You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by wy...@apache.org on 2026/09/14 16:09:47 UTC

(maka) 15/20: merge: sync origin/main through c22768c3b

This is an automated email from the ASF dual-hosted git repository.

M4n5ter pushed a commit to branch feat/runtime-host-rust
in repository https://gitbox.apache.org/repos/asf/maka.git

commit 0b00588a18cfe1254b1843fa8a6b3f7fed2c150d
Merge: d898022ea2 c22768c3b0
Author: Wang <m4...@gmail.com>
AuthorDate: Mon Sep 14 22:35:15 2026 +0800

    merge: sync origin/main through c22768c3b
    
    Preserve Rust Desktop launch and separate control storage alongside upstream Work Board validation. Rust epoch 154 adaptation remains a separate follow-up.
    
    Generated-by: OpenAI Codex

 apps/desktop/e2e-budget.json                       |    2 +-
 apps/desktop/e2e/workhub-layout.spec.ts            |   19 +-
 apps/desktop/renderer-architecture.json            |   26 +-
 .../__tests__/app-shell-chat-actions-fixture.ts    |    1 +
 .../__tests__/app-shell-first-send-cleanup.test.ts |  132 ++-
 apps/desktop/src/main/__tests__/cdp-bridge.test.ts |  179 +++-
 .../__tests__/import-tasks-settings-page.test.ts   |   55 +-
 .../__tests__/multi-host-thread-search.test.ts     |   37 +-
 ...runtime-host-external-sessions-ipc-main.test.ts |   29 +-
 .../runtime-host-guest-ipc-preload.test.ts         |   26 +-
 .../__tests__/runtime-host-search-ipc-main.test.ts |  257 ++++-
 .../runtime-host-session-catalog-ipc-main.test.ts  |   20 +
 .../src/main/__tests__/session-local.test.ts       |   41 +
 .../main/__tests__/startup-storage-repair.test.ts  |  136 +++
 .../src/main/__tests__/work-board-ipc-main.test.ts |  230 +++-
 .../src/main/__tests__/work-board-panel.test.ts    |    4 +-
 .../src/main/__tests__/work-board-target.test.ts   |  109 ++
 .../src/main/__tests__/workbar-controller.test.ts  |  547 +++++++++-
 apps/desktop/src/main/browser/cdp-bridge.ts        |   46 +-
 apps/desktop/src/main/main.ts                      |    7 +-
 apps/desktop/src/main/runtime-host-boot.ts         |   28 +-
 apps/desktop/src/main/runtime-host-client.ts       |    7 +-
 .../runtime-host-external-sessions-ipc-main.ts     |   17 +-
 .../src/main/runtime-host-search-ipc-main.ts       |   92 +-
 .../main/runtime-host-session-catalog-ipc-main.ts  |   11 +-
 apps/desktop/src/main/session-local-service.ts     |   16 +-
 apps/desktop/src/main/startup-context.ts           |    7 +
 apps/desktop/src/main/startup-presentation.ts      |   19 +-
 apps/desktop/src/main/work-board-ipc-main.ts       |   43 +
 apps/desktop/src/preload/bridge-contract.d.ts      |   14 +-
 .../src/preload/external-session-import-result.ts  |   13 +-
 .../src/preload/multi-host-thread-search.ts        |   45 +-
 apps/desktop/src/preload/preload.ts                |   54 +-
 .../desktop/src/renderer/app-shell-chat-actions.ts |   59 +-
 apps/desktop/src/renderer/app-shell.tsx            |   25 +-
 .../composition/desktop-feature-services.tsx       |    7 +-
 .../desktop/src/renderer/features/search}/index.ts |   13 +-
 .../renderer/features/search/services-context.tsx  |   24 +-
 .../{ => features/search}/use-shell-search.ts      |    8 +-
 .../controller/use-task-entry-controller.ts        |   31 +-
 .../task-entry/model/task-entry-selection.ts       |   18 +-
 .../features/task-entry/model/work-board-target.ts |   70 ++
 .../src/renderer/features/task-entry/testing.ts    |    1 +
 .../features/task-entry/ui/task-entry-provider.tsx |   19 +
 .../workbar/controller/use-workbar-controller.ts   |  235 ++++-
 .../desktop/src/renderer/features/workbar/ports.ts |   12 +
 .../renderer/features/workbar/ui/workbar-host.tsx  |    9 +
 .../features/workbar/ui/workbar-surface.tsx        |    9 +
 .../src/renderer/locales/conversation-copy.ts      |    8 +
 .../locales/external-session-import-copy.ts        |   23 +
 .../platform/desktop/create-search-services.ts     |   21 +-
 .../platform/desktop/create-workbar-services.ts    |   10 +-
 .../src/renderer/session-workspace-actions.ts      |   11 +-
 .../settings/import-tasks-settings-page.tsx        |   20 +-
 apps/desktop/src/renderer/styles/work-board.css    |   49 +-
 apps/desktop/src/renderer/styles/workhub.css       |    9 +-
 apps/desktop/src/renderer/work-board-panel.tsx     |   58 +-
 apps/desktop/stories/workhub.stories.tsx           |   15 +-
 ...kspace-mutation-lifecycle-authority-v1.zh-CN.md |    2 +
 docs/astryx-surface-file-inventory.md              |    7 +-
 docs/astryx-surface-file-inventory.paths           |    1 +
 docs/work-board-contract.md                        |   55 +-
 docs/work-board-phase1.md                          |    4 +-
 docs/work-board-phase3.md                          |   47 +
 packages/core/package.json                         |    1 +
 .../src/__tests__/agent-graph-schedule.test.ts     |   23 +
 .../src/__tests__/executor-id.test.ts}             |   21 +-
 .../__tests__/runtime-invocation-opened.test.ts    |   22 +
 .../src/__tests__/session-send-projection.test.ts  |   17 +
 packages/core/src/__tests__/work-board.test.ts     |   36 +-
 packages/core/src/agent-graph-schedule.ts          |   21 +-
 packages/core/src/events.ts                        |    1 +
 .../{eval/src/index.ts => core/src/executor-id.ts} |   15 +-
 packages/core/src/external-session.ts              |   27 +
 packages/core/src/model-call-usage-projection.ts   |   16 +-
 packages/core/src/runtime-event.ts                 |   40 +-
 packages/core/src/runtime-inputs.ts                |   10 +-
 packages/core/src/session-send-projection.ts       |   12 +-
 packages/core/src/session.ts                       |   14 +-
 packages/core/src/shell-run-result.ts              |    1 +
 packages/core/src/shell-run.ts                     |   15 +-
 packages/core/src/work-board.ts                    |  107 +-
 packages/eval/FLEET.md                             |   79 ++
 packages/eval/README.md                            |    5 +
 packages/eval/package.json                         |    1 +
 packages/eval/src/__tests__/fleet.test.ts          |  544 ++++++++++
 packages/eval/src/fleet-simulation.ts              |  284 +++++
 packages/eval/src/fleet-store.ts                   |  273 +++++
 packages/eval/src/fleet-worker.ts                  |  135 +++
 packages/eval/src/fleet.ts                         |  459 ++++++++
 packages/eval/src/harbor-maka-subject.ts           |    5 +-
 packages/eval/src/index.ts                         |    3 +
 .../src/__tests__/execution-artifacts.test.ts      |    6 +-
 .../__tests__/external-session-coordinator.test.ts |  129 ++-
 .../__tests__/external-session-protocol.test.ts    |   39 +
 .../__tests__/host-session-availability.test.ts    |   41 +
 .../src/__tests__/plugin-platform.test.ts          |   52 +
 .../__tests__/session-catalog-coordinator.test.ts  |   82 ++
 .../src/__tests__/session-catalog-protocol.test.ts |   44 +
 .../src/__tests__/web-fetch-tool.test.ts           |   63 +-
 .../workhub-coordination-protocol.test.ts          |   24 +
 .../src/client/session-catalog-summary.ts          |    1 +
 .../runtime-host/src/protocol/external-session.ts  |   35 +-
 packages/runtime-host/src/protocol/index.ts        |    4 +-
 .../runtime-host/src/protocol/plugin-platform.ts   |   69 +-
 .../runtime-host/src/protocol/session-catalog.ts   |   43 +-
 .../src/server/child-agent-composition.ts          |    1 +
 .../runtime-host/src/server/execution-artifacts.ts |   35 +-
 .../src/server/execution-composition.ts            |   66 +-
 .../src/server/external-session-coordinator.ts     |   23 +-
 .../src/server/host-session-availability.ts        |   17 +-
 .../src/server/plugin-platform-coordinator.ts      |   16 +-
 .../runtime-host/src/server/plugin-platform.ts     |   11 +
 .../src/server/session-catalog-coordinator.ts      |   97 +-
 .../src/server/session-revision-coordinator.ts     |    3 +
 packages/runtime-host/src/server/web-fetch-tool.ts |   48 +-
 packages/runtime/README.md                         |   12 +
 packages/runtime/package.json                      |    3 +
 .../runtime/src/__tests__/ai-sdk-backend.test.ts   |  376 ++++---
 .../__tests__/background-task-health-tool.test.ts  |  119 +++
 .../src/__tests__/model-adapter-onerror.test.ts    |   13 +-
 .../runtime/src/__tests__/model-adapter.test.ts    |   39 -
 .../openai-responses-model-adapter.test.ts         |    3 +-
 .../src/__tests__/plugin-executor-backend.test.ts  |  209 ++++
 .../src/__tests__/plugin-executor-service.test.ts  |  234 +++++
 .../runtime/src/__tests__/session-manager.test.ts  |  153 ++-
 .../src/__tests__/shell-run-manager.test.ts        |   91 ++
 .../runtime/src/__tests__/subagent-tools.test.ts   |    4 +
 .../tool-runtime-durable-boundary.test.ts          | 1108 +-------------------
 packages/runtime/src/agent-run.ts                  |   20 +-
 packages/runtime/src/ai-sdk-compaction.ts          |    5 +-
 packages/runtime/src/ai-sdk-turn.ts                |  424 ++++----
 .../runtime/src/background-task-health-tool.ts     |  137 +++
 packages/runtime/src/history-compaction.ts         |    7 +-
 packages/runtime/src/local-web-fetch.ts            |    2 +-
 packages/runtime/src/model-adapter.ts              |  124 ++-
 packages/runtime/src/model-history.ts              |   10 +-
 packages/runtime/src/model-protocol.ts             |   28 +-
 packages/runtime/src/plugin-agent-service.ts       |    1 +
 packages/runtime/src/plugin-executor-backend.ts    |  388 +++++++
 packages/runtime/src/plugin-executor-service.ts    |  529 ++++++++++
 .../runtime/src/provider-error-classification.ts   |    4 +
 packages/runtime/src/provider-request-telemetry.ts |   66 +-
 packages/runtime/src/runtime-invocation-route.ts   |   58 +
 packages/runtime/src/runtime-kernel.ts             |  236 ++---
 packages/runtime/src/runtime-read-model.ts         |    6 -
 packages/runtime/src/session-manager.ts            |  176 ++--
 packages/runtime/src/shell-run-manager.ts          |   13 +-
 packages/runtime/src/shell-run-tool-result.ts      |    1 +
 .../runtime/src/stream-graph-schedule-reconcile.ts |    1 +
 .../runtime/src/stream-graph-supervisor-tools.ts   |   33 +-
 packages/runtime/src/subagent-tools.ts             |    8 +
 packages/runtime/src/tool-runtime.ts               |  701 ++-----------
 .../__tests__/claude-code-session-adapter.test.ts  |  504 ++++++++-
 .../storage/src/__tests__/session-store.test.ts    |   28 +
 .../sqlite-long-term-memory-store.test.ts          |  321 +++++-
 .../storage/src/__tests__/work-board-store.test.ts |   59 ++
 .../storage/src/claude-code-session-adapter.ts     |  762 +++++++++-----
 .../storage/src/claude-code-transcript-lineage.ts  |  213 ++--
 packages/storage/src/legacy-run-header.ts          |    4 +-
 packages/storage/src/model-call-usage-sql.ts       |    2 +-
 packages/storage/src/session-store.ts              |   15 +-
 .../storage/src/sqlite-long-term-memory-store.ts   |  116 +-
 .../storage/src/sqlite-session-metadata-store.ts   |    3 +-
 packages/storage/src/work-board-store.ts           |   54 +
 .../ui/src/__tests__/model-wheel-picker.test.tsx   |   12 +-
 .../src/__tests__/search-modal-lifecycle.test.tsx  |  129 +++
 .../ui/src/__tests__/transient-placement.test.ts   |  108 ++
 packages/ui/src/chat-view.tsx                      |   47 +-
 packages/ui/src/model-wheel-picker.tsx             |   52 +-
 packages/ui/src/search-modal.tsx                   |   47 +-
 packages/ui/src/styles.css                         |    6 +-
 packages/ui/src/transient-placement.ts             |   71 ++
 packages/ui/stories/model-picker.stories.tsx       |   13 +
 174 files changed, 10777 insertions(+), 3416 deletions(-)

diff --cc apps/desktop/src/main/runtime-host-boot.ts
index bcea37c1fe,6757924296..45f134a6e2
--- a/apps/desktop/src/main/runtime-host-boot.ts
+++ b/apps/desktop/src/main/runtime-host-boot.ts
@@@ -1456,7 -1431,27 +1452,27 @@@ workBoardIpc = registerWorkBoardIpc(
    ipcMain,
    workspaceRoot,
    mainWindowController,
 -  store: createWorkBoardStore(workspaceRoot, { schemaMigration: 'require_current' }),
 +  store: createWorkBoardStore(desktopControlRoot, desktopDatabaseOptions),
+   validateLinkedSession: async (value, expectedProjectId) => {
+     const normalized = normalizeWorkBoardLinkedSession(value);
+     if (!normalized.ok) return false;
+     try {
+       const current = runtimeHostManager?.current(normalized.value.profileId);
+       if (!current?.candidate || current.hostId !== normalized.value.hostId) return false;
+       const sessions = await current.candidate.client.listSessions();
+       const session = sessions.find((candidate) => candidate.id === normalized.value.sessionId);
+       if (!session) return false;
+       if (expectedProjectId !== undefined) {
+         return (
+           session.workspace.target.kind === 'project' &&
+           session.workspace.target.projectId === expectedProjectId
+         );
+       }
+       return true;
+     } catch {
+       return false;
+     }
+   },
  });
  updateDesktopStartupProgress('renderer');
  wireLifecycle();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org