diff --git a/README.md b/README.md index 4ccee7081d..0eec701402 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ **A local-first Agent workspace built for real work.** -Maka does more than answer questions. With controlled permissions, it can inspect projects, execute tools, produce artifacts, and preserve model messages, tool calls, and durable-task progress as recoverable execution facts. The same Runtime is available through the desktop app, terminal TUI, non-interactive CLI, and Headless runner. +Maka does more than answer questions. With controlled permissions, it can inspect projects, execute tools, produce artifacts, and preserve model messages, tool calls, and durable-task progress as recoverable execution facts. Desktop, the terminal TUI, and the non-interactive CLI are clients of one per-workspace Runtime Host. Headless owns a separate task runtime for durable evaluation and automation workloads. > [!IMPORTANT] > Maka is under active development. The macOS Apple Silicon desktop build is an early public release; data formats, CLI commands, and experimental capabilities may still change. @@ -135,13 +135,13 @@ The CLI reads the same model connections and workspace configuration written by The backend spine is: ```text -Desktop / TUI / Headless - ↓ -SessionManager → AgentRun → Model + Tool Runtime - ↓ -Runtime Event Log → Context / Session / UI projections - ↓ -Task Event Log → TaskRun → Self-check / AHE evidence +Desktop / TUI / CLI → Runtime Host → SessionManager → AgentRun + ↓ + Model + Tool Runtime → Runtime Event Log + ↓ + Context / Session / UI projections + +Headless / Eval → Task Event Log → TaskRun → Self-check / AHE evidence ``` Start with [ARCHITECTURE.md](./ARCHITECTURE.md). It provides the system map, code boundaries, problem-oriented reading paths, and six bilingual deep dives. diff --git a/README.zh-CN.md b/README.zh-CN.md index 406be9a2eb..5f0b986b2b 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -8,7 +8,7 @@ **一个为真实工作而生的本地优先 Agent 工作台。** -Maka 不只回答问题。它可以在受控权限下阅读项目、执行工具、生成产物，并把模型消息、工具调用和长程任务进度保存为可恢复的运行事实。你可以从桌面应用、终端 TUI、非交互 CLI 或 Headless runner 使用同一套 Runtime。 +Maka 不只回答问题。它可以在受控权限下阅读项目、执行工具、生成产物，并把模型消息、工具调用和长程任务进度保存为可恢复的运行事实。桌面应用、终端 TUI 和非交互 CLI 共享每个工作区唯一的 Runtime Host；Headless 使用独立的任务 Runtime 承载持久评测和自动化工作负载。 > [!IMPORTANT] > Maka 仍在活跃开发中。macOS Apple Silicon 桌面版是首个早期公开版本，数据格式、CLI 和实验能力仍可能变化。 @@ -135,13 +135,13 @@ CLI 读取 Desktop 写入的同一份模型连接和 workspace 配置。Headless Maka 后端可以用一条主线概括： ```text -Desktop / TUI / Headless - ↓ -SessionManager → AgentRun → Model + Tool Runtime - ↓ -Runtime Event Log → Context / Session / UI projections - ↓ -Task Event Log → TaskRun → Self-check / AHE evidence +Desktop / TUI / CLI → Runtime Host → SessionManager → AgentRun + ↓ + Model + Tool Runtime → Runtime Event Log + ↓ + Context / Session / UI projections + +Headless / Eval → Task Event Log → TaskRun → Self-check / AHE evidence ``` 从 [ARCHITECTURE.zh-CN.md](./ARCHITECTURE.zh-CN.md) 开始阅读。它提供总体架构图、代码边界、按问题组织的阅读路径，以及六篇中英双语深度文章。 diff --git a/apps/desktop/README.md b/apps/desktop/README.md index 7a425355b7..d9f33a871e 100644 --- a/apps/desktop/README.md +++ b/apps/desktop/README.md @@ -83,7 +83,7 @@ npm Electron bundle, which macOS will not accept as a durable grant. | Layer | Path | Role | |---|---|---| -| main | `src/main/` | Node/Electron main process. Owns window lifecycle, credentials, attachments, permissions, IPC handlers, and the bridge to `@maka/runtime` + `@maka/storage`. | +| main | `src/main/` | Node/Electron client process. Owns windows, OS capabilities, client-local settings, IPC projection, and the Runtime Host connection. Runtime execution and canonical runtime policy belong to Runtime Host. | | preload | `src/preload/preload.ts` (single file) | `contextBridge.exposeInMainWorld('maka', …)` — the only surface the renderer may call to reach Node/Electron. No Node API is directly exposed. | | renderer | `src/renderer/` | React UI body. See `src/renderer/README.md`. | @@ -93,20 +93,21 @@ npm Electron bundle, which macOS will not accept as a durable grant. | Suffix | Role | Examples | |---|---|---| -| `*-ipc-main.ts` | Exports a `register*Ipc(...)` that wires `ipcMain.handle` / `ipcMain.on` for one IPC domain | `connections-ipc-main`, `daily-review-ipc-main`, `memory-ipc-main`, `web-search-ipc-main`, `workspace-resources-ipc-main` | -| `*-main.ts` / `*-service.ts` | A service owned by main (no `ipcMain` calls of its own) | `daily-review-main`, `system-prompt-main`, `oauth-model-connections-main`, `local-memory-service` | +| `runtime-host-*-ipc-main.ts` | Projects one Runtime Host protocol domain onto renderer IPC | `runtime-host-connections-ipc-main`, `runtime-host-session-execution-ipc-main`, `runtime-host-settings-ipc-main` | +| `*-ipc-main.ts` | Registers a client-local Electron or OS-facing IPC domain | `browser-ipc-main`, `notifications-ipc-main`, `workspace-search-ipc-main` | +| `*-service.ts` / `*-controller.ts` | A client-local service without direct IPC ownership | `app-update-service`, `project-management-service`, `project-root-controller` | | `*-guard.ts` | Validation / security boundary | `external-link-guard`, `open-path-guard`, `permission-response-guard` | | (other) | Window, state, platform wiring | `main.ts` (entry), `main-window`, `window-state`, `theme-source`, `credential-store`, `skills`, `attachment-*` | -Sub-folders: `browser/` (embedded browser view), `oauth/`, `search/` (thread search), `web-search/`, `types/`. The browser IPC handler itself (`browser-ipc-main.ts`) is flat in `src/main/`, not under `browser/`. +Sub-folders hold OS-facing implementations such as `browser/`, `computer-use/`, `oauth/`, and `permission-overlay/`. Runtime Host adapters stay flat and carry the `runtime-host-` prefix so ownership is visible at the import boundary. -`main.ts` startup order: stores and the runtime/controller are created synchronously at module load; `registerIpc()` runs at top level, **before** `app.whenReady()`; inside `whenReady`, the main window is created **hidden** early and background startup (connection bootstrapping, telemetry, bots, schedulers) runs concurrently without blocking first paint. The window is created hidden and revealed after the renderer's first AppShell paint (the `window:notifyRendererReady` gate in `app.tsx`); a fallback timer reveals it if the renderer never signals, so a fail-soft loading state can show (e.g. if `main.tsx`'s onboarding prefetch times out). The real invariant for IPC: handlers must be registered before the renderer entry runs, because `main.tsx` prefetches the onboarding snapshot before mounting React. Background startup may mutate state after the renderer's first read, so don't assume it has already settled when wiring the UI. +`main.ts` performs only pre-ready Electron identity and single-instance work. After `app.whenReady()`, it dynamically imports `runtime-host-boot.ts`. Boot validates the storage root before any Runtime Host state can be written, registers persistent client-local IPC, connects or spawns Runtime Host, registers connection-scoped Host IPC, and only then creates the first renderer window. The window remains hidden until the renderer's first AppShell paint (`window:notifyRendererReady`), with a fallback reveal timer for fail-soft startup. ## IPC contract Three patterns, all rooted in preload's `maka` namespace. Channel names are `:`. -- **Request/response** — `ipcRenderer.invoke(':', …args)` in preload ↔ `ipcMain.handle(':', …)`. The handler lives either inline in `main.ts` (e.g. `sessions:list`, `settings:get`) or in a `*-ipc-main.ts` extracted by domain (e.g. `connections-ipc-main`, `daily-review-ipc-main`). Both forms coexist; prefer extracting a new domain to its own `*-ipc-main.ts`. +- **Request/response** — `ipcRenderer.invoke(':', …args)` in preload ↔ `ipcMain.handle(':', …)`. Runtime domains are projected by `runtime-host-*-ipc-main.ts`; OS-facing client domains use a focused `*-ipc-main.ts` module. - **Main→renderer push** — main sends through the safe-send guard (`safeSendToRenderer` via `mainWindowController.send`), not raw `webContents.send` (which throws when the window/`webContents` is destroyed); preload subscribes via `ipcRenderer.on` and returns an unsubscribe fn (e.g. `sessions:changed`, `plans:changed`, `artifacts:changed`). The safe-send contract test scans a fixed list of main-source files for direct `mainWindow.webContents.send(...)` forms — new `*-ipc-main.ts` files aren't auto-covered, so route sends through the guard in every new file (an alias for `mainWindow` can bypass the literal scan). - **Renderer→main fire-and-forget** — `ipcRenderer.send(':', …)` in preload ↔ `ipcMain.on(':', …)`. Used when no response is needed (e.g. `browser:active-session`, `browser:setViewport`). @@ -119,7 +120,7 @@ renderer (React) └─ window.maka..(…) // typed surface, see preload.ts └─ ipcRenderer.invoke / send / on └─ main: safeSendToRenderer / ipcMain.handle / ipcMain.on - └─ @maka/runtime (agent runtime) + @maka/storage (JSONL persistence) + └─ Runtime Host protocol → @maka/runtime + @maka/storage ``` The renderer never imports `@maka/runtime` or `@maka/storage` at runtime — all Node-side access goes through the preload `maka` bridge. The renderer only pulls `import type` from them for a few shared types. Types shared across the IPC boundary mostly come from `@maka/core`, with some from `@maka/runtime`, `@maka/storage`, and `@maka/ui` (see `preload.ts` imports). diff --git a/apps/desktop/e2e/bot-onboarding.spec.ts b/apps/desktop/e2e/bot-onboarding.spec.ts index f5d8944a0a..b6e644eaa6 100644 --- a/apps/desktop/e2e/bot-onboarding.spec.ts +++ b/apps/desktop/e2e/bot-onboarding.spec.ts @@ -32,7 +32,6 @@ test('IM 快捷接入完成真实 QR session、凭据落盘，取消与过期二 await dialog.getByRole('button', { name: '完成' }).click(); await expect(dialog).toBeHidden(); - // Same window, next channels: cancellation races, expiry regeneration, and // the Lark variant are independent flows over the same seeded settings. await settings.getByRole('button', { name: '返回远程接入' }).click(); @@ -40,13 +39,10 @@ test('IM 快捷接入完成真实 QR session、凭据落盘，取消与过期二 await settings.getByRole('button', { name: '扫码登录' }).click(); const wechatDialog = page.getByRole('dialog', { name: '微信扫码登录' }); await expect(wechatDialog.getByRole('img', { name: '微信扫码登录二维码' })).toBeVisible(); - await page.waitForTimeout(1_150); - // The fixture deliberately has a provider result in flight here. Bypass - // Playwright's stability wait so the result-driven rerender cannot win the - // race before the cancellation click is dispatched. + // Poll snapshots replace the dialog subtree. A real pointer dispatch does + // not wait for that subtree to become stable, so neither should this click. await wechatDialog.getByRole('button', { name: '取消' }).click({ force: true }); await expect(wechatDialog).toBeHidden(); - await page.waitForTimeout(1_300); const afterCancel = await page.evaluate(() => window.maka.settings.get()); expect(afterCancel.botChat.channels.wechat.token).toBe(''); @@ -56,7 +52,6 @@ test('IM 快捷接入完成真实 QR session、凭据落盘，取消与过期二 await settings.getByRole('button', { name: '接入 企业微信' }).click(); await settings.getByRole('button', { name: '开始快捷绑定' }).click(); const wecomDialog = page.getByRole('dialog', { name: '配置企业微信扫码接入' }); - await expect(wecomDialog.getByRole('img', { name: '配置企业微信二维码' })).toBeVisible(); await expect(wecomDialog.getByText('二维码已过期，请重新生成')).toBeVisible({ timeout: 4_000 }); await wecomDialog.getByRole('button', { name: '重新生成' }).click(); await expect(wecomDialog.getByRole('img', { name: '配置企业微信二维码' })).toBeVisible(); diff --git a/apps/desktop/e2e/composer-skill-invocation.spec.ts b/apps/desktop/e2e/composer-skill-invocation.spec.ts index 0ead53af61..bfdb002ac6 100644 --- a/apps/desktop/e2e/composer-skill-invocation.spec.ts +++ b/apps/desktop/e2e/composer-skill-invocation.spec.ts @@ -65,6 +65,9 @@ test('slash suggestions: project gating, collaboration modes, and Deep Research await expect.poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length).toBe(1); const [session] = await page.evaluate(() => window.maka.sessions.list()); if (!session) throw new Error('the composer did not create a session'); + await expect + .poll(async () => (await page.evaluate(() => window.maka.sessions.list()))[0]?.status) + .not.toBe('running'); const listNames = (sessionId: string) => page.evaluate( @@ -77,12 +80,18 @@ test('slash suggestions: project gating, collaboration modes, and Deep Research await expect(listbox).toContainText('Agent Write'); await expect - .poll(async () => (await page.evaluate(() => window.maka.sessions.list()))[0]?.status) - .not.toBe('running'); - await page.evaluate( - ({ sessionId }) => window.maka.sessions.setCollaborationMode(sessionId, 'plan'), - { sessionId: session.id }, - ); + .poll(() => + page.evaluate(async ({ sessionId }) => { + try { + await window.maka.sessions.setCollaborationMode(sessionId, 'plan'); + return true; + } catch (error) { + if (String(error).includes('linked Turn is active')) return false; + throw error; + } + }, { sessionId: session.id }), + ) + .toBe(true); await expect.poll(() => listNames(session.id)).not.toContain('Agent Write'); await expect(listbox).not.toContainText('Agent Write'); diff --git a/apps/desktop/e2e/fixtures.ts b/apps/desktop/e2e/fixtures.ts index 7386f60804..a6aaf5fefe 100644 --- a/apps/desktop/e2e/fixtures.ts +++ b/apps/desktop/e2e/fixtures.ts @@ -210,6 +210,7 @@ async function withE2eWindow( e2eFixtureScenario, locale, platform, + showWindow, invocableSkills, gitReviewExtraFiles, extraConnectionCount, @@ -220,6 +221,8 @@ async function withE2eWindow( locale?: 'zh' | 'en'; /** #1312: force app:info's platform so the window boots natively into that platform's `data-os` cascade. */ platform?: 'darwin' | 'win32' | 'linux'; + /** Show fixtures whose contract depends on compositor-paced frames. */ + showWindow?: boolean; invocableSkills?: boolean; gitReviewExtraFiles?: number; extraConnectionCount?: number; @@ -251,9 +254,9 @@ async function withE2eWindow( scenario: e2eFixtureScenario, locale, platform, - // xvfb throttles a hidden window's compositor to ~1fps; only that - // isolated display gets a visible window. - showWindow: isCiLinuxDisplay(), + // xvfb throttles a hidden window's compositor to ~1fps. Geometry + // fixtures opt in locally; every fixture is visible on isolated CI X. + showWindow: showWindow || isCiLinuxDisplay(), }), }); app.on('console', (message) => { diff --git a/apps/desktop/e2e/mcp.spec.ts b/apps/desktop/e2e/mcp.spec.ts index 821a7ba8d9..d5b68c6478 100644 --- a/apps/desktop/e2e/mcp.spec.ts +++ b/apps/desktop/e2e/mcp.spec.ts @@ -35,22 +35,6 @@ test('MCP module completes stdio add, discovery, disable, JSON import, and delet await expect(page.getByRole('main', { name: '扩展' })).toBeVisible(); await expect(extensionSelector).toHaveAccessibleName('扩展内容：MCP'); - const dingtalkRow = mcp.locator('[data-maka-contract="mcp-market-row"]').filter({ hasText: '钉钉' }); - const installDingtalk = dingtalkRow.getByRole('button', { name: '安装 钉钉' }); - await installDingtalk.click(); - const cancelDingtalk = dingtalkRow.getByRole('button', { name: '取消安装 钉钉' }); - await expect(cancelDingtalk).toBeVisible(); - await page.mouse.move(0, 0); - await expect(cancelDingtalk.locator('.maka-mcp-install-spinner')).toHaveCSS('opacity', '1'); - await cancelDingtalk.hover(); - await expect(cancelDingtalk.locator('.maka-mcp-install-cancel')).toHaveCSS('opacity', '1'); - await cancelDingtalk.click(); - await expect(dingtalkRow.getByRole('button', { name: '安装 钉钉' })).toBeVisible(); - await expect.poll(async () => { - const next = await page.evaluate(() => window.maka.mcp.getConfig()); - return next.mcpServers.dingtalk; - }).toBeUndefined(); - await mcp.getByRole('button', { name: '添加 MCP' }).click(); const editor = page.getByRole('dialog', { name: '添加 MCP' }); await expect(editor.getByLabel('服务器 ID')).toBeFocused(); diff --git a/apps/desktop/e2e/playwright.config.ts b/apps/desktop/e2e/playwright.config.ts index 5a21e9137a..462db13813 100644 --- a/apps/desktop/e2e/playwright.config.ts +++ b/apps/desktop/e2e/playwright.config.ts @@ -5,25 +5,24 @@ import { defineConfig } from '@playwright/test'; * * Each test launches a real Electron window backed by the deterministic fake * backend (MAKA_E2E=1) against its OWN throwaway userData dir (the fixture - * mkdtemps one per test), so windows share no *state*. The wall clock is - * dominated by Electron boot, which overlaps well: a past full-suite run - * measured 1 worker ≈ 7min against 4 workers ≈ 2.4min. Deliberately no test - * count here — the previous note carried a stale one that outlived two rounds - * of pruning. `playwright test --list` is the only figure that cannot rot. + * mkdtemps one per test), so windows share no *state*. A Runtime Host-backed + * window owns both Electron and an execution candidate process. Keep the + * default at one worker: concurrent hidden windows throttle animation frames + * and share OS focus, invalidating geometry and focus contracts. Developers + * can still pass `--workers` explicitly for a subset that has neither concern. + * Deliberately no test count here — the previous note carried a stale one that + * outlived two rounds of pruning. `playwright test --list` is the only figure + * that cannot rot. * - * What parallel windows DO share is OS focus. Specs that assert - * `toBeFocused()` (e.g. plan-reminders) fail when another window steals - * activation mid-assertion — Chromium blurs the document when its window - * deactivates. Each CI shard therefore keeps one worker on an isolated X - * display; local runs take the parallel win, and a local focus failure re-runs - * alone to confirm. + * CI shards run on isolated X displays, so jobs still overlap without sharing + * focus or a compositor. Local parallelism is opt-in for the same reason. * * Run from apps/desktop via `npm run e2e`, which builds the app first. */ export default defineConfig({ testDir: '.', fullyParallel: true, - workers: process.env.CI ? 1 : 4, + workers: 1, // CI publishes no Playwright report that consumes Git metadata. Disable its // best-effort shallow-history fetch, which otherwise waits on a fixed timeout. captureGitInfo: { commit: false, diff: false }, diff --git a/apps/desktop/e2e/providers.spec.ts b/apps/desktop/e2e/providers.spec.ts index 392abe0c23..aa60813875 100644 --- a/apps/desktop/e2e/providers.spec.ts +++ b/apps/desktop/e2e/providers.spec.ts @@ -221,17 +221,6 @@ test('provider connections: the canonical API-key journey and two-field rows', a }); await test.step('deletion stays reachable and reversible in a short viewport', async () => { - // The fixture intentionally cannot discover models with its placeholder - // credential. Dismiss that independently tested transient before changing - // the viewport so it cannot pause its own auto-hide timer over the control - // this step is meant to exercise. - const discoveryError = page - .getByRole('alert') - .filter({ has: page.locator('[data-type="supporting"]') }); - await expect(discoveryError).toBeVisible(); - await discoveryError.getByRole('button').click(); - await expect(discoveryError).toBeHidden(); - // Short-viewport invariant: the detail is a page, so the settings content // area owns the scrolling and the trailing action stays reachable. The test // asserts reachability, not which node scrolls. diff --git a/apps/desktop/e2e/quote-companion.spec.ts b/apps/desktop/e2e/quote-companion.spec.ts index 302d0db407..cd3620d0ed 100644 --- a/apps/desktop/e2e/quote-companion.spec.ts +++ b/apps/desktop/e2e/quote-companion.spec.ts @@ -31,6 +31,7 @@ async function waitForSourceSessionToSettle(page: Page) { test('the quote layer: settle timing, Escape, immediate hide, and scroll following', async ({ window: page, }) => { + test.slow(); await page.setViewportSize({ width: 1400, height: 900 }); const composer = page.locator(COMPOSER_INPUT); await composer.fill('selection timing source'); @@ -38,6 +39,7 @@ test('the quote layer: settle timing, Escape, immediate hide, and scroll followi const reply = page.getByText(/Fake backend received: selection timing source/); await expect(reply).toBeVisible(); + await expect(composer).toBeEditable(); const quoteLayer = page.locator('.maka-quote-actions'); const selectContents = (locator: typeof reply) => @@ -52,7 +54,14 @@ test('the quote layer: settle timing, Escape, immediate hide, and scroll followi // Real drag-select with real mouse events. A drag emits a burst of // `selectionchange`, and the gesture below lasts well past the settle delay, // so a layer that appeared mid-drag — the original complaint — shows up here. - const replyBox = (await reply.boundingBox())!; + let replyBox: { x: number; y: number; width: number; height: number } | null = null; + await expect + .poll(async () => { + replyBox = await reply.boundingBox(); + return replyBox; + }) + .not.toBeNull(); + if (!replyBox) throw new Error('settled selection reply has no visible bounds'); const dragY = replyBox.y + replyBox.height / 2; await page.mouse.move(replyBox.x + 20, dragY); await page.mouse.down(); @@ -139,7 +148,7 @@ test('the quote layer: settle timing, Escape, immediate hide, and scroll followi await select(/Fake backend received: selection timing source/); await expect(page.locator('.maka-quote-actions')).toBeVisible(); - const stillVisibleNextFrame = await page + const stillVisibleAfterEvent = await page .getByText(/Fake backend received: hide first beta/) .last() .evaluate(async (element) => { @@ -148,10 +157,13 @@ test('the quote layer: settle timing, Escape, immediate hide, and scroll followi const selection = window.getSelection(); selection?.removeAllRanges(); selection?.addRange(range); - await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve))); + // Programmatic Selection mutations schedule `selectionchange` as a later + // task. Dispatch the user-visible event now and inspect its synchronous + // result, before the 350 ms settle path is allowed to re-show the layer. + document.dispatchEvent(new Event('selectionchange')); return !!document.querySelector('.maka-quote-actions'); }); - expect(stillVisibleNextFrame).toBe(false); + expect(stillVisibleAfterEvent).toBe(false); // Scrolling moves the selection, so it must move the layer. await page.setViewportSize({ width: 1400, height: 700 }); @@ -192,7 +204,7 @@ test('the quote layer: settle timing, Escape, immediate hide, and scroll followi * phase runs last because it checks 以后不再询问, which suppresses the close * confirmation for the rest of its window. */ -test('side conversations: every entry point, then the numbered-tab lifecycle', async ({ +test('side conversation entry points keep work outside the main transcript', async ({ window: page, }) => { await page.setViewportSize({ width: 1400, height: 900 }); @@ -303,10 +315,24 @@ test('side conversations: every entry point, then the numbered-tab lifecycle', a await expect .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) .toBe(1); +}); - // Numbered tabs, independent drafts, and the don't-ask-again close. +test('numbered side chat tabs keep independent drafts and close policy', async ({ + window: page, +}) => { + test.slow(); + await page.setViewportSize({ width: 1400, height: 900 }); + const mainComposer = page.locator('.mainColumn').locator(COMPOSER_INPUT); + await mainComposer.fill('numbered side chat source'); + await mainComposer.press('Enter'); + await expect( + page.getByText(/Fake backend received: numbered side chat source/), + ).toBeVisible(); await waitForSourceSessionToSettle(page); + const [sourceSession] = await page.evaluate(() => window.maka.sessions.list()); + expect(sourceSession).toBeDefined(); + // Numbered tabs, independent drafts, and the don't-ask-again close. await openSideConversationFromLauncher(page); const visiblePanel = page.locator('.maka-quote-workbar-panel:not([hidden])'); await expect(visiblePanel).toBeVisible(); @@ -361,11 +387,11 @@ test('side conversations: every entry point, then the numbered-tab lifecycle', a .map(({ permissionMode }) => permissionMode) .sort(), })); - }, sourceSession.id), + }, sourceSession!.id), ) .toEqual({ count: 3, - companions: [sourceSession.permissionMode, sourceSession.permissionMode].sort(), + companions: [sourceSession!.permissionMode, sourceSession!.permissionMode].sort(), }); await page.getByRole('button', { name: '关闭first side draft', exact: true }).click(); @@ -401,12 +427,41 @@ test('side conversations: every entry point, then the numbered-tab lifecycle', a .toBe(1); }); -/** - * Side-chat behavior over one source conversation: the staged-quote - * lifecycle, permission inheritance + steering, failure classification and - * retry, and draft survival across collapse and navigation. - */ -test('side chat: staged quotes, steering and permissions, failures, and draft survival', async ({ +test('renderer reload recovers and cleans its orphaned side conversation fork', async ({ + window: page, +}) => { + await page.setViewportSize({ width: 1400, height: 900 }); + const mainComposer = page.locator('.mainColumn').locator(COMPOSER_INPUT); + await mainComposer.fill('side chat reload source'); + await mainComposer.press('Enter'); + await expect(page.getByText(/Fake backend received: side chat reload source/)).toBeVisible(); + await waitForSourceSessionToSettle(page); + + await openSideConversationFromLauncher(page); + const sideComposer = page + .locator('.maka-quote-workbar-panel:not([hidden])') + .locator(COMPOSER_INPUT); + await sideComposer.fill('orphan this temporary fork'); + await sideComposer.press('Enter'); + await expect( + page.getByText(/Fake backend received: orphan this temporary fork/), + ).toBeVisible(); + await expect + .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) + .toBe(2); + + await page.reload(); + + await expect(page.locator(COMPOSER_INPUT)).toBeVisible(); + await expect + .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) + .toBe(1); + await expect( + page.locator('.maka-workbar-tab[data-workbar-tab-id^="side-chat:"]'), + ).toHaveCount(0); +}); + +test('side chat stages quotes and attachments in one isolated fork', async ({ window: page, }) => { await page.setViewportSize({ width: 1400, height: 900 }); @@ -428,7 +483,7 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su // Create the same real DOM Range a drag selection would produce. Mutating // the selection fires `selectionchange` on its own, which is the hook's only // trigger; the click below absorbs the settle delay before the layer shows. - const stageReply = async (reply: typeof firstSourceReply) => { + const stageReply = async (reply: typeof firstSourceReply, expectedQuoteCount: number) => { await reply.evaluate((element) => { const range = document.createRange(); range.selectNodeContents(element); @@ -443,9 +498,27 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su }); await expect(page.getByRole('button', { name: '在侧栏追问' })).toBeVisible(); await page.getByRole('button', { name: '在侧栏追问' }).click(); + await expect( + page.locator('.maka-quote-companion .maka-composer-context-drawer .astryx-token'), + ).toHaveCount(expectedQuoteCount); + await expect( + page + .locator( + '.maka-workbar-tab[data-active][data-workbar-tab-id^="side-chat:"]', + ) + .getByRole('tab'), + ).not.toHaveAttribute('aria-busy', 'true'); + await expect + .poll(() => + page + .locator('.maka-quote-workbar-panel:not([hidden])') + .locator(COMPOSER_INPUT) + .evaluate((element) => element === document.activeElement), + ) + .toBe(true); }; - await stageReply(firstSourceReply); - await stageReply(secondSourceReply); + await stageReply(firstSourceReply, 1); + await stageReply(secondSourceReply, 2); const panel = page.locator('.maka-quote-companion'); await expect(panel).toBeVisible(); @@ -531,10 +604,23 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su await expect .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) .toBe(1); +}); - // Steering and permission inheritance on a fresh fork. +test('side chat persists steering and permission changes', async ({ + window: page, +}) => { + await page.setViewportSize({ width: 1400, height: 900 }); + const mainComposer = page.locator('.mainColumn').locator(COMPOSER_INPUT); + await mainComposer.fill('side chat control source'); + await mainComposer.press('Enter'); + await expect( + page.getByText(/Fake backend received: side chat control source/), + ).toBeVisible(); await waitForSourceSessionToSettle(page); + const [sourceSession] = await page.evaluate(() => window.maka.sessions.list()); + expect(sourceSession).toBeDefined(); + // Steering and permission inheritance on a fresh fork. await openSideConversationFromLauncher(page); const steerPanel = page.locator('.maka-quote-workbar-panel:not([hidden])'); const sideComposer = steerPanel.locator(COMPOSER_INPUT); @@ -576,8 +662,7 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su }) .toBe('bypass'); - // Close the steering fork before the failure phases: it holds content, so - // answer the confirmation. + // The fork holds content, so closing it requires confirmation. await page .locator('.maka-workbar-tab[data-active][data-workbar-tab-id^="side-chat:"] .maka-workbar-tab-close') .click(); @@ -585,15 +670,27 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su await expect .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) .toBe(1); +}); - // Failure classification, collapse survival, and retry. - const rightPanel = page.locator('[data-maka-contract="session-workbar-right"]'); +test('side chat recovers from failures and preserves its draft', async ({ + window: page, +}) => { + test.slow(); + await page.setViewportSize({ width: 1400, height: 900 }); + const mainComposer = page.locator('.mainColumn').locator(COMPOSER_INPUT); + await mainComposer.fill('side chat recovery source'); + await mainComposer.press('Enter'); + await expect( + page.getByText(/Fake backend received: side chat recovery source/), + ).toBeVisible(); await waitForSourceSessionToSettle(page); + // Failure classification, collapse survival, and retry. + const rightPanel = page.locator('[data-maka-contract="session-workbar-right"]'); await openSideConversationFromLauncher(page); const failPanel = page.locator('.maka-quote-companion'); const failComposer = failPanel.locator(COMPOSER_INPUT); - + await failComposer.fill('__e2e_error__:network'); await failComposer.press('Enter'); await expect(failPanel.getByRole('button', { name: '停止' })).toBeVisible(); @@ -625,7 +722,6 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su await expect .poll(async () => (await page.evaluate(() => window.maka.sessions.list())).length) .toBe(1); - await page.waitForTimeout(350); await expect(page.getByText('鉴权失败')).toHaveCount(0); // Draft survival across collapse and launcher navigation. @@ -634,7 +730,7 @@ test('side chat: staged quotes, steering and permissions, failures, and draft su await openSideConversationFromLauncher(page); const draftPanel = page.locator('.maka-quote-companion'); const draftComposer = draftPanel.locator(COMPOSER_INPUT); - await draftComposer.fill('draft survives panel navigation'); + await draftComposer.fill('draft survives panel navigation'); await page.getByRole('button', { name: '收起会话工作栏' }).click(); await expect(rightPanel).toBeHidden(); diff --git a/apps/desktop/e2e/skill-delete-scope.spec.ts b/apps/desktop/e2e/skill-delete-scope.spec.ts index 719636f547..f3757da24e 100644 --- a/apps/desktop/e2e/skill-delete-scope.spec.ts +++ b/apps/desktop/e2e/skill-delete-scope.spec.ts @@ -64,4 +64,3 @@ test('offers delete only for deletable scopes and removes a user-scope skill fro // which would drop a keyboard user at the top of the document. await expect(page.locator('.maka-module-page-rows > li button:focus')).toHaveCount(1); }); - diff --git a/apps/desktop/e2e/storage-root-conflict.spec.ts b/apps/desktop/e2e/storage-root-conflict.spec.ts index c6c288cd7b..72c27abd53 100644 --- a/apps/desktop/e2e/storage-root-conflict.spec.ts +++ b/apps/desktop/e2e/storage-root-conflict.spec.ts @@ -11,9 +11,10 @@ const DESKTOP_ROOT = process.cwd(); /** * Startup signal the main process prints synchronously right before showing - * the repair modal (see `confirmDesktopStorageRootRepair` in boot.ts). It is + * the repair modal (see `confirmDesktopStorageRootRepair` in + * `runtime-host-boot.ts`). It is * an explicit contract between the app and this test: it can only be printed - * after `ready` — the whole boot module runs inside the `whenReady` callback — + * after `ready` — startup runs inside the `whenReady` callback — * and only when the root-identity gate fired, so seeing it proves both * invariants at once. * diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 0029c93ae9..e650213f7e 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -55,7 +55,6 @@ "@maka/ui": "0.1.0", "@xterm/addon-fit": "^0.11.0", "@xterm/xterm": "^6.0.0", - "ai": "^7.0.31", "electron-updater": "^6.8.9", "qrcode": "^1.5.4", "react": "^19.2.1", diff --git a/apps/desktop/src/main/__tests__/agent-settings-tools.test.ts b/apps/desktop/src/main/__tests__/agent-settings-tools.test.ts deleted file mode 100644 index c3bb924c91..0000000000 --- a/apps/desktop/src/main/__tests__/agent-settings-tools.test.ts +++ /dev/null @@ -1,193 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { createDefaultSettings, mergeSettings, type AppSettings } from '@maka/core'; -import type { MakaTool, MakaToolContext } from '@maka/runtime'; -import type { z } from 'zod'; -import { - buildAgentSettingsTools, - MAKA_SETTINGS_GET_TOOL_NAME, - MAKA_SETTINGS_UPDATE_TOOL_NAME, -} from '../agent-settings-tools.js'; - -function fixture() { - let settings = createDefaultSettings(); - const patches: unknown[] = []; - const tools = buildAgentSettingsTools({ - settingsStore: { get: async () => settings }, - updateSettings: async (patch) => { - patches.push(structuredClone(patch)); - settings = mergeSettings(settings, patch); - return settings; - }, - }); - return { - tools, - patches, - readSettings: () => settings, - replaceSettings: (next: AppSettings) => { - settings = next; - }, - }; -} - -function toolByName(tools: MakaTool[], name: string): MakaTool { - const tool = tools.find((candidate) => candidate.name === name); - if (!tool) throw new Error(`Missing tool ${name}`); - return tool; -} - -function context( - answer?: string | null, - capture?: { questions?: unknown }, -): MakaToolContext { - return { - sessionId: 'session-1', - turnId: 'turn-1', - cwd: '/tmp', - toolCallId: 'tool-call-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - ...(answer !== undefined - ? { - askUserQuestion: async (questions) => { - if (capture) capture.questions = questions; - return { - answers: questions.map((question) => ({ - question: question.question, - answer, - })), - }; - }, - } - : {}), - }; -} - -describe('Agent settings tools', () => { - it('registers a replay-safe read tool and an exclusive confirmed update tool', () => { - const { tools } = fixture(); - const getTool = toolByName(tools, MAKA_SETTINGS_GET_TOOL_NAME); - const updateTool = toolByName(tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - - assert.equal(getTool.categoryHint, 'read'); - assert.equal(getTool.recoveryMode, 'replay_safe'); - assert.equal(updateTool.categoryHint, 'custom_tool'); - assert.equal(updateTool.recoveryMode, 'never_auto_retry'); - assert.equal(updateTool.executionSemantics, 'exclusive_step'); - }); - - it('returns only the non-secret settings projection', async () => { - const h = fixture(); - h.replaceSettings( - mergeSettings(h.readSettings(), { - network: { proxy: { password: 'proxy-secret' } }, - webSearch: { providers: { tavily: { apiKey: 'tavily-secret' } } }, - personalization: { displayName: 'cc', assistantTone: 'concise' }, - }), - ); - const getTool = toolByName(h.tools, MAKA_SETTINGS_GET_TOOL_NAME); - const result = await getTool.impl({}, context()); - const serialized = JSON.stringify(result); - - assert.deepEqual((result as { personalization: unknown }).personalization, { - displayName: 'cc', - assistantTone: 'concise', - uiLocale: 'auto', - }); - assert.doesNotMatch(serialized, /proxy-secret|tavily-secret/); - assert.doesNotMatch(serialized, /apiKey|token|password|openGateway|network/); - }); - - it('rejects non-allowlisted sections at the schema boundary', () => { - const updateTool = toolByName(fixture().tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - const schema = updateTool.parameters as z.ZodType; - - assert.equal(schema.safeParse({ openGateway: { enabled: true } }).success, false); - assert.equal(schema.safeParse({ chatDefaults: { permissionMode: 'bypass' } }).success, false); - assert.equal(schema.safeParse({ webSearch: { apiKey: 'secret' } }).success, false); - }); - - it('asks for confirmation, then persists the exact allowlisted patch', async () => { - const h = fixture(); - const capture: { questions?: unknown } = {}; - const updateTool = toolByName(h.tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - const result = (await updateTool.impl( - { - appearance: { theme: 'dark' }, - personalization: { assistantTone: 'Be direct.' }, - system: { keepSystemAwake: true }, - }, - context('Apply changes', capture), - )) as { ok: boolean; applied: boolean; changes: string[] }; - - assert.equal(result.ok, true); - assert.equal(result.applied, true); - assert.deepEqual(h.patches, [ - { - appearance: { theme: 'dark' }, - personalization: { assistantTone: 'Be direct.' }, - system: { keepSystemAwake: true }, - }, - ]); - assert.equal(h.readSettings().appearance.theme, 'dark'); - assert.equal(h.readSettings().personalization.assistantTone, 'Be direct.'); - assert.equal(h.readSettings().system.keepSystemAwake, true); - assert.match(JSON.stringify(capture.questions), /appearance\.theme/); - assert.match(JSON.stringify(capture.questions), /system\.keepSystemAwake/); - }); - - it('does not write when the user cancels', async () => { - const h = fixture(); - const updateTool = toolByName(h.tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - const result = (await updateTool.impl( - { notifications: { runComplete: false } }, - context('Cancel'), - )) as { ok: boolean; applied: boolean; reason: string }; - - assert.deepEqual(result, { - kind: 'maka_settings_update', - ok: true, - applied: false, - reason: 'cancelled', - message: 'Maka settings were not changed.', - settings: { - appearance: { theme: 'auto', palette: 'default' }, - personalization: { displayName: '', assistantTone: '', uiLocale: 'auto' }, - localMemory: { enabled: true, agentReadEnabled: false }, - workspaceInstructions: { enabled: true }, - privacy: { incognitoActive: false }, - notifications: { runComplete: true }, - system: { keepSystemAwake: false }, - webSearch: { enabled: false }, - }, - }); - assert.deepEqual(h.patches, []); - }); - - it('skips confirmation and writing when every requested value is unchanged', async () => { - const h = fixture(); - const updateTool = toolByName(h.tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - const result = (await updateTool.impl( - { appearance: { theme: 'auto' }, notifications: { runComplete: true } }, - context(), - )) as { ok: boolean; applied: boolean }; - - assert.equal(result.ok, true); - assert.equal(result.applied, false); - assert.deepEqual(h.patches, []); - }); - - it('fails closed when the current surface cannot ask for confirmation', async () => { - const h = fixture(); - const updateTool = toolByName(h.tools, MAKA_SETTINGS_UPDATE_TOOL_NAME); - const result = (await updateTool.impl( - { webSearch: { enabled: true } }, - context(), - )) as { ok: boolean; applied: boolean; reason: string }; - - assert.equal(result.ok, false); - assert.equal(result.applied, false); - assert.equal(result.reason, 'confirmation_unavailable'); - assert.deepEqual(h.patches, []); - }); -}); diff --git a/apps/desktop/src/main/__tests__/antigravity-subscription-service.test.ts b/apps/desktop/src/main/__tests__/antigravity-subscription-service.test.ts deleted file mode 100644 index bed8580d11..0000000000 --- a/apps/desktop/src/main/__tests__/antigravity-subscription-service.test.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { - ANTIGRAVITY_MISSING_CLIENT_ID_ENVELOPE, - ANTIGRAVITY_OAUTH_CONFIG, - GOOGLE_CLIENT_ID, - buildAntigravityAuthorizationUrl, -} from '../oauth/antigravity-subscription-helpers.js'; -import { AntigravitySubscriptionService } from '../oauth/antigravity-subscription-service.js'; - -describe('Antigravity subscription preview', () => { - it('keeps the unconfigured preview on the standard Google PKCE flow', () => { - assert.equal(GOOGLE_CLIENT_ID, ''); - assert.equal(ANTIGRAVITY_OAUTH_CONFIG.status, 'preview'); - assert.equal(ANTIGRAVITY_OAUTH_CONFIG.hasClientId, false); - - const url = new URL( - buildAntigravityAuthorizationUrl({ - clientId: 'fixture-client', - authorizeEndpoint: ANTIGRAVITY_OAUTH_CONFIG.authUrl, - redirectUri: ANTIGRAVITY_OAUTH_CONFIG.redirectUri, - scope: ANTIGRAVITY_OAUTH_CONFIG.scopes, - state: 'pinned-state', - challenge: 'pinned-challenge', - }), - ); - assert.equal(url.origin, 'https://accounts.google.com'); - assert.equal(url.searchParams.get('response_type'), 'code'); - assert.equal(url.searchParams.get('access_type'), 'offline'); - assert.equal(url.searchParams.get('prompt'), 'consent'); - assert.equal(url.searchParams.get('code_challenge_method'), 'S256'); - assert.equal(url.searchParams.get('state'), 'pinned-state'); - }); - - it('fails closed through the public API while no client id is bundled', async () => { - const service = new AntigravitySubscriptionService({ - userDataDir: '/unused', - openExternal: async () => undefined, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - }); - - const result = await service.getAuthorizationUrl(); - assert.deepEqual(result, ANTIGRAVITY_MISSING_CLIENT_ID_ENVELOPE); - assert.equal(result.ok, false); - assert.match(result.message, /Google client_id/); - }); -}); diff --git a/apps/desktop/src/main/__tests__/attachment-preview.test.ts b/apps/desktop/src/main/__tests__/attachment-preview.test.ts index 965a1f2e84..bdb2be157b 100644 --- a/apps/desktop/src/main/__tests__/attachment-preview.test.ts +++ b/apps/desktop/src/main/__tests__/attachment-preview.test.ts @@ -95,7 +95,7 @@ describe('staged attachment preview (approval source)', () => { assert.equal(read, 0); }); - it('wires the shared IPC registration both execution modes reuse', async () => { + it('registers the client-owned attachment preview IPC boundary', async () => { const approvals = createAttachmentApprovalRegistry(); const [issued] = approvals.issueApprovals(7, [ { path: '/tmp/shot.png', name: 'shot.png', mimeType: 'image/png', size: PNG.byteLength }, diff --git a/apps/desktop/src/main/__tests__/automation-canfire.test.ts b/apps/desktop/src/main/__tests__/automation-canfire.test.ts deleted file mode 100644 index 5b1079bd2a..0000000000 --- a/apps/desktop/src/main/__tests__/automation-canfire.test.ts +++ /dev/null @@ -1,74 +0,0 @@ -/** - * evaluateAutomationCanFire — the kind-aware fire gate. - * - * Regression coverage for the P1 durability bug: a cron must keep firing even - * after the conversation that created it is archived, deleted, or gone after a - * restart (cron spawns a FRESH session, so its creator session is irrelevant). - * Heartbeats stay gated on their own session; incognito blocks everything. - */ - -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { evaluateAutomationCanFire } from '../automation-wiring.js'; - -const IDLE = new Set(['active', 'done', 'waiting_for_user']); -const cron = { kind: 'cron' as const, sessionId: 'creator' }; -const beat = { kind: 'heartbeat' as const, sessionId: 'own' }; - -function deps(over: Partial[1]> = {}) { - return { - isIncognitoActive: async () => false, - readSessionHeader: async () => ({ status: 'active' as string, archivedAt: null as number | null }), - idleStatuses: IDLE, - ...over, - }; -} - -describe('evaluateAutomationCanFire — kind-aware fire gate', () => { - it('cron fires regardless of its creator session (archived)', async () => { - const d = deps({ readSessionHeader: async () => ({ status: 'active', archivedAt: 123 }) }); - assert.equal(await evaluateAutomationCanFire(cron, d), true); - }); - - it('cron fires even when its creator session was DELETED (readHeader throws)', async () => { - const d = deps({ readSessionHeader: async () => { throw new Error('ENOENT'); } }); - assert.equal(await evaluateAutomationCanFire(cron, d), true); - }); - - it('cron never reads the session header at all', async () => { - let read = false; - const d = deps({ readSessionHeader: async () => { read = true; return { status: 'active', archivedAt: null }; } }); - await evaluateAutomationCanFire(cron, d); - assert.equal(read, false); - }); - - it('incognito blocks cron', async () => { - assert.equal(await evaluateAutomationCanFire(cron, deps({ isIncognitoActive: async () => true })), false); - }); - - it('incognito blocks heartbeat', async () => { - assert.equal(await evaluateAutomationCanFire(beat, deps({ isIncognitoActive: async () => true })), false); - }); - - it('heartbeat fires into an idle (active/done/waiting_for_user) session', async () => { - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'active', archivedAt: null }) })), true); - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'done', archivedAt: null }) })), true); - // #639 decision: waiting_for_user is the wakeup's HOME scenario — the - // heartbeat starts a turn in place of the user. - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'waiting_for_user', archivedAt: null }) })), true); - }); - - it('heartbeat does NOT fire into a busy/blocked session', async () => { - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'running', archivedAt: null }) })), false); - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'blocked', archivedAt: null }) })), false); - }); - - it('heartbeat does NOT fire into an archived or missing session', async () => { - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => ({ status: 'active', archivedAt: 1 }) })), false); - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => null })), false); - }); - - it('heartbeat does NOT fire when its session was deleted (readHeader throws)', async () => { - assert.equal(await evaluateAutomationCanFire(beat, deps({ readSessionHeader: async () => { throw new Error('ENOENT'); } })), false); - }); -}); diff --git a/apps/desktop/src/main/__tests__/automation-cron-lifecycle.test.ts b/apps/desktop/src/main/__tests__/automation-cron-lifecycle.test.ts deleted file mode 100644 index 80618c37ea..0000000000 --- a/apps/desktop/src/main/__tests__/automation-cron-lifecycle.test.ts +++ /dev/null @@ -1,99 +0,0 @@ -/** - * End-to-end (no Electron): a durable cron keeps firing through the REAL manager - * + scheduler + the REAL kind-aware canFire gate, even after its creator session - * is archived/deleted — while a heartbeat in the same archived session does not. - * - * This ties the P1 fix together: evaluateAutomationCanFire (cron ignores its - * creator session) → AutomationScheduler actually dispatches the cron. - */ - -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { AutomationManager, AutomationScheduler, type AutomationDefinition } from '@maka/runtime'; -import { evaluateAutomationCanFire } from '../automation-wiring.js'; - -const IDLE = new Set(['active', 'done', 'waiting_for_user']); - -function harness(opts: { sessionArchived: boolean; incognito?: boolean }) { - let time = 1_700_000_000_000; - let idc = 0; - const timers: Array<{ fn: () => void; id: number }> = []; - let timerId = 0; - const freshRuns: string[] = []; - const injected: string[] = []; - - const manager = new AutomationManager({ generateId: () => `a-${++idc}`, now: () => time, random: () => 0 }); - - const scheduler = new AutomationScheduler({ - automationManager: manager, - // The REAL kind-aware gate. The creator session is "archived" (or gone). - canFire: (automation: AutomationDefinition) => evaluateAutomationCanFire(automation, { - isIncognitoActive: async () => opts.incognito === true, - readSessionHeader: async () => - opts.sessionArchived ? { status: 'active', archivedAt: time } : { status: 'active', archivedAt: null }, - idleStatuses: IDLE, - }), - injectTurn: async (_s, _p, id) => { injected.push(id); return { runId: `h-${id}`, ok: true }; }, - createFreshRun: async (_p, id) => { freshRuns.push(id); return { runId: `c-${id}`, ok: true }; }, - setTimeout: (fn) => { const id = ++timerId; timers.push({ fn, id }); return id; }, - clearTimeout: (t) => { const i = timers.findIndex(x => x.id === t); if (i >= 0) timers.splice(i, 1); }, - now: () => time, - }); - - return { - manager, scheduler, freshRuns, injected, - advance: (ms: number) => { time += ms; }, - async tick() { const t = timers.shift(); if (t) t.fn(); for (let i = 0; i < 8; i++) await Promise.resolve(); await new Promise(r => setTimeout(r, 0)); }, - }; -} - -describe('E2E: durable cron fires after its creator session is archived', () => { - it('cron fires even though the creating conversation is archived', async () => { - const h = harness({ sessionArchived: true }); - const cron = h.manager.create({ - kind: 'cron', name: 'nightly', prompt: 'run it', - sessionId: 'archived-conversation', schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in cron)); - - h.advance(31_000); - h.scheduler.start(); - await h.tick(); - - assert.equal(h.freshRuns.length, 1, 'cron should fire despite the archived creator session'); - h.scheduler.dispose(); - }); - - it('a heartbeat in the same archived session does NOT fire', async () => { - const h = harness({ sessionArchived: true }); - const beat = h.manager.create({ - kind: 'heartbeat', name: 'poll', prompt: 'check', - sessionId: 'archived-conversation', schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in beat)); - - h.advance(31_000); - h.scheduler.start(); - // canFire=false → defers, never injects. Tick a few times to be sure. - await h.tick(); await h.tick(); await h.tick(); - - assert.equal(h.injected.length, 0, 'heartbeat must not fire into an archived session'); - h.scheduler.dispose(); - }); - - it('incognito blocks the cron too', async () => { - const h = harness({ sessionArchived: false, incognito: true }); - const cron = h.manager.create({ - kind: 'cron', name: 'nightly', prompt: 'run it', - sessionId: 's', schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in cron)); - - h.advance(31_000); - h.scheduler.start(); - await h.tick(); - - assert.equal(h.freshRuns.length, 0, 'cron must not fire while incognito is active'); - h.scheduler.dispose(); - }); -}); diff --git a/apps/desktop/src/main/__tests__/automation-persistence-e2e.test.ts b/apps/desktop/src/main/__tests__/automation-persistence-e2e.test.ts deleted file mode 100644 index d0ef6df773..0000000000 --- a/apps/desktop/src/main/__tests__/automation-persistence-e2e.test.ts +++ /dev/null @@ -1,214 +0,0 @@ -/** - * End-to-end: durable cron persistence + cross-session query/management. - * - * Exercises the real host wiring against the operational SQLite authority, - * simulating an app restart: - * - * session A creates a durable cron ──sync──► runtime.sqlite - * (restart: a fresh wiring loads it) ◄──loadAll───────┘ - * session B (never saw it) lists / pauses / resumes / deletes it - * - * This is the query-and-persistence loop the reviewer asked for: a persisted - * cron is not just fireable after restart, it stays visible and manageable - * from a brand-new session. Nothing here is mocked except the fire executors - * (we assert on persisted state, not on runs). - */ - -import { strict as assert } from 'node:assert'; -import { describe, it, before, after } from 'node:test'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import type { MakaToolContext, MakaTool } from '@maka/runtime'; -import { createAutomationStore } from '@maka/storage'; -import { createMainAutomationWiring } from '../automation-wiring.js'; - -function ctx(sessionId: string): MakaToolContext { - return { - sessionId, - turnId: 'turn-1', - cwd: '/tmp', - toolCallId: 'tc-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; -} - -function makeWiring(workspaceRoot: string) { - return createMainAutomationWiring({ - workspaceRoot, - canFire: async () => true, - injectTurn: async () => ({ runId: 'run', ok: true }), - // Presence of createFreshRun is what advertises the cron kind to the tool. - createFreshRun: async () => ({ runId: 'run', ok: true }), - }); -} - -/** A cron-DISABLED host (heartbeat-only), like the `maka` CLI — no createFreshRun. */ -function makeCronDisabledWiring(workspaceRoot: string) { - return createMainAutomationWiring({ - workspaceRoot, - canFire: async () => true, - injectTurn: async () => ({ runId: 'run', ok: true }), - // createFreshRun omitted → cron disabled → must not persist/adopt durable state. - }); -} - -function automationTool(wiring: ReturnType): MakaTool { - return wiring.tools[0]; -} - -async function readStore(workspaceRoot: string): Promise> { - return (await createAutomationStore(workspaceRoot).loadAll()).map(({ id, name }) => ({ - id, - name, - })); -} - -/** Store sync is fire-and-forget; poll the authority until it settles. */ -async function waitForStore( - workspaceRoot: string, - predicate: (rows: Array<{ id: string; name: string }>) => boolean, - timeoutMs = 2000, -): Promise> { - const deadline = Date.now() + timeoutMs; - for (;;) { - const rows = await readStore(workspaceRoot); - if (predicate(rows)) return rows; - if (Date.now() >= deadline) return rows; - await new Promise((r) => setTimeout(r, 25)); - } -} - -describe('E2E: durable cron persistence + cross-session query/management', () => { - let workspaceRoot: string; - - before(async () => { - workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-automation-e2e-')); - }); - after(async () => { - await rm(workspaceRoot, { recursive: true, force: true }); - }); - - it('a durable cron created in one session is queryable and manageable from a fresh session after restart', async () => { - const SESSION_A = 'session-A-original'; - const SESSION_B = 'session-B-after-restart'; - - // ── session A: create a durable cron via the real Automation tool ────── - const wiring1 = makeWiring(workspaceRoot); - const created = await automationTool(wiring1).impl({ - mode: 'create', - kind: 'cron', - name: 'nightly backup', - prompt: 'run the nightly backup', - schedule: { type: 'cron', expression: '0 3 * * *' }, - }, ctx(SESSION_A)) as string; - assert.ok(created.includes('Automation created'), created); - // cron defaults to durable, so it must be advertised as such. - assert.ok(created.includes('durable'), created); - - // ── it reaches disk (persistence) ───────────────────────────────────── - const persisted = await waitForStore(workspaceRoot, (rows) => rows.some((r) => r.name === 'nightly backup')); - assert.equal(persisted.length, 1); - assert.equal(persisted[0].name, 'nightly backup'); - const cronId = persisted[0].id; - - // ── restart: a fresh wiring loads the persisted cron from disk ───────── - const wiring2 = makeWiring(workspaceRoot); - await wiring2.loadDurableAutomations(); - - // ── session B (never saw the cron): query it ────────────────────────── - const listed = await automationTool(wiring2).impl({ mode: 'list' }, ctx(SESSION_B)) as string; - assert.ok(listed.includes('nightly backup'), `session B should see the persisted cron:\n${listed}`); - assert.ok(listed.includes(cronId), listed); - - // ── session B: manage it (pause → resume → delete) ──────────────────── - const paused = await automationTool(wiring2).impl({ mode: 'pause', id: cronId }, ctx(SESSION_B)) as string; - assert.ok(paused.includes('paused'), paused); - assert.equal(wiring2.manager.get(cronId)?.status, 'paused'); - - const resumed = await automationTool(wiring2).impl({ mode: 'resume', id: cronId }, ctx(SESSION_B)) as string; - assert.ok(resumed.includes('resumed'), resumed); - assert.equal(wiring2.manager.get(cronId)?.status, 'active'); - - const deleted = await automationTool(wiring2).impl({ mode: 'delete', id: cronId }, ctx(SESSION_B)) as string; - assert.ok(deleted.toLowerCase().includes('delet'), deleted); - assert.equal(wiring2.manager.get(cronId), undefined); - - // ── the deletion is durable too: disk no longer holds it ────────────── - const afterDelete = await waitForStore(workspaceRoot, (rows) => rows.every((r) => r.id !== cronId)); - assert.ok(afterDelete.every((r) => r.id !== cronId), 'deleted cron must be gone from disk'); - - wiring1.scheduler.dispose(); - wiring2.scheduler.dispose(); - }); - - it('a non-durable heartbeat does NOT leak into another session and is not persisted', async () => { - const ws = await mkdtemp(join(tmpdir(), 'maka-automation-e2e-hb-')); - try { - const wiring = makeWiring(ws); - const created = await automationTool(wiring).impl({ - mode: 'create', - kind: 'heartbeat', - name: 'poll status', - prompt: 'check status', - schedule: { type: 'interval', seconds: 60 }, - }, ctx('owner-session')) as string; - assert.ok(created.includes('Automation created'), created); - - // A different session cannot see or manage the session-private heartbeat. - const listedElsewhere = await automationTool(wiring).impl({ mode: 'list' }, ctx('stranger-session')) as string; - assert.ok(listedElsewhere.includes('No automations'), listedElsewhere); - - // And it never hits disk (non-durable). - const rows = await waitForStore(ws, () => false, 300); // give sync a chance, expect empty - assert.equal(rows.length, 0, 'a non-durable heartbeat must not be persisted'); - - wiring.scheduler.dispose(); - } finally { - await rm(ws, { recursive: true, force: true }); - } - }); -}); - -describe('E2E: a cron-disabled host (CLI) sharing the workspace never clobbers durable crons', () => { - it('a heartbeat-only wiring neither loads nor overwrites durable Automations', async () => { - const ws = await mkdtemp(join(tmpdir(), 'maka-automation-clobber-')); - try { - // ── owner (cron-enabled, desktop) creates a durable cron ────────────── - const owner = makeWiring(ws); - await automationTool(owner).impl({ - mode: 'create', kind: 'cron', name: 'daily backup', prompt: 'back up', - schedule: { type: 'cron', expression: '0 3 * * *' }, - }, ctx('desktop-session')) as string; - const persisted = await waitForStore(ws, (rows) => rows.some(r => r.name === 'daily backup')); - assert.equal(persisted.length, 1); - owner.scheduler.dispose(); - - // ── a cron-disabled host (CLI) boots on the SAME workspace ──────────── - const cli = makeCronDisabledWiring(ws); - // It must not adopt the cron it cannot run. - await cli.loadDurableAutomations(); - assert.equal(cli.manager.listAll().length, 0, 'cron-disabled host must not load crons it cannot run'); - - // It creates a heartbeat and manages it — all the activity that would - // trigger a durable sync on a cron-enabled host. - await automationTool(cli).impl({ - mode: 'create', kind: 'heartbeat', name: 'poll', prompt: 'p', - schedule: { type: 'interval', seconds: 60 }, - }, ctx('cli-session')) as string; - const listed = await automationTool(cli).impl({ mode: 'list' }, ctx('cli-session')) as string; - const idMatch = listed.match(/ID: ([a-f0-9-]+)/i); - if (idMatch) await automationTool(cli).impl({ mode: 'delete', id: idMatch[1] }, ctx('cli-session')) as string; - - // Give any (erroneous) sync a chance to land, then assert the owner's cron - // is STILL on disk, untouched. - await new Promise(r => setTimeout(r, 200)); - const after = await readStore(ws); - assert.deepEqual(after.map(r => r.name), ['daily backup'], 'CLI must not overwrite/erase the desktop\'s durable cron'); - cli.scheduler.dispose(); - } finally { - await rm(ws, { recursive: true, force: true }); - } - }); -}); diff --git a/apps/desktop/src/main/__tests__/bot-incoming-goal-lifecycle.test.ts b/apps/desktop/src/main/__tests__/bot-incoming-goal-lifecycle.test.ts deleted file mode 100644 index 5480d44407..0000000000 --- a/apps/desktop/src/main/__tests__/bot-incoming-goal-lifecycle.test.ts +++ /dev/null @@ -1,146 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import type { BotIncomingMessage, BotRegistry, SessionManager } from '@maka/runtime'; -import { - GoalContinuationCoordinator, - GoalManager, - SessionActivityRegistry, -} from '@maka/runtime'; -import type { SessionEvent } from '@maka/core'; -import { createBotIncomingMainService } from '../bot-incoming-main.js'; -import { createEmbeddedBotSessionAdapter } from '../embedded-bot-session-adapter.js'; -import { startDesktopSessionTurn } from '../session-turn-stream.js'; - -const SESSION_ID = 'bot-session'; - -async function waitFor(condition: () => boolean, message: string): Promise { - const deadline = Date.now() + 1_000; - while (!condition()) { - if (Date.now() >= deadline) assert.fail(message); - await new Promise((resolve) => setImmediate(resolve)); - } -} - -describe('bot incoming Goal lifecycle', () => { - test('settles a bot turn through the Desktop activity and Goal boundary', async () => { - let now = 1; - const manager = new GoalManager({ - generateId: () => 'goal-1', - now: () => now++, - }); - const coordinator = new GoalContinuationCoordinator({ - goalManager: manager, - evaluator: { - evaluate: async () => JSON.stringify({ - met: true, - impossible: false, - progress: true, - waiting: false, - reason: 'bot result verified', - }), - }, - getRecentContext: async () => 'bot result exists', - admitTurn: () => assert.fail('an achieved Goal must not admit another turn'), - }); - manager.create(SESSION_ID, 'bot result is verified'); - const activities = new SessionActivityRegistry(); - const replies: string[] = []; - let runnerCalls = 0; - let observedTurnId = ''; - - const runtime = { - async createSession() { - return { id: SESSION_ID }; - }, - sendMessage(_sessionId: string, input: { turnId: string }) { - observedTurnId = input.turnId; - return (async function* (): AsyncIterable { - yield { - type: 'text_complete', id: 'text', turnId: input.turnId, ts: now++, - messageId: 'assistant', text: 'Bot reply', - }; - yield { - type: 'complete', id: 'complete', turnId: input.turnId, ts: now++, - stopReason: 'end_turn', - }; - })(); - }, - } as unknown as SessionManager; - - const service = createBotIncomingMainService({ - botRegistry: { - async sendMessage(_platform: string, _chatId: string, text: string) { - replies.push(text); - return 'bot-message-1'; - }, - async sendTypingIndicator() { - return true; - }, - } as unknown as BotRegistry, - sessions: createEmbeddedBotSessionAdapter({ - runtime, - createSession: (input) => - runtime.createSession({ ...input, cwd: input.cwd ?? '/repo' }), - getDefaultConnectionSlug: async () => 'provider', - getReadyConnection: async () => ({ - connection: { slug: 'provider' }, - model: 'model', - }), - readSessionHeader: async () => ({ - permissionMode: 'explore', - isArchived: false, - status: 'active', - }), - ensureSessionCanSend: async () => {}, - emitSessionsChanged() {}, - async runAgentTurn(input) { - runnerCalls++; - const started = startDesktopSessionTurn({ - sessionId: input.sessionId, - events: input.iterator, - turnId: input.turnId, - goalBoundary: 'external', - activities, - beginObservedTurn: (sessionId, turnId) => - coordinator.beginObservedTurn(sessionId, turnId), - onEvent: input.onEvent, - onStreamError: (error) => { - assert.fail(String(error)); - }, - onDrained: () => {}, - }); - assert.equal(started.kind, 'started'); - const outcome = await started.completion; - return { - outcome, - ...(outcome.kind === 'errored' || outcome.kind === 'suspended' - ? { error: outcome.reason } - : {}), - }; - }, - }), - }); - - await service.handleBotIncomingMessage({ - platform: 'telegram', - userId: 'user', - userName: 'User', - chatId: 'chat', - isGroup: false, - text: 'verify the result', - sourceMessageId: 'source', - receivedAt: now++, - } as BotIncomingMessage); - - await waitFor(() => manager.get(SESSION_ID)?.status === 'achieved', 'bot turn did not settle its Goal'); - await waitFor(() => replies.length === 1, 'bot reply was not delivered'); - assert.equal(runnerCalls, 1); - assert.ok(observedTurnId); - assert.equal(activities.whenIdle(SESSION_ID), undefined); - assert.deepEqual(replies, ['Bot reply']); - - coordinator.dispose(); - manager.dispose(); - }); - -}); diff --git a/apps/desktop/src/main/__tests__/bot-incoming-project-cwd.test.ts b/apps/desktop/src/main/__tests__/bot-incoming-project-cwd.test.ts index c8283744d7..7af35a9357 100644 --- a/apps/desktop/src/main/__tests__/bot-incoming-project-cwd.test.ts +++ b/apps/desktop/src/main/__tests__/bot-incoming-project-cwd.test.ts @@ -1,12 +1,11 @@ import { strict as assert } from 'node:assert'; import { describe, it } from 'node:test'; -import type { BotIncomingMessage, BotRegistry, SessionManager } from '@maka/runtime'; +import type { BotIncomingMessage, BotRegistry } from '@maka/runtime'; import { createBotIncomingMainService } from '../bot-incoming-main.js'; -import { createEmbeddedBotSessionAdapter } from '../embedded-bot-session-adapter.js'; describe('bot incoming new-session cwd', () => { it('leaves the cwd to the shared desktop session resolver', async () => { - let capturedCwd: unknown = undefined; + let createInput: unknown; const service = createBotIncomingMainService({ botRegistry: { async sendMessage() {}, @@ -17,27 +16,18 @@ describe('bot incoming new-session cwd', () => { return true; }, } as unknown as BotRegistry, - sessions: createEmbeddedBotSessionAdapter({ - runtime: {} as SessionManager, - // createSession captures the cwd it was given, then throws to - // short-circuit before the streaming / typing path runs. + sessions: { async createSession(input) { - capturedCwd = input.cwd; + createInput = input; throw new Error('__short_circuit_after_create__'); }, - getDefaultConnectionSlug: async () => 'slug', - getReadyConnection: async () => ({ connection: { slug: 'slug' }, model: 'm' }), - readSessionHeader: async () => ({ - permissionMode: 'ask', - isArchived: false, - status: 'active', - }), - ensureSessionCanSend: async () => {}, - emitSessionsChanged() {}, - async runAgentTurn() { - throw new Error('runAgentTurn must not be reached'); + async prepareSession() { + throw new Error('prepareSession must not be reached'); }, - }), + async runTurn() { + throw new Error('runTurn must not be reached'); + }, + }, }); await service.handleBotIncomingMessage({ @@ -51,6 +41,9 @@ describe('bot incoming new-session cwd', () => { receivedAt: Date.now(), } as unknown as BotIncomingMessage); - assert.equal(capturedCwd, undefined); + assert.deepEqual(createInput, { + name: 'Telegram 对话', + labels: ['bot', 'telegram'], + }); }); }); diff --git a/apps/desktop/src/main/__tests__/bot-incoming-session-lifecycle.test.ts b/apps/desktop/src/main/__tests__/bot-incoming-session-lifecycle.test.ts index b0b1c1967c..00e1851907 100644 --- a/apps/desktop/src/main/__tests__/bot-incoming-session-lifecycle.test.ts +++ b/apps/desktop/src/main/__tests__/bot-incoming-session-lifecycle.test.ts @@ -1,10 +1,8 @@ import assert from 'node:assert/strict'; import { describe, test } from 'node:test'; -import type { BotIncomingMessage, BotRegistry, SessionManager } from '@maka/runtime'; -import type { SessionEvent } from '@maka/core'; +import type { BotIncomingMessage, BotRegistry } from '@maka/runtime'; import { createBotIncomingMainService } from '../bot-incoming-main.js'; -import { createEmbeddedBotSessionAdapter } from '../embedded-bot-session-adapter.js'; -import { SessionLifecycleError } from '../session-lifecycle.js'; +import { BotSessionUnavailableError } from '../bot-session-adapter.js'; async function waitFor(predicate: () => boolean): Promise { const deadline = Date.now() + 1_000; @@ -20,28 +18,24 @@ describe('bot session lifecycle bindings', () => { const sent: string[] = []; const replies: string[] = []; let ensureCalls = 0; - const runtime = { + const sessions = { async createSession() { const id = `bot-session-${created.length + 1}`; created.push(id); - return { id }; + return id; }, - async setPermissionMode() {}, - sendMessage(sessionId: string, input: { turnId: string }) { + async prepareSession(sessionId: string) { + ensureCalls += 1; + if (sessionId === 'bot-session-1' && ensureCalls === 1) { + throw new BotSessionUnavailableError('archived'); + } + return 'ready' as const; + }, + async runTurn({ sessionId }: { sessionId: string }) { sent.push(sessionId); - return (async function* (): AsyncIterable { - yield { - type: 'text_complete', - id: `text-${sessionId}`, - turnId: input.turnId, - ts: Date.now(), - messageId: `message-${sessionId}`, - text: `reply from ${sessionId}`, - }; - yield { type: 'complete', id: `complete-${sessionId}`, turnId: input.turnId, ts: Date.now(), stopReason: 'end_turn' }; - })(); + return { kind: 'completed' as const, text: `reply from ${sessionId}` }; }, - } as unknown as SessionManager; + }; const service = createBotIncomingMainService({ botRegistry: { @@ -53,32 +47,7 @@ describe('bot session lifecycle bindings', () => { return true; }, } as unknown as BotRegistry, - sessions: createEmbeddedBotSessionAdapter({ - runtime, - createSession: (input) => - runtime.createSession({ ...input, cwd: input.cwd ?? '/repo' }), - getDefaultConnectionSlug: async () => 'provider', - getReadyConnection: async () => ({ - connection: { slug: 'provider' }, - model: 'model', - }), - readSessionHeader: async () => ({ - permissionMode: 'explore', - isArchived: false, - status: 'active', - }), - ensureSessionCanSend: async (sessionId) => { - ensureCalls += 1; - if (sessionId === 'bot-session-1' && ensureCalls === 2) { - throw new SessionLifecycleError('archived'); - } - }, - emitSessionsChanged() {}, - runAgentTurn: async ({ iterator, turnId, onEvent }) => { - for await (const event of iterator) onEvent(event); - return { outcome: { kind: 'completed', turnId } } as never; - }, - }), + sessions, }); const base = { diff --git a/apps/desktop/src/main/__tests__/bot-status-persistence.test.ts b/apps/desktop/src/main/__tests__/bot-status-persistence.test.ts deleted file mode 100644 index 2bd05fa837..0000000000 --- a/apps/desktop/src/main/__tests__/bot-status-persistence.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import type { BotStatus } from '@maka/runtime'; -import { deriveBotStatusPersistenceUpdate } from '../bot-status-persistence.js'; - -function status(readiness: BotStatus['readiness'], reason?: string): BotStatus { - return { - platform: 'telegram', - running: true, - readiness, - reason, - connection: 'polling', - }; -} - -describe('Bot status persistence', () => { - it('persists a changed degraded reason without requiring a readiness transition', () => { - const update = deriveBotStatusPersistenceUpdate( - status('degraded', 'rate-limited'), - status('degraded', 'send-failed'), - ); - - assert.match(update?.lastError ?? '', /发送失败/); - }); - - it('does not rewrite an unchanged degraded status', () => { - assert.equal( - deriveBotStatusPersistenceUpdate( - status('degraded', 'send-failed'), - status('degraded', 'send-failed'), - ), - undefined, - ); - }); - - it('clears the persisted error after recovery', () => { - assert.deepEqual( - deriveBotStatusPersistenceUpdate( - status('degraded', 'send-failed'), - status('operational'), - ), - { lastError: undefined }, - ); - }); - - it('clears a persisted error when operational state is re-established after restart', () => { - assert.deepEqual( - deriveBotStatusPersistenceUpdate( - status('credentials_valid'), - status('operational'), - ), - { lastError: undefined }, - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/bundled-skill-catalog.test.ts b/apps/desktop/src/main/__tests__/bundled-skill-catalog.test.ts deleted file mode 100644 index d75eaaec7b..0000000000 --- a/apps/desktop/src/main/__tests__/bundled-skill-catalog.test.ts +++ /dev/null @@ -1,224 +0,0 @@ -import { describe, it } from 'node:test'; -import assert from 'node:assert/strict'; -import { mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises'; -import { join } from 'node:path'; -import { tmpdir } from 'node:os'; -import { - BUNDLED_SKILL_CATALOG, - MANAGED_SKILL_CATEGORIES, -} from '@maka/runtime'; -import { - ensureBundledSkillInstalled, - installBundledSkill, - listBundledSkillCatalog, - listInstalledSkills, - loadSkillInstructions, - parseSkillFrontMatter, -} from '../skills.js'; - -const EXPECTED_COUNT = BUNDLED_SKILL_CATALOG.length; - -async function withWorkspace(fn: (workspaceRoot: string) => Promise): Promise { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-bundled-catalog-')); - try { - await fn(workspaceRoot); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -} - -async function exists(path: string): Promise { - try { - await stat(path); - return true; - } catch { - return false; - } -} - -describe('bundled skill catalog', () => { - it('ships the built-in skills as an install-on-demand catalog', async () => { - await withWorkspace(async (workspaceRoot) => { - const catalog = await listBundledSkillCatalog(workspaceRoot); - assert.equal(catalog.length, EXPECTED_COUNT); - - const ids = new Set(catalog.map((entry) => entry.id)); - assert.ok(ids.has('computer-use')); - assert.ok(ids.has('deep-research')); - assert.ok(ids.has('frontend-design')); - - // Every catalog body must be a valid, importable maka skill: a non-empty - // name and a category within the fixed taxonomy. Nothing is installed yet. - for (const entry of catalog) { - assert.ok(entry.name.length > 0, `${entry.id} has an empty name`); - assert.ok( - (MANAGED_SKILL_CATEGORIES as readonly string[]).includes(entry.category), - `${entry.id} has out-of-taxonomy category ${entry.category}`, - ); - assert.equal(entry.installed, false); - } - }); - }); - - it('ships Computer Use guidance only on a host that binds maka_computer', async () => { - await withWorkspace(async (workspaceRoot) => { - const installed = await installBundledSkill(workspaceRoot, 'computer-use'); - assert.equal(installed.ok, true); - if (!installed.ok) return; - - const skillFile = join(workspaceRoot, 'skills', 'computer-use', 'SKILL.md'); - const body = await readFile(skillFile, 'utf8'); - const metadata = parseSkillFrontMatter(body); - assert.equal(metadata.name, 'Computer Use'); - assert.match(metadata.description ?? '', /local desktop application UI/); - assert.deepEqual(metadata.allowedTools, ['load_tools', 'maka_computer']); - assert.deepEqual(metadata.requiredTools, ['maka_computer']); - assert.equal( - /[\u3400-\u9fff]/u.test(body.replace(/^category:.*$/m, '')), - false, - 'model-facing Computer Use guidance must remain English', - ); - - const visualHost = { - toolNames: new Set(['load_tools', 'maka_computer']), - }; - const loaded = await loadSkillInstructions(workspaceRoot, 'computer-use', visualHost); - assert.equal(loaded.ok, true); - if (!loaded.ok) return; - assert.match(loaded.skill.instructions, /group.*computer_use/); - assert.match(loaded.skill.instructions, /outcome_unknown/); - assert.match(loaded.skill.instructions, /include_screenshot/); - assert.match(loaded.skill.instructions, /element_sequence/); - assert.match(loaded.skill.instructions, /standalone step/); - assert.match(loaded.skill.instructions, /optional `app` filter/); - assert.match(loaded.skill.instructions, /compatibility input dispatch disabled/); - assert.match(loaded.skill.instructions, /metadata_read/); - assert.doesNotMatch(loaded.skill.instructions, /snapshot_spent|window_gone/); - - const hidden = await loadSkillInstructions(workspaceRoot, 'computer-use', { - toolNames: new Set(['load_tools']), - }); - assert.equal(hidden.ok, false); - if (hidden.ok) return; - assert.equal(hidden.reason, 'host_incompatible'); - }); - }); - - it('auto-seeds a trusted Computer Use Skill idempotently', async () => { - await withWorkspace(async (workspaceRoot) => { - const first = await ensureBundledSkillInstalled(workspaceRoot, 'computer-use'); - assert.equal(first.ok, true); - if (!first.ok) return; - assert.equal(first.action, 'installed'); - assert.equal(first.skill.sourceType, 'bundled'); - assert.equal(first.skill.validationStatus, 'ok'); - - const second = await ensureBundledSkillInstalled(workspaceRoot, 'computer-use'); - assert.equal(second.ok, true); - if (!second.ok) return; - assert.equal(second.action, 'already_installed'); - assert.equal(second.skill.contentSha256, first.skill.contentSha256); - - const installed = await listInstalledSkills(workspaceRoot); - assert.deepEqual(installed.map((skill) => skill.id), ['computer-use']); - }); - }); - - it('does not overwrite an untrusted workspace copy during automatic seeding', async () => { - await withWorkspace(async (workspaceRoot) => { - const skillDir = join(workspaceRoot, 'skills', 'computer-use'); - await mkdir(skillDir, { recursive: true }); - const custom = `--- -name: Computer Use -description: A local override that must not be replaced. ---- -Do something else. -`; - const skillFile = join(skillDir, 'SKILL.md'); - await writeFile(skillFile, custom, 'utf8'); - - assert.deepEqual(await ensureBundledSkillInstalled(workspaceRoot, 'computer-use'), { - ok: false, - reason: 'existing_untrusted', - }); - assert.equal(await readFile(skillFile, 'utf8'), custom); - }); - }); - - it('installs a bundled skill on demand into the workspace', async () => { - await withWorkspace(async (workspaceRoot) => { - const result = await installBundledSkill(workspaceRoot, 'deep-research'); - assert.equal(result.ok, true); - if (!result.ok) return; - assert.equal(result.skill.id, 'deep-research'); - assert.equal(result.skill.sourceType, 'bundled'); - assert.equal(result.skill.userModified, false); - assert.equal(result.skill.validationStatus, 'ok'); - - const skillFile = join(workspaceRoot, 'skills', 'deep-research', 'SKILL.md'); - const lockFile = join(workspaceRoot, 'skills', 'deep-research', 'skill.lock.json'); - assert.ok(await exists(skillFile)); - assert.ok(await exists(lockFile)); - - const lock = JSON.parse(await readFile(lockFile, 'utf8')) as Record; - assert.equal(lock.sourceType, 'bundled'); - assert.equal(lock.sourceName, 'maka-bundled'); - - const catalog = await listBundledSkillCatalog(workspaceRoot); - assert.equal(catalog.find((entry) => entry.id === 'deep-research')?.installed, true); - assert.equal(catalog.find((entry) => entry.id === 'frontend-design')?.installed, false); - - const installed = await listInstalledSkills(workspaceRoot); - assert.deepEqual(installed.map((skill) => skill.id), ['deep-research']); - }); - }); - - it('keeps every shipped bundled skill valid through the installed-skill scanner', async () => { - await withWorkspace(async (workspaceRoot) => { - const catalog = await listBundledSkillCatalog(workspaceRoot); - for (const entry of catalog) { - const result = await installBundledSkill(workspaceRoot, entry.id); - assert.equal(result.ok, true, `${entry.id} failed runtime skill validation`); - } - - const installed = await listInstalledSkills(workspaceRoot); - assert.equal(installed.length, EXPECTED_COUNT); - assert.deepEqual( - new Set(installed.map((skill) => skill.id)), - new Set(catalog.map((entry) => entry.id)), - ); - }); - }); - - it('is idempotent: a second install reports already_exists and preserves the copy', async () => { - await withWorkspace(async (workspaceRoot) => { - const first = await installBundledSkill(workspaceRoot, 'summarization'); - assert.equal(first.ok, true); - const skillFile = join(workspaceRoot, 'skills', 'summarization', 'SKILL.md'); - const before = await readFile(skillFile, 'utf8'); - - const second = await installBundledSkill(workspaceRoot, 'summarization'); - assert.deepEqual(second, { ok: false, reason: 'already_exists' }); - assert.equal(await readFile(skillFile, 'utf8'), before); - }); - }); - - it('rejects unknown and unsafe skill ids', async () => { - await withWorkspace(async (workspaceRoot) => { - assert.deepEqual(await installBundledSkill(workspaceRoot, 'no-such-skill'), { ok: false, reason: 'not_found' }); - assert.deepEqual(await installBundledSkill(workspaceRoot, '../evil'), { ok: false, reason: 'not_found' }); - assert.deepEqual(await listInstalledSkills(workspaceRoot), []); - }); - }); - - it('keeps the generated catalog module in sync with the reviewable sources', async () => { - const genUrl = new URL('../../../scripts/gen-bundled-skill-catalog.mjs', import.meta.url); - const gen = await import(genUrl.href); - const fromDisk = gen.readBundledSkillSources(); - assert.deepEqual( - fromDisk, - BUNDLED_SKILL_CATALOG, - 'resources/bundled-skills is out of sync with Runtime bundled-skill-catalog.generated.ts — run: node scripts/gen-bundled-skill-catalog.mjs', - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/claude-subscription-experimental-gate.test.ts b/apps/desktop/src/main/__tests__/claude-subscription-experimental-gate.test.ts deleted file mode 100644 index 85d3f5a6f3..0000000000 --- a/apps/desktop/src/main/__tests__/claude-subscription-experimental-gate.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { it } from 'node:test'; -import { ClaudeSubscriptionService } from '../oauth/claude-subscription-service.js'; - -it('opens only an authorization URL issued by the Claude subscription service', async () => { - const openedUrls: string[] = []; - const service = new ClaudeSubscriptionService({ - userDataDir: '/unused', - openExternal: async (url) => { - openedUrls.push(url); - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => undefined, - deleteSecret: async () => undefined, - }, - }); - - assert.equal((await service.openAuthorizationUrl('https://attacker.example')).ok, false); - assert.deepEqual(openedUrls, []); - - const authorization = await service.getAuthorizationUrl(); - assert.deepEqual(Object.keys(authorization).sort(), ['authRequestId', 'stateHint']); - assert.deepEqual(await service.openAuthorizationUrl(authorization.authRequestId), { ok: true }); - assert.equal(openedUrls.length, 1); - assert.equal(new URL(openedUrls[0]!).origin, 'https://claude.com'); -}); diff --git a/apps/desktop/src/main/__tests__/client-settings-effects.test.ts b/apps/desktop/src/main/__tests__/client-settings-effects.test.ts new file mode 100644 index 0000000000..81ff1fa73f --- /dev/null +++ b/apps/desktop/src/main/__tests__/client-settings-effects.test.ts @@ -0,0 +1,37 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { createDefaultSettings } from '@maka/core/settings'; +import { createClientSettingsEffects } from '../client-settings-effects.js'; + +test('applies each client settings snapshot once across local writes and file watcher echoes', async () => { + let current = createDefaultSettings(); + const keepAwake: boolean[] = []; + let botApplications = 0; + let rendererEvents = 0; + const effects = createClientSettingsEffects({ + settingsStore: { get: async () => current }, + applyKeepSystemAwake: async (enabled) => { + keepAwake.push(enabled); + }, + applyBotSettings: async () => { + botApplications += 1; + }, + emitExternalChanged: () => { + rendererEvents += 1; + }, + }); + + assert.equal(await effects.refresh(false), true); + assert.equal(await effects.refresh(true), false); + + current = { + ...current, + system: { keepSystemAwake: true }, + }; + assert.equal(await effects.apply(current, true), true); + assert.equal(await effects.refresh(true), false); + + assert.deepEqual(keepAwake, [false, true]); + assert.equal(botApplications, 1); + assert.equal(rendererEvents, 1); +}); diff --git a/apps/desktop/src/main/__tests__/client-settings-tools.test.ts b/apps/desktop/src/main/__tests__/client-settings-tools.test.ts new file mode 100644 index 0000000000..bb3e428377 --- /dev/null +++ b/apps/desktop/src/main/__tests__/client-settings-tools.test.ts @@ -0,0 +1,41 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { createDefaultSettings, mergeSettings } from '@maka/core/settings'; +import { buildClientSettingsTools } from '../client-settings-tools.js'; + +test('the bound client confirms and applies only UI and operating-system settings', async () => { + let settings = createDefaultSettings(); + let proposed: readonly string[] = []; + const tools = buildClientSettingsTools({ + read: async () => settings, + update: async (patch) => { + settings = mergeSettings(settings, patch); + return settings; + }, + confirm: async (changes) => { + proposed = changes; + return true; + }, + }); + const update = tools.find(({ name }) => name === 'MakaClientSettingsUpdate'); + assert.ok(update); + + const result = await update.impl( + { + appearance: { theme: 'dark' }, + uiLocale: 'en', + system: { keepSystemAwake: true }, + }, + {} as never, + ); + + assert.deepEqual(proposed, [ + 'Theme: auto → dark', + 'UI language: auto → en', + 'Keep system awake: false → true', + ]); + assert.equal((result as { applied: boolean }).applied, true); + assert.equal(settings.appearance.theme, 'dark'); + assert.equal(settings.personalization.uiLocale, 'en'); + assert.equal(settings.system.keepSystemAwake, true); +}); diff --git a/apps/desktop/src/main/__tests__/client-settings-watcher.test.ts b/apps/desktop/src/main/__tests__/client-settings-watcher.test.ts new file mode 100644 index 0000000000..b0b1747088 --- /dev/null +++ b/apps/desktop/src/main/__tests__/client-settings-watcher.test.ts @@ -0,0 +1,40 @@ +import assert from "node:assert/strict"; +import { test } from "node:test"; +import { startClientSettingsWatcher } from "../client-settings-watcher.js"; + +test("refreshes only for client settings replacements and stops cleanly", async () => { + let listener: ((eventType: string, filename: string | Buffer | null) => void) | undefined; + let closed = false; + let refreshes = 0; + const watcher = startClientSettingsWatcher( + "/workspace", + () => { + refreshes += 1; + }, + { + debounceMs: 0, + watch: (_root, nextListener) => { + listener = nextListener; + return { + on: () => undefined, + close: () => { + closed = true; + }, + }; + }, + }, + ); + + assert.ok(listener); + listener("rename", "runtime.sqlite"); + listener("rename", "settings.json"); + await new Promise((resolve) => setTimeout(resolve, 0)); + assert.equal(refreshes, 1); + + watcher.stop(); + assert.equal(closed, true); + listener("rename", "settings.json"); + watcher.stop(); + await new Promise((resolve) => setTimeout(resolve, 0)); + assert.equal(refreshes, 1); +}); diff --git a/apps/desktop/src/main/__tests__/computer-use-model-tools.test.ts b/apps/desktop/src/main/__tests__/computer-use-model-tools.test.ts deleted file mode 100644 index 2a035315f3..0000000000 --- a/apps/desktop/src/main/__tests__/computer-use-model-tools.test.ts +++ /dev/null @@ -1,25 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import type { MakaTool } from '@maka/runtime'; -import { computerUseToolsForModel } from '../computer-use-model-tools.js'; - -const tool = (name: string): MakaTool => ({ name } as MakaTool); - -describe('Computer Use model tool visibility', () => { - const computer = tool('maka_computer'); - const shell = tool('Bash'); - - it('removes screenshot-returning Computer Use tools for text-only models', () => { - assert.deepEqual( - computerUseToolsForModel([shell, computer], [computer], false).map((candidate) => candidate.name), - ['Bash'], - ); - }); - - it('preserves the complete tool surface for visual models', () => { - assert.deepEqual( - computerUseToolsForModel([shell, computer], [computer], true).map((candidate) => candidate.name), - ['Bash', 'maka_computer'], - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/computer-use-pip-wiring.test.ts b/apps/desktop/src/main/__tests__/computer-use-pip-wiring.test.ts deleted file mode 100644 index 1546fcae29..0000000000 --- a/apps/desktop/src/main/__tests__/computer-use-pip-wiring.test.ts +++ /dev/null @@ -1,216 +0,0 @@ -// Lifecycle wiring for the Computer Use picture-in-picture mirror. -// -// The mirror's own behaviour is covered by computer-use-pip.test.ts, which -// builds the controller directly and hands it every dependency. That is -// precisely why it could not catch what was wrong here: the controller was -// constructed as a local inside `assembleDesktopTools` and never returned, so -// `complete`, `clearForSession`, `destroyAll` and `setStopHandler` had no -// production caller at all, and the `mainWindow` dependency the assembly -// declares was supplied by nothing in the repo. Every test passed while the -// window was never torn down, never anchored to the app, and never clickable. -// -// So these assertions are about the call sites, not the controller. boot.ts, -// app-lifecycle.ts and sessions-ipc-main.ts cannot be imported outside Electron -// — boot.ts is the whole startup chain and the other two bind `ipcMain` and -// `app` at module scope — so the wiring in those three is asserted against the -// source text, the same way this repo's other cross-file conventions are. The -// session-streamer half is a real call, because that module is importable. -import assert from 'node:assert/strict'; -import { readFile } from 'node:fs/promises'; -import { resolve } from 'node:path'; -import { describe, it } from 'node:test'; -import { SessionActivityRegistry } from '@maka/runtime'; -import type { SessionEvent } from '@maka/core'; -import { createSessionStreamer } from '../session-stream.js'; - -const REPO_ROOT = resolve(import.meta.dirname, '../../../../..'); -const MAIN = resolve(REPO_ROOT, 'apps/desktop/src/main'); - -function read(relative: string): Promise { - return readFile(resolve(MAIN, relative), 'utf8'); -} - -describe('picture-in-picture lifecycle wiring', () => { - it('assembleDesktopTools hands the mirror back to its caller', async () => { - const source = await read('desktop-native-capability-assembly.ts'); - const returned = /\n return \{\n([\s\S]*?)\n \};\n\}/.exec(source)?.[1]; - assert.ok(returned, 'assembleDesktopTools must end in a return literal'); - assert.match( - returned, - /^\s*computerUsePip,$/m, - 'a controller that is not returned has no production caller: complete, ' + - 'clearForSession, destroyAll and setStopHandler are all unreachable', - ); - }); - - it('the overlay hook Computer Use is given is wrapped by the mirror', async () => { - // The one assertion that makes this branch safe to merge alongside the - // others that touch the same expression. - // - // `createComputerUseHost({ overlay })` takes a single hook, and every - // feature that wants to see actions go past wraps the one before it. That - // makes the expression a merge conflict by construction: resolving it by - // taking one side compiles, type-checks, and leaves every test in both - // branches green while one branch's entire feed is silently disconnected. - // Measured here by replacing the value with the bare - // `createComputerUseOverlayHook(computerUseOverlay)`: `tsc` exits 0 and all - // 71 mirror tests pass against a window that can never receive a frame, - // because every one of them constructs the wrapper itself. - // - // So this asserts the production expression, not the wrapper's behaviour. - // The correct resolution nests the wrappers rather than choosing between - // them; whichever order they end up in, `withComputerUsePip` has to be one - // of them. - const source = await read('desktop-native-capability-assembly.ts'); - const overlay = /\n overlay: ([\s\S]*?),\n \}\);/.exec(source)?.[1]; - assert.ok(overlay, 'createComputerUseHost must be given an overlay hook'); - assert.match( - overlay, - /withComputerUsePip\(/, - 'a mirror that is not in the overlay chain is never handed a frame: no ' + - 'present, no cursor, and a window that only ever shows its placeholder', - ); - assert.match( - overlay, - /createComputerUseOverlayHook\(computerUseOverlay\)/, - 'and it wraps the cursor hook rather than replacing it', - ); - }); - - it('boot.ts gives the assembly the app window it asks for', async () => { - const source = await read('boot.ts'); - assert.match( - source, - /assembleDesktopTools\(\{[\s\S]*?\n mainWindow: mainWindowController,/, - 'without this the mirror floats above every application, has no pointer ' + - 'to hover-test against, and lands on the primary display', - ); - }); - - it('the main window controller supplies all three anchor capabilities', async () => { - const source = await read('main-window.ts'); - for (const method of ['windowBounds', 'browserWindow', 'onWindowGeometryChanged']) { - assert.match( - source, - new RegExp(`^ ${method}\\(`, 'm'), - `MainWindowController must implement ${method}`, - ); - } - assert.match(source, /w\.on\('move', cb\);\s*\n\s*w\.on\('resize', cb\);/); - }); - - it('boot.ts tears the mirror down when the window it belongs to closes', async () => { - const source = await read('boot.ts'); - const handler = /onMainWindowClose = \(\) => \{([\s\S]*?)\n\};/.exec(source)?.[1]; - assert.ok(handler, 'boot.ts must assign onMainWindowClose'); - assert.match(handler, /computerUsePip\.destroyAll\(\);/); - }); - - it('boot.ts forwards the mirror to every surface that retires it', async () => { - const source = await read('boot.ts'); - for (const [callee, pattern] of [ - ['registerSessionsIpc', /registerSessionsIpc\(\{[\s\S]*?\n \}\);/], - ['createSessionStreamer', /createSessionStreamer\(\{[\s\S]*?\n\}\);/], - ['wireAppLifecycle', /wireAppLifecycle\(\{[\s\S]*?\n\}\);/], - ] as const) { - const call = pattern.exec(source)?.[0]; - assert.ok(call, `boot.ts must call ${callee}`); - assert.match(call, /^\s*computerUsePip,$/m, `${callee} must receive the mirror`); - } - }); - - it('app-lifecycle destroys the mirror on both shutdown paths', async () => { - const source = await read('app-lifecycle.ts'); - const allClosed = /app\.on\('window-all-closed', \(\) => \{([\s\S]*?)\n \}\);/.exec(source)?.[1]; - assert.ok(allClosed, 'app-lifecycle must handle window-all-closed'); - assert.match(allClosed, /computerUsePip\.destroyAll\(\)/); - - const quit = /async function runBeforeQuitCleanup\(\): Promise \{([\s\S]*?)\n \}/.exec( - source, - )?.[1]; - assert.ok(quit, 'app-lifecycle must run a before-quit cleanup'); - assert.match(quit, /computerUsePip\.destroyAll\(\)/); - }); - - it('the session IPC clears the mirror wherever it clears the cursor', async () => { - const source = await read('sessions-ipc-main.ts'); - const overlayClears = source.match(/computerUseOverlay\.clearForSession\(/g) ?? []; - const pipClears = source.match(/computerUsePip\?\.clearForSession\(/g) ?? []; - assert.ok(overlayClears.length >= 3, 'sanity: the cursor is cleared on several paths'); - assert.equal( - pipClears.length, - overlayClears.length, - 'the mirror dies with a session on exactly the paths the cursor does: ' + - 'delete, stop, archive', - ); - }); - - it('the mirror stop control runs the same stop the app window runs', async () => { - const source = await read('sessions-ipc-main.ts'); - assert.match( - source, - /computerUsePip\?\.setStopHandler\(\(sessionId\) => \{\s*\n\s*void stopSession\(sessionId, \{ source: 'stop_button' \}\);/, - 'without a handler the button in the mirror stops nothing', - ); - assert.match( - source, - /ipcMain\.handle\('sessions:stop',[\s\S]*?stopSession\(sessionId, input\)/, - 'and both must be the same function, or they drift', - ); - }); - - it('the Runtime Host keeps natural completion separate from explicit Stop', async () => { - const source = await read('runtime-host-boot.ts'); - const complete = /const completeComputerUseTurn = \(sessionId: string\): void => \{([\s\S]*?)\n\};/.exec( - source, - )?.[1]; - assert.ok(complete, 'Runtime Host boot must define natural Turn completion'); - assert.match(complete, /computerUsePip\.complete\(sessionId\)/); - - const release = /const releaseComputerUseSession = \(sessionId: string\): void => \{([\s\S]*?)\n\};/.exec( - source, - )?.[1]; - assert.ok(release, 'Runtime Host boot must define immediate Session teardown'); - assert.match(release, /computerUsePip\.clearForSession\(sessionId\)/); - - assert.match(source, /\n completeComputerUseTurn,\n/); - assert.match( - source, - /computerUsePip\.setStopHandler\(stopComputerUseSession\);[\s\S]*computerUseStatusItem\.setStopHandler\(stopComputerUseSession\);/, - 'PiP and status Stop must share the candidate Stop authority', - ); - }); - - it('a turn ending retires the mirror', async () => { - // The real call, not the source text: this module has no Electron in it. - // The mirror used to be cleared only on stop, archive and delete, so it - // outlived the run it belonged to and kept showing that run's last frame - // while the next turn drove a different application. - const completed: string[] = []; - const streamEvents = createSessionStreamer({ - sessionActivities: new SessionActivityRegistry(), - goalWiring: { - coordinator: { - beginObservedTurn: () => ({ kind: 'registered', settle: async () => {} }), - }, - } as never, - computerUseOverlay: { clearForSession: () => {} } as never, - computerUsePip: { complete: (sessionId) => completed.push(sessionId) }, - computerUseTools: { clearSession: () => {} } as never, - safeSendToRenderer: () => {}, - emitSessionsChanged: () => {}, - }); - - async function* events(): AsyncGenerator { - yield { - type: 'complete', - id: 'e1', - turnId: 't1', - ts: 1, - } as unknown as SessionEvent; - } - - await streamEvents('session-a', events(), { turnId: 't1', goalBoundary: 'none' }); - assert.deepEqual(completed, ['session-a']); - }); -}); diff --git a/apps/desktop/src/main/__tests__/computer-use-presence-wiring.test.ts b/apps/desktop/src/main/__tests__/computer-use-presence-wiring.test.ts deleted file mode 100644 index 7ed720a2c3..0000000000 --- a/apps/desktop/src/main/__tests__/computer-use-presence-wiring.test.ts +++ /dev/null @@ -1,390 +0,0 @@ -/** - * Call-site wiring for Computer Use presence. - * - * The status item, the screen-lock guard and the keep-awake hold are all - * correct in isolation and were all unreachable: the item was a local inside - * `assembleDesktopTools` that nothing was ever handed, so `clearForSession`, - * `destroy` and `setStopHandler` had no production caller. The consequences - * were a `prevent-app-suspension` blocker taken out by the first Computer Use - * action and held until the process exited, a menu bar item that never went - * away, and a Stop row drawn permanently disabled. - * - * So these tests deliberately do NOT hand the components anything. The existing - * status-item and screen-lock suites already prove the components work when - * wired; a test that calls `setStopHandler` itself proves exactly the thing - * that was never in doubt. What is asserted here is that production supplies - * the calls. - */ -import assert from 'node:assert/strict'; -import { createHash } from 'node:crypto'; -import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'; -import { readFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join, resolve } from 'node:path'; -import { describe, it, test } from 'node:test'; -import type { SessionEvent } from '@maka/core'; -import { createComputerUseHost } from '../computer-use-host.js'; -import { createSessionStreamer } from '../session-stream.js'; - -const REPO_ROOT = resolve(import.meta.dirname, '../../../../..'); -const MAIN = resolve(REPO_ROOT, 'apps/desktop/src/main'); - -async function source(file: string): Promise { - return readFile(resolve(MAIN, file), 'utf8'); -} - -async function events(list: SessionEvent[]): Promise> { - return (async function* stream() { - for (const event of list) yield event; - })(); -} - -function completeEvent(): SessionEvent { - return { - type: 'complete', - id: 'e1', - turnId: 't1', - ts: Date.now(), - } as SessionEvent; -} - -function errorEvent(): SessionEvent { - return { - type: 'error', - id: 'e1', - turnId: 't1', - ts: Date.now(), - recoverable: false, - code: 'boom', - reason: 'boom', - message: 'boom', - } as SessionEvent; -} - -function streamerDeps(cleared: string[], lockCleared: string[] = []) { - return { - sessionActivities: { - reserve: () => ({ release: () => {} }), - } as never, - goalWiring: { - coordinator: { - beginObservedTurn: () => ({ kind: 'registered', settle: () => {} }), - }, - } as never, - computerUseOverlay: { clearForSession: () => {} } as never, - computerUseStatusItem: { - clearForSession: (sessionId: string) => { - cleared.push(sessionId); - }, - }, - computerUseScreenLock: { - clearForSession: (sessionId: string) => { - lockCleared.push(sessionId); - }, - }, - computerUseTools: { clearSession: () => {} } as never, - safeSendToRenderer: () => {}, - emitSessionsChanged: () => {}, - }; -} - -test('a turn ending releases the menu bar item, and with it the keep-awake hold', async () => { - const cleared: string[] = []; - const lockCleared: string[] = []; - const streamEvents = createSessionStreamer(streamerDeps(cleared, lockCleared) as never); - - await streamEvents('session-A', await events([completeEvent()]), { - turnId: 't1', - goalBoundary: 'internal', - } as never); - - // `onLiveChanged(false)` — and therefore `keepSystemAwake.release` — is - // reachable only through `clearForSession` and `destroy`. If a finished turn - // does not clear, one Computer Use action holds `prevent-app-suspension` for - // the rest of the process's life and the keep-awake setting can no longer - // stop it. - assert.deepEqual(cleared, ['session-A']); - - // And the lock guard on exactly the same signal. It holds session ids to - // release on unlock, and this path did not clear it: the session IPC cleared - // it on delete, stop and archive, while a turn that simply finished left its - // id in the set until the process exited. Two hundred turns in distinct - // sessions across a day left two hundred ids held and every unlock walking - // all of them. The status item was cleared here and its sibling was not, - // which is the asymmetry this pins shut. - assert.deepEqual(lockCleared, ['session-A']); -}); - -test('a turn that dies releases it too', async () => { - const cleared: string[] = []; - const lockCleared: string[] = []; - const streamerDepsWithThrow = { - ...streamerDeps(cleared, lockCleared), - safeSendToRenderer: (channel: string) => { - if (channel.startsWith('sessions:event:')) return; - }, - }; - const streamEvents = createSessionStreamer(streamerDepsWithThrow as never); - - await streamEvents('session-B', await events([errorEvent()]), { - turnId: 't1', - goalBoundary: 'internal', - } as never); - - assert.deepEqual(cleared, ['session-B']); - assert.deepEqual(lockCleared, ['session-B']); -}); - -/** - * The remaining call sites live in modules that import `electron` at the top - * level and therefore cannot be loaded under `node --test`; the repo already - * pins main-process invariants this way (see `app-region-hygiene-contract`). - * Each assertion below is about a call that had no production caller at all, - * which is the failure mode being guarded — not about spelling. - */ -describe('Computer Use presence is reachable from production', () => { - it('hands the status item and the lock guard out of tool assembly', async () => { - const text = await source('desktop-native-capability-assembly.ts'); - const returned = text.slice(text.lastIndexOf('return {')); - assert.match( - returned, - /computerUseStatusItem,/, - 'the status item must leave assembleDesktopTools or nothing can clear it', - ); - assert.match( - returned, - /computerUseScreenLock,/, - 'the lock guard must leave assembleDesktopTools or nothing can dispose it', - ); - }); - - it('gives the dispatch path a lock probe', async () => { - const text = await source('desktop-native-capability-assembly.ts'); - assert.match( - text, - /screenLocked:\s*\(\{\s*sessionId\s*\}\)\s*=>/, - '`locked()` is only a guard once createComputerUseHost is given it', - ); - assert.match( - text, - /computerUseScreenLock\.noteSessionActive\(sessionId\)/, - 'a session refused for a lock must be one the guard will release on unlock', - ); - }); - - it('the overlay hook Computer Use is given is wrapped by both presence hooks', async () => { - // The one assertion that makes this branch safe to merge alongside the - // others that touch the same expression. - // - // `createComputerUseHost({ overlay })` takes a single hook, and every - // feature that wants to see actions go past wraps the one before it. That - // makes the expression a merge conflict by construction: resolving it by - // taking one side compiles, type-checks, and leaves every test in both - // branches green while one branch's presence is silently disconnected. - // Measured by replacing the value with the bare - // `createComputerUseOverlayHook(computerUseOverlay)`: `tsc` exits 0 and all - // 61 presence tests pass with a tray that never appears — so - // `onLiveChanged` never fires, the keep-awake hold is never taken, and a - // background run dies to idle sleep. Every one of those tests builds the - // wrapper itself, which is exactly why none of them notices. - // - // So this asserts the production expression. The correct resolution nests - // the wrappers rather than choosing between them; whichever order they end - // up in, both of these have to be present. - const text = await source('desktop-native-capability-assembly.ts'); - const overlay = /\n overlay: ([\s\S]*?),\n \}\);/.exec(text)?.[1]; - assert.ok(overlay, 'createComputerUseHost must be given an overlay hook'); - assert.match( - overlay, - /withComputerUseStatusItem\(/, - 'no status item in the chain means no live-session count, so no menu bar ' + - 'indicator and no keep-awake hold', - ); - assert.match( - overlay, - /withComputerUseScreenLock\(/, - 'no lock guard in the chain means a session the executor refused for a ' + - 'lock is never registered, and screenUnlocked is its only way out', - ); - assert.match( - overlay, - /createComputerUseOverlayHook\(computerUseOverlay\)/, - 'and they wrap the cursor hook rather than replacing it', - ); - }); - - it('gives tool assembly the keep-awake controller its only caller needs', async () => { - // `keepSystemAwake` is optional on the deps, so deleting it from the call - // costs nothing at compile time: `tsc --noEmit` stays at exit 0 and all 61 - // presence tests pass. What it costs at runtime is the whole feature — - // `onLiveChanged` fires into `undefined`, no `prevent-app-suspension` - // blocker is ever taken, and a background Computer Use run dies to idle - // sleep, which is the exact failure the refcount rewrite exists to - // prevent. Optional is right for the dependency (the tool surface is - // assembled in contexts with no Electron power management) and wrong for - // the one production call site, so the call site is what is pinned. - const text = await source('boot.ts'); - const start = text.indexOf('assembleDesktopTools({'); - assert.notEqual(start, -1, 'boot.ts must assemble the tools'); - const call = text.slice(start, text.indexOf('});', start)); - assert.match( - call, - /\bkeepSystemAwake,/, - 'without it the status item holds nothing awake and the run sleeps', - ); - }); - - it('routes the status item to session teardown and to the stop path', async () => { - const text = await source('sessions-ipc-main.ts'); - assert.match( - text, - /computerUseStatusItem\?\.setStopHandler\(/, - 'without a stop handler the menu draws every Stop row disabled', - ); - assert.match( - text, - /void stopSession\(sessionId, \{ source: 'stop_button' \}\)/, - 'the menu bar must stop a run through the same path as the in-app button', - ); - // Anchored on the declaration, not on the first place the name is spelled. - // `text.indexOf(caller)` finds whichever mention comes first in the file, - // which is a doc comment as soon as anyone writes one — and this branch - // merges with another that adds exactly such a comment above the deps. - // The window then starts hundreds of characters early and the assertion - // fails on a merge that is entirely correct, which is the same kind of - // wrong answer as passing when it should not. - for (const [caller, declaration] of [ - ['removeSession', /const removeSession = async \([\s\S]*?\n \};/], - ['stopSession', /async function stopSession\([\s\S]*?\n \}/], - ] as const) { - const body = declaration.exec(text)?.[0]; - assert.ok(body, `sessions-ipc-main.ts must declare ${caller}`); - assert.match( - body, - /computerUseStatusItem\?\.clearForSession\(/, - `${caller} must retire the item`, - ); - assert.match( - body, - /computerUseScreenLock\?\.clearForSession\(/, - `${caller} must stop the guard tracking a session that is gone`, - ); - } - }); - - it('retires both at quit', async () => { - const text = await source('app-lifecycle.ts'); - assert.match(text, /computerUseStatusItem\.destroy\(\)/); - assert.match(text, /computerUseScreenLock\.dispose\(\)/); - }); - - it('passes them from boot to every collaborator that must call them', async () => { - const text = await source('boot.ts'); - for (const [anchor, needed] of [ - ['registerSessionsIpc({', ['computerUseStatusItem', 'computerUseScreenLock']], - ['createSessionStreamer({', ['computerUseStatusItem', 'computerUseScreenLock']], - ['wireAppLifecycle({', ['computerUseStatusItem', 'computerUseScreenLock']], - ] as const) { - const start = text.indexOf(anchor); - assert.notEqual(start, -1, `${anchor} not found`); - const block = text.slice(start, text.indexOf('});', start)); - for (const name of needed) { - assert.match(block, new RegExp(`\\b${name},`), `${anchor} must receive ${name}`); - } - } - }); -}); - -/** - * The probe above pins the top of the wire — tool assembly hands - * `createComputerUseHost` a `screenLocked` — and the runtime's screen-lock - * suite pins the bottom — `buildComputerUseTools` refuses when its - * `screenLocked` says so. Neither touches the two forwarding hops in between: - * `computer-use-host.ts` handing it to `selectComputerUseBackend`, and - * `select-backend.ts` handing it to `buildComputerUseTools`. Delete both and - * every suite in the repo stays green with the guard dead in production, which - * is the same shape of defect the rest of this file exists to catch. - * - * So this drives the real chain rather than reading it: a real - * `createComputerUseHost` over a temp manifest and a stand-in binary, whose - * tool must refuse. Nothing is stubbed between the two ends — a dropped hop - * anywhere along it turns the refusal into a dispatch. - * - * `selectComputerUseBackend` is darwin-only and CI is Linux, so the platform is - * forced rather than skipped; skipping would make this vacuous exactly where it - * is most needed. Nothing spawns: the lock refusal happens in the tool layer - * before the backend is ever asked for anything. - */ -test('a lock reaches the tool layer through the real host and backend selection', async () => { - const dir = mkdtempSync(join(tmpdir(), 'maka-cu-lock-wire-')); - const binaryPath = join(dir, 'maka-cu'); - writeFileSync(binaryPath, '#!/bin/sh\nexit 0\n'); - chmodSync(binaryPath, 0o755); - const manifestPath = join(dir, 'bundled-tools.json'); - writeFileSync( - manifestPath, - JSON.stringify({ - makaCu: { - binarySha256: createHash('sha256').update(readFileSync(binaryPath)).digest('hex'), - distributionReady: true, - }, - }), - ); - - const realPlatform = process.platform; - Object.defineProperty(process, 'platform', { value: 'darwin', configurable: true }); - try { - const locked: string[] = []; - const host = createComputerUseHost({ - isPackaged: false, - resourcesPath: dir, - manifestPath, - binaryPath, - physicalInputRecentlyActive: () => false, - screenLocked: ({ sessionId }) => { - locked.push(sessionId); - return true; - }, - }); - - const tools = host.selected.tools; - assert.ok(tools, 'the fixture must select a backend, or this asserts nothing'); - const [tool] = tools; - // A dropped hop does not return a wrong answer, it dispatches: the call - // goes past the missing guard and tries to drive the machine, and the - // stand-in binary fails somewhere inside the driver. Name that here rather - // than leaving a lifecycle stack trace as the only evidence. - let result: { text: string; error?: string }; - try { - result = (await tool.impl({ action: 'observe', app: 'Fixture' } as never, { - sessionId: 'session-locked', - turnId: 'turn-1', - toolCallId: 'observe', - cwd: '/tmp', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - })) as { text: string; error?: string }; - } catch (error) { - assert.fail( - 'the call reached the driver instead of being refused, so the lock never got ' + - `to the tool layer: ${error instanceof Error ? error.message : String(error)}`, - ); - } - - assert.equal( - result.error, - 'screen_locked', - 'the probe must be asked and its answer must refuse the call', - ); - assert.deepEqual( - locked, - ['session-locked'], - 'the probe must be consulted for the session that called, not a stand-in', - ); - - host.selected.backend?.dispose?.(); - } finally { - Object.defineProperty(process, 'platform', { value: realPlatform, configurable: true }); - rmSync(dir, { recursive: true, force: true }); - } -}); diff --git a/apps/desktop/src/main/__tests__/config-file-watcher.test.ts b/apps/desktop/src/main/__tests__/config-file-watcher.test.ts deleted file mode 100644 index dbd9b8fcc1..0000000000 --- a/apps/desktop/src/main/__tests__/config-file-watcher.test.ts +++ /dev/null @@ -1,281 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { afterEach, beforeEach, describe, test } from 'node:test'; -import { startConfigFileWatcher, type ConfigFileWatcher, type ConfigFileWatcherCallbacks } from '../config-file-watcher.js'; - -const WATCH_SETTLE_MS = 400; - -function wait(ms: number): Promise { - return new Promise((resolve) => setTimeout(resolve, ms)); -} - -type WatchListener = (eventType: string, filename: string | Buffer | null) => void; -type WatchErrorListener = (error: Error) => void; - -interface FakeStartResult { - emit: (filename: string | Buffer | null) => void; - emitError: (error?: Error) => void; - watcher: ConfigFileWatcher; - closeCount: () => number; - pendingTimers: () => Array>; - clearedTimers: () => Array>; - runPendingTimers: () => void; -} - -interface FakeWatcherOptions { - immediateTimers?: boolean; -} - -function startWithFakeWatcher(callbacks: ConfigFileWatcherCallbacks, fakeOptions: FakeWatcherOptions = {}): FakeStartResult { - let listener: WatchListener | undefined; - let errorListener: WatchErrorListener | undefined; - let closeCalls = 0; - let nextTimer = 0; - const pendingTimers = new Map, () => void>(); - const clearedTimers: Array> = []; - const start = startConfigFileWatcher as unknown as ( - workspaceRoot: string, - callbacks: ConfigFileWatcherCallbacks, - options: { - watchImpl: (workspaceRoot: string, listener: WatchListener) => { on(event: 'error', listener: WatchErrorListener): void; close(): void }; - debounceMs: number; - setTimeoutImpl: (callback: () => void, delayMs: number) => ReturnType; - clearTimeoutImpl: (timer: ReturnType) => void; - }, - ) => ConfigFileWatcher; - - const watcher = start('/fake-workspace', callbacks, { - watchImpl: (_workspaceRoot, nextListener) => { - listener = nextListener; - return { - on(_event, nextErrorListener) { errorListener = nextErrorListener; }, - close() { closeCalls++; }, - }; - }, - debounceMs: 0, - setTimeoutImpl: (callback) => { - const timer = ++nextTimer as unknown as ReturnType; - if (fakeOptions.immediateTimers === false) pendingTimers.set(timer, callback); - else callback(); - return timer; - }, - clearTimeoutImpl: (timer) => { - clearedTimers.push(timer); - pendingTimers.delete(timer); - }, - }); - - return { - watcher, - emit(filename) { - assert.ok(listener, 'fake watcher listener must be registered'); - listener('change', filename); - }, - emitError(error = new Error('watch failed')) { - assert.ok(errorListener, 'fake watcher error listener must be registered'); - errorListener(error); - }, - closeCount: () => closeCalls, - pendingTimers: () => Array.from(pendingTimers.keys()), - clearedTimers: () => [...clearedTimers], - runPendingTimers() { - for (const [timer, callback] of [...pendingTimers.entries()]) { - pendingTimers.delete(timer); - callback(); - } - }, - }; -} - -describe('config-file-watcher', () => { - test('does not drop named config events emitted immediately after startup', () => { - let connectionsCalled = 0; - let settingsCalled = 0; - const { emit, watcher } = startWithFakeWatcher({ - onConnectionsChanged: () => { connectionsCalled++; }, - onSettingsChanged: () => { settingsCalled++; }, - }); - try { - emit('llm-connections.json'); - emit('settings.json'); - assert.equal(connectionsCalled, 1, 'startup must not drop immediate connection-file changes'); - assert.equal(settingsCalled, 1, 'startup must not drop immediate settings changes'); - } finally { - watcher.stop(); - } - }); - - test('runtime watcher errors close the watcher and clear pending debounce timers', () => { - let connectionsCalled = 0; - const fake = startWithFakeWatcher({ - onConnectionsChanged: () => { connectionsCalled++; }, - onSettingsChanged: () => {}, - }, { immediateTimers: false }); - try { - fake.emit('llm-connections.json'); - assert.equal(fake.pendingTimers().length, 1, 'named changes should create a pending debounce timer'); - fake.emitError(); - assert.equal(fake.closeCount(), 1, 'runtime watcher error should close the watcher'); - assert.equal(fake.clearedTimers().length, 1, 'runtime watcher error should clear pending debounce timers'); - assert.equal(fake.pendingTimers().length, 0, 'runtime watcher error should leave no pending debounce timers'); - assert.equal(connectionsCalled, 0, 'cleared debounce callback must not run after watcher error'); - fake.watcher.stop(); - assert.equal(fake.closeCount(), 1, 'stop after runtime error should be idempotent'); - } finally { - fake.watcher.stop(); - } - }); - - test('refreshes settings and connections when fs.watch omits the filename', () => { - let connectionsCalled = 0; - let settingsCalled = 0; - const { emit, watcher } = startWithFakeWatcher({ - onConnectionsChanged: () => { connectionsCalled++; }, - onSettingsChanged: () => { settingsCalled++; }, - }); - try { - emit(null); - assert.equal(connectionsCalled, 1, 'filename-less events should conservatively refresh connection state'); - assert.equal(settingsCalled, 1, 'filename-less events should conservatively refresh settings state'); - } finally { - watcher.stop(); - } - }); - - test('does not suppress a real external write after an internal write marker', () => { - let connectionsCalled = 0; - const { emit, watcher } = startWithFakeWatcher({ - onConnectionsChanged: () => { connectionsCalled++; }, - onSettingsChanged: () => {}, - }); - try { - (watcher as unknown as { suppressSelfWrite?: (filename: string) => void }).suppressSelfWrite?.('llm-connections.json'); - emit('llm-connections.json'); - assert.equal(connectionsCalled, 1, 'external writes must not be swallowed by a filename/time suppression window'); - } finally { - watcher.stop(); - } - }); - - let dir: string; - - beforeEach(async () => { - dir = await mkdtemp(join(tmpdir(), 'maka-watcher-test-')); - await writeFile(join(dir, 'llm-connections.json'), '{}'); - await writeFile(join(dir, 'credentials.json'), '{}'); - await writeFile(join(dir, 'settings.json'), '{}'); - }); - - afterEach(async () => { - await rm(dir, { recursive: true, force: true }); - }); - - test('fires onConnectionsChanged when llm-connections.json is modified', async () => { - let called = 0; - const watcher = startConfigFileWatcher(dir, { - onConnectionsChanged: () => { called++; }, - onSettingsChanged: () => {}, - }); - try { - await wait(WATCH_SETTLE_MS); - await writeFile(join(dir, 'llm-connections.json'), '{"changed": true}'); - await wait(800); - assert.ok(called >= 1, `expected onConnectionsChanged to fire, got ${called} calls`); - } finally { - watcher.stop(); - } - }); - - test('fires onConnectionsChanged when credentials.json is modified', async () => { - let called = 0; - const watcher = startConfigFileWatcher(dir, { - onConnectionsChanged: () => { called++; }, - onSettingsChanged: () => {}, - }); - try { - await wait(WATCH_SETTLE_MS); - await writeFile(join(dir, 'credentials.json'), '{"version":1,"values":{}}'); - await wait(800); - assert.ok(called >= 1, `expected onConnectionsChanged to fire, got ${called} calls`); - } finally { - watcher.stop(); - } - }); - - test('fires onSettingsChanged when settings.json is modified', async () => { - let called = 0; - const watcher = startConfigFileWatcher(dir, { - onConnectionsChanged: () => {}, - onSettingsChanged: () => { called++; }, - }); - try { - await wait(WATCH_SETTLE_MS); - await writeFile(join(dir, 'settings.json'), '{"appearance":{"theme":"dark"}}'); - await wait(800); - assert.ok(called >= 1, `expected onSettingsChanged to fire, got ${called} calls`); - } finally { - watcher.stop(); - } - }); - - test('does not fire for unrelated files', () => { - let connectionsCalled = 0; - let settingsCalled = 0; - const { emit, watcher } = startWithFakeWatcher({ - onConnectionsChanged: () => { connectionsCalled++; }, - onSettingsChanged: () => { settingsCalled++; }, - }); - try { - emit('telemetry.json'); - emit('random.txt'); - assert.equal(connectionsCalled, 0); - assert.equal(settingsCalled, 0); - } finally { - watcher.stop(); - } - }); - - test('debounces rapid writes into a single callback', () => { - let called = 0; - const fake = startWithFakeWatcher({ - onConnectionsChanged: () => { called++; }, - onSettingsChanged: () => {}, - }, { immediateTimers: false }); - try { - fake.emit('llm-connections.json'); - fake.emit('llm-connections.json'); - fake.emit('llm-connections.json'); - assert.equal(fake.pendingTimers().length, 1, 'rapid writes should leave one pending debounce timer'); - assert.equal(fake.clearedTimers().length, 2, 'rapid writes should clear superseded debounce timers'); - fake.runPendingTimers(); - assert.equal(called, 1, `expected debounce to coalesce into 1 call, got ${called} calls`); - } finally { - fake.watcher.stop(); - } - }); - - test('stop() clears pending callbacks', () => { - let called = 0; - const fake = startWithFakeWatcher({ - onConnectionsChanged: () => { called++; }, - onSettingsChanged: () => {}, - }, { immediateTimers: false }); - fake.emit('llm-connections.json'); - assert.equal(fake.pendingTimers().length, 1, 'named changes should create a pending debounce timer'); - fake.watcher.stop(); - assert.equal(fake.clearedTimers().length, 1, 'stop should clear pending debounce timers'); - fake.runPendingTimers(); - assert.equal(called, 0, 'cleared debounce callback must not run after stop()'); - }); - - test('returns no-op watcher when directory does not exist', () => { - const watcher = startConfigFileWatcher('/nonexistent/path/xyz', { - onConnectionsChanged: () => {}, - onSettingsChanged: () => {}, - }); - // Should not throw, just returns a no-op - watcher.stop(); - }); -}); diff --git a/apps/desktop/src/main/__tests__/connection-model-discovery.test.ts b/apps/desktop/src/main/__tests__/connection-model-discovery.test.ts deleted file mode 100644 index 2c66a9224d..0000000000 --- a/apps/desktop/src/main/__tests__/connection-model-discovery.test.ts +++ /dev/null @@ -1,137 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import test from 'node:test'; -import { createConnectionStore } from '@maka/storage'; -import { - ConnectionModelDiscoveryPreconditionError, - discoverConnectionModels, -} from '../connection-model-discovery.js'; - -test('precondition failures are explicitly safe to preserve across IPC', async () => { - await assert.rejects( - discoverConnectionModels( - { - connectionStore: { - get: async () => null, - update: async () => { - throw new Error('update must not run for a missing connection'); - }, - }, - resolveConnectionSecret: async () => null, - }, - 'missing', - ), - (error: unknown) => - error instanceof ConnectionModelDiscoveryPreconditionError && - error.message === '找不到模型连接：missing', - ); -}); - -test('an empty discovery result leaves the last successful catalog intact', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-model-discovery-')); - try { - const connectionStore = createConnectionStore(workspaceRoot); - const created = await connectionStore.create({ - slug: 'zai-main', - name: 'Z.ai', - providerType: 'zai-coding-plan', - defaultModel: 'glm-5', - }); - await connectionStore.update(created.slug, { - models: [{ id: 'glm-5' }], - modelSource: 'fetched', - modelsFetchedAt: 1_800_000_000_000, - }); - await connectionStore.update(created.slug, { apiKey: 'rotated-secret' }); - - await assert.rejects( - discoverConnectionModels( - { - connectionStore, - resolveConnectionSecret: async () => 'rotated-secret', - fetchModels: async () => [], - now: () => 1_900_000_000_000, - }, - created.slug, - ), - /no usable models/, - ); - - const persisted = await connectionStore.get(created.slug); - assert.deepEqual(persisted?.models, [{ id: 'glm-5' }]); - assert.equal(persisted?.modelSource, 'fetched'); - assert.equal(persisted?.modelsFetchedAt, 1_800_000_000_000); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -}); - -test('a fallback-only provider cannot turn its static snapshot into a fetched catalog', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-model-discovery-')); - try { - const connectionStore = createConnectionStore(workspaceRoot); - const created = await connectionStore.create({ - slug: 'volcengine-ark', - name: 'Volcengine Ark', - providerType: 'volcengine-ark', - defaultModel: 'doubao-seed-2-0-pro-260215', - }); - - await assert.rejects( - discoverConnectionModels( - { - connectionStore, - resolveConnectionSecret: async () => 'ark-inference-key', - fetchModels: async () => [{ id: 'doubao-seed-2-0-pro-260215' }], - }, - created.slug, - ), - /does not support remote model discovery/, - ); - - const persisted = await connectionStore.get(created.slug); - assert.equal(persisted?.models, undefined); - assert.equal(persisted?.modelSource, undefined); - assert.equal(persisted?.modelsFetchedAt, undefined); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -}); - -test('a successful discovery atomically replaces the persisted catalog and provenance', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-model-discovery-')); - try { - const connectionStore = createConnectionStore(workspaceRoot); - const created = await connectionStore.create({ - slug: 'zai-main', - name: 'Z.ai', - providerType: 'zai-coding-plan', - defaultModel: 'glm-old', - }); - - const result = await discoverConnectionModels( - { - connectionStore, - resolveConnectionSecret: async () => 'zai-secret', - fetchModels: async () => [{ id: 'glm-new' }], - now: () => 1_900_000_000_000, - }, - created.slug, - ); - - assert.deepEqual(result, { - models: [{ id: 'glm-new' }], - source: 'fetched', - fetchedAt: 1_900_000_000_000, - }); - const persisted = await connectionStore.get(created.slug); - assert.deepEqual(persisted?.models, [{ id: 'glm-new' }]); - assert.equal(persisted?.modelSource, 'fetched'); - assert.equal(persisted?.modelsFetchedAt, 1_900_000_000_000); - assert.equal(persisted?.defaultModel, 'glm-new'); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -}); diff --git a/apps/desktop/src/main/__tests__/connection-test-status.test.ts b/apps/desktop/src/main/__tests__/connection-test-status.test.ts deleted file mode 100644 index f52ed92fbe..0000000000 --- a/apps/desktop/src/main/__tests__/connection-test-status.test.ts +++ /dev/null @@ -1,73 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { connectionTestStatusPatch } from '../connection-test-status.js'; - -describe('connection test status persistence', () => { - const now = new Date('2026-05-21T09:00:00.000Z'); - - test('success writes verified with a generalized message', () => { - assert.deepEqual( - connectionTestStatusPatch({ ok: true, modelTested: 'claude-sonnet-4-5' }, now), - { - lastTestStatus: 'verified', - lastTestAt: now.toISOString(), - lastTestMessage: '连接已验证', - }, - ); - }); - - test('401/403 failures write needs_reauth', () => { - assert.equal( - connectionTestStatusPatch({ ok: false, statusCode: 401, errorMessage: '401 raw provider body' }, now).lastTestStatus, - 'needs_reauth', - ); - assert.deepEqual( - connectionTestStatusPatch({ ok: false, statusCode: 403, errorClass: 'auth' }, now), - { - lastTestStatus: 'needs_reauth', - lastTestAt: now.toISOString(), - lastTestMessage: '鉴权失败', - }, - ); - }); - - test('timeout, network, and 5xx failures write generic error statuses', () => { - assert.equal( - connectionTestStatusPatch({ ok: false, errorClass: 'timeout', errorMessage: 'Fetch timeout' }, now).lastTestMessage, - '请求超时', - ); - assert.equal( - connectionTestStatusPatch({ ok: false, errorClass: 'network', errorMessage: 'ECONNREFUSED token=abc' }, now).lastTestMessage, - '网络错误', - ); - assert.equal( - connectionTestStatusPatch({ ok: false, statusCode: 503, errorMessage: '503 raw upstream body' }, now).lastTestMessage, - '模型服务返回错误', - ); - }); - - test('persistent message never stores raw provider error text', () => { - const result = connectionTestStatusPatch({ - ok: false, - errorClass: 'network', - errorMessage: 'Authorization: Bearer sk-live-secret-token-value', - }, now); - - assert.equal(JSON.stringify(result).includes('sk-live-secret-token-value'), false); - }); - - test('persistent message stays localized for Settings rows', () => { - const serialized = JSON.stringify([ - connectionTestStatusPatch({ ok: true, modelTested: 'claude-sonnet-4-5' }, now), - connectionTestStatusPatch({ ok: false, statusCode: 403, errorClass: 'auth' }, now), - connectionTestStatusPatch({ ok: false, errorClass: 'timeout', errorMessage: 'Fetch timeout' }, now), - connectionTestStatusPatch({ ok: false, errorClass: 'network', errorMessage: 'ECONNREFUSED token=abc' }, now), - connectionTestStatusPatch({ ok: false, statusCode: 503, errorMessage: '503 raw upstream body' }, now), - ]); - - assert.doesNotMatch( - serialized, - /Connection verified|Authentication failed|Request timed out|Network error|Provider returned an error|Connection test failed/, - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/connections-ipc-main.test.ts b/apps/desktop/src/main/__tests__/connections-ipc-main.test.ts deleted file mode 100644 index 5a97cb8d97..0000000000 --- a/apps/desktop/src/main/__tests__/connections-ipc-main.test.ts +++ /dev/null @@ -1,590 +0,0 @@ -import assert from 'node:assert/strict'; -import { createServer } from 'node:http'; -import { describe, test } from 'node:test'; -import type { CreateConnectionInput, LlmConnection, UpdateConnectionInput } from '@maka/core'; -import { registerConnectionsIpc } from '../connections-ipc-main.js'; - -type Handler = (event: unknown, ...args: unknown[]) => Promise; - -function registerHandlers( - overrides: Record = {}, -): Map { - const handlers = new Map(); - const deps = { - ipcMain: { - handle(channel: string, handler: Handler) { - handlers.set(channel, handler); - }, - }, - connectionStore: { - create: async (input: CreateConnectionInput) => ({ - ...input, - defaultModel: input.defaultModel ?? 'test-model', - enabled: true, - createdAt: 1, - updatedAt: 1, - }), - get: async () => null, - update: async () => null, - remove: async () => {}, - }, - credentialStore: { - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - syncOAuthModelConnections: async () => {}, - resolveConnectionSecret: async () => null, - hasConnectionSecret: async () => false, - disconnectManagedOAuthConnection: async () => {}, - emitConnectionListChanged: () => {}, - ...overrides, - } as unknown as Parameters[0]; - - registerConnectionsIpc(deps); - return handlers; -} - -describe('connection IPC credential boundary', () => { - test('create rejects an invalid slug before connection or credential persistence', async () => { - const sideEffects: string[] = []; - const handlers = registerHandlers({ - connectionStore: { - create: async () => { - sideEffects.push('connection'); - throw new Error('must not persist'); - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const create = handlers.get('connections:create'); - assert.ok(create); - for (const slug of [ - 42, - '', - 'a'.repeat(65), - 'line\nbreak', - 'path/segment', - 'path\\segment', - 'path:segment', - 'white space', - 'a..b', - ]) { - await assert.rejects( - create({}, { - slug, - name: 'Invalid', - providerType: 'openai', - apiKey: 'safe-test-value', - }), - /connection slug/, - ); - } - assert.deepEqual(sideEffects, []); - }); - - test('create rejects non-string and oversized API keys before persistence', async () => { - const sideEffects: string[] = []; - const handlers = registerHandlers({ - connectionStore: { - create: async () => { - sideEffects.push('connection'); - throw new Error('must not persist'); - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const create = handlers.get('connections:create'); - assert.ok(create); - for (const apiKey of [42, 'x'.repeat(4097)]) { - await assert.rejects( - create({}, { - slug: 'openai-main', - name: 'OpenAI', - providerType: 'openai', - apiKey, - }), - /apiKey/, - ); - } - assert.deepEqual(sideEffects, []); - }); - - test('create rejects an invalid API key without persisting or exposing it', async () => { - const sideEffects: string[] = []; - const secret = 'private-value\nwith-control-character'; - const handlers = registerHandlers({ - connectionStore: { - create: async () => { - sideEffects.push('connection'); - throw new Error('must not persist'); - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const create = handlers.get('connections:create'); - assert.ok(create); - await assert.rejects( - create({}, { - slug: 'openai-main', - name: 'OpenAI', - providerType: 'openai', - apiKey: secret, - }), - (error: unknown) => error instanceof Error && !error.message.includes(secret), - ); - assert.deepEqual(sideEffects, []); - }); - - test('update rejects an invalid slug before reading or mutating persistence', async () => { - const sideEffects: string[] = []; - const handlers = registerHandlers({ - connectionStore: { - get: async () => { - sideEffects.push('read'); - return null; - }, - update: async () => { - sideEffects.push('connection'); - return null; - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - deleteSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const update = handlers.get('connections:update'); - assert.ok(update); - await assert.rejects(update({}, '../escape', { apiKey: 'safe-test-value' }), /connection slug/); - assert.deepEqual(sideEffects, []); - }); - - test('every renderer-controlled slug handler rejects traversal before external work', async () => { - const sideEffects: string[] = []; - const mark = (effect: string) => { - sideEffects.push(effect); - return null; - }; - const handlers = registerHandlers({ - connectionStore: { - get: async () => mark('connection:get'), - update: async () => mark('connection:update'), - remove: async () => mark('connection:remove'), - setDefault: async () => mark('connection:setDefault'), - }, - credentialStore: { - setSecret: async () => mark('credential:set'), - deleteSecret: async () => mark('credential:delete'), - }, - resolveConnectionSecret: async () => mark('credential:resolve'), - hasConnectionSecret: async () => { - mark('credential:has'); - return false; - }, - disconnectManagedOAuthConnection: async () => { - mark('oauth:disconnect'); - }, - fetchModels: async () => { - mark('provider:fetchModels'); - return []; - }, - }); - const cases: Array<{ channel: string; args: unknown[] }> = [ - { channel: 'connections:setDefault', args: ['../escape'] }, - { - channel: 'connections:setDefaultModel', - args: [{ slug: '../escape', model: 'test-model' }], - }, - { channel: 'connections:delete', args: ['../escape'] }, - { channel: 'connections:test', args: ['../escape'] }, - { channel: 'connections:fetchModels', args: ['../escape'] }, - { channel: 'connections:hasSecret', args: ['../escape'] }, - ]; - - for (const { channel, args } of cases) { - const handler = handlers.get(channel); - assert.ok(handler, `${channel} must be registered`); - await assert.rejects(handler({}, ...args), /connection slug/); - } - assert.deepEqual(sideEffects, []); - }); - - test('update rejects an invalid API key without reading, mutating, or exposing it', async () => { - const sideEffects: string[] = []; - const secret = 'private-value\u0000with-control-character'; - const handlers = registerHandlers({ - connectionStore: { - get: async () => { - sideEffects.push('read'); - return null; - }, - update: async () => { - sideEffects.push('connection'); - return null; - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - deleteSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const update = handlers.get('connections:update'); - assert.ok(update); - await assert.rejects( - update({}, 'openai-main', { apiKey: secret }), - (error: unknown) => error instanceof Error && !error.message.includes(secret), - ); - assert.deepEqual(sideEffects, []); - }); - - test('update rejects non-string and oversized API keys before reading persistence', async () => { - const sideEffects: string[] = []; - const handlers = registerHandlers({ - connectionStore: { - get: async () => { - sideEffects.push('read'); - return null; - }, - update: async () => { - sideEffects.push('connection'); - return null; - }, - }, - credentialStore: { - setSecret: async () => { - sideEffects.push('credential'); - }, - deleteSecret: async () => { - sideEffects.push('credential'); - }, - }, - }); - - const update = handlers.get('connections:update'); - assert.ok(update); - for (const apiKey of [42, 'x'.repeat(4097)]) { - await assert.rejects(update({}, 'openai-main', { apiKey }), /apiKey/); - } - assert.deepEqual(sideEffects, []); - }); - - test('create forces the canonical OAuth base URL', async () => { - let persistedInput: CreateConnectionInput | undefined; - const handlers = registerHandlers({ - connectionStore: { - create: async (input: CreateConnectionInput) => { - persistedInput = input; - return { - ...input, - defaultModel: 'gpt-5.4', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - }, - remove: async () => {}, - }, - }); - - const create = handlers.get('connections:create'); - assert.ok(create); - await create({}, { - slug: 'openai-codex', - name: 'OpenAI OAuth', - providerType: 'openai-codex', - baseUrl: 'https://attacker.example', - }); - assert.equal(persistedInput?.baseUrl, 'https://chatgpt.com/backend-api/codex'); - }); - - test('update preserves the canonical OAuth base URL', async () => { - let persistedPatch: UpdateConnectionInput | undefined; - const existing: LlmConnection = { - slug: 'openai-codex', - name: 'OpenAI OAuth', - providerType: 'openai-codex', - baseUrl: 'https://chatgpt.com/backend-api/codex', - defaultModel: 'gpt-5.4', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - const handlers = registerHandlers({ - connectionStore: { - get: async () => existing, - update: async (_slug: string, patch: UpdateConnectionInput) => { - persistedPatch = patch; - return { ...existing, ...patch }; - }, - }, - }); - - const update = handlers.get('connections:update'); - assert.ok(update); - await update({}, existing.slug, { baseUrl: 'https://attacker.example' }); - assert.equal(persistedPatch?.baseUrl, 'https://chatgpt.com/backend-api/codex'); - }); - - test('create passes relay model profiles through to the store unchanged', async () => { - let persistedInput: CreateConnectionInput | undefined; - const handlers = registerHandlers({ - connectionStore: { - create: async (input: CreateConnectionInput) => { - persistedInput = input; - return { - ...input, - defaultModel: 'my-reasoning-model', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - }, - remove: async () => {}, - }, - }); - - const create = handlers.get('connections:create'); - assert.ok(create); - const relayModelProfiles = { - 'my-reasoning-model': { - thinkingLevels: ['low', 'medium', 'high', 'max'], - vision: true, - }, - } as const; - await create({}, { - slug: 'my-relay', - name: 'My Relay', - providerType: 'openai-compatible', - baseUrl: 'https://relay.example/v1', - defaultModel: 'my-reasoning-model', - relayModelProfiles, - }); - assert.deepEqual(persistedInput?.relayModelProfiles, relayModelProfiles); - assert.equal(persistedInput?.extras, undefined); - }); - - test('update passes relay model profiles through to the store unchanged', async () => { - let persistedPatch: UpdateConnectionInput | undefined; - const existing: LlmConnection = { - slug: 'my-relay', - name: 'My Relay', - providerType: 'openai-compatible', - baseUrl: 'https://relay.example/v1', - defaultModel: 'my-reasoning-model', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - const handlers = registerHandlers({ - connectionStore: { - get: async () => existing, - update: async (_slug: string, patch: UpdateConnectionInput) => { - persistedPatch = patch; - return { ...existing, ...patch }; - }, - }, - }); - - const update = handlers.get('connections:update'); - assert.ok(update); - const relayModelProfiles = { - 'my-reasoning-model': { thinkingLevels: ['low', 'high', 'max'] }, - } as const; - await update({}, existing.slug, { relayModelProfiles }); - assert.deepEqual(persistedPatch?.relayModelProfiles, relayModelProfiles); - assert.equal(persistedPatch?.extras, undefined); - }); - - test('hasSecret uses the read-only credential probe', async () => { - const connection = { - slug: 'openai-codex', - name: 'OpenAI OAuth', - providerType: 'openai-codex', - baseUrl: 'https://chatgpt.com/backend-api/codex', - defaultModel: 'gpt-5.4', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - let probedConnection: unknown; - const handlers = registerHandlers({ - connectionStore: { - get: async () => connection, - }, - resolveConnectionSecret: async () => { - throw new Error('refreshing resolver must not run'); - }, - hasConnectionSecret: async (candidate: unknown) => { - probedConnection = candidate; - return true; - }, - }); - - const hasSecret = handlers.get('connections:hasSecret'); - assert.ok(hasSecret); - assert.equal(await hasSecret({}, connection.slug), true); - assert.equal(probedConnection, connection); - }); - - test('fetchModels allows LocalAI without an API key', async () => { - const connection: LlmConnection = { - slug: 'localai', - name: 'LocalAI', - providerType: 'localai', - baseUrl: 'http://127.0.0.1:8080/v1', - defaultModel: 'qwen3-8b', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - let receivedApiKey: string | undefined; - const handlers = registerHandlers({ - connectionStore: { - get: async () => connection, - update: async () => connection, - }, - resolveConnectionSecret: async () => null, - fetchModels: async (_candidate: LlmConnection, apiKey: string) => { - receivedApiKey = apiKey; - return [{ id: 'qwen3-8b' }]; - }, - }); - - const fetchModels = handlers.get('connections:fetchModels'); - assert.ok(fetchModels); - const result = await fetchModels({}, connection.slug); - - assert.equal(receivedApiKey, ''); - assert.deepEqual((result as { models: unknown }).models, [{ id: 'qwen3-8b' }]); - }); - - test('test allows LocalAI without an API key or Authorization header', async () => { - let authorization: string | undefined; - const server = createServer((request, response) => { - authorization = request.headers.authorization; - response.writeHead(200, { 'content-type': 'application/json' }); - response.end('{}'); - }); - await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)); - const address = server.address(); - assert.ok(address && typeof address === 'object'); - - const connection: LlmConnection = { - slug: 'localai', - name: 'LocalAI', - providerType: 'localai', - baseUrl: `http://127.0.0.1:${address.port}/v1`, - defaultModel: 'qwen3-8b', - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - const handlers = registerHandlers({ - connectionStore: { - get: async () => connection, - update: async () => connection, - }, - resolveConnectionSecret: async () => null, - }); - - try { - const testConnection = handlers.get('connections:test'); - assert.ok(testConnection); - const result = await testConnection({}, connection.slug); - - assert.equal((result as { ok: boolean }).ok, true); - assert.equal(authorization, undefined); - } finally { - await new Promise((resolve, reject) => { - server.close((error) => (error ? reject(error) : resolve())); - }); - } - }); - - test('test records the healthy fallback without changing a customized default model', async () => { - const updates: UpdateConnectionInput[] = []; - const server = createServer((request, response) => { - const chunks: Buffer[] = []; - request.on('data', (chunk: Buffer) => chunks.push(chunk)); - request.on('end', () => { - const body = JSON.parse(Buffer.concat(chunks).toString('utf8')) as { model: string }; - response.writeHead(200, { 'content-type': 'application/json' }); - response.end( - JSON.stringify( - body.model === 'custom-broken-free' - ? { error: { type: 'server_error' } } - : { choices: [{ message: { role: 'assistant', content: 'ok' } }] }, - ), - ); - }); - }); - await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)); - const address = server.address(); - assert.ok(address && typeof address === 'object'); - const connection: LlmConnection = { - slug: 'my-opencode-free', - name: 'My free connection', - providerType: 'opencode-free', - baseUrl: `http://127.0.0.1:${address.port}/v1`, - defaultModel: 'custom-broken-free', - enabledModelIds: ['custom-broken-free'], - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - const handlers = registerHandlers({ - connectionStore: { - get: async () => connection, - update: async (_slug: string, patch: UpdateConnectionInput) => { - updates.push(patch); - return connection; - }, - }, - }); - - try { - const testConnection = handlers.get('connections:test'); - assert.ok(testConnection); - const result = (await testConnection({}, connection.slug)) as { - ok: boolean; - modelTested?: string; - }; - - assert.equal(result.ok, true); - assert.equal(result.modelTested, 'nemotron-3-ultra-free'); - assert.equal(updates.length, 1); - assert.equal(updates[0]?.lastTestStatus, 'verified'); - assert.equal('defaultModel' in updates[0]!, false); - assert.equal('enabledModelIds' in updates[0]!, false); - } finally { - await new Promise((resolve, reject) => { - server.close((error) => (error ? reject(error) : resolve())); - }); - } - }); -}); diff --git a/apps/desktop/src/main/__tests__/create-connection-with-credential.test.ts b/apps/desktop/src/main/__tests__/create-connection-with-credential.test.ts deleted file mode 100644 index 448b1af485..0000000000 --- a/apps/desktop/src/main/__tests__/create-connection-with-credential.test.ts +++ /dev/null @@ -1,40 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, it } from 'node:test'; -import { createConnectionStore } from '@maka/storage'; -import { createConnectionWithCredential } from '../create-connection-with-credential.js'; - -describe('createConnectionWithCredential', () => { - it('removes the new connection when credential persistence fails', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-create-connection-')); - try { - const connectionStore = createConnectionStore(workspaceRoot); - await assert.rejects( - createConnectionWithCredential( - { - connectionStore, - credentialStore: { - async setSecret() { - throw new Error('credential write failed'); - }, - }, - }, - { - slug: 'openai', - name: 'OpenAI', - providerType: 'openai', - apiKey: 'test-key', - }, - ), - /credential write failed/, - ); - - assert.deepEqual(await connectionStore.list(), []); - assert.equal(await connectionStore.getDefault(), null); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } - }); -}); diff --git a/apps/desktop/src/main/__tests__/cursor-subscription-retirement.test.ts b/apps/desktop/src/main/__tests__/cursor-subscription-retirement.test.ts deleted file mode 100644 index 83e8a7f8af..0000000000 --- a/apps/desktop/src/main/__tests__/cursor-subscription-retirement.test.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { mkdir, mkdtemp, rm, stat, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, it } from 'node:test'; -import { createFileCredentialStore } from '../credential-store.js'; -import { retireCursorSubscriptionCredentials } from '../oauth/cursor-subscription-retirement.js'; - -describe('Cursor subscription credential retirement', () => { - it('removes both Cursor stores without touching other credentials and is safe to rerun', async (t) => { - const root = await mkdtemp(join(tmpdir(), 'maka-cursor-retirement-')); - t.after(() => rm(root, { recursive: true, force: true })); - const userDataDir = join(root, 'user-data'); - await mkdir(userDataDir); - const legacyTokenPath = join(userDataDir, '.cursor_subscription_token'); - await writeFile(legacyTokenPath, 'legacy-token'); - - const credentialStore = createFileCredentialStore(join(root, 'workspace')); - await credentialStore.setSecret('cursor-subscription', 'oauth_token', 'cursor-oauth'); - await credentialStore.setSecret('cursor-subscription', 'api_key', 'cursor-api-key'); - await credentialStore.setSecret('openai', 'oauth_token', 'openai-oauth'); - await credentialStore.setSecret('anthropic', 'api_key', 'anthropic-api-key'); - - await retireCursorSubscriptionCredentials({ userDataDir, credentialStore }); - await assert.rejects(stat(legacyTokenPath), { code: 'ENOENT' }); - assert.equal(await credentialStore.getSecret('cursor-subscription', 'oauth_token'), null); - assert.equal( - await credentialStore.getSecret('cursor-subscription', 'api_key'), - 'cursor-api-key', - ); - assert.equal(await credentialStore.getSecret('openai', 'oauth_token'), 'openai-oauth'); - assert.equal(await credentialStore.getSecret('anthropic', 'api_key'), 'anthropic-api-key'); - - await retireCursorSubscriptionCredentials({ userDataDir, credentialStore }); - await assert.rejects(stat(legacyTokenPath), { code: 'ENOENT' }); - assert.equal( - await credentialStore.getSecret('cursor-subscription', 'api_key'), - 'cursor-api-key', - ); - assert.equal(await credentialStore.getSecret('openai', 'oauth_token'), 'openai-oauth'); - assert.equal(await credentialStore.getSecret('anthropic', 'api_key'), 'anthropic-api-key'); - }); - - it('attempts the shared-store cleanup when the legacy file cannot be removed', async (t) => { - const root = await mkdtemp(join(tmpdir(), 'maka-cursor-retirement-failure-')); - t.after(() => rm(root, { recursive: true, force: true })); - const legacyTokenPath = join(root, '.cursor_subscription_token'); - await mkdir(legacyTokenPath); - const deleted: string[] = []; - - await assert.rejects( - retireCursorSubscriptionCredentials({ - userDataDir: root, - credentialStore: { - deleteSecret: async (slug, kind) => { - deleted.push(`${slug}:${String(kind)}`); - }, - }, - }), - AggregateError, - ); - assert.deepEqual(deleted, ['cursor-subscription:oauth_token']); - }); - - it('removes the legacy file when the shared store fails and retries on the next run', async (t) => { - const root = await mkdtemp(join(tmpdir(), 'maka-cursor-retirement-retry-')); - t.after(() => rm(root, { recursive: true, force: true })); - const legacyTokenPath = join(root, '.cursor_subscription_token'); - await writeFile(legacyTokenPath, 'legacy-token'); - let deleteAttempts = 0; - const deps = { - userDataDir: root, - credentialStore: { - deleteSecret: async () => { - deleteAttempts += 1; - if (deleteAttempts === 1) throw new Error('credential store unavailable'); - }, - }, - }; - - await assert.rejects(retireCursorSubscriptionCredentials(deps), AggregateError); - await assert.rejects(stat(legacyTokenPath), { code: 'ENOENT' }); - - await retireCursorSubscriptionCredentials(deps); - assert.equal(deleteAttempts, 2); - }); -}); diff --git a/apps/desktop/src/main/__tests__/daily-review-idempotency.test.ts b/apps/desktop/src/main/__tests__/daily-review-idempotency.test.ts deleted file mode 100644 index b25a637014..0000000000 --- a/apps/desktop/src/main/__tests__/daily-review-idempotency.test.ts +++ /dev/null @@ -1,161 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import { - createDailyReviewMainService, - parseDailyReviewSections, -} from '../daily-review-main.js'; - -const emptyUsageSummary = { - range: { from: 0, to: 0 }, - totalRequests: 0, - totalCostUsd: 0, - totalTokens: { - input: 0, - output: 0, - cacheMiss: 0, - cacheRead: 0, - cacheWrite: 0, - reasoning: 0, - total: 0, - }, - cacheHitRequests: 0, - cacheCreateRequests: 0, - errorRequests: 0, -}; - -function createService(archiveStore: Record) { - return createDailyReviewMainService({ - archiveStore: { - getConfig: async () => ({ enabled: true, executeTime: '08:00', modelKey: '' }), - prune: async () => undefined, - ...archiveStore, - }, - telemetryRepo: { - summary: () => emptyUsageSummary, - buckets: () => [], - }, - modelCallLedger: { - read: () => ({ attempts: [], unreadableRecords: 0 }), - pendingReprojections: () => [], - }, - ensureUsageReady: async () => undefined, - listSessions: async () => [], - connectionStore: {}, - resolveConnectionSecret: async () => null, - buildSubscriptionModelFetch: () => undefined, - } as unknown as Parameters[0]); -} - -test('Daily Review rejects model output without a usable section', () => { - for (const output of ['', '{}', '[]', 'null', '{"summary":42}', '{"summary":" "}']) { - assert.throws(() => parseDailyReviewSections(output)); - } - assert.deepEqual(parseDailyReviewSections('plain text fallback'), { - summary: 'plain text fallback', - }); -}); - -test('Daily Review run reuses an existing archive', async (t) => { - t.mock.timers.enable({ apis: ['Date'], now: new Date(2026, 7, 3, 9, 0, 0).getTime() }); - let writes = 0; - const service = createService({ - getArchive: async () => ({ - status: 'ok', - range: 1, - day: { - fromMs: new Date(2026, 7, 3, 0, 0, 0, 0).getTime(), - toMs: new Date(2026, 7, 4, 0, 0, 0, 0).getTime(), - }, - }), - putArchive: async () => { - writes += 1; - }, - }); - - try { - const result = await service.run({ range: 1, trigger: 'manual' }); - - assert.equal(result.archiveId, '2026-08-03-1d'); - assert.equal(writes, 0); - } finally { - t.mock.timers.reset(); - } -}); - -test('Daily Review run retries every non-success archive status', async (t) => { - t.mock.timers.enable({ apis: ['Date'], now: new Date(2026, 7, 3, 9, 0, 0).getTime() }); - try { - for (const status of ['no_data', 'no_model', 'failed', 'skipped']) { - let writes = 0; - const service = createService({ - getArchive: async () => ({ status }), - putArchive: async () => { - writes += 1; - }, - }); - - await service.run({ range: 1, trigger: 'manual' }); - assert.equal(writes, 1, `${status} should remain retryable`); - } - } finally { - t.mock.timers.reset(); - } -}); - -test('Daily Review run replaces an ok archive for a different resolved day', async (t) => { - t.mock.timers.enable({ apis: ['Date'], now: new Date(2026, 7, 3, 9, 0, 0).getTime() }); - let writes = 0; - const service = createService({ - getArchive: async () => ({ - status: 'ok', - range: 1, - day: { fromMs: 1, toMs: 2 }, - }), - putArchive: async () => { - writes += 1; - }, - }); - - try { - await service.run({ range: 1, trigger: 'manual' }); - assert.equal(writes, 1); - } finally { - t.mock.timers.reset(); - } -}); - -test('Daily Review run coalesces concurrent generation for the same archive', async (t) => { - t.mock.timers.enable({ apis: ['Date'], now: new Date(2026, 7, 3, 9, 0, 0).getTime() }); - let writes = 0; - let releaseWrite!: () => void; - let notifyWriteStarted!: () => void; - const writeStarted = new Promise((resolve) => { - notifyWriteStarted = resolve; - }); - const writeReleased = new Promise((resolve) => { - releaseWrite = resolve; - }); - const service = createService({ - getArchive: async () => null, - putArchive: async () => { - writes += 1; - notifyWriteStarted(); - await writeReleased; - }, - }); - - try { - const first = service.run({ range: 7, trigger: 'manual' }); - await writeStarted; - const second = service.run({ range: 7, trigger: 'manual' }); - await new Promise((resolve) => setImmediate(resolve)); - releaseWrite(); - - const [firstResult, secondResult] = await Promise.all([first, second]); - assert.deepEqual(secondResult, firstResult); - assert.equal(writes, 1); - } finally { - releaseWrite(); - t.mock.timers.reset(); - } -}); diff --git a/apps/desktop/src/main/__tests__/daily-review-scheduler.test.ts b/apps/desktop/src/main/__tests__/daily-review-scheduler.test.ts deleted file mode 100644 index 7313a1acbb..0000000000 --- a/apps/desktop/src/main/__tests__/daily-review-scheduler.test.ts +++ /dev/null @@ -1,91 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import { createDailyReviewMainService } from '../daily-review-main.js'; - -test('Daily Review scheduler targets the previous complete local day without overwriting it', async (t) => { - const scheduledAt = new Date(2026, 7, 3, 8, 0, 0, 0); - const previousDay = { - fromMs: new Date(2026, 7, 2, 0, 0, 0, 0).getTime(), - toMs: new Date(2026, 7, 3, 0, 0, 0, 0).getTime(), - }; - t.mock.timers.enable({ apis: ['Date'], now: scheduledAt.getTime() }); - let resolveChecked!: () => void; - const checked = new Promise((resolve) => { - resolveChecked = resolve; - }); - let checkedArchiveId = ''; - let writes = 0; - - const emptySummary = { - range: { from: 0, to: 0 }, - totalRequests: 0, - totalCostUsd: 0, - totalTokens: { - input: 0, - output: 0, - cacheMiss: 0, - cacheRead: 0, - cacheWrite: 0, - reasoning: 0, - total: 0, - }, - cacheHitRequests: 0, - cacheCreateRequests: 0, - errorRequests: 0, - }; - - const service = createDailyReviewMainService({ - archiveStore: { - getConfig: async () => ({ enabled: true, executeTime: '08:00', modelKey: '' }), - getArchive: async (archiveId: string) => { - checkedArchiveId = archiveId; - resolveChecked(); - return { - id: archiveId, - day: previousDay, - range: 1, - status: 'ok', - generatedAt: scheduledAt.getTime(), - trigger: 'cron', - modelKey: '', - sections: { summary: 'existing' }, - totals: { - sessionCount: 0, - requestCount: 0, - totalTokens: 0, - costUsd: 0, - errorCount: 0, - }, - }; - }, - putArchive: async () => { - writes += 1; - }, - prune: async () => undefined, - }, - telemetryRepo: { - summary: () => emptySummary, - buckets: () => [], - }, - modelCallLedger: { - read: () => ({ attempts: [], unreadableRecords: 0 }), - pendingReprojections: () => [], - }, - ensureUsageReady: async () => undefined, - listSessions: async () => [], - connectionStore: {}, - resolveConnectionSecret: async () => null, - buildSubscriptionModelFetch: () => undefined, - } as unknown as Parameters[0]); - - try { - service.startScheduler(); - await checked; - await new Promise((resolve) => setImmediate(resolve)); - assert.equal(checkedArchiveId, '2026-08-02-1d'); - assert.equal(writes, 0); - } finally { - service.stopScheduler(); - t.mock.timers.reset(); - } -}); diff --git a/apps/desktop/src/main/__tests__/daily-review-usage-readiness.test.ts b/apps/desktop/src/main/__tests__/daily-review-usage-readiness.test.ts deleted file mode 100644 index 02efea4a79..0000000000 --- a/apps/desktop/src/main/__tests__/daily-review-usage-readiness.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { test } from 'node:test'; -import { createSqliteModelCallLedger, createSqliteTelemetryRepo } from '@maka/storage'; -import { createDailyReviewMainService } from '../daily-review-main.js'; - -function deferred() { - let resolve!: () => void; - const promise = new Promise((done) => { - resolve = done; - }); - return { promise, resolve }; -} - -test('Daily Review waits for shared usage readiness before reading telemetry', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-daily-review-usage-ready-')); - const seeded = createSqliteTelemetryRepo(root); - const telemetryRepo = createSqliteTelemetryRepo(root, { createIfMissing: false }); - const modelCallLedger = createSqliteModelCallLedger(root); - const loadGate = deferred(); - - try { - const now = Date.now(); - await seeded.load(); - await seeded.insertLlmCall({ - id: 'usage_daily_review_ready', - providerId: 'openai', - modelId: 'gpt-5', - inputTokens: 10, - outputTokens: 20, - cacheHitInputTokens: 0, - cacheMissInputTokens: 10, - cachedInputTokens: 0, - cacheWriteInputTokens: 0, - reasoningTokens: 0, - totalTokens: 30, - costUsd: 0.001, - latencyMs: 5, - status: 'success', - startedAt: now - 5, - date: new Date(now).toISOString().slice(0, 10), - ts: now, - }); - await seeded.close(); - - const service = createDailyReviewMainService({ - telemetryRepo, - modelCallLedger, - ensureUsageReady: async () => { - await loadGate.promise; - await telemetryRepo.load(); - }, - listSessions: async () => [], - archiveStore: {}, - connectionStore: {}, - resolveConnectionSecret: async () => null, - buildSubscriptionModelFetch: () => undefined, - } as unknown as Parameters[0]); - - const summaryPending = service.buildSummaryForRange(0, 1); - await Promise.resolve(); - assert.throws(() => telemetryRepo.summary({ range: 'all' })); - loadGate.resolve(); - const summary = await summaryPending; - assert.equal(summary.totals.requestCount, 1); - } finally { - await Promise.allSettled([seeded.close(), modelCallLedger.close(), telemetryRepo.close()]); - await rm(root, { recursive: true, force: true }); - } -}); diff --git a/apps/desktop/src/main/__tests__/delete-connection-with-credential.test.ts b/apps/desktop/src/main/__tests__/delete-connection-with-credential.test.ts deleted file mode 100644 index b1660d3607..0000000000 --- a/apps/desktop/src/main/__tests__/delete-connection-with-credential.test.ts +++ /dev/null @@ -1,102 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import type { LlmConnection } from '@maka/core'; -import { deleteConnectionWithCredential } from '../delete-connection-with-credential.js'; - -function connection(): LlmConnection { - return { - slug: 'codex-subscription', - name: 'Codex OAuth', - providerType: 'openai-codex', - defaultModel: 'gpt-5.6-sol', - enabled: true, - enabledModelIds: ['gpt-5.6-sol'], - createdAt: 1, - updatedAt: 1, - }; -} - -describe('deleteConnectionWithCredential', () => { - it('disconnects an account-managed connection before removing its catalog row', async () => { - const calls: string[] = []; - await deleteConnectionWithCredential( - { - connectionStore: { - get: async () => connection(), - delete: async (slug) => { - calls.push(`delete:${slug}`); - }, - }, - credentialStore: { - deleteSecret: async (slug) => { - calls.push(`credential:${slug}`); - }, - }, - disconnectManagedOAuthConnection: async (item) => { - calls.push(`disconnect:${item.providerType}`); - }, - }, - 'codex-subscription', - ); - - assert.deepEqual(calls, [ - 'disconnect:openai-codex', - 'delete:codex-subscription', - 'credential:codex-subscription', - ]); - }); - - it('does not remove the connection when account logout fails', async () => { - const calls: string[] = []; - await assert.rejects( - deleteConnectionWithCredential( - { - connectionStore: { - get: async () => connection(), - delete: async () => { - calls.push('delete'); - }, - }, - credentialStore: { - deleteSecret: async () => { - calls.push('credential'); - }, - }, - disconnectManagedOAuthConnection: async () => { - calls.push('disconnect'); - throw new Error('logout failed'); - }, - }, - 'codex-subscription', - ), - /logout failed/, - ); - - assert.deepEqual(calls, ['disconnect']); - }); - - it('keeps deletion idempotent when the catalog row is already gone', async () => { - const calls: string[] = []; - await deleteConnectionWithCredential( - { - connectionStore: { - get: async () => null, - delete: async (slug) => { - calls.push(`delete:${slug}`); - }, - }, - credentialStore: { - deleteSecret: async (slug) => { - calls.push(`credential:${slug}`); - }, - }, - disconnectManagedOAuthConnection: async () => { - calls.push('disconnect'); - }, - }, - 'missing', - ); - - assert.deepEqual(calls, ['delete:missing', 'credential:missing']); - }); -}); diff --git a/apps/desktop/src/main/__tests__/desktop-backend-tool-surface.test.ts b/apps/desktop/src/main/__tests__/desktop-backend-tool-surface.test.ts deleted file mode 100644 index a5975e0e0a..0000000000 --- a/apps/desktop/src/main/__tests__/desktop-backend-tool-surface.test.ts +++ /dev/null @@ -1,626 +0,0 @@ -import { createToolResultArchiveCapability } from '@maka/runtime'; -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import type { LlmConnection, SessionHeader } from '@maka/core'; -import { emptyPlanSessionState, type PlanStore } from '@maka/core/plan'; -import type { McpClientManager } from '@maka/mcp'; -import { - type AiSdkBackendInput, - type BackendFactoryContext, - buildParentAgentTools, - listRunnableBuiltinAgentDefinitions, - type MakaTool, - type ToolAvailabilityConfig, -} from '@maka/runtime'; -import { - resolveDesktopBackendToolSurface, - resolveDesktopChildToolSurface, - resolveDesktopNewSessionSkillHost, - resolveDesktopSessionSkillHost, - type DesktopBackendToolSurfaceDeps, -} from '../desktop-backend-tool-surface.js'; -import { - createAiSdkBackendFactory, - type AiSdkBackendFactoryDeps, -} from '../session-stream.js'; - -const readTool = tool('Read', 'read'); -const writeTool = tool('Write', 'file_write'); -const computerTool = tool('maka_computer', 'computer_use'); -const availability: ToolAvailabilityConfig = { - economy: true, - groups: [ - { id: 'files', toolNames: ['Read', 'Write'] }, - { id: 'computer_use', toolNames: ['maka_computer'] }, - ], -}; - -describe('Desktop backend tool surface', () => { - it('builds the Memory prompt for the backend session identity', async () => { - const deps = makeFactoryDeps(); - let memorySessionId: string | undefined; - deps.systemPromptService = { - ...deps.systemPromptService, - buildLocalMemoryPromptFragment: async (sessionId) => { - memorySessionId = sessionId; - return ''; - }, - }; - - await backendInput(createAiSdkBackendFactory(deps), undefined); - - assert.equal(memorySessionId, 'session-1'); - }); - - it('uses the effective Agent surface as the complete child-runtime capability boundary', async () => { - const agentTools = [ - tool('agent_spawn', 'subagent'), - tool('agent_list', 'read'), - tool('agent_output', 'read'), - ]; - const factory = createAiSdkBackendFactory( - makeFactoryDeps({ - builtinTools: [readTool, writeTool, computerTool, ...agentTools], - }), - ); - - const rootInput = await backendInput(factory, undefined); - for (const capability of AGENT_RUNTIME_CAPABILITIES) { - assert.equal(typeof rootInput[capability], 'function', `expected root ${capability}`); - } - - const scopedInput = await backendInput(factory, [readTool]); - for (const capability of AGENT_RUNTIME_CAPABILITIES) { - assert.equal(scopedInput[capability], undefined, `unexpected scoped ${capability}`); - } - }); - - it('derives model-gated Skill capabilities from the current session header', async () => { - const deps = makeDeps(); - - const visual = await resolveDesktopBackendToolSurface( - deps, - inputFor('claude-sonnet-4-5-20250929'), - ); - assert.equal(visual.supportsVision, true); - assert.equal(visual.skillHost.toolNames.has('maka_computer'), true); - assert.equal( - visual.toolAvailability.groups?.some((group) => group.id === 'computer_use'), - true, - ); - - const textOnly = await resolveDesktopBackendToolSurface( - deps, - inputFor('text-only-e2e'), - ); - assert.equal(textOnly.supportsVision, false); - assert.equal(textOnly.skillHost.toolNames.has('maka_computer'), false); - assert.equal( - textOnly.toolAvailability.groups?.some((group) => group.id === 'computer_use'), - false, - ); - }); - - it('derives collaboration-gated Skill capabilities from the current session header', async () => { - const deps = makeDeps(); - const agent = await resolveDesktopBackendToolSurface( - deps, - inputFor('claude-sonnet-4-5-20250929', 'agent'), - ); - assert.equal(agent.skillHost.toolNames.has('Read'), true); - assert.equal(agent.skillHost.toolNames.has('Write'), true); - assert.equal(agent.skillHost.toolNames.has('SubmitPlan'), false); - - const plan = await resolveDesktopBackendToolSurface( - deps, - inputFor('claude-sonnet-4-5-20250929', 'plan'), - ); - assert.equal(plan.skillHost.toolNames.has('Read'), true); - assert.equal(plan.skillHost.toolNames.has('Write'), false); - assert.equal(plan.skillHost.toolNames.has('SubmitPlan'), true); - }); - - it('keeps MCP readiness fail-open while deriving builtin capabilities', async () => { - let readinessCalls = 0; - const deps = makeDeps({ - ensureMcpReady: async () => { - readinessCalls += 1; - throw new Error('invalid mcp config'); - }, - }); - - const surface = await resolveDesktopBackendToolSurface( - deps, - inputFor('claude-sonnet-4-5-20250929'), - ); - assert.equal(readinessCalls, 1); - assert.equal(surface.skillHost.toolNames.has('Read'), true); - assert.equal(surface.skillHost.toolNames.has('Write'), true); - }); - - it('keeps scoped child tools ahead of root-only computer-use and Plan controls', async () => { - const deps = makeDeps({ isComputerUseRealModelE2e: true }); - const input = inputFor('claude-sonnet-4-5-20250929', 'plan'); - - const child = await resolveDesktopBackendToolSurface(deps, { - ...input, - tools: [readTool], - }); - - assert.deepEqual([...child.skillHost.toolNames], ['Read']); - assert.equal(child.skillHost.toolNames.has('maka_computer'), false); - assert.equal(child.skillHost.toolNames.has('SubmitPlan'), false); - }); - - it('binds graph supervisor tools only to an existing root Session', async () => { - let graphToolRequests = 0; - const graphTools = [ - tool('view_agent_graph', 'read'), - tool('update_agent_graph', 'subagent'), - ]; - const deps = makeDeps({ - getAgentGraphSupervisorTools: async () => { - graphToolRequests += 1; - return graphTools; - }, - }); - const input = inputFor('claude-sonnet-4-5-20250929'); - const root = await resolveDesktopBackendToolSurface(deps, input); - assert.equal(root.skillHost.toolNames.has('view_agent_graph'), true); - assert.equal(root.skillHost.toolNames.has('update_agent_graph'), true); - - const child = await resolveDesktopBackendToolSurface(deps, { - ...input, - tools: [readTool], - }); - assert.deepEqual([...child.skillHost.toolNames], ['Read']); - - await resolveDesktopNewSessionSkillHost(deps, { - projectRoot: '/tmp/project', - workspaceRoot: '/tmp/workspace', - readyConnection: { - connection: connectionFor('claude-sonnet-4-5-20250929'), - apiKey: 'preview-key', - model: 'claude-sonnet-4-5-20250929', - }, - }); - assert.equal(graphToolRequests, 1); - }); - - it('uses the durable child snapshot for the persisted-session Skill host', async () => { - const header = inputFor('claude-sonnet-4-5-20250929').header; - header.subagentParent = {} as SessionHeader['subagentParent']; - header.subagentRuntime = { - schemaVersion: 1, - definitionVersion: 1, - agentId: 'read-only-child', - agentName: 'Read-only child', - profile: 'local_read', - systemPrompt: 'Read only.', - toolNames: ['Read'], - categoryPolicy: { read: 'allow' }, - permissionCeiling: 'ask', - }; - - const host = await resolveDesktopSessionSkillHost(makeDeps(), { - sessionId: header.id, - header, - childTools: [readTool, writeTool], - }); - - assert.deepEqual([...host.toolNames], ['Read']); - assert.equal(host.toolNames.has('Write'), false); - }); - - it('does not use the legacy permission ceiling as child admission authority', async () => { - const header = inputFor('claude-sonnet-4-5-20250929').header; - header.permissionMode = 'execute'; - header.subagentParent = {} as SessionHeader['subagentParent']; - header.subagentRuntime = { - schemaVersion: 1, - definitionVersion: 1, - agentId: 'implementation-child', - agentName: 'Implementation child', - profile: 'implementation', - systemPrompt: 'Implement.', - toolNames: ['Write'], - categoryPolicy: {}, - permissionCeiling: 'ask', - }; - - const host = await resolveDesktopSessionSkillHost(makeDeps(), { - sessionId: header.id, - header, - childTools: [readTool, writeTool], - }); - - assert.deepEqual([...host.toolNames], ['Write']); - }); - - it('never previews Deep Research tools — the preview stands in for a plain chat', async () => { - // #1433: this used to branch on a `mode` the Quick Chat panel passed in - // before its session existed. That panel is gone; the only entry point - // that picks Deep Research creates its session up front, so by the time - // the composer mounts there is a real header and the preview is not it. - // A preview that could still claim Deep Research would be a second, - // hand-written copy of `sessionModeSeed`. - const deepResearchTool = tool('deep_research_status', 'read'); - const deps = makeDeps({ deepResearchTools: [deepResearchTool] }); - - const preview = await resolveDesktopNewSessionSkillHost(deps, { - projectRoot: '/tmp/project', - workspaceRoot: '/tmp/workspace', - readyConnection: { - connection: connectionFor('claude-sonnet-4-5-20250929'), - apiKey: 'preview-key', - model: 'claude-sonnet-4-5-20250929', - }, - }); - - assert.equal(preview.toolNames.has('deep_research_status'), false); - }); - - it('keeps Deep Research on a read-only local tool surface without boundary expansion', async () => { - const requestBoundary = tool('request_sandbox_boundary', 'custom_tool'); - const bash = tool('Bash', 'shell_unsafe'); - const exploreAgent = tool('ExploreAgent', 'subagent'); - const webSearch = tool('WebSearch', 'web_read'); - const deepResearchStatus = tool('deep_research_status', 'read'); - const deps = makeDeps({ - builtinTools: [ - readTool, - writeTool, - requestBoundary, - bash, - exploreAgent, - webSearch, - ], - deepResearchTools: [deepResearchStatus], - getWebSearchSettings: async () => ({ - enabled: true, - defaultProvider: 'tavily', - providers: { - tavily: { - apiKey: 'tavily-key', - credentialSource: 'saved', - credentialVersion: 1, - credentialStatus: 'valid', - }, - }, - }), - }); - const input = inputFor('claude-sonnet-4-5-20250929'); - input.header.labels = ['mode:deep_research']; - - const surface = await resolveDesktopBackendToolSurface(deps, input); - - assert.deepEqual( - surface.selectedTools.map((candidate) => candidate.name), - ['Read', 'ExploreAgent', 'WebSearch', 'deep_research_status'], - ); - }); - - it('replaces client-executed WebSearch with provider-native search for DeepSeek V4', async () => { - const clientSearch = tool('WebSearch', 'web_read'); - const deepseek: LlmConnection = { - ...connectionFor('deepseek-v4-flash'), - providerType: 'deepseek', - models: [ - { - id: 'deepseek-v4-flash', - apiProtocol: 'openai-responses', - capabilities: { webSearch: true }, - }, - ], - }; - const deps = makeDeps({ - builtinTools: [readTool, clientSearch], - getReadyConnection: async () => ({ - connection: deepseek, - apiKey: 'deepseek-key', - model: 'deepseek-v4-flash', - }), - getWebSearchSettings: async () => ({ - enabled: true, - defaultProvider: 'model', - providers: { - tavily: { - apiKey: '', - credentialSource: 'none', - credentialVersion: 0, - credentialStatus: 'untested', - }, - }, - }), - }); - - const surface = await resolveDesktopBackendToolSurface( - deps, - inputFor('deepseek-v4-flash'), - ); - const searches = surface.selectedTools.filter((candidate) => candidate.name === 'WebSearch'); - assert.equal(searches.length, 1); - assert.deepEqual(searches[0]?.providerTool, { - kind: 'openai-web-search', - searchContextSize: 'medium', - }); - }); - - it('omits every web-reading implementation while privacy mode is active', async () => { - const clientSearch = tool('WebSearch', 'web_read'); - const webFetch = tool('WebFetch', 'web_read'); - const deepseek: LlmConnection = { - ...connectionFor('deepseek-v4-flash'), - providerType: 'deepseek', - models: [{ id: 'deepseek-v4-flash', apiProtocol: 'openai-responses' }], - }; - const deps = makeDeps({ - builtinTools: [readTool, clientSearch, webFetch], - getReadyConnection: async () => ({ - connection: deepseek, - apiKey: 'deepseek-key', - model: 'deepseek-v4-flash', - }), - getWebSearchSettings: async () => ({ - enabled: true, - defaultProvider: 'model', - providers: { - tavily: { - apiKey: '', - credentialSource: 'none', - credentialVersion: 0, - credentialStatus: 'untested', - }, - }, - }), - getPrivacySettings: async () => ({ incognitoActive: true }), - }); - - const surface = await resolveDesktopBackendToolSurface( - deps, - inputFor('deepseek-v4-flash'), - ); - - assert.equal( - surface.selectedTools.some((candidate) => candidate.name === 'WebSearch'), - false, - ); - assert.equal( - surface.selectedTools.some((candidate) => candidate.name === 'WebFetch'), - false, - ); - }); - - it('derives Desktop parent and child agent availability from the routed search surface', async () => { - const clientSearch = tool('WebSearch', 'web_read'); - const staticParentTools = buildParentAgentTools(); - const deepseek: LlmConnection = { - ...connectionFor('deepseek-v4-flash'), - providerType: 'deepseek', - models: [{ id: 'deepseek-v4-flash', apiProtocol: 'openai-responses' }], - }; - const childTools = [readTool, clientSearch]; - const routedProfiles = new Map(); - const makeSearchDeps = (enabled: boolean) => - makeDeps({ - builtinTools: [readTool, ...staticParentTools], - childTools, - buildParentAgentToolsForChildSurface: (routedChildTools) => { - const definitions = listRunnableBuiltinAgentDefinitions({ tools: routedChildTools }); - routedProfiles.set(enabled, definitions.map((definition) => definition.profile)); - return buildParentAgentTools({ definitions }); - }, - getReadyConnection: async () => ({ - connection: deepseek, - apiKey: 'deepseek-key', - model: 'deepseek-v4-flash', - }), - getWebSearchSettings: async () => ({ - enabled, - defaultProvider: 'model', - providers: { - tavily: { - apiKey: '', - credentialSource: 'none', - credentialVersion: 0, - credentialStatus: 'untested', - }, - }, - }), - }); - - const disabledDeps = makeSearchDeps(false); - await resolveDesktopBackendToolSurface( - disabledDeps, - inputFor('deepseek-v4-flash'), - ); - assert.equal(routedProfiles.get(false)?.includes('web_research'), false); - assert.deepEqual( - ( - await resolveDesktopChildToolSurface(disabledDeps, { - header: inputFor('deepseek-v4-flash').header, - tools: childTools, - }) - ).map((tool) => tool.name), - ['Read'], - ); - - const enabledDeps = makeSearchDeps(true); - await resolveDesktopBackendToolSurface( - enabledDeps, - inputFor('deepseek-v4-flash'), - ); - assert.equal(routedProfiles.get(true)?.includes('web_research'), true); - const routedChildTools = await resolveDesktopChildToolSurface(enabledDeps, { - header: inputFor('deepseek-v4-flash').header, - tools: childTools, - }); - assert.equal( - routedChildTools.find((tool) => tool.name === 'WebSearch')?.providerTool?.kind, - 'openai-web-search', - ); - }); - - it('uses explicit preview inputs without reading a nonexistent session plan', async () => { - let connectionReads = 0; - let planReads = 0; - const deps = makeDeps({ - getReadyConnection: async () => { - connectionReads += 1; - throw new Error('preview must reuse its resolved connection'); - }, - planStore: { - readState: async () => { - planReads += 1; - throw new Error('preview must reuse its empty plan state'); - }, - } as unknown as PlanStore, - }); - const input = inputFor('claude-sonnet-4-5-20250929', 'plan'); - const surface = await resolveDesktopBackendToolSurface(deps, { - ...input, - readyConnection: { - connection: connectionFor('claude-sonnet-4-5-20250929'), - apiKey: 'preview-key', - model: 'claude-sonnet-4-5-20250929', - }, - planState: emptyPlanSessionState(input.sessionId), - }); - - assert.equal(connectionReads, 0); - assert.equal(planReads, 0); - assert.equal(surface.skillHost.toolNames.has('Write'), false); - assert.equal(surface.skillHost.toolNames.has('SubmitPlan'), true); - }); -}); - -function makeDeps( - overrides: Partial = {}, -): DesktopBackendToolSurfaceDeps { - const planStore = { - readState: async (sessionId: string) => emptyPlanSessionState(sessionId), - } as PlanStore; - return { - isComputerUseRealModelE2e: false, - ensureMcpReady: async () => {}, - getReadyConnection: async (_slug, model) => ({ - connection: connectionFor(model ?? 'claude-sonnet-4-5-20250929'), - apiKey: 'test-key', - model: model ?? 'claude-sonnet-4-5-20250929', - }), - mcpManager: { tools: () => [] } as unknown as McpClientManager, - deepResearchTools: [], - computerUseTools: [computerTool], - builtinTools: [readTool, writeTool, computerTool], - toolEconomy: availability.economy, - planStore, - ...overrides, - }; -} - -function inputFor( - model: string, - collaborationMode: 'agent' | 'plan' = 'agent', -) { - return { - sessionId: 'session-1', - header: { - id: 'session-1', - cwd: '/tmp/project', - workspaceRoot: '/tmp/workspace', - backend: 'ai-sdk', - llmConnectionSlug: 'connection-1', - model, - collaborationMode, - permissionMode: 'ask', - labels: [], - } as unknown as SessionHeader, - }; -} - -function connectionFor(model: string): LlmConnection { - return { - slug: 'connection-1', - name: 'Connection', - providerType: 'anthropic', - defaultModel: model, - enabled: true, - createdAt: 1, - updatedAt: 1, - }; -} - -function tool( - name: string, - categoryHint: MakaTool['categoryHint'], -): MakaTool { - return { name, categoryHint } as MakaTool; -} - -const AGENT_RUNTIME_CAPABILITIES = [ - 'spawnChildAgent', - 'spawnChildSession', - 'prepareChildAgentResume', - 'resumeChildAgent', - 'retryChildAgent', - 'listChildAgents', - 'readChildAgentOutput', -] as const satisfies readonly (keyof AiSdkBackendInput)[]; - -function makeFactoryDeps( - overrides: Partial = {}, -): AiSdkBackendFactoryDeps { - const runtime = { - spawnChildAgent: async () => undefined, - spawnChildSession: async () => undefined, - prepareChildAgentResume: async () => ({}) as never, - resumeChildAgent: async () => undefined, - retryChildAgent: async () => undefined, - listChildAgents: async () => [], - readChildAgentOutput: async () => ({}), - }; - return { - ...makeDeps(overrides), - buildSubscriptionModelFetch: () => undefined, - systemPromptService: { - buildLocalMemoryPromptFragment: async () => '', - }, - telemetryRepo: {}, - ensureUsageReady: async () => {}, - artifactStore: {}, - desktopSessionSkillHosts: new Map(), - sandboxDiagnosticsProvider: { resolve: async () => undefined }, - persistToolArtifacts: async () => {}, - toolResultArchive: testDesktopToolResultArchive(), - runtimeCommitStore: undefined, - safeSendToRenderer: () => {}, - emitSessionsChanged: () => {}, - getRuntime: () => runtime, - getLookupPricing: () => () => null, - } as unknown as AiSdkBackendFactoryDeps; -} - -async function backendInput( - factory: ReturnType, - tools: readonly MakaTool[] | undefined, -): Promise { - const base = inputFor('claude-sonnet-4-5-20250929'); - const context: BackendFactoryContext = { - ...base, - workspaceRoot: base.header.workspaceRoot, - store: { - appendMessage: async () => {}, - } as unknown as BackendFactoryContext['store'], - ...(tools ? { tools } : {}), - }; - const backend = await factory(context); - return (backend as unknown as { input: AiSdkBackendInput }).input; -} - -function testDesktopToolResultArchive() { - return createToolResultArchiveCapability({ - archiveToolResult: async () => undefined, - readToolResultArchive: async () => ({ ok: false, reason: 'not_found' }), - readArchivedToolResultResource: async () => ({ ok: false, reason: 'not_found' }), - }); -} diff --git a/apps/desktop/src/main/__tests__/desktop-runtime-owner.test.ts b/apps/desktop/src/main/__tests__/desktop-runtime-owner.test.ts deleted file mode 100644 index 363524ae97..0000000000 --- a/apps/desktop/src/main/__tests__/desktop-runtime-owner.test.ts +++ /dev/null @@ -1,20 +0,0 @@ -import assert from 'node:assert/strict'; -import test from 'node:test'; -import { resolveDesktopRuntimeOwner } from '../desktop-runtime-owner.js'; - -test('keeps the production default on the embedded owner', () => { - assert.equal(resolveDesktopRuntimeOwner(undefined), 'embedded'); - assert.equal(resolveDesktopRuntimeOwner(''), 'embedded'); - assert.equal(resolveDesktopRuntimeOwner('embedded'), 'embedded'); -}); - -test('selects the Runtime Host only through the explicit opt-in', () => { - assert.equal(resolveDesktopRuntimeOwner('runtime-host'), 'runtime-host'); -}); - -test('rejects unknown owner values instead of falling back', () => { - assert.throws( - () => resolveDesktopRuntimeOwner('host'), - /MAKA_DESKTOP_RUNTIME_OWNER must be "embedded" or "runtime-host"/, - ); -}); diff --git a/apps/desktop/src/main/__tests__/goal-wiring.test.ts b/apps/desktop/src/main/__tests__/goal-wiring.test.ts deleted file mode 100644 index fffa047e3b..0000000000 --- a/apps/desktop/src/main/__tests__/goal-wiring.test.ts +++ /dev/null @@ -1,114 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { createMainGoalWiring } from '../goal-wiring.js'; - -const SESSION = 'session-1'; - -function deferred() { - let resolve!: (value: T | PromiseLike) => void; - let reject!: (reason?: unknown) => void; - const promise = new Promise((res, rej) => { - resolve = res; - reject = rej; - }); - return { promise, resolve, reject }; -} - -function setup() { - return createMainGoalWiring({ - getDefaultConnectionSlug: async () => null, - getConnection: async () => null, - getSessionModel: async () => null, - resolveConnectionSecret: async () => null, - buildSubscriptionModelFetch: () => undefined, - getAIModel: () => undefined, - buildProviderOptions: () => undefined, - getRecentMessages: async () => [], - getTokenCount: async () => 0, - admitTurn: () => ({ kind: 'unavailable', reason: 'not used by lifecycle tests' }), - }); -} - -describe('Desktop Goal session lifecycle transaction', () => { - test('failed persistence preserves Goal ownership and reopens admission', async (t) => { - await t.test('archive', async () => { - const wiring = setup(); - wiring.manager.create(SESSION, 'keep this Goal'); - const persisted = deferred(); - const pending = wiring.archiveSession(SESSION, () => persisted.promise); - - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-pending').kind, 'unavailable'); - persisted.reject(new Error('archive failed')); - await assert.rejects(pending, /archive failed/); - - assert.equal(wiring.manager.get(SESSION)?.condition, 'keep this Goal'); - assert.equal(wiring.manager.get(SESSION)?.status, 'paused'); - assert.equal( - wiring.manager.get(SESSION)?.lastReason, - 'Goal continuation paused because session archive did not complete.', - ); - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-after-rollback').kind, 'registered'); - wiring.coordinator.dispose(); - wiring.manager.dispose(); - }); - - await t.test('remove', async () => { - const wiring = setup(); - wiring.manager.create(SESSION, 'keep this Goal'); - const persisted = deferred(); - const pending = wiring.removeSession(SESSION, () => persisted.promise); - - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-pending').kind, 'unavailable'); - persisted.reject(new Error('remove failed')); - await assert.rejects(pending, /remove failed/); - - assert.equal(wiring.manager.get(SESSION)?.condition, 'keep this Goal'); - assert.equal(wiring.manager.get(SESSION)?.status, 'paused'); - assert.equal( - wiring.manager.get(SESSION)?.lastReason, - 'Goal continuation paused because session removal did not complete.', - ); - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-after-rollback').kind, 'registered'); - wiring.coordinator.dispose(); - wiring.manager.dispose(); - }); - }); - - test('an overlapping remove rollback cannot reopen a committed archive', async () => { - const wiring = setup(); - wiring.manager.create(SESSION, 'archive me'); - const archivePersisted = deferred(); - const removePersisted = deferred(); - const archive = wiring.archiveSession(SESSION, () => archivePersisted.promise); - const remove = wiring.removeSession(SESSION, () => removePersisted.promise); - - archivePersisted.resolve(); - await archive; - removePersisted.reject(new Error('remove failed')); - await assert.rejects(remove, /remove failed/); - - assert.equal(wiring.manager.get(SESSION), undefined); - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-archived').kind, 'unavailable'); - await wiring.unarchiveSession(SESSION, async () => {}); - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-restored').kind, 'registered'); - wiring.coordinator.dispose(); - wiring.manager.dispose(); - }); - - test('permanent removal survives an older archive rollback and unarchive', async () => { - const wiring = setup(); - wiring.manager.create(SESSION, 'delete me'); - const archivePersisted = deferred(); - const archive = wiring.archiveSession(SESSION, () => archivePersisted.promise); - - await wiring.removeSession(SESSION, async () => {}); - archivePersisted.reject(new Error('archive failed late')); - await assert.rejects(archive, /archive failed late/); - await wiring.unarchiveSession(SESSION, async () => {}); - - assert.equal(wiring.manager.get(SESSION), undefined); - assert.equal(wiring.coordinator.beginObservedTurn(SESSION, 'turn-deleted').kind, 'unavailable'); - wiring.coordinator.dispose(); - wiring.manager.dispose(); - }); -}); diff --git a/apps/desktop/src/main/__tests__/inspector-ipc-main.test.ts b/apps/desktop/src/main/__tests__/inspector-ipc-main.test.ts deleted file mode 100644 index bfc0af9026..0000000000 --- a/apps/desktop/src/main/__tests__/inspector-ipc-main.test.ts +++ /dev/null @@ -1,195 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { - MODEL_CALL_ATTEMPT_EVENT_TYPE, - MODEL_CALL_ATTEMPT_SCHEMA_VERSION, - type ModelCallAttempt, -} from '@maka/core/model-call-attempt'; -import type { IpcMain } from 'electron'; -import type { RuntimeEvent } from '@maka/core/runtime-event'; -import { readSessionTrace, registerInspectorIpc } from '../inspector-ipc-main.js'; - -function attempt(overrides: Partial = {}): ModelCallAttempt { - return { - schemaVersion: MODEL_CALL_ATTEMPT_SCHEMA_VERSION, - logicalCallId: 'call-1', - attemptId: 'attempt-1', - traceId: 'trace-1', - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - step: 0, - attempt: 0, - callKind: 'main', - providerId: 'anthropic', - modelId: 'claude-test', - startedAt: 1_000, - completedAt: 1_500, - latencyMs: 500, - status: 'completed', - usageBasis: 'reported', - inputTokens: 10, - outputTokens: 5, - costBasis: 'priced', - costUsd: 0.002, - ...overrides, - }; -} - -function runtimeEvent(overrides: Partial = {}): RuntimeEvent { - return { - id: 'event-1', - invocationId: 'invocation-1', - runId: 'run-1', - sessionId: 'session-1', - turnId: 'turn-1', - ts: 1_000, - partial: false, - role: 'model', - author: 'agent', - ...overrides, - }; -} - -describe('inspector trace read', () => { - it('joins the AgentRun stream with the session runtime events', async () => { - // The canonical metering authority is the run stream, not the Usage read - // model — that one is range-queried and carries no session predicate. - const readRuns: string[] = []; - const trace = await readSessionTrace( - { - readSessionRuntimeEvents: async () => [ - runtimeEvent({ - id: 'dispatch-1', - ts: 500, - actions: { - toolDispatch: { - protocol: 't1_after_preflight_v1', - operationId: 'op-1', - providerToolCallId: 'tool-call-1', - toolName: 'Bash', - canonicalArgsHash: 'hash', - recoveryMode: 'replay_safe', - }, - }, - }), - runtimeEvent({ - id: 'usage-1', - ts: 2_000, - actions: { tokenUsage: { input: 10, output: 5, total: 15, runtimeSteps: 1 } }, - }), - ], - listSessionRuns: async () => [{ runId: 'run-1' }, { runId: 'run-2' }], - readRunEvents: async (_sessionId, runId) => { - readRuns.push(runId); - return runId === 'run-1' - ? [ - { type: 'run_started' }, - { type: MODEL_CALL_ATTEMPT_EVENT_TYPE, data: attempt() }, - ] - : []; - }, - }, - 'session-1', - ); - - assert.deepEqual(readRuns, ['run-1', 'run-2'], 'every run of the session is read'); - assert.equal(trace.sessionId, 'session-1'); - assert.equal(trace.totals.modelAttempts, 1); - assert.equal(trace.totals.costUsd, 0.002); - assert.equal(trace.coverage.modelCalls, 'no_known_gap'); - assert.equal(trace.coverage.unreadableRecords, 0); - // Only the runtime-event ledger can satisfy these: a tool step exists in no - // metering record, and the turn's start precedes the model call it drove. - const tool = trace.turns[0]?.steps.find((step) => step.kind === 'tool'); - assert.equal(tool?.kind === 'tool' ? tool.toolName : undefined, 'Bash'); - assert.equal(trace.turns[0]?.startedAt, 500, 'the turn starts at the dispatch, not the call'); - }); - - it('counts a record it cannot decode instead of dropping it', async () => { - // An undecodable record is spend the trace cannot show. Silently skipping - // it would make an incomplete trace look complete. - const trace = await readSessionTrace( - { - readSessionRuntimeEvents: async () => [], - listSessionRuns: async () => [{ runId: 'run-1' }], - readRunEvents: async () => [ - { type: MODEL_CALL_ATTEMPT_EVENT_TYPE, data: attempt() }, - { type: MODEL_CALL_ATTEMPT_EVENT_TYPE, data: { schemaVersion: 1, broken: true } }, - ], - }, - 'session-1', - ); - - assert.equal(trace.totals.modelAttempts, 1, 'the readable record still projects'); - assert.equal(trace.coverage.unreadableRecords, 1); - assert.equal(trace.coverage.modelCalls, 'partial', 'an unreadable record is a known gap'); - }); - - it('ignores AgentRun events that are not canonical model calls', async () => { - const trace = await readSessionTrace( - { - readSessionRuntimeEvents: async () => [], - listSessionRuns: async () => [{ runId: 'run-1' }], - readRunEvents: async () => [ - { type: 'provider_request_attempt_recorded', data: { step: 0 } }, - { type: 'run_completed' }, - ], - }, - 'session-1', - ); - - assert.equal(trace.turns.length, 0); - assert.equal(trace.coverage.modelCalls, 'none'); - }); - - it('answers a failed read as a typed error rather than a rejected invoke', async () => { - // The renderer treats the channel as `Result`; an unwrapped rejection would - // surface as an unhandled invoke failure instead of a retryable panel state. - // Typed against Electron's own signature rather than cast past it: the - // point of this test is that the registration matches the real surface. - type InvokeHandler = Parameters[1]; - const handlers = new Map(); - registerInspectorIpc({ - ipcMain: { - handle: (channel, handler) => { - handlers.set(channel, handler); - }, - }, - readSessionRuntimeEvents: async () => { - throw new Error('ledger unavailable'); - }, - listSessionRuns: async () => [], - readRunEvents: async () => [], - }); - - const handler = handlers.get('inspector:trace'); - assert.ok(handler, 'the channel is registered'); - const result = (await handler(undefined as never, 'session-1')) as { - ok: boolean; - error?: { code: string }; - }; - assert.equal(result.ok, false); - assert.equal(result.error?.code, 'INSPECTOR_TRACE_FAILED'); - }); - - it('counts a run it cannot read at all, instead of failing the whole trace', async () => { - // A read failure is another way a record can be unreadable. One corrupt run - // must not turn every retry into the same total failure. - const trace = await readSessionTrace( - { - readSessionRuntimeEvents: async () => [], - listSessionRuns: async () => [{ runId: 'run-ok' }, { runId: 'run-corrupt' }], - readRunEvents: async (_sessionId, runId) => { - if (runId === 'run-corrupt') throw new Error('run header missing'); - return [{ type: MODEL_CALL_ATTEMPT_EVENT_TYPE, data: attempt() }]; - }, - }, - 'session-1', - ); - - assert.equal(trace.totals.modelAttempts, 1, 'the readable run still projects'); - assert.equal(trace.coverage.unreadableRecords, 1, 'and the lost run is one counted gap'); - assert.equal(trace.coverage.modelCalls, 'partial'); - }); -}); diff --git a/apps/desktop/src/main/__tests__/linked-child-session-observation.test.ts b/apps/desktop/src/main/__tests__/linked-child-session-observation.test.ts deleted file mode 100644 index 5adf58c08a..0000000000 --- a/apps/desktop/src/main/__tests__/linked-child-session-observation.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import type { SessionChangedReason, SessionEvent } from '@maka/core'; -import { createLinkedChildEventProjection } from '../session-stream.js'; - -describe('linked child session observation', () => { - test('projects nested child events onto the normal renderer channel', async () => { - const rendererEvents: Array<{ channel: string; event: SessionEvent }> = []; - const changes: Array<{ reason: SessionChangedReason; sessionId?: string }> = []; - const presentationEvents: SessionEvent[] = []; - const projection = createLinkedChildEventProjection({ - lifecycle: 'created', - safeSendToRenderer: (channel, event) => { - rendererEvents.push({ channel, event: event as SessionEvent }); - }, - emitSessionsChanged: (reason, sessionId) => changes.push({ reason, sessionId }), - onEvent: (event) => presentationEvents.push(event), - }); - await projection.onReady({ - childSessionId: 'child-session', - turnId: 'child-turn', - runId: 'child-run', - agentId: 'local-read', - agentName: 'Local Read', - }); - const delta: SessionEvent = { - type: 'text_delta', - id: 'delta', - turnId: 'child-turn', - ts: 1, - messageId: 'message', - text: 'observed', - }; - const complete: SessionEvent = { - type: 'complete', - id: 'complete', - turnId: 'child-turn', - ts: 2, - stopReason: 'end_turn', - }; - - projection.onEvent(delta); - projection.onEvent(complete); - - assert.deepEqual( - rendererEvents.map(({ channel, event }) => [channel, event.id]), - [ - ['sessions:event:child-session', 'delta'], - ['sessions:event:child-session', 'complete'], - ], - ); - assert.deepEqual(presentationEvents.map((event) => event.id), ['delta', 'complete']); - assert.deepEqual(changes, [ - { reason: 'created', sessionId: 'child-session' }, - { reason: 'turn-status-change', sessionId: 'child-session' }, - { reason: 'message-appended', sessionId: 'child-session' }, - { reason: 'status-change', sessionId: 'child-session' }, - { reason: 'turn-status-change', sessionId: 'child-session' }, - ]); - }); - - test('does not project a legacy child run that has no child Session identity', async () => { - const rendererEvents: unknown[] = []; - const projection = createLinkedChildEventProjection({ - lifecycle: 'continued', - safeSendToRenderer: (...args) => rendererEvents.push(args), - emitSessionsChanged: () => assert.fail('must not announce a child Session'), - }); - - await projection.onReady({ - turnId: 'legacy-turn', - agentId: 'local-read', - agentName: 'Local Read', - }); - projection.onEvent({ - type: 'complete', - id: 'complete', - turnId: 'legacy-turn', - ts: 1, - stopReason: 'end_turn', - }); - - assert.deepEqual(rendererEvents, []); - }); -}); diff --git a/apps/desktop/src/main/__tests__/linux-filesystem-worker-wiring-contract.test.ts b/apps/desktop/src/main/__tests__/linux-filesystem-worker-wiring-contract.test.ts deleted file mode 100644 index 3a87ca628e..0000000000 --- a/apps/desktop/src/main/__tests__/linux-filesystem-worker-wiring-contract.test.ts +++ /dev/null @@ -1,11 +0,0 @@ -import assert from 'node:assert/strict'; -import { buildDesktopBuiltinTools } from '../desktop-builtin-tools.js'; -import { test } from 'node:test'; - -test('Desktop exposes Edit only when a filesystem worker is available', () => { - const withoutWorker = buildDesktopBuiltinTools({}); - const withWorker = buildDesktopBuiltinTools({ filesystemWorker: {} as never }); - - assert.equal(withoutWorker.some((tool) => tool.name === 'Edit'), false); - assert.equal(withWorker.some((tool) => tool.name === 'Edit'), true); -}); diff --git a/apps/desktop/src/main/__tests__/local-memory-service.test.ts b/apps/desktop/src/main/__tests__/local-memory-service.test.ts deleted file mode 100644 index a4cdb0e149..0000000000 --- a/apps/desktop/src/main/__tests__/local-memory-service.test.ts +++ /dev/null @@ -1,598 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { mkdir, mkdtemp, readFile, stat, symlink, writeFile } from 'node:fs/promises'; -import { join } from 'node:path'; -import { tmpdir } from 'node:os'; -import { describe, it } from 'node:test'; -import { createDefaultSettings, type AppSettings } from '@maka/core'; -import { LocalMemoryService } from '../local-memory-service.js'; -import { createSystemPromptMainService } from '../system-prompt-main.js'; - -function makeService(now = 1_700_000_000_000) { - return async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-memory-')); - let settings = createDefaultSettings(); - const service = new LocalMemoryService({ - workspaceRoot, - now: () => now, - getSettings: async () => settings, - updateSettings: async (patch: { localMemory: Partial }) => { - settings = { - ...settings, - localMemory: { ...settings.localMemory, ...patch.localMemory }, - }; - return settings; - }, - getPrivacyContext: async () => ({ incognitoActive: false }), - }); - return { service, workspaceRoot }; - }; -} - -describe('LocalMemoryService', () => { - it('creates MEMORY.md with 0700 directory and 0600 file', async () => { - const { service } = await makeService()(); - const state = await service.getState(); - assert.equal(state.status, 'ok'); - const dirStat = await stat(service.dir); - const fileStat = await stat(service.file); - assert.equal(dirStat.mode & 0o777, 0o700); - assert.equal(fileStat.mode & 0o777, 0o600); - }); - - it('saves content and keeps a backup', async () => { - const { service } = await makeService()(); - await service.getState(); - const next = [ - '# Maka Memory', - '', - '## 偏好', - '', - '喜欢短回答。', - '', - ].join('\n'); - const state = await service.save(next); - assert.equal(state.entryCount, 1); - assert.equal(state.activeEntryCount, 1); - assert.equal(state.archivedEntryCount, 0); - assert.equal(state.entries.length, 1); - assert.equal(state.activeEntries.length, 1); - assert.equal(state.archivedEntries.length, 0); - assert.equal(state.latestBackup?.kind, 'save'); - assert.match(state.latestBackup?.path ?? '', /MEMORY\.md\.bak$/); - assert.equal(typeof state.latestBackup?.updatedAt, 'number'); - assert.equal(state.latestBackup?.activeEntryCount, 1); - assert.equal(state.latestBackup?.archivedEntryCount, 0); - assert.equal(state.latestBackup?.safeMode, false); - assert.ok((state.latestBackup?.sizeBytes ?? 0) > 0); - assert.match(await readFile(service.file, 'utf8'), /喜欢短回答/); - assert.match(await readFile(`${service.file}.bak`, 'utf8'), /示例/); - }); - - it('restores the latest backup while preserving the current file as restore backup', async () => { - const { service } = await makeService()(); - await service.getState(); - await service.save([ - '# Maka Memory', - '', - '## First', - '', - '第一版。', - '', - ].join('\n')); - await service.save([ - '# Maka Memory', - '', - '## Second', - '', - '第二版。', - '', - ].join('\n')); - - const restored = await service.restoreLatestBackup(); - - assert.equal(restored.ok, true); - assert.match(restored.state.content, /第一版/); - assert.doesNotMatch(restored.state.content, /第二版/); - assert.match(await readFile(service.file, 'utf8'), /第一版/); - assert.match(await readFile(`${service.file}.restore.bak`, 'utf8'), /第二版/); - }); - - it('returns a failure envelope when there is no backup to restore', async () => { - const { service } = await makeService()(); - await service.getState(); - - const restored = await service.restoreLatestBackup(); - - assert.equal(restored.ok, false); - assert.match(restored.message, /没有找到上一版 MEMORY\.md 备份/); - assert.equal(restored.state.status, 'ok'); - }); - - it('can restore the reset backup as the latest previous MEMORY.md version', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## Before reset', - '', - '重置前。', - '', - ].join('\n')); - await service.reset(); - - const restored = await service.restoreLatestBackup(); - - assert.equal(restored.ok, true); - assert.match(restored.state.content, /重置前/); - assert.doesNotMatch(restored.state.content, /示例/); - }); - - it('can restore a specific backup candidate by kind', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## First', - '', - '第一版。', - '', - ].join('\n')); - await service.save([ - '# Maka Memory', - '', - '## Second', - '', - '第二版。', - '', - ].join('\n')); - - const restored = await service.restoreBackup('save'); - - assert.equal(restored.ok, true); - assert.match(restored.state.content, /第一版/); - assert.doesNotMatch(restored.state.content, /第二版/); - }); - - it('surfaces the pre-restore backup as a restorable candidate', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## First', - '', - '第一版。', - '', - ].join('\n')); - await service.save([ - '# Maka Memory', - '', - '## Second', - '', - '第二版。', - '', - ].join('\n')); - - const restored = await service.restoreBackup('save'); - const restoreBackup = await service.resolveBackupForOpen('restore'); - - assert.equal(restored.ok, true); - assert.equal(restored.state.latestBackup?.kind, 'restore'); - assert.match(restored.state.latestBackup?.path ?? '', /MEMORY\.md\.restore\.bak$/); - assert.ok(restored.state.backups?.some((backup) => backup.kind === 'restore')); - assert.equal(restoreBackup.ok, true); - if (restoreBackup.ok) assert.match(restoreBackup.path, /MEMORY\.md\.restore\.bak$/); - }); - - it('keeps the previous restore undo when restoring twice', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## First', - '', - '第一版。', - '', - ].join('\n')); - await service.save([ - '# Maka Memory', - '', - '## Second', - '', - '第二版。', - '', - ].join('\n')); - - const firstRestore = await service.restoreBackup('save'); - assert.equal(firstRestore.ok, true); - assert.match(await readFile(`${service.file}.restore.bak`, 'utf8'), /第二版/); - - await service.save([ - '# Maka Memory', - '', - '## Third', - '', - '第三版。', - '', - ].join('\n')); - const secondRestore = await service.restoreBackup('save'); - - assert.equal(secondRestore.ok, true); - assert.match(await readFile(`${service.file}.restore.bak`, 'utf8'), /第三版/); - assert.match(await readFile(`${service.file}.restore.1.bak`, 'utf8'), /第二版/); - }); - - it('can restore the restore backup without overwriting the selected backup first', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## First', - '', - '第一版。', - '', - ].join('\n')); - await service.save([ - '# Maka Memory', - '', - '## Second', - '', - '第二版。', - '', - ].join('\n')); - const firstRestore = await service.restoreBackup('save'); - assert.equal(firstRestore.ok, true); - - const undoRestore = await service.restoreBackup('restore'); - - assert.equal(undoRestore.ok, true); - assert.match(undoRestore.state.content, /第二版/); - assert.doesNotMatch(undoRestore.state.content, /第一版/); - assert.match(await readFile(`${service.file}.restore.1.bak`, 'utf8'), /第二版/); - }); - - it('surfaces reset backup metadata so restore is visible before click', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## Before reset', - '', - '重置前。', - '', - ].join('\n')); - - const state = await service.reset(); - - assert.equal(state.latestBackup?.kind, 'reset'); - assert.match(state.latestBackup?.path ?? '', /MEMORY\.md\.reset\.bak$/); - assert.equal(typeof state.latestBackup?.updatedAt, 'number'); - assert.equal(state.latestBackup?.activeEntryCount, 1); - assert.equal(state.latestBackup?.archivedEntryCount, 0); - assert.equal(state.latestBackup?.safeMode, false); - assert.ok((state.latestBackup?.sizeBytes ?? 0) > 0); - }); - - it('surfaces all validated MEMORY.md backup candidates without exposing content', async () => { - const { service } = await makeService(1_700_000_000_000)(); - await service.save([ - '# Maka Memory', - '', - '## Before reset', - '', - '重置前。', - '', - ].join('\n')); - const state = await service.reset(); - - assert.equal(state.backups?.length, 2); - assert.deepEqual(new Set(state.backups?.map((backup) => backup.kind)), new Set(['save', 'reset'])); - assert.equal(state.latestBackup?.path, state.backups?.[0]?.path); - assert.ok(state.backups?.every((backup) => backup.sizeBytes > 0)); - assert.ok(state.backups?.every((backup) => typeof backup.activeEntryCount === 'number')); - assert.ok(state.backups?.every((backup) => !('content' in backup))); - }); - - it('resolves the latest backup for explicit user inspection', async () => { - const { service } = await makeService()(); - await service.getState(); - await service.save([ - '# Maka Memory', - '', - '## Inspectable', - '', - '可检查。', - '', - ].join('\n')); - - const result = await service.resolveLatestBackupForOpen(); - - assert.equal(result.ok, true); - if (result.ok) assert.match(result.path, /MEMORY\.md\.bak$/); - }); - - it('resolves a specific backup candidate by kind for explicit user inspection', async () => { - const { service } = await makeService()(); - await service.save([ - '# Maka Memory', - '', - '## Before reset', - '', - '重置前。', - '', - ].join('\n')); - await service.reset(); - - const saveBackup = await service.resolveBackupForOpen('save'); - const resetBackup = await service.resolveBackupForOpen('reset'); - - assert.equal(saveBackup.ok, true); - assert.equal(resetBackup.ok, true); - if (saveBackup.ok) assert.match(saveBackup.path, /MEMORY\.md\.bak$/); - if (resetBackup.ok) assert.match(resetBackup.path, /MEMORY\.md\.reset\.bak$/); - }); - - it('does not resolve a backup symlink that escapes the workspace', async () => { - const { service, workspaceRoot } = await makeService()(); - const outsideRoot = await mkdtemp(join(tmpdir(), 'maka-memory-backup-outside-')); - await service.getState(); - const outsideFile = join(outsideRoot, 'MEMORY.md.bak'); - await writeFile(outsideFile, '# outside backup\n', 'utf8'); - await symlink(outsideFile, `${service.file}.bak`); - - const result = await service.resolveLatestBackupForOpen(); - const explicitResult = await service.resolveBackupForOpen('save'); - const state = await service.getState(); - - assert.equal(result.ok, false); - if (!result.ok) assert.equal(result.reason, 'missing'); - assert.equal(explicitResult.ok, false); - if (!explicitResult.ok) assert.equal(explicitResult.reason, 'missing'); - assert.equal(state.latestBackup, undefined); - assert.match(service.file, new RegExp(workspaceRoot.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))); - }); - - it('redacts secrets before writing durable MEMORY.md content', async () => { - const { service } = await makeService()(); - await service.getState(); - const state = await service.save([ - '# Maka Memory', - '', - '## Provider token', - '', - 'Authorization: Bearer sk-ant-api03-abc123def456ghi789jkl0mn1opq', - 'URL: https://api.example.test/models?api_key=raw-secret-value&timeout=30', - ].join('\n')); - - assert.equal(state.status, 'ok'); - assert.doesNotMatch(state.content, /sk-ant-api03|raw-secret-value/); - assert.match(state.content, /Authorization: Bearer \[redacted\]/); - assert.match(state.content, /api_key=\[redacted\]/); - - const persisted = await readFile(service.file, 'utf8'); - assert.doesNotMatch(persisted, /sk-ant-api03|raw-secret-value/); - assert.match(persisted, /Authorization: Bearer \[redacted\]/); - assert.match(persisted, /api_key=\[redacted\]/); - }); - - it('counts archived entries but previews the latest active entry', async () => { - const { service } = await makeService()(); - const state = await service.save([ - '# Maka Memory', - '', - '## Active', - '', - 'Use this.', - '', - '## Archived', - '', - 'Do not use this.', - ].join('\n')); - - assert.equal(state.entryCount, 2); - assert.equal(state.activeEntryCount, 1); - assert.equal(state.archivedEntryCount, 1); - assert.equal(state.activeEntries[0]?.id, 'active'); - assert.equal(state.archivedEntries[0]?.id, 'archived'); - assert.equal(state.latestEntry?.id, 'active'); - }); - - it('stores assistant proposals in PENDING.md until approval', async () => { - const { service } = await makeService(1_700_000_000_000)(); - - const proposed = await service.proposeMemory({ - title: 'Tone', - content: 'Prefer direct answers.', - sourceTurnId: 'turn-1', - }); - - assert.equal(proposed.ok, true); - assert.equal((await service.getState()).activeEntryCount, 1); // default example remains the only active MEMORY.md entry. - assert.match(await readFile(service.pendingFile, 'utf8'), /status=review_required/); - assert.match(await readFile(service.pendingFile, 'utf8'), /Prefer direct answers/); - assert.doesNotMatch(await readFile(service.file, 'utf8'), /Prefer direct answers/); - assert.equal((await service.listProposals()).length, 1); - }); - - it('approves a pending proposal into active MEMORY.md and removes it from the queue', async () => { - const { service } = await makeService(1_700_000_000_000)(); - const proposed = await service.proposeMemory({ - title: 'Tone', - content: 'Prefer direct answers.', - sourceTurnId: 'turn-1', - }); - assert.equal(proposed.ok, true); - if (!proposed.ok) return; - const proposalId = proposed.proposal?.proposalId ?? proposed.proposal?.id; - assert.ok(proposalId); - - const approved = await service.approveProposal(proposalId); - - assert.equal(approved.ok, true); - assert.equal(approved.entry?.source, 'chat_extracted'); - assert.equal(approved.entry?.status, 'active'); - assert.equal(approved.entry?.confirmedAt, 1_700_000_000_000); - assert.match(await readFile(service.file, 'utf8'), /source=chat_extracted/); - assert.match(await readFile(service.file, 'utf8'), /confirmedAt=1700000000000/); - assert.match(await readFile(service.file, 'utf8'), /Prefer direct answers/); - assert.doesNotMatch(await readFile(service.pendingFile, 'utf8'), /Prefer direct answers/); - assert.equal((await service.listProposals()).length, 0); - const updates = service.consumePendingPromptUpdates(); - assert.equal(updates.length, 1); - assert.equal(updates[0]?.action, 'approved'); - assert.equal(updates[0]?.title, 'Tone'); - assert.equal(service.consumePendingPromptUpdates().length, 0); - }); - - it('rejects a pending proposal without creating active memory', async () => { - const { service } = await makeService(1_700_000_000_000)(); - const proposed = await service.proposeMemory({ - title: 'Tone', - content: 'Do not save this.', - }); - assert.equal(proposed.ok, true); - if (!proposed.ok) return; - const proposalId = proposed.proposal?.proposalId ?? proposed.proposal?.id; - assert.ok(proposalId); - - const rejected = await service.rejectProposal(proposalId); - - assert.equal(rejected.ok, true); - assert.match(await readFile(service.pendingFile, 'utf8'), /status=rejected/); - assert.match(await readFile(service.pendingFile, 'utf8'), /rejectedAt=1700000000000/); - assert.doesNotMatch(await readFile(service.file, 'utf8'), /Do not save this/); - assert.equal((await service.listProposals()).length, 0); - }); - - it('archives and restores entries through the service with lifecycle metadata', async () => { - const { service } = await makeService(1_700_000_000_000)(); - const remembered = await service.rememberUserAuthored({ - title: 'Tone', - content: 'Prefer direct answers.', - }); - assert.equal(remembered.ok, true); - if (!remembered.ok) return; - const entryId = remembered.entry?.id; - assert.ok(entryId); - assert.equal(service.consumePendingPromptUpdates()[0]?.action, 'remembered'); - - const archived = await service.archiveEntry(entryId, 'user requested'); - assert.equal(archived.ok, true); - assert.equal(archived.entry?.status, 'archived'); - assert.match(await readFile(service.file, 'utf8'), /status=archived/); - assert.match(await readFile(service.file, 'utf8'), /archivedAt=1700000000000/); - assert.equal((await service.getState()).activeEntries.some((entry) => entry.id === entryId), false); - - const restored = await service.restoreEntry(entryId); - assert.equal(restored.ok, true); - assert.equal(restored.entry?.status, 'active'); - assert.equal((await service.getState()).activeEntries.some((entry) => entry.id === entryId), true); - const updates = service.consumePendingPromptUpdates(); - assert.deepEqual(updates.map((update) => update.action), ['archived', 'restored']); - assert.equal(updates[0]?.entryId, entryId); - assert.equal(updates[1]?.entryId, entryId); - }); - - it('builds session-scoped prompt updates only for their owning session', async () => { - const { service, workspaceRoot } = await makeService(1_700_000_000_000)(); - const remembered = await service.rememberUserAuthored({ - title: 'Session tone', - content: 'Prefer direct answers in this session.', - scope: 'session', - sessionId: 'session-a', - }); - assert.equal(remembered.ok, true); - - const prompts = createSystemPromptMainService({ - settingsStore: { get: async () => createDefaultSettings() }, - workspaceRoot, - localMemory: service, - taskLedger: { list: async () => [] }, - }); - assert.equal(await prompts.buildTurnTailPrompt(undefined, undefined), undefined); - assert.equal(await prompts.buildTurnTailPrompt(undefined, 'session-b'), undefined); - const update = await prompts.buildTurnTailPrompt(undefined, 'session-a'); - assert.match(update ?? '', //); - assert.match(update ?? '', /Session tone/); - assert.equal(await prompts.buildTurnTailPrompt(undefined, 'session-a'), undefined); - }); - - it('blocks proposal and approval mutations while incognito is active', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-memory-incognito-mutate-')); - const service = new LocalMemoryService({ - workspaceRoot, - getSettings: async () => createDefaultSettings(), - updateSettings: async () => createDefaultSettings(), - getPrivacyContext: async () => ({ incognitoActive: true }), - }); - - const proposed = await service.proposeMemory({ title: 'Blocked', content: 'Do not store.' }); - const remembered = await service.rememberUserAuthored({ title: 'Blocked', content: 'Do not store.' }); - const archived = await service.archiveEntry('mem-missing'); - - assert.equal(proposed.ok, false); - if (!proposed.ok) assert.equal(proposed.reason, 'incognito_active'); - assert.equal(remembered.ok, false); - if (!remembered.ok) assert.equal(remembered.reason, 'incognito_active'); - assert.equal(archived.ok, false); - if (!archived.ok) assert.equal(archived.reason, 'incognito_active'); - }); - - it('does not write oversized content', async () => { - const { service } = await makeService()(); - await service.getState(); - const state = await service.save('x'.repeat(200_000)); - assert.equal(state.status, 'safe_mode'); - assert.doesNotMatch(await readFile(service.file, 'utf8'), /^x+$/); - }); - - it('returns incognito_blocked without creating the file', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-memory-incognito-')); - const service = new LocalMemoryService({ - workspaceRoot, - getSettings: async () => createDefaultSettings(), - updateSettings: async () => createDefaultSettings(), - getPrivacyContext: async () => ({ incognitoActive: true }), - }); - const state = await service.getState(); - assert.equal(state.status, 'incognito_blocked'); - }); - - it('resolves MEMORY.md for opening only after the file is inside the workspace', async () => { - const { service } = await makeService()(); - const result = await service.resolveFileForOpen(); - assert.equal(result.ok, true); - if (result.ok) assert.match(result.path, /MEMORY\.md$/); - }); - - it('does not resolve MEMORY.md for opening in incognito mode', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-memory-open-incognito-')); - const service = new LocalMemoryService({ - workspaceRoot, - getSettings: async () => createDefaultSettings(), - updateSettings: async () => createDefaultSettings(), - getPrivacyContext: async () => ({ incognitoActive: true }), - }); - - assert.deepEqual(await service.resolveFileForOpen(), { ok: false, reason: 'incognito_blocked' }); - }); - - it('rejects a symlinked MEMORY.md that escapes the workspace', async () => { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-memory-symlink-workspace-')); - const outsideRoot = await mkdtemp(join(tmpdir(), 'maka-memory-symlink-outside-')); - await mkdir(join(workspaceRoot, 'memory'), { recursive: true }); - const outsideFile = join(outsideRoot, 'MEMORY.md'); - await writeFile(outsideFile, '# outside\n', 'utf8'); - await symlink(outsideFile, join(workspaceRoot, 'memory', 'MEMORY.md')); - const service = new LocalMemoryService({ - workspaceRoot, - getSettings: async () => createDefaultSettings(), - updateSettings: async () => createDefaultSettings(), - getPrivacyContext: async () => ({ incognitoActive: false }), - }); - - const state = await service.getState(); - - assert.equal(state.status, 'error'); - assert.match(state.reason ?? '', /outside the workspace/); - }); -}); diff --git a/apps/desktop/src/main/__tests__/mcp-ipc-main.test.ts b/apps/desktop/src/main/__tests__/mcp-ipc-main.test.ts index 78f8ba5c28..12d9c95415 100644 --- a/apps/desktop/src/main/__tests__/mcp-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/mcp-ipc-main.test.ts @@ -3,7 +3,7 @@ import { test } from 'node:test'; import type { McpConfigFile, McpServerStatus } from '@maka/core/mcp'; import { registerMcpIpcMain } from '../mcp-ipc-main.js'; -test('MCP IPC reconciles config before invalidating idle backends and emitting status', async () => { +test('MCP IPC commits config before publishing capabilities and emitting status', async () => { const handlers = new Map Promise>(); let config: McpConfigFile = { version: 1, mcpServers: {} }; const calls: string[] = []; @@ -35,7 +35,8 @@ test('MCP IPC reconciles config before invalidating idle backends and emitting s test: async () => ({ ok: true, status: connected, latencyMs: 1 }), }, ensureReady: async () => { calls.push('ready'); }, - refreshIdleBackends: async () => { calls.push('refresh'); }, + publishCapabilities: async () => { calls.push('publish'); }, + onPublicationError: () => { calls.push('publication:error'); }, emitChanged: () => { calls.push('emit'); }, }); @@ -43,7 +44,7 @@ test('MCP IPC reconciles config before invalidating idle backends and emitting s assert.ok(upsert); const result = await upsert({}, 'fixture', { command: 'node' }); assert.deepEqual(result.mcpServers.fixture, { command: 'node' }); - assert.deepEqual(calls, ['store', 'sync', 'refresh', 'emit']); + assert.deepEqual(calls, ['store', 'sync', 'emit', 'publish']); calls.length = 0; const setConfig = handlers.get('mcp:setConfig'); @@ -55,7 +56,7 @@ test('MCP IPC reconciles config before invalidating idle backends and emitting s assert.deepEqual(imported.mcpServers, { remote: { url: 'https://example.com/mcp', enabled: false }, }); - assert.deepEqual(calls, ['store', 'sync', 'refresh', 'emit']); + assert.deepEqual(calls, ['store', 'sync', 'emit', 'publish']); calls.length = 0; const testHandler = handlers.get('mcp:test'); @@ -69,7 +70,7 @@ test('MCP IPC reconciles config before invalidating idle backends and emitting s assert.ok(cancelInstall); const cancelled = await cancelInstall({}, 'fixture'); assert.equal(cancelled.mcpServers.fixture, undefined); - assert.deepEqual(calls, ['cancel', 'sync', 'refresh', 'emit']); + assert.deepEqual(calls, ['cancel', 'sync', 'emit', 'publish']); }); test('MCP market cancellation waits for an in-flight config write before rolling it back', async () => { @@ -109,7 +110,8 @@ test('MCP market cancellation waits for an in-flight config write before rolling test: async () => { throw new Error('not used'); }, }, ensureReady: async () => {}, - refreshIdleBackends: async () => { calls.push('refresh'); }, + publishCapabilities: async () => { calls.push('publish'); }, + onPublicationError: () => { calls.push('publication:error'); }, emitChanged: () => { calls.push('emit'); }, }); @@ -126,5 +128,52 @@ test('MCP market cancellation waits for an in-flight config write before rolling const [, cancelled] = await Promise.all([installing, cancelling]); assert.equal(cancelled.mcpServers.fixture, undefined); assert.equal(config.mcpServers.fixture, undefined); - assert.deepEqual(calls, ['write:start', 'cancel', 'write:end', 'remove', 'sync', 'refresh', 'emit']); + assert.deepEqual(calls, ['write:start', 'cancel', 'write:end', 'remove', 'sync', 'emit', 'publish']); +}); + +test('MCP config commit is not rolled back by a capability publication failure', async () => { + const handlers = new Map Promise>(); + let config: McpConfigFile = { version: 1, mcpServers: {} }; + const publicationErrors: unknown[] = []; + registerMcpIpcMain({ + ipcMain: { + handle(channel, handler) { + handlers.set(channel, handler as (...args: any[]) => Promise); + }, + }, + store: { + get: async () => config, + set: async (next) => { + config = next; + return next; + }, + upsert: async (serverId, server) => { + config = { version: 1, mcpServers: { ...config.mcpServers, [serverId]: server } }; + return config; + }, + remove: async () => config, + }, + manager: { + cancelConnect: () => false, + sync: async () => {}, + statuses: () => [], + reconnect: async () => { throw new Error('not used'); }, + test: async () => { throw new Error('not used'); }, + }, + ensureReady: async () => {}, + publishCapabilities: async () => { + throw new Error('Host disconnected'); + }, + onPublicationError: (error) => publicationErrors.push(error), + emitChanged() {}, + }); + + const upsert = handlers.get('mcp:upsert'); + assert.ok(upsert); + const committed = await upsert({}, 'fixture', { command: 'node' }); + assert.deepEqual(committed.mcpServers.fixture, { command: 'node' }); + await new Promise((resolve) => setImmediate(resolve)); + assert.deepEqual(publicationErrors.map((error) => (error as Error).message), [ + 'Host disconnected', + ]); }); diff --git a/apps/desktop/src/main/__tests__/new-session-project.test.ts b/apps/desktop/src/main/__tests__/new-session-project.test.ts index 4ec0fd9a50..bc5fd2fcf5 100644 --- a/apps/desktop/src/main/__tests__/new-session-project.test.ts +++ b/apps/desktop/src/main/__tests__/new-session-project.test.ts @@ -3,47 +3,55 @@ import { mkdir, mkdtemp, realpath, rm, symlink } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { test } from 'node:test'; -import type { CreateSessionInput } from '@maka/core'; import { createProjectCatalog } from '@maka/storage'; import { resolveDesktopSessionSelection, resolveNewSessionProjectInput, - type DesktopCreateSessionInput, + type SessionProjectInput, } from '../new-session-project.js'; -test('default sessions inherit the main-owned project selection', async () => { - const resolved = await resolveDesktopSessionSelection( - { - backend: 'fake', - llmConnectionSlug: 'fake', - model: 'fake-model', - permissionMode: 'ask', - name: 'Session', - labels: [], - }, - { - current: async () => ({ projectId: null, path: '/current/root' }), - select: async () => { - throw new Error('select must not be called'); +type CreateSessionInput = SessionProjectInput & { + cwd: string; + backend: string; + llmConnectionSlug: string; + model: string; + permissionMode: string; + name: string; + labels: string[]; +}; +type DesktopCreateSessionInput = Omit; + +test('default sessions inherit and register the current Desktop project', async () => { + const base = await mkdtemp(join(tmpdir(), 'maka-new-session-project-')); + const cwd = join(base, 'project'); + await mkdir(cwd); + const catalog = createProjectCatalog(join(base, 'storage'), { + createId: () => 'project-1', + }); + + try { + const selected = await resolveDesktopSessionSelection( + {}, + { + current: async () => ({ projectId: undefined, path: cwd }), + select: async () => { + throw new Error('select must not be called'); + }, }, - }, - ); + ); + const resolved = await resolveNewSessionProjectInput(selected, catalog); - assert.equal(resolved.cwd, '/current/root'); - assert.equal(resolved.projectId, null); + assert.equal(resolved.cwd, await realpath(cwd)); + assert.equal(resolved.projectId, 'project-1'); + assert.equal((await catalog.list()).length, 1); + } finally { + await rm(base, { recursive: true, force: true }); + } }); -test('an explicit project id resolves its matching path before session creation', async () => { - const resolved = await resolveDesktopSessionSelection( - { - projectId: 'project-2', - backend: 'fake', - llmConnectionSlug: 'fake', - model: 'fake-model', - permissionMode: 'ask', - name: 'Session', - labels: [], - }, +test('an explicit project selection resolves its path before Session creation', async () => { + const selected = await resolveDesktopSessionSelection( + { projectId: 'project-2' }, { current: async () => { throw new Error('current must not be called'); @@ -55,58 +63,53 @@ test('an explicit project id resolves its matching path before session creation' }, ); - assert.equal(resolved.cwd, '/project-2/root'); - assert.equal(resolved.projectId, 'project-2'); + assert.deepEqual(selected, { + cwd: '/project-2/root', + projectId: 'project-2', + }); }); -test('new sessions auto-register a project while explicit no-project sessions stay unassigned', async () => { - const base = await mkdtemp(join(tmpdir(), 'maka-new-session-project-')); - const cwd = join(base, 'project'); - await mkdir(cwd); - const catalog = createProjectCatalog(join(base, 'storage'), { - createId: () => 'project-1', +test('an explicit no-project Session keeps its directory unassigned', async () => { + const input = { cwd: '/standalone', projectId: null } as const; + const resolved = await resolveNewSessionProjectInput(input, { + list: async () => { + throw new Error('list must not be called'); + }, + register: async () => { + throw new Error('register must not be called'); + }, + touch: async () => { + throw new Error('touch must not be called'); + }, }); - try { - const automatic = await resolveNewSessionProjectInput(makeInput(cwd), catalog); - assert.equal(automatic.projectId, 'project-1'); - assert.equal((await catalog.list()).length, 1); - - const explicit = await resolveNewSessionProjectInput( - makeInput(cwd, { projectId: 'project-1' }), - catalog, - ); - assert.equal(explicit.projectId, 'project-1'); - - const unassigned = await resolveNewSessionProjectInput( - makeInput(cwd, { projectId: null }), - catalog, - ); - assert.equal(unassigned.projectId, null); - } finally { - await rm(base, { recursive: true, force: true }); - } + assert.equal(resolved, input); }); -test('new sessions reject a project id that does not own the selected directory', async () => { +test('a Session cannot associate a project with a different directory', async () => { const base = await mkdtemp(join(tmpdir(), 'maka-new-session-project-mismatch-')); - const cwd = join(base, 'project'); - await mkdir(cwd); + const first = join(base, 'first'); + const second = join(base, 'second'); + await mkdir(first); + await mkdir(second); const catalog = createProjectCatalog(join(base, 'storage'), { createId: () => 'project-1', }); try { - await catalog.register(cwd); + await catalog.register(first); await assert.rejects( - () => resolveNewSessionProjectInput(makeInput(cwd, { projectId: 'project-2' }), catalog), + () => + resolveNewSessionProjectInput( + { cwd: second, projectId: 'project-1' }, + catalog, + ), /does not match/i, ); } finally { await rm(base, { recursive: true, force: true }); } }); - test('new sessions preserve unexpected catalog failures', async () => { const base = await mkdtemp(join(tmpdir(), 'maka-new-session-project-storage-failure-')); const cwd = join(base, 'project'); diff --git a/apps/desktop/src/main/__tests__/oauth-model-connection-disconnect.test.ts b/apps/desktop/src/main/__tests__/oauth-model-connection-disconnect.test.ts deleted file mode 100644 index f278a2c228..0000000000 --- a/apps/desktop/src/main/__tests__/oauth-model-connection-disconnect.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import type { ProviderType } from '@maka/core'; -import { createOAuthModelConnectionsMainService } from '../oauth-model-connections-main.js'; - -describe('managed OAuth model connection disconnect', () => { - it('logs out the owning account service so a deleted connection cannot be materialized again', async () => { - const calls: string[] = []; - const ok = async (provider: string) => { - calls.push(provider); - return { ok: true as const }; - }; - const service = createOAuthModelConnectionsMainService({ - connectionStore: {} as never, - credentialStore: {} as never, - claudeSubscription: { logout: () => ok('claude-subscription') } as never, - openAiCodex: { logout: () => ok('openai-codex') } as never, - githubCopilotSubscription: { logout: () => ok('github-copilot') } as never, - xaiOAuth: { logout: () => ok('xai-oauth') } as never, - }); - - for (const providerType of [ - 'claude-subscription', - 'openai-codex', - 'github-copilot', - 'xai-oauth', - ] satisfies ProviderType[]) { - await service.disconnectManagedOAuthConnection({ providerType }); - } - await service.disconnectManagedOAuthConnection({ providerType: 'openai' }); - assert.deepEqual(calls, [ - 'claude-subscription', - 'openai-codex', - 'github-copilot', - 'xai-oauth', - ]); - }); - - it('fails closed when the account service cannot log out', async () => { - const service = createOAuthModelConnectionsMainService({ - connectionStore: {} as never, - credentialStore: {} as never, - claudeSubscription: {} as never, - openAiCodex: { - logout: async () => ({ - ok: false as const, - reason: 'storage_failed', - message: 'Could not remove the stored OAuth credential', - }), - } as never, - githubCopilotSubscription: {} as never, - xaiOAuth: {} as never, - }); - - await assert.rejects( - service.disconnectManagedOAuthConnection({ providerType: 'openai-codex' }), - /Could not remove the stored OAuth credential/, - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/oauth-model-connections-openai-codex.test.ts b/apps/desktop/src/main/__tests__/oauth-model-connections-openai-codex.test.ts deleted file mode 100644 index 141cc9f0cc..0000000000 --- a/apps/desktop/src/main/__tests__/oauth-model-connections-openai-codex.test.ts +++ /dev/null @@ -1,402 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { - createOAuthModelConnectionsMainService, - CODEX_SUBSCRIPTION_CONNECTION_SLUG, -} from '../oauth-model-connections-main.js'; -import { PROVIDER_REGISTRY, PROVIDER_DEFAULTS } from '@maka/core/llm-connections'; -import { OpenAiCodexDiscoveryError } from '@maka/runtime'; -import type { LlmConnection } from '@maka/core/llm-connections'; - -// syncOpenAiCodexConnection live-discovers the account's Codex model list -// from chatgpt.com/backend-api/codex/models. These behavior tests inject fake -// deps (connectionStore / openAiCodex / fetchModels) so the three discovery -// outcomes - fetched, empty, failed - and the OAuth-token-failure path can be -// asserted directly, instead of grepping source. - -type ModelInfo = NonNullable[number]; - -function makeExisting(overrides: Partial = {}): LlmConnection { - return { - slug: CODEX_SUBSCRIPTION_CONNECTION_SLUG, - name: 'Codex OAuth', - providerType: 'openai-codex', - baseUrl: PROVIDER_DEFAULTS['openai-codex'].baseUrl, - defaultModel: 'gpt-5.6-sol', - enabled: true, - models: [{ id: 'gpt-5.6-sol' }], - modelSource: 'fetched', - createdAt: 1, - updatedAt: 1, - ...overrides, - }; -} - -function makeService(opts: { - existing?: LlmConnection | null; - token?: string | null; - fetchModels?: (conn: LlmConnection, token: string) => Promise; - accountState?: { runtimeState: string }; -}): { - activate: () => Promise; - sync: () => Promise; - getSaved: () => LlmConnection | null; -} { - let saved: LlmConnection | null = null; - const existing = opts.existing ?? null; - const connectionStore = { - get: async () => existing, - list: async () => (existing ? [existing] : []), - save: async (v: LlmConnection) => { - saved = v; - return v; - }, - update: async (_slug: string, patch: Partial) => { - saved = { ...(existing as LlmConnection), ...patch } as LlmConnection; - return saved; - }, - create: async () => { - throw new Error('not used'); - }, - delete: async () => {}, - remove: async () => {}, - getDefault: async () => null, - setDefault: async () => {}, - }; - const service = createOAuthModelConnectionsMainService({ - connectionStore, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - claudeSubscription: {} as never, - openAiCodex: { - getAccountState: async () => ({ - provider: 'openai-codex', - runtimeState: opts.accountState?.runtimeState ?? 'authenticated', - }), - getAccessTokenInternal: async () => opts.token ?? null, - }, - githubCopilotSubscription: {} as never, - fetchModels: opts.fetchModels, - } as never); - return { - activate: () => service.activateOpenAiCodexConnection(), - sync: () => service.syncOpenAiCodexConnection(), - getSaved: () => saved, - }; -} - -describe('syncOpenAiCodexConnection live discovery behavior', () => { - it('declares protocol live discovery for the openai-codex provider', () => { - assert.deepEqual( - PROVIDER_REGISTRY['openai-codex'].modelDiscovery, - { kind: 'protocol', auth: 'openai-codex' }, - ); - }); - - it('activates a newly authenticated connection without waiting for model discovery', async () => { - let discoveryCalls = 0; - const { activate, getSaved } = makeService({ - existing: makeExisting({ - enabled: false, - lastTestStatus: 'needs_reauth', - modelSource: 'fallback', - }), - token: 'tok', - fetchModels: async () => { - discoveryCalls += 1; - return [{ id: 'gpt-5.6-sol' }]; - }, - }); - - const result = await activate(); - - assert.equal(discoveryCalls, 0); - assert.equal(result?.enabled, true); - assert.equal(result?.lastTestStatus, 'verified'); - assert.equal(result?.lastTestMessage, 'Codex OAuth 已登录。'); - assert.deepEqual( - result?.models?.map((model) => model.id), - PROVIDER_DEFAULTS['openai-codex'].fallbackModels, - ); - assert.equal(getSaved()?.enabled, true); - }); - - it('preserves a non-empty fetched model cache during immediate activation', async () => { - const existing = makeExisting({ - enabled: false, - lastTestStatus: 'needs_reauth', - models: [{ id: 'gpt-5.6-sol' }, { id: 'gpt-5.5' }], - modelSource: 'fetched', - modelsFetchedAt: 42, - }); - const { activate } = makeService({ existing, token: 'tok' }); - - const result = await activate(); - - assert.deepEqual(result?.models, existing.models); - assert.equal(result?.modelSource, 'fetched'); - assert.equal(result?.modelsFetchedAt, 42); - assert.equal(result?.enabled, true); - }); - - it('stamps modelSource=fetched and persists discovered models on success', async () => { - const { sync, getSaved } = makeService({ - token: 'tok', - fetchModels: async () => [{ id: 'gpt-5.6-sol', contextWindow: 372000 }, { id: 'gpt-5.5' }], - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.modelSource, 'fetched'); - assert.deepEqual(saved.models, [{ id: 'gpt-5.6-sol', contextWindow: 372000 }, { id: 'gpt-5.5' }]); - assert.equal(saved.enabled, true); - assert.equal(saved.lastTestStatus, 'verified'); - }); - - it('preserves the user-enabled model allowlist during OAuth synchronization', async () => { - const existing = makeExisting({ - enabledModelIds: ['gpt-5.6-sol', 'gpt-5.5'], - models: [{ id: 'gpt-5.6-sol' }, { id: 'gpt-5.5' }], - }); - const { sync, getSaved } = makeService({ - existing, - token: 'tok', - fetchModels: async () => existing.models!, - }); - - await sync(); - - assert.deepEqual(getSaved()!.enabledModelIds, ['gpt-5.6-sol', 'gpt-5.5']); - }); - - it('disables the connection with lastTestStatus=error when /models returns an empty list', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting(), - token: 'tok', - fetchModels: async () => [], - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.enabled, false); - assert.equal(saved.lastTestStatus, 'error'); - }); - - it('disables the connection with lastTestStatus=needs_reauth when the access token is unavailable', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting(), - token: null, - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.enabled, false); - assert.equal(saved.lastTestStatus, 'needs_reauth'); - }); - - it('rebuilds the fallback list from the registry on discovery failure, not the stale persisted copy', async () => { - // Existing connection carries an old fallback snapshot (pre-gpt-5.6-sol). - // A transient discovery failure must not reuse that stale copy; it must - // rebuild from the current registry fallbackModels so gpt-5.6-sol appears. - const { sync, getSaved } = makeService({ - existing: makeExisting({ models: [{ id: 'gpt-5.4' }], modelSource: 'fallback' }), - token: 'tok', - fetchModels: async () => { - throw new Error('offline'); - }, - }); - await sync(); - const saved = getSaved()!; - assert.deepEqual( - saved.models!.map((m) => m.id), - PROVIDER_DEFAULTS['openai-codex'].fallbackModels, - ); - assert.ok( - saved.models!.some((m) => m.id === 'gpt-5.6-sol'), - 'fallback must include gpt-5.6-sol from the current registry', - ); - assert.equal(saved.modelSource, 'fallback'); - assert.equal(saved.enabled, true); - assert.equal(saved.lastTestStatus, 'verified'); - }); - - it('keeps the last fetched list as a cache on transient discovery failure', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting({ models: [{ id: 'gpt-5.6-sol' }], modelSource: 'fetched' }), - token: 'tok', - fetchModels: async () => { - throw new Error('offline'); - }, - }); - await sync(); - const saved = getSaved()!; - assert.deepEqual(saved.models, [{ id: 'gpt-5.6-sol' }]); - assert.equal(saved.modelSource, 'fetched'); - assert.equal(saved.enabled, true); - }); - - it('normalizes an enabled fetched-empty snapshot to disabled on transient failure', async () => { - const existing = makeExisting({ - enabled: true, - models: [], - modelSource: 'fetched', - lastTestStatus: 'verified', - }); - const { sync, getSaved } = makeService({ - existing, - token: 'tok', - fetchModels: async () => { - throw new Error('offline'); - }, - }); - - const result = await sync(); - - assert.deepEqual(result?.models, []); - assert.equal(result?.modelSource, 'fetched'); - assert.equal(result?.enabled, false); - assert.equal(result?.lastTestStatus, 'error'); - assert.deepEqual(getSaved()?.models, []); - assert.equal(getSaved()?.enabled, false); - }); - - it('re-enables a fetched-empty connection after later non-empty discovery', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting({ - enabled: false, - models: [], - modelSource: 'fetched', - lastTestStatus: 'error', - }), - token: 'tok', - fetchModels: async () => [{ id: 'gpt-5.6-sol' }], - }); - - const result = await sync(); - - assert.deepEqual(result?.models, [{ id: 'gpt-5.6-sol' }]); - assert.equal(result?.modelSource, 'fetched'); - assert.equal(result?.enabled, true); - assert.equal(result?.lastTestStatus, 'verified'); - assert.equal(getSaved()?.enabled, true); - }); - - it('does not preserve a non-empty fetched list when every cached id is now unsupported', async () => { - const existing = makeExisting({ - models: [{ id: 'gpt-5-codex' }], - modelSource: 'fetched', - }); - const { sync, getSaved } = makeService({ - existing, - token: 'tok', - fetchModels: async () => { - throw new Error('offline'); - }, - }); - - const result = await sync(); - assert.deepEqual(result?.models, []); - assert.equal(result?.enabled, false); - assert.equal(result?.lastTestStatus, 'error'); - assert.deepEqual(getSaved()?.models, []); - }); - - it('disables with needs_reauth when /models rejects with 401', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting(), - token: 'tok', - fetchModels: async () => { - throw new OpenAiCodexDiscoveryError(401); - }, - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.enabled, false); - assert.equal(saved.lastTestStatus, 'needs_reauth'); - }); - - it('disables with error when all discovered models are filtered as unsupported', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting(), - token: 'tok', - fetchModels: async () => [{ id: 'gpt-5-codex' }], - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.enabled, false); - assert.equal(saved.lastTestStatus, 'error'); - }); - - it('clears stale models when /models returns empty', async () => { - const { sync, getSaved } = makeService({ - existing: makeExisting({ models: [{ id: 'gpt-5.6-sol' }], modelSource: 'fetched' }), - token: 'tok', - fetchModels: async () => [], - }); - await sync(); - const saved = getSaved()!; - assert.equal(saved.enabled, false); - assert.equal(saved.lastTestStatus, 'error'); - assert.deepEqual(saved.models, []); - assert.equal(saved.modelSource, 'fetched'); - }); -}); - -describe('OAuth model connection user settings', () => { - it('preserves the Claude user-enabled model allowlist during synchronization', async () => { - const defaults = PROVIDER_DEFAULTS['claude-subscription']; - const existing = makeExisting({ - slug: 'claude-subscription', - providerType: 'claude-subscription', - defaultModel: defaults.fallbackModels[0], - enabledModelIds: defaults.fallbackModels.slice(0, 2), - models: defaults.fallbackModels.map((id) => ({ id })), - }); - let saved: LlmConnection | null = null; - const service = createOAuthModelConnectionsMainService({ - connectionStore: { - get: async () => existing, - save: async (value: LlmConnection) => { - saved = value; - return value; - }, - }, - claudeSubscription: { - getAccountState: async () => ({ runtimeState: 'authenticated' }), - }, - } as never); - - await service.syncClaudeSubscriptionConnection(); - - assert.deepEqual(saved!.enabledModelIds, defaults.fallbackModels.slice(0, 2)); - }); - - it('preserves the GitHub Copilot user-enabled model allowlist during synchronization', async () => { - const existing = makeExisting({ - slug: 'github-copilot', - providerType: 'github-copilot', - defaultModel: 'gpt-5.4', - enabledModelIds: ['gpt-5.4', 'claude-sonnet-4.6'], - models: [{ id: 'gpt-5.4' }, { id: 'claude-sonnet-4.6' }], - }); - let saved: LlmConnection | null = null; - const service = createOAuthModelConnectionsMainService({ - connectionStore: { - get: async () => existing, - save: async (value: LlmConnection) => { - saved = value; - return value; - }, - }, - githubCopilotSubscription: { - getAccountState: async () => ({ runtimeState: 'authenticated' }), - getTokensInternal: async () => ({ access_token: 'tok', base_url: 'https://api.githubcopilot.com' }), - }, - fetchModels: async () => existing.models!, - } as never); - - await service.syncGitHubCopilotConnection(); - - assert.deepEqual(saved!.enabledModelIds, ['gpt-5.4', 'claude-sonnet-4.6']); - }); -}); diff --git a/apps/desktop/src/main/__tests__/oauth-model-connections-xai.test.ts b/apps/desktop/src/main/__tests__/oauth-model-connections-xai.test.ts deleted file mode 100644 index b0414f0b0d..0000000000 --- a/apps/desktop/src/main/__tests__/oauth-model-connections-xai.test.ts +++ /dev/null @@ -1,227 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; - -import { PROVIDER_DEFAULTS, type LlmConnection } from '@maka/core'; -import { ProviderModelDiscoveryHttpError } from '@maka/runtime'; -import { - createOAuthModelConnectionsMainService, - XAI_OAUTH_CONNECTION_SLUG, -} from '../oauth-model-connections-main.js'; - -describe('xAI OAuth model connection synchronization', () => { - test('activates immediately from the shared xAI fallback catalog, then replaces it with discovery', async () => { - let saved: LlmConnection | null = null; - let discoveryCalls = 0; - const connectionStore = { - get: async () => saved, - list: async () => (saved ? [saved] : []), - save: async (connection: LlmConnection) => { - saved = connection; - return connection; - }, - update: async (_slug: string, patch: Partial) => { - saved = { ...(saved as LlmConnection), ...patch }; - return saved; - }, - }; - let discoveryStatus: number | null = null; - const service = createOAuthModelConnectionsMainService({ - connectionStore, - credentialStore: { getSecret: async () => null }, - claudeSubscription: {} as never, - openAiCodex: {} as never, - githubCopilotSubscription: {} as never, - xaiOAuth: { - getAccountState: async () => ({ - provider: 'xai-oauth', - runtimeState: 'authenticated', - }), - getAccessTokenInternal: async () => 'xai-oauth-token', - hasStoredCredential: async () => true, - }, - fetchModels: async () => { - discoveryCalls += 1; - if (discoveryStatus !== null) { - throw new ProviderModelDiscoveryHttpError(discoveryStatus); - } - return [{ id: 'grok-4.5', apiProtocol: 'openai-responses' }]; - }, - } as never); - - const activated = await service.activateXaiOAuthConnection(); - assert.equal(discoveryCalls, 0); - assert.equal(activated?.slug, XAI_OAUTH_CONNECTION_SLUG); - assert.equal(activated?.providerType, 'xai-oauth'); - assert.equal(activated?.enabled, true); - assert.deepEqual( - activated?.models?.map(({ id }) => id), - PROVIDER_DEFAULTS['xai-oauth'].fallbackModels, - ); - - const synchronized = await service.syncXaiOAuthConnection(); - assert.equal(discoveryCalls, 1); - assert.deepEqual(synchronized?.models, [ - { id: 'grok-4.5', apiProtocol: 'openai-responses' }, - ]); - assert.equal(synchronized?.modelSource, 'fetched'); - assert.equal(synchronized?.defaultModel, 'grok-4.5'); - assert.equal(synchronized?.lastTestStatus, 'verified'); - - discoveryStatus = 401; - const rejected = await service.syncXaiOAuthConnection(); - assert.equal(rejected?.enabled, false); - assert.equal(rejected?.lastTestStatus, 'needs_reauth'); - }); - - test('a resync reconciles the stored selection against the account catalog', async () => { - // The sync used to pass `enabledModelIds` straight back while replacing - // `models` with the live catalog, so a retired id stayed enabled forever; - // and it derived the default itself instead of asking the one function - // that already answers "the inventory changed, what is still usable". - let saved: LlmConnection = { - slug: XAI_OAUTH_CONNECTION_SLUG, - name: 'xAI OAuth', - providerType: 'xai-oauth', - defaultModel: 'grok-3', - enabled: true, - enabledModelIds: ['grok-3'], - models: [{ id: 'grok-3' }], - modelSource: 'fetched', - createdAt: 1, - updatedAt: 1, - }; - const service = createXaiService( - () => saved, - (connection) => { - saved = connection; - }, - [{ id: 'grok-4.5' }], - ); - - const synced = await service.syncXaiOAuthConnection(); - assert.equal(synced?.defaultModel, 'grok-4.5'); - assert.deepEqual(synced?.enabledModelIds, ['grok-4.5']); - }); - - test('a resync does not resurrect a selection the user emptied', async () => { - let saved: LlmConnection = { - slug: XAI_OAUTH_CONNECTION_SLUG, - name: 'xAI OAuth', - providerType: 'xai-oauth', - defaultModel: '', - enabled: true, - enabledModelIds: [], - models: [{ id: 'grok-4.5' }], - modelSource: 'fetched', - createdAt: 1, - updatedAt: 1, - }; - const service = createXaiService( - () => saved, - (connection) => { - saved = connection; - }, - [{ id: 'grok-4.5' }], - ); - - const synced = await service.syncXaiOAuthConnection(); - assert.equal(synced?.defaultModel, ''); - assert.deepEqual(synced?.enabledModelIds, []); - }); - - test('an account that recovers from an empty catalog does not re-seed', async () => { - // The sync persists `models: []` when the account reports nothing usable, - // which erases the record of ever having had a catalog. Reading "has a list - // to pick from" off the current array then made the recovery look like a - // first discovery — and handed back the selection the user had cleared. - // Every OAuth provider here ships fallbackModels, so an existing connection - // has had a list since it was created; that is the actual question. - let saved: LlmConnection = { - slug: XAI_OAUTH_CONNECTION_SLUG, - name: 'xAI OAuth', - providerType: 'xai-oauth', - defaultModel: '', - enabled: true, - enabledModelIds: [], - models: [], - modelSource: 'fetched', - createdAt: 1, - updatedAt: 1, - }; - const service = createXaiService( - () => saved, - (connection) => { - saved = connection; - }, - [{ id: 'grok-4.5' }, { id: 'grok-4-fast' }], - ); - - const synced = await service.syncXaiOAuthConnection(); - assert.equal(synced?.defaultModel, ''); - assert.deepEqual(synced?.enabledModelIds, []); - }); - - test('a resync does not re-pick a default the user cleared', async () => { - // The user unchecked the default model but kept another one enabled — a - // legitimate state, and the only half of the workspace default pair this - // page can clear. The sync then re-derived a default with `||` / "first - // enabled id", and '' is falsy, so it handed the choice back on the very - // next connections:list — which runs this sync before every read. - let saved: LlmConnection = { - slug: XAI_OAUTH_CONNECTION_SLUG, - name: 'xAI OAuth', - providerType: 'xai-oauth', - defaultModel: '', - enabled: true, - enabledModelIds: ['grok-4.5'], - models: [{ id: 'grok-4.5' }], - modelSource: 'fetched', - createdAt: 1, - updatedAt: 1, - }; - const service = createXaiService( - () => saved, - (connection) => { - saved = connection; - }, - [{ id: 'grok-4.5' }], - ); - - assert.equal((await service.activateXaiOAuthConnection())?.defaultModel, ''); - assert.equal((await service.syncXaiOAuthConnection())?.defaultModel, ''); - assert.deepEqual(saved.enabledModelIds, ['grok-4.5']); - }); -}); - -/** An authenticated xAI account whose catalog is `models`, over one stored connection. */ -function createXaiService( - read: () => LlmConnection, - write: (connection: LlmConnection) => void, - models: { id: string }[], -) { - return createOAuthModelConnectionsMainService({ - connectionStore: { - get: async () => read(), - list: async () => [read()], - save: async (connection: LlmConnection) => { - write(connection); - return connection; - }, - update: async (_slug: string, patch: Partial) => { - const next = { ...read(), ...patch }; - write(next); - return next; - }, - }, - credentialStore: { getSecret: async () => null }, - claudeSubscription: {} as never, - openAiCodex: {} as never, - githubCopilotSubscription: {} as never, - xaiOAuth: { - getAccountState: async () => ({ provider: 'xai-oauth', runtimeState: 'authenticated' }), - getAccessTokenInternal: async () => 'xai-oauth-token', - hasStoredCredential: async () => true, - }, - fetchModels: async () => models, - } as never); -} diff --git a/apps/desktop/src/main/__tests__/openai-codex-service.test.ts b/apps/desktop/src/main/__tests__/openai-codex-service.test.ts deleted file mode 100644 index 6cba3bdae7..0000000000 --- a/apps/desktop/src/main/__tests__/openai-codex-service.test.ts +++ /dev/null @@ -1,453 +0,0 @@ -/** - * Behavior tests for the OpenAI Codex subscription OAuth service - * (device-code flow). - * - * The device-auth protocol endpoints/params are owned and pinned by - * `@maka/runtime`'s codex-oauth-enrollment tests; this suite exercises - * the desktop service through its public class surface: user-code - * surfacing, browser opening, poll completion, expiry/cancellation - * semantics, strict exchange validation, and shared-credential - * persistence. - */ - -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { base64urlEncode } from '@maka/core'; -import { OpenAiCodexService } from '../oauth/openai-codex-service.js'; - -function makeJwt(payload: Record): string { - const header = base64urlEncode(new TextEncoder().encode(JSON.stringify({ alg: 'none' }))); - const body = base64urlEncode(new TextEncoder().encode(JSON.stringify(payload))); - return `${header}.${body}.signature`; -} - -// --------------------------------------------------------------- -// Behavior tests against a mocked fetch. -// --------------------------------------------------------------- - -interface RecordedRequest { - url: string; - method: string; - headers: Record; - body: unknown; -} - -class FakeCredentialStore { - private readonly map = new Map(); - failSetSecret = false; - async getSecret(slug: string, kind: string): Promise { - return this.map.get(`${slug}:${kind}`) ?? null; - } - async setSecret(slug: string, kind: string, value: string): Promise { - if (this.failSetSecret) throw new Error('simulated credential write failure'); - this.map.set(`${slug}:${kind}`, value); - } - async deleteSecret(slug: string, kind?: string): Promise { - this.map.delete(`${slug}:${kind}`); - } - async compareAndSetSecret( - slug: string, - kind: string, - expected: string | null, - value: string, - ): Promise<{ committed: true } | { committed: false; current: string | null }> { - const key = `${slug}:${kind}`; - const current = this.map.get(key) ?? null; - if (current !== expected) return { committed: false, current }; - this.map.set(key, value); - return { committed: true }; - } - dump(slug: string, kind: string): string | null { - return this.map.get(`${slug}:${kind}`) ?? null; - } -} - -function jsonResponse(body: unknown, status = 200): Response { - return new Response(JSON.stringify(body), { - status, - headers: { 'Content-Type': 'application/json' }, - }); -} - -interface DeviceHarnessOptions { - usercode: Record; - usercodeStatus?: number; - tokenPoll: Array<{ status: number; body: Record }>; - tokenExchange: { status: number; body: Record }; - /** Called right before each poll sleep resolves; tests advance the clock here. */ - onSleep?: () => void; -} - -interface DeviceHarness { - service: OpenAiCodexService; - requests: RecordedRequest[]; - openedUrls: string[]; - store: FakeCredentialStore; - advance(ms: number): void; -} - -const CLOCK_START = 1_800_000_000_000; - -function createHarness(options: DeviceHarnessOptions): DeviceHarness { - const requests: RecordedRequest[] = []; - const openedUrls: string[] = []; - const store = new FakeCredentialStore(); - let clock = CLOCK_START; - let pollIndex = 0; - - const fetchFn = async (url: string, init: RequestInit = {}): Promise => { - const headers: Record = {}; - for (const [key, value] of Object.entries((init.headers as Record) ?? {})) { - headers[key] = String(value); - } - let body: unknown = null; - if (typeof init.body === 'string') { - try { - body = JSON.parse(init.body); - } catch { - body = init.body; - } - } - requests.push({ url, method: init.method ?? 'GET', headers, body }); - - if (url.endsWith('/deviceauth/usercode')) { - return jsonResponse(options.usercode, options.usercodeStatus ?? 200); - } - if (url.endsWith('/deviceauth/token')) { - const step = options.tokenPoll[Math.min(pollIndex, options.tokenPoll.length - 1)]!; - pollIndex += 1; - return jsonResponse(step.body, step.status); - } - if (url.endsWith('/oauth/token')) { - return jsonResponse(options.tokenExchange.body, options.tokenExchange.status); - } - throw new Error(`Unexpected fetch URL: ${url}`); - }; - - const service = new OpenAiCodexService({ - userDataDir: '/tmp/maka-codex-device-test', - openExternal: async (url) => { - openedUrls.push(url); - }, - credentialStore: store, - fetchFn: fetchFn as unknown as typeof fetch, - // Abortable sleep so cancellation can interrupt the poll loop. - sleep: async (_ms, signal) => { - options.onSleep?.(); - if (signal.aborted) throw signal.reason ?? new Error('Aborted'); - await new Promise((resolve) => { - const timer = setTimeout(resolve, 0); - signal.addEventListener( - 'abort', - () => { - clearTimeout(timer); - resolve(); - }, - { once: true }, - ); - }); - if (signal.aborted) throw signal.reason ?? new Error('Aborted'); - }, - now: () => clock, - }); - - return { - service, - requests, - openedUrls, - store, - advance: (ms) => { - clock += ms; - }, - }; -} - -async function startLogin(h: DeviceHarness): Promise<{ authRequestId: string; stateHint: string }> { - const payload = await h.service.getAuthorizationUrl(); - if (!('authRequestId' in payload)) { - assert.fail(`expected authRequestId payload, got ${JSON.stringify(payload)}`); - } - const opened = await h.service.openAuthorizationUrl(payload.authRequestId); - assert.deepEqual(opened, { ok: true }); - return { authRequestId: payload.authRequestId, stateHint: payload.stateHint }; -} - -describe('Codex device-auth login flow', () => { - it('requests a one-time user code and surfaces it as stateHint', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_abc123', - user_code: 'ABCD-1234', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [{ status: 200, body: { authorization_code: 'ac', code_verifier: 'v' } }], - tokenExchange: { status: 200, body: {} }, - }); - const payload = await h.service.getAuthorizationUrl(); - if (!('authRequestId' in payload)) { - assert.fail('expected authRequestId payload'); - return; - } - assert.equal(payload.stateHint, 'ABCD-1234'); - const usercodeReq = h.requests.find((r) => r.url.endsWith('/deviceauth/usercode')); - assert.ok(usercodeReq); - assert.equal(usercodeReq.method, 'POST'); - assert.deepEqual(usercodeReq.body, { client_id: 'app_EMoamEEZ73f0CkXaXp7hrann' }); - }); - - it('reports a usercode endpoint failure as a failed action result', async () => { - const h = createHarness({ - usercode: {}, - usercodeStatus: 500, - tokenPoll: [{ status: 200, body: {} }], - tokenExchange: { status: 200, body: {} }, - }); - const result = await h.service.getAuthorizationUrl(); - assert.ok('ok' in result && result.ok === false); - assert.equal(result.reason, 'token_exchange_failed'); - }); - - it('opens the verify URL and completes the full device login', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_abc123', - user_code: 'ABCD-1234', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [ - { status: 403, body: { error: { code: 'deviceauth_authorization_pending' } } }, - { - status: 200, - body: { - authorization_code: 'authcode_xyz', - code_challenge: 'challenge', - code_verifier: 'verifier_123', - }, - }, - ], - tokenExchange: { - status: 200, - body: { - access_token: makeJwt({ - sub: 'sub-ok', - 'https://api.openai.com/auth': { chatgpt_account_id: 'acct_ok' }, - }), - refresh_token: 'refresh_ok', - id_token: makeJwt({ email: 'dev@example.test' }), - expires_in: 3600, - }, - }, - }); - - const { authRequestId } = await startLogin(h); - // The verification page is the fixed server-owned device URL. - assert.deepEqual(h.openedUrls, ['https://auth.openai.com/codex/device']); - - const complete = await h.service.completeAuthorization(authRequestId); - assert.deepEqual(complete, { ok: true }); - - // The device-auth protocol (poll body, exchange form, redirect URI) is - // pinned by codex-oauth-enrollment.test.ts; here we only verify the - // desktop lifecycle: pending retry then exchange happened and the - // credential landed. - const polls = h.requests.filter((r) => r.url.endsWith('/deviceauth/token')); - assert.equal(polls.length, 2); - assert.ok(h.requests.some((r) => r.url.endsWith('/oauth/token'))); - - // Tokens persisted; account state reflects the claims. - const state = await h.service.getAccountState(); - assert.equal(state.runtimeState, 'authenticated'); - assert.equal(state.accountId, 'acct_ok'); - assert.equal(state.email, 'dev@example.test'); - }); - - it('times out while polling when the user never approves', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_expired', - user_code: 'CODE-0001', - interval: '5', - expires_at: new Date(CLOCK_START + 5_000).toISOString(), - }, - tokenPoll: [{ status: 403, body: { error: { code: 'deviceauth_authorization_pending' } } }], - tokenExchange: { status: 200, body: {} }, - onSleep: () => h.advance(10_000), - }); - const { authRequestId } = await startLogin(h); - const complete = await h.service.completeAuthorization(authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'authorization_expired'); - }); - - it('reports completion after cancellation as authorization_pending', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_cancel', - user_code: 'CODE-0002', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [{ status: 403, body: { error: { code: 'deviceauth_authorization_pending' } } }], - tokenExchange: { status: 200, body: {} }, - }); - const { authRequestId } = await startLogin(h); - // Cancel aborts the poll and disposes the pending session; a later - // completion reports the session is gone (matches the xAI service). - h.service.cancelAuthorization(authRequestId); - const complete = await h.service.completeAuthorization(authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'authorization_pending'); - }); - - it('rejects completion before the verification page is opened', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_none', - user_code: 'CODE-0003', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [{ status: 200, body: {} }], - tokenExchange: { status: 200, body: {} }, - }); - const payload = await h.service.getAuthorizationUrl(); - if (!('authRequestId' in payload)) { - assert.fail('expected authRequestId payload'); - return; - } - const complete = await h.service.completeAuthorization(payload.authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'authorization_pending'); - }); - - it('rejects a malformed 200 exchange response without writing a credential', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_malformed', - user_code: 'CODE-0004', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [{ status: 200, body: { authorization_code: 'ac', code_verifier: 'v' } }], - // 200 but missing refresh_token / expires_in: must fail validation, - // never report success and persist an unparseable credential. - tokenExchange: { status: 200, body: { access_token: makeJwt({ sub: 'sub-malformed' }) } }, - }); - const { authRequestId } = await startLogin(h); - const complete = await h.service.completeAuthorization(authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'token_exchange_failed'); - assert.equal(h.store.dump('codex-subscription', 'oauth_token'), null); - }); - - it('maps a device window expiry to the authorization_expired UI reason', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_expiremid', - user_code: 'CODE-0005', - interval: '5', - expires_at: new Date(CLOCK_START + 5_000).toISOString(), - }, - tokenPoll: [{ status: 403, body: { error: { code: 'deviceauth_authorization_pending' } } }], - tokenExchange: { status: 200, body: {} }, - // The first (and only) poll returns pending; the sleep then advances - // the clock past expiry. The no-fetch-after-expiry behavior itself is - // pinned by codex-oauth-enrollment.test.ts; here we only assert the - // desktop surfaces it as a user-facing expiry, not a rejection. - onSleep: () => h.advance(10_000), - }); - const { authRequestId } = await startLogin(h); - const complete = await h.service.completeAuthorization(authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'authorization_expired'); - }); - - it('reports a credential write failure as storage_failed without reporting success', async () => { - const h = createHarness({ - usercode: { - device_auth_id: 'deviceauth_storefail', - user_code: 'CODE-0006', - interval: '5', - expires_at: '2099-01-01T00:00:00.000+00:00', - }, - tokenPoll: [{ status: 200, body: { authorization_code: 'ac', code_verifier: 'v' } }], - tokenExchange: { - status: 200, - body: { - access_token: makeJwt({ sub: 'sub-storefail' }), - refresh_token: 'refresh-storefail', - expires_in: 3600, - }, - }, - }); - h.store.failSetSecret = true; - const { authRequestId } = await startLogin(h); - const complete = await h.service.completeAuthorization(authRequestId); - assert.ok('ok' in complete && complete.ok === false); - assert.equal(complete.reason, 'storage_failed'); - }); - - it('exchanges and persists a grant even when cancelled after the poll consumed it', async () => { - const store = new FakeCredentialStore(); - let releasePoll!: (response: Response) => void; - const pollResponse = new Promise((resolve) => { - releasePoll = resolve; - }); - let exchanges = 0; - const service = new OpenAiCodexService({ - userDataDir: '/tmp/maka-codex-deferred', - openExternal: async () => undefined, - credentialStore: store, - now: () => CLOCK_START, - sleep: async () => undefined, - fetchFn: async (url) => { - if (String(url).endsWith('/deviceauth/usercode')) { - return jsonResponse({ - device_auth_id: 'deviceauth-deferred', - user_code: 'CODE-DEF', - interval: '5', - expires_at: new Date(CLOCK_START + 600_000).toISOString(), - }); - } - if (String(url).endsWith('/deviceauth/token')) { - return pollResponse; - } - if (String(url).endsWith('/oauth/token')) { - exchanges += 1; - return jsonResponse({ - access_token: makeJwt({ - sub: 'sub-def', - 'https://api.openai.com/auth': { chatgpt_account_id: 'acct-def' }, - }), - refresh_token: 'refresh-def', - expires_in: 3600, - }); - } - throw new Error(`Unexpected fetch ${String(url)}`); - }, - }); - const payload = await service.getAuthorizationUrl(); - if (!('authRequestId' in payload)) { - assert.fail('expected authRequestId payload'); - return; - } - const opened = await service.openAuthorizationUrl(payload.authRequestId); - assert.deepEqual(opened, { ok: true }); - const completion = service.completeAuthorization(payload.authRequestId); - // The poll is in flight (admitted). Cancelling must not discard the - // one-time authorization code once the poll has consumed it. - service.cancelAuthorization(payload.authRequestId); - releasePoll( - jsonResponse({ - authorization_code: 'one-time-code', - code_challenge: 'c', - code_verifier: 'server-verifier', - }), - ); - assert.deepEqual(await completion, { ok: true }); - assert.equal(exchanges, 1); - assert.ok(store.dump('codex-subscription', 'oauth_token') !== null); - }); -}); diff --git a/apps/desktop/src/main/__tests__/quote-companion-cleanup.test.ts b/apps/desktop/src/main/__tests__/quote-companion-cleanup.test.ts index 58b0299bdf..4698b34782 100644 --- a/apps/desktop/src/main/__tests__/quote-companion-cleanup.test.ts +++ b/apps/desktop/src/main/__tests__/quote-companion-cleanup.test.ts @@ -19,6 +19,183 @@ afterEach(async () => { }); describe('quote companion cleanup authority', () => { + it('releases a rejected creation lease so the same identity can retry', async () => { + const workspaceRoot = await createWorkspace(); + let removalFails = true; + const authority = createSessionCopyCleanupAuthority({ + workspaceRoot, + removeSession: async () => { + if (removalFails) throw new Error('temporary removal failure'); + }, + }); + await assert.rejects(authority.cleanup('fork-retry'), /temporary removal failure/); + + const creation = { + sessionId: 'fork-retry', + kind: 'branch' as const, + sourceSessionId: 'source-session', + sourceTurnId: 'source-turn', + ownerId: 'web-contents:1', + }; + await assert.rejects( + authority.ownCreation(creation, async () => 'unreachable'), + /scheduled for cleanup/, + ); + + removalFails = false; + await authority.cleanup('fork-retry'); + assert.equal(await authority.ownCreation(creation, async () => 'created'), 'created'); + }); + + it('orders cancellation after an in-flight copy reaches a known outcome', async () => { + const workspaceRoot = await createWorkspace(); + let releaseCreation!: () => void; + const creationGate = new Promise((resolve) => { + releaseCreation = resolve; + }); + const events: string[] = []; + const authority = createSessionCopyCleanupAuthority({ + workspaceRoot, + processId: 'process-current', + resumeSessionCopy: async () => { + events.push('resume'); + }, + removeSession: async () => { + events.push('remove'); + }, + }); + const creation = authority.ownCreation( + { + sessionId: 'fork-racing-create', + kind: 'branch', + sourceSessionId: 'source-session', + sourceTurnId: 'source-turn', + ownerId: 'web-contents:1', + }, + async () => { + events.push('create'); + await creationGate; + return 'created'; + }, + ); + + await authority.schedule('fork-racing-create'); + assert.deepEqual(events, ['create']); + releaseCreation(); + assert.equal(await creation, 'created'); + await authority.cleanup('fork-racing-create'); + + assert.deepEqual(events, ['create', 'remove']); + assert.deepEqual(await readPendingIds(workspaceRoot), []); + }); + + it('resolves an unknown creating lease before removing it after restart', async () => { + const workspaceRoot = await createWorkspace(); + const first = createSessionCopyCleanupAuthority({ + workspaceRoot, + processId: 'process-before-crash', + removeSession: async () => { + throw new Error('remove should belong to the successor'); + }, + }); + await assert.rejects( + first.ownCreation( + { + sessionId: 'fork-unknown-create', + kind: 'branch', + sourceSessionId: 'source-session', + sourceTurnId: 'source-turn', + ownerId: 'web-contents:2', + }, + async () => { + throw new Error('response lost'); + }, + ), + /response lost/, + ); + + const events: string[] = []; + const successor = createSessionCopyCleanupAuthority({ + workspaceRoot, + processId: 'process-after-crash', + resumeSessionCopy: async (creation) => { + events.push(`resume:${creation.sessionId}:${creation.sourceTurnId}`); + }, + removeSession: async (sessionId) => { + events.push(`remove:${sessionId}`); + }, + }); + + assert.deepEqual(await successor.recover(), { + removed: ['fork-unknown-create'], + failed: [], + }); + assert.deepEqual(events, [ + 'resume:fork-unknown-create:source-turn', + 'remove:fork-unknown-create', + ]); + assert.deepEqual(await readPendingIds(workspaceRoot), []); + }); + + it('abandons every live copy owned by a renderer that exits', async () => { + const workspaceRoot = await createWorkspace(); + const removed: string[] = []; + const authority = createSessionCopyCleanupAuthority({ + workspaceRoot, + processId: 'process-current', + removeSession: async (sessionId) => { + removed.push(sessionId); + }, + }); + await authority.ownCreation( + { + sessionId: 'fork-owned-renderer', + kind: 'branch', + sourceSessionId: 'source-session', + sourceTurnId: 'source-turn', + ownerId: 'web-contents:7', + }, + async () => 'created', + ); + + await authority.abandonOwner('web-contents:7'); + await authority.cleanup('fork-owned-renderer'); + + assert.deepEqual(removed, ['fork-owned-renderer']); + assert.deepEqual(await readPendingIds(workspaceRoot), []); + }); + + it('upgrades pending cleanup rows written by the previous schema', async () => { + const workspaceRoot = await createWorkspace(); + const database = new DatabaseSync(join(workspaceRoot, 'runtime.sqlite')); + try { + database.exec(` + CREATE TABLE workflow_quote_companion_cleanup ( + session_id TEXT PRIMARY KEY, + tracked_at INTEGER NOT NULL + ); + INSERT INTO workflow_quote_companion_cleanup(session_id, tracked_at) + VALUES ('fork-before-lease-schema', 1); + `); + } finally { + database.close(); + } + const removed: string[] = []; + const authority = createSessionCopyCleanupAuthority({ + workspaceRoot, + processId: 'process-current', + removeSession: async (sessionId) => { + removed.push(sessionId); + }, + }); + + assert.deepEqual(await authority.recover(), { + removed: ['fork-before-lease-schema'], + failed: [], + }); + assert.deepEqual(removed, ['fork-before-lease-schema']); + }); + it('acknowledges abandon after the intent is durable without waiting for removal', async () => { const workspaceRoot = await createWorkspace(); let releaseRemoval: (() => void) | undefined; diff --git a/apps/desktop/src/main/__tests__/quote-companion-core.test.ts b/apps/desktop/src/main/__tests__/quote-companion-core.test.ts index 9fd85e7353..73ec29ddd2 100644 --- a/apps/desktop/src/main/__tests__/quote-companion-core.test.ts +++ b/apps/desktop/src/main/__tests__/quote-companion-core.test.ts @@ -11,7 +11,7 @@ import { strict as assert } from 'node:assert'; import { afterEach, describe, it } from 'node:test'; -import type { SessionEvent, SessionSummary, StoredMessage, TurnRecord, TurnStatus } from '@maka/core'; +import type { SessionEvent, SessionSummary, TurnRecord, TurnStatus } from '@maka/core'; import { abandonPendingCompanionCopy, applyCompanionInteractionEvent, @@ -22,6 +22,7 @@ import { isCompanionTurnTerminal, latestSettledTurnId, performCompanionTurn, + recoverOrphanedCompanionCopies, type CompanionSessionApi, } from '../../renderer/quote-companion-core.js'; @@ -67,7 +68,6 @@ function makeApi(control: FakeControl = {}) { attachmentItems?: unknown; }; }[], - setMode: [] as [string, string][], branchedFrom: [] as Array<{ sourceTurnId: string; name?: string; @@ -78,7 +78,6 @@ function makeApi(control: FakeControl = {}) { created: 0, }; const api: CompanionSessionApi = { - readMessages: async () => [{ turnId: 'x' } as unknown as StoredMessage], listTurns: async () => { if (control.listTurnsThrows) throw new Error('listTurns failed'); return control.turns ?? [turn('main-turn-1', 'completed')]; @@ -95,10 +94,6 @@ function makeApi(control: FakeControl = {}) { } return forked; }, - setPermissionMode: async (id, mode) => { - calls.setMode.push([id, mode]); - return summary(id, mode); - }, cleanupSessionCopy: async (id) => { calls.removed.push(id); if (control.cleanupThrows) throw new Error('cleanup failed'); @@ -129,6 +124,7 @@ function recorder() { const base = { sourceSession: summary('main', 'execute'), + panelId: 'panel-main', name: '追问：excerpt', turnId: 'T1', text: 'hello', @@ -139,7 +135,7 @@ const base = { afterEach(async () => { const { api } = makeApi(); for (const sourceSessionId of ['main', 'quote-retry-source', 'quote-abandon-source']) { - await abandonPendingCompanionCopy(api, sourceSessionId); + await abandonPendingCompanionCopy(api, sourceSessionId, base.panelId); } }); @@ -219,6 +215,42 @@ describe('deriveCompanionComposerState', () => { }); describe('performCompanionTurn', () => { + it('abandons every panel-scoped copy orphaned by a renderer reload', async () => { + const control: FakeControl = { loseFirstBranchResponse: true }; + const { api, calls } = makeApi(control); + const sourceSession = summary('quote-reload-source', 'execute'); + const first = await performCompanionTurn({ + api, + isDisposed: () => false, + ...base, + sourceSession, + panelId: 'panel-before-reload', + ...recorder(), + }); + assert.equal(first.status, 'error'); + const orphanedCopyId = calls.branchedFrom[0]?.copyId; + + await recoverOrphanedCompanionCopies(api); + + assert.deepEqual(calls.abandoned, [orphanedCopyId]); + const afterReload = await performCompanionTurn({ + api, + isDisposed: () => false, + ...base, + sourceSession, + panelId: 'panel-after-reload', + ...recorder(), + }); + assert.equal(afterReload.status, 'sent'); + assert.notEqual(calls.branchedFrom[1]?.copyId, orphanedCopyId); + await cleanupCompanionCopy( + api, + sourceSession.id, + 'panel-after-reload', + calls.branchedFrom[1]!.copyId, + ); + }); + it('happy path: forks at the completed turn, preserves permission, sends, then commits + consumes', async () => { const { api, calls } = makeApi({ turns: [turn('t-old', 'completed'), turn('t-settled', 'completed'), turn('t-running', 'running')], @@ -234,7 +266,6 @@ describe('performCompanionTurn', () => { })), [{ sourceTurnId: 't-settled', name: base.name, sideConversation: true }], ); - assert.deepEqual(calls.setMode, []); assert.equal(calls.sent.length, 1); assert.deepEqual(calls.sent[0].cmd.quotes, [{ text: 'excerpt' }]); assert.deepEqual(calls.removed, []); @@ -299,7 +330,6 @@ describe('performCompanionTurn', () => { const rec = recorder(); const result = await performCompanionTurn({ api, isDisposed: () => false, ...base, ...rec }); assert.deepEqual(result, { status: 'error', code: 'fork_setup_failed' }); - assert.deepEqual(calls.setMode, []); assert.equal(calls.sent.length, 0); assert.deepEqual(rec.events, []); }); @@ -344,7 +374,10 @@ describe('performCompanionTurn', () => { await performCompanionTurn({ api, isDisposed: () => false, ...input, ...recorder() }); const abandonedCopyId = calls.branchedFrom[0]!.copyId; - assert.equal(await abandonPendingCompanionCopy(api, sourceSession.id), true); + assert.equal( + await abandonPendingCompanionCopy(api, sourceSession.id, base.panelId), + true, + ); assert.deepEqual(calls.abandoned, [abandonedCopyId]); const next = await performCompanionTurn({ @@ -369,7 +402,10 @@ describe('performCompanionTurn', () => { await performCompanionTurn({ api, isDisposed: () => false, ...input, ...recorder() }); const firstCopyId = calls.branchedFrom[0]?.copyId; - assert.equal(await abandonPendingCompanionCopy(api, sourceSession.id), false); + assert.equal( + await abandonPendingCompanionCopy(api, sourceSession.id, base.panelId), + false, + ); control.abandonThrows = false; const retried = await performCompanionTurn({ @@ -380,7 +416,12 @@ describe('performCompanionTurn', () => { }); assert.equal(retried.status, 'sent'); assert.notEqual(calls.branchedFrom[1]?.copyId, firstCopyId); - await cleanupCompanionCopy(api, sourceSession.id, calls.branchedFrom[1]!.copyId); + await cleanupCompanionCopy( + api, + sourceSession.id, + base.panelId, + calls.branchedFrom[1]!.copyId, + ); }); it('completes the copy lease by copy id when an embedded fork has another id', async () => { @@ -399,13 +440,26 @@ describe('performCompanionTurn', () => { assert.equal(sent.status, 'sent'); const firstCopyId = calls.branchedFrom[0]?.copyId; - assert.equal(await cleanupCompanionCopy(api, sourceSession.id, 'embedded-fork'), true); + assert.equal( + await cleanupCompanionCopy( + api, + sourceSession.id, + base.panelId, + 'embedded-fork', + ), + true, + ); assert.deepEqual(calls.removed, ['embedded-fork']); control.createdId = 'embedded-fork-2'; await performCompanionTurn({ api, isDisposed: () => false, ...input, ...recorder() }); assert.notEqual(calls.branchedFrom[1]?.copyId, firstCopyId); - await cleanupCompanionCopy(api, sourceSession.id, 'embedded-fork-2'); + await cleanupCompanionCopy( + api, + sourceSession.id, + base.panelId, + 'embedded-fork-2', + ); }); it('does not create or send before the source has a completed turn', async () => { @@ -413,7 +467,6 @@ describe('performCompanionTurn', () => { const rec = recorder(); const result = await performCompanionTurn({ api, isDisposed: () => false, ...base, ...rec }); assert.deepEqual(result, { status: 'error', code: 'fork_setup_failed' }); - assert.deepEqual(calls.setMode, []); assert.equal(calls.sent.length, 0); assert.deepEqual(rec.events, []); }); @@ -427,7 +480,6 @@ describe('performCompanionTurn', () => { const result = await performCompanionTurn({ api, isDisposed: () => disposed, ...base, ...rec }); assert.equal(result.status, 'disposed'); assert.deepEqual(calls.removed, [calls.branchedFrom[0]!.copyId]); - assert.deepEqual(calls.setMode, []); assert.equal(calls.sent.length, 0); assert.deepEqual(rec.events, []); }); @@ -466,7 +518,6 @@ describe('performCompanionTurn', () => { }); assert.deepEqual(result, { status: 'sent', forkId: 'fork-existing' }); assert.equal(calls.created, 0); - assert.deepEqual(calls.setMode, []); assert.deepEqual(rec.events, ['beforeSend:fork-existing', 'consumed']); }); }); diff --git a/apps/desktop/src/main/__tests__/runtime-host-bot-session-adapter.test.ts b/apps/desktop/src/main/__tests__/runtime-host-bot-session-adapter.test.ts index 182497c5b9..3dba2b87ae 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-bot-session-adapter.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-bot-session-adapter.test.ts @@ -136,7 +136,7 @@ test('subscribes before Turn start and settles a fast Host reply without losing terminalEventId: 'terminal-1', }), ); - return runningTurn(input.sessionId, input.turnId); + return startedTurn(runningTurn(input.sessionId, input.turnId)); }, }); const adapter = createRuntimeHostBotSessionAdapter({ @@ -163,6 +163,44 @@ test('subscribes before Turn start and settles a fast Host reply without losing ]); }); +test('returns blocked Skill feedback without waiting for a Turn that was not created', async () => { + const events = new AsyncFrameQueue(); + let closeCount = 0; + const adapter = createRuntimeHostBotSessionAdapter({ + client: botClient({ + openSession: async () => ({ + snapshot: continuitySnapshot(null), + transcript: Promise.resolve([]), + events, + async close() { + closeCount += 1; + events.end(); + }, + }), + startTurn: async () => ({ + kind: 'blocked', + skillInvocation: { + loaded: [], + failed: [{ request: 'writer', reason: 'not_found' }], + receipts: [], + }, + }), + }), + resolveCreateTarget: async () => ({ cwd: '/workspace' }), + emitSessionsChanged() {}, + }); + + assert.deepEqual( + await adapter.runTurn({ + sessionId: 'bot-session-1', + turnId: 'turn-blocked', + text: '/skill:writer help', + }), + { kind: 'errored', reason: 'writer: not_found' }, + ); + assert.equal(closeCount, 1); +}); + test('projects Host interaction and failure outcomes into the Bot reply contract', async () => { const suspended = await runProjectedTurn({ ...runningTurn('bot-session-1', 'turn-1'), @@ -193,7 +231,7 @@ async function runProjectedTurn(rootTurn: TurnSnapshot) { }), startTurn: async () => { events.push(projectionFrame(1, rootTurn)); - return runningTurn(rootTurn.sessionId, rootTurn.turnId); + return startedTurn(runningTurn(rootTurn.sessionId, rootTurn.turnId)); }, }), resolveCreateTarget: async () => ({ cwd: '/workspace' }), @@ -252,6 +290,14 @@ function runningTurn(sessionId: string, turnId: string): TurnSnapshot { return { sessionId, turnId, runId: 'run-1', status: 'running' }; } +function startedTurn(turn: TurnSnapshot) { + return { + kind: 'started' as const, + turn, + skillInvocation: { loaded: [], failed: [], receipts: [] }, + }; +} + function continuitySnapshot(rootTurn: TurnSnapshot | null): SessionContinuitySnapshot { return { schemaVersion: 3, diff --git a/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts b/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts index 09690e38cd..28f1d7b7e8 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts @@ -118,6 +118,37 @@ test('re-reads the Session revision before retrying a product update', async () ]); }); +test('settles cleanup when its copy target is already absent', async () => { + const { client } = clientWithResponses([{ kind: 'session', session: null }]); + + assert.equal(await client.removeSessionCopy('lost-copy-response'), 'removed'); +}); + +test('settles branch cleanup when its target disappears between catalog reads', async () => { + const { client } = clientWithResponses([ + { kind: 'session', session: session('branch-copy', 1) }, + { kind: 'session', session: null }, + ]); + + assert.equal(await client.removeSessionCopy('branch-copy'), 'removed'); +}); + +test('settles revision cleanup when abandon observes an already absent target', async () => { + const { client } = clientWithResponses([ + { + kind: 'session', + session: session('revision-copy', 1, { revisionOfTurnId: 'source-turn' }), + }, + new RuntimeHostOperationError( + 'session.revision.abandon', + 'not_found', + 'Revision copy is already absent', + ), + ]); + + assert.equal(await client.removeSessionCopy('revision-copy'), 'removed'); +}); + test('merges a configuration patch into each fresh CAS projection', async () => { const { client, requests } = clientWithResponses([ { kind: 'session', session: session('session-1', 10) }, diff --git a/apps/desktop/src/main/__tests__/runtime-host-client-uds.test.ts b/apps/desktop/src/main/__tests__/runtime-host-client-uds.test.ts index 34dd7f09df..62cb750021 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-client-uds.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-client-uds.test.ts @@ -206,12 +206,15 @@ test('drives the renderer Session catalog facade through real UDS framing', asyn }, botRegistry: {} as BotRegistry, resolveBotCreateTarget: async () => ({ cwd: base }), + resolveSessionCreateProject: async () => ({ cwd: base }), emitSessionsChanged: (reason, sessionId) => changes.push({ reason, sessionId }), emitModeChanged() {}, completeComputerUseTurn() {}, createSessionCopyCleanup: () => ({ + ownCreation: (_creation, operation) => operation(), cleanup: async () => undefined, schedule: async () => undefined, + abandonOwner: async () => undefined, recover: async () => ({ removed: [], failed: [] }), }), newId: () => 'session-ipc', @@ -279,10 +282,14 @@ test('drives the renderer Session execution facade through real UDS framing', as return { ok: true, result: { - sessionId: input.sessionId, - turnId: input.turnId, - runId: 'run-1', - status: 'running', + kind: 'started', + turn: { + sessionId: input.sessionId, + turnId: input.turnId, + runId: 'run-1', + status: 'running', + }, + skillInvocation: { loaded: [], failed: [], receipts: [] }, }, }; }, @@ -314,6 +321,8 @@ test('drives the renderer Session execution facade through real UDS framing', as stat: async () => ({ size: 0 }), resizeImage: async (bytes) => bytes, beforeStop() {}, + sessionCopyCleanup: unusedSessionCopyCleanup(), + onBackgroundError() {}, newId: () => 'turn-1', }, ipc, @@ -426,7 +435,10 @@ test('drives bounded Session domain projections through real UDS framing', async if (connected.kind !== 'connected') throw new Error('Desktop did not connect to Runtime Host'); const client = new DesktopRuntimeHostClient(connected.connection); const ipc = ipcHarness(); - registerRuntimeHostSessionDomainsIpc({ client, emitModeChanged() {} }, ipc); + registerRuntimeHostSessionDomainsIpc( + { client, emitModeChanged() {}, sessionObserver: unusedSessionObserver() }, + ipc, + ); assert.equal( ((await ipc.invoke('tasks:list', 'session-1')) as Array<{ id: string }>)[0]?.id, @@ -494,6 +506,25 @@ function ipcHarness() { }; } +function unusedSessionCopyCleanup() { + return { + ownCreation: async (_creation: unknown, operation: () => Promise) => operation(), + async cleanup() {}, + async schedule() {}, + async abandonOwner() {}, + async recover() { + return { removed: [], failed: [] }; + }, + }; +} + +function unusedSessionObserver() { + return { + async observe() {}, + async unobserve() {}, + }; +} + function session( id: string, overrides: Partial = {}, diff --git a/apps/desktop/src/main/__tests__/runtime-host-connections-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-connections-ipc-main.test.ts index f051c944eb..6f3bf10d9a 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-connections-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-connections-ipc-main.test.ts @@ -35,6 +35,68 @@ test('reports an existing but unconfigured credential as missing', async () => { ); }); +test('preserves the provider default inventory beside the recommended model', async () => { + const handlers = new Map unknown>(); + let createdModels: readonly string[] = []; + const emptyCatalog: ConnectionCatalogSnapshot = { + revision: 0, + defaultTarget: null, + connections: [], + }; + registerRuntimeHostConnectionsIpc({ + ipcMain: { + handle: (channel, handler) => { + handlers.set(channel, handler as (...args: unknown[]) => unknown); + }, + }, + client: { + loadConnectionCatalog: async () => + createdModels.length === 0 + ? emptyCatalog + : { + revision: 1, + defaultTarget: null, + connections: [ + { + connectionId: 'connection-free', + revision: 1, + slug: 'opencode-free', + name: 'OpenCode Free', + providerType: 'opencode-free', + enabled: true, + enabledModelIds: createdModels, + models: [], + }, + ], + }, + createConnection: async ( + _revision: number, + draft: { readonly enabledModelIds: readonly string[] }, + ) => { + createdModels = draft.enabledModelIds; + return { + kind: 'committed', + connection: { connectionId: 'connection-free', revision: 1 }, + }; + }, + } as never, + emitConnectionListChanged() {}, + }); + + await handlers.get('connections:create')?.({}, { + slug: 'opencode-free', + name: 'OpenCode Free', + providerType: 'opencode-free', + defaultModel: 'nemotron-3-ultra-free', + }); + + assert.deepEqual(createdModels, [ + 'nemotron-3-ultra-free', + 'mimo-v2.5-free', + 'deepseek-v4-flash-free', + ]); +}); + test('projects the Host default target without inventing a second Connection authority', () => { const connections = projectHostConnections(catalog()); @@ -54,6 +116,14 @@ test('projects the Host default target without inventing a second Connection aut ]); }); +test('does not invent a per-Connection default when the Host target is unset', () => { + const snapshot = catalog(); + const connections = projectHostConnections({ ...snapshot, defaultTarget: null }); + + assert.equal(connections[0]?.defaultModel, ''); + assert.deepEqual(connections[0]?.enabledModelIds, ['model-1', 'model-2']); +}); + test('preserves the Host-tested model and diagnostics for the existing Desktop UI', () => { assert.deepEqual( projectHostConnectionTest({ diff --git a/apps/desktop/src/main/__tests__/runtime-host-desktop-boot-dependency.test.ts b/apps/desktop/src/main/__tests__/runtime-host-desktop-boot-dependency.test.ts index 9ab367d5bb..9960ab101b 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-desktop-boot-dependency.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-desktop-boot-dependency.test.ts @@ -18,7 +18,7 @@ const entrypoint = join( 'runtime-host-boot.ts', ); -test('the opt-in Desktop boot cannot load an embedded Interactive owner', async () => { +test('the production Desktop boot cannot construct an Interactive owner', async () => { const result = await build({ absWorkingDir: repositoryRoot, entryPoints: [entrypoint], @@ -31,15 +31,6 @@ test('the opt-in Desktop boot cannot load an embedded Interactive owner', async }); assert.ok(result.metafile); const reached = new Set(Object.keys(result.metafile.inputs).map(normalize)); - const forbidden = [ - 'apps/desktop/src/main/app-lifecycle.ts', - 'apps/desktop/src/main/boot.ts', - 'apps/desktop/src/main/embedded-bot-session-adapter.ts', - 'apps/desktop/src/main/execution-store-wiring.ts', - 'apps/desktop/src/main/sessions-ipc-main.ts', - 'apps/desktop/src/main/startup-safe-boundary-resume.ts', - ]; - assert.deepEqual(forbidden.filter((path) => reached.has(normalize(path))), []); for (const required of [ 'apps/desktop/src/main/desktop-shell-presentation.ts', 'apps/desktop/src/main/runtime-host-account-connection.ts', @@ -49,13 +40,32 @@ test('the opt-in Desktop boot cannot load an embedded Interactive owner', async assert.equal(reached.has(normalize(required)), true, `${required} must be reachable`); } - const source = await readFile(entrypoint, 'utf8'); - for (const factory of [ + const forbiddenFactories = [ 'SessionManager', + 'RuntimeKernel', 'createSessionStore', + 'createAgentRunStore', + 'createRuntimeEventStore', 'openRuntimeEventPersistence', 'openDesktopExecutionStoreWiring', - ]) { - assert.equal(source.includes(factory), false, `${factory} must stay outside Host-backed boot`); + 'openInteractiveRuntimePolicyStoresForWrite', + 'tryAcquireInteractiveRootOwner', + ]; + for (const path of reached) { + if (!path.startsWith(normalize('apps/desktop/src/main/'))) continue; + if (isE2eFixtureModule(path)) continue; + const source = await readFile(resolve(repositoryRoot, path), 'utf8'); + for (const factory of forbiddenFactories) { + assert.doesNotMatch( + source, + new RegExp(`\\b${factory}\\b`, 'u'), + `${path} must not reach Interactive owner ${factory}`, + ); + } } }); + +function isE2eFixtureModule(path: string): boolean { + const relative = normalize(path).slice(normalize('apps/desktop/src/main/').length); + return relative === 'e2e-fixture.ts' || relative.startsWith(normalize('e2e-fixture/')); +} diff --git a/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate-dependency.test.ts b/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate-dependency.test.ts index 68752335db..884a5f0247 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate-dependency.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate-dependency.test.ts @@ -30,20 +30,6 @@ test('the Desktop Host candidate cannot reach an embedded Runtime owner', async }); assert.ok(result.metafile); - const reached = new Set(Object.keys(result.metafile.inputs).map(normalize)); - const forbiddenModules = [ - 'apps/desktop/src/main/app-lifecycle.ts', - 'apps/desktop/src/main/boot.ts', - 'apps/desktop/src/main/embedded-bot-session-adapter.ts', - 'apps/desktop/src/main/execution-store-wiring.ts', - 'apps/desktop/src/main/sessions-ipc-main.ts', - 'apps/desktop/src/main/startup-safe-boundary-resume.ts', - ]; - assert.deepEqual( - forbiddenModules.filter((path) => reached.has(normalize(path))), - [], - ); - const externalImports = Object.values(result.metafile.inputs).flatMap(({ imports }) => imports.filter(({ external }) => external).map(({ path }) => path), ); diff --git a/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate.test.ts b/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate.test.ts index 5eef2944d4..4de9dcd85b 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-desktop-candidate.test.ts @@ -292,8 +292,10 @@ test('does not release or report a Revision the Host retained during cleanup', a createSessionCopyCleanup: ({ removeSession }) => { removeSessionCopy = removeSession; return { + ownCreation: (_creation, operation) => operation(), cleanup: async () => undefined, schedule: async () => undefined, + abandonOwner: async () => undefined, recover: async () => ({ removed: [], failed: [] }), }; }, @@ -350,12 +352,15 @@ function deps( nativeCapabilities, botRegistry: {} as BotRegistry, resolveBotCreateTarget: async () => ({ cwd: '/workspace' }), + resolveSessionCreateProject: async () => ({ cwd: '/workspace' }), emitSessionsChanged() {}, emitModeChanged() {}, completeComputerUseTurn() {}, createSessionCopyCleanup: () => ({ + ownCreation: (_creation, operation) => operation(), cleanup: async () => undefined, schedule: async () => undefined, + abandonOwner: async () => undefined, recover: async () => ({ removed: [], failed: [] }), }), newId: () => 'candidate-id', diff --git a/apps/desktop/src/main/__tests__/runtime-host-desktop-owner.test.ts b/apps/desktop/src/main/__tests__/runtime-host-desktop-owner.test.ts index 37d2080064..b16ae2df5b 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-desktop-owner.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-desktop-owner.test.ts @@ -8,14 +8,19 @@ import type { } from '../runtime-host-desktop-candidate.js'; import { startRuntimeHostDesktopOwner } from '../runtime-host-desktop-owner.js'; -test('replaces a disconnected generation without falling back to embedded Runtime', async () => { +test('replaces a disconnected generation without falling back to embedded Runtime', { timeout: 10_000 }, async () => { const first = candidateHarness(); const second = candidateHarness(); const queue = [ready(first.candidate), ready(second.candidate)]; let starts = 0; + let resolveSecondStart!: () => void; + const secondStarted = new Promise((resolve) => { + resolveSecondStart = resolve; + }); const owner = await startRuntimeHostDesktopOwner({} as DesktopRuntimeHostCandidateStartInput, { startCandidate: async () => { starts += 1; + if (starts === 2) resolveSecondStart(); const result = queue.shift(); assert.ok(result); return result; @@ -23,7 +28,8 @@ test('replaces a disconnected generation without falling back to embedded Runtim }); first.disconnect(); - await eventually(() => starts === 2); + await secondStarted; + await new Promise((resolve) => setImmediate(resolve)); await owner.handleBotIncomingMessage({ text: 'hello' } as BotIncomingMessage); await owner.stopSession('session-1'); @@ -34,10 +40,13 @@ test('replaces a disconnected generation without falling back to embedded Runtim assert.equal(second.closeCalls, 1); }); -test('reports exhausted reconnect attempts as fatal and never starts a fallback', async () => { +test('reports exhausted reconnect attempts as fatal and never starts a fallback', { timeout: 10_000 }, async () => { const first = candidateHarness(); let starts = 0; - let fatal: Error | undefined; + let reportFatal!: (error: Error) => void; + const fatalReported = new Promise((resolve) => { + reportFatal = resolve; + }); const owner = await startRuntimeHostDesktopOwner({} as DesktopRuntimeHostCandidateStartInput, { startCandidate: async (): Promise => { starts += 1; @@ -46,14 +55,14 @@ test('reports exhausted reconnect attempts as fatal and never starts a fallback' : { kind: 'failed', reason: 'host_unresponsive' }; }, onFatalError: (error) => { - fatal = error; + reportFatal(error); }, }); first.disconnect(); - await eventually(() => fatal !== undefined, 2_000); + const fatal = await fatalReported; assert.equal(starts, 4); - assert.match(fatal?.message ?? '', /host_unresponsive/); + assert.match(fatal.message, /host_unresponsive/); await owner.close(); }); @@ -99,11 +108,3 @@ function candidateHarness() { function ready(candidate: DesktopRuntimeHostCandidate): DesktopRuntimeHostCandidateStartResult { return { kind: 'ready', candidate }; } - -async function eventually(predicate: () => boolean, timeoutMs = 1_000): Promise { - const deadline = Date.now() + timeoutMs; - while (!predicate()) { - if (Date.now() >= deadline) throw new Error('condition did not settle'); - await new Promise((resolve) => setTimeout(resolve, 10)); - } -} diff --git a/apps/desktop/src/main/__tests__/runtime-host-native-capabilities.test.ts b/apps/desktop/src/main/__tests__/runtime-host-native-capabilities.test.ts index 126b3aefff..403bc71b09 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-native-capabilities.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-native-capabilities.test.ts @@ -13,6 +13,8 @@ import { type ClientCapabilityCallFrame, } from '@maka/runtime-host/protocol'; import { z } from 'zod'; +import { buildClientSettingsTools } from '../client-settings-tools.js'; +import { buildRiveWorkflowTool } from '../rive-workflow-tool.js'; import { createDesktopNativeCapabilityProvider } from '../runtime-host-native-capabilities.js'; test('publishes self-described session-affine Browser and Computer Use offers', () => { @@ -81,6 +83,47 @@ test('publishes the real Computer Use schema through the Client Capability proto assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true); }); +test('publishes every production Desktop-owned tool schema through the protocol', () => { + const settingsTools = buildClientSettingsTools({ + async read() { + throw new Error('not invoked'); + }, + async update() { + throw new Error('not invoked'); + }, + async confirm() { + return false; + }, + }); + const provider = createDesktopNativeCapabilityProvider({ + browserTools: [], + releaseBrowserSession() {}, + computerUseTools: computerTools(), + releaseComputerUseSession() {}, + additionalGroups: () => [ + { + offerId: 'desktop_settings', + label: 'Client settings', + description: 'Client settings', + tools: settingsTools, + }, + { + offerId: 'desktop_rive', + label: 'Rive', + description: 'Rive workflows', + tools: [buildRiveWorkflowTool()], + }, + ], + }); + + assert.doesNotThrow(() => + decodeClientCapabilityReplaceInput({ + registrationId: 'registration-1', + offers: provider.offers(), + }), + ); +}); + test('validates before admission and invokes the exact offered tool with Host context', async () => { let admitted = false; let invoked = false; diff --git a/apps/desktop/src/main/__tests__/runtime-host-oauth-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-oauth-ipc-main.test.ts index a3ca1b828d..0d10cb2e4c 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-oauth-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-oauth-ipc-main.test.ts @@ -4,6 +4,7 @@ import type { IpcMainInvokeEvent } from 'electron'; import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections'; import type { ConnectionCatalogSnapshot } from '@maka/core/runtime-policy'; import { + RUNTIME_HOST_OAUTH_IPC_CHANNELS, registerRuntimeHostOAuthIpc, type RuntimeHostOAuthIpcDeps, } from '../runtime-host-oauth-ipc-main.js'; @@ -185,6 +186,8 @@ test('adapts every Host OAuth provider through one Desktop flow', async () => { isProviderEnabled: () => true, }); + assert.deepEqual([...handlers.keys()].sort(), [...RUNTIME_HOST_OAUTH_IPC_CHANNELS].sort()); + for (const prefix of ['claude-subscription', 'openai-codex', 'xai-oauth']) { assert.equal(handlers.has(`${prefix}:get-auth-url`), true); assert.equal(handlers.has(`${prefix}:complete-authorization`), true); diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-catalog-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-catalog-ipc-main.test.ts index 5551402c25..8dd5846ec7 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-session-catalog-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-session-catalog-ipc-main.test.ts @@ -24,7 +24,7 @@ test('leaves ordinary Session defaults to the Host while preserving product mode registerRuntimeHostSessionCatalogIpc( { client, - workspaceRoot: '/workspace', + resolveCreateProject: async () => ({ cwd: '/project', projectId: 'project-1' }), emitSessionsChanged: (reason, sessionId) => events.push({ reason, sessionId }), releaseSessionResources() {}, sessionCopyCleanup: cleanupAuthority(), @@ -44,7 +44,8 @@ test('leaves ordinary Session defaults to the Host while preserving product mode assert.deepEqual(creates, [ { sessionId: 'session-1', - cwd: '/workspace', + cwd: '/project', + projectId: 'project-1', name: DEFAULT_SESSION_NAME, modelTarget: { kind: 'default' }, collaborationMode: 'agent', @@ -52,7 +53,8 @@ test('leaves ordinary Session defaults to the Host while preserving product mode }, { sessionId: 'session-2', - cwd: '/workspace', + cwd: '/project', + projectId: 'project-1', mode: 'deep_research', labels: ['customer-label'], modelTarget: { kind: 'default' }, @@ -81,7 +83,7 @@ test('filters linked subagents without exposing the filter to the Host protocol' registerRuntimeHostSessionCatalogIpc( { client, - workspaceRoot: '/workspace', + resolveCreateProject: defaultCreateProject, emitSessionsChanged() {}, releaseSessionResources() {}, sessionCopyCleanup: cleanupAuthority(), @@ -110,12 +112,14 @@ test('recovers and records Session copy cleanup through the Runtime Host catalog registerRuntimeHostSessionCatalogIpc( { client: catalogClient({ listSessions: async () => [] }), - workspaceRoot: '/workspace', + resolveCreateProject: defaultCreateProject, emitSessionsChanged() {}, releaseSessionResources() {}, sessionCopyCleanup: { + ownCreation: (_creation, operation) => operation(), cleanup: async (sessionId) => { cleanupCalls.push(`cleanup:${sessionId}`); }, schedule: async (sessionId) => { cleanupCalls.push(`abandon:${sessionId}`); }, + abandonOwner: async () => undefined, recover: async () => { recoveries += 1; return { removed: [], failed: [] }; @@ -140,12 +144,14 @@ test('keeps abandoned copies hidden while durable cleanup is still pending', asy client: catalogClient({ listSessions: async () => [session('visible'), session('abandoned-copy')], }), - workspaceRoot: '/workspace', + resolveCreateProject: defaultCreateProject, emitSessionsChanged() {}, releaseSessionResources() {}, sessionCopyCleanup: { + ownCreation: (_creation, operation) => operation(), cleanup: async () => undefined, schedule: async () => undefined, + abandonOwner: async () => undefined, recover: async () => ({ removed: [], failed: [{ sessionId: 'abandoned-copy', error: new Error('remove failed') }], @@ -186,7 +192,7 @@ test('applies family metadata and retirement actions through Host-owned operatio registerRuntimeHostSessionCatalogIpc( { client, - workspaceRoot: '/workspace', + resolveCreateProject: defaultCreateProject, emitSessionsChanged() {}, releaseSessionResources: async (sessionId) => { released.push(sessionId); @@ -221,7 +227,7 @@ test('normalizes renderer configuration actions into Host patches', async () => registerRuntimeHostSessionCatalogIpc( { client, - workspaceRoot: '/workspace', + resolveCreateProject: defaultCreateProject, emitSessionsChanged() {}, releaseSessionResources() {}, sessionCopyCleanup: cleanupAuthority(), @@ -257,12 +263,18 @@ type CatalogClient = RuntimeHostSessionCatalogIpcDeps['client']; function cleanupAuthority(): RuntimeHostSessionCatalogIpcDeps['sessionCopyCleanup'] { return { + ownCreation: (_creation, operation) => operation(), cleanup: async () => undefined, schedule: async () => undefined, + abandonOwner: async () => undefined, recover: async () => ({ removed: [], failed: [] }), }; } +const defaultCreateProject: RuntimeHostSessionCatalogIpcDeps['resolveCreateProject'] = async () => ({ + cwd: '/workspace', +}); + function catalogClient(overrides: Partial): CatalogClient { const unavailable = async (): Promise => { throw new Error('Unexpected Runtime Host Session catalog operation'); diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-domains-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-domains-ipc-main.test.ts index 6374dfe86a..a82ec7427a 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-session-domains-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-session-domains-ipc-main.test.ts @@ -34,7 +34,7 @@ test('adapts Host Goal, Task, Deep Research, and Resource projections', async () queryDeepResearch: async () => hostedResearch(), }); const ipc = ipcHarness(); - registerRuntimeHostSessionDomainsIpc({ client, emitModeChanged() {} }, ipc); + registerDomainsIpc({ client, emitModeChanged() {} }, ipc); assert.equal(((await ipc.invoke('tasks:list', 'session-1')) as Array<{ id: string }>)[0]?.id, 'task-1'); assert.equal( @@ -75,7 +75,9 @@ test('adapts Host Goal, Task, Deep Research, and Resource projections', async () { itemId: 'entrypoints', title: 'Map entrypoints', status: 'completed' }, ], reportSections: [{ key: 'conclusion', status: 'completed' }], - recentInspectedRefs: [{ kind: 'file', locator: 'apps/desktop/src/main/boot.ts' }], + recentInspectedRefs: [ + { kind: 'file', locator: 'apps/desktop/src/main/runtime-host-boot.ts' }, + ], workerRunIds: ['run-1'], blockers: [], reportArtifactId: 'artifact-1', @@ -83,6 +85,265 @@ test('adapts Host Goal, Task, Deep Research, and Resource projections', async () }); }); +test('adapts interactive terminal ownership to one Host controller lease', async () => { + const calls: Array<{ operation: string; input: unknown }> = []; + const update = shellRunUpdate({ + result: { + kind: 'shell_run', + ref: 'maka://runtime/background-tasks/shell-1', + mode: 'pty', + status: 'running', + cwd: '/workspace', + cmd: 'exec "$SHELL" -l', + startedAt: 1, + updatedAt: 2, + revision: 2, + output: { + mode: 'pty', + screen: 'ready', + scrollback: '', + cols: 80, + rows: 24, + cursor: { x: 5, y: 0, visible: true }, + alternateScreen: false, + truncated: false, + redacted: false, + }, + }, + }); + const pty = { + sessionId: 'session-1', + ref: update.result.ref, + sequence: 3, + buffer: 'ready', + size: { cols: 80, rows: 24 }, + }; + const ipc = ipcHarness(); + const handle = registerDomainsIpc( + { + client: domainClient({ + startRuntimeResource: async (input) => { + calls.push({ operation: 'start', input }); + return { resource: update.result as never }; + }, + getRuntimeResource: async (sessionId, ref) => { + calls.push({ operation: 'get', input: { sessionId, ref } }); + return update; + }, + acquireRuntimeResourceController: async (input) => { + calls.push({ operation: 'acquire', input }); + return { controllerId: input.controllerId, nextSequence: 7, pty }; + }, + controlRuntimeResource: async (input) => { + calls.push({ operation: 'control', input }); + return { controllerId: input.controllerId, sequence: input.sequence, resource: update.result as never }; + }, + releaseRuntimeResourceController: async (input) => { + calls.push({ operation: 'release', input }); + return { controllerId: input.controllerId, released: true }; + }, + stopRuntimeResource: async (input) => { + calls.push({ operation: 'stop', input }); + return { resource: update.result as never }; + }, + }), + sessionObserver: { + observe: async (sessionId, observerId) => { + calls.push({ operation: 'observe', input: { sessionId, observerId } }); + }, + unobserve: async (observerId) => { + calls.push({ operation: 'unobserve', input: { observerId } }); + }, + }, + emitModeChanged() {}, + newId: () => 'fixed-id', + }, + ipc, + ); + + assert.equal((await ipc.invoke('shell-runs:start', 'session-1') as ShellRunUpdate).result.ref, pty.ref); + assert.deepEqual( + await ipc.invoke('shell-runs:attach', { sessionId: 'session-1', ref: pty.ref }), + pty, + ); + await ipc.invoke('shell-runs:write', { + sessionId: 'session-1', + ref: pty.ref, + input: 'pwd\r', + size: { cols: 90, rows: 30 }, + }); + await ipc.invoke('shell-runs:detach', { sessionId: 'session-1', ref: pty.ref }); + await ipc.invoke('shell-runs:stop', { sessionId: 'session-1', ref: pty.ref }); + await handle.close(); + + assert.deepEqual( + calls.filter(({ operation }) => operation === 'control').map(({ input }) => input), + [{ + sessionId: 'session-1', + ref: pty.ref, + controllerId: 'desktop-terminal-controller-fixed-id', + sequence: 7, + control: { kind: 'input_and_resize', input: 'pwd\r', cols: 90, rows: 30 }, + }], + ); + assert.equal(calls.filter(({ operation }) => operation === 'acquire').length, 1); + assert.equal(calls.filter(({ operation }) => operation === 'release').length, 1); + assert.equal(calls.filter(({ operation }) => operation === 'stop').length, 1); + assert.deepEqual( + calls.filter(({ operation }) => operation === 'observe' || operation === 'unobserve'), + [ + { + operation: 'observe', + input: { + sessionId: 'session-1', + observerId: 'desktop-terminal-controller-fixed-id:session-events', + }, + }, + { + operation: 'unobserve', + input: { observerId: 'desktop-terminal-controller-fixed-id:session-events' }, + }, + ], + ); +}); + +test('reuses terminal controller identity after an ambiguous acquire response', async () => { + const controllerIds: string[] = []; + let attempt = 0; + const ref = 'maka://runtime/background-tasks/shell-1'; + const ipc = ipcHarness(); + registerDomainsIpc( + { + client: domainClient({ + acquireRuntimeResourceController: async (input) => { + controllerIds.push(input.controllerId); + attempt += 1; + if (attempt === 1) throw new Error('response lost'); + return { + controllerId: input.controllerId, + nextSequence: 4, + pty: { + sessionId: input.sessionId, + ref: input.ref, + sequence: 3, + buffer: 'ready', + size: { cols: 80, rows: 24 }, + }, + }; + }, + }), + emitModeChanged() {}, + newId: () => 'stable-id', + }, + ipc, + ); + + await assert.rejects( + ipc.invoke('shell-runs:attach', { sessionId: 'session-1', ref }), + /response lost/, + ); + assert.equal( + (await ipc.invoke('shell-runs:attach', { sessionId: 'session-1', ref }) as { + sequence: number; + }).sequence, + 3, + ); + assert.deepEqual(controllerIds, [ + 'desktop-terminal-controller-stable-id', + 'desktop-terminal-controller-stable-id', + ]); +}); + +test('restores terminal observation after the observer drops its registration', async () => { + const ref = 'maka://runtime/background-tasks/shell-1'; + let observeCalls = 0; + let observationActive = false; + const ipc = ipcHarness(); + registerDomainsIpc( + { + client: domainClient({ + acquireRuntimeResourceController: async (input) => ({ + controllerId: input.controllerId, + nextSequence: 4, + pty: { + sessionId: input.sessionId, + ref: input.ref, + sequence: 3, + buffer: 'ready', + size: { cols: 80, rows: 24 }, + }, + }), + }), + sessionObserver: { + observe: async () => { + observeCalls += 1; + observationActive = true; + }, + unobserve: async () => { + observationActive = false; + }, + }, + emitModeChanged() {}, + newId: () => 'stable-id', + }, + ipc, + ); + + await ipc.invoke('shell-runs:attach', { sessionId: 'session-1', ref }); + observationActive = false; + await ipc.invoke('shell-runs:attach', { sessionId: 'session-1', ref }); + + assert.equal(observeCalls, 2); + assert.equal(observationActive, true); +}); + +test('reacquires a missing terminal controller with protocol-exact identity fields', async () => { + const ref = 'maka://runtime/background-tasks/shell-1'; + let acquired: unknown; + const ipc = ipcHarness(); + registerDomainsIpc( + { + client: domainClient({ + acquireRuntimeResourceController: async (input) => { + acquired = input; + return { + controllerId: input.controllerId, + nextSequence: 4, + pty: { + sessionId: input.sessionId, + ref: input.ref, + sequence: 3, + buffer: 'ready', + size: { cols: 80, rows: 24 }, + }, + }; + }, + controlRuntimeResource: async (input) => ({ + controllerId: input.controllerId, + sequence: input.sequence, + resource: shellRunUpdate().result as never, + }), + getRuntimeResource: async () => shellRunUpdate(), + }), + emitModeChanged() {}, + newId: () => 'recovered-id', + }, + ipc, + ); + + await ipc.invoke('shell-runs:write', { + sessionId: 'session-1', + ref, + input: 'pwd\r', + }); + + assert.deepEqual(acquired, { + sessionId: 'session-1', + ref, + controllerId: 'desktop-terminal-controller-recovered-id', + }); +}); + test('adapts Plan controls and starts approved execution through one Host command', async () => { const calls: unknown[] = []; const state: PlanSessionState = { @@ -93,7 +354,7 @@ test('adapts Plan controls and starts approved execution through one Host comman executions: [], }; const ipc = ipcHarness(); - registerRuntimeHostSessionDomainsIpc( + registerDomainsIpc( { client: domainClient({ getPlanState: async () => state, @@ -238,7 +499,7 @@ test('publishes typed invalidations and refreshes only changed Runtime Resources }, }); const ipc = ipcHarness(); - const handle = registerRuntimeHostSessionDomainsIpc( + const handle = registerDomainsIpc( { client: domainClient({ listRuntimeResources: async () => { @@ -271,6 +532,12 @@ test('publishes typed invalidations and refreshes only changed Runtime Resources graphId: 'graph-1', reason: 'runtime_activity', }); + handle.runtimeResourcePtyData({ + sessionId: 'session-1', + ref: update.result.ref, + sequence: 4, + data: 'ready', + }); await new Promise((resolve) => setImmediate(resolve)); assert.equal(listCalls, 0); assert.deepEqual(gets, [{ sessionId: 'session-1', ref: update.result.ref }]); @@ -296,6 +563,15 @@ test('publishes typed invalidations and refreshes only changed Runtime Resources reason: 'runtime_activity', }, }, + { + channel: 'shell-runs:pty-data', + payload: { + sessionId: 'session-1', + ref: update.result.ref, + sequence: 4, + data: 'ready', + }, + }, { channel: 'shell-runs:update', payload: update, @@ -375,7 +651,9 @@ function domainClient(overrides: Partial): DomainClient { }; return { clearGoal: unavailable, + acquireRuntimeResourceController: unavailable, controlPlan: unavailable, + controlRuntimeResource: unavailable, getRuntimeResource: unavailable, getPlanState: unavailable, listRuntimeResources: unavailable, @@ -384,7 +662,10 @@ function domainClient(overrides: Partial): DomainClient { queryAgentGraphOperator: unavailable, queryDeepResearch: unavailable, queryGoal: unavailable, + releaseRuntimeResourceController: unavailable, + startRuntimeResource: unavailable, stopAgentGraph: unavailable, + stopRuntimeResource: unavailable, ...overrides, } as DomainClient; } @@ -435,7 +716,7 @@ function hostedResearch() { recentInspectedRefs: [ { kind: 'file' as const, - locator: 'apps/desktop/src/main/boot.ts', + locator: 'apps/desktop/src/main/runtime-host-boot.ts', label: null, }, ], @@ -491,3 +772,20 @@ function ipcHarness() { }, }; } + +function registerDomainsIpc( + deps: Omit & + Partial>, + ipcMain: Pick, +) { + return registerRuntimeHostSessionDomainsIpc( + { + ...deps, + sessionObserver: deps.sessionObserver ?? { + async observe() {}, + async unobserve() {}, + }, + }, + ipcMain, + ); +} diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts index 34b81cce2e..3de9764510 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts @@ -1,4 +1,5 @@ import assert from "node:assert/strict"; +import { EventEmitter } from 'node:events'; import { mkdtemp, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -44,7 +45,7 @@ test("advances the Host read marker through the last visible message", async () }, ]); const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client: executionClient({ setSessionReadMarker: async (sessionId, readThroughMessageId) => { @@ -73,6 +74,71 @@ test("advances the Host read marker through the last visible message", async () await observer.close(); }); +test("keeps synthetic E2E interactions visible through Host hydration and retires their answer", async () => { + const observer = observerWithSnapshot(); + const ipc = ipcHarness(); + const request = { + type: "sandbox_boundary_request" as const, + id: "event-1", + turnId: "turn-1", + ts: 1, + requestId: "request-1", + toolUseId: "tool-1", + justification: "Write outside the workspace.", + expansion: { + filesystem: { + entries: [ + { path: "/outside", access: "write" as const, scope: "subtree" as const }, + ], + }, + }, + }; + let active = true; + const configurationUpdates: unknown[] = []; + registerExecutionIpc( + { + client: executionClient({ + updateSessionConfiguration: async (sessionId, patch) => { + configurationUpdates.push({ sessionId, patch }); + return session(); + }, + }), + observer, + attachmentApprovals: createAttachmentApprovalRegistry(), + emitSessionsChanged() {}, + stat: async () => ({ size: 0 }), + resizeImage: async (bytes) => bytes, + beforeStop() {}, + e2eInteractions: { + list: () => (active ? [request] : []), + respondToSandboxBoundary: async (_sessionId, response) => { + if (response.requestId !== request.requestId) return { handled: false }; + active = false; + return { handled: true, permissionMode: 'ask' }; + }, + }, + }, + ipc, + ); + + assert.deepEqual( + await ipc.invoke("sessions:listActiveInteractions", "session-1"), + [request], + ); + await ipc.invoke("sessions:respondToSandboxBoundary", "session-1", { + requestId: request.requestId, + decision: "allow", + }); + assert.deepEqual( + await ipc.invoke("sessions:listActiveInteractions", "session-1"), + [], + ); + assert.deepEqual(configurationUpdates, [ + { sessionId: 'session-1', patch: { permissionMode: 'ask' } }, + ]); + await observer.close(); +}); + test("retries committed Branch and Revision copies with the renderer-owned identity", async () => { const committed = new Map(); const lostResponses = new Set(["branch-copy-1", "revision-copy-1"]); @@ -83,7 +149,7 @@ test("retries committed Branch and Revision copies with the renderer-owned ident }> = []; let fallbackIds = 0; const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client: executionClient({ copySession: async (kind, input) => { @@ -167,8 +233,22 @@ test("retries committed Branch and Revision copies with the renderer-owned ident test("marks Runtime Host Branch copies as side conversations", async () => { const metadataUpdates: unknown[] = []; + const abandonedOwners: string[] = []; + const backgroundErrors: unknown[] = []; const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + const sessionCopyCleanup = { + ownCreation: (_creation: unknown, operation: () => Promise) => operation(), + async cleanup() {}, + async schedule() {}, + async abandonOwner(ownerId: string) { + abandonedOwners.push(ownerId); + throw new Error('cleanup unavailable'); + }, + async recover() { + return { removed: [], failed: [] }; + }, + }; + registerExecutionIpc( { client: executionClient({ copySession: async (_kind, input) => ({ @@ -191,6 +271,8 @@ test("marks Runtime Host Branch copies as side conversations", async () => { stat: async () => ({ size: 0 }), resizeImage: async (bytes) => bytes, beforeStop() {}, + sessionCopyCleanup, + onBackgroundError: (error) => backgroundErrors.push(error), }, ipc, ); @@ -215,6 +297,13 @@ test("marks Runtime Host Branch copies as side conversations", async () => { "source-label", SIDE_CONVERSATION_SESSION_LABEL, ]); + ipc.rendererGone(); + ipc.rendererDestroyed(); + await new Promise((resolve) => setImmediate(resolve)); + assert.deepEqual(abandonedOwners, ['web-contents:9']); + assert.deepEqual(backgroundErrors.map((error) => (error as Error).message), [ + 'cleanup unavailable', + ]); }); test("sends canonical content and uploads owned Attachment bytes through the Host", async () => { @@ -241,15 +330,19 @@ test("sends canonical content and uploads owned Attachment bytes through the Hos startTurn: async (input) => { starts.push(input); return { - sessionId: input.sessionId, - turnId: input.turnId, - runId: "run-1", - status: "running", + kind: "started", + turn: { + sessionId: input.sessionId, + turnId: input.turnId, + runId: "run-1", + status: "running", + }, + skillInvocation: { loaded: [], failed: [], receipts: [] }, }; }, }); const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client, observer: unusedObserver(), @@ -339,7 +432,7 @@ test("uploads a selected workspace file as a Host-owned Session Artifact", async }, }; const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client: executionClient({ getSession: async () => session(cwd), @@ -350,10 +443,14 @@ test("uploads a selected workspace file as a Host-owned Session Artifact", async startTurn: async (input) => { starts.push(input); return { - sessionId: input.sessionId, - turnId: input.turnId, - runId: "run-1", - status: "running", + kind: "started", + turn: { + sessionId: input.sessionId, + turnId: input.turnId, + runId: "run-1", + status: "running", + }, + skillInvocation: { loaded: [], failed: [], receipts: [] }, }; }, }), @@ -388,17 +485,25 @@ test("uploads a selected workspace file as a Host-owned Session Artifact", async test("forwards explicit Skill invocation to the Host-owned Turn admission", async () => { const starts: unknown[] = []; const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client: executionClient({ getSession: async () => session(), startTurn: async (input) => { starts.push(input); return { - sessionId: input.sessionId, - turnId: input.turnId, - runId: "run-1", - status: "running", + kind: "started", + turn: { + sessionId: input.sessionId, + turnId: input.turnId, + runId: "run-1", + status: "running", + }, + skillInvocation: { + loaded: [{ id: "review", name: "Review" }], + failed: [], + receipts: [], + }, }; }, }), @@ -433,7 +538,11 @@ test("forwards explicit Skill invocation to the Host-owned Turn admission", asyn turnId: "turn-skill", attachments: [], inlineReferences: [], - skillInvocation: { loaded: [], failed: [], receipts: [] }, + skillInvocation: { + loaded: [{ id: "review", name: "Review" }], + failed: [], + receipts: [], + }, }); }); @@ -466,7 +575,7 @@ test("binds steer and stop to Host-owned queue and active Turn identities", asyn }); const observer = observerWithSnapshot(); const ipc = ipcHarness(); - registerRuntimeHostSessionExecutionIpc( + registerExecutionIpc( { client, observer, @@ -530,6 +639,7 @@ function executionClient(overrides: Partial): ExecutionClient { startTurn: unavailable, startTurnResume: unavailable, submitMessage: unavailable, + updateSessionConfiguration: unavailable, updateSessionMetadata: unavailable, ...overrides, }; @@ -607,6 +717,7 @@ type IpcHandler = Parameters["handle"]>[1]; function ipcHarness() { const handlers = new Map(); + const sender = Object.assign(new EventEmitter(), { id: 9 }); return { handle(channel: string, handler: IpcHandler) { assert.equal( @@ -619,7 +730,42 @@ function ipcHarness() { async invoke(channel: string, ...args: unknown[]): Promise { const handler = handlers.get(channel); assert.ok(handler, `missing handler: ${channel}`); - return handler({ sender: { id: 9 } } as never, ...args); + return handler({ sender } as never, ...args); + }, + rendererGone() { + sender.emit('render-process-gone'); + }, + rendererDestroyed() { + sender.emit('destroyed'); + }, + }; +} + +function registerExecutionIpc( + deps: Omit & + Partial< + Pick + >, + ipcMain: Pick, +): (sessionId: string) => Promise { + return registerRuntimeHostSessionExecutionIpc( + { + ...deps, + sessionCopyCleanup: deps.sessionCopyCleanup ?? unusedSessionCopyCleanup(), + onBackgroundError: deps.onBackgroundError ?? (() => undefined), + }, + ipcMain, + ); +} + +function unusedSessionCopyCleanup(): RuntimeHostSessionExecutionIpcDeps['sessionCopyCleanup'] { + return { + ownCreation: async (_creation, operation) => operation(), + async cleanup() {}, + async schedule() {}, + async abandonOwner() {}, + async recover() { + return { removed: [], failed: [] }; }, }; } diff --git a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts index b50a1476b4..75f1604f41 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-session-observer.test.ts @@ -224,6 +224,61 @@ test("does not let an older terminal projection finish a newer watched Turn", as await observer.close(); }); +test("invalidates the transcript when another client starts a Turn", async () => { + const events = new AsyncFrameQueue(); + const sessionChanges: Array<{ + reason: string; + sessionId: string; + turnId?: string; + }> = []; + const observer = new RuntimeHostSessionObserver({ + client: { + openSession: async () => ({ + snapshot: continuitySnapshot({ + rootTurn: { + sessionId: "session-1", + turnId: "turn-1", + runId: "run-1", + status: "completed", + terminalEventId: "terminal-1", + }, + }), + transcript: Promise.resolve([]), + events, + async close() { + events.end(); + }, + }), + }, + emitSessionsChanged: (reason, sessionId, extra) => + sessionChanges.push({ reason, sessionId, turnId: extra?.turnId }), + }); + await observer.observe("session-1", "observer-1", eventTarget(2)); + + events.push({ + kind: "subscription.session_projection", + hostEpoch: "host-1", + subscriptionId: "subscription-1", + sequence: 1, + snapshot: continuitySnapshot({ + projectionRevision: 2, + rootTurn: { + sessionId: "session-1", + turnId: "turn-2", + runId: "run-2", + status: "running", + }, + }), + }); + + await waitFor(() => sessionChanges.length === 2); + assert.deepEqual(sessionChanges, [ + { reason: "status-change", sessionId: "session-1", turnId: "turn-2" }, + { reason: "message-appended", sessionId: "session-1", turnId: "turn-2" }, + ]); + await observer.close(); +}); + test("abandons a watched Turn when the initial Host subscription fails", async () => { const finishedTurns: Array<[string, "completed" | "abandoned"]> = []; const observer = new RuntimeHostSessionObserver({ @@ -554,6 +609,7 @@ test("publishes Host sidecar and graph invalidations without inventing Session s const events = new AsyncFrameQueue(); const sessionChanges: Array<{ reason: string; sessionId: string }> = []; const domainChanges: Array<{ sessionId: string; domain: string }> = []; + const ptyData: unknown[] = []; const graphChanges: unknown[] = []; const observer = new RuntimeHostSessionObserver({ client: { @@ -569,6 +625,7 @@ test("publishes Host sidecar and graph invalidations without inventing Session s emitSessionsChanged: (reason, sessionId) => sessionChanges.push({ reason, sessionId }), emitSessionDomainChanged: (change) => domainChanges.push(change), + emitRuntimeResourcePtyData: (event) => ptyData.push(event), emitAgentGraphChanged: (event) => graphChanges.push(event), }); await observer.observe("session-1", "observer-1", eventTarget(11)); @@ -608,10 +665,20 @@ test("publishes Host sidecar and graph invalidations without inventing Session s domain: "plan", }); events.push({ - kind: "subscription.agent_graph_changed", + kind: "subscription.runtime_resource_pty_data", hostEpoch: "host-1", subscriptionId: "subscription-1", sequence: 3, + sessionId: "session-1", + ref: "maka://runtime/background-tasks/shell-1", + ptySequence: 7, + data: "ready", + }); + events.push({ + kind: "subscription.agent_graph_changed", + hostEpoch: "host-1", + subscriptionId: "subscription-1", + sequence: 4, rootSessionId: "session-1", graphId: "graph-1", reason: "runtime_activity", @@ -619,6 +686,12 @@ test("publishes Host sidecar and graph invalidations without inventing Session s await waitFor(() => graphChanges.length === 1); assert.deepEqual(domainChanges, [{ sessionId: "session-1", domain: "plan" }]); + assert.deepEqual(ptyData, [{ + sessionId: "session-1", + ref: "maka://runtime/background-tasks/shell-1", + sequence: 7, + data: "ready", + }]); assert.ok( sessionChanges.some( (change) => diff --git a/apps/desktop/src/main/__tests__/runtime-host-settings-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-settings-ipc-main.test.ts new file mode 100644 index 0000000000..70e511bf14 --- /dev/null +++ b/apps/desktop/src/main/__tests__/runtime-host-settings-ipc-main.test.ts @@ -0,0 +1,45 @@ +import assert from 'node:assert/strict'; +import { mkdtemp, rm } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import test from 'node:test'; +import { createDefaultRuntimePolicy } from '@maka/core/runtime-policy'; +import { createSettingsStore } from '@maka/storage'; +import { + updateRuntimeHostSettings, + type RuntimeHostSettingsIpcDeps, +} from '../runtime-host-settings-ipc-main.js'; + +test('persists a project-only patch in the client-owned settings document', async () => { + const root = await mkdtemp(join(tmpdir(), 'maka-runtime-host-settings-')); + try { + const settingsStore = createSettingsStore(root); + const client = { + queryRuntimePolicy: async () => ({ revision: 0, policy: createDefaultRuntimePolicy() }), + queryCredential: async () => null, + deleteCredential: async () => { throw new Error('not used'); }, + setCredential: async () => { throw new Error('not used'); }, + testNetworkProxy: async () => { throw new Error('not used'); }, + updateRuntimePolicy: async () => { throw new Error('not used'); }, + } satisfies RuntimeHostSettingsIpcDeps['client']; + let appliedProjectId: string | undefined; + + const result = await updateRuntimeHostSettings( + { + ipcMain: { handle() {} }, + client, + settingsStore, + applyClientSettings: async (settings) => { + appliedProjectId = settings.projects.defaultProjectId; + }, + }, + { projects: { defaultProjectId: 'project-1' } }, + ); + + assert.equal(result.projects.defaultProjectId, 'project-1'); + assert.equal((await settingsStore.get()).projects.defaultProjectId, 'project-1'); + assert.equal(appliedProjectId, 'project-1'); + } finally { + await rm(root, { recursive: true, force: true }); + } +}); diff --git a/apps/desktop/src/main/__tests__/runtime-host-skills-ipc-main.test.ts b/apps/desktop/src/main/__tests__/runtime-host-skills-ipc-main.test.ts index 33c962162e..750fc41390 100644 --- a/apps/desktop/src/main/__tests__/runtime-host-skills-ipc-main.test.ts +++ b/apps/desktop/src/main/__tests__/runtime-host-skills-ipc-main.test.ts @@ -45,3 +45,40 @@ test('keeps a resolved Skill mutation on one project root', async () => { assert.deepEqual(catalogContexts, ['/tmp/project-a', '/tmp/project-a']); assert.deepEqual(mutationContexts, ['/tmp/project-a', '/tmp/project-a']); }); + +test('requests the Host-owned invocable projection for existing and new Sessions', async () => { + const handlers = new Map unknown>(); + const targets: unknown[] = []; + registerRuntimeHostSkillsIpc({ + ipcMain: { + handle: (channel, handler) => { + handlers.set(channel, handler as (...args: unknown[]) => unknown); + }, + }, + client: { + listInvocableSkills: async (target: unknown) => { + targets.push(target); + return [{ ref: 'project:review', id: 'review', name: 'Review', description: 'Review code' }]; + }, + } as never, + workspaceRoot: '/tmp/maka-runtime-host-skills-workspace', + mainWindowController: {} as never, + getCurrentProjectRoot: async () => '/tmp/project-a', + openPath: async () => '', + }); + + const list = handlers.get('skills:listInvocable'); + assert.ok(list); + assert.deepEqual(await list({}, 'session-1'), [ + { ref: 'project:review', id: 'review', name: 'Review', description: 'Review code' }, + ]); + await list({}, undefined, { collaborationMode: 'plan', model: 'ignored-model' }); + assert.deepEqual(targets, [ + { kind: 'session', sessionId: 'session-1' }, + { + kind: 'new_session', + context: { projectRoot: '/tmp/project-a' }, + collaborationMode: 'plan', + }, + ]); +}); diff --git a/apps/desktop/src/main/__tests__/session-branch.test.ts b/apps/desktop/src/main/__tests__/session-branch.test.ts deleted file mode 100644 index 448e09145a..0000000000 --- a/apps/desktop/src/main/__tests__/session-branch.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { it } from 'node:test'; -import { assertSessionWorkspaceAvailable } from '../project-context-root.js'; -import { handleBranchFromTurn } from '../session-branch.js'; -import { handleReviseBeforeTurn } from '../session-revision.js'; - -it('does not create a branch when the source session workspace is unavailable', async () => { - const deletedRoot = await mkdtemp(join(tmpdir(), 'maka-branch-deleted-workspace-')); - await rm(deletedRoot, { recursive: true, force: true }); - let branchCalled = false; - let emitted = false; - - await assert.rejects( - () => handleBranchFromTurn('session-a', { sourceTurnId: 'turn-a' }, { - ensureSessionWorkspaceAvailable: async () => assertSessionWorkspaceAvailable(deletedRoot), - branchFromTurn: async () => { - branchCalled = true; - throw new Error('branch must not run'); - }, - emitCreated: () => { - emitted = true; - }, - }), - /SESSION_WORKSPACE_UNAVAILABLE/, - ); - - assert.equal(branchCalled, false); - assert.equal(emitted, false); -}); - -it('routes reviseBeforeTurn through the workspace gate and emits one created version', async () => { - let revised: { id: string; sourceTurnId: string } | undefined; - let emittedId: string | undefined; - const result = await handleReviseBeforeTurn('session-a', { sourceTurnId: 'turn-a' }, { - ensureSessionWorkspaceAvailable: async () => {}, - reviseBeforeTurn: async (id, input) => { - revised = { id, sourceTurnId: input.sourceTurnId }; - return { id: 'revision-session' } as never; - }, - emitCreated: (id) => { emittedId = id; }, - }); - assert.deepEqual(revised, { id: 'session-a', sourceTurnId: 'turn-a' }); - assert.equal(emittedId, 'revision-session'); - assert.equal(result.id, 'revision-session'); -}); diff --git a/apps/desktop/src/main/__tests__/session-copy-attempt.test.ts b/apps/desktop/src/main/__tests__/session-copy-attempt.test.ts index e4c7aac16d..f64d4f33b0 100644 --- a/apps/desktop/src/main/__tests__/session-copy-attempt.test.ts +++ b/apps/desktop/src/main/__tests__/session-copy-attempt.test.ts @@ -83,6 +83,61 @@ test('independent Branch and Revision actions never share a copy identity', asyn revision.complete(); }); +test('renderer reload can enumerate every orphaned Side Chat copy owner', async () => { + const storage = memoryStorage(); + const firstModule = await loadFreshModule('side-chat-first'); + const first = firstModule.acquireSessionCopyAttempt( + { + scope: 'quote-companion:panel-a', + kind: 'branch', + sourceSessionId: 'source-side-chat', + }, + 'turn-a', + storage, + () => 'copy-a', + ); + const second = firstModule.acquireSessionCopyAttempt( + { + scope: 'quote-companion:panel-b', + kind: 'branch', + sourceSessionId: 'source-side-chat', + }, + 'turn-b', + storage, + () => 'copy-b', + ); + firstModule.startSessionCopyAttempt( + { + scope: 'quote-companion:panel-a', + kind: 'branch', + sourceSessionId: 'source-side-chat', + }, + first.copyId, + storage, + ); + firstModule.startSessionCopyAttempt( + { + scope: 'quote-companion:panel-b', + kind: 'branch', + sourceSessionId: 'source-side-chat', + }, + second.copyId, + storage, + ); + + const reloadedModule = await loadFreshModule('side-chat-reloaded'); + assert.deepEqual( + reloadedModule + .listSessionCopyAttempts('quote-companion:', storage) + .map(({ key, attempt }) => ({ scope: key.scope, copyId: attempt.copyId })) + .sort((left, right) => left.scope.localeCompare(right.scope)), + [ + { scope: 'quote-companion:panel-a', copyId: 'copy-a' }, + { scope: 'quote-companion:panel-b', copyId: 'copy-b' }, + ], + ); +}); + async function loadFreshModule(name: string): Promise { const url = new URL('../../renderer/session-copy-attempt.js', import.meta.url); url.searchParams.set('instance', name); diff --git a/apps/desktop/src/main/__tests__/session-lifecycle.test.ts b/apps/desktop/src/main/__tests__/session-lifecycle.test.ts deleted file mode 100644 index 83e7ed0a03..0000000000 --- a/apps/desktop/src/main/__tests__/session-lifecycle.test.ts +++ /dev/null @@ -1,30 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { - assertSessionCanSendFromHeader, - isSessionLifecycleError, - sessionLifecycleErrorFromReadFailure, - SessionLifecycleError, -} from '../session-lifecycle.js'; - -describe('session lifecycle send admission', () => { - test('uses persisted archived state as the send authority', () => { - assert.throws( - () => assertSessionCanSendFromHeader({ isArchived: true, status: 'active' }), - (error: unknown) => isSessionLifecycleError(error) - && error.reason === 'archived', - ); - assert.throws( - () => assertSessionCanSendFromHeader({ isArchived: false, status: 'archived' }), - (error: unknown) => error instanceof SessionLifecycleError - && error.reason === 'archived', - ); - }); - - test('classifies a missing persisted session as removed', () => { - const error = sessionLifecycleErrorFromReadFailure(Object.assign(new Error('missing'), { code: 'ENOENT' })); - assert.ok(error); - assert.equal(error.reason, 'removed'); - assert.equal(isSessionLifecycleError(error), true); - }); -}); diff --git a/apps/desktop/src/main/__tests__/session-send-inline-references.test.ts b/apps/desktop/src/main/__tests__/session-send-inline-references.test.ts deleted file mode 100644 index 28fd314f8b..0000000000 --- a/apps/desktop/src/main/__tests__/session-send-inline-references.test.ts +++ /dev/null @@ -1,105 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import { mergeSentInlineReferences } from '../session-send-inline-references.js'; - -test('merges trusted file tokens with successful Skill receipts in display order', () => { - const displayText = 'Use /skill:writer on @docs/my plan.md'; - assert.deepEqual( - mergeSentInlineReferences({ - displayText, - workspaceFileReferences: [ - { value: '@docs/my plan.md', start: displayText.indexOf('@docs/my plan.md') }, - ], - receipts: [ - { - invocation: 'explicit', - request: 'project:maka:writer', - success: true, - ref: 'workspace:maka:writer', - id: 'writer', - name: 'Writer Skill', - scope: 'workspace', - source: 'maka', - truncated: false, - }, - { - invocation: 'explicit', - request: 'missing', - success: false, - reason: 'not_found', - }, - ], - }), - [ - { kind: 'skill', value: '/skill:writer', label: 'Writer Skill', start: 4 }, - { - kind: 'workspace_file', - value: '@docs/my plan.md', - label: 'my plan.md', - start: displayText.indexOf('@docs/my plan.md'), - }, - ], - ); -}); - -test('preserves only the selected occurrence of a repeated workspace value', () => { - const displayText = 'literal @docs/a.ts then selected @docs/a.ts'; - const selectedStart = displayText.lastIndexOf('@docs/a.ts'); - assert.deepEqual( - mergeSentInlineReferences({ - displayText, - workspaceFileReferences: [{ value: '@docs/a.ts', start: selectedStart }], - receipts: [], - }), - [ - { - kind: 'workspace_file', - value: '@docs/a.ts', - label: 'a.ts', - start: selectedStart, - }, - ], - ); -}); - -test('bounds derived Skill references to the Core message schema', () => { - const token = '/skill:writer'; - const displayText = Array.from({ length: 33 }, () => token).join(' '); - const references = mergeSentInlineReferences({ - displayText, - receipts: [ - { - invocation: 'explicit', - request: 'writer', - success: true, - ref: 'personal:writer', - id: 'writer', - name: 'w'.repeat(201), - scope: 'workspace', - source: 'maka', - truncated: false, - }, - ], - }); - - assert.equal(references.length, 32); - assert.ok(references.every((reference) => reference.label.length === 200)); - - const emojiBoundary = mergeSentInlineReferences({ - displayText: token, - receipts: [ - { - invocation: 'explicit', - request: 'writer', - success: true, - ref: 'workspace:writer', - id: 'writer', - name: `${'a'.repeat(199)}😀`, - scope: 'workspace', - source: 'maka', - truncated: false, - }, - ], - }); - assert.equal(emojiBoundary[0]?.label, 'a'.repeat(199)); -}); diff --git a/apps/desktop/src/main/__tests__/session-send-resolve.test.ts b/apps/desktop/src/main/__tests__/session-send-resolve.test.ts deleted file mode 100644 index e32d9c21f3..0000000000 --- a/apps/desktop/src/main/__tests__/session-send-resolve.test.ts +++ /dev/null @@ -1,120 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, test } from 'node:test'; -import { createSqliteArtifactStore } from '@maka/storage'; -import { createAttachmentApprovalRegistry } from '../attachment-approval.js'; -import { resolveSessionSend } from '../session-send-resolve.js'; -import type { SessionHeader } from '@maka/core'; - -describe('resolveSessionSend', () => { - test('readiness failure skips resolve and ingest — token stays valid, no artifact, no stat', async () => { - const dir = await mkdtemp(join(tmpdir(), 'send-ready-')); - try { - const approvals = createAttachmentApprovalRegistry(); - const file = join(dir, 'note.txt'); - await writeFile(file, 'hello'); - const issued = approvals.issueApprovals(1, [{ path: file, name: 'note.txt', size: 5 }]); - const approvalId = issued[0].approvalId; - - let ensureCalls = 0; - let consumeCalls = 0; - let statCalls = 0; - let artifactCreates = 0; - const realConsume = approvals.consumeApproval.bind(approvals); - approvals.consumeApproval = (senderId: number, id: string) => { - consumeCalls += 1; - return realConsume(senderId, id); - }; - - await assert.rejects( - resolveSessionSend({ - sessionId: 's1', - senderId: 1, - command: { type: 'send', text: 'hi', attachmentItems: [{ approvalId, name: 'note.txt' }] }, - ensureCanSend: async () => { - ensureCalls += 1; - throw new Error('no connection'); - }, - readHeader: async () => ({ cwd: dir } as SessionHeader), - approvals, - stat: async () => { - statCalls += 1; - return { size: 5 }; - }, - artifactStore: { - create: async () => { - artifactCreates += 1; - return { relativePath: 'a' }; - }, - } as never, - resizeImage: async (b) => b, - }), - /no connection/, - ); - - assert.equal(ensureCalls, 1); - assert.equal(consumeCalls, 0, 'approval token must not be consumed when readiness fails'); - assert.equal(statCalls, 0, 'no stat when readiness fails'); - assert.equal(artifactCreates, 0, 'no artifact when readiness fails'); - // token still valid for retry - const retry = approvals.consumeApproval(1, approvalId); - assert.notEqual(retry, null, 'approval token must remain consumable after a readiness failure'); - } finally { - await rm(dir, { recursive: true, force: true }); - } - }); - - test('readiness ok with items resolves and ingests attachments, consuming the token', async () => { - const dir = await mkdtemp(join(tmpdir(), 'send-ok-')); - try { - const store = createSqliteArtifactStore(dir); - const approvals = createAttachmentApprovalRegistry(); - const file = join(dir, 'note.txt'); - await writeFile(file, 'hello'); - const [{ approvalId }] = approvals.issueApprovals(1, [{ path: file, name: 'note.txt', size: 5 }]); - const result = await resolveSessionSend({ - sessionId: 's1', - senderId: 1, - command: { type: 'send', turnId: 't1', text: 'hi', attachmentItems: [{ approvalId, name: 'note.txt' }] }, - ensureCanSend: async () => {}, - readHeader: async () => ({ cwd: dir } as SessionHeader), - approvals, - stat: async () => ({ size: 5 }), - artifactStore: store, - resizeImage: async (b) => b, - }); - assert.equal(result.turnId, 't1'); - assert.equal(result.attachments.length, 1); - assert.equal(result.attachments[0].ref.kind, 'workspace_file'); - assert.equal(approvals.consumeApproval(1, approvalId), null, 'token is one-shot after a successful send'); - } finally { - await rm(dir, { recursive: true, force: true }); - } - }); - - test('readiness ok without items returns empty attachments without touching approvals', async () => { - let consumeCalls = 0; - const approvals = createAttachmentApprovalRegistry(); - const realConsume = approvals.consumeApproval.bind(approvals); - approvals.consumeApproval = (s: number, id: string) => { - consumeCalls += 1; - return realConsume(s, id); - }; - const result = await resolveSessionSend({ - sessionId: 's1', - senderId: 1, - command: { type: 'send', turnId: 't2', text: 'hi' }, - ensureCanSend: async () => {}, - readHeader: async () => null, - approvals, - stat: async () => ({ size: 0 }), - artifactStore: { create: async () => ({ relativePath: 'x' }) } as never, - resizeImage: async (b) => b, - }); - assert.equal(result.turnId, 't2'); - assert.deepEqual(result.attachments, []); - assert.equal(consumeCalls, 0, 'no approval consumed when there are no items'); - }); -}); diff --git a/apps/desktop/src/main/__tests__/session-send-skill-plan.test.ts b/apps/desktop/src/main/__tests__/session-send-skill-plan.test.ts deleted file mode 100644 index 696483b855..0000000000 --- a/apps/desktop/src/main/__tests__/session-send-skill-plan.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { prepareSessionSendSkillPlan } from '../session-send-skill-plan.js'; - -describe('Desktop Skill send gate', () => { - it('does not consume attachments when every explicit invocation fails', async () => { - let attachmentResolutionCalls = 0; - const result = await prepareSessionSendSkillPlan({ - prepare: async () => ({ - disposition: 'blocked', - skillInvocation: { - loaded: [], - failed: [{ request: 'missing', reason: 'not_found' }], - receipts: [ - { - invocation: 'explicit', - request: 'missing', - success: false, - reason: 'not_found', - }, - ], - }, - }), - resolveSend: async () => { - attachmentResolutionCalls += 1; - return { turnId: 'turn-1', attachments: ['artifact'] }; - }, - }); - - assert.equal(result.ok, false); - assert.equal(attachmentResolutionCalls, 0); - }); - - it('resolves attachments only after passthrough or ready preparation', async () => { - const order: string[] = []; - const result = await prepareSessionSendSkillPlan({ - prepare: async () => { - order.push('prepare'); - return { - disposition: 'ready', - sendText: 'expanded', - skillInvocation: { - loaded: [{ id: 'alpha', name: 'Alpha' }], - failed: [], - receipts: [], - }, - }; - }, - resolveSend: async () => { - order.push('attachments'); - return { turnId: 'turn-1' }; - }, - }); - assert.equal(result.ok, true); - assert.deepEqual(order, ['prepare', 'attachments']); - }); -}); diff --git a/apps/desktop/src/main/__tests__/session-stream-unanswered-turn.test.ts b/apps/desktop/src/main/__tests__/session-stream-unanswered-turn.test.ts deleted file mode 100644 index 46610965fc..0000000000 --- a/apps/desktop/src/main/__tests__/session-stream-unanswered-turn.test.ts +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Every send the IPC accepts must be answered by a change naming its turn. - * - * A client arms a live-turn projection the moment it sends, and that arm stays - * `unconfirmed` — refusing to let any session snapshot retire it — until the - * authority says something about that exact turn. The arm is what puts Stop up - * and locks the composer, so a send accepted and then never answered would pin - * both for the life of the process; nothing polls, and Stop cannot clear an arm - * it never confirms. - * - * A turn refused registration (session closed underneath it, duplicate turn id) - * produces no such answer: it runs none of the streamer's callbacks. What saves - * it is that the refusal is thrown SYNCHRONOUSLY, so it escapes the - * `void streamEvents(...)` in the send handler, rejects that handler instead of - * resolving `{ ok: true }`, and the client disarms in its own catch. - * - * That synchronicity is the whole safety property, and it is invisible at the - * call site — a later `async` on this path would be swallowed by the `void`. - * This locks it. - */ - -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; - -import { createSessionStreamer } from '../session-stream.js'; - -function refusingStreamer(reason: string) { - const noop = new Proxy({}, { get: () => () => undefined }); - return createSessionStreamer({ - sessionActivities: noop as never, - goalWiring: { - coordinator: { - beginObservedTurn: () => ({ kind: 'unavailable' as const, reason }), - }, - } as never, - computerUseOverlay: noop as never, - computerUseTools: noop as never, - safeSendToRenderer: () => undefined, - emitSessionsChanged: () => undefined, - }); -} - -describe('a turn that is refused registration', () => { - // `assert.throws`, not `assert.rejects`: a returned rejected promise would be - // discarded by the caller's `void`, and the client would sit on `{ ok: true }` - // with an arm nothing can ever confirm. - it('reaches the caller synchronously rather than as a rejected promise', () => { - const streamEvents = refusingStreamer('Goal continuation session is closed.'); - - assert.throws( - () => - streamEvents('session-a', (async function* () {})(), { - turnId: 'turn-1', - goalBoundary: 'external', - }), - /session is closed/, - ); - }); - - it('reaches the caller for a duplicate turn id too', () => { - const streamEvents = refusingStreamer('Goal turn turn-dup is already registered.'); - - assert.throws(() => - streamEvents('session-a', (async function* () {})(), { - turnId: 'turn-dup', - goalBoundary: 'external', - }), - ); - }); -}); diff --git a/apps/desktop/src/main/__tests__/session-stream-usage-readiness.test.ts b/apps/desktop/src/main/__tests__/session-stream-usage-readiness.test.ts deleted file mode 100644 index 0ad80bee86..0000000000 --- a/apps/desktop/src/main/__tests__/session-stream-usage-readiness.test.ts +++ /dev/null @@ -1,145 +0,0 @@ -import { createToolResultArchiveCapability } from '@maka/runtime'; -import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { test } from 'node:test'; -import type { SessionHeader } from '@maka/core'; -import { - buildPricingLookup, - createSandboxDiagnosticsProvider, - type BackendFactoryContext, -} from '@maka/runtime'; -import { - createSqliteModelCallLedger, - createSqlitePlanStore, - createSqliteTelemetryRepo, -} from '@maka/storage'; -import { - createAiSdkBackendFactory, - type AiSdkBackendFactoryDeps, -} from '../session-stream.js'; - -function deferred() { - let resolve!: () => void; - const promise = new Promise((done) => { - resolve = done; - }); - return { promise, resolve }; -} - -test('the first Desktop backend waits for canonical telemetry readiness', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-desktop-usage-ready-')); - const loadGate = deferred(); - const telemetryRepo = createSqliteTelemetryRepo(root); - const modelCallLedger = createSqliteModelCallLedger(root); - const planStore = createSqlitePlanStore(root); - await planStore.ready(); - let lookupPricing = buildPricingLookup(); - let readyConnectionReads = 0; - - try { - const ensureUsageReady = async () => { - await loadGate.promise; - await telemetryRepo.load(); - lookupPricing = buildPricingLookup(telemetryRepo.listPricingOverrides()); - }; - const factory = createAiSdkBackendFactory({ - isComputerUseRealModelE2e: false, - ensureMcpReady: async () => {}, - getReadyConnection: async () => { - readyConnectionReads += 1; - return { - connection: { - slug: 'openai-main', - name: 'OpenAI', - providerType: 'openai', - defaultModel: 'gpt-4o', - enabled: true, - createdAt: 1, - updatedAt: 1, - }, - apiKey: 'test-key', - model: 'gpt-4o', - }; - }, - buildSubscriptionModelFetch: () => undefined, - systemPromptService: { - buildLocalMemoryPromptFragment: async () => undefined, - buildBackendSystemPrompt: () => '', - buildTurnTailPrompt: () => undefined, - }, - mcpManager: {}, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - artifactStore: {}, - deepResearchTools: [], - desktopSessionSkillHosts: new Map(), - computerUseTools: [], - builtinTools: [], - toolAvailability: { economy: false, groups: [] }, - sandboxDiagnosticsProvider: createSandboxDiagnosticsProvider({ platform: 'win32' }), - persistToolArtifacts: async () => {}, - toolResultArchive: testDesktopToolResultArchive(), - runtimeCommitStore: undefined, - planStore, - safeSendToRenderer: () => {}, - getRuntime: () => ({}), - getLookupPricing: () => lookupPricing, - } as unknown as AiSdkBackendFactoryDeps); - - const backendPending = Promise.resolve(factory(factoryContext(root))); - await new Promise((resolve) => setImmediate(resolve)); - assert.equal(readyConnectionReads, 0); - - loadGate.resolve(); - const backend = await backendPending; - assert.equal(readyConnectionReads, 1); - await backend.dispose(); - } finally { - planStore.close(); - await modelCallLedger.close().catch(() => undefined); - await telemetryRepo.close().catch(() => undefined); - await rm(root, { recursive: true, force: true }); - } -}); - -function factoryContext(root: string): BackendFactoryContext { - const header: SessionHeader = { - id: 'session-1', - workspaceRoot: root, - cwd: root, - createdAt: 1, - lastUsedAt: 1, - name: 'Usage readiness test', - titleIsManual: true, - isFlagged: false, - labels: [], - isArchived: false, - status: 'active', - statusUpdatedAt: 1, - hasUnread: false, - backend: 'ai-sdk', - llmConnectionSlug: 'openai-main', - connectionLocked: true, - model: 'gpt-4o', - permissionMode: 'ask', - schemaVersion: 1, - }; - return { - sessionId: header.id, - workspaceRoot: root, - header, - store: { appendMessage: async () => {} } as unknown as BackendFactoryContext['store'], - tools: [], - }; -} - -function testDesktopToolResultArchive() { - return createToolResultArchiveCapability({ - archiveToolResult: async () => undefined, - readToolResultArchive: async () => ({ ok: false, reason: 'not_found' }), - readArchivedToolResultResource: async () => ({ ok: false, reason: 'not_found' }), - }); -} diff --git a/apps/desktop/src/main/__tests__/session-turn-stream.test.ts b/apps/desktop/src/main/__tests__/session-turn-stream.test.ts deleted file mode 100644 index efcc2993e5..0000000000 --- a/apps/desktop/src/main/__tests__/session-turn-stream.test.ts +++ /dev/null @@ -1,135 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { - GoalContinuationCoordinator, - GoalManager, - SessionActivityRegistry, -} from '@maka/runtime'; -import type { SessionEvent } from '@maka/core'; -import { - startDesktopSessionTurn, - type DesktopSessionTurnStart, - type SessionGoalBoundary, -} from '../session-turn-stream.js'; - -function deferred() { - let resolve!: (value: T | PromiseLike) => void; - const promise = new Promise((res) => { resolve = res; }); - return { promise, resolve }; -} - -describe('Desktop session turn Goal boundary', () => { - test('external settles once only after the complete stream drains and releases activity', async () => { - const registry = new SessionActivityRegistry(); - const release = deferred(); - const observed: string[] = []; - async function* events(): AsyncIterable { - yield { - type: 'text_delta', id: 'delta', turnId: 'turn-1', ts: 1, - messageId: 'message-1', text: 'working', - }; - await release.promise; - yield { type: 'complete', id: 'complete', turnId: 'turn-1', ts: 2, stopReason: 'end_turn' }; - } - - const started = startDesktopSessionTurn({ - sessionId: 'session-1', - events: events(), - turnId: 'turn-1', - goalBoundary: 'external', - activities: registry, - beginObservedTurn: () => ({ - kind: 'registered', - settle: async (outcome) => { - assert.equal(registry.whenIdle('session-1'), undefined); - observed.push(`settled:${outcome.kind}`); - }, - }), - onEvent: (event) => { observed.push(event.type); }, - onStreamError: () => { assert.fail('stream must not fail'); }, - onDrained: () => { observed.push('drained'); }, - }); - const resultPromise = startedCompletion(started); - - await new Promise((resolve) => setImmediate(resolve)); - assert.deepEqual(observed, ['text_delta']); - release.resolve(); - const result = await resultPromise; - - assert.deepEqual(result, { kind: 'completed', turnId: 'turn-1' }); - assert.deepEqual(observed, ['text_delta', 'complete', 'drained', 'settled:completed']); - }); - - test('coordinator-owned and non-turn streams never notify the external boundary', async (t) => { - for (const goalBoundary of ['coordinator', 'none'] satisfies SessionGoalBoundary[]) { - await t.test(goalBoundary, async () => { - const registry = new SessionActivityRegistry(); - let settlements = 0; - async function* events(): AsyncIterable { - yield { type: 'complete', id: 'complete', turnId: 'turn-1', ts: 1, stopReason: 'end_turn' }; - } - - const started = startDesktopSessionTurn({ - sessionId: 'session-1', - events: events(), - turnId: 'turn-1', - goalBoundary, - activities: registry, - beginObservedTurn: () => { - settlements++; - return { kind: 'unavailable', reason: 'unused' }; - }, - onEvent: () => {}, - onStreamError: () => { assert.fail('stream must not fail'); }, - onDrained: () => {}, - }); - const result = await startedCompletion(started); - - assert.equal(result.kind, 'completed'); - assert.equal(settlements, 0); - assert.equal(registry.whenIdle('session-1'), undefined); - }); - } - }); - - test('a closed session is rejected before activity reservation or iterator start', () => { - const manager = new GoalManager({ generateId: () => 'goal', now: () => 1 }); - const coordinator = new GoalContinuationCoordinator({ - goalManager: manager, - evaluator: { evaluate: async () => assert.fail('closed session must not evaluate') }, - getRecentContext: async () => 'unused', - admitTurn: () => assert.fail('closed session must not admit a turn'), - }); - coordinator.beginSessionClose('session-1', 'archive').commit(); - const registry = new SessionActivityRegistry(); - let iteratorStarted = false; - async function* events(): AsyncIterable { - iteratorStarted = true; - yield { type: 'complete', id: 'complete', turnId: 'turn-closed', ts: 1, stopReason: 'end_turn' }; - } - - const started = startDesktopSessionTurn({ - sessionId: 'session-1', - events: events(), - turnId: 'turn-closed', - goalBoundary: 'external', - activities: registry, - beginObservedTurn: (sessionId, turnId) => coordinator.beginObservedTurn(sessionId, turnId), - onEvent: () => {}, - onStreamError: () => {}, - onDrained: () => {}, - }); - - assert.deepEqual(started, { - kind: 'unavailable', - reason: 'Goal continuation session is closed.', - }); - assert.equal(iteratorStarted, false); - assert.equal(registry.whenIdle('session-1'), undefined); - }); -}); - -function startedCompletion(start: DesktopSessionTurnStart) { - assert.equal(start.kind, 'started'); - return start.completion; -} diff --git a/apps/desktop/src/main/__tests__/sessions-ipc-execution-admission.test.ts b/apps/desktop/src/main/__tests__/sessions-ipc-execution-admission.test.ts deleted file mode 100644 index 1eeee51697..0000000000 --- a/apps/desktop/src/main/__tests__/sessions-ipc-execution-admission.test.ts +++ /dev/null @@ -1,66 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import { registerSessionExecutionIpc } from '../session-execution-ipc-main.js'; - -test('every resumptive session IPC stops before runtime execution when admission rejects', async () => { - const handlers = new Map Promise>(); - const runtimeCalls: string[] = []; - const runtime = new Proxy( - {}, - { - get(_target, property) { - return () => { - runtimeCalls.push(String(property)); - throw new Error(`runtime execution reached: ${String(property)}`); - }; - }, - }, - ); - registerSessionExecutionIpc({ - ipcMain: { - handle( - channel: string, - handler: Parameters[1], - ) { - handlers.set(channel, handler as (...args: unknown[]) => Promise); - }, - }, - runtime: runtime as never, - ensureSessionCanSend: async () => { - throw new Error('External execution boundary is not interactive'); - }, - ensureSessionWorkspaceAvailable: async () => { - throw new Error('workspace admission must not run'); - }, - streamEvents: async () => { - throw new Error('streaming must not run'); - }, - emitModeChanged: () => { - throw new Error('mode event must not emit'); - }, - }); - - const cases: Array<{ channel: string; args: unknown[] }> = [ - { channel: 'sessions:compact', args: ['session-1'] }, - { channel: 'sessions:resumeLatest', args: ['session-1'] }, - { - channel: 'sessions:regenerateTurn', - args: ['session-1', { sourceTurnId: 'turn-1' }], - }, - { - channel: 'plan-mode:approve', - args: [ - 'session-1', - { proposalId: 'proposal-1', expectedRevision: 1, expectedStoreVersion: 1 }, - ], - }, - { channel: 'plan-mode:resume', args: ['session-1', 'execution-1'] }, - ]; - - for (const { channel, args } of cases) { - const handler = handlers.get(channel); - assert.ok(handler, `${channel} must be registered`); - await assert.rejects(() => handler({}, ...args), /External execution boundary/); - } - assert.deepEqual(runtimeCalls, []); -}); diff --git a/apps/desktop/src/main/__tests__/sessions-ipc-send-turn-broadcast.test.ts b/apps/desktop/src/main/__tests__/sessions-ipc-send-turn-broadcast.test.ts deleted file mode 100644 index bf7b421367..0000000000 --- a/apps/desktop/src/main/__tests__/sessions-ipc-send-turn-broadcast.test.ts +++ /dev/null @@ -1,120 +0,0 @@ -/** - * The one seam that tells a client its own send is live. - * - * No SessionEvent marks a turn's START — only its end — and the runtime writes - * `status: 'running'` at the end of `AgentRun.begin`, announcing it to nobody. - * Until this broadcast the earliest a client learned its turn had begun was the - * `message-appended` riding the FIRST content event, so the entire backend - * start-up looked idle. - * - * The turn id is what makes it an ANSWER rather than a bare invalidation: it - * must be the id the renderer sent, or the arm that send placed is never - * confirmed and a stale session list can retire it. - */ - -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; - -import { createRunStartedHook, stoppedTurnBroadcasts } from '../session-send-resolve.js'; - -function hookHarness(turnId: string, options: { commitFails?: boolean } = {}) { - const answers: Array<{ sessionId: string; turnId: string }> = []; - const commits: string[] = []; - return { - answers, - commits, - hook: createRunStartedHook({ - sessionId: 'session-a', - turnId, - emitSessionsChanged: (sessionId, turn) => answers.push({ sessionId, turnId: turn }), - commitRevisionVersion: async (sessionId) => { - commits.push(sessionId); - if (options.commitFails) throw new Error('revision commit failed'); - }, - }), - }; -} - -describe('the broadcast that answers a send', () => { - it('names the turn the send was made with', async () => { - const harness = hookHarness('turn-from-renderer'); - - await harness.hook('run-1', {}); - - assert.deepEqual(harness.answers, [ - { sessionId: 'session-a', turnId: 'turn-from-renderer' }, - ]); - }); - - // The revision commit shares this callback but nothing in the answer depends - // on it, so it must not be able to delay the broadcast. - it('answers before committing a prepared revision', async () => { - const order: string[] = []; - const hook = createRunStartedHook({ - sessionId: 'session-a', - turnId: 'turn-1', - emitSessionsChanged: () => order.push('answer'), - commitRevisionVersion: async () => { - order.push('commit'); - }, - }); - - await hook('run-1', { revisionState: 'preparing' }); - - assert.deepEqual(order, ['answer', 'commit']); - }); - - // A failing commit rejects the whole callback. If the answer rode behind it, - // the client's arm would stay unconfirmed with nothing left to confirm it. - it('survives a revision commit that throws', async () => { - const harness = hookHarness('turn-1', { commitFails: true }); - - await assert.rejects(() => harness.hook('run-1', { revisionState: 'preparing' })); - - assert.deepEqual(harness.answers, [{ sessionId: 'session-a', turnId: 'turn-1' }]); - assert.deepEqual(harness.commits, ['session-a']); - }); - - it('does not commit a revision the session did not prepare', async () => { - const harness = hookHarness('turn-1'); - - await harness.hook('run-1', {}); - - assert.deepEqual(harness.commits, []); - assert.equal(harness.answers.length, 1, 'the answer is unconditional'); - }); -}); - -// Stop is the one turn ending a client can be waiting on without ever having -// seen the turn start: pressed inside the send→run-start window, it is the only -// thing that will ever answer that send. Unnamed, it cannot release the claim — -// Stop would be the one control unable to undo Stop. -describe('the broadcasts that announce a stop', () => { - it('names the turn it ended, on every reason', () => { - assert.deepEqual(stoppedTurnBroadcasts(['turn-1']), [ - { reason: 'status-change', turnId: 'turn-1' }, - { reason: 'turn-status-change', turnId: 'turn-1' }, - { reason: 'message-appended', turnId: 'turn-1' }, - ]); - }); - - // A session can carry concurrent runs; stopping ends all of them, and a - // client waiting on any one must hear its own turn named. - it('names every turn it ended', () => { - const named = stoppedTurnBroadcasts(['turn-1', 'turn-2']) - .filter((broadcast) => broadcast.reason === 'turn-status-change') - .map((broadcast) => broadcast.turnId); - - assert.deepEqual(named, ['turn-1', 'turn-2']); - }); - - // Nothing was running, so nothing is being answered — an unnamed change is - // exactly what "not about any turn" means. - it('names nothing when there was no turn to stop', () => { - assert.deepEqual(stoppedTurnBroadcasts([]), [ - { reason: 'status-change' }, - { reason: 'turn-status-change' }, - { reason: 'message-appended' }, - ]); - }); -}); diff --git a/apps/desktop/src/main/__tests__/shared-oauth-token-persistence.test.ts b/apps/desktop/src/main/__tests__/shared-oauth-token-persistence.test.ts deleted file mode 100644 index e0160a77af..0000000000 --- a/apps/desktop/src/main/__tests__/shared-oauth-token-persistence.test.ts +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Unit tests for the authoritative OAuth token persistence layer - * (#1125): CredentialStore-backed save/load/delete. Exercised against - * the real pure-Node FileCredentialStore in a tmpdir so the on-disk - * contract is covered end to end. - */ - -import { strict as assert } from 'node:assert'; -import { mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { after, describe, it } from 'node:test'; -import { resolveOAuthSubscriptionTokens } from '@maka/runtime'; -import { createFileCredentialStore } from '@maka/storage'; -import { - deleteSharedOAuthTokens, - loadSharedOAuthTokens, - saveSharedOAuthTokens, -} from '../oauth/shared-credential-bridge.js'; - -const TOKENS = { - access_token: 'access-1', - refresh_token: 'refresh-1', - expires_at: 1_800_000_000_000, - account_uuid: 'uuid-1', -}; - -const tempRoots: string[] = []; -async function makeWorkspace(): Promise { - const root = await mkdtemp(join(tmpdir(), 'maka-oauth-bridge-')); - tempRoots.push(root); - return root; -} -after(async () => { - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))); -}); - -describe('shared OAuth token persistence (store authority)', () => { - it('round-trips tokens through the credential store', async () => { - const store = createFileCredentialStore(await makeWorkspace()); - await saveSharedOAuthTokens(store, 'claude-subscription', TOKENS); - const result = await loadSharedOAuthTokens(store, 'claude-subscription'); - assert.equal(result.status, 'ok'); - assert.deepEqual(result.status === 'ok' && result.tokens, TOKENS); - }); - - it('makes a desktop-written token immediately readable by a pure-Node runtime surface', async () => { - const workspaceRoot = await makeWorkspace(); - const desktopStore = createFileCredentialStore(workspaceRoot); - await saveSharedOAuthTokens(desktopStore, 'codex-subscription', TOKENS); - - const runtimeStore = createFileCredentialStore(workspaceRoot); - const resolved = await resolveOAuthSubscriptionTokens({ - providerType: 'openai-codex', - slug: 'codex-subscription', - credentialStore: runtimeStore, - now: () => TOKENS.expires_at - 3_600_000, - fetchFn: async () => assert.fail('a fresh shared token must not use the network'), - }); - - assert.deepEqual(resolved, TOKENS); - }); - - it('reports missing tokens as missing', async () => { - const store = createFileCredentialStore(await makeWorkspace()); - assert.deepEqual(await loadSharedOAuthTokens(store, 'claude-subscription'), { status: 'missing' }); - }); - - it('save propagates store failures instead of swallowing them', async () => { - await assert.rejects( - saveSharedOAuthTokens( - { setSecret: async () => { throw new Error('store down'); } }, - 'claude-subscription', - TOKENS, - ), - /store down/, - ); - }); - - it('load propagates store read failures (fail closed, not logged out)', async () => { - const workspaceRoot = await makeWorkspace(); - await writeFile(join(workspaceRoot, 'credentials.json'), '{"version":999,"values":{}}'); - const store = createFileCredentialStore(workspaceRoot); - await assert.rejects(loadSharedOAuthTokens(store, 'claude-subscription'), /schema version/); - }); - - it('keeps an unparseable entry intact and reports corrupt (reads never destroy secrets)', async () => { - const store = createFileCredentialStore(await makeWorkspace()); - await store.setSecret('claude-subscription', 'oauth_token', 'not-a-token-payload'); - assert.deepEqual(await loadSharedOAuthTokens(store, 'claude-subscription'), { status: 'corrupt' }); - assert.equal(await store.getSecret('claude-subscription', 'oauth_token'), 'not-a-token-payload'); - // A fresh login overwrites the corrupt entry — no delete needed to unstick. - await saveSharedOAuthTokens(store, 'claude-subscription', TOKENS); - assert.equal((await loadSharedOAuthTokens(store, 'claude-subscription')).status, 'ok'); - }); - - it('delete removes the entry and leaves other kinds intact', async () => { - const store = createFileCredentialStore(await makeWorkspace()); - await store.setSecret('claude-subscription', 'api_key', 'sk-keep'); - await saveSharedOAuthTokens(store, 'claude-subscription', TOKENS); - await deleteSharedOAuthTokens(store, 'claude-subscription'); - assert.equal(await store.getSecret('claude-subscription', 'oauth_token'), null); - assert.equal(await store.getSecret('claude-subscription', 'api_key'), 'sk-keep'); - }); -}); diff --git a/apps/desktop/src/main/__tests__/side-conversation-system-prompt.test.ts b/apps/desktop/src/main/__tests__/side-conversation-system-prompt.test.ts deleted file mode 100644 index 9176220ffc..0000000000 --- a/apps/desktop/src/main/__tests__/side-conversation-system-prompt.test.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { - SIDE_CONVERSATION_SESSION_LABEL, - type AppSettings, -} from '@maka/core'; -import { createSystemPromptMainService } from '../system-prompt-main.js'; - -function makeService() { - return createSystemPromptMainService({ - settingsStore: { - get: async () => - ({ - personalization: {}, - workspaceInstructions: { enabled: false }, - }) as AppSettings, - }, - workspaceRoot: '/tmp/maka-side-conversation-prompt', - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => [] }, - }); -} - -describe('side conversation system prompt', () => { - it('injects the reference-only boundary only for side sessions', async () => { - const service = makeService(); - const ordinary = await service.buildBackendSystemPrompt( - { labels: [] }, - undefined, - { memoryFragment: null }, - ); - const side = await service.buildBackendSystemPrompt( - { labels: [SIDE_CONVERSATION_SESSION_LABEL] }, - undefined, - { memoryFragment: null }, - ); - - assert.doesNotMatch(ordinary ?? '', /Side conversation boundary/); - assert.match(side ?? '', /Side conversation boundary/); - assert.match(side ?? '', /inherited parent history is reference context only/i); - assert.match(side ?? '', /only when the user explicitly asks/i); - assert.match(side ?? '', /inherited permission profile allows it/i); - }); -}); diff --git a/apps/desktop/src/main/__tests__/skills.test.ts b/apps/desktop/src/main/__tests__/skills.test.ts deleted file mode 100644 index 3a0e2d258b..0000000000 --- a/apps/desktop/src/main/__tests__/skills.test.ts +++ /dev/null @@ -1,1054 +0,0 @@ -import { describe, it } from 'node:test'; -import assert from 'node:assert/strict'; -import { createHash } from 'node:crypto'; -import { lstat, mkdir, mkdtemp, readFile, readdir, realpath, rm, symlink, writeFile } from 'node:fs/promises'; -import { join } from 'node:path'; -import { tmpdir } from 'node:os'; -import { - MAX_SKILL_TOOL_BODY_CHARS, - buildSkillsPromptFragment, - createStarterSkill, - deleteSkill, - installManagedSkill, - loadSkillInstructions, - listGovernedSkillEntries, - listInstalledSkills, - previewManagedSkillUpdate, - resolveSkillOpenPath, - setSkillEnabled, - setSkillPinned, - updateManagedSkill, -} from '../skills.js'; -import { importManagedSkillSource } from '../managed-skill-sources.js'; -import { createSystemPromptMainService } from '../system-prompt-main.js'; - -describe('skills ingestion', () => { - it('applies Desktop host tool and capability gates to the system skill prompt', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'capability-helper', `--- -name: Capability Helper -description: Exercise host capability gating. -allowed-tools: [Read] -required-tools: [Write] -required-capabilities: [documents] ---- -# Capability Helper -Use the required tools.`); - - const makeService = (host: { toolNames: Set; capabilities: Set }) => - createSystemPromptMainService({ - settingsStore: { - get: async () => ({ - personalization: {}, - workspaceInstructions: { enabled: false }, - }) as never, - }, - workspaceRoot, - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => [] }, - host, - }); - - const missingTool = await makeService({ - toolNames: new Set(['Read']), - capabilities: new Set(['documents']), - }).buildBackendSystemPrompt({ labels: [] }, workspaceRoot, { memoryFragment: null }); - assert.doesNotMatch(missingTool ?? '', /capability-helper/, 'missing required tools must hide the skill'); - - const missingCapability = await makeService({ - toolNames: new Set(['Read', 'Write']), - capabilities: new Set(), - }).buildBackendSystemPrompt({ labels: [] }, workspaceRoot, { memoryFragment: null }); - assert.doesNotMatch(missingCapability ?? '', /capability-helper/, 'missing required capabilities must hide the skill'); - - const eligible = await makeService({ - toolNames: new Set(['Read', 'Write']), - capabilities: new Set(['documents']), - }).buildBackendSystemPrompt({ labels: [] }, workspaceRoot, { memoryFragment: null }); - assert.ok(eligible); - assert.match(eligible, / { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'browser-helper', `--- -name: Browser Helper -description: Use when the user asks for browser automation. ---- -# Browser Helper -Open local targets carefully.`); - await writeSkill(workspaceRoot, 'deck-helper', `--- -name: Deck Helper -description: Build a slide outline. ---- -# Deck Helper -Make every slide carry one idea.`); - - const disabled = await setSkillEnabled(workspaceRoot, 'browser-helper', false); - assert.equal(disabled.ok, true); - if (!disabled.ok) return; - assert.equal(disabled.skill.enabled, false); - assert.equal(disabled.skill.runtimeStatus, 'disabled'); - - const skills = await listInstalledSkills(workspaceRoot); - const browserSkill = skills.find((skill) => skill.id === 'browser-helper'); - const deckSkill = skills.find((skill) => skill.id === 'deck-helper'); - assert.ok(browserSkill); - assert.ok(deckSkill); - assert.equal(browserSkill.enabled, false); - assert.equal(browserSkill.runtimeStatus, 'disabled'); - assert.equal(deckSkill.enabled, true); - assert.equal(deckSkill.runtimeStatus, 'enabled'); - - const prompt = await buildSkillsPromptFragment(workspaceRoot); - assert.ok(prompt); - assert.doesNotMatch(prompt, /browser-helper/); - assert.match(prompt, /deck-helper/); - - const blocked = await loadSkillInstructions(workspaceRoot, 'browser-helper'); - assert.equal(blocked.ok, false); - if (blocked.ok) return; - assert.equal(blocked.reason, 'disabled'); - assert.deepEqual(blocked.availableSkills.map((skill) => skill.id), ['deck-helper']); - - const enabled = await setSkillEnabled(workspaceRoot, 'browser-helper', true); - assert.equal(enabled.ok, true); - const loaded = await loadSkillInstructions(workspaceRoot, 'browser-helper'); - assert.equal(loaded.ok, true); - }); - }); - - it('governs project, workspace, and user scopes with stable refs and v2 pin state', async () => { - await withWorkspace(async (workspaceRoot) => { - const projectRoot = join(workspaceRoot, 'project'); - const homeDir = join(workspaceRoot, 'home'); - await mkdir(projectRoot, { recursive: true }); - await mkdir(homeDir, { recursive: true }); - await writeSkill(workspaceRoot, 'workspace-helper', `--- -name: Workspace Helper -description: Workspace workflow. ---- -# Workspace`); - await writeSkillAt( - join(projectRoot, '.maka', 'skills'), - 'project-helper', - 'Project Helper', - 'Project workflow.', - ); - await writeSkillAt( - join(homeDir, '.agents', 'skills'), - 'user-helper', - 'User Helper', - 'User workflow.', - ); - - const options = { cwd: projectRoot, homeDir }; - const entries = await listGovernedSkillEntries(workspaceRoot, options); - assert.deepEqual(entries.map((skill) => skill.scope).sort(), ['project', 'user', 'workspace']); - assert.equal(entries.find((skill) => skill.id === 'project-helper')?.ref, 'project:maka:project-helper'); - // User-scope skills are the user's own installs under ~/.maka|.agents, - // so the panel deletes them. Project-scope skills live in the repo and - // are left to git — see isManageableSkill. - assert.equal(entries.find((skill) => skill.id === 'user-helper')?.manageable, true); - assert.equal(entries.find((skill) => skill.id === 'workspace-helper')?.manageable, true); - assert.equal(entries.find((skill) => skill.id === 'project-helper')?.manageable, false); - - const pinned = await setSkillPinned( - workspaceRoot, - 'user:agents:user-helper', - true, - options, - ); - assert.equal(pinned.ok, true); - if (!pinned.ok) return; - assert.equal(pinned.skill.pinned, true); - assert.equal(pinned.skill.contextRank, 1); - const state = JSON.parse( - await readFile(join(workspaceRoot, '.maka', 'skills-state.json'), 'utf8'), - ) as { schemaVersion: number; skills: Record }; - assert.equal(state.schemaVersion, 2); - assert.deepEqual( - { - enabled: state.skills['user:agents:user-helper']?.enabled, - pinned: state.skills['user:agents:user-helper']?.pinned, - }, - { enabled: true, pinned: true }, - ); - }); - }); - - it('surfaces blocked discovery roots as non-actionable inventory diagnostics', async () => { - await withWorkspace(async (workspaceRoot) => { - const projectRoot = join(workspaceRoot, 'project'); - const outside = await mkdtemp(join(tmpdir(), 'maka-desktop-skill-source-')); - try { - await mkdir(join(projectRoot, '.maka'), { recursive: true }); - await symlink(outside, join(projectRoot, '.maka', 'skills')); - const entries = await listGovernedSkillEntries(workspaceRoot, { - cwd: projectRoot, - homeDir: join(workspaceRoot, 'empty-home'), - }); - const diagnostic = entries.find( - (entry) => entry.kind === 'discovery_diagnostic', - ); - assert.ok(diagnostic); - assert.equal(diagnostic.scope, 'project'); - assert.equal(diagnostic.source, 'maka'); - assert.equal(diagnostic.discoveryDiagnosticReason, 'blocked_path'); - assert.equal(diagnostic.manageable, false); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('shows invalid discovered skills as explainable, openable inventory entries', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'broken', `--- -name: Broken ---- -# Missing description`); - const entries = await listGovernedSkillEntries(workspaceRoot, { - cwd: workspaceRoot, - homeDir: join(workspaceRoot, 'empty-home'), - }); - const broken = entries.find((skill) => skill.id === 'broken'); - assert.ok(broken); - assert.equal(broken.contextStatus, 'invalid'); - assert.equal(broken.validationStatus, 'metadata_error'); - assert.equal(broken.manageable, true); - const opened = await resolveSkillOpenPath( - workspaceRoot, - broken.ref, - 'file', - { cwd: workspaceRoot, homeDir: join(workspaceRoot, 'empty-home') }, - ); - assert.equal(opened.ok, true); - }); - }); - - it('fails closed when the workspace skill runtime state file is invalid', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'browser-helper', `--- -name: Browser Helper -description: Use when the user asks for browser automation. ---- -# Browser Helper -Open local targets carefully.`); - await mkdir(join(workspaceRoot, '.maka'), { recursive: true }); - await writeFile(join(workspaceRoot, '.maka', 'skills-state.json'), '{not json', 'utf8'); - - const skills = await listInstalledSkills(workspaceRoot); - assert.equal(skills.length, 1); - assert.equal(skills[0].enabled, false); - assert.equal(skills[0].runtimeStatus, 'state_error'); - assert.equal(await buildSkillsPromptFragment(workspaceRoot), undefined); - - const loaded = await loadSkillInstructions(workspaceRoot, 'browser-helper'); - assert.equal(loaded.ok, false); - if (loaded.ok) return; - assert.equal(loaded.reason, 'disabled'); - assert.deepEqual(loaded.availableSkills, []); - assert.deepEqual(await setSkillEnabled(workspaceRoot, 'browser-helper', true), { ok: false, reason: 'state_error' }); - }); - }); - - it('does not write skill runtime state through a symlinked workspace metadata directory', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-state-outside-')); - try { - await writeSkill(workspaceRoot, 'browser-helper', `--- -name: Browser Helper -description: Use when the user asks for browser automation. ---- -# Browser Helper -Open local targets carefully.`); - await symlink(outside, join(workspaceRoot, '.maka')); - - assert.deepEqual(await setSkillEnabled(workspaceRoot, 'browser-helper', false), { ok: false, reason: 'blocked_path' }); - await assert.rejects(readFile(join(outside, 'skills-state.json'), 'utf8'), { code: 'ENOENT' }); - - const skills = await listInstalledSkills(workspaceRoot); - assert.equal(skills.length, 1); - assert.equal(skills[0].enabled, false); - assert.equal(skills[0].runtimeStatus, 'state_error'); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('does not read or write skill runtime state through a symlinked state file', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-state-file-outside-')); - try { - await writeSkill(workspaceRoot, 'browser-helper', `--- -name: Browser Helper -description: Use when the user asks for browser automation. ---- -# Browser Helper -Open local targets carefully.`); - await mkdir(join(workspaceRoot, '.maka'), { recursive: true }); - const externalState = join(outside, 'skills-state.json'); - await writeFile(externalState, 'outside state', 'utf8'); - await symlink(externalState, join(workspaceRoot, '.maka', 'skills-state.json')); - - const skills = await listInstalledSkills(workspaceRoot); - assert.equal(skills.length, 1); - assert.equal(skills[0].enabled, false); - assert.equal(skills[0].runtimeStatus, 'state_error'); - assert.equal(await buildSkillsPromptFragment(workspaceRoot), undefined); - assert.deepEqual(await setSkillEnabled(workspaceRoot, 'browser-helper', false), { ok: false, reason: 'blocked_path' }); - assert.equal(await readFile(externalState, 'utf8'), 'outside state'); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('bounds loaded skill instructions and returns available skills on miss', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'huge', `--- -name: Huge -description: Exercise instruction truncation. ---- -# Huge -${'A'.repeat(MAX_SKILL_TOOL_BODY_CHARS + 1000)}`); - - const loaded = await loadSkillInstructions(workspaceRoot, 'huge'); - assert.equal(loaded.ok, true); - if (!loaded.ok) return; - assert.equal(loaded.skill.truncated, true); - assert.ok(loaded.skill.instructions.length <= MAX_SKILL_TOOL_BODY_CHARS + '[skill truncated]'.length + 2); - assert.match(loaded.skill.instructions, /\[skill truncated\]/); - - const miss = await loadSkillInstructions(workspaceRoot, 'missing'); - assert.equal(miss.ok, false); - if (miss.ok) return; - assert.equal(miss.reason, 'not_found'); - assert.deepEqual(miss.availableSkills, [{ id: 'huge', name: 'Huge', description: 'Exercise instruction truncation.' }]); - }); - }); - - it('creates a guarded starter SKILL.md template', async () => { - await withWorkspace(async (workspaceRoot) => { - const result = await createStarterSkill(workspaceRoot); - assert.equal(result.ok, true); - if (!result.ok) return; - assert.equal(result.created, true); - assert.equal(result.skill.id, 'starter-skill'); - assert.equal(result.skill.name, '示例技能'); - assert.equal(result.skill.path, join(workspaceRoot, 'skills', 'starter-skill')); - assert.equal(result.filePath, join(workspaceRoot, 'skills', 'starter-skill', 'SKILL.md')); - await assert.rejects(readFile(join(workspaceRoot, 'skills', 'starter-skill', 'skill.lock.json'), 'utf8'), { - code: 'ENOENT', - }); - - const text = await readFile(result.filePath, 'utf8'); - assert.equal( - text, - `--- -name: 示例技能 -description: 把常用工作流写成可复用的本地指令。 -allowed-tools: - - Read ---- - -# 示例技能 - -当用户要求你按固定流程完成某类任务时，先加载这个技能。 - -## 使用方式 - -1. 先确认用户的目标、输入材料和交付格式。 -2. 阅读必要的本地文件或上下文，只收集完成任务需要的信息。 -3. 按步骤输出结果；如果需要改文件，先说明要改哪里和原因。 - -## 边界 - -- 这个技能声明的工具只是需求提示，不会自动获得权限。 -- 不要把敏感内容写进这里；它会作为本地技能指令进入模型上下文。 -- 如果这个模板不适合你的工作流，可以直接改名或删除 starter-skill。 -`, - ); - - const skillsDirMode = (await lstat(join(workspaceRoot, 'skills'))).mode & 0o077; - const fileMode = (await lstat(result.filePath)).mode & 0o077; - if (process.platform !== 'win32') { - assert.equal(skillsDirMode, 0); - assert.equal(fileMode, 0); - } - - const skills = await listInstalledSkills(workspaceRoot); - assert.equal(skills.length, 1); - assert.equal(skills[0].id, 'starter-skill'); - assert.equal(skills[0].sourceType, 'workspace'); - assert.equal(skills[0].validationStatus, 'missing_lock'); - - // Idempotent seeding: a repeat create REUSES the existing starter-skill - // (created:false) instead of minting a duplicate — three clicks used to - // produce three indistinguishable 「示例技能」 rows. No new dir appears. - const second = await createStarterSkill(workspaceRoot); - assert.equal(second.ok, true); - if (second.ok) { - assert.equal(second.created, false); - assert.equal(second.skill.id, 'starter-skill'); - assert.equal(second.filePath, join(workspaceRoot, 'skills', 'starter-skill', 'SKILL.md')); - } - const dirs = (await readdir(join(workspaceRoot, 'skills'), { withFileTypes: true })) - .filter((entry) => entry.isDirectory()) - .map((entry) => entry.name); - assert.deepEqual(dirs, ['starter-skill']); - }); - }); - - it('deletes a user-scope skill by ref and leaves project-scope skills alone', async () => { - await withWorkspace(async (workspaceRoot) => { - const projectRoot = join(workspaceRoot, 'project'); - const homeDir = join(workspaceRoot, 'home'); - await mkdir(projectRoot, { recursive: true }); - await mkdir(homeDir, { recursive: true }); - await writeSkillAt(join(homeDir, '.agents', 'skills'), 'user-helper', 'User Helper', 'User workflow.'); - await writeSkillAt(join(projectRoot, '.maka', 'skills'), 'project-helper', 'Project Helper', 'Project workflow.'); - const options = { cwd: projectRoot, homeDir }; - - assert.deepEqual( - await deleteSkill(workspaceRoot, 'user:agents:user-helper', options), - { ok: true }, - ); - await assert.rejects(lstat(join(homeDir, '.agents', 'skills', 'user-helper')), { code: 'ENOENT' }); - - // Project scope is a policy refusal, not a path block, and the repo file - // must still be on disk afterwards. - assert.deepEqual( - await deleteSkill(workspaceRoot, 'project:maka:project-helper', options), - { ok: false, reason: 'blocked_scope' }, - ); - await lstat(join(projectRoot, '.maka', 'skills', 'project-helper')); - - // A ref for a skill that no longer exists is a clean not_found. - assert.deepEqual( - await deleteSkill(workspaceRoot, 'user:agents:user-helper', options), - { ok: false, reason: 'not_found' }, - ); - }); - }); - - it('refuses to delete a user-scope skill reached through a symlinked directory', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-user-delete-outside-')); - try { - const homeDir = join(workspaceRoot, 'home'); - // A real skill outside the scan roots, linked into ~/.agents/skills. - await writeSkillAt(outside, 'linked-helper', 'Linked Helper', 'Linked workflow.'); - await mkdir(join(homeDir, '.agents', 'skills'), { recursive: true }); - await symlink(join(outside, 'linked-helper'), join(homeDir, '.agents', 'skills', 'linked-helper')); - - const options = { cwd: workspaceRoot, homeDir }; - // `not_found`, not `blocked_path`: discovery itself skips symlinked - // dir entries, so a linked skill never reaches the inventory and the - // delete has no ref to match. The lstat symlink guard inside - // deleteSkillByRef is defence in depth behind this. - assert.deepEqual( - await deleteSkill(workspaceRoot, 'user:agents:linked-helper', options), - { ok: false, reason: 'not_found' }, - ); - // The link target survives — deletion never followed the link out. - await lstat(join(outside, 'linked-helper', 'SKILL.md')); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('refuses a ref that resolves outside the enumerated discovery dirs', async () => { - await withWorkspace(async (workspaceRoot) => { - const homeDir = join(workspaceRoot, 'home'); - await mkdir(homeDir, { recursive: true }); - await writeSkillAt(join(homeDir, '.agents', 'skills'), 'user-helper', 'User Helper', 'User workflow.'); - const options = { cwd: workspaceRoot, homeDir }; - - // Refs are matched against the scan, so a forged one never resolves to a - // path at all — no traversal, no delete. - for (const forged of [ - 'user:agents:../../../etc', - 'user:agents:user-helper/../../..', - 'custom:0:user-helper', - 'workspace:legacy:user-helper', - ]) { - assert.deepEqual( - await deleteSkill(workspaceRoot, forged, options), - { ok: false, reason: 'not_found' }, - `forged ref ${forged} must not resolve`, - ); - } - await lstat(join(homeDir, '.agents', 'skills', 'user-helper', 'SKILL.md')); - }); - }); - - it('refuses to delete through a symlinked skill directory', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-delete-outside-')); - try { - await mkdir(join(workspaceRoot, 'skills'), { recursive: true }); - await symlink(outside, join(workspaceRoot, 'skills', 'outside')); - assert.deepEqual(await deleteSkill(workspaceRoot, 'outside'), { ok: false, reason: 'blocked_path' }); - // The symlink target survives — deletion never followed the link. - await lstat(outside); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('does not trust mismatched or symlinked skill lock metadata', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'copied', `--- -name: Copied -description: Exercise mismatched lock metadata. ---- -# Copied`); - await writeFile(join(workspaceRoot, 'skills', 'copied', 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'other-id', - sourceType: 'bundled', - sourceName: 'forged-bundle', - sourceVersion: '1', - contentSha256: `sha256:${sha256Hex(await readFile(join(workspaceRoot, 'skills', 'copied', 'SKILL.md'), 'utf8'))}`, - installedAt: new Date(0).toISOString(), - }), 'utf8'); - - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-lock-outside-')); - try { - await writeSkill(workspaceRoot, 'linked-lock', `--- -name: Linked Lock -description: Exercise symlinked lock metadata. ---- -# Linked Lock`); - await writeFile(join(outside, 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'linked-lock', - sourceType: 'bundled', - sourceName: 'forged-bundle', - sourceVersion: '1', - contentSha256: 'sha256:0000000000000000000000000000000000000000000000000000000000000000', - installedAt: new Date(0).toISOString(), - }), 'utf8'); - await symlink(join(outside, 'skill.lock.json'), join(workspaceRoot, 'skills', 'linked-lock', 'skill.lock.json')); - - const skills = await listInstalledSkills(workspaceRoot); - const copied = skills.find((skill) => skill.id === 'copied'); - const linked = skills.find((skill) => skill.id === 'linked-lock'); - assert.ok(copied); - assert.equal(copied.sourceType, 'unknown'); - assert.equal(copied.sourceName, undefined); - assert.equal(copied.validationStatus, 'metadata_error'); - assert.deepEqual(copied.validationCodes, ['id_mismatch']); - assert.ok(linked); - assert.equal(linked.sourceType, 'unknown'); - assert.equal(linked.validationStatus, 'metadata_error'); - assert.deepEqual(linked.validationCodes, ['lock_symlink']); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('does not trust forged bundled or managed skill lock metadata', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'deep-research', `--- -name: Fake Deep Research -description: Exercise forged bundled metadata. ---- -# Fake Deep Research -This is not the bundled template.`); - const fakeBundledContent = await readFile(join(workspaceRoot, 'skills', 'deep-research', 'SKILL.md'), 'utf8'); - await writeFile(join(workspaceRoot, 'skills', 'deep-research', 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'deep-research', - sourceType: 'bundled', - sourceName: 'maka-bundled', - sourceVersion: '1', - contentSha256: `sha256:${sha256Hex(fakeBundledContent)}`, - installedAt: new Date(0).toISOString(), - }), 'utf8'); - - await writeSkill(workspaceRoot, 'unknown-bundled', `--- -name: Unknown Bundled -description: Exercise an invalid bundled skill id. ---- -# Unknown Bundled`); - const unknownBundledContent = await readFile(join(workspaceRoot, 'skills', 'unknown-bundled', 'SKILL.md'), 'utf8'); - await writeFile(join(workspaceRoot, 'skills', 'unknown-bundled', 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'unknown-bundled', - sourceType: 'bundled', - sourceName: 'maka-bundled', - sourceVersion: '1', - contentSha256: `sha256:${sha256Hex(unknownBundledContent)}`, - installedAt: new Date(0).toISOString(), - }), 'utf8'); - - await writeSkill(workspaceRoot, 'managed-forgery', `--- -name: Managed Forgery -description: Exercise forged managed metadata. ---- -# Managed Forgery`); - const managedContent = await readFile(join(workspaceRoot, 'skills', 'managed-forgery', 'SKILL.md'), 'utf8'); - await writeFile(join(workspaceRoot, 'skills', 'managed-forgery', 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'managed-forgery', - sourceType: 'managed', - sourceName: 'local-library', - sourceVersion: '1', - contentSha256: `sha256:${sha256Hex(managedContent)}`, - installedAt: new Date(0).toISOString(), - }), 'utf8'); - - const skills = await listInstalledSkills(workspaceRoot); - const fakeBundled = skills.find((skill) => skill.id === 'deep-research'); - const unknownBundled = skills.find((skill) => skill.id === 'unknown-bundled'); - const managed = skills.find((skill) => skill.id === 'managed-forgery'); - assert.ok(fakeBundled); - assert.equal(fakeBundled.sourceType, 'unknown'); - assert.equal(fakeBundled.sourceName, undefined); - assert.equal(fakeBundled.validationStatus, 'metadata_error'); - assert.deepEqual(fakeBundled.validationCodes, ['unsupported_schema']); - assert.ok(unknownBundled); - assert.equal(unknownBundled.sourceType, 'unknown'); - assert.equal(unknownBundled.sourceName, undefined); - assert.equal(unknownBundled.validationStatus, 'metadata_error'); - assert.deepEqual(unknownBundled.validationCodes, ['unsupported_schema']); - assert.ok(managed); - assert.equal(managed.sourceType, 'unknown'); - assert.equal(managed.sourceName, undefined); - assert.equal(managed.validationStatus, 'metadata_error'); - assert.deepEqual(managed.validationCodes, ['unsupported_schema']); - }); - }); - - it('does not trust forged managed locks that do not match the source snapshot', async () => { - await withWorkspace(async (workspaceRoot) => { - const sourceRoot = await mkdtemp(join(tmpdir(), 'maka-managed-source-cache-')); - try { - const incomingDir = join(workspaceRoot, 'incoming', 'research-brief'); - await mkdir(incomingDir, { recursive: true }); - const incomingFile = join(incomingDir, 'SKILL.md'); - await writeFile(incomingFile, `--- -name: Research Brief -description: Summarize research. ---- -# Research Brief -Source snapshot.`, 'utf8'); - const imported = await importManagedSkillSource({ root: sourceRoot, sourceFile: incomingFile }); - assert.equal(imported.ok, true); - if (!imported.ok) return; - - await writeSkill(workspaceRoot, 'research-brief', `--- -name: Research Brief -description: Forged workspace copy. ---- -# Research Brief -Forged workspace content.`); - const forgedContent = await readFile(join(workspaceRoot, 'skills', 'research-brief', 'SKILL.md'), 'utf8'); - const forgedContentSha256 = `sha256:${sha256Hex(forgedContent)}`; - assert.notEqual(forgedContentSha256, imported.source.contentSha256); - await writeFile(join(workspaceRoot, 'skills', 'research-brief', 'skill.lock.json'), JSON.stringify({ - schemaVersion: 1, - id: 'research-brief', - sourceType: 'managed', - sourceName: 'local-library', - sourceVersion: '1', - contentSha256: forgedContentSha256, - installedAt: new Date(0).toISOString(), - sourceId: 'research-brief', - sourceContentSha256: imported.source.contentSha256, - }), 'utf8'); - - const skills = await listInstalledSkills(workspaceRoot, { managedSourceRoot: sourceRoot }); - const forged = skills.find((skill) => skill.id === 'research-brief'); - assert.ok(forged); - assert.equal(forged.sourceType, 'unknown'); - assert.equal(forged.validationStatus, 'metadata_error'); - assert.deepEqual(forged.validationCodes, ['unsupported_schema']); - assert.equal(forged.managedUpdateStatus, 'metadata_error'); - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'research-brief', sourceRoot), { - ok: false, - reason: 'metadata_error', - }); - } finally { - await rm(sourceRoot, { recursive: true, force: true }); - } - }); - }); - - it('updates managed skills only when the workspace copy is clean', async () => { - await withWorkspace(async (workspaceRoot) => { - const sourceRoot = await mkdtemp(join(tmpdir(), 'maka-managed-source-cache-')); - try { - const incomingDir = join(workspaceRoot, 'incoming', 'deck-helper'); - await mkdir(incomingDir, { recursive: true }); - const incomingFile = join(incomingDir, 'SKILL.md'); - await writeFile(incomingFile, `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version one.`, 'utf8'); - const imported = await importManagedSkillSource({ root: sourceRoot, sourceFile: incomingFile }); - assert.equal(imported.ok, true); - if (!imported.ok) return; - const installed = await installManagedSkill(workspaceRoot, imported.source.id, sourceRoot); - assert.equal(installed.ok, true); - - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version two.`, 'utf8'); - - const cleanPreview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.equal(cleanPreview.ok, true); - if (!cleanPreview.ok) return; - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version two changed after preview.`, 'utf8'); - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot, { - expectedCurrentSha256: cleanPreview.preview.expectedCurrentSha256, - expectedSourceSha256: cleanPreview.preview.expectedSourceSha256, - }), { - ok: false, - reason: 'local_modified', - }); - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), 'utf8'), /Version one\./); - - const freshCleanPreview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.equal(freshCleanPreview.ok, true); - if (!freshCleanPreview.ok) return; - const updated = await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot, { - expectedCurrentSha256: freshCleanPreview.preview.expectedCurrentSha256, - expectedSourceSha256: freshCleanPreview.preview.expectedSourceSha256, - }); - assert.equal(updated.ok, true); - if (!updated.ok) return; - assert.equal(updated.skill.managedUpdateStatus, 'up_to_date'); - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), 'utf8'), /Version two changed after preview\./); - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', '.maka', 'baseline', 'SKILL.md'), 'utf8'), /Version two changed after preview\./); - - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version three.`, 'utf8'); - await writeFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Local edit.`, 'utf8'); - - const blocked = await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot); - assert.deepEqual(blocked, { ok: false, reason: 'local_modified' }); - - const preview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.equal(preview.ok, true); - if (!preview.ok) return; - assert.match(preview.preview.currentContent, /Local edit\./); - assert.match(preview.preview.sourceContent, /Version three\./); - assert.match(preview.preview.baselineContent ?? '', /Version two changed after preview\./); - assert.equal(preview.preview.skill.managedUpdateStatus, 'local_modified'); - assert.ok(preview.preview.summary.changedLineCount > 0); - - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot, { force: true }), { - ok: false, - reason: 'local_modified', - }); - await writeFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Changed after preview.`, 'utf8'); - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot, { - force: true, - expectedCurrentSha256: preview.preview.expectedCurrentSha256, - expectedSourceSha256: preview.preview.expectedSourceSha256, - }), { - ok: false, - reason: 'local_modified', - }); - - const freshPreview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.equal(freshPreview.ok, true); - if (!freshPreview.ok) return; - const forced = await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot, { - force: true, - expectedCurrentSha256: freshPreview.preview.expectedCurrentSha256, - expectedSourceSha256: freshPreview.preview.expectedSourceSha256, - }); - assert.equal(forced.ok, true); - if (!forced.ok) return; - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), 'utf8'), /Version three\./); - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', '.maka', 'baseline', 'SKILL.md'), 'utf8'), /Version three\./); - - const skills = await listInstalledSkills(workspaceRoot, { managedSourceRoot: sourceRoot }); - const managed = skills.find((skill) => skill.id === 'deck-helper'); - assert.ok(managed); - assert.equal(managed.managedUpdateStatus, 'up_to_date'); - } finally { - await rm(sourceRoot, { recursive: true, force: true }); - } - }); - }); - - it('does not write managed skill baselines through symlinks', async () => { - await withWorkspace(async (workspaceRoot) => { - const sourceRoot = await mkdtemp(join(tmpdir(), 'maka-managed-source-cache-')); - const outside = await mkdtemp(join(tmpdir(), 'maka-managed-baseline-outside-')); - try { - const incomingDir = join(workspaceRoot, 'incoming', 'deck-helper'); - await mkdir(incomingDir, { recursive: true }); - const incomingFile = join(incomingDir, 'SKILL.md'); - await writeFile(incomingFile, `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version one.`, 'utf8'); - const imported = await importManagedSkillSource({ root: sourceRoot, sourceFile: incomingFile }); - assert.equal(imported.ok, true); - if (!imported.ok) return; - const installed = await installManagedSkill(workspaceRoot, imported.source.id, sourceRoot); - assert.equal(installed.ok, true); - - const externalBaseline = join(outside, 'SKILL.md'); - await writeFile(externalBaseline, 'outside baseline', 'utf8'); - const baselinePath = join(workspaceRoot, 'skills', 'deck-helper', '.maka', 'baseline', 'SKILL.md'); - await rm(baselinePath); - await symlink(externalBaseline, baselinePath); - - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version two.`, 'utf8'); - const updated = await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot); - assert.deepEqual(updated, { ok: false, reason: 'write_failed' }); - assert.equal(await readFile(externalBaseline, 'utf8'), 'outside baseline'); - const baselineStat = await lstat(baselinePath); - assert.equal(baselineStat.isSymbolicLink(), true); - assert.match(await readFile(join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'), 'utf8'), /Version one\./); - const skills = await listInstalledSkills(workspaceRoot, { managedSourceRoot: sourceRoot }); - assert.equal(skills.find((skill) => skill.id === 'deck-helper')?.managedUpdateStatus, 'update_available'); - } finally { - await rm(sourceRoot, { recursive: true, force: true }); - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('does not write managed skill updates through symlinked SKILL files', async () => { - await withWorkspace(async (workspaceRoot) => { - const sourceRoot = await mkdtemp(join(tmpdir(), 'maka-managed-source-cache-')); - const outside = await mkdtemp(join(tmpdir(), 'maka-managed-skill-outside-')); - try { - const incomingDir = join(workspaceRoot, 'incoming', 'deck-helper'); - await mkdir(incomingDir, { recursive: true }); - const incomingFile = join(incomingDir, 'SKILL.md'); - await writeFile(incomingFile, `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version one.`, 'utf8'); - const imported = await importManagedSkillSource({ root: sourceRoot, sourceFile: incomingFile }); - assert.equal(imported.ok, true); - if (!imported.ok) return; - const installed = await installManagedSkill(workspaceRoot, imported.source.id, sourceRoot); - assert.equal(installed.ok, true); - - const externalSkillContent = `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version one.`; - const externalSkill = join(outside, 'SKILL.md'); - await writeFile(externalSkill, externalSkillContent, 'utf8'); - const skillPath = join(workspaceRoot, 'skills', 'deck-helper', 'SKILL.md'); - await rm(skillPath); - await symlink(externalSkill, skillPath); - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version two.`, 'utf8'); - - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot), { - ok: false, - reason: 'blocked_path', - }); - const preview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.deepEqual(preview, { ok: false, reason: 'blocked_path' }); - assert.equal(await readFile(externalSkill, 'utf8'), externalSkillContent); - } finally { - await rm(sourceRoot, { recursive: true, force: true }); - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('does not read managed skill baselines through symlinked metadata directories', async () => { - await withWorkspace(async (workspaceRoot) => { - const sourceRoot = await mkdtemp(join(tmpdir(), 'maka-managed-source-cache-')); - const outside = await mkdtemp(join(tmpdir(), 'maka-managed-baseline-parent-outside-')); - try { - const incomingDir = join(workspaceRoot, 'incoming', 'deck-helper'); - await mkdir(incomingDir, { recursive: true }); - const incomingFile = join(incomingDir, 'SKILL.md'); - await writeFile(incomingFile, `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version one.`, 'utf8'); - const imported = await importManagedSkillSource({ root: sourceRoot, sourceFile: incomingFile }); - assert.equal(imported.ok, true); - if (!imported.ok) return; - const installed = await installManagedSkill(workspaceRoot, imported.source.id, sourceRoot); - assert.equal(installed.ok, true); - - await mkdir(join(outside, 'baseline'), { recursive: true }); - await writeFile(join(outside, 'baseline', 'SKILL.md'), 'outside baseline', 'utf8'); - const metadataDir = join(workspaceRoot, 'skills', 'deck-helper', '.maka'); - await rm(metadataDir, { recursive: true, force: true }); - await symlink(outside, metadataDir); - - await writeFile(join(sourceRoot, 'deck-helper', 'SKILL.md'), `--- -name: Deck Helper -description: Build decks. ---- -# Deck Helper -Version two.`, 'utf8'); - const preview = await previewManagedSkillUpdate(workspaceRoot, 'deck-helper', sourceRoot); - assert.equal(preview.ok, true); - if (!preview.ok) return; - assert.equal(preview.preview.baselineContent, undefined); - assert.deepEqual(await updateManagedSkill(workspaceRoot, 'deck-helper', sourceRoot), { - ok: false, - reason: 'write_failed', - }); - assert.equal(await readFile(join(outside, 'baseline', 'SKILL.md'), 'utf8'), 'outside baseline'); - } finally { - await rm(sourceRoot, { recursive: true, force: true }); - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('rejects a symlinked skills directory instead of writing through it', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skills-outside-')); - try { - await mkdir(join(outside, 'external'), { recursive: true }); - await writeFile(join(outside, 'external', 'SKILL.md'), `--- -name: External -description: Exercise a symlinked skills directory. ---- -# External`, 'utf8'); - await symlink(outside, join(workspaceRoot, 'skills')); - assert.deepEqual(await createStarterSkill(workspaceRoot), { ok: false, reason: 'blocked_path' }); - assert.deepEqual(await listInstalledSkills(workspaceRoot), []); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - it('resolves only workspace-contained skill files for opening', async () => { - await withWorkspace(async (workspaceRoot) => { - await writeSkill(workspaceRoot, 'writer', `--- -name: Writer -description: Exercise workspace-contained open paths. ---- -# Writer`); - const skillFile = await realpath(join(workspaceRoot, 'skills', 'writer', 'SKILL.md')); - const skillDirectory = await realpath(join(workspaceRoot, 'skills', 'writer')); - assert.deepEqual( - await resolveSkillOpenPath(workspaceRoot, 'writer', 'file'), - { ok: true, path: skillFile, target: 'file' }, - ); - assert.deepEqual( - await resolveSkillOpenPath(workspaceRoot, 'writer', 'directory'), - { ok: true, path: skillDirectory, target: 'directory' }, - ); - assert.deepEqual(await resolveSkillOpenPath(workspaceRoot, '../writer', 'file'), { - ok: false, - reason: 'invalid_id', - }); - }); - }); - - it('blocks symlinked skill directories when opening a specific skill', async () => { - await withWorkspace(async (workspaceRoot) => { - const outside = await mkdtemp(join(tmpdir(), 'maka-skill-open-outside-')); - try { - await mkdir(join(workspaceRoot, 'skills'), { recursive: true }); - await symlink(outside, join(workspaceRoot, 'skills', 'outside')); - assert.deepEqual(await resolveSkillOpenPath(workspaceRoot, 'outside', 'directory'), { - ok: false, - reason: 'blocked_path', - }); - } finally { - await rm(outside, { recursive: true, force: true }); - } - }); - }); - - -}); - -async function withWorkspace(fn: (workspaceRoot: string) => Promise): Promise { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-skills-')); - try { - await fn(workspaceRoot); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -} - -async function writeSkill(workspaceRoot: string, id: string, content: string): Promise { - const dir = join(workspaceRoot, 'skills', id); - await mkdir(dir, { recursive: true }); - await writeFile(join(dir, 'SKILL.md'), content, 'utf8'); -} - -async function writeSkillAt( - skillsDir: string, - id: string, - name: string, - description: string, -): Promise { - const dir = join(skillsDir, id); - await mkdir(dir, { recursive: true }); - await writeFile( - join(dir, 'SKILL.md'), - `---\nname: ${name}\ndescription: ${description}\n---\n# ${name}`, - 'utf8', - ); -} - -function sha256Hex(text: string): string { - return createHash('sha256').update(text).digest('hex'); -} diff --git a/apps/desktop/src/main/__tests__/startup-safe-boundary-resume.test.ts b/apps/desktop/src/main/__tests__/startup-safe-boundary-resume.test.ts deleted file mode 100644 index e300518948..0000000000 --- a/apps/desktop/src/main/__tests__/startup-safe-boundary-resume.test.ts +++ /dev/null @@ -1,154 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import type { SessionManager } from '@maka/runtime'; -import type { StreamEvents } from '../session-stream.js'; -import { resumeSafeBoundaryContinuationsOnStartup } from '../startup-safe-boundary-resume.js'; - -test('startup recovery never plans or resumes an externally isolated session', async () => { - const calls: string[] = []; - const runtime = { - async listSessions() { - return [{ id: 'external-session' }]; - }, - async readExecutionBoundary(sessionId: string) { - calls.push(`boundary:${sessionId}`); - return { kind: 'external' as const, revision: 0 }; - }, - async planLatestAuthoritativeSafeBoundaryContinuation(sessionId: string) { - calls.push(`plan:${sessionId}`); - assert.fail('Desktop must not plan an externally isolated continuation'); - }, - resumeSafeBoundaryContinuation() { - assert.fail('Desktop must not resume an externally isolated continuation'); - }, - } as unknown as Pick< - SessionManager, - | 'listSessions' - | 'readExecutionBoundary' - | 'planLatestAuthoritativeSafeBoundaryContinuation' - | 'resumeSafeBoundaryContinuation' - >; - const streamEvents = (() => { - assert.fail('Desktop must not stream an externally isolated continuation'); - }) as unknown as StreamEvents; - - const logged: string[] = []; - await resumeSafeBoundaryContinuationsOnStartup(runtime, streamEvents, (message) => { - logged.push(message); - }); - - assert.deepEqual(calls, ['boundary:external-session']); - // Skipping it is the admission rule holding, not a fault, so nothing is - // reported — otherwise every harness-owned session would log on every launch. - assert.deepEqual(logged, []); -}); - -test('one unreadable session does not strand the sessions after it', async () => { - // The pass surveys every session, so anything local to one of them — a record - // removed since `listSessions`, an unreadable boundary row — must cost that - // session only. An unguarded loop would abort here and leave every later - // session un-recovered, which is how a single bad row becomes an outage. - const calls: string[] = []; - const logged: string[] = []; - const continuation = { sessionId: 'later', turnId: 'turn-1' }; - const runtime = { - async listSessions() { - return [{ id: 'broken' }, { id: 'later' }]; - }, - async readExecutionBoundary(sessionId: string) { - calls.push(`boundary:${sessionId}`); - if (sessionId === 'broken') throw new Error('session record is gone'); - return { - kind: 'managed' as const, - revision: 0, - profile: { filesystem: { entries: [] }, network: { enabled: false } }, - }; - }, - async planLatestAuthoritativeSafeBoundaryContinuation(sessionId: string) { - calls.push(`plan:${sessionId}`); - return { continuation }; - }, - resumeSafeBoundaryContinuation(input: typeof continuation) { - calls.push(`resume:${input.sessionId}`); - return (async function* () {})(); - }, - } as unknown as Pick< - SessionManager, - | 'listSessions' - | 'readExecutionBoundary' - | 'planLatestAuthoritativeSafeBoundaryContinuation' - | 'resumeSafeBoundaryContinuation' - >; - const streamEvents = (async (sessionId: string) => { - calls.push(`stream:${sessionId}`); - return {}; - }) as unknown as StreamEvents; - - await resumeSafeBoundaryContinuationsOnStartup(runtime, streamEvents, (message) => { - logged.push(message); - }); - await new Promise((resolve) => setImmediate(resolve)); - - assert.deepEqual(calls, [ - 'boundary:broken', - 'boundary:later', - 'plan:later', - 'resume:later', - 'stream:later', - ]); - // Reported, not swallowed: a session that could not be surveyed is a fault, - // unlike the externally isolated session above, which is the rule holding. - assert.deepEqual(logged, ['[startup] safe-boundary resume failed for session broken:']); -}); - -test('startup recovery resumes an admitted managed continuation', async () => { - const calls: string[] = []; - const continuation = { - sessionId: 'managed-session', - turnId: 'turn-1', - }; - const runtime = { - async listSessions() { - return [{ id: 'managed-session' }]; - }, - async readExecutionBoundary(sessionId: string) { - calls.push(`boundary:${sessionId}`); - return { - kind: 'managed' as const, - revision: 0, - profile: { - filesystem: { entries: [] }, - network: { enabled: false }, - }, - }; - }, - async planLatestAuthoritativeSafeBoundaryContinuation(sessionId: string) { - calls.push(`plan:${sessionId}`); - return { continuation }; - }, - resumeSafeBoundaryContinuation(input: typeof continuation) { - calls.push(`resume:${input.sessionId}`); - return (async function* () {})(); - }, - } as unknown as Pick< - SessionManager, - | 'listSessions' - | 'readExecutionBoundary' - | 'planLatestAuthoritativeSafeBoundaryContinuation' - | 'resumeSafeBoundaryContinuation' - >; - const streamEvents = (async (sessionId: string) => { - calls.push(`stream:${sessionId}`); - return {}; - }) as unknown as StreamEvents; - - await resumeSafeBoundaryContinuationsOnStartup(runtime, streamEvents); - await new Promise((resolve) => setImmediate(resolve)); - - assert.deepEqual(calls, [ - 'boundary:managed-session', - 'plan:managed-session', - 'resume:managed-session', - 'stream:managed-session', - ]); -}); diff --git a/apps/desktop/src/main/__tests__/subscription-ipc-main.test.ts b/apps/desktop/src/main/__tests__/subscription-ipc-main.test.ts deleted file mode 100644 index f28aa7bd9b..0000000000 --- a/apps/desktop/src/main/__tests__/subscription-ipc-main.test.ts +++ /dev/null @@ -1,98 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { registerSubscriptionIpc } from '../subscription-ipc-main.js'; - -type Handler = (event: unknown, ...args: unknown[]) => Promise; - -function registerClaudeHandlers(serviceCalls: string[]): Map { - const handlers = new Map(); - const record = (method: string, result: unknown) => async () => { - serviceCalls.push(method); - return result; - }; - const deps = { - ipcMain: { - handle(channel: string, handler: Handler) { - handlers.set(channel, handler); - }, - }, - claudeSubscription: { - getAuthorizationUrl: record('getAuthorizationUrl', { - authRequestId: 'request-id', - stateHint: 'state', - }), - openAuthorizationUrl: record('openAuthorizationUrl', { ok: true }), - completeAuthorization: record('completeAuthorization', { ok: true }), - refreshQuota: record('refreshQuota', { ok: true }), - refreshTokens: record('refreshTokens', { ok: true }), - }, - syncClaudeSubscriptionConnection: async () => null, - emitConnectionListChanged: () => {}, - } as unknown as Parameters[0]; - - registerSubscriptionIpc(deps); - return handlers; -} - -describe('Claude subscription experimental IPC gate', () => { - test('fails closed before every sensitive service action when disabled', async () => { - const previousExperimental = process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL; - process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL = '0'; - const serviceCalls: string[] = []; - try { - const handlers = registerClaudeHandlers(serviceCalls); - const cases: ReadonlyArray<{ channel: string; args: unknown[] }> = [ - { channel: 'claude-subscription:get-auth-url', args: [] }, - { channel: 'claude-subscription:open-auth-url', args: ['request-id'] }, - { - channel: 'claude-subscription:complete-authorization', - args: ['request-id', 'authorization-code'], - }, - { channel: 'claude-subscription:refresh-quota', args: [] }, - { channel: 'claude-subscription:refresh-tokens', args: [] }, - ]; - - for (const { channel, args } of cases) { - const handler = handlers.get(channel); - assert.ok(handler, `${channel} should be registered`); - const result = await handler({}, ...args); - assert.equal((result as { ok?: unknown }).ok, false, `${channel} should fail`); - assert.equal( - (result as { reason?: unknown }).reason, - 'experimental_disabled', - `${channel} should expose the disabled reason`, - ); - } - assert.deepEqual(serviceCalls, []); - } finally { - if (previousExperimental === undefined) { - delete process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL; - } else { - process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL = previousExperimental; - } - } - }); - - test('delegates a representative auth action when the opt-out flag is unset', async () => { - const previousExperimental = process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL; - delete process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL; - const serviceCalls: string[] = []; - try { - const handlers = registerClaudeHandlers(serviceCalls); - const getAuthUrl = handlers.get('claude-subscription:get-auth-url'); - assert.ok(getAuthUrl); - - assert.deepEqual(await getAuthUrl({}), { - authRequestId: 'request-id', - stateHint: 'state', - }); - assert.deepEqual(serviceCalls, ['getAuthorizationUrl']); - } finally { - if (previousExperimental === undefined) { - delete process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL; - } else { - process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL = previousExperimental; - } - } - }); -}); diff --git a/apps/desktop/src/main/__tests__/subscription-model-fetch.test.ts b/apps/desktop/src/main/__tests__/subscription-model-fetch.test.ts deleted file mode 100644 index ef7d5e5cf7..0000000000 --- a/apps/desktop/src/main/__tests__/subscription-model-fetch.test.ts +++ /dev/null @@ -1,71 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { FETCH_PROXY_SNAPSHOT, proxiedFetch, setActiveProxy } from '@maka/runtime'; -import { PROXY_DEFAULTS } from '@maka/core/settings/network-settings'; -import { createSubscriptionModelFetch } from '../subscription-model-fetch.js'; - -describe('desktop model fetch', () => { - test('provider requests use the active Maka proxy transport', () => { - const buildModelFetch = createSubscriptionModelFetch({ - claudeSubscription: {} as never, - openAiCodex: {} as never, - xaiOAuth: {} as never, - }); - - const modelFetch = buildModelFetch( - { - slug: 'openai-test', - name: 'OpenAI test', - providerType: 'openai', - baseUrl: 'https://api.openai.com/v1', - defaultModel: 'gpt-test', - enabled: true, - createdAt: 1, - updatedAt: 1, - }, - 'session-test', - 'gpt-test', - ); - - assert.equal(modelFetch, proxiedFetch); - setActiveProxy({ - ...PROXY_DEFAULTS, - enabled: true, - host: '127.0.0.1', - port: 7890, - }); - try { - const snapshot = ( - modelFetch as typeof fetch & { - [FETCH_PROXY_SNAPSHOT]?: { host?: string; port?: number }; - } - )[FETCH_PROXY_SNAPSHOT]; - assert.equal(snapshot?.host, '127.0.0.1'); - assert.equal(snapshot?.port, 7890); - - const subscriptionFetch = buildModelFetch( - { - slug: 'codex-test', - name: 'Codex test', - providerType: 'openai-codex', - baseUrl: 'https://chatgpt.com/backend-api/codex', - defaultModel: 'gpt-test', - enabled: true, - createdAt: 1, - updatedAt: 1, - }, - 'session-test', - 'gpt-test', - ); - const subscriptionSnapshot = ( - subscriptionFetch as typeof fetch & { - [FETCH_PROXY_SNAPSHOT]?: { host?: string; port?: number }; - } - )[FETCH_PROXY_SNAPSHOT]; - assert.equal(subscriptionSnapshot?.host, '127.0.0.1'); - assert.equal(subscriptionSnapshot?.port, 7890); - } finally { - setActiveProxy(null); - } - }); -}); diff --git a/apps/desktop/src/main/__tests__/subscription-shared-credential-store.test.ts b/apps/desktop/src/main/__tests__/subscription-shared-credential-store.test.ts deleted file mode 100644 index b0b655716d..0000000000 --- a/apps/desktop/src/main/__tests__/subscription-shared-credential-store.test.ts +++ /dev/null @@ -1,551 +0,0 @@ -/** - * Contract for the shared CredentialStore (workspace credentials.json) - * as the single OAuth token authority for desktop subscription services - * (#1125). Service behavior is exercised through public APIs; the - * remaining source checks cover architecture and startup ordering. - */ - -import { strict as assert } from 'node:assert'; -import { mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { after, describe, it } from 'node:test'; -import type { SubscriptionActionResult } from '@maka/core'; -import { AntigravitySubscriptionService } from '../oauth/antigravity-subscription-service.js'; -import { ClaudeSubscriptionService } from '../oauth/claude-subscription-service.js'; -import { OpenAiCodexService } from '../oauth/openai-codex-service.js'; -import type { SharedOAuthCredentialStore } from '../oauth/shared-credential-bridge.js'; -import { XaiOAuthService } from '../oauth/xai-oauth-service.js'; - -interface OAuthServiceContract { - getAccountState(): Promise; - getAccessTokenInternal(): Promise; - refreshTokens(): Promise; - logout(): Promise; -} - -interface ServiceCase { - name: string; - slug: string; - legacyFile?: string; - initialTokens: Record; - refresh: { - accessToken: string; - response: Record; - }; - create(input: { - userDataDir: string; - credentialStore: SharedOAuthCredentialStore; - fetchFn: typeof fetch; - }): OAuthServiceContract; -} - -const NOW = 1_700_000_000_000; -const codexAccessToken = jwt({ - sub: 'codex-subject', - 'https://api.openai.com/auth': { chatgpt_account_id: 'codex-account' }, -}); -const refreshedCodexAccessToken = jwt({ - sub: 'refreshed-codex-subject', - 'https://api.openai.com/auth': { chatgpt_account_id: 'codex-account' }, -}); - -const STORE_AUTHORITY_SERVICES: ServiceCase[] = [ - { - name: 'Claude', - slug: 'claude-subscription', - legacyFile: '.claude_subscription_token', - initialTokens: { - access_token: 'claude-access', - refresh_token: 'claude-refresh', - expires_at: NOW + 3_600_000, - token_type: 'Bearer', - scope: 'user:sessions:claude_code', - account_uuid: 'claude-account', - }, - refresh: { - accessToken: 'claude-access-refreshed', - response: { - access_token: 'claude-access-refreshed', - refresh_token: 'claude-refresh-refreshed', - expires_in: 3600, - token_type: 'Bearer', - scope: 'user:sessions:claude_code', - account: { uuid: 'claude-account' }, - }, - }, - create: (input) => - new ClaudeSubscriptionService({ - ...input, - now: () => NOW, - openExternal: async () => undefined, - }), - }, - { - name: 'Codex', - slug: 'codex-subscription', - legacyFile: '.codex_subscription_token', - initialTokens: { - access_token: codexAccessToken, - refresh_token: 'codex-refresh', - expires_at: NOW + 3_600_000, - account_id: 'codex-account', - }, - refresh: { - accessToken: refreshedCodexAccessToken, - response: { - access_token: refreshedCodexAccessToken, - refresh_token: 'codex-refresh-refreshed', - expires_in: 3600, - }, - }, - create: (input) => - new OpenAiCodexService({ - ...input, - now: () => NOW, - openExternal: async () => undefined, - }), - }, - { - name: 'Antigravity', - slug: 'antigravity-subscription', - legacyFile: '.antigravity_subscription_token', - initialTokens: { - access_token: 'antigravity-access', - refresh_token: 'antigravity-refresh', - expires_at: NOW + 3_600_000, - }, - refresh: { - accessToken: 'antigravity-access-refreshed', - response: { - access_token: 'antigravity-access-refreshed', - expires_in: 3600, - }, - }, - create: (input) => - new AntigravitySubscriptionService({ - ...input, - now: () => NOW, - openExternal: async () => undefined, - }), - }, - { - name: 'xAI', - slug: 'xai-oauth', - initialTokens: { - access_token: 'xai-access', - refresh_token: 'xai-refresh', - expires_at: NOW + 3_600_000, - token_type: 'Bearer', - }, - refresh: { - accessToken: 'xai-access-refreshed', - response: { - access_token: 'xai-access-refreshed', - refresh_token: 'xai-refresh-refreshed', - expires_in: 3600, - token_type: 'Bearer', - }, - }, - create: ({ credentialStore, fetchFn }) => - new XaiOAuthService({ - credentialStore, - fetchFn, - now: () => NOW, - openExternal: async () => undefined, - }), - }, -]; - -const tempRoots: string[] = []; - -after(async () => { - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))); -}); - -describe('OAuth subscription token authority (shared CredentialStore)', () => { - for (const serviceCase of STORE_AUTHORITY_SERVICES) { - it(`${serviceCase.name} reads account state and logs out through its shared credential`, async () => { - const userDataDir = await makeUserDataDir(); - const credentials = createMemoryCredentialStore(); - credentials.set(serviceCase.slug, 'oauth_token', JSON.stringify(serviceCase.initialTokens)); - credentials.set(serviceCase.slug, 'api_key', 'api-key-must-survive'); - const legacyFile = serviceCase.legacyFile - ? join(userDataDir, serviceCase.legacyFile) - : undefined; - if (legacyFile) await writeFile(legacyFile, 'legacy-encrypted-token'); - const service = serviceCase.create({ - userDataDir, - credentialStore: credentials.store, - fetchFn: async () => assert.fail('account-state and logout must not use the network'), - }); - - const state = await service.getAccountState(); - assert.equal('runtimeState' in state && state.runtimeState, 'authenticated'); - const serializedState = JSON.stringify(state); - assert.doesNotMatch(serializedState, /access_token|refresh_token|id_token/); - assert.equal(serializedState.includes(String(serviceCase.initialTokens.access_token)), false); - - assert.deepEqual(await service.logout(), { ok: true }); - assert.equal(credentials.get(serviceCase.slug, 'oauth_token'), null); - assert.equal(credentials.get(serviceCase.slug, 'api_key'), 'api-key-must-survive'); - if (legacyFile) await assert.rejects(stat(legacyFile), { code: 'ENOENT' }); - }); - - const refresh = serviceCase.refresh; - - for (const entryPoint of ['explicit', 'automatic'] as const) { - it(`${serviceCase.name} refreshes an expired credential through ${entryPoint} refresh`, async () => { - const userDataDir = await makeUserDataDir(); - const credentials = createMemoryCredentialStore(); - credentials.set( - serviceCase.slug, - 'oauth_token', - JSON.stringify({ ...serviceCase.initialTokens, expires_at: NOW - 1 }), - ); - let fetchCalls = 0; - const service = serviceCase.create({ - userDataDir, - credentialStore: credentials.store, - fetchFn: async () => { - fetchCalls += 1; - return Response.json(refresh.response); - }, - }); - - const result = entryPoint === 'explicit' - ? await service.refreshTokens() - : await service.getAccessTokenInternal(); - - if (entryPoint === 'explicit') assert.deepEqual(result, { ok: true }); - else assert.equal(result, refresh.accessToken); - assert.equal(fetchCalls, 1); - const persisted = JSON.parse( - credentials.get(serviceCase.slug, 'oauth_token') ?? 'null', - ) as { access_token?: string }; - assert.equal(persisted.access_token, refresh.accessToken); - assert.equal(await service.getAccessTokenInternal(), refresh.accessToken); - assert.equal(fetchCalls, 1, 'a fresh shared token must not trigger a second refresh'); - }); - } - - for (const entryPoint of ['explicit', 'automatic'] as const) { - it(`${serviceCase.name} keeps a credential replaced during ${entryPoint} refresh`, async () => { - const userDataDir = await makeUserDataDir(); - const credentials = createMemoryCredentialStore(); - credentials.set( - serviceCase.slug, - 'oauth_token', - JSON.stringify({ ...serviceCase.initialTokens, expires_at: NOW - 1 }), - ); - const winner = { - ...serviceCase.initialTokens, - access_token: `${serviceCase.name.toLowerCase()}-winner-access`, - expires_at: NOW + 3_600_000, - }; - credentials.replaceAfterNextRead( - serviceCase.slug, - 'oauth_token', - JSON.stringify(winner), - ); - let fetchCalls = 0; - const service = serviceCase.create({ - userDataDir, - credentialStore: credentials.store, - fetchFn: async () => { - fetchCalls += 1; - return Response.json(refresh.response); - }, - }); - - const result = entryPoint === 'explicit' - ? await service.refreshTokens() - : await service.getAccessTokenInternal(); - - if (entryPoint === 'explicit') { - assert.deepEqual(result, { ok: true }); - } else { - assert.equal(result, winner.access_token); - } - assert.equal( - fetchCalls, - 0, - 'a credential superseded before lease acquisition must not present its stale rotating refresh token', - ); - assert.deepEqual( - JSON.parse(credentials.get(serviceCase.slug, 'oauth_token') ?? 'null'), - winner, - ); - }); - } - } - - for (const serviceCase of STORE_AUTHORITY_SERVICES.slice(0, 2)) { - it(`${serviceCase.name} reports shared credential read failures as storage_failed`, async () => { - const userDataDir = await makeUserDataDir(); - const service = serviceCase.create({ - userDataDir, - credentialStore: { - getSecret: async () => { - throw new Error('credential store unavailable'); - }, - setSecret: async () => undefined, - deleteSecret: async () => undefined, - }, - fetchFn: async () => assert.fail('a failed credential read must not use the network'), - }); - - const state = await service.getAccountState(); - assert.equal('runtimeState' in state && state.runtimeState, 'storage_failed'); - assert.match('errorMessage' in state ? String(state.errorMessage) : '', /凭据|credentials\.json/); - }); - - it(`${serviceCase.name} reports a corrupt shared credential as storage_failed without deleting it`, async () => { - const userDataDir = await makeUserDataDir(); - const credentials = createMemoryCredentialStore(); - credentials.set(serviceCase.slug, 'oauth_token', 'not-json'); - const service = serviceCase.create({ - userDataDir, - credentialStore: credentials.store, - fetchFn: async () => assert.fail('a corrupt credential read must not use the network'), - }); - - const state = await service.getAccountState(); - assert.equal('runtimeState' in state && state.runtimeState, 'storage_failed'); - assert.equal(credentials.get(serviceCase.slug, 'oauth_token'), 'not-json'); - }); - } - - it('Claude does not report login success when the shared credential write fails', async () => { - const service = new ClaudeSubscriptionService({ - userDataDir: await makeUserDataDir(), - openExternal: async () => undefined, - now: () => NOW, - fetchFn: async () => - Response.json({ - access_token: 'claude-access', - refresh_token: 'claude-refresh', - expires_in: 3600, - token_type: 'Bearer', - scope: 'user:sessions:claude_code', - account: { uuid: 'claude-account' }, - }), - credentialStore: { - getSecret: async () => null, - setSecret: async () => { - throw new Error('credential store unavailable'); - }, - deleteSecret: async () => undefined, - }, - }); - - const verifier = 'a'.repeat(43); - const result = await service.completeAuthorization('recovered-from-paste', `code#${verifier}`); - - assert.equal(result.ok, false); - assert.equal(result.ok ? undefined : result.reason, 'storage_failed'); - }); - - it('Claude login writes the exchanged token to its shared credential', async () => { - const credentials = createMemoryCredentialStore(); - const userDataDir = await makeUserDataDir(); - const service = new ClaudeSubscriptionService({ - userDataDir, - openExternal: async () => undefined, - now: () => NOW, - fetchFn: async (input) => { - if (String(input).includes('/v1/oauth/token')) { - return Response.json({ - access_token: 'claude-login-access', - refresh_token: 'claude-login-refresh', - expires_in: 3600, - token_type: 'Bearer', - scope: 'user:sessions:claude_code', - account: { uuid: 'claude-login-account' }, - }); - } - return Response.json({ account: { uuid: 'claude-login-account' } }); - }, - credentialStore: credentials.store, - }); - - const verifier = 'b'.repeat(43); - assert.deepEqual( - await service.completeAuthorization('recovered-from-paste', `code#${verifier}`), - { ok: true }, - ); - const stored = JSON.parse( - credentials.get('claude-subscription', 'oauth_token') ?? 'null', - ) as { access_token?: string }; - assert.equal(stored.access_token, 'claude-login-access'); - assert.equal(credentials.get('codex-subscription', 'oauth_token'), null); - await assert.rejects(stat(join(userDataDir, '.claude_subscription_token')), { code: 'ENOENT' }); - }); - - it('Codex login writes the device-auth exchange result to its shared credential', async () => { - const credentials = createMemoryCredentialStore(); - const userDataDir = await makeUserDataDir(); - let openedUrl: string | undefined; - const service = new OpenAiCodexService({ - userDataDir, - openExternal: async (url) => { - openedUrl = url; - }, - now: () => NOW, - sleep: async () => {}, - fetchFn: async (input) => { - const url = String(input); - if (url.endsWith('/deviceauth/usercode')) { - return Response.json({ - device_auth_id: 'deviceauth-codex-login', - user_code: 'CODE-1234', - interval: '5', - expires_at: new Date(NOW + 600_000).toISOString(), - }); - } - if (url.endsWith('/deviceauth/token')) { - return Response.json({ - authorization_code: 'codex-login-code', - code_challenge: 'challenge', - code_verifier: 'codex-login-verifier', - }); - } - if (url.endsWith('/oauth/token')) { - return Response.json({ - access_token: jwt({ - sub: 'codex-login-subject', - 'https://api.openai.com/auth': { chatgpt_account_id: 'codex-login-account' }, - }), - refresh_token: 'codex-login-refresh', - expires_in: 3600, - }); - } - throw new Error(`Unexpected fetch URL: ${url}`); - }, - credentialStore: credentials.store, - }); - - const authorization = await service.getAuthorizationUrl(); - assert.ok('authRequestId' in authorization); - const authRequestId = authorization.authRequestId; - try { - assert.deepEqual(await service.openAuthorizationUrl(authRequestId), { ok: true }); - // The verification page is the fixed server-owned device URL; no - // local loopback callback is involved. - assert.equal(openedUrl, 'https://auth.openai.com/codex/device'); - - assert.deepEqual(await service.completeAuthorization(authRequestId), { ok: true }); - const stored = JSON.parse( - credentials.get('codex-subscription', 'oauth_token') ?? 'null', - ) as { account_id?: string }; - assert.equal(stored.account_id, 'codex-login-account'); - assert.equal(credentials.get('claude-subscription', 'oauth_token'), null); - await assert.rejects(stat(join(userDataDir, '.codex_subscription_token')), { code: 'ENOENT' }); - } finally { - service.cancelAuthorization(authRequestId); - } - }); - - it('Codex login does not revive an authorization cancelled while the browser opens', async () => { - let finishOpening!: () => void; - const opening = new Promise((resolve) => { - finishOpening = resolve; - }); - const service = new OpenAiCodexService({ - userDataDir: await makeUserDataDir(), - openExternal: async () => opening, - credentialStore: createMemoryCredentialStore().store, - fetchFn: async (url) => { - if (String(url).endsWith('/deviceauth/usercode')) { - return Response.json({ - device_auth_id: 'deviceauth-cancel-open', - user_code: 'CODE-CANCEL', - interval: '5', - expires_at: new Date(NOW + 600_000).toISOString(), - }); - } - assert.fail(`unexpected fetch ${String(url)}`); - }, - }); - const authorization = await service.getAuthorizationUrl(); - assert.ok('authRequestId' in authorization); - - const opened = service.openAuthorizationUrl(authorization.authRequestId); - service.cancelAuthorization(authorization.authRequestId); - finishOpening(); - - assert.deepEqual(await opened, { - ok: false, - reason: 'authorization_cancelled', - message: 'Codex 授权已取消。', - }); - assert.deepEqual(await service.getAccountState(), { - provider: 'openai-codex', - runtimeState: 'not_logged_in', - }); - }); - -}); - -function jwt(payload: Record): string { - return `header.${Buffer.from(JSON.stringify(payload), 'utf8').toString('base64url')}.signature`; -} - -async function makeUserDataDir(): Promise { - const root = await mkdtemp(join(tmpdir(), 'maka-oauth-service-contract-')); - tempRoots.push(root); - return root; -} - -function createMemoryCredentialStore(): { - store: SharedOAuthCredentialStore; - get(slug: string, kind: 'api_key' | 'oauth_token'): string | null; - set(slug: string, kind: 'api_key' | 'oauth_token', value: string): void; - replaceAfterNextRead( - slug: string, - kind: 'api_key' | 'oauth_token', - value: string, - ): void; -} { - const secrets = new Map(); - const key = (slug: string, kind: string): string => `${slug}\0${kind}`; - let replacementAfterNextRead: { key: string; value: string } | undefined; - return { - store: { - getSecret: async (slug, kind) => { - const storedKey = key(slug, kind); - const current = secrets.get(storedKey) ?? null; - if (replacementAfterNextRead?.key === storedKey) { - secrets.set(storedKey, replacementAfterNextRead.value); - replacementAfterNextRead = undefined; - } - return current; - }, - setSecret: async (slug, kind, value) => { - secrets.set(key(slug, kind), value); - }, - deleteSecret: async (slug, kind) => { - if (kind !== undefined) { - secrets.delete(key(slug, kind)); - return; - } - for (const storedKey of secrets.keys()) { - if (storedKey.startsWith(`${slug}\0`)) secrets.delete(storedKey); - } - }, - compareAndSetSecret: async (slug, kind, expected, value) => { - const current = secrets.get(key(slug, kind)) ?? null; - if (current !== expected) return { committed: false, current }; - secrets.set(key(slug, kind), value); - return { committed: true }; - }, - }, - get: (slug, kind) => secrets.get(key(slug, kind)) ?? null, - set: (slug, kind, value) => { - secrets.set(key(slug, kind), value); - }, - replaceAfterNextRead: (slug, kind, value) => { - replacementAfterNextRead = { key: key(slug, kind), value }; - }, - }; -} diff --git a/apps/desktop/src/main/__tests__/system-prompt-order.test.ts b/apps/desktop/src/main/__tests__/system-prompt-order.test.ts deleted file mode 100644 index e7803be7bf..0000000000 --- a/apps/desktop/src/main/__tests__/system-prompt-order.test.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { describe, it } from 'node:test'; -import assert from 'node:assert/strict'; -import { mkdtemp, rm, writeFile, mkdir } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { createSystemPromptMainService } from '../system-prompt-main.js'; - -// Entry-level prompt-order contract tests (#2352 review). Several fragments are -// position-semantic: a Side Chat isolation boundary is a trailing assertion -// that constrains everything before it, so it must remain last. The identity -// fragment must lead. These tests pin that order so a future "unify the order" -// refactor cannot silently weaken the boundary. -async function withWorkspace(fn: (workspaceRoot: string) => Promise): Promise { - const dir = await mkdtemp(join(tmpdir(), 'maka-prompt-order-')); - try { - await fn(dir); - } finally { - await rm(dir, { recursive: true, force: true }); - } -} - -describe('desktop system prompt order', () => { - it('leads with the product identity', async () => { - await withWorkspace(async (workspaceRoot) => { - const service = createSystemPromptMainService({ - settingsStore: { - get: async () => ({ personalization: {}, workspaceInstructions: { enabled: false } }) as never, - }, - workspaceRoot, - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => [] }, - }); - const out = await service.buildBackendSystemPrompt({ labels: [] }, workspaceRoot, { - memoryFragment: null, - }); - assert.ok(out); - assert.match(out, /^You are Maka,/); - }); - }); - - it('keeps the Side Chat isolation boundary last, after skills and AGENTS.md', async () => { - await withWorkspace(async (workspaceRoot) => { - // Seed an AGENTS.md so the workspace-instructions fragment is present and - // the test proves the boundary lands after it (not before). - await mkdir(join(workspaceRoot, '.maka'), { recursive: true }); - await writeFile(join(workspaceRoot, 'AGENTS.md'), '- secret project rule'); - const service = createSystemPromptMainService({ - settingsStore: { - get: async () => - ({ personalization: {}, workspaceInstructions: { enabled: true } }) as never, - }, - workspaceRoot, - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => [] }, - }); - const out = await service.buildBackendSystemPrompt( - { labels: ['mode:side_conversation'] }, - workspaceRoot, - { memoryFragment: null }, - ); - assert.ok(out); - assert.match(out, /Side conversation boundary:/); - assert.match(out, / instructionsIndex, 'Side Chat boundary must follow AGENTS.md'); - // And the boundary must be the LAST non-empty fragment. - const tail = out.slice(boundaryIndex).trim(); - assert.ok(tail.startsWith('Side conversation boundary:')); - assert.ok(!/ { - await withWorkspace(async (workspaceRoot) => { - const service = createSystemPromptMainService({ - settingsStore: { - get: async () => ({ personalization: {}, workspaceInstructions: { enabled: false } }) as never, - }, - workspaceRoot, - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => [] }, - }); - const out = await service.buildBackendSystemPrompt({ labels: [] }, workspaceRoot, { - memoryFragment: null, - childInstruction: 'You are a foreground local-read child agent.', - }); - assert.ok(out); - assert.doesNotMatch(out, /^You are Maka,/); - }); - }); -}); diff --git a/apps/desktop/src/main/__tests__/task-ledger-contract.test.ts b/apps/desktop/src/main/__tests__/task-ledger-contract.test.ts deleted file mode 100644 index 7853aa6bef..0000000000 --- a/apps/desktop/src/main/__tests__/task-ledger-contract.test.ts +++ /dev/null @@ -1,216 +0,0 @@ -/** - * Contract for the session task-ledger primitive (model-facing slice, PR1). - * - * Locks the seams that a refactor could silently break: - * (a) main.ts wires task_create/task_update/task_list/task_get into builtinTools and constructs - * the per-session store, and threads sessionId into the turn tail. - * (b) the turn-tail injector exists and injects nothing for an empty ledger - * (zero cost when the model isn't tracking tasks) but renders when there - * are tasks. - * (c) subjects are scrubbed (redactSecrets) and cannot escape the - * data envelope via embedded wrapper-tag literals. - * (d) both tools skip the permission engine (pure local session state). - */ - -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; -import { mkdtemp } from 'node:fs/promises'; -import { join } from 'node:path'; -import { tmpdir } from 'node:os'; -import type { AppSettings, Task } from '@maka/core'; -import { - TASK_CREATE_TOOL_NAME, - TASK_GET_TOOL_NAME, - TASK_LIST_TOOL_NAME, - TASK_UPDATE_TOOL_NAME, - buildTaskLedgerTools, - type MakaToolContext, -} from '@maka/runtime'; -import { createMainTaskLedgerWiring } from '../task-ledger-wiring.js'; -import { createSystemPromptMainService } from '../system-prompt-main.js'; - -function makeService(tasks: Task[]) { - return createSystemPromptMainService({ - settingsStore: { get: async () => ({}) as AppSettings }, - workspaceRoot: '/tmp/does-not-matter', - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: { list: async () => tasks }, - }); -} - -const sampleTask: Task = { - id: 'task-1', - key: 'T1', - subject: '写单元测试', - status: 'in_progress', - createdAt: 1, - updatedAt: 2, -}; - -function fakeContext(sessionId: string): MakaToolContext { - return { - sessionId, - turnId: 'turn-1', - cwd: '/tmp', - toolCallId: 'call-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; -} - -describe('task ledger contract', () => { - it('wires the store and tools to one shared task ledger the turn tail reads (behavior, not source text)', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-task-ledger-wiring-')); - const wiring = createMainTaskLedgerWiring(root); - // (a) snake_case task tools are wired in. - assert.deepEqual(wiring.tools.map((t) => t.name), [TASK_CREATE_TOOL_NAME, TASK_UPDATE_TOOL_NAME, TASK_LIST_TOOL_NAME, TASK_GET_TOOL_NAME]); - // (b) store is real and empty for a fresh workspace. - assert.deepEqual(await wiring.store.list('sess-1'), []); - // (c) tools and the turn tail share ONE store through the real system prompt - // service: a TaskCreate lands in the store the tail reads, proving the - // mutate and read faces cannot drift to different ledgers. - const service = createSystemPromptMainService({ - settingsStore: { get: async () => ({}) as AppSettings }, - workspaceRoot: root, - localMemory: { - getState: async () => ({ status: 'ok', agentReadEnabled: false, content: '' }) as never, - consumePendingPromptUpdates: () => [], - }, - taskLedger: wiring.store, - }); - const create = wiring.tools.find((t) => t.name === TASK_CREATE_TOOL_NAME); - assert.ok(create, 'task_create tool must be present'); - await create.impl({ tasks: [{ subject: '通过装配建任务' }] }, fakeContext('sess-1')); - const tail = await service.buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail, 'tail must render when the shared store has tasks'); - assert.match(tail, /通过装配建任务/); - }); - - it('injects nothing for an empty ledger', async () => { - const tail = await makeService([]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.equal(tail, undefined); - }); - - it('injects nothing when no sessionId is available', async () => { - const tail = await makeService([sampleTask]).buildTurnTailPrompt(undefined, undefined); - assert.equal(tail, undefined); - }); - - it('renders the ledger as a current-turn tail fragment when tasks exist', async () => { - const tail = await makeService([sampleTask]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail); - assert.match(tail, //); - assert.match(tail, /写单元测试/); - assert.match(tail, /仅供当前回复参考/); - assert.match(tail, /task_create\/task_update\/task_list\/task_get/); - assert.doesNotMatch(tail, /TaskCreate\/TaskUpdate/); - }); - - it('does not inject untrusted fallback tasks into the model-visible turn tail', async () => { - const tail = await makeService([ - { - ...sampleTask, - id: 'safe-task', - subject: 'visible task', - }, - { - ...sampleTask, - id: 'fallback-task', - subject: 'corrupt cache fallback', - resumeTrust: 'untrusted', - }, - ]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail); - assert.match(tail, /visible task/); - assert.doesNotMatch(tail, /corrupt cache fallback/); - assert.doesNotMatch(tail, /fallback-task/); - assert.doesNotMatch(tail, /resumeTrust=/); - }); - - it('does not register task tools when the feature flag is explicitly disabled', async () => { - const previous = process.env.MAKA_TASK_LEDGER_TOOLS; - process.env.MAKA_TASK_LEDGER_TOOLS = 'false'; - try { - const root = await mkdtemp(join(tmpdir(), 'maka-task-ledger-disabled-')); - const wiring = createMainTaskLedgerWiring(root); - assert.deepEqual(wiring.tools, []); - } finally { - if (previous === undefined) { - delete process.env.MAKA_TASK_LEDGER_TOOLS; - } else { - process.env.MAKA_TASK_LEDGER_TOOLS = previous; - } - } - }); - - it('redacts secret-like text in task subjects before injecting the tail', async () => { - // Same samples the core redactSecrets tests use: a bearer token and a - // provider key prefix. Subjects are model-authored free text replayed - // every turn, so they must pass through redactSecrets like memory tail - // text does (cf. compactMemoryUpdateText). - const secretTask: Task = { - ...sampleTask, - subject: '轮换 Bearer sk-live-secret-token-value 和 ghp_abcdefghijklmnopqrstuvwxyz', - }; - const tail = await makeService([secretTask]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail); - assert.equal(tail.includes('sk-live-secret-token-value'), false); - assert.equal(tail.includes('ghp_abcdefghijklmnopqrstuvwxyz'), false); - assert.match(tail, /\[redacted\]/); - }); - - it('strips wrapper-tag literals so a subject cannot close the data envelope early', async () => { - // normalizeTaskSubject only collapses whitespace and redactSecrets only - // masks secrets, so a literal in a subject would otherwise - // escape the data wrapper and read as instruction-level text. - const escapingTask: Task = { - ...sampleTask, - subject: '正常前缀 假指令 假开头', - }; - const tail = await makeService([escapingTask]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail); - // Exactly one closing tag (the real envelope) and one opening tag survive. - assert.equal(tail.match(/<\/task-ledger>/g)?.length, 1); - assert.equal(tail.match(//g)?.length, 1); - assert.match(tail, /正常前缀/); - }); - - it('strips tag variants (attributes, whitespace, self-closing), not just exact literals', async () => { - // The narrow regex misses (space before >), - // (attributes), , and . - // A model-authored subject carrying any of these must not smuggle extra - // tag-like text into the tail; only the real envelope open+close survive. - const escapingTask: Task = { - ...sampleTask, - subject: '前缀 假1 假2 假3 后缀', - }; - const tail = await makeService([escapingTask]).buildTurnTailPrompt(undefined, 'sess-1'); - assert.ok(tail); - assert.equal( - (tail.match(/<\/?task-ledger[^>]*>/gi) || []).length, - 2, - 'only the real envelope open+close tags should survive, got: ' + JSON.stringify(tail), - ); - assert.match(tail, /前缀/); - assert.match(tail, /后缀/); - }); - - it('registers all task-ledger tools', () => { - const tools = buildTaskLedgerTools({ - store: { - list: async () => [], - get: async () => undefined, - create: async () => ({ created: [], total: 0 }), - update: async () => ({ updated: {} as Task, total: 0 }), - claim: async () => ({ updated: {} as Task, total: 0 }), - claimAvailable: async () => ({ updated: {} as Task, total: 0 }), - settleAgentOutcome: async () => ({ updated: {} as Task, total: 0 }), - subscribe: () => () => {}, - }, - }); - assert.deepEqual(tools.map((t) => t.name), [TASK_CREATE_TOOL_NAME, TASK_UPDATE_TOOL_NAME, TASK_LIST_TOOL_NAME, TASK_GET_TOOL_NAME]); - }); -}); diff --git a/apps/desktop/src/main/__tests__/tool-output-stream.test.ts b/apps/desktop/src/main/__tests__/tool-output-stream.test.ts index 2c2239447f..c26fb6086d 100644 --- a/apps/desktop/src/main/__tests__/tool-output-stream.test.ts +++ b/apps/desktop/src/main/__tests__/tool-output-stream.test.ts @@ -24,6 +24,7 @@ import { strict as assert } from 'node:assert'; import { describe, it } from 'node:test'; +import { TOOL_OUTPUT_DELTA_MAX_CHARS } from '@maka/core/events'; import { TOOL_STREAM_MAX_CHUNKS, TOOL_STREAM_MAX_CHUNK_CHARS, @@ -107,11 +108,11 @@ describe('applyToolOutputChunk — per-chunk cap', () => { ); }); - it('does not truncate at-or-under maxChunkChars', () => { - const justUnder = filler(TOOL_STREAM_MAX_CHUNK_CHARS - 10); - const result = applyToolOutputChunk(undefined, chunk(1, justUnder)); + it('accepts the largest valid Runtime delta without truncation', () => { + const runtimeChunk = filler(TOOL_OUTPUT_DELTA_MAX_CHARS); + const result = applyToolOutputChunk(undefined, chunk(1, runtimeChunk)); assert.equal(result.truncated, false); - assert.equal(result.chunks[0]!.text, justUnder); + assert.equal(result.chunks[0]!.text, runtimeChunk); }); }); diff --git a/apps/desktop/src/main/__tests__/tool-result-archive-artifacts.test.ts b/apps/desktop/src/main/__tests__/tool-result-archive-artifacts.test.ts deleted file mode 100644 index 0b8e89637a..0000000000 --- a/apps/desktop/src/main/__tests__/tool-result-archive-artifacts.test.ts +++ /dev/null @@ -1,95 +0,0 @@ -import assert from 'node:assert/strict'; -import { createHash } from 'node:crypto'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, test } from 'node:test'; -import { createSqliteArtifactStore, type ArtifactStore } from '@maka/storage'; -import type { ToolResultArchiveRecorderInput } from '@maka/runtime'; -import { - persistArchivedToolResultToArtifacts, - readArchivedToolResultResourceFromArtifacts, -} from '../tool-result-archive-artifacts.js'; - -describe('desktop tool-result archive artifacts', () => { - test('reuses the archive artifact for the same stale tool result body', async () => { - await withStore(async (store) => { - const event = archiveEvent(); - - const first = await persistArchivedToolResultToArtifacts(store, event); - const second = await persistArchivedToolResultToArtifacts(store, event); - - assert.equal(second.artifactId, first.artifactId); - assert.equal(first.created, true); - assert.equal(second.created, false); - const records = await store.list(event.sessionId); - assert.equal(records.length, 1); - assert.equal(records[0]?.id, first.artifactId); - assert.equal(records[0]?.source, 'tool_result_archive'); - }); - }); - - test('reads a resource only for the matching session, size, and checksum', async () => { - await withStore(async (store) => { - const event = archiveEvent(); - const archived = await persistArchivedToolResultToArtifacts(store, event); - const valid = await readArchivedToolResultResourceFromArtifacts(store, { - artifactId: archived.artifactId, - sessionId: event.sessionId, - bodySha256: event.bodySha256, - originalBytes: event.originalBytes, - maxBytes: event.originalBytes, - }); - const wrongSession = await readArchivedToolResultResourceFromArtifacts(store, { - artifactId: archived.artifactId, - sessionId: 'other-session', - bodySha256: event.bodySha256, - originalBytes: event.originalBytes, - maxBytes: event.originalBytes, - }); - const wrongHash = await readArchivedToolResultResourceFromArtifacts(store, { - artifactId: archived.artifactId, - sessionId: event.sessionId, - bodySha256: '0'.repeat(64), - originalBytes: event.originalBytes, - maxBytes: event.originalBytes, - }); - - assert.deepEqual(valid, { ok: true, serializedResult: event.serializedResult }); - assert.deepEqual(wrongSession, { ok: false, reason: 'session_mismatch' }); - assert.deepEqual(wrongHash, { ok: false, reason: 'corrupt' }); - }); - }); -}); - -function archiveEvent(): ToolResultArchiveRecorderInput { - const result = { body: 'large archived output'.repeat(20) }; - const serializedResult = JSON.stringify(result); - return { - sessionId: 'session-1', - runtimeEventId: 'runtime-result-1', - turnId: 'turn-1', - toolCallId: 'tool-call-1', - toolName: 'Read', - result, - serializedResult, - bodySha256: sha256(serializedResult), - originalEstimatedTokens: serializedResult.length, - originalBytes: Buffer.byteLength(serializedResult, 'utf8'), - rewriteVersion: 1, - reason: 'stale_tool_result_pruned_before_compact', - }; -} - -async function withStore(fn: (store: ArtifactStore) => Promise): Promise { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-tool-result-archive-')); - try { - await fn(createSqliteArtifactStore(workspaceRoot)); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -} - -function sha256(text: string): string { - return createHash('sha256').update(text).digest('hex'); -} diff --git a/apps/desktop/src/main/__tests__/usage-ipc-main.test.ts b/apps/desktop/src/main/__tests__/usage-ipc-main.test.ts deleted file mode 100644 index 510c9eddf3..0000000000 --- a/apps/desktop/src/main/__tests__/usage-ipc-main.test.ts +++ /dev/null @@ -1,188 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { test } from 'node:test'; -import type { PricingConfig } from '@maka/core/usage-stats/types'; -import { createSqliteModelCallLedger, createSqliteTelemetryRepo } from '@maka/storage'; -import { registerUsageIpc, type UsageIpcDeps } from '../usage-ipc-main.js'; - -type Handler = (...args: any[]) => any; - -function deferred() { - let resolve!: () => void; - const promise = new Promise((done) => { - resolve = done; - }); - return { promise, resolve }; -} - -test('usage IPC leaves settings usage session-derived while detailed usage waits for SQLite readiness', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-usage-ipc-ready-')); - const seeded = createSqliteTelemetryRepo(root); - const telemetryRepo = createSqliteTelemetryRepo(root, { createIfMissing: false }); - const modelCallLedger = createSqliteModelCallLedger(root); - const ready = deferred(); - const handlers = new Map(); - const calls: string[] = []; - - try { - await seeded.load(); - await seeded.insertLlmCall(llmRecord('usage_ipc_ready')); - await seeded.close(); - registerUsageIpc({ - ipcMain: { - handle(channel: string, handler: Handler) { - handlers.set(channel, handler as Handler); - }, - }, - settingsStore: { - usageStats: async () => { - calls.push('settings'); - return { source: 'sessions' }; - }, - }, - telemetryRepo, - modelCallLedger, - ensureUsageReady: async () => { - calls.push('ready:start'); - await ready.promise; - await telemetryRepo.load(); - calls.push('ready:end'); - }, - refreshPricingLookup: () => {}, - sendToRenderer: () => {}, - } as unknown as UsageIpcDeps); - - const settings = await handlers.get('settings:usageStats')?.({}); - assert.deepEqual(settings, { source: 'sessions' }); - assert.deepEqual(calls, ['settings']); - - const summaryPending = handlers.get('usage:summary')?.({}, { range: 'all' }); - await Promise.resolve(); - assert.deepEqual(calls, ['settings', 'ready:start']); - ready.resolve(); - const summary = await summaryPending; - assert.equal(summary.ok, true); - assert.equal(summary.data.totalRequests, 1); - assert.deepEqual(calls, ['settings', 'ready:start', 'ready:end']); - } finally { - await Promise.allSettled([seeded.close(), modelCallLedger.close(), telemetryRepo.close()]); - await rm(root, { recursive: true, force: true }); - } -}); - -test('pricing IPC mutations serialize through the canonical SQLite repo', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-usage-ipc-pricing-')); - const telemetryRepo = createSqliteTelemetryRepo(root); - const handlers = new Map(); - const firstWrite = deferred(); - const firstWriteStarted = deferred(); - const events: string[] = []; - const originalUpsert = telemetryRepo.upsertPricing.bind(telemetryRepo); - telemetryRepo.upsertPricing = async (value) => { - events.push(`upsert:${value.modelKey}`); - if (value.modelKey === 'openai:first') { - firstWriteStarted.resolve(); - await firstWrite.promise; - } - await originalUpsert(value); - }; - const originalDelete = telemetryRepo.deletePricing.bind(telemetryRepo); - telemetryRepo.deletePricing = async (modelKey) => { - events.push(`delete:${modelKey}`); - await originalDelete(modelKey); - }; - - try { - let readiness: Promise | undefined; - const ensureUsageReady = () => { - readiness ??= telemetryRepo.load(); - return readiness; - }; - registerUsageIpc({ - ipcMain: { - handle(channel: string, handler: Handler) { - handlers.set(channel, handler as Handler); - }, - }, - settingsStore: {}, - telemetryRepo, - ensureUsageReady, - refreshPricingLookup: () => { - events.push(`refresh:${telemetryRepo.listPricingOverrides().length}`); - }, - sendToRenderer: (channel: string) => { - events.push(`notify:${channel}`); - }, - } as unknown as UsageIpcDeps); - - const list = handlers.get('usage:pricing:list'); - const put = handlers.get('usage:pricing:put'); - const reset = handlers.get('usage:pricing:reset'); - assert.ok(list); - assert.ok(put); - assert.ok(reset); - assert.deepEqual(await list({}), { ok: true, data: [] }); - - const first = put({}, pricing('openai:first')); - const second = put({}, pricing('openai:second')); - const third = reset({}, 'openai:first'); - await firstWriteStarted.promise; - assert.deepEqual(events, ['upsert:openai:first']); - - firstWrite.resolve(); - assert.equal((await first).ok, true); - assert.equal((await second).ok, true); - assert.equal((await third).ok, true); - assert.deepEqual( - telemetryRepo.listPricingOverrides().map((item) => item.modelKey), - ['openai:second'], - ); - assert.deepEqual(events, [ - 'upsert:openai:first', - 'refresh:1', - 'notify:usage:pricing:changed', - 'upsert:openai:second', - 'refresh:2', - 'notify:usage:pricing:changed', - 'delete:openai:first', - 'refresh:1', - 'notify:usage:pricing:changed', - ]); - } finally { - await telemetryRepo.close().catch(() => undefined); - await rm(root, { recursive: true, force: true }); - } -}); - -function pricing(modelKey: string): PricingConfig { - return { - modelKey, - inputUsdPer1M: 1, - outputUsdPer1M: 2, - }; -} - -function llmRecord(id: string) { - const now = Date.now(); - return { - id, - providerId: 'openai', - modelId: 'gpt-5', - inputTokens: 10, - outputTokens: 20, - cacheHitInputTokens: 0, - cacheMissInputTokens: 10, - cachedInputTokens: 0, - cacheWriteInputTokens: 0, - reasoningTokens: 0, - totalTokens: 30, - costUsd: 0.001, - latencyMs: 5, - status: 'success' as const, - startedAt: now - 5, - date: new Date(now).toISOString().slice(0, 10), - ts: now, - }; -} diff --git a/apps/desktop/src/main/__tests__/web-fetch-agent-tool.test.ts b/apps/desktop/src/main/__tests__/web-fetch-agent-tool.test.ts deleted file mode 100644 index 7c3f8324b5..0000000000 --- a/apps/desktop/src/main/__tests__/web-fetch-agent-tool.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import type { WebFetchExecutor } from '@maka/runtime'; -import { buildWebFetchAgentTool } from '../web-fetch/agent-tool.js'; - -test('embedded Desktop WebFetch delegates to the shared local executor', async () => { - const requested: string[] = []; - const tool = buildWebFetchAgentTool({ - getPrivacyContext: async () => ({ incognitoActive: false }), - executor: executor(async ({ url }) => { - requested.push(url); - return 'page body'; - }), - }); - - const result = await tool.impl( - { url: 'https://example.com/a/../page' }, - context(), - ); - - assert.equal(result, 'page body'); - assert.deepEqual(requested, ['https://example.com/page']); -}); - -test('embedded Desktop WebFetch fails closed when privacy mode is active', async () => { - let called = false; - const tool = buildWebFetchAgentTool({ - getPrivacyContext: async () => ({ incognitoActive: true }), - executor: executor(async () => { - called = true; - return 'must not fetch'; - }), - }); - - await assert.rejects( - async () => tool.impl({ url: 'https://example.com/page' }, context()), - /disabled while privacy mode is active/i, - ); - assert.equal(called, false); -}); - -function executor(fetch: WebFetchExecutor['fetch']): WebFetchExecutor { - return { fetch }; -} - -function context() { - return { - sessionId: 'session-1', - turnId: 'turn-1', - cwd: '/tmp', - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; -} diff --git a/apps/desktop/src/main/__tests__/web-search-agent-tool.test.ts b/apps/desktop/src/main/__tests__/web-search-agent-tool.test.ts deleted file mode 100644 index 7c805adec9..0000000000 --- a/apps/desktop/src/main/__tests__/web-search-agent-tool.test.ts +++ /dev/null @@ -1,165 +0,0 @@ -/** - * PR-AGENT-WEB-SEARCH-TOOL-0 — fail-closed gates for the agent - * WebSearch tool. The Tavily HTTP call itself is exercised in - * `tavily.ts` but stubbed here via a settings store that puts the - * tool in the various non-network branches. - */ - -import { strict as assert } from 'node:assert'; -import { describe, it } from 'node:test'; - -import { buildWebSearchAgentTool, WEB_SEARCH_TOOL_NAME } from '../web-search/agent-tool.js'; -import { defaultWebSearchSettings } from '@maka/core'; -import type { AppSettings } from '@maka/core'; -import type { SettingsStore } from '@maka/storage'; -import { createDefaultSettings } from '@maka/core/settings'; - -function makeSettingsStore(override: (s: AppSettings) => AppSettings): SettingsStore { - const base = override(createDefaultSettings()); - return { - get: async () => base, - update: async () => ({ settings: base }), - setOnboardingMilestone: async () => base, - usageStats: async () => ({ - summary: { - totalRequests: 0, - totalCostUsd: 0, - totalTokens: 0, - inputTokens: 0, - outputTokens: 0, - cacheTokens: 0, - cacheRead: 0, - cacheCreation: 0, - }, - logs: [], - byProvider: [], - byModel: [], - byTool: [], - pricing: [], - }), - } as unknown as SettingsStore; -} - -async function runTool( - store: SettingsStore, - args: { query?: unknown; limit?: number } = { query: 'hello' }, - extraDeps: Partial[0]> = {}, -) { - const tool = buildWebSearchAgentTool({ settingsStore: store, ...extraDeps }); - return tool.impl(args as Parameters[0], { - sessionId: 's', - turnId: 't', - cwd: '/tmp', - toolCallId: 'tc', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }); -} - -describe('WebSearch agent tool (PR-AGENT-WEB-SEARCH-TOOL-0)', () => { - it('registers under the canonical WebSearch name', () => { - const tool = buildWebSearchAgentTool({ settingsStore: makeSettingsStore((s) => s) }); - assert.equal(tool.name, WEB_SEARCH_TOOL_NAME); - assert.equal(tool.name, 'WebSearch'); - assert.equal(tool.categoryHint, undefined); - }); - - it('fails closed with invalid_query for empty / whitespace-only query', async () => { - const store = makeSettingsStore((s) => ({ - ...s, - webSearch: { - ...defaultWebSearchSettings(), - enabled: true, - defaultProvider: 'tavily', - providers: { tavily: { ...defaultWebSearchSettings().providers.tavily, apiKey: 'tvly-xxx' } }, - }, - })); - const out1 = (await runTool(store, { query: '' })) as { ok: boolean; reason?: string }; - assert.equal((out1 as { kind?: string }).kind, 'web_search_error'); - assert.equal(out1.ok, false); - assert.equal(out1.reason, 'invalid_query'); - const out2 = (await runTool(store, { query: ' ' })) as { ok: boolean; reason?: string }; - assert.equal((out2 as { kind?: string }).kind, 'web_search_error'); - assert.equal(out2.ok, false); - assert.equal(out2.reason, 'invalid_query'); - }); - - it('fails closed with not_configured when webSearch.enabled is false', async () => { - const store = makeSettingsStore((s) => ({ - ...s, - webSearch: { - ...defaultWebSearchSettings(), - enabled: false, - defaultProvider: 'tavily', - providers: { tavily: { ...defaultWebSearchSettings().providers.tavily, apiKey: 'tvly-real-key' } }, - }, - })); - const out = (await runTool(store)) as { ok: boolean; reason?: string }; - assert.equal((out as { kind?: string; credentialSource?: string }).kind, 'web_search_error'); - assert.equal(out.ok, false); - assert.equal(out.reason, 'not_configured'); - assert.equal((out as { credentialSource?: string }).credentialSource, 'saved'); - }); - - it('fails closed before reading settings when incognito is active', async () => { - let settingsReads = 0; - const store = { - ...makeSettingsStore((s) => s), - get: async () => { - settingsReads += 1; - return createDefaultSettings(); - }, - } as unknown as SettingsStore; - const out = (await runTool(store, { query: 'latest ai news' }, { - getPrivacyContext: async () => ({ incognitoActive: true }), - })) as { ok: boolean; reason?: string; message?: string }; - assert.equal((out as { kind?: string }).kind, 'web_search_error'); - assert.equal(out.ok, false); - assert.equal(out.reason, 'incognito_active'); - assert.match(out.message ?? '', /隐身模式/); - assert.equal(settingsReads, 0); - }); - - it('fails closed before reading settings when privacy context is malformed', async () => { - let settingsReads = 0; - const store = { - ...makeSettingsStore((s) => s), - get: async () => { - settingsReads += 1; - return createDefaultSettings(); - }, - } as unknown as SettingsStore; - const out = (await runTool(store, { query: 'latest ai news' }, { - getPrivacyContext: async () => ({}), - })) as { ok: boolean; reason?: string; message?: string }; - assert.equal((out as { kind?: string }).kind, 'web_search_error'); - assert.equal(out.ok, false); - assert.equal(out.reason, 'incognito_active'); - assert.match(out.message ?? '', /隐私状态无法确认/); - assert.equal(settingsReads, 0); - }); - - it('fails closed with not_configured when apiKey is empty', async () => { - const store = makeSettingsStore((s) => ({ - ...s, - webSearch: { - ...defaultWebSearchSettings(), - enabled: true, - defaultProvider: 'tavily', - providers: { tavily: { ...defaultWebSearchSettings().providers.tavily, apiKey: '' } }, - }, - })); - const out = (await runTool(store)) as { ok: boolean; reason?: string; message?: string }; - assert.equal((out as { kind?: string; credentialSource?: string }).kind, 'web_search_error'); - assert.equal(out.ok, false); - assert.equal(out.reason, 'not_configured'); - assert.equal((out as { credentialSource?: string }).credentialSource, 'none'); - // Generalized copy — never leaks the empty-key fact as a raw code. - assert.match(out.message ?? '', /Tavily/); - }); - - it('tool description warns the agent against speculative calls', () => { - const tool = buildWebSearchAgentTool({ settingsStore: makeSettingsStore((s) => s) }); - assert.match(tool.description, /never call speculatively|explicit user approval/i); - }); -}); diff --git a/apps/desktop/src/main/__tests__/xai-oauth-service.test.ts b/apps/desktop/src/main/__tests__/xai-oauth-service.test.ts deleted file mode 100644 index cc155089ea..0000000000 --- a/apps/desktop/src/main/__tests__/xai-oauth-service.test.ts +++ /dev/null @@ -1,227 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; - -import { PENDING_AUTHORIZATION_TTL_MS } from '@maka/core'; -import { XaiOAuthService } from '../oauth/xai-oauth-service.js'; - -describe('XaiOAuthService', () => { - test('starts the Grok CLI PKCE flow without exposing its URL or verifier', async () => { - const opened: string[] = []; - const service = createService({ opened }); - const result = await service.getAuthorizationUrl(); - - assert.equal('ok' in result, false); - if ('ok' in result) return; - assert.equal(typeof result.authRequestId, 'string'); - assert.match(result.stateHint, /^[A-Za-z0-9_-]{8}$/); - assert.equal('url' in result, false); - assert.equal('verifier' in result, false); - - assert.deepEqual(await service.openAuthorizationUrl(result.authRequestId), { ok: true }); - const url = new URL(opened[0]!); - assert.equal(url.origin + url.pathname, 'https://auth.x.ai/oauth2/authorize'); - assert.equal(url.searchParams.get('client_id'), 'b1a00492-073a-47ea-816f-4c329264a828'); - assert.equal(url.searchParams.get('redirect_uri'), 'http://127.0.0.1:56121/callback'); - assert.equal(url.searchParams.get('code_challenge_method'), 'S256'); - assert.equal(url.searchParams.get('plan'), 'generic'); - assert.match(url.searchParams.get('code_challenge') ?? '', /^[A-Za-z0-9_-]{43}$/); - service.cancelAuthorization(result.authRequestId); - }); - - test('captures the loopback callback, exchanges the code, and persists tokens', async () => { - const opened: string[] = []; - const requests: Array<{ url: string; body: URLSearchParams }> = []; - const store = memoryCredentialStore(); - const service = createService({ - opened, - store, - fetchFn: async (url, init) => { - requests.push({ url: String(url), body: new URLSearchParams(String(init?.body)) }); - return Response.json({ - access_token: 'xai-access-token', - refresh_token: 'xai-refresh-token', - expires_in: 21_600, - id_token: 'xai-id-token', - }); - }, - }); - const authorization = await service.getAuthorizationUrl(); - assert.equal('ok' in authorization, false); - if ('ok' in authorization) return; - await service.openAuthorizationUrl(authorization.authRequestId); - const state = new URL(opened[0]!).searchParams.get('state'); - assert.ok(state); - - const completion = service.completeAuthorization(authorization.authRequestId); - const callback = await fetch( - `http://127.0.0.1:56121/callback?code=authorization-code&state=${encodeURIComponent(state)}`, - ); - assert.equal(callback.status, 200); - assert.deepEqual(await completion, { ok: true }); - - assert.equal(requests[0]?.url, 'https://auth.x.ai/oauth2/token'); - assert.deepEqual(Object.fromEntries(requests[0]!.body), { - grant_type: 'authorization_code', - client_id: 'b1a00492-073a-47ea-816f-4c329264a828', - code: 'authorization-code', - code_verifier: requests[0]!.body.get('code_verifier'), - redirect_uri: 'http://127.0.0.1:56121/callback', - }); - assert.match(requests[0]!.body.get('code_verifier') ?? '', /^[A-Za-z0-9_-]{43,128}$/); - assert.deepEqual(await service.getAccountState(), { - provider: 'xai-oauth', - runtimeState: 'authenticated', - }); - assert.equal(store.read()?.access_token, 'xai-access-token'); - assert.equal(store.read()?.refresh_token, 'xai-refresh-token'); - }); - - test('rejects a mismatched callback state without consuming the pending login', async () => { - const opened: string[] = []; - const service = createService({ opened }); - const authorization = await service.getAuthorizationUrl(); - assert.equal('ok' in authorization, false); - if ('ok' in authorization) return; - await service.openAuthorizationUrl(authorization.authRequestId); - - const rejected = await fetch('http://127.0.0.1:56121/callback?code=stolen&state=wrong'); - assert.equal(rejected.status, 400); - const state = new URL(opened[0]!).searchParams.get('state'); - assert.ok(state); - const completion = service.completeAuthorization(authorization.authRequestId); - await fetch( - `http://127.0.0.1:56121/callback?code=valid-code&state=${encodeURIComponent(state)}`, - ); - assert.deepEqual(await completion, { ok: true }); - }); - - test('maps provider denial and local cancellation to distinct safe outcomes', async () => { - const opened: string[] = []; - const denied = createService({ opened }); - const deniedAuth = await denied.getAuthorizationUrl(); - assert.equal('ok' in deniedAuth, false); - if ('ok' in deniedAuth) return; - await denied.openAuthorizationUrl(deniedAuth.authRequestId); - const state = new URL(opened[0]!).searchParams.get('state'); - assert.ok(state); - const denial = denied.completeAuthorization(deniedAuth.authRequestId); - await fetch( - `http://127.0.0.1:56121/callback?error=access_denied&state=${encodeURIComponent(state)}`, - ); - assert.deepEqual(await denial, { - ok: false, - reason: 'authorization_denied', - message: 'xAI 授权被拒绝，请重新登录并允许访问。', - }); - - const cancelled = createService(); - const cancelledAuth = await cancelled.getAuthorizationUrl(); - assert.equal('ok' in cancelledAuth, false); - if ('ok' in cancelledAuth) return; - const completion = cancelled.completeAuthorization(cancelledAuth.authRequestId); - cancelled.cancelAuthorization(cancelledAuth.authRequestId); - assert.deepEqual(await completion, { - ok: false, - reason: 'authorization_cancelled', - message: 'xAI 授权已取消。', - }); - }); - - test('does not revive a cancelled authorization after the browser finishes opening', async () => { - const browserOpened = deferred(); - const service = new XaiOAuthService({ - credentialStore: memoryCredentialStore().store, - openExternal: async () => browserOpened.promise, - fetchFn: async () => assert.fail('a cancelled login must not exchange a token'), - }); - const authorization = await service.getAuthorizationUrl(); - assert.equal('ok' in authorization, false); - if ('ok' in authorization) return; - const opening = service.openAuthorizationUrl(authorization.authRequestId); - service.cancelAuthorization(authorization.authRequestId); - browserOpened.resolve(); - - assert.deepEqual(await opening, { - ok: false, - reason: 'authorization_cancelled', - message: 'xAI 授权已取消。', - }); - assert.deepEqual(await service.getAccountState(), { - provider: 'xai-oauth', - runtimeState: 'not_logged_in', - }); - }); - - test('expires an abandoned PKCE authorization', async () => { - let now = 10_000; - const service = createService({ now: () => now }); - const authorization = await service.getAuthorizationUrl(); - assert.equal('ok' in authorization, false); - if ('ok' in authorization) return; - now += PENDING_AUTHORIZATION_TTL_MS + 1; - assert.deepEqual(await service.openAuthorizationUrl(authorization.authRequestId), { - ok: false, - reason: 'authorization_expired', - message: 'xAI 授权请求已过期，请重新登录。', - }); - }); -}); - -function createService(input: { - opened?: string[]; - store?: ReturnType; - fetchFn?: typeof fetch; - now?: () => number; -} = {}): XaiOAuthService { - const store = input.store ?? memoryCredentialStore(); - return new XaiOAuthService({ - credentialStore: store.store, - openExternal: async (url) => { - input.opened?.push(url); - }, - now: input.now, - fetchFn: input.fetchFn ?? (async () => - Response.json({ - access_token: 'access', - refresh_token: 'refresh', - expires_in: 21_600, - })), - }); -} - -function memoryCredentialStore() { - let stored: string | null = null; - return { - store: { - getSecret: async () => stored, - setSecret: async (_slug: string, _kind: 'oauth_token', value: string) => { - stored = value; - }, - deleteSecret: async () => { - stored = null; - }, - compareAndSetSecret: async ( - _slug: string, - _kind: 'oauth_token', - expected: string | null, - value: string, - ) => { - if (stored !== expected) return { committed: false as const, current: stored }; - stored = value; - return { committed: true as const }; - }, - }, - read: () => stored ? JSON.parse(stored) as Record : null, - }; -} - -function deferred(): { - promise: Promise; - resolve: (value: T | PromiseLike) => void; -} { - let resolve!: (value: T | PromiseLike) => void; - const promise = new Promise((done) => { - resolve = done; - }); - return { promise, resolve }; -} diff --git a/apps/desktop/src/main/agent-graph-ipc-main.ts b/apps/desktop/src/main/agent-graph-ipc-main.ts deleted file mode 100644 index 862264e99f..0000000000 --- a/apps/desktop/src/main/agent-graph-ipc-main.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { ipcMain } from 'electron'; -import type { - AgentGraphClientChangedEvent, - AgentGraphClientSnapshotOptions, - AgentGraphCoordinator, -} from '@maka/runtime'; - -export interface AgentGraphIpcDeps { - coordinator: AgentGraphCoordinator; - sendToRenderer(channel: string, ...args: unknown[]): void; -} - -/** - * Read/control adapter for the Desktop graph client. - * - * The renderer receives bounded read models and invalidation hints only. It - * never receives stores, RuntimeEvent payloads, or reconciliation authority. - */ -export function registerAgentGraphIpc(deps: AgentGraphIpcDeps): void { - ipcMain.handle( - 'graphs:getSnapshot', - (_event, rootSessionId: unknown, options?: unknown) => - deps.coordinator.getSnapshot( - requireIdentity(rootSessionId, 'root Session id'), - normalizeSnapshotOptions(options), - ), - ); - ipcMain.handle( - 'graphs:inspectOperator', - (_event, rootSessionId: unknown, operatorId: unknown) => - deps.coordinator.inspectOperator( - requireIdentity(rootSessionId, 'root Session id'), - requireIdentity(operatorId, 'operator id'), - ), - ); - ipcMain.handle('graphs:stop', (_event, rootSessionId: unknown) => - deps.coordinator.stop(requireIdentity(rootSessionId, 'root Session id')), - ); - deps.coordinator.subscribeAll((event: AgentGraphClientChangedEvent) => { - deps.sendToRenderer('graphs:changed', event); - }); -} - -function normalizeSnapshotOptions(value: unknown): AgentGraphClientSnapshotOptions { - if (value === undefined) return {}; - if (!value || typeof value !== 'object' || Array.isArray(value)) { - throw new TypeError('Invalid agent graph snapshot options'); - } - const record = value as Record; - const keys = Object.keys(record); - if (keys.some((key) => key !== 'terminalCursor')) { - throw new TypeError('Invalid agent graph snapshot options'); - } - if (record.terminalCursor === undefined) return {}; - return { - terminalCursor: requireIdentity(record.terminalCursor, 'terminal cursor', 2_048), - }; -} - -function requireIdentity(value: unknown, name: string, maxLength = 512): string { - if ( - typeof value !== 'string' || - value.length === 0 || - value.length > maxLength || - value.trim() !== value || - /[\u0000-\u001f\u007f]/.test(value) - ) { - throw new TypeError(`Invalid agent graph ${name}`); - } - return value; -} diff --git a/apps/desktop/src/main/agent-settings-tools.ts b/apps/desktop/src/main/agent-settings-tools.ts deleted file mode 100644 index 43091dc84d..0000000000 --- a/apps/desktop/src/main/agent-settings-tools.ts +++ /dev/null @@ -1,293 +0,0 @@ -import { z } from 'zod'; -import { - THEME_PALETTES, - UI_LOCALE_PREFERENCES, - type AppSettings, - type UpdateAppSettingsInput, -} from '@maka/core'; -import type { MakaTool } from '@maka/runtime'; -import type { SettingsStore } from '@maka/storage'; - -export const MAKA_SETTINGS_GET_TOOL_NAME = 'MakaSettingsGet'; -export const MAKA_SETTINGS_UPDATE_TOOL_NAME = 'MakaSettingsUpdate'; - -const appearancePatchSchema = z - .object({ - theme: z.enum(['light', 'dark', 'auto']).optional(), - palette: z.enum(THEME_PALETTES).optional(), - }) - .strict(); - -const personalizationPatchSchema = z - .object({ - displayName: z.string().max(80).optional(), - assistantTone: z.string().max(500).optional(), - uiLocale: z.enum(UI_LOCALE_PREFERENCES).optional(), - }) - .strict(); - -const localMemoryPatchSchema = z - .object({ - enabled: z.boolean().optional(), - agentReadEnabled: z.boolean().optional(), - }) - .strict(); - -const enabledPatchSchema = z.object({ enabled: z.boolean().optional() }).strict(); - -const privacyPatchSchema = z.object({ incognitoActive: z.boolean().optional() }).strict(); -const notificationsPatchSchema = z.object({ runComplete: z.boolean().optional() }).strict(); -const systemPatchSchema = z.object({ keepSystemAwake: z.boolean().optional() }).strict(); - -const agentSettingsPatchSchema = z - .object({ - appearance: appearancePatchSchema.optional(), - personalization: personalizationPatchSchema.optional(), - localMemory: localMemoryPatchSchema.optional(), - workspaceInstructions: enabledPatchSchema.optional(), - privacy: privacyPatchSchema.optional(), - notifications: notificationsPatchSchema.optional(), - system: systemPatchSchema.optional(), - webSearch: enabledPatchSchema.optional(), - }) - .strict(); - -export type AgentSettingsPatch = z.infer; - -export interface AgentSettingsSnapshot { - appearance: Pick; - personalization: Pick< - AppSettings['personalization'], - 'displayName' | 'assistantTone' | 'uiLocale' - >; - localMemory: Pick; - workspaceInstructions: Pick; - privacy: Pick; - notifications: Pick; - system: Pick; - webSearch: Pick; -} - -export interface AgentSettingsToolsDeps { - settingsStore: Pick; - updateSettings(patch: UpdateAppSettingsInput): Promise; -} - -export function buildAgentSettingsTools(deps: AgentSettingsToolsDeps): MakaTool[] { - const getTool: MakaTool, AgentSettingsSnapshot> = { - name: MAKA_SETTINGS_GET_TOOL_NAME, - displayName: '读取 Maka 设置', - description: - 'Read the safe, non-secret subset of Maka application settings that the assistant may help configure. ' + - 'This never returns API keys, tokens, model credentials, proxy credentials, Bot settings, or Gateway settings.', - parameters: z.object({}).strict(), - categoryHint: 'read', - recoveryMode: 'replay_safe', - impl: async () => projectAgentSettings(await deps.settingsStore.get()), - }; - - const updateTool: MakaTool = { - name: MAKA_SETTINGS_UPDATE_TOOL_NAME, - displayName: '修改 Maka 设置', - description: - 'Update a small allowlisted subset of Maka application settings. ' + - 'Use only when the user explicitly asks to change Maka itself. ' + - 'Every effective change requires an in-app confirmation before it is persisted. ' + - 'Secrets, provider/model configuration, network proxy, Bot/Gateway settings, and permission defaults are not supported.', - parameters: agentSettingsPatchSchema, - categoryHint: 'custom_tool', - recoveryMode: 'never_auto_retry', - executionSemantics: 'exclusive_step', - impl: async (input, context) => { - const current = await deps.settingsStore.get(); - const patch = toSettingsPatch(input); - const changes = describeChanges(current, patch); - if (changes.length === 0) { - return { - kind: 'maka_settings_update', - ok: true, - applied: false, - message: 'The requested Maka settings already have those values.', - settings: projectAgentSettings(current), - }; - } - if (!context.askUserQuestion) { - return { - kind: 'maka_settings_update', - ok: false, - applied: false, - reason: 'confirmation_unavailable', - message: 'Maka settings were not changed because confirmation is unavailable.', - settings: projectAgentSettings(current), - }; - } - - const answer = await context.askUserQuestion([ - { - question: `Apply these Maka setting changes?\n${changes.map((change) => `• ${change}`).join('\n')}`, - options: [ - { - label: 'Apply changes', - description: 'Persist the listed Maka settings now.', - }, - { - label: 'Cancel', - description: 'Leave every setting unchanged.', - }, - ], - }, - ]); - if (answer.answers[0]?.answer !== 'Apply changes') { - return { - kind: 'maka_settings_update', - ok: true, - applied: false, - reason: 'cancelled', - message: 'Maka settings were not changed.', - settings: projectAgentSettings(await deps.settingsStore.get()), - }; - } - - const updated = await deps.updateSettings(patch); - return { - kind: 'maka_settings_update', - ok: true, - applied: true, - changes, - message: `Updated ${changes.length} Maka setting${changes.length === 1 ? '' : 's'}.`, - settings: projectAgentSettings(updated), - }; - }, - }; - - return [getTool, updateTool]; -} - -type AgentSettingsUpdateResult = - | { - kind: 'maka_settings_update'; - ok: true; - applied: boolean; - reason?: 'cancelled'; - changes?: string[]; - message: string; - settings: AgentSettingsSnapshot; - } - | { - kind: 'maka_settings_update'; - ok: false; - applied: false; - reason: 'confirmation_unavailable'; - message: string; - settings: AgentSettingsSnapshot; - }; - -export function projectAgentSettings(settings: AppSettings): AgentSettingsSnapshot { - return { - appearance: { - theme: settings.appearance.theme, - palette: settings.appearance.palette, - }, - personalization: { - displayName: settings.personalization.displayName, - assistantTone: settings.personalization.assistantTone, - uiLocale: settings.personalization.uiLocale, - }, - localMemory: { - enabled: settings.localMemory.enabled, - agentReadEnabled: settings.localMemory.agentReadEnabled, - }, - workspaceInstructions: { enabled: settings.workspaceInstructions.enabled }, - privacy: { incognitoActive: settings.privacy.incognitoActive }, - notifications: { runComplete: settings.notifications.runComplete }, - system: { keepSystemAwake: settings.system.keepSystemAwake }, - webSearch: { enabled: settings.webSearch.enabled }, - }; -} - -function toSettingsPatch(input: AgentSettingsPatch): UpdateAppSettingsInput { - return { - ...(input.appearance ? { appearance: input.appearance } : {}), - ...(input.personalization ? { personalization: input.personalization } : {}), - ...(input.localMemory ? { localMemory: input.localMemory } : {}), - ...(input.workspaceInstructions - ? { workspaceInstructions: input.workspaceInstructions } - : {}), - ...(input.privacy ? { privacy: input.privacy } : {}), - ...(input.notifications ? { notifications: input.notifications } : {}), - ...(input.system ? { system: input.system } : {}), - ...(input.webSearch ? { webSearch: input.webSearch } : {}), - }; -} - -function describeChanges(current: AppSettings, patch: UpdateAppSettingsInput): string[] { - const changes: string[] = []; - addChange(changes, 'appearance.theme', current.appearance.theme, patch.appearance?.theme); - addChange(changes, 'appearance.palette', current.appearance.palette, patch.appearance?.palette); - addChange( - changes, - 'personalization.displayName', - current.personalization.displayName, - patch.personalization?.displayName, - ); - addChange( - changes, - 'personalization.assistantTone', - current.personalization.assistantTone, - patch.personalization?.assistantTone, - ); - addChange( - changes, - 'personalization.uiLocale', - current.personalization.uiLocale, - patch.personalization?.uiLocale, - ); - addChange(changes, 'localMemory.enabled', current.localMemory.enabled, patch.localMemory?.enabled); - addChange( - changes, - 'localMemory.agentReadEnabled', - current.localMemory.agentReadEnabled, - patch.localMemory?.agentReadEnabled, - ); - addChange( - changes, - 'workspaceInstructions.enabled', - current.workspaceInstructions.enabled, - patch.workspaceInstructions?.enabled, - ); - addChange( - changes, - 'privacy.incognitoActive', - current.privacy.incognitoActive, - patch.privacy?.incognitoActive, - ); - addChange( - changes, - 'notifications.runComplete', - current.notifications.runComplete, - patch.notifications?.runComplete, - ); - addChange( - changes, - 'system.keepSystemAwake', - current.system.keepSystemAwake, - patch.system?.keepSystemAwake, - ); - addChange(changes, 'webSearch.enabled', current.webSearch.enabled, patch.webSearch?.enabled); - return changes; -} - -function addChange( - changes: string[], - path: string, - current: string | boolean | undefined, - requested: string | boolean | undefined, -): void { - if (requested === undefined || Object.is(current, requested)) return; - changes.push(`${path}: ${displayValue(current)} → ${displayValue(requested)}`); -} - -function displayValue(value: string | boolean | undefined): string { - if (value === undefined) return '(unset)'; - return JSON.stringify(value); -} diff --git a/apps/desktop/src/main/app-lifecycle.ts b/apps/desktop/src/main/app-lifecycle.ts deleted file mode 100644 index c94e3cd050..0000000000 --- a/apps/desktop/src/main/app-lifecycle.ts +++ /dev/null @@ -1,437 +0,0 @@ -import { app } from 'electron'; -import { mkdir } from 'node:fs/promises'; -import { setActiveProxy } from '@maka/runtime'; -import { - resolveBootstrapConnections, - resolveOpenCodeFreeBootstrapMigration, -} from '@maka/core'; -import type { - AgentGraphCoordinator, - AgentGraphSupervisorWakeCoordinator, - BotRegistry, - SessionManager, - ShellRunProcessManager, -} from '@maka/runtime'; -import type { McpClientManager } from '@maka/mcp'; -import { backfillSessionProjects } from '@maka/storage'; -import type { - createConnectionStore, - createProjectCatalog, - createSessionStore, - createSettingsStore, - createSqliteArtifactStore, - createSqliteModelCallLedger, - createSqliteTelemetryRepo, - openRuntimeEventPersistence, -} from '@maka/storage'; -import type { createAgentGraphControlStore } from '@maka/storage/agent-graph-control-store'; -import type { createFileCredentialStore } from './credential-store.js'; -import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js'; -import { toContractNetworkSettings } from './network-settings-main.js'; -import type { resolveE2eFixture } from './e2e-fixture.js'; -import type { KeepSystemAwakeController } from './keep-system-awake.js'; -import type { createPlanReminderMainService } from './plan-reminders-main.js'; -import type { createDailyReviewMainService } from './daily-review-main.js'; -import type { createMainAutomationWiring } from './automation-wiring.js'; -import type { createMainGoalWiring } from './goal-wiring.js'; -import type { createMainWindowController } from './main-window.js'; -import type { DesktopExecutionStoreWiring } from './execution-store-wiring.js'; -import type { assembleDesktopTools } from './tool-assembly.js'; -import type { StreamEvents } from './session-stream.js'; -import type { SettingsIpcHandle } from './settings-ipc-main.js'; -import type { AppUpdateService } from './app-update-service.js'; -import { createAppQuitCoordinator } from './app-quit-coordinator.js'; -import { installDesktopShellPresentation } from './desktop-shell-presentation.js'; -import { resumeSafeBoundaryContinuationsOnStartup } from './startup-safe-boundary-resume.js'; -import { retireCursorSubscriptionCredentials } from './oauth/cursor-subscription-retirement.js'; - -type AssembledTools = ReturnType; -export interface AppLifecycleDeps { - // Whether this run stays out of the developer's way. boot.ts owns the - // condition; the dock icon follows it so window visibility and dock - // presence can never drift apart. A fixture window someone asked to see - // (MAKA_E2E_SHOW_WINDOW) opts out of both together: as an accessory app it - // has no dock tile and no Cmd+Tab entry, so switching away during a manual - // review would leave no way back. - startHidden: boolean; - e2eFixture: ReturnType; - userDataDir: string; - workspaceRoot: string; - sessionStore: ReturnType; - projectCatalog: ReturnType; - credentialStore: ReturnType; - connectionStore: ReturnType; - settingsStore: ReturnType; - telemetryRepo: ReturnType; - artifactStore: ReturnType; - modelCallLedger: ReturnType; - ensureUsageReady: () => Promise; - keepSystemAwake: KeepSystemAwakeController; - botRegistry: BotRegistry; - planReminders: ReturnType; - dailyReview: ReturnType; - updateService: AppUpdateService; - automationWiring: ReturnType; - goalWiring: ReturnType; - computerUse: AssembledTools['computerUse']; - computerUseOverlay: AssembledTools['computerUseOverlay']; - /** The Computer Use mirror, torn down on the same two paths as the cursor. */ - computerUsePip: AssembledTools['computerUsePip']; - /** - * Retired at quit, not at window close: the item reports on runs, and a run - * can outlive the window it was started from. Destroying it is also what - * gives back the keep-awake assertion, so it is the last backstop against - * leaving one held. - */ - computerUseStatusItem: AssembledTools['computerUseStatusItem']; - /** - * Same reason, and one more: `dispose()` makes the guard answer "unlocked" - * forever, so doing it any earlier would silently switch the lock guard off - * for the rest of the process. - */ - computerUseScreenLock: AssembledTools['computerUseScreenLock']; - shellRuns: ShellRunProcessManager; - mcpManager: McpClientManager; - runtimePersistence: Awaited>; - executionStoreWiring: DesktopExecutionStoreWiring; - closeWorkflowStores: () => Promise; - mainWindowController: ReturnType; - runtime: SessionManager; - agentGraphCoordinator: AgentGraphCoordinator; - agentGraphSupervisorWakeCoordinator: AgentGraphSupervisorWakeCoordinator; - agentGraphControlStore: ReturnType; - streamEvents: StreamEvents; - /** Focus-or-create for the main window; stays in boot.ts next to the - * controller and is registered here on `second-instance` / `activate`. */ - focusOrCreateMainWindow: (signal: AbortSignal) => void; - emitConnectionListChanged: () => void; - emitSessionsChanged: (reason: 'migrated') => void; - handleExternalSettingsChange: () => Promise; - /** Accessor for the settings IPC handle, which is assigned inside - * boot.ts's `registerIpc()`; teardown disposes it if present. */ - getSettingsIpc: () => SettingsIpcHandle | undefined; -} - -/** - * Startup / lifecycle cluster extracted from main.ts (arch R6). Pure move of the - * post-`registerIpc()` tail: the `app.whenReady()` startup flow (dock icon, - * fixture seeding, window creation, background startup), - * `runBackgroundStartup` / `ensureBootstrapConnection` / - * `recoverInterruptedSessionsOnStartup`, the `window-all-closed` and `before-quit` - * handlers, and `runBeforeQuitCleanup`. Startup ORDER is the product, so the - * bodies stay behaviorally identical to their in-main.ts originals; every - * process-scoped collaborator is injected. The single-instance lock stays in - * main.ts; the `registerIpc()` anchor stays in boot.ts. Call this once, at - * the same point the inline `app.whenReady()` used to sit (immediately after - * `registerIpc()`). - */ -export function wireAppLifecycle(deps: AppLifecycleDeps): void { - const { - startHidden, - e2eFixture, - userDataDir, - workspaceRoot, - sessionStore, - projectCatalog, - credentialStore, - connectionStore, - settingsStore, - telemetryRepo, - artifactStore, - modelCallLedger, - ensureUsageReady, - keepSystemAwake, - botRegistry, - planReminders, - dailyReview, - updateService, - automationWiring, - goalWiring, - computerUse, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - shellRuns, - mcpManager, - runtimePersistence, - executionStoreWiring, - closeWorkflowStores, - mainWindowController, - runtime, - agentGraphCoordinator, - agentGraphSupervisorWakeCoordinator, - agentGraphControlStore, - streamEvents, - focusOrCreateMainWindow, - emitConnectionListChanged, - emitSessionsChanged, - handleExternalSettingsChange, - getSettingsIpc, - } = deps; - - let backgroundStartup: Promise | undefined; - let configWatcher: ConfigFileWatcher | undefined; - const quitCoordinator = createAppQuitCoordinator({ - cleanup: runBeforeQuitCleanup, - focusOrCreateWindow: focusOrCreateMainWindow, - onCleanupError: (error) => console.error('[shutdown] cleanup failed:', error), - resumeQuit: () => app.quit(), - }); - - async function recoverInterruptedSessionsOnStartup(): Promise { - try { - await runtime.recoverInterruptedSessions(); - await agentGraphSupervisorWakeCoordinator.recover(); - await agentGraphCoordinator.recover(); - if (process.env.MAKA_RUNTIME_SAFE_BOUNDARY_RESUME !== '1') return; - await resumeSafeBoundaryContinuationsOnStartup(runtime, streamEvents, console.error); - } catch { - // Best-effort: startup should still reach the renderer so users can inspect - // and repair any remaining local session state. - } - } - - async function resolveSessionProjectsOnStartup(): Promise { - try { - const result = await backfillSessionProjects({ - sessions: sessionStore, - catalog: projectCatalog, - }); - for (const failure of result.failures) { - console.error(`[projects] could not resolve ${failure.cwd}: ${failure.reason}`); - } - if (result.resolved > 0) emitSessionsChanged('migrated'); - } catch (error) { - // Best-effort: an unresolved project only affects sidebar grouping, and - // the sessions themselves must still reach the renderer. - console.error('[projects] session project resolution failed:', error); - } - } - - async function ensureBootstrapConnection(): Promise { - await mkdir(workspaceRoot, { recursive: true }); - const existingConnections = await connectionStore.list(); - let migrated = false; - for (const connection of existingConnections) { - const patch = resolveOpenCodeFreeBootstrapMigration(connection); - if (!patch) continue; - const updated = await connectionStore.updateIfUnchanged( - connection.slug, - connection.updatedAt, - patch, - ); - migrated ||= updated !== null; - } - if (migrated) emitConnectionListChanged(); - if (existingConnections.length > 0) return; - - // opencode-free is seeded unconditionally so a fresh install is usable with - // zero credentials; env-keyed providers layer on top and take the default - // when present (Anthropic before OpenAI). See resolveBootstrapConnections. - const seeds = resolveBootstrapConnections({ - ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY, - OPENAI_API_KEY: process.env.OPENAI_API_KEY, - }); - for (const seed of seeds) { - await connectionStore.create({ - slug: seed.slug, - name: seed.name, - providerType: seed.providerType, - defaultModel: seed.defaultModel, - ...(seed.enabledModelIds ? { enabledModelIds: [...seed.enabledModelIds] } : {}), - extras: seed.extras, - }); - const envApiKey = - seed.providerType === 'anthropic' - ? process.env.ANTHROPIC_API_KEY - : seed.providerType === 'openai' - ? process.env.OPENAI_API_KEY - : undefined; - if (envApiKey) await credentialStore.setSecret(seed.slug, 'api_key', envApiKey); - if (seed.isDefault) await connectionStore.setDefault(seed.slug); - } - // Bootstrap runs in BACKGROUND startup (#456): the renderer may have - // already seeded its connection list from the onboarding snapshot, - // so push the change or the model picker stays empty until an - // unrelated action refreshes it. - if (seeds.length > 0) emitConnectionListChanged(); - } - - app.whenReady().then(async () => { - updateService.start(); - - // Check when the user comes back to the app, not only on the four-hour - // timer. A version published while the window sat open was otherwise - // invisible until the next tick, which is what "the update never showed - // up" actually was. The service throttles this to one check per 15 - // minutes, so alt-tabbing does not turn into a request storm, and any - // extra Maka window firing the same app-level event is a no-op. - app.on('browser-window-focus', () => { - void updateService.checkForUpdatesOnFocus(); - }); - - // The renderer's first IPC calls (session enumeration, settings read, - // connection listing) - // all read from stores that are initialized synchronously at module load, - // so they succeed regardless of whether background startup has - // settled. Any state that background startup mutates is pushed to the - // renderer via the existing `sessions:changed` / `connections:event` - // / `settings:bots:statusChanged` channels, so the UI converges lazily. - // E2E fixture workspaces are wiped and seeded before stores open in - // boot.ts. SQLite keeps live file handles, so resetting the workspace - // here after store construction would detach the canonical database. - const initialWindowSignal = quitCoordinator.getWindowCreationSignal(); - if (!initialWindowSignal) return; - // The application menu is app-scoped, not window-scoped: install it once - // here (before the first window, surviving window close on macOS) instead - // of inside createWindow. A null menu on macOS leaves Cmd+Q and the Edit - // roles without any handler; Windows/Linux keep it suppressed so the - // renderer's shell chrome and Ctrl+N / Ctrl+, shortcuts stay untouched. - // Menu commands route to the renderer through one typed channel when a - // window exists, or re-create the window when there is none (quit-phase - // no-op via the coordinator). - installDesktopShellPresentation({ - startHidden, - mainWindowController, - focusOrCreateWindow: quitCoordinator.focusOrCreateWindow, - onIconError: (error) => - console.error('[icon] failed to set dock icon:', error), - }); - app.on('second-instance', quitCoordinator.focusOrCreateWindow); - app.on('activate', quitCoordinator.focusOrCreateWindow); - backgroundStartup = runBackgroundStartup(); - await mainWindowController.createWindow(initialWindowSignal); - // Keep the process alive until background work settles so schedulers - // / bridges aren't torn down mid-start by a fast window-all-closed. - await backgroundStartup; - }); - - /** - * Non-critical startup work that must NOT block the first window paint. - * - * `setActiveProxy` must be applied before any network-bearing step - * (`botRegistry.applySettings`); usage readiness opens the operational SQLite - * telemetry authority. Everything here is best-effort and logged on failure — - * none of it should prevent the user from seeing and interacting with the app shell. - */ - async function runBackgroundStartup(): Promise { - // Each step stands alone, because the doc comment above is a promise the - // old shape could not keep: this was a run of bare `await`s, so the first - // rejection skipped every step after it, silently. - // - // A malformed telemetry record must not prevent session recovery, plan - // reminders, the daily review scheduler, the config watcher, or the - // Automation scheduler from starting. - const step = async (name: string, run: () => unknown): Promise => { - try { - await run(); - return true; - } catch (error) { - console.error(`[startup] ${name} failed; continuing:`, error); - return false; - } - }; - - // E2e-fixture seeding happens synchronously in `whenReady` before the - // window opens (see there for why); only the real bootstrap runs here. - await step('retired Cursor credentials', () => - retireCursorSubscriptionCredentials({ userDataDir, credentialStore }), - ); - if (!e2eFixture) { - await step('bootstrap connection', () => ensureBootstrapConnection()); - } - // The settings read is the one genuine dependency: three steps below take - // their argument from it, and guessing a default for any of them would be - // worse than not running them. - let settings: Awaited> | undefined; - await step('settings read', async () => { - settings = await settingsStore.get(); - }); - if (settings) { - const resolved = settings; - await step('proxy', () => setActiveProxy(toContractNetworkSettings(resolved.network).proxy)); - // Re-hold the power-save blocker at launch if the user left it enabled, so - // scheduled tasks survive machine sleep across restarts. - await step('keep-awake', () => keepSystemAwake.apply(resolved.system.keepSystemAwake)); - } - await step('usage readiness', () => ensureUsageReady()); - await step('session recovery', () => recoverInterruptedSessionsOnStartup()); - // After recovery: an interrupted session must come back before the sidebar - // learns how to group it, and resolution costs a git probe per directory. - await step('project resolution', () => resolveSessionProjectsOnStartup()); - let botRegistryReady = false; - if (settings) { - const resolved = settings; - botRegistryReady = await step( - 'bot registry', - () => botRegistry.applySettings(resolved.botChat), - ); - } - if (botRegistryReady) { - await step('plan reminders', () => planReminders.refreshTimers()); - } else { - console.error('[startup] plan reminders not started; bot registry is not ready'); - } - await step('daily review scheduler', () => dailyReview.startScheduler()); - await step('config watcher', () => { - configWatcher = startConfigFileWatcher(workspaceRoot, { - onConnectionsChanged: () => emitConnectionListChanged(), - onSettingsChanged: () => void handleExternalSettingsChange(), - }); - }); - await step('automation scheduler', () => automationWiring.scheduler.start()); - } - - app.on('window-all-closed', () => { - computerUseOverlay.destroyAll(); - computerUsePip.destroyAll(); - if (process.platform !== 'darwin') app.quit(); - }); - - app.on('before-quit', quitCoordinator.handleBeforeQuit); - - async function runBeforeQuitCleanup(): Promise { - updateService.dispose(); - try { - await backgroundStartup; - } catch (error) { - console.error('[shutdown] background startup failed:', error); - } - automationWiring.scheduler.dispose(); - goalWiring.coordinator.dispose(); - goalWiring.manager.dispose(); - configWatcher?.stop(); - planReminders.stopTimers(); - dailyReview.stopScheduler(); - getSettingsIpc()?.dispose(); - const results = await Promise.allSettled([ - Promise.resolve().then(() => computerUseOverlay.destroyAll()), - Promise.resolve().then(() => computerUsePip.destroyAll()), - Promise.resolve().then(() => computerUseStatusItem.destroy()), - Promise.resolve().then(() => computerUseScreenLock.dispose()), - Promise.resolve().then(() => computerUse.backend?.dispose?.()), - botRegistry.stopAll(), - Promise.resolve(mainWindowController.disposeBrowserViews()), - shellRuns.terminateAll(), - mcpManager.close(), - agentGraphCoordinator.close(), - agentGraphSupervisorWakeCoordinator.close(), - telemetryRepo.close(), - Promise.resolve().then(() => artifactStore.close?.()), - modelCallLedger.close(), - ]); - for (const result of results) { - if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason); - } - try { - await closeWorkflowStores(); - } catch (error) { - console.error('[shutdown] cleanup failed:', error); - } - runtimePersistence.close(); - executionStoreWiring.close(); - agentGraphControlStore.close(); - await sessionStore.close?.(); - } -} diff --git a/apps/desktop/src/main/app-update-activity.ts b/apps/desktop/src/main/app-update-activity.ts deleted file mode 100644 index 62f7018a65..0000000000 --- a/apps/desktop/src/main/app-update-activity.ts +++ /dev/null @@ -1,17 +0,0 @@ -export interface AppUpdateActivitySources { - sessionActivities: { hasActive(): boolean }; - automationScheduler: { hasInFlight(): boolean }; - shellRuns: { liveCount(): number }; -} - -/** - * Reports work that the app shutdown path would interrupt. - * - * Keep the complete source list here so updater consent cannot silently drift - * from the independently owned session, Automation, and shell lifecycles. - */ -export function hasInterruptibleUpdateWork(sources: AppUpdateActivitySources): boolean { - return sources.sessionActivities.hasActive() || - sources.automationScheduler.hasInFlight() || - sources.shellRuns.liveCount() > 0; -} diff --git a/apps/desktop/src/main/attachment-preview.ts b/apps/desktop/src/main/attachment-preview.ts index ee0e8432ce..df0508c7c2 100644 --- a/apps/desktop/src/main/attachment-preview.ts +++ b/apps/desktop/src/main/attachment-preview.ts @@ -76,9 +76,9 @@ export async function loadApprovalPreview(input: { } /** - * One registration for both execution modes (embedded sessions IPC and the - * Runtime Host boot path), so the channel's validation and wiring cannot - * drift between them. + * Register the client-owned attachment preview boundary used by Runtime Host + * Desktop. Preview admission and byte validation remain local because the + * renderer consumes this native presentation capability directly. */ export function registerAttachmentPreviewIpc(input: { ipcMain: { diff --git a/apps/desktop/src/main/automation-wiring.ts b/apps/desktop/src/main/automation-wiring.ts deleted file mode 100644 index de0b02a489..0000000000 --- a/apps/desktop/src/main/automation-wiring.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import { AutomationManager, AutomationScheduler, buildAutomationTool, type AutomationDefinition, type AutomationFireResult, type MakaTool } from '@maka/runtime'; -import { createAutomationStore } from '@maka/storage'; - -// The kind-aware fire gate lives in @maka/runtime so the desktop and CLI hosts -// share one definition and cannot diverge. Re-exported for existing importers. -export { evaluateAutomationCanFire } from '@maka/runtime'; - -/** - * Unified Automation wiring for the desktop main process. - */ -export interface MainAutomationWiring { - manager: AutomationManager; - scheduler: AutomationScheduler; - tools: MakaTool[]; - /** Load durable Automations from operational storage. Call once at startup. */ - loadDurableAutomations: () => Promise; -} - -export interface CreateMainAutomationWiringDeps { - workspaceRoot: string; - canFire: (automation: AutomationDefinition) => Promise; - /** Inject a turn into the automation's session; resolves after the stream finishes. */ - injectTurn: (sessionId: string, prompt: string, automationId: string) => Promise; - /** Spawn a fresh session + run (cron); resolves after the stream finishes. Omit to disable cron. */ - createFreshRun?: (prompt: string, automationId: string) => Promise; -} - -export function createMainAutomationWiring(deps: CreateMainAutomationWiringDeps): MainAutomationWiring { - const manager = new AutomationManager({ - generateId: () => randomUUID(), - now: () => Date.now(), - }); - - const store = createAutomationStore(deps.workspaceRoot); - - // Durable persistence is tied to cron capability: only a host that can run - // crons (createFreshRun present) owns durable Automations. A cron-disabled - // host has no durable state of its own and must not reconcile shared state. - const cronEnabled = deps.createFreshRun !== undefined; - - // If we fail to READ the existing durable store, we must not WRITE over it — a - // full-overwrite sync would erase crons we never loaded. Disable persistence - // (loudly) until the next restart re-reads successfully. - let durableStoreReadable = true; - - const syncDurableToStore = cronEnabled - ? (): void => { - if (!durableStoreReadable) return; - const all = manager.listAll().filter(a => a.durable && (a.status === 'active' || a.status === 'paused')); - store.sync(all).catch(err => { - console.warn('[automation-wiring] failed to sync durable automations:', err); - }); - } - : (): void => { /* no durable automations to persist on a cron-disabled host */ }; - - const scheduler = new AutomationScheduler({ - automationManager: manager, - canFire: deps.canFire, - injectTurn: deps.injectTurn, - createFreshRun: deps.createFreshRun, - setTimeout: (fn, ms) => setTimeout(fn, ms), - clearTimeout: (timer) => clearTimeout(timer as ReturnType), - onStateChange: syncDurableToStore, - }); - - const tools = [buildAutomationTool({ - automationManager: manager, - onAutomationChange: syncDurableToStore, - // Only advertise the cron kind when the host can actually spawn fresh runs. - cronEnabled: deps.createFreshRun !== undefined, - })]; - - const loadDurableAutomations = async (): Promise => { - if (!cronEnabled) return; // a cron-disabled host must not adopt/reconcile crons it doesn't own - try { - const saved = await store.loadAll(); - manager.registerAll(saved); - } catch (err) { - // Could not read the existing durable state — disable persistence so a - // later create/mutate cannot overwrite (and erase) the unread crons. - durableStoreReadable = false; - console.error('[automation-wiring] durable automation store unreadable; persistence disabled to avoid data loss:', err); - } - }; - - return { manager, scheduler, tools, loadDurableAutomations }; -} diff --git a/apps/desktop/src/main/boot.ts b/apps/desktop/src/main/boot.ts deleted file mode 100644 index 05f2829fe3..0000000000 --- a/apps/desktop/src/main/boot.ts +++ /dev/null @@ -1,1555 +0,0 @@ -import { app, dialog, ipcMain, powerSaveBlocker, shell } from 'electron'; -import { randomUUID } from 'node:crypto'; -import { join } from 'node:path'; -import { wireAppLifecycle } from './app-lifecycle.js'; -import { - collapseSessionRevisions, - filterModelVisibleTaskLedgerTasks, - isActiveShellRunStatus, - resolveSystemUiLocale, - resolveUiLocale, -} from '@maka/core'; -import type { - AppSettings, - BotProvider, - ConnectionEvent, - SessionChangedEvent, - SessionChangedReason, - SessionEvent, - SessionHeader, - UpdateAppSettingsInput, -} from '@maka/core'; -import { deriveBotStatusPersistenceUpdate } from './bot-status-persistence.js'; -import { runThreadSearch } from './search/thread-search.js'; -import { assembleDesktopTools } from './tool-assembly.js'; -import { createToolArtifactPersistence } from './tool-artifact-persistence.js'; -import { ClaudeSubscriptionService } from './oauth/claude-subscription-service.js'; -import { OpenAiCodexService } from './oauth/openai-codex-service.js'; -import { createOpenAiCodexE2eFixtureService } from './openai-codex-e2e-fixture.js'; -import { GitHubCopilotSubscriptionService } from './oauth/github-copilot-subscription-service.js'; -import { XaiOAuthService } from './oauth/xai-oauth-service.js'; -import { AntigravitySubscriptionService } from './oauth/antigravity-subscription-service.js'; -import type { WorkspacePrivacyContext } from '@maka/core/incognito'; -import { ok } from '@maka/core/result'; -import { - AgentGraphCoordinator, - AgentGraphSupervisorWakeCoordinator, - BackendRegistry, - FakeBackend, - SessionManager, - createLocalContinuationSafetyInspector, - createConfiguredSubagentCatalog, - buildDeepResearchTools, - getAIModel, - generateSessionTitle as generateRuntimeSessionTitle, - buildProviderOptions, - buildPricingLookup, - BotRegistry, - ShellRunProcessManager, - SessionActivityRegistry, - buildParentAgentTools, - listRunnableBuiltinAgentDefinitions, - listInvocableSkills, - renderAgentSwarmSupervisorWake, - prepareSkillInvocationMessage, - shouldWakeAgentSwarmSupervisor, - resolveSkillDiscoveryPaths, -} from '@maka/runtime'; -import type { - BotIncomingMessage, - BotStatus, - GoalTurnOutcome, - HostCapabilities, - HostCapabilitiesResolver, - MakaTool, -} from '@maka/runtime'; -import type { LlmConnection } from '@maka/core/llm-connections'; -import { - createSqliteArtifactStore, - createSqliteDeepResearchStore, - createReadImageSnapshotter, - createConnectionStore, - createGitWorktreeChildExecutor, - createSqlitePlanReminderStore, - createSqlitePlanStore, - createProjectCatalog, - openRuntimeEventPersistence, - createSessionStore, - createSettingsStore, - createMcpConfigStore, - createSqliteModelCallLedger, - createSqliteTelemetryRepo, -} from '@maka/storage'; -import { createAgentGraphControlStore } from '@maka/storage/agent-graph-control-store'; -import { resolveWorkspaceIdentity } from '@maka/storage/workspace-identity'; -import { McpClientManager } from '@maka/mcp'; -import { registerMcpIpcMain } from './mcp-ipc-main.js'; -import { - ensureSessionCanSendOrRebind, - errorMessage, - requireReadyConnection, -} from './chat-readiness.js'; -import { assertDesktopExecutionBoundary } from './desktop-execution-admission.js'; -import { createFileCredentialStore } from './credential-store.js'; -import { bindOnboardingDeps, createOnboardingService } from './onboarding-service.js'; -import { createDailyReviewArchiveStore } from './daily-review-archive-store.js'; -import { projectEmbeddedDeepResearch } from './deep-research-desktop-projection.js'; -import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js'; -import { resolveBuildInfo } from './build-info.js'; -import { resolveShellEnv } from './shell-env.js'; -import { LocalMemoryService } from './local-memory-service.js'; -import { createAttachmentApprovalRegistry } from './attachment-approval.js'; -import { cleanupLegacyHistoryCompactArtifacts } from '@maka/runtime'; -import { computerUseServiceHealth } from './computer-use-host.js'; -import { createMainWindowController } from './main-window.js'; -import { createDailyReviewMainService } from './daily-review-main.js'; -import { createPlanReminderMainService } from './plan-reminders-main.js'; -import { createBotIncomingMainService } from './bot-incoming-main.js'; -import { createEmbeddedBotSessionAdapter } from './embedded-bot-session-adapter.js'; -import { createSubscriptionModelFetch } from './subscription-model-fetch.js'; -import { createSystemPromptMainService } from './system-prompt-main.js'; -import { createMainTaskLedgerWiring } from './task-ledger-wiring.js'; -import { createMainAutomationWiring, evaluateAutomationCanFire } from './automation-wiring.js'; -import { createMainGoalWiring } from './goal-wiring.js'; -import { createOAuthModelConnectionsMainService } from './oauth-model-connections-main.js'; -import { registerMemoryIpc } from './memory-ipc-main.js'; -import { registerSubscriptionIpc } from './subscription-ipc-main.js'; -import { registerBrowserIpc } from './browser-ipc-main.js'; -import { registerConnectionsIpc } from './connections-ipc-main.js'; -import { registerConfigIpc } from './config-ipc-main.js'; -import { registerPlanReminderIpc } from './plan-reminders-ipc-main.js'; -import { registerPetPackIpc } from './pet-pack-import.js'; -import { registerWorkspaceResourcesIpc } from './workspace-resources-ipc-main.js'; -import type { NewSessionSkillContext } from './workspace-resources-ipc-main.js'; -import { registerDailyReviewIpc } from './daily-review-ipc-main.js'; -import { registerInspectorIpc } from './inspector-ipc-main.js'; -import { registerUsageIpc } from './usage-ipc-main.js'; -import { registerWebSearchIpc } from './web-search-ipc-main.js'; -import { registerNotificationsIpc } from './notifications-ipc-main.js'; -import { registerAppIpc } from './app-ipc-main.js'; -import { createAppUpdateService } from './app-update-service.js'; -import { hasInterruptibleUpdateWork } from './app-update-activity.js'; -import { registerWorkspaceSearchIpc } from './workspace-search-ipc-main.js'; -import { registerOnboardingIpc } from './onboarding-ipc-main.js'; -import { registerPermissionsIpc } from './permissions-ipc-main.js'; -import { ensureBundledSkillInstalled } from './skills.js'; -import { - createPermissionOverlayMain, - registerPermissionOverlayIpc, -} from './permission-overlay/permission-overlay-main.js'; -import { registerSettingsIpc } from './settings-ipc-main.js'; -import type { SettingsIpcHandle } from './settings-ipc-main.js'; -import { createE2eFixtureBotOnboardingAdapters } from './bot-onboarding-e2e-fixture.js'; -import { createKeepSystemAwakeController } from './keep-system-awake.js'; -import { createSettingsRuntimeEffects } from './settings-runtime-effects.js'; -import { createAiSdkBackendFactory, createSessionStreamer } from './session-stream.js'; -import { - resolveDesktopBackendToolSurface, - resolveDesktopChildToolSurface, - resolveDesktopNewSessionSkillHost, - resolveDesktopSessionSkillHost, -} from './desktop-backend-tool-surface.js'; -import { registerSessionsIpc } from './sessions-ipc-main.js'; -import { registerAgentGraphIpc } from './agent-graph-ipc-main.js'; -import { - assertSessionCanSendFromHeader, - isSessionLifecycleError, - sessionLifecycleErrorFromReadFailure, -} from './session-lifecycle.js'; -import { createProjectRootController } from './project-root-controller.js'; -import { createProjectManagementService } from './project-management-service.js'; -import { - type DesktopCreateSessionInput, - resolveDesktopSessionSelection, - resolveNewSessionProjectInput, -} from './new-session-project.js'; -import { - assertSessionWorkspaceAvailable, - isSessionWorkspaceUnavailableError, - resolveProjectContextRoot, -} from './project-context-root.js'; -import { isComputerUseRealModelE2e, isE2e, isIsolatedE2e } from './startup-context.js'; -import { resolveDesktopStorageRoot } from './storage-root-startup.js'; -import { startupStep, whileAwaitingPerson } from './startup-step.js'; -import { openDesktopExecutionStoreWiring } from './execution-store-wiring.js'; - -const buildInfo = resolveBuildInfo(app.isPackaged, app.getAppPath()); - -// Resolve the user's login-shell PATH before any stores, tools, or child -// processes are created. On macOS, apps launched from Finder/Dock inherit a -// minimal PATH that lacks /opt/homebrew/bin, ~/.local/bin, etc. Only PATH is -// imported; application-control variables remain owned by this process. -// Skipped on Windows, when MAKA_SKIP_SHELL_ENV=1, and when launched from a -// terminal (TERM/COLORTERM set). -await resolveShellEnv(); - -// PR-VISUAL-SMOKE-HEADLESS: resolve the fixture defensively. An unknown -// scenario (e.g. a stale build, or a typo'd MAKA_E2E_FIXTURE) throws -// here during top-level module evaluation. Left uncaught it surfaces a -// blocking native error dialog. In fixture mode we instead log a parseable -// line and exit fast so the run fails in milliseconds with no dialog. -// Outside fixture mode the throw is rethrown. -let e2eFixture: ReturnType; -try { - e2eFixture = resolveE2eFixture( - process.env.MAKA_E2E_FIXTURE, - app.isPackaged, - process.env.MAKA_E2E_FIXTURE_REDUCED_MOTION, - process.env.MAKA_E2E_FIXTURE_THEME, - process.env.MAKA_E2E_FIXTURE_LOCALE, - process.env.MAKA_E2E_FIXTURE_TIMEZONE, - process.env.MAKA_E2E_FIXTURE_PLATFORM, - ); -} catch (error) { - if (process.env.MAKA_E2E_FIXTURE) { - console.error(`[e2e-fixture] fatal: ${error instanceof Error ? error.message : String(error)}`); - process.exit(1); - } - throw error; -} -const userDataDir = app.getPath('userData'); -const workspaceRoot = join(userDataDir, 'workspaces', e2eFixture?.workspaceName ?? 'default'); -const credentialStore = createFileCredentialStore(workspaceRoot); -if (e2eFixture) { - console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`); - await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore }); -} else { - const storageRoot = await startupStep( - 'storage root', - resolveDesktopStorageRoot(workspaceRoot, { - confirmRepair: confirmDesktopStorageRootRepair, - }), - ); - if (!storageRoot) { - app.exit(0); - await new Promise(() => {}); - } -} - -async function confirmDesktopStorageRootRepair(): Promise { - if (!app.isReady()) { - throw new Error('storage-root repair dialog requires app ready'); - } - // Explicit startup contract for the storage-root-conflict E2E: printed - // synchronously before the modal, so the test can observe the gate firing - // on any platform (macOS modal loops block CDP evaluation, Linux does not). - console.log('[storage-root] root-identity conflict; parking at repair dialog'); - const isChinese = resolveSystemUiLocale(app.getPreferredSystemLanguages()) === 'zh'; - // The person owns this delay, so the startup reporter stops calling it a - // hang — otherwise reading the dialog for four seconds prints "still waiting - // on storage root" at somebody who is looking straight at the reason. It - // still says once that an answer is expected, which is the only line printed - // when this dialog fails to appear at all. - const { response } = await whileAwaitingPerson( - dialog.showMessageBox({ - type: 'warning', - title: isChinese ? 'Maka 工作区需要修复' : 'Maka workspace needs repair', - message: isChinese ? 'Maka 无法验证这个工作区。' : 'Maka cannot verify this workspace.', - detail: isChinese - ? `系统中的磁盘标识可能发生了变化。仅当这是本机原来的 Maka 工作区、而不是复制出的工作区时，才选择修复。\n\n${workspaceRoot}` - : `The disk identity may have changed. Repair only if this is the original Maka workspace on this computer, not a copied workspace.\n\n${workspaceRoot}`, - buttons: isChinese ? ['修复工作区', '退出'] : ['Repair Workspace', 'Exit'], - defaultId: 1, - cancelId: 1, - noLink: true, - }), - ); - return response === 0; -} -// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron -// `powerSaveBlocker` so in-process scheduled tasks keep firing while the -// machine would otherwise sleep. Injected with electron's blocker; the -// controller owns the id + double-start guard. The blocker dies with the -// process, so quit needs no special teardown. -const keepSystemAwake = createKeepSystemAwakeController(powerSaveBlocker); -const store = createSessionStore(workspaceRoot); -const agentGraphControlStore = createAgentGraphControlStore(workspaceRoot); -const projectCatalog = createProjectCatalog(workspaceRoot, { - onLegacyImportFailure: (error) => - console.error('[projects] projects.json could not be imported:', error), -}); -const worktreeChildExecutor = createGitWorktreeChildExecutor({ storageRoot: workspaceRoot }); -const planStore = createSqlitePlanStore(workspaceRoot); -const executionStoreWiring = await startupStep( - 'execution store', - openDesktopExecutionStoreWiring(workspaceRoot), -); -const { runStore, shellRunStore } = executionStoreWiring; -const runtimePersistence = await startupStep( - 'runtime event persistence', - openRuntimeEventPersistence({ - workspaceRoot, - }), -); -const runtimeEventStore = runtimePersistence.runtimeEventStore; -const connectionStore = createConnectionStore(workspaceRoot); -const settingsStore = createSettingsStore(workspaceRoot); -const subagentCatalog = createConfiguredSubagentCatalog({ - getSettings: () => settingsStore.get(), - getConnection: (slug) => connectionStore.get(slug), -}); -const mcpConfigStore = createMcpConfigStore(workspaceRoot); -const mcpManager = new McpClientManager({ clientName: 'maka-desktop', clientVersion: app.getVersion() }); -let mcpStartup: Promise | undefined; -function ensureMcpReady(): Promise { - if (!mcpStartup) { - const startup = mcpConfigStore.get().then((config) => mcpManager.sync(config)); - mcpStartup = startup; - void startup.catch(() => { - if (mcpStartup === startup) mcpStartup = undefined; - }); - } - return mcpStartup; -} -const telemetryRepo = createSqliteTelemetryRepo(workspaceRoot); -// Canonical model-call accounting ledger (#1679). Separate store, same -// operational database: `telemetryRepo` is now a frozen historical projection -// for LLM calls, and every model call dispatched from here settles into this. -const modelCallLedger = createSqliteModelCallLedger(workspaceRoot); -const dailyReviewArchiveStore = createDailyReviewArchiveStore(workspaceRoot); -const artifactStore = createSqliteArtifactStore(workspaceRoot); -const deepResearchStore = createSqliteDeepResearchStore(workspaceRoot); -const storeReadImage = createReadImageSnapshotter(artifactStore); -const attachmentApprovals = createAttachmentApprovalRegistry(); -// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service. -// Lives in main process only; renderer accesses via IPC. Tokens -// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic- -// imported behind MAKA_CLAUDE_SUBSCRIPTION_CLOAK flag (xuan G-X4) -// and lives in a separate module not statically imported here. -const claudeSubscription = new ClaudeSubscriptionService({ - userDataDir: app.getPath('userData'), - openExternal: (url) => shell.openExternal(url), - credentialStore, -}); -// PR-MODEL-OAUTH-ALL-0: Codex / Antigravity subscription -// services. Same shape as `claudeSubscription` — main-process only, -// IPC payloads never carry tokens, each gated behind its own -// MAKA_*_EXPERIMENTAL env var. Antigravity is a `preview` placeholder -// until the Google client_id question is resolved. -const openAiCodex = e2eFixture?.scenario === 'oauth-relogin' - ? createOpenAiCodexE2eFixtureService() - : new OpenAiCodexService({ - userDataDir: app.getPath('userData'), - openExternal: (url) => shell.openExternal(url), - credentialStore, - }); -const githubCopilotSubscription = new GitHubCopilotSubscriptionService({ credentialStore }); -const xaiOAuth = new XaiOAuthService({ - credentialStore, - openExternal: (url) => shell.openExternal(url), -}); -const buildSubscriptionModelFetch = createSubscriptionModelFetch({ - claudeSubscription, - openAiCodex, - xaiOAuth, -}); -const oauthModelConnections = createOAuthModelConnectionsMainService({ - connectionStore, - credentialStore, - claudeSubscription, - openAiCodex, - githubCopilotSubscription, - xaiOAuth, - ...(e2eFixture?.scenario === 'oauth-relogin' - ? { fetchModels: async () => [{ id: 'gpt-5.6-sol' }] } - : {}), -}); -const isClaudeSubscriptionAuthenticatedState = oauthModelConnections.isClaudeSubscriptionAuthenticatedState; - -function syncClaudeSubscriptionConnection(): Promise { - return oauthModelConnections.syncClaudeSubscriptionConnection(); -} -function activateXaiOAuthConnection(): Promise { - return oauthModelConnections.activateXaiOAuthConnection(); -} -function syncXaiOAuthConnection(): Promise { - return oauthModelConnections.syncXaiOAuthConnection(); -} - -function syncOpenAiCodexConnection(): Promise { - return oauthModelConnections.syncOpenAiCodexConnection(); -} - -function activateOpenAiCodexConnection(): Promise { - return oauthModelConnections.activateOpenAiCodexConnection(); -} - -function syncGitHubCopilotConnection(): Promise { - return oauthModelConnections.syncGitHubCopilotConnection(); -} - -function syncOAuthModelConnections(): Promise { - return oauthModelConnections.syncOAuthModelConnections(); -} - -function disconnectManagedOAuthConnection(connection: LlmConnection): Promise { - return oauthModelConnections.disconnectManagedOAuthConnection(connection); -} - -function resolveConnectionSecret(slug: string): Promise { - return oauthModelConnections.resolveConnectionSecret(slug); -} - -/** - * Read-only credential-presence check for status paths (onboarding's - * `getSnapshot`) that must not trigger `resolveConnectionSecret`'s - * OAuth near-expiry refresh — that refresh hits the network and - * mutates local token state, which a read-only status read must never - * do just by being observed. Send/test/fetch-models paths keep using - * `resolveConnectionSecret` so they still benefit from the refresh. - * - * Takes the `LlmConnection` directly rather than a slug: callers that - * already hold the connection list (onboarding does) skip the extra - * `connectionStore.get()` round trip and derive state from one - * consistent snapshot. - */ -function hasConnectionSecret(connection: LlmConnection): Promise { - return oauthModelConnections.hasConnectionSecret(connection); -} -const antigravitySubscription = new AntigravitySubscriptionService({ - userDataDir: app.getPath('userData'), - openExternal: (url) => shell.openExternal(url), - credentialStore, -}); - -const planReminderStore = createSqlitePlanReminderStore(workspaceRoot); -const taskLedgerWiring = createMainTaskLedgerWiring(workspaceRoot); -const taskLedgerStore = taskLedgerWiring.store; - -async function closeWorkflowStores(): Promise { - const stores = [ - planStore, - deepResearchStore, - planReminderStore, - taskLedgerStore, - ]; - const errors: unknown[] = []; - for (const result of await Promise.allSettled(stores.map((workflowStore) => workflowStore.ready()))) { - if (result.status === 'rejected') errors.push(result.reason); - } - for (const workflowStore of stores) { - try { - workflowStore.close(); - } catch (error) { - errors.push(error); - } - } - if (errors.length > 0) throw new AggregateError(errors, 'Unable to close workflow stores'); -} - -const sessionActivities = new SessionActivityRegistry(); - -// Unified Automation — single "Automation" tool for heartbeat + cron. -// Deps are resolved lazily since runtime/store aren't ready at this point. -const automationWiring = createMainAutomationWiring({ - workspaceRoot, - async canFire(automation): Promise { - // Kind-aware fire gate (see evaluateAutomationCanFire): incognito blocks all; - // cron is never gated on its creator session; heartbeat needs an idle session. - return evaluateAutomationCanFire(automation, { - isIncognitoActive: async () => (await getWorkspacePrivacyContext()).incognitoActive, - readSessionHeader: (sessionId) => store.readHeader(sessionId), - }); - }, - // Heartbeat: inject into the automation's own session; resolve after the stream. - async injectTurn(sessionId: string, prompt: string, automationId: string) { - await ensureSessionCanSend(sessionId); - const turnId = randomUUID(); - const iterator = runtime.sendMessage(sessionId, { - turnId, text: prompt, origin: { kind: 'automation', automationId }, - }); - const r = await streamEvents(sessionId, iterator, { - turnId, - goalBoundary: 'external', - }); - return { runId: turnId, ok: r.ok, ...(r.error ? { error: r.error } : {}) }; - }, - // Cron: spawn a FRESH session (explore mode — no unapproved side effects) and - // run the prompt there, so each fire is a first-class session + run. - async createFreshRun(prompt: string, automationId: string) { - const slug = await connectionStore.getDefault(); - const { connection, model } = await getReadyConnection(slug, undefined); - const session = await createDesktopSession({ - backend: 'ai-sdk', - llmConnectionSlug: connection.slug, - model, - permissionMode: 'explore', - name: `Automation: ${prompt.slice(0, 32)}`, - labels: ['automation', 'cron'], - }); - emitSessionsChanged('created', session.id); - await ensureSessionCanSend(session.id); - const turnId = randomUUID(); - const iterator = runtime.sendMessage(session.id, { - turnId, text: prompt, origin: { kind: 'automation', automationId }, - }); - const r = await streamEvents(session.id, iterator, { - turnId, - goalBoundary: 'external', - }); - // Archive the fresh cron session after its run finalizes so recurring crons - // do not accumulate an unbounded pile of active sessions. The session (with - // its run/trace) is preserved under the archive, labelled automation/cron. - try { - await agentGraphCoordinator.stop(session.id); - await goalWiring.archiveSession(session.id, () => runtime.archive(session.id)); - desktopSessionSkillHosts.delete(session.id); - emitSessionsChanged('archived', session.id); - } catch {} - return { runId: turnId, ok: r.ok, ...(r.error ? { error: r.error } : {}) }; - }, -}); - -// Load durable Automations from operational storage on startup. -void automationWiring.loadDurableAutomations(); - -// Goal execution — autonomous turn-boundary continuation with an external -// evaluator (CC-style). Self-contained: no automation coupling (a goal is -// bounded by its own caps; a waiting goal re-checks via normal continuation). -const goalWiring = createMainGoalWiring({ - getDefaultConnectionSlug: () => connectionStore.getDefault(), - getConnection: (slug) => connectionStore.get(slug), - getSessionModel: async (sessionId) => { - const header = await store.readHeader(sessionId); - if (!header) return null; - return { connectionSlug: header.llmConnectionSlug, model: header.model }; - }, - resolveConnectionSecret, - buildSubscriptionModelFetch, - getAIModel: (input) => getAIModel(input), - buildProviderOptions: (connection, modelId) => buildProviderOptions(connection, modelId), - getRecentMessages: async (sessionId) => { - const messages = await runtime.getMessages(sessionId); - return messages.slice(-10).map((m) => ({ - type: m.type, - text: m.type === 'user' || m.type === 'assistant' ? m.text : undefined, - })); - }, - getTokenCount: async (sessionId) => { - const messages = await runtime.getMessages(sessionId); - let total = 0; - for (const m of messages) { - if (m.type === 'token_usage') total += (m.total ?? (m.input + m.output)); - } - return total; - }, - admitTurn: (sessionId, text) => { - const whenIdle = sessionActivities.whenIdle(sessionId); - if (whenIdle) return { kind: 'busy', whenIdle }; - const reservation = sessionActivities.reserve(sessionId); - const turnId = randomUUID(); - return { - kind: 'prepared', - turnId, - start: async (): Promise => { - try { - await ensureSessionCanSend(sessionId); - const iterator = runtime.sendMessage(sessionId, { turnId, text }); - return (await streamEvents(sessionId, iterator, { - turnId, - goalBoundary: 'coordinator', - activity: reservation, - })).outcome; - } catch (error) { - reservation.release(); - return { - kind: 'errored', - turnId, - reason: `Goal continuation could not start: ${errorMessage(error)}`, - }; - } - }, - }; - }, - // Surface every goal transition to the renderer so an active autonomous loop - // is visible (badge + clear affordance) — never a silent token burn. - onGoalChange: (goal) => emitSessionsChanged('goal-change', goal.sessionId), - listActionableTaskKeys: async (sessionId) => { - const tasks = await taskLedgerStore.list(sessionId, { - includeTerminal: false, - includeArchived: false, - }); - return filterModelVisibleTaskLedgerTasks(tasks) - .filter((task) => task.status === 'pending' || task.status === 'in_progress') - .map((task) => task.key); - }, - recordTaskGateDecision: async (trace) => { - const runs = await runStore.listSessionRuns(trace.sessionId); - const run = runs.find((candidate) => candidate.turnId === trace.turnId); - if (!run) return; - await runStore.appendEvent(trace.sessionId, run.runId, { - type: 'task_gate_decided', - id: randomUUID(), - runId: run.runId, - sessionId: trace.sessionId, - turnId: trace.turnId, - ts: Date.now(), - message: `Task gate: ${trace.decision}`, - data: { - goalId: trace.goalId, - decision: trace.decision, - taskKeys: trace.taskKeys, - }, - }); - }, -}); - -async function getWorkspacePrivacyContext(): Promise { - const settings = await settingsStore.get(); - return { incognitoActive: settings.privacy.incognitoActive === true }; -} - -const localMemory = new LocalMemoryService({ - workspaceRoot, - getSettings: () => settingsStore.get(), - updateSettings: (patch) => settingsStore.update(patch), - getPrivacyContext: getWorkspacePrivacyContext, -}); -// The synchronous Runtime Skill tools execute inside an already-built backend. -// Their resolver uses the exact host cached by that backend. Pre-send -// invocation and slash discovery derive a fresh surface from the persisted -// session header instead; see resolveDesktopSkillHostForSession below. -const desktopSessionSkillHosts = new Map(); -const resolveDesktopSkillHost: HostCapabilitiesResolver = ({ sessionId }) => - desktopSessionSkillHosts.get(sessionId) ?? desktopProductToolSurface.hostCapabilities; -// Window is created hidden for E2E and e2e-fixture runs so it never steals -// focus. Derived from the same isE2e gate as userData/fake-backend so the -// hidden-window switch stays in lockstep with the rest of the E2E isolation. -// MAKA_E2E_SHOW_WINDOW opts back into a visible window where there is no -// focus to steal (CI under xvfb): hidden windows only get ~1fps compositor -// BeginFrames on Linux, which stalls content-visibility inflation and any -// frame-paced E2E protocol (measured in the scroll-geometry climb: 38 frames -// over 31s). The E2E harness sets it, not the workflow — see fixtures.ts. -// This value is also what hides the macOS dock icon (see app-lifecycle.ts): -// staying out of sight and staying out of the Dock are one decision, so a run -// that opts into a visible window also opts back into Dock and Cmd+Tab. -const startHidden = (Boolean(e2eFixture) || isIsolatedE2e) - && process.env.MAKA_E2E_SHOW_WINDOW !== '1'; -let onMainWindowClose = (): void => {}; -const mainWindowController = createMainWindowController({ - workspaceRoot, - e2eFixture, - settingsStore, - startHidden, - onClose: () => onMainWindowClose(), -}); -// Shared by 'second-instance' and 'activate': focus the existing window, or -// create one if all windows were closed while the app (macOS: still in the -// dock) stayed running -- a second launch attempt must not be a silent no-op. -function focusOrCreateMainWindow(signal: AbortSignal): void { - if (mainWindowController.hasOpenWindows()) { - mainWindowController.focus(); - } else { - void mainWindowController - .createWindow(signal) - .catch((error) => console.error('[window] failed to create:', error)); - } -} -const safeSendToRenderer = mainWindowController.send; -const updateMockState = process.env.MAKA_UPDATE_MOCK_STATE === 'available' || - process.env.MAKA_UPDATE_MOCK_STATE === 'downloading' || - process.env.MAKA_UPDATE_MOCK_STATE === 'downloaded' - ? process.env.MAKA_UPDATE_MOCK_STATE - : undefined; -taskLedgerStore.subscribe((event) => safeSendToRenderer('tasks:changed', event)); -deepResearchStore.subscribe((event) => safeSendToRenderer('deepResearch:changed', event)); -const deepResearchTools = buildDeepResearchTools({ - store: deepResearchStore, - artifactStore, - onArtifactCreated: (event) => safeSendToRenderer('artifacts:changed', event), -}); -const backends = new BackendRegistry(); -const shellRuns = new ShellRunProcessManager({ - store: shellRunStore, - newId: randomUUID, - now: Date.now, - onShellRunUpdate: (update) => { - safeSendToRenderer('shell-runs:update', update); - }, - onPtyData: (event) => { - safeSendToRenderer('shell-runs:pty-data', event); - }, -}); -const updateService = createAppUpdateService({ - currentVersion: app.getVersion(), - isPackaged: app.isPackaged, - mockLatestVersion: process.env.MAKA_UPDATE_MOCK_VERSION, - mockState: updateMockState, - onStatusChange: (status) => safeSendToRenderer('app:updateStatusChanged', status), - hasActiveTasks: () => hasInterruptibleUpdateWork({ - sessionActivities, - automationScheduler: automationWiring.scheduler, - shellRuns, - }), -}); -const { - persistToolArtifacts, - snapshotReadImage, - toolResultArchive, -} = createToolArtifactPersistence({ artifactStore, storeReadImage, safeSendToRenderer }); - -const { - riveTools, - browserTools, - computerUse, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - desktopProductToolSurface, - builtinTools, - childAgentTools, - sandboxDiagnosticsProvider, -} = assembleDesktopTools({ - // The mirror anchors to the app window and becomes its child; without this - // it falls back to floating above every application on the primary display, - // with no pointer to hover-test against and so no controls at all. - mainWindow: mainWindowController, - keepSystemAwake, - isComputerUseRealModelE2e, - workspaceRoot, - taskLedgerStore, - taskLedgerWiring, - automationWiring, - goalWiring, - settingsStore, - updateAgentSettings, - shellRuns, - artifactStore, - snapshotReadImage, - getWorkspacePrivacyContext, - resolveDesktopSkillHost, -}); -if (computerUse.backendId !== 'none') { - const seededComputerUseSkill = await startupStep( - 'Computer Use skill', - ensureBundledSkillInstalled(workspaceRoot, 'computer-use'), - ); - if (!seededComputerUseSkill.ok) { - console.warn( - `[skills] Computer Use is available, but its bundled Skill was not installed: ${seededComputerUseSkill.reason}`, - ); - } -} -let agentGraphCoordinator: AgentGraphCoordinator; -let agentGraphSupervisorWakeCoordinator: AgentGraphSupervisorWakeCoordinator; -const desktopBackendToolSurfaceDeps = { - isComputerUseRealModelE2e, - ensureMcpReady, - getReadyConnection, - mcpManager, - deepResearchTools, - computerUseTools, - builtinTools, - toolEconomy: desktopProductToolSurface.identity.policy.economy, - planStore, - getWebSearchSettings: async () => (await settingsStore.get()).webSearch, - getPrivacySettings: async () => (await settingsStore.get()).privacy, - childTools: childAgentTools, - buildParentAgentToolsForChildSurface: (tools: readonly MakaTool[]) => - buildParentAgentTools({ - taskLedger: taskLedgerStore, - definitions: listRunnableBuiltinAgentDefinitions({ - tools, - worktreeChildExecutorAvailable: worktreeChildExecutor !== undefined, - }), - }), - getAgentGraphSupervisorTools: (sessionId: string) => - agentGraphCoordinator.toolsForSession(sessionId), -}; - -async function resolveDesktopChildTools(sessionId: string) { - const header = await store.readHeader(sessionId); - return resolveDesktopChildToolSurface(desktopBackendToolSurfaceDeps, { - header, - tools: childAgentTools, - }); -} -// Cursor-overlay teardown assigns a module-scoped `let`, so it stays in boot.ts. -onMainWindowClose = () => { - computerUseOverlay.destroyAll(); - // The mirror is a child of the window that just closed; without this it - // outlives its parent, still polling the pointer at 20Hz. - computerUsePip.destroyAll(); -}; -const systemPromptService = createSystemPromptMainService({ - settingsStore, - workspaceRoot, - localMemory, - taskLedger: taskLedgerStore, - goalManager: goalWiring.manager, - hostCapabilities: desktopProductToolSurface.hostCapabilities, -}); -let lookupPricing = buildPricingLookup(); -let usageReadiness: Promise | undefined; -function ensureUsageReady(): Promise { - if (!usageReadiness) { - const readiness = telemetryRepo.load().then(() => { - lookupPricing = buildPricingLookup(telemetryRepo.listPricingOverrides()); - }); - usageReadiness = readiness; - void readiness.catch(() => { - if (usageReadiness === readiness) usageReadiness = undefined; - }); - } - return usageReadiness; -} -// Track the last status fields that affect persisted diagnostics. The reason -// is part of the key because a running bridge can remain degraded while a -// newer, more useful failure replaces the previous one. -const previousBotStatus = new Map>(); -let botIncoming: ReturnType; -// Single authority for the "current project root" selection, shared across the -// app/window, git, workspace-search, and session-entry IPC surfaces. -// botIncoming and automation cron runs read the current -// selection through the thin `resolveCurrentProjectRoot` adapter below. -const projectRootController = createProjectRootController({ - lastProjectPathFile: join(workspaceRoot, 'last-project-path.json'), - fallbackRoots: () => [process.cwd(), app.getAppPath()], -}); -const projectManagement = createProjectManagementService({ - catalog: projectCatalog, - sessions: store, - chooseDirectory: async () => { - const result = await mainWindowController.showOpenDialog({ - title: '添加项目', - properties: ['openDirectory'], - }); - return result.canceled ? undefined : result.filePaths[0]; - }, - selection: projectRootController, -}); -const resolveCurrentProjectRoot: () => Promise = () => projectRootController.current(); -const resolveProjectRootForContext = (sessionId: unknown): Promise => - resolveProjectContextRoot(sessionId, { - currentProjectRoot: resolveCurrentProjectRoot, - readSessionCwd: async (id) => (await store.readHeader(id)).cwd, - }); -const botRegistry = new BotRegistry({ - onIncomingMessage: (message: BotIncomingMessage) => { - // Only log incoming bot messages in dev — production stdout leaking - // platform + chatId is operational noise at best and a small privacy - // signal at worst (which bridges are connected, with what frequency). - if (process.env.VITE_DEV_SERVER_URL || process.env.NODE_ENV === 'development') { - console.log('[bot] incoming message', message.platform, message.chatId); - } - void botIncoming.handleBotIncomingMessage(message); - }, - onStatusChange: (status: BotStatus) => { - safeSendToRenderer('settings:bots:statusChanged', status); - // PR-BOT-LASTERROR-FROM-SEND-0: persist send-path failure reasons - // to settings so they survive a Settings page close/reopen. The - // existing connection-test path writes `lastError` only on test - // failures; without this hook, a runtime 429 / timeout would - // disappear the moment the renderer status panel closed. - const previous = previousBotStatus.get(status.platform); - previousBotStatus.set(status.platform, { - readiness: status.readiness, - reason: status.reason, - }); - const update = deriveBotStatusPersistenceUpdate(previous, status); - if (update) { - void settingsStore.update({ - botChat: { - channels: { - [status.platform]: { - ...update, - readinessUpdatedAt: Date.now(), - }, - }, - }, - }).catch(() => {}); - } - }, -}); -const planReminders = createPlanReminderMainService({ - store: planReminderStore, - getPrivacyContext: getWorkspacePrivacyContext, - sendBotMessage: (platform, chatId, text) => - botRegistry.sendMessage(platform, chatId, text), - emitChanged: (reason, reminder) => { - safeSendToRenderer('plans:changed', { - type: 'plans_changed', - reason, - reminderId: reminder.id, - ts: Date.now(), - }); - }, - emitDue: (reminder) => { - safeSendToRenderer('plans:due', reminder); - }, -}); - - -backends.register('ai-sdk', createAiSdkBackendFactory({ - ...desktopBackendToolSurfaceDeps, - buildSubscriptionModelFetch, - systemPromptService, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - artifactStore, - desktopSessionSkillHosts, - sandboxDiagnosticsProvider, - persistToolArtifacts, - toolResultArchive, - runtimeCommitStore: runtimePersistence.runtimeCommitStore, - safeSendToRenderer, - emitSessionsChanged, - getRuntime: () => runtime, - getLookupPricing: () => lookupPricing, -})); - -backends.register('fake', (ctx) => - new FakeBackend({ sessionId: ctx.sessionId, header: ctx.header, store: ctx.store, appendMessage: ctx.appendMessage }), -); - -// E2E: also route 'ai-sdk' (requested by sessions:create, the single -// session-creation IPC) through the deterministic fake backend, so no -// session-creation path can escape the E2E seam and hit a real provider. -// Registered after the real ai-sdk factory to override it (BackendRegistry -// uses last-write-wins). -// Production builds never set MAKA_E2E. -if (isE2e) { - backends.register('ai-sdk', (ctx) => - new FakeBackend({ sessionId: ctx.sessionId, header: ctx.header, store: ctx.store, appendMessage: ctx.appendMessage }), - ); -} - -const runtime = new SessionManager({ - store, - planStore, - runStore, - runtimeEventStore, - ...(runtimePersistence.runtimeCommitStore - ? { - runtimeCommitSink: runtimePersistence.runtimeCommitStore, - toolBoundaryProtocol: runtimePersistence.runtimeCommitStore.toolBoundaryProtocol, - } - : {}), - shellRuns, - backends, - childTools: childAgentTools, - resolveChildTools: resolveDesktopChildTools, - subagentCatalog, - worktreeChildExecutor, - safeBoundaryResumeEnabled: process.env.MAKA_RUNTIME_SAFE_BOUNDARY_RESUME === '1', - onContinuationLifecycleEvent: (event) => { - console.info('[runtime-resume]', JSON.stringify(event)); - }, - inspectContinuationSafety: createLocalContinuationSafetyInspector({ - readSessionCwd: async (sessionId) => (await store.readHeader(sessionId)).cwd, - resolveWorkspaceIdentity: async (cwd) => resolveWorkspaceIdentity({ path: cwd }), - listAvailableToolNames: async () => builtinTools.map((tool) => tool.name), - hasPendingBackgroundOperations: async (sessionId) => { - const [shellUpdates, runs] = await Promise.all([ - shellRuns.listSessionUpdates(sessionId), - runStore.listSessionRuns(sessionId), - ]); - return ( - shellUpdates.some((update) => isActiveShellRunStatus(update.result.status)) || - runs.some( - (run) => - run.parentRunId !== undefined && - ['created', 'running', 'waiting_for_user'].includes(run.status), - ) - ); - }, - }), - listArtifactsForTurn: async (sessionId, turnId) => - (await artifactStore.list(sessionId)).filter((artifact) => - artifact.turnId === turnId && artifact.status !== 'deleted' - ), - cleanupHistoryCompactArtifacts: async (input) => { - await cleanupLegacyHistoryCompactArtifacts({ - ...input, - artifactStore, - onDiagnostic: (diagnostic) => console.warn('[history-compact-cleanup]', diagnostic), - }); - }, - generateSessionTitle: async ({ sessionId, header, sourceText }) => { - const { connection, apiKey, model } = await getReadyConnection(header.llmConnectionSlug, header.model); - return generateRuntimeSessionTitle({ - model: getAIModel({ - connection, - apiKey: apiKey ?? '', - modelId: model, - fetch: buildSubscriptionModelFetch(connection, sessionId, model), - }), - providerOptions: buildProviderOptions(connection, model), - sourceText, - }); - }, - onSessionTitleChanged: (sessionId) => emitSessionsChanged('renamed', sessionId), - newId: randomUUID, - now: Date.now, -}); -agentGraphSupervisorWakeCoordinator = new AgentGraphSupervisorWakeCoordinator({ - activityRegistry: sessionActivities, - wakeStore: agentGraphControlStore, - readSnapshot: (rootSessionId) => agentGraphCoordinator.getSnapshot(rootSessionId), - startTurn: async (sessionId, input, activity, abortSignal) => { - let stopPromise: Promise | undefined; - const stop = () => { - stopPromise ??= runtime.stopSession(sessionId, { source: 'graph_supervisor' }); - }; - abortSignal.addEventListener('abort', stop, { once: true }); - if (abortSignal.aborted) stop(); - try { - await ensureSessionCanSend(sessionId); - if (abortSignal.aborted) { - return { kind: 'aborted', turnId: input.turnId }; - } - const iterator = runtime.sendMessage(sessionId, input); - return ( - await streamEvents(sessionId, iterator, { - turnId: input.turnId, - goalBoundary: 'none', - activity, - }) - ).outcome; - } finally { - abortSignal.removeEventListener('abort', stop); - await stopPromise; - } - }, - inspectAttempt: async (rootSessionId, attemptId, turnId) => { - const runs = (await runStore.listSessionRuns(rootSessionId)).filter( - (run) => run.agentGraphWakeAttemptId === attemptId && run.turnId === turnId, - ); - if (runs.length > 1) { - throw new Error( - `Agent graph supervisor wake attempt ${attemptId} has multiple AgentRuns`, - ); - } - return runs[0]?.status ?? 'missing'; - }, - shouldWake: shouldWakeAgentSwarmSupervisor, - renderWake: renderAgentSwarmSupervisorWake, - newId: randomUUID, - onError: (rootSessionId) => { - emitSessionsChanged('status-change', rootSessionId); - }, -}); -agentGraphCoordinator = new AgentGraphCoordinator({ - sessionStore: store, - runStore, - runtimeEventStore, - controlStore: agentGraphControlStore, - runtime, - newId: randomUUID, - onReconciliation: (rootSessionId, result) => { - agentGraphSupervisorWakeCoordinator.notify(rootSessionId, result); - }, - onCheckpoint: (rootSessionId) => { - agentGraphSupervisorWakeCoordinator.notify(rootSessionId); - }, -}); -let settingsIpc: SettingsIpcHandle | undefined; -let mcpToolSnapshot = JSON.stringify(mcpManager.tools()); -mcpManager.onChange(() => { - safeSendToRenderer('mcp:changed', mcpManager.statuses()); - const nextSnapshot = JSON.stringify(mcpManager.tools()); - if (nextSnapshot === mcpToolSnapshot) return; - mcpToolSnapshot = nextSnapshot; - void runtime.refreshIdleBackends().catch((error) => { - console.warn('[mcp] failed to refresh backend tool snapshots:', error); - }); -}); -const dailyReview = createDailyReviewMainService({ - archiveStore: dailyReviewArchiveStore, - connectionStore, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - listSessions: async () => collapseSessionRevisions(await runtime.listSessions()), - resolveConnectionSecret, - buildSubscriptionModelFetch, -}); -botIncoming = createBotIncomingMainService({ - botRegistry, - sessions: createEmbeddedBotSessionAdapter({ - runtime, - createSession: createDesktopSession, - getDefaultConnectionSlug: () => connectionStore.getDefault(), - getReadyConnection, - readSessionHeader: async (sessionId) => { - try { - return await store.readHeader(sessionId); - } catch (error) { - throw sessionLifecycleErrorFromReadFailure(error) ?? error; - } - }, - ensureSessionCanSend, - emitSessionsChanged, - runAgentTurn: ({ sessionId, iterator, turnId, onEvent }) => - streamEvents(sessionId, iterator, { - turnId, - goalBoundary: 'external', - observeEvent: onEvent, - }), - }), -}); - -// PR110b: onboarding service composes existing stores + runtime to -// derive `OnboardingState` and manage `OnboardingMilestone[]`. -// Constructed AFTER `runtime` so `listSessions()` is bindable. The -// service checks credential presence through `hasConnectionSecret` -// (read-only — recognizes OAuth-subscription connections like the -// send-path's `resolveConnectionSecret` does, but never refreshes), -// so simply opening onboarding can't hit the network or mutate token -// state. -const onboardingService = createOnboardingService( - bindOnboardingDeps({ - settingsStore, - connectionStore, - hasCredential: hasConnectionSecret, - listSessions: () => runtime.listSessions(), - }), -); - -function registerIpc(): void { - const currentProjectRoot = resolveCurrentProjectRoot; - ipcMain.handle('deepResearch:get', async (_event, sessionId: string) => - projectEmbeddedDeepResearch(await deepResearchStore.read(sessionId))); - registerMcpIpcMain({ - ipcMain, - store: mcpConfigStore, - manager: mcpManager, - ensureReady: ensureMcpReady, - refreshIdleBackends: () => runtime.refreshIdleBackends(), - emitChanged: (statuses) => safeSendToRenderer('mcp:changed', statuses), - }); - - registerAppIpc({ - mainWindowController, - projectRoot: projectRootController, - getSessionProjectRoot: async (sessionId) => (await store.readHeader(sessionId)).cwd, - getProjectRoot: resolveProjectRootForContext, - workspaceRoot, - buildInfo, - e2eFixture, - projectManagement, - updateService, - }); - registerMemoryIpc({ localMemory }); - registerConfigIpc({ connectionStore, settingsStore, credentialStore, workspaceRoot }); - registerNotificationsIpc({ settingsStore, mainWindowController, e2e: isE2e }); - registerWorkspaceResourcesIpc({ - workspaceRoot, - artifactStore, - mainWindowController, - sendToRenderer: safeSendToRenderer, - listInvocableSkills: listDesktopInvocableSkills, - skillHost: desktopProductToolSurface.hostCapabilities, - getCurrentProjectRoot: currentProjectRoot, - getSkillSelectionReport: systemPromptService.getLastSkillSelectionReport, - invalidateSkillSelectionReport: systemPromptService.invalidateSkillSelectionReport, - }); - registerPetPackIpc({ ipcMain, workspaceRoot, mainWindowController, settingsStore }); - registerWorkspaceSearchIpc({ getProjectRoot: resolveProjectRootForContext }); - registerPlanReminderIpc({ planReminders, getWorkspacePrivacyContext }); - registerAgentGraphIpc({ - coordinator: agentGraphCoordinator, - sendToRenderer: safeSendToRenderer, - }); - registerSessionsIpc({ - workspaceRoot, - runtime, - shellRuns, - store, - taskLedgerStore, - goalWiring, - automationManager: automationWiring.manager, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - artifactStore, - attachmentApprovals, - settingsStore, - connectionStore, - mainWindowController, - e2eFixture, - emitSessionsChanged, - ensureSessionCanSend, - prepareSkillInvocation: prepareDesktopSkillInvocation, - invalidateSessionBindings: (sessionId) => botIncoming.invalidateSessionBindings(sessionId), - clearSkillHost: (sessionId) => desktopSessionSkillHosts.delete(sessionId), - stopAgentGraph: async (sessionId) => { - const header = await store.readHeader(sessionId); - if (!header.subagentParent) await agentGraphCoordinator.stop(sessionId); - }, - notifyAgentGraphPermissionResponse: (sessionId) => { - agentGraphSupervisorWakeCoordinator.notifyPermissionResponse(sessionId); - }, - ensureSessionWorkspaceAvailable, - createSession: createDesktopSession, - getReadyConnection, - streamEvents, - getWorkspacePrivacyContext, - canCreateFakeSession: canCreateFakeSessionFromRenderer, - }); - registerSubscriptionIpc({ - ipcMain, - connectionStore, - claudeSubscription, - openAiCodex, - githubCopilotSubscription, - xaiOAuth, - antigravitySubscription, - isClaudeSubscriptionAuthenticatedState, - syncClaudeSubscriptionConnection, - activateOpenAiCodexConnection, - syncOpenAiCodexConnection, - syncGitHubCopilotConnection, - activateXaiOAuthConnection, - syncXaiOAuthConnection, - emitConnectionListChanged, - }); - registerWebSearchIpc({ settingsStore, getWorkspacePrivacyContext }); - registerBrowserIpc({ mainWindowController }); - registerConnectionsIpc({ - ipcMain, - connectionStore, - credentialStore, - syncOAuthModelConnections, - resolveConnectionSecret, - hasConnectionSecret, - disconnectManagedOAuthConnection, - emitConnectionListChanged, - // Same seam as the fake-backend override above, for the other IPC that can - // leave the machine: adding a catalog provider runs remote model discovery - // against the provider's real endpoint. In E2E the key is a placeholder, so - // discovery can only fail — but it fails at whatever speed the network - // answers, and the add dialog stays open for the whole round trip. The - // provider-side budget (10s) is exactly the suite's expect timeout (10s), - // so a slow answer flips `await expect(dialog).toBeHidden()` from pass to - // fail with no code change. Fail deterministically and offline instead, - // which is the outcome a placeholder key produces anyway. - ...(isE2e - ? { - fetchModels: async () => { - throw new Error('E2E: remote model discovery is disabled'); - }, - } - : {}), - }); - registerOnboardingIpc({ onboardingService }); - registerPermissionsIpc({ - settingsStore, - connectionStore, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - botRegistry, - getComputerUseCapabilityInput: computerUseCapabilityInput, - }); - // Drag-to-grant onboarding for the two TCC permissions macOS offers no - // programmatic consent dialog for. See docs/permission-onboarding-plan.md. - const permissionOverlay = createPermissionOverlayMain({ - resolveLocale: async () => { - const settings = await settingsStore.get(); - return resolveUiLocale( - settings.personalization.uiLocale, - resolveSystemUiLocale(app.getPreferredSystemLanguages()), - ); - }, - }); - registerPermissionOverlayIpc({ controller: permissionOverlay, ipcMain }); - // A screen-saver-level panel pinned to every Space is visible to the - // user if it outlives a slow quit; close it explicitly rather than - // relying on process teardown to race it away. - app.on('before-quit', () => permissionOverlay.dismiss()); - settingsIpc = registerSettingsIpc({ - settingsStore, - botRegistry, - normalizeSettingsPatch, - applySettingsRuntimeEffects, - ...(e2eFixture?.scenario === 'settings-bots' - ? { - botOnboardingAdapters: createE2eFixtureBotOnboardingAdapters(), - botOnboardingApplySettingsRuntimeEffects: async () => undefined, - // The fixture no-ops runtime effects, so no real bridge starts. - // Report the onboarded channel as running to demonstrate the - // successful "connected" path (the P0-3 warning path is covered by - // bot-onboarding-main.test.ts). - botOnboardingReadChannelStatus: () => ({ running: true }), - } - : {}), - }); - registerDailyReviewIpc({ dailyReview, dailyReviewArchiveStore, mainWindowController }); - registerInspectorIpc({ - ipcMain, - readSessionRuntimeEvents: (sessionId) => runtimeEventStore.readSessionRuntimeEvents(sessionId), - listSessionRuns: (sessionId) => runStore.listSessionRuns(sessionId), - readRunEvents: (sessionId, runId) => runStore.readEvents(sessionId, runId), - }); - registerUsageIpc({ - ipcMain, - settingsStore, - telemetryRepo, - modelCallLedger, - readRunEvents: (sessionId, runId) => runStore.readEvents(sessionId, runId), - ensureUsageReady, - refreshPricingLookup: () => { - lookupPricing = buildPricingLookup(telemetryRepo.listPricingOverrides()); - }, - sendToRenderer: safeSendToRenderer, - }); -} - -function canCreateFakeSessionFromRenderer(): boolean { - return !app.isPackaged && ( - Boolean(e2eFixture) || - Boolean(process.env.VITE_DEV_SERVER_URL) || - process.env.NODE_ENV === 'development' - ); -} - -const { normalizeSettingsPatch, applySettingsRuntimeEffects, handleExternalSettingsChange } = - createSettingsRuntimeEffects({ - settingsStore, - botRegistry, - keepSystemAwake, - safeSendToRenderer, - }); - -async function updateAgentSettings(patch: UpdateAppSettingsInput): Promise { - const normalizedPatch = await normalizeSettingsPatch(patch); - const next = await settingsStore.update(normalizedPatch); - await applySettingsRuntimeEffects(next, patch); - safeSendToRenderer('settings:externalChanged', { ts: Date.now() }); - return next; -} - -const streamEvents = createSessionStreamer({ - sessionActivities, - goalWiring, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - safeSendToRenderer, - emitSessionsChanged, - interruptActivePlanExecution: (sessionId, reason) => - runtime.interruptActivePlanExecution(sessionId, reason), -}); - -async function ensureSessionCanSend(sessionId: string): Promise { - const boundary = await runtime.readExecutionBoundary(sessionId); - assertDesktopExecutionBoundary(sessionId, boundary); - const header = await readAvailableSessionHeader(sessionId); - let result: Awaited>; - try { - result = await ensureSessionCanSendOrRebind(sessionId, header, { - readyConnectionDeps, - getDefaultSlug: () => connectionStore.getDefault(), - listConnectionSlugs: async () => (await connectionStore.list()).map((connection) => connection.slug), - updateSession: (_sessionId, patch) => runtime.updateSession(_sessionId, { - ...patch, - status: 'active', - blockedReason: undefined, - statusUpdatedAt: Date.now(), - }), - }); - } catch (error) { - if (isSessionLifecycleError(error)) throw error; - await runtime.setSessionStatus(sessionId, 'blocked', 'NO_REAL_CONNECTION').catch(() => {}); - emitSessionsChanged('status-change', sessionId); - throw error; - } - if (result.rebound) { - emitSessionsChanged('rebound', sessionId, { - connectionSlug: result.connectionSlug, - modelId: result.modelId, - }); - } -} - -async function readAvailableSessionHeader(sessionId: string) { - let header; - try { - header = await store.readHeader(sessionId); - } catch (error) { - const lifecycleError = sessionLifecycleErrorFromReadFailure(error); - if (lifecycleError) throw lifecycleError; - throw error; - } - assertSessionCanSendFromHeader(header); - await assertSessionWorkspaceAvailable(header.cwd); - return header; -} - -async function ensureSessionWorkspaceAvailable(sessionId: string): Promise { - await readAvailableSessionHeader(sessionId); -} - -async function createDesktopSession(input: DesktopCreateSessionInput) { - const selected = await resolveDesktopSessionSelection(input, { - ...projectManagement, - // Read per creation rather than cached at boot: the user can change the - // default project in Settings without restarting the app. - defaultProjectId: async () => (await settingsStore.get()).projects.defaultProjectId, - }); - await assertSessionWorkspaceAvailable(selected.cwd); - return runtime.createSession(await resolveNewSessionProjectInput(selected, projectCatalog)); -} - -const readyConnectionDeps = { - getConnection: (slug: string) => connectionStore.get(slug), - getApiKey: (slug: string) => resolveConnectionSecret(slug), -}; - -function getReadyConnection(slug: string | null | undefined, model?: string) { - return requireReadyConnection(slug, readyConnectionDeps, model); -} - -async function resolveDesktopSkillHostForSession( - sessionId: string, -): Promise { - const header = await store.readHeader(sessionId); - return resolveDesktopSessionSkillHost(desktopBackendToolSurfaceDeps, { - sessionId, - header, - childTools: childAgentTools, - }); -} - -async function resolveDesktopSkillHostForNewSession( - projectRoot: string, - context?: NewSessionSkillContext, -): Promise { - const ready = await getReadyConnection( - context?.llmConnectionSlug ?? (await connectionStore.getDefault()), - context?.model, - ); - return resolveDesktopNewSessionSkillHost(desktopBackendToolSurfaceDeps, { - projectRoot, - workspaceRoot, - readyConnection: ready, - context, - }); -} - -async function prepareDesktopSkillInvocation( - sessionId: string, - text: string, - skillIds?: readonly string[], -) { - const [projectRoot, host] = await Promise.all([ - resolveProjectRootForContext(sessionId), - resolveDesktopSkillHostForSession(sessionId), - ]); - return prepareSkillInvocationMessage({ - text, - ...(skillIds ? { skillIds } : {}), - source: resolveSkillDiscoveryPaths(projectRoot, workspaceRoot), - host, - }); -} - -async function listDesktopInvocableSkills( - sessionId?: string, - newSessionContext?: NewSessionSkillContext, -) { - try { - const projectRoot = await resolveProjectRootForContext(sessionId); - const host = sessionId - ? await resolveDesktopSkillHostForSession(sessionId) - : await resolveDesktopSkillHostForNewSession(projectRoot, newSessionContext); - return await listInvocableSkills( - resolveSkillDiscoveryPaths(projectRoot, workspaceRoot), - host, - ); - } catch (error) { - // Stale sessions with a removed working directory remain browseable, but - // cannot offer project-aware Skill suggestions. Treat that expected state - // as an empty projection instead of generating a rejected IPC/log entry. - if (sessionId && isSessionWorkspaceUnavailableError(error)) return []; - throw error; - } -} - -function emitConnectionListChanged(): void { - const event: ConnectionEvent = { - type: 'connection_list_changed', - id: randomUUID(), - ts: Date.now(), - }; - safeSendToRenderer('connections:event', event); -} - -function emitSessionsChanged( - reason: SessionChangedReason, - sessionId?: string, - extra?: Pick, -): void { - const event: SessionChangedEvent = { - type: 'sessions_changed', - reason, - ts: Date.now(), - }; - if (sessionId) event.sessionId = sessionId; - if (extra?.connectionSlug) event.connectionSlug = extra.connectionSlug; - if (extra?.modelId) event.modelId = extra.modelId; - if (extra?.turnId) event.turnId = extra.turnId; - safeSendToRenderer('sessions:changed', event); -} - -registerIpc(); - -wireAppLifecycle({ - startHidden, - e2eFixture, - userDataDir, - workspaceRoot, - sessionStore: store, - projectCatalog, - credentialStore, - connectionStore, - settingsStore, - telemetryRepo, - artifactStore, - modelCallLedger, - ensureUsageReady, - keepSystemAwake, - botRegistry, - planReminders, - dailyReview, - updateService, - automationWiring, - goalWiring, - computerUse, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - shellRuns, - mcpManager, - runtimePersistence, - executionStoreWiring, - closeWorkflowStores, - mainWindowController, - runtime, - agentGraphCoordinator, - agentGraphSupervisorWakeCoordinator, - agentGraphControlStore, - streamEvents, - focusOrCreateMainWindow, - emitConnectionListChanged, - emitSessionsChanged, - handleExternalSettingsChange, - getSettingsIpc: () => settingsIpc, -}); - -function computerUseCapabilityInput() { - const executorState = computerUse.backend?.executorState?.(); - return { - backendId: computerUse.backendId, - health: computerUseServiceHealth(computerUse.backendId, executorState), - }; -} diff --git a/apps/desktop/src/main/bot-onboarding-e2e-fixture.ts b/apps/desktop/src/main/bot-onboarding-e2e-fixture.ts index f5accb6509..bc38af9cae 100644 --- a/apps/desktop/src/main/bot-onboarding-e2e-fixture.ts +++ b/apps/desktop/src/main/bot-onboarding-e2e-fixture.ts @@ -27,6 +27,7 @@ export function createE2eFixtureBotOnboardingAdapters(): AdapterMap { } const pollCounts = new Map(); let startSequence = 0; + let wecomStartCount = 0; function nextPoll(token: string | undefined): number { const key = token ?? 'missing'; @@ -57,7 +58,9 @@ export function createE2eFixtureBotOnboardingAdapters(): AdapterMap { async start() { return start('dingtalk'); }, async poll(session) { await settlePoll(); - if (nextPoll(session.opaqueToken) === 1) return { status: 'scanned' }; + const pollCount = nextPoll(session.opaqueToken); + if (pollCount === 1) return { status: 'pending' }; + if (pollCount === 2) return { status: 'scanned' }; return { status: 'confirmed', credential: { @@ -89,7 +92,10 @@ export function createE2eFixtureBotOnboardingAdapters(): AdapterMap { }, }, wecom: { - async start() { return start('wecom', 1); }, + async start() { + wecomStartCount += 1; + return start('wecom', wecomStartCount === 1 ? 1 : NORMAL_TTL_SECONDS); + }, async poll() { await settlePoll(); return { status: 'pending' }; diff --git a/apps/desktop/src/main/bot-status-persistence.ts b/apps/desktop/src/main/bot-status-persistence.ts deleted file mode 100644 index c61a4a18fb..0000000000 --- a/apps/desktop/src/main/bot-status-persistence.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { humanizeBotStatusReason } from '@maka/core'; -import type { BotStatus } from '@maka/runtime'; - -type PersistedBotStatus = Pick; - -export function deriveBotStatusPersistenceUpdate( - previous: PersistedBotStatus | undefined, - current: PersistedBotStatus, -): { lastError: string | undefined } | undefined { - if ( - previous?.readiness === current.readiness - && previous.reason === current.reason - ) { - return undefined; - } - - if (current.readiness === 'degraded') { - const lastError = humanizeBotStatusReason(current.reason); - return lastError ? { lastError } : undefined; - } - - if (current.readiness === 'operational') { - return { lastError: undefined }; - } - - return undefined; -} diff --git a/apps/desktop/src/main/chat-readiness.ts b/apps/desktop/src/main/chat-readiness.ts index 070f48c9c2..cad90f2e80 100644 --- a/apps/desktop/src/main/chat-readiness.ts +++ b/apps/desktop/src/main/chat-readiness.ts @@ -1,5 +1,6 @@ import { isConnectionReady, + NO_REAL_CONNECTION_CODE, normalizeOpenAiCodexConnection, normalizeRequestedModelForReadiness, projectSessionSendOutcome, @@ -14,9 +15,7 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections'; // The rebind-eligibility taxonomy moved to `@maka/core/session-send-projection` // (#1038) so the send gate and the renderer health notice share one // decision source. Re-exported here for back-compat. -export { shouldRebindSessionToDefault } from '@maka/core'; - -export const NO_REAL_CONNECTION_CODE = 'NO_REAL_CONNECTION'; +export { NO_REAL_CONNECTION_CODE, shouldRebindSessionToDefault } from '@maka/core'; // `ChatConfigurationReason` moved to `@maka/core/connection-readiness` // (PR110a) so the same taxonomy is shared between the send path and diff --git a/apps/desktop/src/main/client-settings-effects.ts b/apps/desktop/src/main/client-settings-effects.ts new file mode 100644 index 0000000000..7d86153812 --- /dev/null +++ b/apps/desktop/src/main/client-settings-effects.ts @@ -0,0 +1,58 @@ +import type { AppSettings } from '@maka/core'; +import type { SettingsStore } from '@maka/storage'; + +export interface ClientSettingsEffects { + apply(settings: AppSettings, notifyRenderer: boolean): Promise; + refresh(notifyRenderer: boolean): Promise; +} + +interface ClientSettingsEffectDependencies { + readonly settingsStore: Pick; + readonly applyKeepSystemAwake: (enabled: boolean) => Promise; + readonly applyBotSettings: (settings: AppSettings['botChat']) => Promise; + readonly emitExternalChanged: () => void; +} + +export function createClientSettingsEffects( + dependencies: ClientSettingsEffectDependencies, +): ClientSettingsEffects { + let rendererFingerprint: string | undefined; + let botFingerprint: string | undefined; + let keepSystemAwake: boolean | undefined; + let tail = Promise.resolve(); + + const schedule = ( + load: () => AppSettings | Promise, + notifyRenderer: boolean, + ): Promise => { + const run = tail.then(async () => { + const settings = await load(); + const nextRendererFingerprint = JSON.stringify(settings); + const nextBotFingerprint = JSON.stringify(settings.botChat); + const rendererChanged = nextRendererFingerprint !== rendererFingerprint; + const keepAwakeChanged = settings.system.keepSystemAwake !== keepSystemAwake; + const botChanged = nextBotFingerprint !== botFingerprint; + if (keepAwakeChanged) { + await dependencies.applyKeepSystemAwake(settings.system.keepSystemAwake); + keepSystemAwake = settings.system.keepSystemAwake; + } + if (botChanged) { + await dependencies.applyBotSettings(settings.botChat); + botFingerprint = nextBotFingerprint; + } + rendererFingerprint = nextRendererFingerprint; + if (notifyRenderer && rendererChanged) dependencies.emitExternalChanged(); + return rendererChanged || keepAwakeChanged || botChanged; + }); + tail = run.then( + () => undefined, + () => undefined, + ); + return run; + }; + + return { + apply: (settings, notifyRenderer) => schedule(() => settings, notifyRenderer), + refresh: (notifyRenderer) => schedule(() => dependencies.settingsStore.get(), notifyRenderer), + }; +} diff --git a/apps/desktop/src/main/client-settings-tools.ts b/apps/desktop/src/main/client-settings-tools.ts new file mode 100644 index 0000000000..1f69101c3c --- /dev/null +++ b/apps/desktop/src/main/client-settings-tools.ts @@ -0,0 +1,159 @@ +import { + THEME_PALETTES, + UI_LOCALE_PREFERENCES, + type AppSettings, + type UpdateAppSettingsInput, +} from '@maka/core'; +import type { MakaTool } from '@maka/runtime'; +import { z } from 'zod'; + +const patchSchema = z + .object({ + appearance: z + .object({ + theme: z.enum(['light', 'dark', 'auto']).optional(), + palette: z.enum(THEME_PALETTES).optional(), + }) + .strict() + .optional(), + uiLocale: z.enum(UI_LOCALE_PREFERENCES).optional(), + notifications: z.object({ runComplete: z.boolean().optional() }).strict().optional(), + system: z.object({ keepSystemAwake: z.boolean().optional() }).strict().optional(), + }) + .strict(); + +type ClientSettingsPatch = z.infer; + +export interface ClientSettingsToolAuthority { + read(): Promise; + update(patch: UpdateAppSettingsInput): Promise; + confirm(changes: readonly string[]): Promise; +} + +interface ClientSettingsSnapshot { + readonly appearance: Pick; + readonly uiLocale: AppSettings['personalization']['uiLocale']; + readonly notifications: Pick; + readonly system: Pick; +} + +/** Exposes only settings owned by the bound Desktop capability provider. */ +export function buildClientSettingsTools( + authority: ClientSettingsToolAuthority, +): readonly MakaTool[] { + const readTool: MakaTool, ClientSettingsSnapshot> = { + name: 'MakaClientSettingsGet', + displayName: 'Read client settings', + description: + 'Read safe UI and operating-system settings for the currently bound Maka client. ' + + 'Runtime behavior, credentials, model configuration, network settings, and Bot settings are excluded.', + parameters: z.object({}).strict(), + categoryHint: 'read', + recoveryMode: 'replay_safe', + impl: async () => project(await authority.read()), + }; + const updateTool: MakaTool = { + name: 'MakaClientSettingsUpdate', + displayName: 'Update client settings', + description: + 'Update safe UI and operating-system settings for the currently bound Maka client. ' + + 'Use only when the user explicitly asks to change this client. The client asks for confirmation before saving.', + parameters: patchSchema, + categoryHint: 'custom_tool', + recoveryMode: 'never_auto_retry', + executionSemantics: 'exclusive_step', + impl: async (input) => { + const current = await authority.read(); + const changes = describeChanges(current, input); + if (changes.length === 0) return unchanged(current); + if (!(await authority.confirm(changes))) { + return { + kind: 'maka_client_settings_update', + applied: false, + reason: 'cancelled', + message: 'Client settings were not changed.', + settings: project(await authority.read()), + }; + } + const updated = await authority.update(toSettingsPatch(input)); + return { + kind: 'maka_client_settings_update', + applied: true, + changes, + message: `Updated ${changes.length} client setting${changes.length === 1 ? '' : 's'}.`, + settings: project(updated), + }; + }, + }; + return [readTool, updateTool]; +} + +type ClientSettingsUpdateResult = { + readonly kind: 'maka_client_settings_update'; + readonly applied: boolean; + readonly reason?: 'cancelled'; + readonly changes?: readonly string[]; + readonly message: string; + readonly settings: ClientSettingsSnapshot; +}; + +function unchanged(settings: AppSettings): ClientSettingsUpdateResult { + return { + kind: 'maka_client_settings_update', + applied: false, + message: 'The requested client settings already have those values.', + settings: project(settings), + }; +} + +function project(settings: AppSettings): ClientSettingsSnapshot { + return { + appearance: { + theme: settings.appearance.theme, + palette: settings.appearance.palette, + }, + uiLocale: settings.personalization.uiLocale, + notifications: { runComplete: settings.notifications.runComplete }, + system: { keepSystemAwake: settings.system.keepSystemAwake }, + }; +} + +function toSettingsPatch(input: ClientSettingsPatch): UpdateAppSettingsInput { + return { + ...(input.appearance ? { appearance: input.appearance } : {}), + ...(input.uiLocale ? { personalization: { uiLocale: input.uiLocale } } : {}), + ...(input.notifications ? { notifications: input.notifications } : {}), + ...(input.system ? { system: input.system } : {}), + }; +} + +function describeChanges(current: AppSettings, patch: ClientSettingsPatch): string[] { + const changes: string[] = []; + compare(changes, 'Theme', current.appearance.theme, patch.appearance?.theme); + compare(changes, 'Palette', current.appearance.palette, patch.appearance?.palette); + compare(changes, 'UI language', current.personalization.uiLocale, patch.uiLocale); + compare( + changes, + 'Run-complete notifications', + current.notifications.runComplete, + patch.notifications?.runComplete, + ); + compare( + changes, + 'Keep system awake', + current.system.keepSystemAwake, + patch.system?.keepSystemAwake, + ); + return changes; +} + +function compare( + changes: string[], + label: string, + current: string | boolean | undefined, + next: string | boolean | undefined, +): void { + if (next !== undefined && next !== current) { + changes.push(`${label}: ${String(current)} → ${String(next)}`); + } +} diff --git a/apps/desktop/src/main/client-settings-watcher.ts b/apps/desktop/src/main/client-settings-watcher.ts new file mode 100644 index 0000000000..8aa8d3babe --- /dev/null +++ b/apps/desktop/src/main/client-settings-watcher.ts @@ -0,0 +1,71 @@ +import { watch as watchDirectory } from "node:fs"; +import { basename } from "node:path"; + +export interface ClientSettingsWatcher { + stop(): void; +} + +type WatchListener = ( + eventType: string, + filename: string | Buffer | null, +) => void; + +interface ClientSettingsWatcherDependencies { + readonly watch?: ( + workspaceRoot: string, + listener: WatchListener, + ) => WatchHandle; + readonly debounceMs?: number; + readonly onError?: (error: unknown) => void; +} + +const SETTINGS_FILE = "settings.json"; +const DEFAULT_DEBOUNCE_MS = 300; + +interface WatchHandle { + on(event: "error", listener: (error: Error) => void): unknown; + close(): void; +} + +export function startClientSettingsWatcher( + workspaceRoot: string, + onChanged: () => void, + dependencies: ClientSettingsWatcherDependencies = {}, +): ClientSettingsWatcher { + let timer: ReturnType | undefined; + let watcher: WatchHandle | undefined; + + const stop = (): void => { + watcher?.close(); + watcher = undefined; + if (timer) clearTimeout(timer); + timer = undefined; + }; + + const schedule = (): void => { + if (timer) clearTimeout(timer); + timer = setTimeout(() => { + timer = undefined; + onChanged(); + }, dependencies.debounceMs ?? DEFAULT_DEBOUNCE_MS); + }; + + try { + watcher = (dependencies.watch ?? watchDirectory)( + workspaceRoot, + (_eventType, filename) => { + if (!watcher) return; + if (filename && basename(filename.toString()) !== SETTINGS_FILE) return; + schedule(); + }, + ); + watcher.on("error", (error) => { + dependencies.onError?.(error); + stop(); + }); + } catch (error) { + dependencies.onError?.(error); + } + + return { stop }; +} diff --git a/apps/desktop/src/main/computer-use-model-tools.ts b/apps/desktop/src/main/computer-use-model-tools.ts deleted file mode 100644 index cf10a8e205..0000000000 --- a/apps/desktop/src/main/computer-use-model-tools.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { MakaTool } from '@maka/runtime'; - -export function computerUseToolsForModel( - tools: readonly MakaTool[], - computerUseTools: readonly MakaTool[], - supportsVision: boolean, -): MakaTool[] { - if (supportsVision || computerUseTools.length === 0) return [...tools]; - const computerUseToolNames = new Set(computerUseTools.map((tool) => tool.name)); - return tools.filter((tool) => !computerUseToolNames.has(tool.name)); -} diff --git a/apps/desktop/src/main/computer-use/status-item.ts b/apps/desktop/src/main/computer-use/status-item.ts index 08eec37797..28a8329de0 100644 --- a/apps/desktop/src/main/computer-use/status-item.ts +++ b/apps/desktop/src/main/computer-use/status-item.ts @@ -85,8 +85,8 @@ export interface ComputerUseStatusItemDeps { * and whose picture-in-picture sibling labels the same two actions in * Chinese, so the menu bar and the mirror disagreed about what language the * product speaks. Sync, because a menu template is built synchronously; - * defaults to the system language, which is the same source boot.ts already - * uses for the one other main-process string it has to draw. + * defaults to the system language, which is also used for other + * main-process strings. */ resolveLocale?: () => UiLocale; /** Test seams: the contract is drivable without an Electron main process. */ diff --git a/apps/desktop/src/main/config-file-watcher.ts b/apps/desktop/src/main/config-file-watcher.ts deleted file mode 100644 index 83af6f0e8d..0000000000 --- a/apps/desktop/src/main/config-file-watcher.ts +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Watches workspace config files for external modifications and notifies the - * renderer so the UI stays in sync when headless CLI, scripts, or the user's - * editor modify llm-connections.json, credentials.json, or settings.json. - * - * Uses Node.js built-in fs.watch on the workspace directory (FSEvents on macOS, - * inotify on Linux). Zero external dependencies. - */ -import { watch as fsWatch, type FSWatcher } from 'node:fs'; -import { basename } from 'node:path'; - -export interface ConfigFileWatcherCallbacks { - onConnectionsChanged: () => void; - onSettingsChanged: () => void; -} - -export interface ConfigFileWatcher { - stop: () => void; -} - -const DEBOUNCE_MS = 300; - -type WatchListener = (eventType: string, filename: string | Buffer | null) => void; - -type WatchImpl = (workspaceRoot: string, listener: WatchListener) => Pick; - -interface ConfigFileWatcherOptions { - watchImpl?: WatchImpl; - debounceMs?: number; - setTimeoutImpl?: typeof setTimeout; - clearTimeoutImpl?: typeof clearTimeout; -} - -const WATCHED_FILES: Record = { - 'llm-connections.json': 'onConnectionsChanged', - 'credentials.json': 'onConnectionsChanged', - 'settings.json': 'onSettingsChanged', -}; - -export function startConfigFileWatcher( - workspaceRoot: string, - callbacks: ConfigFileWatcherCallbacks, - options: ConfigFileWatcherOptions = {}, -): ConfigFileWatcher { - const debounceMs = options.debounceMs ?? DEBOUNCE_MS; - const setTimer = options.setTimeoutImpl ?? setTimeout; - const clearTimer = options.clearTimeoutImpl ?? clearTimeout; - const watchImpl = options.watchImpl ?? fsWatch; - const debounceTimers = new Map>(); - - function schedule(timerKey: string, callbackKey: keyof ConfigFileWatcherCallbacks): void { - const existing = debounceTimers.get(timerKey); - if (existing) clearTimer(existing); - debounceTimers.set( - timerKey, - setTimer(() => { - debounceTimers.delete(timerKey); - try { - callbacks[callbackKey](); - } catch { - // non-fatal: watcher callback failure must not crash the app - } - }, debounceMs), - ); - } - - let watcher: Pick | undefined; - try { - watcher = watchImpl(workspaceRoot, (_eventType, filename) => { - if (!filename) { - schedule('__fallback:connections', 'onConnectionsChanged'); - schedule('__fallback:settings', 'onSettingsChanged'); - return; - } - const name = basename(filename.toString()); - const callbackKey = WATCHED_FILES[name]; - if (!callbackKey) return; - - schedule(name, callbackKey); - }); - } catch (error) { - console.error('[config-watcher] failed to start:', error); - return { stop() {} }; - } - - watcher.on('error', (error) => { - console.error('[config-watcher] runtime error, stopping:', error); - cleanup(); - }); - - function cleanup(): void { - watcher?.close(); - watcher = undefined; - for (const timer of debounceTimers.values()) clearTimer(timer); - debounceTimers.clear(); - } - - return { stop: cleanup }; -} diff --git a/apps/desktop/src/main/config-ipc-main.ts b/apps/desktop/src/main/config-ipc-main.ts deleted file mode 100644 index d3bd8b03e5..0000000000 --- a/apps/desktop/src/main/config-ipc-main.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { readFile, writeFile } from 'node:fs/promises'; -import { join } from 'node:path'; -import { app, dialog, ipcMain } from 'electron'; -import type { ConnectionStore, CredentialStore, SettingsStore } from '@maka/storage'; -import { - type ConfigCategory, - type ConnectionConflictStrategy, - isConfigCategory, - parseConfigBundle, - serializeConfigBundle, -} from '@maka/storage'; -import { - applyConfigImport, - gatherConfigExport, - type ConfigTransferDeps, -} from './config-transfer-service.js'; - -export interface ConfigIpcDeps { - connectionStore: ConnectionStore; - settingsStore: SettingsStore; - credentialStore: CredentialStore; - workspaceRoot: string; -} - -function sanitizeCategories(value: unknown): ConfigCategory[] { - if (!Array.isArray(value)) return []; - return [...new Set(value.filter(isConfigCategory))]; -} - -function sanitizeStrategy(value: unknown): ConnectionConflictStrategy { - return value === 'overwrite' ? 'overwrite' : 'skip'; -} - -export function registerConfigIpc(deps: ConfigIpcDeps): void { - const memoryPath = join(deps.workspaceRoot, 'MEMORY.md'); - const transferDeps: ConfigTransferDeps = { - connectionStore: deps.connectionStore, - settingsStore: deps.settingsStore, - credentialStore: deps.credentialStore, - readMemory: async () => { - try { - return await readFile(memoryPath, 'utf8'); - } catch { - return null; - } - }, - writeMemory: async (content) => { - await writeFile(memoryPath, content, 'utf8'); - }, - appVersion: app.getVersion(), - }; - - ipcMain.handle('config:export', async (_event, input: { categories?: unknown } = {}) => { - const categories = sanitizeCategories(input?.categories); - if (categories.length === 0) { - return { ok: false as const, reason: 'no_categories' as const }; - } - const bundle = await gatherConfigExport(categories, transferDeps); - const today = new Date().toISOString().slice(0, 10); - const { canceled, filePath } = await dialog.showSaveDialog({ - title: '导出 Maka 配置', - defaultPath: `maka-config-${today}.json`, - filters: [{ name: 'Maka Config', extensions: ['json'] }], - }); - if (canceled || !filePath) { - return { ok: false as const, reason: 'canceled' as const }; - } - await writeFile(filePath, serializeConfigBundle(bundle), 'utf8'); - return { ok: true as const, path: filePath, includedData: bundle.includedData }; - }); - - ipcMain.handle('config:import', async (_event, input: { strategy?: unknown } = {}) => { - const { canceled, filePaths } = await dialog.showOpenDialog({ - title: '导入 Maka 配置', - properties: ['openFile'], - filters: [{ name: 'Maka Config', extensions: ['json'] }], - }); - const filePath = filePaths?.[0]; - if (canceled || !filePath) { - return { ok: false as const, reason: 'canceled' as const }; - } - const raw = await readFile(filePath, 'utf8'); - const parsed = parseConfigBundle(raw); - if (!parsed.ok) { - return { ok: false as const, reason: parsed.reason, message: parsed.message }; - } - const result = await applyConfigImport(parsed.bundle, sanitizeStrategy(input?.strategy), transferDeps); - return { ok: true as const, includedData: parsed.bundle.includedData, result }; - }); -} diff --git a/apps/desktop/src/main/connection-model-discovery.ts b/apps/desktop/src/main/connection-model-discovery.ts deleted file mode 100644 index 4ddd5ae5ef..0000000000 --- a/apps/desktop/src/main/connection-model-discovery.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { - PROVIDER_DEFAULTS, - providerAuthRequiresSecret, - providerSupportsModelDiscovery, - type ModelDiscoveryResult, -} from '@maka/core/llm-connections'; -import { fetchProviderModels } from '@maka/runtime'; -import type { ConnectionStore } from '@maka/storage'; - -export interface ConnectionModelDiscoveryDeps { - connectionStore: Pick; - resolveConnectionSecret(slug: string): Promise; - fetchModels?: typeof fetchProviderModels; - now?: () => number; -} - -export class ConnectionModelDiscoveryPreconditionError extends Error { - override readonly name = 'ConnectionModelDiscoveryPreconditionError'; -} - -export async function discoverConnectionModels( - deps: ConnectionModelDiscoveryDeps, - slug: string, -): Promise { - const connection = await deps.connectionStore.get(slug); - if (!connection) throw new ConnectionModelDiscoveryPreconditionError(`找不到模型连接：${slug}`); - const defaults = PROVIDER_DEFAULTS[connection.providerType]; - if (!defaults || !providerSupportsModelDiscovery(connection.providerType)) { - throw new ConnectionModelDiscoveryPreconditionError( - `Provider "${connection.providerType}" does not support remote model discovery`, - ); - } - const apiKey = await deps.resolveConnectionSecret(slug); - if (providerAuthRequiresSecret(connection.providerType) && !apiKey) { - throw new ConnectionModelDiscoveryPreconditionError( - defaults.authKind === 'oauth_token' - ? '这个 OAuth 模型连接还没有登录' - : '这个模型连接还没有保存 API key', - ); - } - const fetchedAt = (deps.now ?? Date.now)(); - const models = await (deps.fetchModels ?? fetchProviderModels)(connection, apiKey ?? ''); - if (models.length === 0) { - throw new Error('Provider returned no usable models'); - } - await deps.connectionStore.update(slug, { - models, - modelSource: 'fetched', - modelsFetchedAt: fetchedAt, - }); - return { - models, - source: 'fetched', - fetchedAt, - }; -} diff --git a/apps/desktop/src/main/connection-test-status.ts b/apps/desktop/src/main/connection-test-status.ts deleted file mode 100644 index 1138763bf2..0000000000 --- a/apps/desktop/src/main/connection-test-status.ts +++ /dev/null @@ -1,36 +0,0 @@ -import type { ConnectionTestResult, UpdateConnectionInput } from '@maka/core'; - -export function connectionTestStatusPatch( - result: ConnectionTestResult, - now = new Date(), -): Pick { - if (result.ok) { - return { - lastTestStatus: 'verified', - lastTestAt: now.toISOString(), - lastTestMessage: '连接已验证', - }; - } - - if (result.errorClass === 'auth' || result.statusCode === 401 || result.statusCode === 403) { - return { - lastTestStatus: 'needs_reauth', - lastTestAt: now.toISOString(), - lastTestMessage: '鉴权失败', - }; - } - - return { - lastTestStatus: 'error', - lastTestAt: now.toISOString(), - lastTestMessage: generalizedConnectionErrorMessage(result), - }; -} - -function generalizedConnectionErrorMessage(result: ConnectionTestResult): string { - if (result.errorClass === 'timeout') return '请求超时'; - if (result.errorClass === 'provider_unavailable') return '模型服务返回错误'; - if (result.errorClass === 'network') return '网络错误'; - if (result.statusCode && result.statusCode >= 500) return '模型服务返回错误'; - return '连接测试失败'; -} diff --git a/apps/desktop/src/main/connections-ipc-main.ts b/apps/desktop/src/main/connections-ipc-main.ts deleted file mode 100644 index b93fc70cd1..0000000000 --- a/apps/desktop/src/main/connections-ipc-main.ts +++ /dev/null @@ -1,202 +0,0 @@ -import type { IpcMain } from 'electron'; -import { - buildConnectionModelCatalogEntries, - generalizedErrorMessageChinese, -} from '@maka/core'; -import type { - CreateConnectionInput, - UpdateConnectionInput, -} from '@maka/core'; -import { PROVIDER_DEFAULTS, providerAuthRequiresSecret } from '@maka/core/llm-connections'; -import type { LlmConnection } from '@maka/core/llm-connections'; -import { testConnection } from '@maka/runtime'; -import { createConnectionStore } from '@maka/storage'; -import { - ConnectionModelDiscoveryPreconditionError, - discoverConnectionModels, - type ConnectionModelDiscoveryDeps, -} from './connection-model-discovery.js'; -import { createFileCredentialStore } from './credential-store.js'; -import { createConnectionWithCredential } from './create-connection-with-credential.js'; -import { deleteConnectionWithCredential } from './delete-connection-with-credential.js'; -import { connectionTestStatusPatch } from './connection-test-status.js'; -import { - normalizeConnectionBaseUrlValueForIpc, - normalizeConnectionPatchSecretsForIpc, - normalizeConnectionSlugForIpc, - normalizeCreateConnectionInputForIpc, -} from './connections-ipc-validation.js'; - -type ConnectionStore = ReturnType; -type CredentialStore = ReturnType; - -interface ConnectionInputNormalizerDeps { - connectionStore: ConnectionStore; -} - -interface ConnectionsIpcDeps extends ConnectionInputNormalizerDeps { - ipcMain: Pick; - credentialStore: CredentialStore; - syncOAuthModelConnections: () => Promise; - resolveConnectionSecret: (slug: string) => Promise; - hasConnectionSecret: (connection: LlmConnection) => Promise; - disconnectManagedOAuthConnection: (connection: LlmConnection) => Promise; - emitConnectionListChanged: () => void; - /** - * Override for remote model discovery. Only E2E supplies this, to keep the - * add-provider flow off the public internet (see main.ts). - */ - fetchModels?: ConnectionModelDiscoveryDeps['fetchModels']; -} - -async function normalizeUpdateConnectionInput( - deps: ConnectionInputNormalizerDeps, - slug: string, - patch: UpdateConnectionInput, -): Promise { - const normalizedPatch = normalizeConnectionPatchSecretsForIpc(patch); - const { connectionStore } = deps; - const existing = await connectionStore.get(slug); - const providerType = existing?.providerType; - const defaults = providerType ? PROVIDER_DEFAULTS[providerType] : undefined; - if (defaults?.authKind === 'oauth_token') { - if (!Object.prototype.hasOwnProperty.call(normalizedPatch, 'baseUrl') || normalizedPatch.baseUrl === undefined) { - return normalizedPatch; - } - return { ...normalizedPatch, baseUrl: existing?.baseUrl ?? defaults.baseUrl }; - } - if (normalizedPatch.baseUrl === undefined) return normalizedPatch; - if (!providerType) throw new Error(`No such connection: ${slug}`); - return { - ...normalizedPatch, - baseUrl: normalizeConnectionBaseUrlValueForIpc(providerType, normalizedPatch.baseUrl), - }; -} - -export function registerConnectionsIpc(deps: ConnectionsIpcDeps): void { - const { - ipcMain, - connectionStore, - credentialStore, - syncOAuthModelConnections, - resolveConnectionSecret, - hasConnectionSecret, - disconnectManagedOAuthConnection, - emitConnectionListChanged, - fetchModels, - } = deps; - - ipcMain.handle('connections:list', async () => { - await syncOAuthModelConnections(); - return connectionStore.list(); - }); - ipcMain.handle('connections:getDefault', () => connectionStore.getDefault()); - ipcMain.handle('connections:setDefault', async (_event, slug: string | null) => { - const normalizedSlug = slug === null ? null : normalizeConnectionSlugForIpc(slug, 'connection slug'); - if (normalizedSlug && !(await connectionStore.get(normalizedSlug))) { - throw new Error(`No such connection: ${normalizedSlug}`); - } - await connectionStore.setDefault(normalizedSlug); - emitConnectionListChanged(); - }); - ipcMain.handle('connections:setDefaultModel', async (_event, input: { slug: string; model: string } | null) => { - if (input === null) { - await connectionStore.setDefault(null); - emitConnectionListChanged(); - return; - } - if (!input || typeof input !== 'object' || typeof input.slug !== 'string' || typeof input.model !== 'string') { - throw new Error('Default model input must include slug and model'); - } - const slug = normalizeConnectionSlugForIpc(input.slug, 'connection slug'); - const model = input.model.trim(); - if (!model) throw new Error('Default model must not be empty'); - const connection = await connectionStore.get(slug); - if (!connection) throw new Error(`No such connection: ${slug}`); - if (!connection.enabled) throw new Error(`Connection is disabled: ${slug}`); - const selectable = buildConnectionModelCatalogEntries({ connection }) - .some((entry) => entry.id === model && entry.canUseAsChatDefault); - if (!selectable) { - throw new Error(`Model is not available for chat default: ${model}`); - } - if (connection.defaultModel !== model) { - await connectionStore.update(slug, { defaultModel: model }); - } - await connectionStore.setDefault(slug); - emitConnectionListChanged(); - }); - ipcMain.handle('connections:create', async (_event, input: CreateConnectionInput) => { - // baseUrl is a credentials-exfiltration boundary. Normalize before any - // store or credential write; OAuth-token providers must keep their - // canonical provider endpoint. - const normalizedInput = normalizeCreateConnectionInputForIpc(input); - const connection = await createConnectionWithCredential({ connectionStore, credentialStore }, normalizedInput); - emitConnectionListChanged(); - return connection; - }); - ipcMain.handle('connections:update', async (_event, slug: string, patch: UpdateConnectionInput) => { - slug = normalizeConnectionSlugForIpc(slug, 'connection slug'); - const normalizedPatch = await normalizeUpdateConnectionInput(deps, slug, patch); - const connection = await connectionStore.update(slug, normalizedPatch); - if (normalizedPatch.apiKey !== undefined) { - if (normalizedPatch.apiKey) await credentialStore.setSecret(slug, 'api_key', normalizedPatch.apiKey); - else await credentialStore.deleteSecret(slug, 'api_key'); - } - emitConnectionListChanged(); - return connection; - }); - ipcMain.handle('connections:delete', async (_event, slug: string) => { - slug = normalizeConnectionSlugForIpc(slug, 'connection slug'); - await deleteConnectionWithCredential( - { connectionStore, credentialStore, disconnectManagedOAuthConnection }, - slug, - ); - emitConnectionListChanged(); - }); - ipcMain.handle('connections:test', async (_event, slug: string, opts?: { model?: string }) => { - slug = normalizeConnectionSlugForIpc(slug, 'connection slug'); - const connection = await connectionStore.get(slug); - if (!connection) return { ok: false, errorMessage: `找不到模型连接：${slug}` }; - const apiKey = await resolveConnectionSecret(slug); - if (providerAuthRequiresSecret(connection.providerType) && !apiKey) { - return { - ok: false, - errorMessage: PROVIDER_DEFAULTS[connection.providerType].authKind === 'oauth_token' - ? '这个 OAuth 模型连接还没有登录' - : '这个模型连接还没有保存 API key', - errorClass: 'auth', - }; - } - const result = await testConnection(connection, apiKey ?? '', opts?.model); - await connectionStore.update(slug, connectionTestStatusPatch(result)); - emitConnectionListChanged(); - return result; - }); - ipcMain.handle('connections:fetchModels', async (_event, slug: string) => { - slug = normalizeConnectionSlugForIpc(slug, 'connection slug'); - try { - const result = await discoverConnectionModels({ - connectionStore, - resolveConnectionSecret, - ...(fetchModels ? { fetchModels } : {}), - }, slug); - emitConnectionListChanged(); - return result; - } catch (error) { - if (error instanceof ConnectionModelDiscoveryPreconditionError) throw error; - throw new Error(generalizedErrorMessageChinese(error, '拉取模型列表失败')); - } - }); - ipcMain.handle('connections:hasSecret', async (_event, slug: string) => { - slug = normalizeConnectionSlugForIpc(slug, 'connection slug'); - // Read-only status probe (session health notice): must use the - // read-only hasConnectionSecret, never resolveConnectionSecret — - // the latter refreshes near-expiry OAuth tokens over the network, - // which a read-only status read must not do just by being observed. - // Send/test/fetch-models stay on resolveConnectionSecret and keep - // the refresh; the send gate remains the authoritative check. - const connection = await connectionStore.get(slug); - if (!connection) return false; - return hasConnectionSecret(connection); - }); -} diff --git a/apps/desktop/src/main/create-connection-with-credential.ts b/apps/desktop/src/main/create-connection-with-credential.ts deleted file mode 100644 index 4ce4045e22..0000000000 --- a/apps/desktop/src/main/create-connection-with-credential.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { CreateConnectionInput, LlmConnection } from '@maka/core/llm-connections'; -import type { ConnectionStore, CredentialStore } from '@maka/storage'; - -interface CreateConnectionWithCredentialDeps { - connectionStore: Pick; - credentialStore: Pick; -} - -export async function createConnectionWithCredential( - deps: CreateConnectionWithCredentialDeps, - input: CreateConnectionInput, -): Promise { - const connection = await deps.connectionStore.create(input); - if (input.apiKey) { - try { - await deps.credentialStore.setSecret(connection.slug, 'api_key', input.apiKey); - } catch (error) { - await deps.connectionStore.remove(connection.slug); - throw error; - } - } - return connection; -} diff --git a/apps/desktop/src/main/credential-store.ts b/apps/desktop/src/main/credential-store.ts deleted file mode 100644 index eca2e116c9..0000000000 --- a/apps/desktop/src/main/credential-store.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type { CredentialStore } from '@maka/storage'; -export { createFileCredentialStore } from '@maka/storage'; diff --git a/apps/desktop/src/main/daily-review-ipc-main.ts b/apps/desktop/src/main/daily-review-ipc-main.ts deleted file mode 100644 index 7b8519e70e..0000000000 --- a/apps/desktop/src/main/daily-review-ipc-main.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { ipcMain } from 'electron'; -import type { - DailyReviewConfig, - DailyReviewRange, - DailyReviewSummary, -} from '@maka/core'; -import { DAILY_REVIEW_RANGES } from '@maka/core'; -import { tryResult } from '@maka/core/result'; -import type { createMainWindowController } from './main-window.js'; -import type { createDailyReviewArchiveStore } from './daily-review-archive-store.js'; -import type { createDailyReviewMainService } from './daily-review-main.js'; -import { saveMarkdownViaDialog } from './markdown-save-main.js'; - -type MainWindowController = ReturnType; -type DailyReviewArchiveStore = ReturnType; -type DailyReviewMainService = ReturnType; - -interface DailyReviewIpcDeps { - dailyReview: DailyReviewMainService; - dailyReviewArchiveStore: DailyReviewArchiveStore; - mainWindowController: MainWindowController; -} - -export function registerDailyReviewIpc(deps: DailyReviewIpcDeps): void { - ipcMain.handle( - 'daily-review:day', - ( - _event, - payload: { offsetDays?: number; daySpan?: number } | undefined, - ) => - tryResult(async (): Promise => { - const offset = Number.isFinite(payload?.offsetDays) ? Math.trunc(payload!.offsetDays!) : 0; - const rawSpan = Number.isFinite(payload?.daySpan) ? Math.trunc(payload!.daySpan!) : 1; - return deps.dailyReview.buildSummaryForRange(offset, rawSpan); - }, 'DAILY_REVIEW_DAY_FAILED'), - ); - ipcMain.handle('daily-review:getConfig', () => deps.dailyReviewArchiveStore.getConfig()); - ipcMain.handle('daily-review:setConfig', (_event, patch: Partial) => - deps.dailyReviewArchiveStore.setConfig(patch), - ); - ipcMain.handle( - 'daily-review:runOnce', - (_event, input: { range?: DailyReviewRange; offsetDays?: number; modelKey?: string } | undefined) => - deps.dailyReview.run({ - range: DAILY_REVIEW_RANGES.includes(input?.range as DailyReviewRange) ? input!.range! : 1, - offsetDays: Number.isFinite(input?.offsetDays) ? Math.trunc(input!.offsetDays!) : undefined, - modelKeyOverride: typeof input?.modelKey === 'string' ? input.modelKey : undefined, - trigger: 'manual', - }), - ); - ipcMain.handle('daily-review:list', () => deps.dailyReviewArchiveStore.listArchives()); - ipcMain.handle('daily-review:get', (_event, archiveId: string) => - deps.dailyReviewArchiveStore.getArchive(archiveId), - ); - ipcMain.handle( - 'daily-review:saveMarkdownToFile', - (_event, input: { markdown?: unknown; defaultName?: unknown } | undefined) => - saveMarkdownViaDialog(deps.mainWindowController, input, '保存今日回顾'), - ); - ipcMain.handle( - 'chat:saveConversationToFile', - (_event, input: { markdown?: unknown; defaultName?: unknown } | undefined) => - saveMarkdownViaDialog(deps.mainWindowController, input, '保存当前对话'), - ); -} diff --git a/apps/desktop/src/main/daily-review-main.ts b/apps/desktop/src/main/daily-review-main.ts deleted file mode 100644 index a022d25c97..0000000000 --- a/apps/desktop/src/main/daily-review-main.ts +++ /dev/null @@ -1,385 +0,0 @@ -import { - DAILY_REVIEW_LIST_LIMIT, - buildDailyReviewSummary, - collapseSessionRevisions, - dailyReviewArchiveId, - dailyUsageQuery, - generalizedErrorMessageChinese, - localDayBoundsAt, - localDayBoundsForInstant, - pickDailyReviewSessions, - pickDailyReviewTopEntries, -} from '@maka/core'; -import type { - DailyReviewArchive, - DailyReviewArchiveSectionContent, - DailyReviewRange, - DailyReviewSummary, - DailyReviewTrigger, - SessionSummary, -} from '@maka/core'; -import { providerAuthRequiresSecret, type LlmConnection } from '@maka/core/llm-connections'; -import { buildProviderOptions, getAIModel } from '@maka/runtime'; -import { resolveUsageRange } from '@maka/core/model-call-usage-projection'; -import { mergeUsageBuckets, mergeUsageSummary } from '@maka/core/usage-ledger-merge'; -import type { createConnectionStore, createSqliteModelCallLedger, TelemetryRepo } from '@maka/storage'; -import type { createDailyReviewArchiveStore } from './daily-review-archive-store.js'; - -const DAILY_REVIEW_ARCHIVE_LIMIT = 180; - -type ConnectionStore = ReturnType; -type DailyReviewArchiveStore = ReturnType; -type ModelCallLedger = ReturnType; - -export interface DailyReviewMainService { - buildSummaryForRange(offsetDays: number, daySpan: number): Promise; - run(input: { - range: DailyReviewRange; - offsetDays?: number; - trigger: DailyReviewTrigger; - modelKeyOverride?: string; - }): Promise<{ archiveId: string }>; - startScheduler(): void; - stopScheduler(): void; -} - -interface DailyReviewMainServiceDeps { - archiveStore: DailyReviewArchiveStore; - connectionStore: ConnectionStore; - telemetryRepo: TelemetryRepo; - modelCallLedger: ModelCallLedger; - ensureUsageReady(): Promise; - listSessions(): Promise; - resolveConnectionSecret(slug: string): Promise; - buildSubscriptionModelFetch( - connection: LlmConnection, - sessionId: string, - modelId: string, - ): typeof fetch | undefined; -} - -export function createDailyReviewMainService(deps: DailyReviewMainServiceDeps): DailyReviewMainService { - let schedulerTimer: NodeJS.Timeout | null = null; - let schedulerLastMinuteKey: string | null = null; - const inFlightRuns = new Map>(); - - async function buildSummaryForRange(offsetDays: number, daySpan: number): Promise { - await deps.ensureUsageReady(); - const offset = Number.isFinite(offsetDays) ? Math.trunc(offsetDays) : 0; - const rawSpan = Number.isFinite(daySpan) ? Math.trunc(daySpan) : 1; - const span = Math.max(1, Math.min(30, rawSpan)); - const endDay = - offset === 0 - ? localDayBoundsForInstant(Date.now()) - : localDayBoundsAt(Date.now(), offset); - const startDay = - span === 1 - ? endDay - : localDayBoundsAt(Date.now(), offset - (span - 1)); - const range = { fromMs: startDay.fromMs, toMs: endDay.toMs }; - const usageQuery = dailyUsageQuery(range); - // The day's model spend sums the canonical ledger and the frozen table the - // unrouted compaction calls still write to (#1679). Tool buckets are tool - // invocations, which the ledger does not describe. - const now = Date.now(); - const ledgerPage = deps.modelCallLedger.read(resolveUsageRange(usageQuery.range, now)); - const canonical = { - attempts: ledgerPage.attempts, - unreadableRecords: ledgerPage.unreadableRecords, - // The Daily Review reads the ledger as it stands; repairing it is the - // Usage authority's job on its own read path. - pendingRepairs: deps.modelCallLedger.pendingReprojections().length, - }; - const [usageSummary, toolBuckets, modelBuckets, sessions] = await Promise.all([ - Promise.resolve( - mergeUsageSummary(deps.telemetryRepo.summary(usageQuery), canonical, usageQuery, now), - ), - Promise.resolve(deps.telemetryRepo.buckets(usageQuery, 'tool')), - Promise.resolve( - mergeUsageBuckets( - deps.telemetryRepo.buckets(usageQuery, 'model'), - canonical, - usageQuery, - 'model', - now, - ).buckets, - ), - Promise.resolve(deps.listSessions()), - ]); - return buildDailyReviewSummary({ - day: range, - usageSummary, - sessions: pickDailyReviewSessions(collapseSessionRevisions(sessions), range, DAILY_REVIEW_LIST_LIMIT), - topTools: pickDailyReviewTopEntries(toolBuckets, DAILY_REVIEW_LIST_LIMIT), - topModels: pickDailyReviewTopEntries(modelBuckets, DAILY_REVIEW_LIST_LIMIT), - }); - } - - async function run(input: { - range: DailyReviewRange; - offsetDays?: number; - trigger: DailyReviewTrigger; - modelKeyOverride?: string; - }): Promise<{ archiveId: string }> { - const config = await deps.archiveStore.getConfig(); - const range = input.range; - const modelKeyOverride = input.modelKeyOverride?.trim(); - const effectiveModelKey = modelKeyOverride ? modelKeyOverride : config.modelKey; - const summary = await buildSummaryForRange(input.offsetDays ?? 0, range); - const archiveId = dailyReviewArchiveId(summary.day, range); - const existingArchive = await deps.archiveStore.getArchive(archiveId); - if ( - existingArchive?.status === 'ok' - && existingArchive.range === range - && existingArchive.day.fromMs === summary.day.fromMs - && existingArchive.day.toMs === summary.day.toMs - ) { - return { archiveId }; - } - - const inFlight = inFlightRuns.get(archiveId); - if (inFlight) return inFlight; - const pending = generateArchive({ - archiveId, - effectiveModelKey, - range, - summary, - trigger: input.trigger, - }); - inFlightRuns.set(archiveId, pending); - try { - return await pending; - } finally { - if (inFlightRuns.get(archiveId) === pending) inFlightRuns.delete(archiveId); - } - } - - async function generateArchive(input: { - archiveId: string; - effectiveModelKey: string; - range: DailyReviewRange; - summary: DailyReviewSummary; - trigger: DailyReviewTrigger; - }): Promise<{ archiveId: string }> { - const { archiveId, effectiveModelKey, range, summary, trigger } = input; - const baseArchive: Omit = { - id: archiveId, - day: summary.day, - range, - generatedAt: Date.now(), - trigger, - modelKey: effectiveModelKey, - totals: summary.totals, - }; - - if (summary.totals.sessionCount + summary.totals.requestCount === 0) { - await deps.archiveStore.putArchive({ - ...baseArchive, - status: 'no_data', - sections: buildRuleBasedDailyReviewSections(summary, range), - errorMessage: '没有可用于生成回顾的本地活动数据。', - }); - await deps.archiveStore.prune(DAILY_REVIEW_ARCHIVE_LIMIT); - return { archiveId }; - } - - try { - const modelContext = await resolveModelContext(effectiveModelKey); - if (!modelContext) { - await deps.archiveStore.putArchive({ - ...baseArchive, - status: 'no_model', - sections: buildRuleBasedDailyReviewSections(summary, range), - errorMessage: '未配置可用的分析模型。', - }); - await deps.archiveStore.prune(DAILY_REVIEW_ARCHIVE_LIMIT); - return { archiveId }; - } - - const sections = await generateSections({ - summary, - range, - connection: modelContext.connection, - apiKey: modelContext.apiKey, - modelId: modelContext.modelId, - }); - await deps.archiveStore.putArchive({ - ...baseArchive, - modelKey: `${modelContext.connection.slug}::${modelContext.modelId}`, - status: 'ok', - sections, - }); - } catch (error) { - await deps.archiveStore.putArchive({ - ...baseArchive, - status: 'failed', - sections: buildRuleBasedDailyReviewSections(summary, range), - errorMessage: generalizedErrorMessageChinese(error, '每日回顾生成失败'), - }); - } - await deps.archiveStore.prune(DAILY_REVIEW_ARCHIVE_LIMIT); - return { archiveId }; - } - - async function resolveModelContext(modelKey: string): Promise<{ - connection: LlmConnection; - apiKey: string | null; - modelId: string; - } | null> { - const parsed = parseModelKey(modelKey); - const slug = parsed?.slug ?? await deps.connectionStore.getDefault(); - if (!slug) return null; - const connection = await deps.connectionStore.get(slug); - if (!connection || !connection.enabled) return null; - const modelId = parsed?.modelId || connection.defaultModel; - if (!modelId) return null; - const apiKey = await deps.resolveConnectionSecret(connection.slug); - if (providerAuthRequiresSecret(connection.providerType) && !apiKey) return null; - return { connection, apiKey, modelId }; - } - - async function generateSections(input: { - summary: DailyReviewSummary; - range: DailyReviewRange; - connection: LlmConnection; - apiKey: string | null; - modelId: string; - }): Promise { - const ai = await import('ai') as unknown as { - generateText(opts: Record): Promise<{ text: string }>; - }; - const modelFetch = deps.buildSubscriptionModelFetch(input.connection, 'daily-review', input.modelId); - const result = await ai.generateText({ - model: getAIModel({ - connection: input.connection, - apiKey: input.apiKey ?? '', - modelId: input.modelId, - fetch: modelFetch, - }), - instructions: dailyReviewSystemPrompt(), - prompt: dailyReviewUserPrompt(input.summary, input.range), - providerOptions: buildProviderOptions(input.connection, input.modelId), - }); - return parseDailyReviewSections(result.text); - } - - function startScheduler(): void { - if (schedulerTimer) clearInterval(schedulerTimer); - schedulerTimer = setInterval(() => { - void tickScheduler().catch((error) => { - console.error('[daily-review] scheduler tick failed', error); - }); - }, 60 * 1000); - void tickScheduler().catch((error) => { - console.error('[daily-review] scheduler startup tick failed', error); - }); - } - - function stopScheduler(): void { - if (schedulerTimer) clearInterval(schedulerTimer); - schedulerTimer = null; - } - - async function tickScheduler(): Promise { - const now = new Date(); - const minuteKey = `${now.getFullYear()}-${now.getMonth()}-${now.getDate()}-${now.getHours()}-${now.getMinutes()}`; - if (schedulerLastMinuteKey === minuteKey) return; - schedulerLastMinuteKey = minuteKey; - - const config = await deps.archiveStore.getConfig(); - if (!config.enabled) return; - const hh = String(now.getHours()).padStart(2, '0'); - const mm = String(now.getMinutes()).padStart(2, '0'); - if (`${hh}:${mm}` !== config.executeTime) return; - - await run({ range: 1, offsetDays: -1, trigger: 'cron' }); - } - - return { - buildSummaryForRange, - run, - startScheduler, - stopScheduler, - }; -} - -function parseModelKey(modelKey: string): { slug: string; modelId: string } | null { - const trimmed = modelKey.trim(); - if (!trimmed) return null; - const separator = trimmed.indexOf('::'); - if (separator <= 0 || separator >= trimmed.length - 2) return null; - return { - slug: trimmed.slice(0, separator), - modelId: trimmed.slice(separator + 2), - }; -} - -function dailyReviewSystemPrompt(): string { - return [ - '你是 Maka 的每日回顾分析器。只基于输入的本地统计和会话预览生成回顾，不编造未出现的事实。', - '输出 JSON，不要 Markdown fence。JSON 顶层字段只允许 summary、gaps、usage、code，值为中文字符串。', - '生成适用的栏目；没有可靠内容的栏目省略。', - ].join('\n'); -} - -function dailyReviewUserPrompt( - summary: DailyReviewSummary, - range: DailyReviewRange, -): string { - return JSON.stringify({ - rangeDays: range, - day: summary.day, - totals: summary.totals, - sessions: summary.sessions.map((session) => ({ - name: session.name, - lastMessageAt: session.lastMessageAt, - preview: session.lastMessagePreview ?? '', - })), - topModels: summary.topModels, - topTools: summary.topTools, - instruction: range === 1 - ? '生成当天工作分析：发生了什么、遗漏什么、用量洞察、代码建议。' - : `生成最近 ${range} 天的工作分析：趋势、遗漏、风险、下一步。`, - }); -} - -export function parseDailyReviewSections(text: string): DailyReviewArchiveSectionContent { - const trimmed = text.trim(); - let sections: DailyReviewArchiveSectionContent; - try { - const parsed: unknown = JSON.parse(trimmed); - sections = parsed && typeof parsed === 'object' && !Array.isArray(parsed) - ? { - ...('summary' in parsed && typeof parsed.summary === 'string' ? { summary: parsed.summary.trim() } : {}), - ...('gaps' in parsed && typeof parsed.gaps === 'string' ? { gaps: parsed.gaps.trim() } : {}), - ...('usage' in parsed && typeof parsed.usage === 'string' ? { usage: parsed.usage.trim() } : {}), - ...('code' in parsed && typeof parsed.code === 'string' ? { code: parsed.code.trim() } : {}), - } - : {}; - } catch { - sections = { summary: trimmed }; - } - if (Object.values(sections).some((content) => content.length > 0)) return sections; - throw new Error('Daily Review model returned no usable sections'); -} - -function buildRuleBasedDailyReviewSections( - summary: DailyReviewSummary, - range: DailyReviewRange, -): DailyReviewArchiveSectionContent { - const sections: { - summary?: string; - gaps?: string; - usage?: string; - code?: string; - } = {}; - sections.summary = `${range} 天范围覆盖 ${summary.totals.sessionCount} 个对话、${summary.totals.requestCount} 次请求、${summary.totals.totalTokens} tokens。`; - sections.gaps = summary.totals.errorCount > 0 - ? `发现 ${summary.totals.errorCount} 次错误请求，建议回看失败上下文。` - : '未从本地统计中发现明确失败请求。'; - const topModel = summary.topModels[0]; - if (topModel) sections.usage = `使用最多的模型是 ${topModel.label}，共 ${topModel.requests} 次请求。`; - const topTool = summary.topTools[0]; - if (topTool) sections.code = `高频工具：${topTool.label}（${topTool.requests} 次）。建议优先复盘相关改动产物。`; - return sections; -} diff --git a/apps/desktop/src/main/delete-connection-with-credential.ts b/apps/desktop/src/main/delete-connection-with-credential.ts deleted file mode 100644 index 24ed8b4dc2..0000000000 --- a/apps/desktop/src/main/delete-connection-with-credential.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { LlmConnection } from '@maka/core'; -import type { ConnectionStore, CredentialStore } from '@maka/storage'; - -interface DeleteConnectionWithCredentialDeps { - connectionStore: Pick; - credentialStore: Pick; - /** - * Logs out account-managed OAuth connections before their catalog row is - * removed. Without this step the next connection-list read materializes the - * still-authenticated account again, making deletion appear to do nothing. - */ - disconnectManagedOAuthConnection(connection: LlmConnection): Promise; -} - -export async function deleteConnectionWithCredential( - deps: DeleteConnectionWithCredentialDeps, - slug: string, -): Promise { - const connection = await deps.connectionStore.get(slug); - if (connection) { - await deps.disconnectManagedOAuthConnection(connection); - } - await deps.connectionStore.delete(slug); - await deps.credentialStore.deleteSecret(slug); -} diff --git a/apps/desktop/src/main/desktop-backend-tool-surface.ts b/apps/desktop/src/main/desktop-backend-tool-surface.ts deleted file mode 100644 index f61ae0e2ed..0000000000 --- a/apps/desktop/src/main/desktop-backend-tool-surface.ts +++ /dev/null @@ -1,383 +0,0 @@ -import { - activePlanExecution, - relayModelProfile, - DEFAULT_SESSION_NAME, - defaultWebSearchSettings, - isDeepResearchSession, - resolveModelVisionSupport, -} from '@maka/core'; -import type { - AppSettings, - CollaborationMode, - LlmConnection, - SessionHeader, -} from '@maka/core'; -import { - emptyPlanSessionState, - type PlanExecution, - type PlanSessionState, - type PlanStore, -} from '@maka/core/plan'; -import { - AGENT_TOOL_NAMES, - AGENT_TOOL_GROUP_ID, - buildCancelPlanTool, - isDeepResearchToolAllowed, - buildMcpTools, - buildSubmitPlanTool, - buildToolsForAgentDefinition, - buildUpdatePlanTool, - projectEffectiveProductToolSurface, - routeWebFetchTools, - routeWebSearchTools, - selectCollaborationTools, -} from '@maka/runtime'; -import type { - HostCapabilities, - MakaTool, - ToolAvailabilityConfig, -} from '@maka/runtime'; -import type { McpClientManager } from '@maka/mcp'; -import { computerUseToolsForModel } from './computer-use-model-tools.js'; -import type { ReadyConnection } from './chat-readiness.js'; - -export interface DesktopBackendToolSurfaceDeps { - isComputerUseRealModelE2e: boolean; - ensureMcpReady: () => Promise; - getReadyConnection: ( - slug: string | null | undefined, - model?: string, - ) => Promise; - mcpManager: McpClientManager; - deepResearchTools: readonly MakaTool[]; - computerUseTools: readonly MakaTool[]; - builtinTools: readonly MakaTool[]; - toolEconomy: boolean; - planStore: PlanStore; - getAgentGraphSupervisorTools?: ( - sessionId: string, - header: SessionHeader, - ) => Promise; - getWebSearchSettings?: () => Promise; - getPrivacySettings?: () => Promise; - /** Complete child catalog before per-session search routing. */ - childTools?: readonly MakaTool[]; - /** Rebuilds parent agent tools from the routed child capability surface. */ - buildParentAgentToolsForChildSurface?: (childTools: readonly MakaTool[]) => readonly MakaTool[]; -} - -export interface DesktopBackendToolSurfaceInput { - sessionId: string; - header: SessionHeader; - /** Scoped child tools. Main sessions leave this undefined. */ - tools?: readonly MakaTool[]; - /** Reuse a connection already resolved for a not-yet-persisted session preview. */ - readyConnection?: ReadyConnection; - /** Avoid reading a durable plan ledger for a not-yet-persisted session preview. */ - planState?: PlanSessionState; - /** A new-session preview has no durable root Session to supervise yet. */ - includeAgentGraphSupervisorTools?: boolean; -} - -export interface DesktopBackendToolSurface { - connection: LlmConnection; - apiKey: string; - model: string; - supportsVision: boolean; - collaborationMode: CollaborationMode; - planState: PlanSessionState; - activeExecution?: PlanExecution; - interruptedExecution?: PlanExecution; - selectedTools: MakaTool[]; - toolAvailability: ToolAvailabilityConfig; - skillHost: HostCapabilities; - admitsAgentChildren: boolean; -} - -export interface DesktopNewSessionSkillContext { - collaborationMode?: CollaborationMode; -} - -/** - * Resolve the child capability surface from the same connection, search policy, - * and privacy authority used by backend creation. - */ -export async function resolveDesktopChildToolSurface( - deps: DesktopBackendToolSurfaceDeps, - input: { - header: SessionHeader; - tools: readonly MakaTool[]; - readyConnection?: ReadyConnection; - }, -): Promise { - const { connection, model } = - input.readyConnection ?? - (await deps.getReadyConnection(input.header.llmConnectionSlug, input.header.model)); - const webSearchSettings = await (deps.getWebSearchSettings?.() ?? - Promise.resolve(defaultWebSearchSettings())); - const privacySettings = await deps.getPrivacySettings?.(); - return routeWebSearchTools({ - tools: routeWebFetchTools( - input.tools, - privacySettings ?? { incognitoActive: false }, - ), - settings: webSearchSettings, - connection, - model, - ...(privacySettings ? { privacy: privacySettings } : {}), - }); -} - -/** - * Resolve Skill capabilities for an existing Desktop session from the same - * durable child-tool snapshot that Runtime uses when it builds that session's - * backend. Root sessions keep using the normal Desktop catalog. - */ -export async function resolveDesktopSessionSkillHost( - deps: DesktopBackendToolSurfaceDeps, - input: { - sessionId: string; - header: SessionHeader; - childTools: readonly MakaTool[]; - }, -): Promise { - if (input.header.backend !== 'ai-sdk') return { toolNames: new Set() }; - const tools = resolveDurableChildTools(input.header, input.childTools); - return ( - await resolveDesktopBackendToolSurface(deps, { - sessionId: input.sessionId, - header: input.header, - ...(tools !== undefined ? { tools } : {}), - }) - ).skillHost; -} - -/** - * Resolve Skill capabilities for the empty-state composer before a session is - * persisted. The preview header stands in for the session the composer will - * create on first send, which is always a plain chat — entry points that pick - * a mode (Deep Research) create their session up front, so by the time the - * composer mounts there is a real header to read from. - */ -export async function resolveDesktopNewSessionSkillHost( - deps: DesktopBackendToolSurfaceDeps, - input: { - projectRoot: string; - workspaceRoot: string; - readyConnection: ReadyConnection; - context?: DesktopNewSessionSkillContext; - }, -): Promise { - const sessionId = 'new-session-skill-preview'; - const now = Date.now(); - const header: SessionHeader = { - id: sessionId, - workspaceRoot: input.workspaceRoot, - cwd: input.projectRoot, - createdAt: now, - lastUsedAt: now, - name: DEFAULT_SESSION_NAME, - titleIsManual: false, - isFlagged: false, - labels: [], - isArchived: false, - status: 'active', - hasUnread: false, - backend: 'ai-sdk', - llmConnectionSlug: input.readyConnection.connection.slug, - connectionLocked: false, - model: input.readyConnection.model, - permissionMode: 'ask', - collaborationMode: input.context?.collaborationMode ?? 'agent', - orchestrationMode: 'default', - schemaVersion: 1, - }; - return ( - await resolveDesktopBackendToolSurface(deps, { - sessionId, - header, - readyConnection: input.readyConnection, - planState: emptyPlanSessionState(sessionId), - includeAgentGraphSupervisorTools: false, - }) - ).skillHost; -} - -/** - * Derive the exact tool surface an upcoming Desktop ai-sdk backend will bind. - * - * Pre-send Skill resolution and slash discovery call this with the persisted - * session header; backend construction calls it with the same header/context. - * Keeping the model, collaboration, plan, MCP and child-tool - * filters here prevents either path from advertising capabilities the other - * path cannot execute. - */ -export async function resolveDesktopBackendToolSurface( - deps: DesktopBackendToolSurfaceDeps, - input: DesktopBackendToolSurfaceInput, -): Promise { - // MCP is optional. A corrupt mcp.json remains visible in the MCP module, - // but must not prevent builtin-only conversations or Skill discovery. - await deps.ensureMcpReady().catch(() => {}); - const { connection, apiKey, model } = - input.readyConnection ?? - (await deps.getReadyConnection( - input.header.llmConnectionSlug, - input.header.model, - )); - const supportsVision = modelSupportsVision(connection, model); - const collaborationMode = input.header.collaborationMode ?? 'agent'; - const planState = input.planState ?? (await deps.planStore.readState(input.sessionId)); - const activeExecution = activePlanExecution(planState); - const interruptedExecution = [...planState.executions] - .reverse() - .find((execution) => execution.status === 'interrupted'); - const agentGraphSupervisorTools = - !input.tools && - input.includeAgentGraphSupervisorTools !== false && - deps.getAgentGraphSupervisorTools - ? await deps.getAgentGraphSupervisorTools(input.sessionId, input.header) - : []; - const unscopedCandidateTools = input.tools - ? [...input.tools] - : deps.isComputerUseRealModelE2e - ? [...deps.computerUseTools] - : [ - ...deps.builtinTools, - ...agentGraphSupervisorTools, - ...buildMcpTools(deps.mcpManager), - ...(isDeepResearchSession(input.header.labels) ? deps.deepResearchTools : []), - ]; - const candidateTools = - !input.tools && isDeepResearchSession(input.header.labels) - ? unscopedCandidateTools.filter(isDeepResearchToolAllowed) - : unscopedCandidateTools; - const webSearchSettings = await (deps.getWebSearchSettings?.() ?? - Promise.resolve(defaultWebSearchSettings())); - const privacySettings = await deps.getPrivacySettings?.(); - const routedCandidateTools = routeWebSearchTools({ - tools: routeWebFetchTools( - candidateTools, - privacySettings ?? { incognitoActive: false }, - ), - settings: webSearchSettings, - connection, - model, - ...(privacySettings ? { privacy: privacySettings } : {}), - }); - const routedChildTools = deps.childTools - ? routeWebSearchTools({ - tools: routeWebFetchTools( - deps.childTools, - privacySettings ?? { incognitoActive: false }, - ), - settings: webSearchSettings, - connection, - model, - ...(privacySettings ? { privacy: privacySettings } : {}), - }) - : undefined; - const effectiveCandidateTools = - !input.tools && routedChildTools && deps.buildParentAgentToolsForChildSurface - ? replaceParentAgentTools( - routedCandidateTools, - deps.buildParentAgentToolsForChildSurface(routedChildTools), - ) - : routedCandidateTools; - const toolEconomy = deps.isComputerUseRealModelE2e ? false : deps.toolEconomy; - - const planControlTools = input.tools - ? [] - : collaborationMode === 'plan' - ? [buildSubmitPlanTool(deps.planStore, interruptedExecution?.executionId)] - : activeExecution - ? [ - buildUpdatePlanTool(deps.planStore, activeExecution.executionId), - buildCancelPlanTool(deps.planStore, activeExecution.executionId), - ] - : []; - const backendTools = computerUseToolsForModel( - [...effectiveCandidateTools, ...planControlTools], - deps.computerUseTools, - supportsVision, - ); - const selectedTools = selectCollaborationTools({ - mode: collaborationMode, - tools: backendTools, - hasActiveExecution: activeExecution !== undefined, - }); - const productToolSurface = projectEffectiveProductToolSurface({ - host: 'desktop', - tools: selectedTools, - policy: { economy: toolEconomy }, - }); - - return { - connection, - apiKey, - model, - supportsVision, - collaborationMode, - planState, - activeExecution, - interruptedExecution, - selectedTools: [...productToolSurface.tools], - toolAvailability: productToolSurface.toolAvailability, - skillHost: productToolSurface.hostCapabilities, - admitsAgentChildren: productToolSurface.boundSurfaceIds.includes(AGENT_TOOL_GROUP_ID), - }; -} - -function replaceParentAgentTools( - tools: readonly MakaTool[], - replacements: readonly MakaTool[], -): MakaTool[] { - const parentToolNames = new Set(AGENT_TOOL_NAMES); - const result: MakaTool[] = []; - let replaced = false; - for (const tool of tools) { - if (!parentToolNames.has(tool.name)) { - result.push(tool); - continue; - } - if (!replaced) { - result.push(...replacements); - replaced = true; - } - } - return result; -} - -function modelSupportsVision(connection: LlmConnection, model: string): boolean { - return resolveModelVisionSupport( - connection.providerType, - connection.models, - model, - relayModelProfile(connection, model)?.vision, - ); -} - -function resolveDurableChildTools( - header: SessionHeader, - availableChildTools: readonly MakaTool[], -): MakaTool[] | undefined { - const snapshot = header.subagentRuntime; - if (!snapshot) { - if (header.subagentParent) { - throw new Error('Linked child session is missing its durable runtime snapshot'); - } - return undefined; - } - if (!header.subagentParent) { - throw new Error('Subagent runtime snapshot requires a linked child session'); - } - const tools = buildToolsForAgentDefinition(availableChildTools, { - id: snapshot.agentId, - permissionMode: header.permissionMode, - tools: snapshot.toolNames, - }); - if (tools.length !== snapshot.toolNames.length) { - throw new Error('Subagent runtime tool snapshot is unavailable'); - } - return tools; -} diff --git a/apps/desktop/src/main/desktop-builtin-tools.ts b/apps/desktop/src/main/desktop-builtin-tools.ts deleted file mode 100644 index a7b91cf003..0000000000 --- a/apps/desktop/src/main/desktop-builtin-tools.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { - buildBuiltinTools, - type BuildBuiltinToolsOptions, - type MakaTool, -} from '@maka/runtime'; - -type DesktopBuiltinToolsOptions = Omit; - -/** Keep worker-backed tools aligned across the Desktop parent and child surfaces. */ -export function buildDesktopBuiltinTools(options: DesktopBuiltinToolsOptions): MakaTool[] { - return buildBuiltinTools({ - ...options, - includeEdit: Boolean(options.filesystemWorker), - }); -} diff --git a/apps/desktop/src/main/desktop-execution-admission.ts b/apps/desktop/src/main/desktop-execution-admission.ts deleted file mode 100644 index 79cd98686a..0000000000 --- a/apps/desktop/src/main/desktop-execution-admission.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { ExecutionBoundary } from '@maka/core'; - -/** - * Whether the desktop may run this session at all. - * - * An externally isolated session belongs to the harness that owns its sandbox; - * the desktop has no authority over that boundary and must not act inside it. - * - * Exposed alongside the assert so a caller that is *surveying* sessions can ask - * without catching. Both shapes read the same rule from here, so a caller never - * restates it — and a by-design skip stays distinguishable from a real failure, - * which matters wherever both are handled in one place. - */ -export function isDesktopAdmissibleExecutionBoundary(boundary: ExecutionBoundary): boolean { - return boundary.kind !== 'external'; -} - -export function assertDesktopExecutionBoundary( - sessionId: string, - boundary: ExecutionBoundary, -): void { - if (!isDesktopAdmissibleExecutionBoundary(boundary)) { - throw new Error( - `Cannot run externally isolated session ${sessionId} outside its owning harness.`, - ); - } -} diff --git a/apps/desktop/src/main/desktop-runtime-owner.ts b/apps/desktop/src/main/desktop-runtime-owner.ts deleted file mode 100644 index 92a5b64d6b..0000000000 --- a/apps/desktop/src/main/desktop-runtime-owner.ts +++ /dev/null @@ -1,15 +0,0 @@ -export type DesktopRuntimeOwner = 'embedded' | 'runtime-host'; - -export const DESKTOP_RUNTIME_OWNER_ENV = 'MAKA_DESKTOP_RUNTIME_OWNER'; - -/** - * Select the one Interactive Runtime owner before either boot graph is loaded. - * An invalid opt-in is fatal so startup can never drift into an embedded fallback. - */ -export function resolveDesktopRuntimeOwner(value: string | undefined): DesktopRuntimeOwner { - if (value === undefined || value === '' || value === 'embedded') return 'embedded'; - if (value === 'runtime-host') return 'runtime-host'; - throw new Error( - `${DESKTOP_RUNTIME_OWNER_ENV} must be "embedded" or "runtime-host"`, - ); -} diff --git a/apps/desktop/src/main/e2e-fixture.ts b/apps/desktop/src/main/e2e-fixture.ts index 48c1f6ae90..21b276e5e9 100644 --- a/apps/desktop/src/main/e2e-fixture.ts +++ b/apps/desktop/src/main/e2e-fixture.ts @@ -3,11 +3,12 @@ import { join } from 'node:path'; import type { UiLocale, E2eFixtureScenario, E2eFixtureState } from '@maka/core'; import { backfillSessionProjects, + createFileCredentialStore, createProjectCatalog, createSessionStore, } from '@maka/storage'; import { resolveStorageRoot } from '@maka/storage/root-authority'; -import type { CredentialStore } from './credential-store.js'; +import type { CredentialStore } from '@maka/storage'; import { ARTIFACT_SESSION_ID, ERROR_SESSION_ID, @@ -698,18 +699,19 @@ function buildE2eFixtureState(fixture: E2eFixture | null): E2eFixtureState | nul export async function seedE2eFixture(input: { workspaceRoot: string; fixture: E2eFixture; - credentialStore: Pick; + credentialStore?: Pick; now?: number; }): Promise { const now = input.now ?? E2E_FIXTURE_NOW; await rm(input.workspaceRoot, { recursive: true, force: true }); await mkdir(input.workspaceRoot, { recursive: true }); await resolveStorageRoot({ path: input.workspaceRoot, kind: 'interactive' }); + const credentialStore = input.credentialStore ?? createFileCredentialStore(input.workspaceRoot); await writeSettings(input.workspaceRoot, input.fixture.scenario); if (input.fixture.scenario === 'first-run') return; await writeConnections(input.workspaceRoot, now, input.fixture.scenario); for (const slug of ['zai-live', 'relay-fallback', 'empty-fetched', 'needs-reauth', 'broken-provider']) { - await input.credentialStore.setSecret(slug, 'api_key', `fixture-key-${slug}`); + await credentialStore.setSecret(slug, 'api_key', `fixture-key-${slug}`); } await writeSession(input.workspaceRoot, turnSession(now), turnMessages(now)); if (input.fixture.scenario === 'deep-research-progress') { diff --git a/apps/desktop/src/main/e2e-fixture/seed-helpers.ts b/apps/desktop/src/main/e2e-fixture/seed-helpers.ts index a77daaffe1..fcaf6dfea0 100644 --- a/apps/desktop/src/main/e2e-fixture/seed-helpers.ts +++ b/apps/desktop/src/main/e2e-fixture/seed-helpers.ts @@ -151,15 +151,20 @@ export async function writeSession( session: SessionHeader, messages: StoredMessage[], ): Promise { + const rootedSession: SessionHeader = { + ...session, + workspaceRoot, + cwd: workspaceRoot, + }; const databaseLease = acquireOperationalStateDatabase(workspaceRoot); const sessions = createSqliteSessionMetadataStore( join(workspaceRoot, OPERATIONAL_STATE_DATABASE_NAME), { databaseLease }, ); try { - await sessions.create(session); + await sessions.create(rootedSession); await sessions.appendMessages( - session.id, + rootedSession.id, messages, projectSessionCatalogMessages(messages), ); diff --git a/apps/desktop/src/main/embedded-bot-session-adapter.ts b/apps/desktop/src/main/embedded-bot-session-adapter.ts deleted file mode 100644 index 5931182693..0000000000 --- a/apps/desktop/src/main/embedded-bot-session-adapter.ts +++ /dev/null @@ -1,104 +0,0 @@ -import type { SessionChangedEvent, SessionChangedReason, SessionEvent } from '@maka/core'; -import type { GoalTurnOutcome, SessionManager } from '@maka/runtime'; -import { - BotSessionUnavailableError, - type BotSessionAdapter, -} from './bot-session-adapter.js'; -import type { DesktopCreateSessionInput } from './new-session-project.js'; -import { - assertSessionCanSendFromHeader, - isSessionLifecycleError, -} from './session-lifecycle.js'; - -interface EmbeddedBotSessionAdapterDeps { - runtime: SessionManager; - createSession: ( - input: DesktopCreateSessionInput, - ) => ReturnType; - getDefaultConnectionSlug(): Promise; - getReadyConnection( - slug: string | null | undefined, - model?: string, - ): Promise<{ connection: { slug: string }; model: string }>; - readSessionHeader(sessionId: string): Promise<{ - permissionMode: string; - isArchived: boolean; - status: string; - }>; - ensureSessionCanSend(sessionId: string): Promise; - emitSessionsChanged( - reason: SessionChangedReason, - sessionId?: string, - extra?: Pick, - ): void; - runAgentTurn(input: { - sessionId: string; - iterator: AsyncIterable; - turnId: string; - onEvent: (event: SessionEvent) => void; - }): Promise<{ outcome: GoalTurnOutcome; error?: string }>; -} - -export function createEmbeddedBotSessionAdapter( - deps: EmbeddedBotSessionAdapterDeps, -): BotSessionAdapter { - return { - async createSession(input) { - const ready = await deps.getReadyConnection( - await deps.getDefaultConnectionSlug(), - undefined, - ); - const summary = await deps.createSession({ - backend: 'ai-sdk', - llmConnectionSlug: ready.connection.slug, - model: ready.model, - permissionMode: 'explore', - name: input.name, - labels: [...input.labels], - }); - deps.emitSessionsChanged('created', summary.id); - await deps.ensureSessionCanSend(summary.id); - return summary.id; - }, - - async prepareSession(sessionId) { - try { - const header = await deps.readSessionHeader(sessionId); - assertSessionCanSendFromHeader(header); - try { - await deps.runtime.setPermissionMode(sessionId, 'explore'); - } catch (error) { - if (isSessionLifecycleError(error)) throw error; - return 'permission_refused'; - } - deps.emitSessionsChanged('updated', sessionId); - await deps.ensureSessionCanSend(sessionId); - return 'ready'; - } catch (error) { - if (!isSessionLifecycleError(error)) throw error; - throw new BotSessionUnavailableError(error.message, { cause: error }); - } - }, - - async runTurn({ sessionId, turnId, text }) { - const iterator = deps.runtime.sendMessage(sessionId, { turnId, text }); - let latestText = ''; - const result = await deps.runAgentTurn({ - sessionId, - iterator, - turnId, - onEvent: (event) => { - if (event.type === 'text_complete') latestText = event.text; - }, - }); - if (result.outcome.kind === 'suspended') return { kind: 'suspended' }; - if (result.outcome.kind === 'errored') { - return { - kind: 'errored', - reason: result.error ?? result.outcome.reason, - }; - } - return { kind: 'completed', text: latestText }; - }, - }; -} diff --git a/apps/desktop/src/main/execution-store-wiring.ts b/apps/desktop/src/main/execution-store-wiring.ts deleted file mode 100644 index 9ef30528e8..0000000000 --- a/apps/desktop/src/main/execution-store-wiring.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { - createSqliteAgentRunStore, - createSqliteShellRunStore, -} from '@maka/storage'; - -export interface DesktopExecutionStoreWiring { - readonly runStore: ReturnType; - readonly shellRunStore: ReturnType; - close(): void; -} - -/** - * Open the two core execution stores only after their legacy cutovers finish. - * Keeping this boundary explicit prevents Desktop services from observing a - * partially imported root and gives shutdown one owner for both database - * leases. - */ -export async function openDesktopExecutionStoreWiring( - workspaceRoot: string, -): Promise { - const runStore = createSqliteAgentRunStore(workspaceRoot); - let shellRunStore: ReturnType | undefined; - try { - shellRunStore = createSqliteShellRunStore(workspaceRoot); - await Promise.all([runStore.ready?.(), shellRunStore.ready()]); - } catch (error) { - shellRunStore?.close(); - runStore.close?.(); - throw error; - } - - let closed = false; - return Object.freeze({ - runStore, - shellRunStore, - close: () => { - if (closed) return; - closed = true; - shellRunStore.close(); - runStore.close?.(); - }, - }); -} diff --git a/apps/desktop/src/main/goal-wiring.ts b/apps/desktop/src/main/goal-wiring.ts deleted file mode 100644 index 15ed08bace..0000000000 --- a/apps/desktop/src/main/goal-wiring.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import { - GoalContinuationCoordinator, - GoalManager, - buildGoalTools, - type GoalContinuationDeps, - type GoalState, - type GoalStatus, - type GoalTaskGateTrace, - type GoalTurnAdmission, - type MakaTool, -} from '@maka/runtime'; -import type { LlmConnection } from '@maka/core'; - -/** - * Goal execution wiring for the main process. Owns the GoalManager, the goal - * tools, and the turn-boundary continuation coordinator. - * - * The evaluator uses the session's default connection model with a small, - * bounded output budget. A dedicated judge model would be cheaper, but reusing - * the session model avoids a fragile provider-specific model mapping. - * - * Waiting is owned by the coordinator's in-memory backoff; it does not couple a - * Goal to Automation and does not immediately spend another model turn. - */ -export interface MainGoalWiring { - manager: GoalManager; - tools: MakaTool[]; - coordinator: GoalContinuationCoordinator; - /** Clear the current Goal generation without closing the session to future turns. */ - clearGoal: (sessionId: string) => GoalState | undefined; - /** Persist archive, then discard Goal execution state. */ - archiveSession: (sessionId: string, persist: () => Promise) => Promise; - /** Persist unarchive, then clear only the durable archive admission fence. */ - unarchiveSession: (sessionId: string, persist: () => Promise) => Promise; - /** Persist deletion, then release every in-memory Goal owner for the session. */ - removeSession: (sessionId: string, persist: () => Promise) => Promise; -} - -export interface CreateMainGoalWiringDeps { - getDefaultConnectionSlug: () => Promise; - getConnection: (slug: string) => Promise; - /** - * The session's own connection + model, so the evaluator judges on the same - * provider the session uses (not a global default that could route this - * session's text to an unrelated provider). Null when the session is gone. - */ - getSessionModel: (sessionId: string) => Promise<{ connectionSlug: string; model: string } | null>; - resolveConnectionSecret: (slug: string) => Promise; - buildSubscriptionModelFetch: (connection: LlmConnection, sessionId: string, modelId: string) => typeof fetch | undefined; - getAIModel: (input: { connection: LlmConnection; apiKey: string; modelId: string; fetch: typeof fetch | undefined }) => unknown; - buildProviderOptions: (connection: LlmConnection, modelId: string) => unknown; - getRecentMessages: (sessionId: string) => Promise>; - /** Cumulative token count for a session (summed from token_usage messages). */ - getTokenCount: (sessionId: string) => Promise; - admitTurn: (sessionId: string, text: string) => GoalTurnAdmission; - /** Pending/in-progress task keys used by the bounded Goal stop reminder. */ - listActionableTaskKeys?: (sessionId: string) => Promise; - /** Persist the task gate decision against the completed AgentRun. */ - recordTaskGateDecision?: (trace: GoalTaskGateTrace) => Promise; - /** - * Fired on every goal state transition (set / continue / terminal / clear). - * The host emits a session event so the renderer can badge an active goal and - * offer a clear affordance — an autonomous token-burning loop must be visible. - */ - onGoalChange?: (goal: GoalState, previous?: GoalStatus) => void; -} - -export function createMainGoalWiring(deps: CreateMainGoalWiringDeps): MainGoalWiring { - const manager = new GoalManager({ - generateId: () => randomUUID(), - now: () => Date.now(), - onChange: deps.onGoalChange, - }); - - // Synchronous best-effort token snapshot cache, refreshed each continuation. - const tokenCache = new Map(); - - const continuationDeps: GoalContinuationDeps = { - goalManager: manager, - evaluator: { - async evaluate(prompt: string, sessionId: string): Promise { - // Judge on the SESSION's own connection + model (fall back to the - // default only if the session's connection is gone), so evaluation - // routes to the same provider the session is actually driving. - const sess = await deps.getSessionModel(sessionId); - const slug = sess?.connectionSlug ?? await deps.getDefaultConnectionSlug(); - if (!slug) return '{"met": false, "impossible": false, "progress": false, "waiting": false, "reason": "no connection configured"}'; - const connection = await deps.getConnection(slug); - if (!connection) return '{"met": false, "impossible": false, "progress": false, "waiting": false, "reason": "connection not found"}'; - const modelId = sess?.model ?? connection.defaultModel; - const apiKey = await deps.resolveConnectionSecret(slug); - const ai = await import('ai') as unknown as { - generateText(opts: Record): Promise<{ text: string }>; - }; - const modelFetch = deps.buildSubscriptionModelFetch(connection, 'goal-evaluator', modelId); - const result = await ai.generateText({ - model: deps.getAIModel({ connection, apiKey: apiKey ?? '', modelId, fetch: modelFetch }), - prompt, - providerOptions: deps.buildProviderOptions(connection, modelId), - // Ceiling, not a target — the verdict is tiny JSON. Kept well above the - // JSON size so any model-side reasoning before the JSON doesn't consume - // the whole budget and return empty text (finishReason=length). 250 was - // too tight once the cap is honored by the AI SDK. - maxOutputTokens: 1024, - }); - return result.text; - }, - }, - async getRecentContext(sessionId: string): Promise { - // Refresh the token snapshot while we have the session open. - tokenCache.set(sessionId, await deps.getTokenCount(sessionId)); - const messages = await deps.getRecentMessages(sessionId); - return messages - .filter((m) => m.type === 'user' || m.type === 'assistant') - .slice(-6) - .map((m) => `[${m.type}]: ${(m.text ?? '').slice(0, 500)}`) - .join('\n'); - }, - getTokenCount: (sessionId) => tokenCache.get(sessionId) ?? 0, - admitTurn: deps.admitTurn, - ...(deps.listActionableTaskKeys ? { - taskGate: { - listActionableTaskKeys: deps.listActionableTaskKeys, - ...(deps.recordTaskGateDecision ? { recordDecision: deps.recordTaskGateDecision } : {}), - }, - } : {}), - }; - - const coordinator = new GoalContinuationCoordinator(continuationDeps); - const tools = buildGoalTools({ - goalManager: manager, - goalContinuation: coordinator, - getTokenCount: (sessionId) => tokenCache.get(sessionId) ?? 0, - }); - - async function closeSession( - sessionId: string, - kind: 'archive' | 'remove', - persist: () => Promise, - ): Promise { - const operation = coordinator.beginSessionClose(sessionId, kind); - try { - await persist(); - } catch (error) { - operation.rollback(); - throw error; - } - operation.commit(); - manager.remove(sessionId); - } - - return { - manager, - tools, - coordinator, - clearGoal(sessionId) { - const cleared = manager.clear(sessionId); - if (cleared) coordinator.invalidateSession(sessionId); - return cleared; - }, - archiveSession(sessionId, persist) { - return closeSession(sessionId, 'archive', persist); - }, - async unarchiveSession(sessionId, persist) { - await persist(); - coordinator.unarchiveSession(sessionId); - }, - removeSession(sessionId, persist) { - return closeSession(sessionId, 'remove', persist); - }, - }; -} diff --git a/apps/desktop/src/main/inspector-ipc-main.ts b/apps/desktop/src/main/inspector-ipc-main.ts deleted file mode 100644 index f5550e5a4f..0000000000 --- a/apps/desktop/src/main/inspector-ipc-main.ts +++ /dev/null @@ -1,90 +0,0 @@ -import type { IpcMain } from 'electron'; -import { decodeModelCallAttempt, type ModelCallAttempt } from '@maka/core/model-call-attempt'; -import { MODEL_CALL_ATTEMPT_EVENT_TYPE } from '@maka/core/model-call-attempt'; -import type { RuntimeEvent } from '@maka/core/runtime-event'; -import type { SessionTrace } from '@maka/core/session-trace'; -import { tryResult } from '@maka/core/result'; -import { projectSessionTrace } from '@maka/runtime'; - -/** - * Read-only projection of one session's causal trace for the Inspector (#1625). - * - * Reads two ledgers and writes nothing. The AgentRun stream is the authority - * for canonical metering — not the Usage read model, which is range-queried and - * carries no session predicate — and `readSessionRuntimeEvents` supplies the - * causal structure the metering ledger knows nothing about. - */ -export interface InspectorIpcDeps { - ipcMain: Pick; - readSessionRuntimeEvents: (sessionId: string) => Promise; - listSessionRuns: (sessionId: string) => Promise; - readRunEvents: ( - sessionId: string, - runId: string, - ) => Promise; -} - -export function registerInspectorIpc(deps: InspectorIpcDeps): void { - deps.ipcMain.handle('inspector:trace', (_event, sessionId: string) => - tryResult(async () => await readSessionTrace(deps, sessionId), 'INSPECTOR_TRACE_FAILED'), - ); -} - -export async function readSessionTrace( - deps: Omit, - sessionId: string, -): Promise { - const [runtimeEvents, runs] = await Promise.all([ - deps.readSessionRuntimeEvents(sessionId), - deps.listSessionRuns(sessionId), - ]); - - const modelCallAttempts: ModelCallAttempt[] = []; - let unreadableRecords = 0; - // Per run rather than per session: the authority stream is keyed that way, so - // reading it run by run is reading it as it is stored, not reshaping it. - // - // Each run's events are read independently because a read failure is just - // another way a record can be unreadable: one corrupt event row would - // otherwise fail the whole trace on every retry, the opposite of the - // "counted, not dropped" rule this projection is built on. - // - // The two reads above are NOT covered by that. `listSessionRunsForRecovery` - // parses every header row with no per-row tolerance - // (`agent-run-store.ts:333`), so one corrupt header still rejects the whole - // trace. Fixing it there changes the contract every recovery caller depends - // on, which is a decision about recovery rather than about this read model — - // so it is stated here rather than quietly half-fixed. - const runEvents = await Promise.all( - runs.map(async (run) => { - try { - return await deps.readRunEvents(sessionId, run.runId); - } catch { - // Nothing is known about how many records the run held, so it counts as - // one gap rather than a guess at its size. - unreadableRecords += 1; - return []; - } - }), - ); - for (const events of runEvents) { - for (const event of events) { - if (event.type !== MODEL_CALL_ATTEMPT_EVENT_TYPE) continue; - try { - modelCallAttempts.push(decodeModelCallAttempt(event.data)); - } catch { - // A record that will not decode is spend this trace cannot show. - // Counted so the gap is visible; dropping it silently is the failure - // this projection exists to avoid. - unreadableRecords += 1; - } - } - } - - return projectSessionTrace({ - sessionId, - runtimeEvents, - modelCallAttempts, - ...(unreadableRecords > 0 ? { unreadableRecords } : {}), - }); -} diff --git a/apps/desktop/src/main/local-memory-service.ts b/apps/desktop/src/main/local-memory-service.ts deleted file mode 100644 index 117443ac1c..0000000000 --- a/apps/desktop/src/main/local-memory-service.ts +++ /dev/null @@ -1,801 +0,0 @@ -import { chmod, copyFile, mkdir, readFile, realpath, rename, stat, writeFile } from 'node:fs/promises'; -import { dirname, join, relative, sep } from 'node:path'; -import { - appendApprovedLocalMemoryEntryDraft, - appendLocalMemoryProposalDraft, - approveLocalMemoryProposalDraft, - defaultLocalMemoryMarkdown, - findLocalMemoryEntryDraft, - normalizeMemoryContent, - normalizeMemoryScope, - parseLocalMemoryMarkdown, - rejectLocalMemoryProposalDraft, - redactSecrets, - setLocalMemoryEntryStatusDraft, - stableLocalMemoryEntryId, - stableLocalMemoryProposalId, - validateMemoryWriteRequest, - type AppSettings, - type LocalMemoryBackupInfo, - type LocalMemoryEntryPreview, - type LocalMemoryScope, - type LocalMemoryState, -} from '@maka/core'; -import type { WorkspacePrivacyContext } from '@maka/core/incognito'; - -export interface LocalMemoryServiceDeps { - workspaceRoot: string; - getSettings(): Promise; - updateSettings(patch: { localMemory: Partial }): Promise; - getPrivacyContext(): Promise; - now?(): number; -} - -export type LocalMemoryMutationResult = - | { ok: true; state: LocalMemoryState; entry?: LocalMemoryEntryPreview; proposal?: LocalMemoryEntryPreview } - | { ok: false; state: LocalMemoryState; reason: string; message: string }; -type LocalMemoryMutationBlocked = Extract; - -export interface LocalMemoryProposalInput { - title: string; - content: string; - scope?: LocalMemoryScope; - sessionId?: string; - sourceTurnId?: string; -} - -export interface LocalMemoryRememberInput { - title: string; - content: string; - scope?: LocalMemoryScope; - sessionId?: string; -} - -export type LocalMemoryPromptUpdateAction = - | 'approved' - | 'remembered' - | 'archived' - | 'restored' - | 'saved' - | 'reset' - | 'backup_restored'; - -export interface LocalMemoryPromptUpdate { - action: LocalMemoryPromptUpdateAction; - entryId?: string; - title?: string; - sessionId?: string; - ts: number; -} - -export class LocalMemoryService { - readonly dir: string; - readonly file: string; - readonly pendingFile: string; - private readonly now: () => number; - private queue: Promise = Promise.resolve(); - private pendingPromptUpdates: LocalMemoryPromptUpdate[] = []; - - constructor(private readonly deps: LocalMemoryServiceDeps) { - this.dir = join(deps.workspaceRoot, 'memory'); - this.file = join(this.dir, 'MEMORY.md'); - this.pendingFile = join(this.dir, 'PENDING.md'); - this.now = deps.now ?? Date.now; - } - - consumePendingPromptUpdates(sessionId?: string): ReadonlyArray { - const updates: LocalMemoryPromptUpdate[] = []; - const retained: LocalMemoryPromptUpdate[] = []; - for (const update of this.pendingPromptUpdates) { - if (!update.sessionId || update.sessionId === sessionId) updates.push(update); - else retained.push(update); - } - this.pendingPromptUpdates = retained; - return updates; - } - - async getState(): Promise { - const settings = await this.deps.getSettings(); - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return { - path: this.file, - enabled: settings.localMemory.enabled, - agentReadEnabled: false, - status: 'incognito_blocked', - content: '', - entryCount: 0, - activeEntryCount: 0, - archivedEntryCount: 0, - entries: [], - activeEntries: [], - archivedEntries: [], - reason: '隐身模式下禁用本地记忆读写。', - }; - } - if (!settings.localMemory.enabled) { - return { - path: this.file, - enabled: false, - agentReadEnabled: settings.localMemory.agentReadEnabled, - status: 'disabled', - content: '', - entryCount: 0, - activeEntryCount: 0, - archivedEntryCount: 0, - entries: [], - activeEntries: [], - archivedEntries: [], - }; - } - try { - await this.ensure(); - const content = await readFile(this.file, 'utf8'); - const parsed = parseLocalMemoryMarkdown(content); - const backups = await this.backupInfos(); - const latestBackup = backups[0]; - if (parsed.safeMode) { - return { - path: this.file, - enabled: true, - agentReadEnabled: settings.localMemory.agentReadEnabled, - status: 'safe_mode', - content, - entryCount: 0, - activeEntryCount: 0, - archivedEntryCount: 0, - entries: [], - activeEntries: [], - archivedEntries: [], - latestBackup: latestBackup ?? undefined, - backups, - reason: parsed.reason, - }; - } - return { - path: this.file, - enabled: true, - agentReadEnabled: settings.localMemory.agentReadEnabled, - status: 'ok', - content, - entryCount: parsed.entries.length, - activeEntryCount: parsed.activeEntries.length, - archivedEntryCount: parsed.archivedEntries.length, - entries: parsed.entries, - activeEntries: parsed.activeEntries, - archivedEntries: parsed.archivedEntries, - latestEntry: parsed.activeEntries.at(-1), - latestBackup: latestBackup ?? undefined, - backups, - }; - } catch (error) { - return { - path: this.file, - enabled: true, - agentReadEnabled: settings.localMemory.agentReadEnabled, - status: 'error', - content: '', - entryCount: 0, - activeEntryCount: 0, - archivedEntryCount: 0, - entries: [], - activeEntries: [], - archivedEntries: [], - reason: error instanceof Error ? error.message : 'memory read failed', - }; - } - } - - async save(content: string): Promise { - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return this.getState(); - } - const redactedContent = redactSecrets(content); - const parsed = parseLocalMemoryMarkdown(redactedContent); - if (parsed.safeMode) { - return { - path: this.file, - enabled: true, - agentReadEnabled: (await this.deps.getSettings()).localMemory.agentReadEnabled, - status: 'safe_mode', - content: redactedContent, - entryCount: 0, - activeEntryCount: 0, - archivedEntryCount: 0, - entries: [], - activeEntries: [], - archivedEntries: [], - reason: parsed.reason, - }; - } - await this.enqueue(async () => { - await this.ensure(); - await this.backup('bak'); - const tmp = `${this.file}.${this.now()}.tmp`; - await writeFile(tmp, redactedContent, { mode: 0o600 }); - await rename(tmp, this.file); - await chmod(this.file, 0o600); - }); - this.recordPromptUpdate('saved'); - return this.getState(); - } - - async listProposals(): Promise> { - const state = await this.getState(); - if (state.status !== 'ok') return []; - const content = await this.readPendingContent(); - const parsed = parseLocalMemoryMarkdown(content); - if (parsed.safeMode) return []; - return parsed.entries.filter((entry) => entry.status === 'draft' || entry.status === 'review_required'); - } - - async proposeMemory(input: LocalMemoryProposalInput): Promise { - const gate = await this.requireMutationAllowed(); - if (!gate.ok) return gate; - - const now = this.now(); - const content = normalizeMemoryContent(input.content); - if (!content.ok) return this.mutationBlocked(content.reason, content.message); - const scope = normalizeMemoryScope(input.scope ?? 'workspace'); - if (!scope.ok) return this.mutationBlocked(scope.reason, scope.message); - - const proposalId = stableLocalMemoryProposalId(content.value, now); - let proposal: LocalMemoryEntryPreview | undefined; - const result = await this.enqueue(async () => { - await this.ensure(); - const current = await this.readPendingContent(); - const draft = appendLocalMemoryProposalDraft(current, { - proposalId, - title: input.title, - content: redactSecrets(content.value), - scope: scope.value, - sessionId: input.sessionId, - sourceTurnId: input.sourceTurnId, - proposedAt: now, - }); - if (!draft.ok) return draft; - await this.writePendingContent(draft.draft); - const parsed = parseLocalMemoryMarkdown(draft.draft); - proposal = parsed.entries.find((entry) => entry.proposalId === proposalId || entry.id === proposalId); - return draft; - }); - if (!result.ok) return this.mutationBlocked(result.reason, localMemoryMutationFailureMessage(result.reason)); - return { ok: true, state: await this.getState(), proposal }; - } - - async rememberUserAuthored(input: LocalMemoryRememberInput): Promise { - const gate = await this.requireMutationAllowed(); - if (!gate.ok) return gate; - - const now = this.now(); - const validation = validateMemoryWriteRequest( - { - source: 'user_authored', - persistenceState: 'active', - content: input.content, - scope: input.scope ?? 'workspace', - confirmedAt: now, - }, - { mode: 'manual_with_drafts', incognitoActive: gate.privacy.incognitoActive, originatedFromRenderer: false, now }, - ); - if (!validation.ok) return this.mutationBlocked(validation.reason, validation.message); - - const entryId = stableLocalMemoryEntryId(validation.value.content, now); - const result = await this.enqueue(async () => { - await this.ensure(); - await this.backup('bak'); - const current = await readFile(this.file, 'utf8'); - const draft = appendApprovedLocalMemoryEntryDraft(current, { - id: entryId, - title: input.title, - content: redactSecrets(validation.value.content), - source: 'user_authored', - scope: input.scope ?? 'workspace', - sessionId: input.sessionId, - confirmedAt: now, - approvalSurface: 'manual_editor_save', - }); - if (!draft.ok) return draft; - await this.writeMemoryContent(draft.draft); - return draft; - }); - if (!result.ok) return this.mutationBlocked(result.reason, localMemoryMutationFailureMessage(result.reason)); - const state = await this.getState(); - const entry = state.activeEntries.find((candidate) => candidate.id === entryId); - this.recordPromptUpdate('remembered', entry, entryId); - return { ok: true, state, entry }; - } - - async approveProposal(proposalId: string): Promise { - const gate = await this.requireMutationAllowed(); - if (!gate.ok) return gate; - - const now = this.now(); - let approvedEntry: LocalMemoryEntryPreview | undefined; - const result = await this.enqueue(async () => { - await this.ensure(); - const memoryContent = await readFile(this.file, 'utf8'); - const pendingContent = await this.readPendingContent(); - const proposal = findLocalMemoryEntryDraft(pendingContent, proposalId); - if (!proposal) return { ok: false as const, reason: 'not_found' as const }; - if (proposal.status !== 'draft' && proposal.status !== 'review_required') { - return { ok: false as const, reason: 'not_pending' as const }; - } - const validation = validateMemoryWriteRequest( - { - source: 'chat_extracted', - persistenceState: 'active', - content: proposal.content, - scope: proposal.scope ?? 'workspace', - confirmedAt: now, - sourceTurnId: proposal.sourceTurnId, - }, - { mode: 'manual_with_drafts', incognitoActive: gate.privacy.incognitoActive, originatedFromRenderer: false, now }, - ); - if (!validation.ok) return { ok: false as const, reason: validation.reason }; - await this.backup('bak'); - const entryId = stableLocalMemoryEntryId(validation.value.content, now); - const approved = approveLocalMemoryProposalDraft(memoryContent, pendingContent, { - proposalId, - entryId, - confirmedAt: now, - approvalSurface: 'settings_review_queue', - }); - if (!approved.ok) return approved; - await this.writeMemoryContent(approved.memoryDraft); - await this.writePendingContent(approved.pendingDraft); - approvedEntry = approved.entry; - return approved; - }); - if (!result.ok) return this.mutationBlocked(result.reason, localMemoryMutationFailureMessage(result.reason)); - this.recordPromptUpdate('approved', approvedEntry); - return { ok: true, state: await this.getState(), entry: approvedEntry }; - } - - async rejectProposal(proposalId: string): Promise { - const gate = await this.requireMutationAllowed(); - if (!gate.ok) return gate; - - const result = await this.enqueue(async () => { - await this.ensure(); - const current = await this.readPendingContent(); - const rejected = rejectLocalMemoryProposalDraft(current, { proposalId, rejectedAt: this.now() }); - if (!rejected.ok) return rejected; - await this.writePendingContent(rejected.draft); - return rejected; - }); - if (!result.ok) return this.mutationBlocked(result.reason, localMemoryMutationFailureMessage(result.reason)); - return { ok: true, state: await this.getState() }; - } - - async archiveEntry(entryId: string, archiveReason?: string): Promise { - return this.updateEntryStatus(entryId, 'archived', archiveReason); - } - - async restoreEntry(entryId: string): Promise { - return this.updateEntryStatus(entryId, 'active'); - } - - async reset(): Promise { - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return this.getState(); - } - await this.enqueue(async () => { - await this.ensure(); - await this.backup('reset.bak'); - await writeFile(this.file, defaultLocalMemoryMarkdown(this.now()), { mode: 0o600 }); - await chmod(this.file, 0o600); - }); - this.recordPromptUpdate('reset'); - return this.getState(); - } - - async restoreLatestBackup(): Promise< - { ok: true; state: LocalMemoryState } | { ok: false; state: LocalMemoryState; message: string } - > { - return this.restoreBackupBySelector(() => this.requireLatestBackupInfo()); - } - - async restoreBackup(kind: LocalMemoryBackupInfo['kind']): Promise< - { ok: true; state: LocalMemoryState } | { ok: false; state: LocalMemoryState; message: string } - > { - return this.restoreBackupBySelector(async () => { - const backup = (await this.backupInfos()).find((candidate) => candidate.kind === kind); - if (!backup) { - const error = new Error('没有找到指定的 MEMORY.md 备份。') as Error & { code: string }; - error.code = 'ENOENT'; - throw error; - } - return backup; - }); - } - - private async restoreBackupBySelector( - selectBackup: () => Promise, - ): Promise<{ ok: true; state: LocalMemoryState } | { ok: false; state: LocalMemoryState; message: string }> { - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return { ok: false, state: await this.getState(), message: '隐身模式下不能恢复 MEMORY.md。' }; - } - if (!(await this.deps.getSettings()).localMemory.enabled) { - return { ok: false, state: await this.getState(), message: '本地记忆关闭时不能恢复 MEMORY.md。' }; - } - try { - await this.enqueue(async () => { - await this.ensure(); - const backupInfo = await selectBackup(); - const [root, backup] = await Promise.all([ - realpath(this.deps.workspaceRoot), - realpath(backupInfo.path), - ]); - if (!isInsideOrSamePath(root, backup)) { - throw new Error('MEMORY.md backup is outside the workspace.'); - } - const backupStat = await stat(backup); - if (!backupStat.isFile()) { - throw new Error('MEMORY.md backup is not a file.'); - } - const backupContent = await readFile(backup); - await this.backupRestoreUndo(); - await writeFile(this.file, backupContent, { mode: 0o600 }); - await chmod(this.file, 0o600); - }); - this.recordPromptUpdate('backup_restored'); - return { ok: true, state: await this.getState() }; - } catch (error) { - return { - ok: false, - state: await this.getState(), - message: backupRestoreFailureMessage(error), - }; - } - } - - private async latestBackupInfo(): Promise { - return (await this.backupInfos())[0] ?? null; - } - - private async backupInfos(): Promise> { - type BackupCandidate = LocalMemoryBackupInfo & { priority: number }; - const root = await realpath(this.deps.workspaceRoot); - const candidates: Array = await Promise.all( - [ - { path: `${this.file}.bak`, priority: 0, kind: 'save' as const }, - { path: `${this.file}.reset.bak`, priority: 1, kind: 'reset' as const }, - { path: `${this.file}.restore.bak`, priority: 2, kind: 'restore' as const }, - ].map(async (candidate) => { - const { path, priority, kind } = candidate; - const backupPath = await realpath(path).catch(() => null); - if (!backupPath || !isInsideOrSamePath(root, backupPath)) return null; - const fileStat = await stat(backupPath).catch(() => null); - if (!fileStat?.isFile()) return null; - const parsed = parseLocalMemoryMarkdown(await readFile(backupPath, 'utf8')); - return { - path: backupPath, - updatedAt: Math.round(fileStat.mtimeMs), - sizeBytes: fileStat.size, - entryCount: parsed.safeMode ? 0 : parsed.entries.length, - activeEntryCount: parsed.safeMode ? 0 : parsed.activeEntries.length, - archivedEntryCount: parsed.safeMode ? 0 : parsed.archivedEntries.length, - safeMode: parsed.safeMode, - reason: parsed.reason, - priority, - kind, - }; - }), - ); - const latest = candidates - .filter((candidate): candidate is BackupCandidate => candidate !== null) - .sort((a, b) => b.updatedAt - a.updatedAt || b.priority - a.priority); - return latest.map((backup) => ({ - path: backup.path, - kind: backup.kind, - updatedAt: backup.updatedAt, - sizeBytes: backup.sizeBytes, - entryCount: backup.entryCount, - activeEntryCount: backup.activeEntryCount, - archivedEntryCount: backup.archivedEntryCount, - safeMode: backup.safeMode, - reason: backup.reason, - })); - } - - private async requireLatestBackupInfo(): Promise { - const latest = await this.latestBackupInfo(); - if (!latest) { - const error = new Error('没有找到上一版 MEMORY.md 备份。') as Error & { code: string }; - error.code = 'ENOENT'; - throw error; - } - return latest; - } - - private async updateEntryStatus( - entryId: string, - status: 'active' | 'archived', - archiveReason?: string, - ): Promise { - const gate = await this.requireMutationAllowed(); - if (!gate.ok) return gate; - - const result = await this.enqueue(async () => { - await this.ensure(); - await this.backup('bak'); - const current = await readFile(this.file, 'utf8'); - const updated = setLocalMemoryEntryStatusDraft(current, { - id: entryId, - status, - now: this.now(), - archiveReason, - recordLifecycleMetadata: true, - }); - if (!updated.ok) return updated; - await this.writeMemoryContent(updated.draft); - return updated; - }); - if (!result.ok) return this.mutationBlocked(result.reason, localMemoryMutationFailureMessage(result.reason)); - const state = await this.getState(); - const entries = status === 'active' ? state.activeEntries : state.archivedEntries; - const entry = entries.find((candidate) => candidate.id === entryId); - this.recordPromptUpdate(status === 'active' ? 'restored' : 'archived', entry, entryId); - return { ok: true, state, entry }; - } - - async setEnabled(enabled: boolean): Promise { - await this.deps.updateSettings({ localMemory: { enabled } }); - if (enabled) await this.ensure(); - return this.getState(); - } - - async setAgentReadEnabled(agentReadEnabled: boolean): Promise { - await this.deps.updateSettings({ localMemory: { agentReadEnabled } }); - return this.getState(); - } - - async resolveFileForOpen(): Promise< - | { ok: true; path: string } - | { ok: false; reason: 'incognito_blocked' | 'disabled' | 'missing' | 'not-allowed' | 'not-a-file' } - > { - const settings = await this.deps.getSettings(); - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return { ok: false, reason: 'incognito_blocked' }; - } - if (!settings.localMemory.enabled) return { ok: false, reason: 'disabled' }; - - await this.ensure(); - - let root: string; - let target: string; - try { - [root, target] = await Promise.all([ - realpath(this.deps.workspaceRoot), - realpath(this.file), - ]); - } catch { - return { ok: false, reason: 'missing' }; - } - - if (!isInsideOrSamePath(root, target)) return { ok: false, reason: 'not-allowed' }; - - const targetStat = await stat(target).catch(() => null); - if (!targetStat) return { ok: false, reason: 'missing' }; - if (!targetStat.isFile()) return { ok: false, reason: 'not-a-file' }; - - return { ok: true, path: target }; - } - - async resolveLatestBackupForOpen(): Promise< - | { ok: true; path: string } - | { ok: false; reason: 'incognito_blocked' | 'disabled' | 'missing' | 'not-allowed' | 'not-a-file' } - > { - const settings = await this.deps.getSettings(); - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return { ok: false, reason: 'incognito_blocked' }; - } - if (!settings.localMemory.enabled) return { ok: false, reason: 'disabled' }; - - await this.ensure(); - - try { - const backup = await this.requireLatestBackupInfo(); - const backupStat = await stat(backup.path).catch(() => null); - if (!backupStat) return { ok: false, reason: 'missing' }; - if (!backupStat.isFile()) return { ok: false, reason: 'not-a-file' }; - return { ok: true, path: backup.path }; - } catch (error) { - if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') { - return { ok: false, reason: 'missing' }; - } - return { ok: false, reason: 'not-allowed' }; - } - } - - async resolveBackupForOpen(kind: LocalMemoryBackupInfo['kind']): Promise< - | { ok: true; path: string } - | { ok: false; reason: 'incognito_blocked' | 'disabled' | 'missing' | 'not-allowed' | 'not-a-file' } - > { - const settings = await this.deps.getSettings(); - if ((await this.deps.getPrivacyContext()).incognitoActive) { - return { ok: false, reason: 'incognito_blocked' }; - } - if (!settings.localMemory.enabled) return { ok: false, reason: 'disabled' }; - - await this.ensure(); - - const backup = (await this.backupInfos()).find((candidate) => candidate.kind === kind); - if (!backup) return { ok: false, reason: 'missing' }; - - const backupStat = await stat(backup.path).catch(() => null); - if (!backupStat) return { ok: false, reason: 'missing' }; - if (!backupStat.isFile()) return { ok: false, reason: 'not-a-file' }; - return { ok: true, path: backup.path }; - } - - private async ensure(): Promise { - await mkdir(this.dir, { recursive: true, mode: 0o700 }); - const root = await realpath(this.deps.workspaceRoot); - const dir = await realpath(this.dir); - if (!isInsideOrSamePath(root, dir)) { - throw new Error('MEMORY.md directory is outside the workspace.'); - } - await chmod(dir, 0o700); - try { - await stat(this.file); - } catch { - await writeFile(this.file, defaultLocalMemoryMarkdown(this.now()), { mode: 0o600 }); - } - const file = await realpath(this.file); - if (!isInsideOrSamePath(root, file)) { - throw new Error('MEMORY.md file is outside the workspace.'); - } - const fileStat = await stat(file); - if (!fileStat.isFile()) { - throw new Error('MEMORY.md is not a file.'); - } - await chmod(file, 0o600); - } - - private async readPendingContent(): Promise { - await this.ensure(); - try { - const root = await realpath(this.deps.workspaceRoot); - const pending = await realpath(this.pendingFile); - if (!isInsideOrSamePath(root, pending)) throw new Error('PENDING.md file is outside the workspace.'); - const pendingStat = await stat(pending); - if (!pendingStat.isFile()) throw new Error('PENDING.md is not a file.'); - await chmod(pending, 0o600); - return readFile(pending, 'utf8'); - } catch (error) { - if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') { - return '# Maka Pending Memory\n'; - } - throw error; - } - } - - private async writePendingContent(content: string): Promise { - const redactedContent = redactSecrets(content); - const parsed = parseLocalMemoryMarkdown(redactedContent); - if (parsed.safeMode) throw new Error(parsed.reason ?? 'pending memory safe mode'); - const tmp = `${this.pendingFile}.${this.now()}.tmp`; - await writeFile(tmp, redactedContent, { mode: 0o600 }); - await rename(tmp, this.pendingFile); - await chmod(this.pendingFile, 0o600); - } - - private async writeMemoryContent(content: string): Promise { - const redactedContent = redactSecrets(content); - const parsed = parseLocalMemoryMarkdown(redactedContent); - if (parsed.safeMode) throw new Error(parsed.reason ?? 'memory safe mode'); - const tmp = `${this.file}.${this.now()}.tmp`; - await writeFile(tmp, redactedContent, { mode: 0o600 }); - await rename(tmp, this.file); - await chmod(this.file, 0o600); - } - - private async requireMutationAllowed(): Promise { - const [settings, privacy] = await Promise.all([ - this.deps.getSettings(), - this.deps.getPrivacyContext(), - ]); - if (privacy.incognitoActive) { - return this.mutationBlocked('incognito_active', '隐身模式下禁用本地记忆写入。'); - } - if (!settings.localMemory.enabled) { - return this.mutationBlocked('disabled', '本地记忆关闭时不能写入记忆。'); - } - return { ok: true, privacy }; - } - - private recordPromptUpdate( - action: LocalMemoryPromptUpdateAction, - entry?: LocalMemoryEntryPreview, - fallbackEntryId?: string, - ): void { - this.pendingPromptUpdates.push({ - action, - ts: this.now(), - ...(entry?.id || fallbackEntryId ? { entryId: entry?.id ?? fallbackEntryId } : {}), - ...(entry?.title ? { title: entry.title } : {}), - ...(entry?.scope === 'session' && entry.sessionId ? { sessionId: entry.sessionId } : {}), - }); - if (this.pendingPromptUpdates.length > 50) { - this.pendingPromptUpdates = this.pendingPromptUpdates.slice(-50); - } - } - - private async mutationBlocked(reason: string, message: string): Promise { - return { ok: false, state: await this.getState(), reason, message }; - } - - private async backup(suffix: string): Promise { - try { - await copyFile(this.file, `${this.file}.${suffix}`); - await chmod(`${this.file}.${suffix}`, 0o600); - } catch { - // No prior file to back up. - } - } - - private async backupRestoreUndo(): Promise { - await this.rotateRestoreBackupHistory(); - await this.backup('restore.bak'); - } - - private async rotateRestoreBackupHistory(): Promise { - const maxRestoreHistory = 5; - for (let index = maxRestoreHistory - 1; index >= 1; index -= 1) { - await rename( - `${this.file}.restore.${index}.bak`, - `${this.file}.restore.${index + 1}.bak`, - ).catch(() => {}); - } - await rename(`${this.file}.restore.bak`, `${this.file}.restore.1.bak`).catch(() => {}); - } - - private async enqueue(task: () => Promise): Promise { - const run = this.queue.catch(() => undefined).then(task); - this.queue = run.then( - () => undefined, - () => undefined, - ); - return run; - } -} - -function isInsideOrSamePath(root: string, target: string): boolean { - if (target === root) return true; - const rel = relative(root, target); - return rel !== '' && !rel.startsWith('..') && rel !== '..' && !rel.includes(`..${sep}`) && !rel.startsWith(sep); -} - -function backupRestoreFailureMessage(error: unknown): string { - if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') { - return '没有找到上一版 MEMORY.md 备份。'; - } - return error instanceof Error ? error.message : 'memory backup restore failed'; -} - -function localMemoryMutationFailureMessage(reason: string): string { - switch (reason) { - case 'invalid_id': - return '记忆 ID 无效。'; - case 'invalid_session_id': - return '会话记忆缺少有效的会话标识。'; - case 'empty_title': - return '标题不能为空。'; - case 'empty_content': - case 'content_invalid': - return '内容不能为空或超过长度限制。'; - case 'not_found': - return '找不到这条记忆。'; - case 'not_pending': - return '这条记忆不在待审核状态。'; - case 'oversize': - return 'MEMORY.md 超出安全上限。'; - case 'mode_off': - return '记忆功能未开启。'; - case 'incognito_active': - return '隐身模式下禁用本地记忆写入。'; - default: - return '记忆写入被拦截。'; - } -} diff --git a/apps/desktop/src/main/main.ts b/apps/desktop/src/main/main.ts index a1694b377f..0c99651db7 100644 --- a/apps/desktop/src/main/main.ts +++ b/apps/desktop/src/main/main.ts @@ -1,6 +1,5 @@ import { app, dialog } from 'electron'; import { isIsolatedE2e } from './startup-context.js'; -import { resolveDesktopRuntimeOwner } from './desktop-runtime-owner.js'; // The macOS app menu title and app.getName() consumers read this name. Set it // before ready, unchanged from its historical pre-ready position. @@ -24,7 +23,7 @@ if (isIsolatedE2e && process.env.MAKA_E2E_USER_DATA_DIR) { // Electron does not enforce single-instance by default. Must run before any // workspace/store setup below -- a losing second process exits immediately, // before touching shared state. See the 'second-instance' listener in -// boot.ts for what the surviving process does about it. +// runtime-host-boot.ts for what the surviving process does about it. if (!app.requestSingleInstanceLock()) { app.exit(0); } else { @@ -39,15 +38,12 @@ if (!app.requestSingleInstanceLock()) { .whenReady() .then(() => { console.log('[startup] app ready'); - const owner = resolveDesktopRuntimeOwner(process.env.MAKA_DESKTOP_RUNTIME_OWNER); - return owner === 'runtime-host' - ? import('./runtime-host-boot.js') - : import('./boot.js'); + return import('./runtime-host-boot.js'); }) .catch((error: unknown) => { console.error('[startup] fatal:', error); // E2E runs must not hang on a modal error box (same reasoning as the - // fixture-fatal path in boot.ts: print a parseable line and exit fast). + // fixture-fatal path in runtime-host-boot.ts: print a parseable line and exit fast). if (!isIsolatedE2e) { const message = error instanceof Error ? error.message : String(error); dialog.showErrorBox('Maka failed to start', message); diff --git a/apps/desktop/src/main/mcp-ipc-main.ts b/apps/desktop/src/main/mcp-ipc-main.ts index 4fc976afa8..de992ab598 100644 --- a/apps/desktop/src/main/mcp-ipc-main.ts +++ b/apps/desktop/src/main/mcp-ipc-main.ts @@ -8,7 +8,8 @@ export interface McpIpcMainDeps { store: McpConfigStore; manager: Pick; ensureReady(): Promise; - refreshIdleBackends(): Promise; + publishCapabilities(): Promise; + onPublicationError(error: unknown): void; emitChanged(statuses: McpServerStatus[]): void; } @@ -25,13 +26,13 @@ export function registerMcpIpcMain(deps: McpIpcMainDeps): void { deps.ipcMain.handle('mcp:setConfig', async (_event, config: McpConfigFile) => { const next = await deps.store.set(config); await deps.manager.sync(next); - await changed(deps); + changed(deps); return next; }); deps.ipcMain.handle('mcp:upsert', async (_event, serverId: string, config: McpServerConfig) => { const next = await deps.store.upsert(serverId, config); await deps.manager.sync(next); - await changed(deps); + changed(deps); return next; }); deps.ipcMain.handle('mcp:install', async (_event, serverId: string, config: McpServerConfig) => { @@ -51,7 +52,7 @@ export function registerMcpIpcMain(deps: McpIpcMainDeps): void { } catch (error) { if (!operation.cancelled) throw error; } - if (!operation.cancelled) await changed(deps); + if (!operation.cancelled) changed(deps); return next; } finally { if (installs.get(serverId) === operation) installs.delete(serverId); @@ -61,7 +62,7 @@ export function registerMcpIpcMain(deps: McpIpcMainDeps): void { deps.ipcMain.handle('mcp:remove', async (_event, serverId: string) => { const next = await deps.store.remove(serverId); await deps.manager.sync(next); - await changed(deps); + changed(deps); return next; }); deps.ipcMain.handle('mcp:cancelInstall', async (_event, serverId: string) => { @@ -71,7 +72,7 @@ export function registerMcpIpcMain(deps: McpIpcMainDeps): void { await operation?.settled; const next = await deps.store.remove(serverId); await deps.manager.sync(next); - await changed(deps); + changed(deps); return next; }); deps.ipcMain.handle('mcp:test', async (_event, serverId: string) => { @@ -83,12 +84,14 @@ export function registerMcpIpcMain(deps: McpIpcMainDeps): void { deps.ipcMain.handle('mcp:reconnect', async (_event, serverId: string) => { await deps.ensureReady(); const result = await deps.manager.reconnect(serverId); - await changed(deps); + changed(deps); return result; }); } -async function changed(deps: McpIpcMainDeps): Promise { - await deps.refreshIdleBackends(); +function changed(deps: McpIpcMainDeps): void { deps.emitChanged(deps.manager.statuses()); + void Promise.resolve() + .then(() => deps.publishCapabilities()) + .catch(deps.onPublicationError); } diff --git a/apps/desktop/src/main/memory-ipc-main.ts b/apps/desktop/src/main/memory-ipc-main.ts deleted file mode 100644 index 2299839aba..0000000000 --- a/apps/desktop/src/main/memory-ipc-main.ts +++ /dev/null @@ -1,194 +0,0 @@ -import { ipcMain, shell } from 'electron'; -import type { LocalMemoryState } from '@maka/core'; -import type { LocalMemoryService } from './local-memory-service.js'; - -interface MemoryIpcDeps { - localMemory: LocalMemoryService; -} - -export function registerMemoryIpc(deps: MemoryIpcDeps): void { - const { localMemory } = deps; - - ipcMain.handle('memory:getState', async (): Promise => localMemory.getState()); - ipcMain.handle('memory:listProposals', async () => localMemory.listProposals()); - ipcMain.handle('memory:propose', async (_event, input: unknown) => { - const proposal = normalizeMemoryTextInput(input); - if (!proposal) { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆提议参数无效。', - }; - } - return localMemory.proposeMemory({ - title: proposal.title, - content: proposal.content, - scope: proposal.scope, - sessionId: proposal.sessionId, - }); - }); - ipcMain.handle('memory:remember', async (_event, input: unknown) => { - const memory = normalizeMemoryTextInput(input); - if (!memory) { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆参数无效。', - }; - } - return localMemory.rememberUserAuthored({ - title: memory.title, - content: memory.content, - scope: memory.scope, - sessionId: memory.sessionId, - }); - }); - ipcMain.handle('memory:approveProposal', async (_event, proposalId: unknown) => { - if (typeof proposalId !== 'string') { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆提议 ID 无效。', - }; - } - return localMemory.approveProposal(proposalId); - }); - ipcMain.handle('memory:rejectProposal', async (_event, proposalId: unknown) => { - if (typeof proposalId !== 'string') { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆提议 ID 无效。', - }; - } - return localMemory.rejectProposal(proposalId); - }); - ipcMain.handle('memory:archiveEntry', async (_event, entryId: unknown, reason: unknown) => { - if (typeof entryId !== 'string') { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆 ID 无效。', - }; - } - return localMemory.archiveEntry(entryId, typeof reason === 'string' ? reason : undefined); - }); - ipcMain.handle('memory:restoreEntry', async (_event, entryId: unknown) => { - if (typeof entryId !== 'string') { - return { - ok: false, - state: await localMemory.getState(), - reason: 'invalid_input', - message: '记忆 ID 无效。', - }; - } - return localMemory.restoreEntry(entryId); - }); - ipcMain.handle('memory:save', async (_event, content: unknown): Promise => { - if (typeof content !== 'string') return localMemory.getState(); - return localMemory.save(content); - }); - ipcMain.handle('memory:reset', async (): Promise => localMemory.reset()); - ipcMain.handle('memory:restoreLatestBackup', async (): Promise< - { ok: true; state: LocalMemoryState } | { ok: false; state: LocalMemoryState; message: string } - > => localMemory.restoreLatestBackup()); - ipcMain.handle('memory:restoreBackup', async (_event, kind: unknown): Promise< - { ok: true; state: LocalMemoryState } | { ok: false; state: LocalMemoryState; message: string } - > => { - if (kind !== 'save' && kind !== 'reset' && kind !== 'restore') { - return { ok: false, state: await localMemory.getState(), message: '只能恢复已验证的 MEMORY.md 备份候选。' }; - } - return localMemory.restoreBackup(kind); - }); - ipcMain.handle('memory:setEnabled', async (_event, enabled: unknown): Promise => - localMemory.setEnabled(enabled === true), - ); - ipcMain.handle('memory:setAgentReadEnabled', async (_event, enabled: unknown): Promise => - localMemory.setAgentReadEnabled(enabled === true), - ); - ipcMain.handle('memory:openFile', async (): Promise<{ ok: true } | { ok: false; message: string }> => { - const resolved = await localMemory.resolveFileForOpen(); - if (!resolved.ok) return { ok: false, message: localMemoryOpenFailureCopy(resolved.reason) }; - const error = await shell.openPath(resolved.path); - return error ? { ok: false, message: localMemoryOpenFailureCopy('open-failed') } : { ok: true }; - }); - ipcMain.handle('memory:openLatestBackup', async (): Promise<{ ok: true } | { ok: false; message: string }> => { - const resolved = await localMemory.resolveLatestBackupForOpen(); - if (!resolved.ok) return { ok: false, message: localMemoryBackupOpenFailureCopy(resolved.reason) }; - const error = await shell.openPath(resolved.path); - return error ? { ok: false, message: localMemoryBackupOpenFailureCopy('open-failed') } : { ok: true }; - }); - ipcMain.handle('memory:openBackup', async (_event, kind: unknown): Promise<{ ok: true } | { ok: false; message: string }> => { - if (kind !== 'save' && kind !== 'reset' && kind !== 'restore') return { ok: false, message: localMemoryBackupOpenFailureCopy('not-allowed') }; - const resolved = await localMemory.resolveBackupForOpen(kind); - if (!resolved.ok) return { ok: false, message: localMemoryBackupOpenFailureCopy(resolved.reason) }; - const error = await shell.openPath(resolved.path); - return error ? { ok: false, message: localMemoryBackupOpenFailureCopy('open-failed') } : { ok: true }; - }); -} - -function normalizeMemoryTextInput(input: unknown): { - title: string; - content: string; - scope?: 'workspace' | 'session'; - sessionId?: string; -} | null { - if (!input || typeof input !== 'object') return null; - const value = input as Record; - if (typeof value.title !== 'string' || typeof value.content !== 'string') return null; - const scope = value.scope === 'session' ? 'session' : value.scope === 'workspace' ? 'workspace' : undefined; - const sessionId = - typeof value.sessionId === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(value.sessionId) - ? value.sessionId - : undefined; - if (scope === 'session' && !sessionId) return null; - return { - title: value.title, - content: value.content, - ...(scope ? { scope } : {}), - ...(scope === 'session' && sessionId ? { sessionId } : {}), - }; -} - -function localMemoryOpenFailureCopy(reason: string): string { - switch (reason) { - case 'incognito_blocked': - return '隐身模式下不能打开本地 MEMORY.md。'; - case 'disabled': - return '本地记忆已关闭。'; - case 'missing': - return 'MEMORY.md 不存在。'; - case 'not-allowed': - return 'MEMORY.md 不在允许的工作区范围内。'; - case 'not-a-file': - return 'MEMORY.md 不是普通文件。'; - case 'open-failed': - return '系统未能打开 MEMORY.md。'; - default: - return '无法打开 MEMORY.md。'; - } -} - -function localMemoryBackupOpenFailureCopy(reason: string): string { - switch (reason) { - case 'incognito_blocked': - return '隐身模式下不能打开本地 MEMORY.md 备份。'; - case 'disabled': - return '本地记忆关闭时不能打开 MEMORY.md 备份。'; - case 'missing': - return '还没有可打开的上一版 MEMORY.md 备份。'; - case 'not-allowed': - return 'MEMORY.md 备份不在允许的工作区范围内。'; - case 'not-a-file': - return 'MEMORY.md 备份不是普通文件。'; - case 'open-failed': - return '系统未能打开 MEMORY.md 备份。'; - default: - return '无法打开 MEMORY.md 备份。'; - } -} diff --git a/apps/desktop/src/main/network-settings-main.ts b/apps/desktop/src/main/network-settings-main.ts deleted file mode 100644 index d9ab135113..0000000000 --- a/apps/desktop/src/main/network-settings-main.ts +++ /dev/null @@ -1,35 +0,0 @@ -import type { AppSettings } from '@maka/core'; -import { - NETWORK_DEFAULTS, - maskSensitive, - type RuntimeNetworkSettings, -} from '@maka/core/settings/network-settings'; - -type StoredNetworkSettings = AppSettings['network']; - -export function toContractNetworkSettings(network: StoredNetworkSettings): RuntimeNetworkSettings { - const proxy = network.proxy; - return { - ...NETWORK_DEFAULTS, - proxy: { - ...NETWORK_DEFAULTS.proxy, - enabled: proxy.enabled, - type: proxy.protocol, - host: proxy.host, - port: proxy.port, - username: proxy.authEnabled && proxy.username ? proxy.username : undefined, - password: proxy.authEnabled && proxy.password ? proxy.password : undefined, - bypassList: proxy.bypassList.length > 0 ? proxy.bypassList : NETWORK_DEFAULTS.proxy.bypassList, - }, - }; -} - -export function maskNetworkSettings(settings: RuntimeNetworkSettings): RuntimeNetworkSettings { - return { - ...settings, - proxy: { - ...settings.proxy, - password: maskSensitive(typeof settings.proxy.password === 'string' ? settings.proxy.password : undefined), - }, - }; -} diff --git a/apps/desktop/src/main/new-session-project.ts b/apps/desktop/src/main/new-session-project.ts index bcde78dedd..d9f3331712 100644 --- a/apps/desktop/src/main/new-session-project.ts +++ b/apps/desktop/src/main/new-session-project.ts @@ -1,12 +1,12 @@ -import type { CreateSessionInput } from '@maka/core'; import { isProjectPathMismatchError, type ProjectCatalog } from '@maka/storage'; -export type DesktopCreateSessionInput = Omit & { - cwd?: string; +export type SessionProjectInput = { + readonly cwd?: string; + readonly projectId?: string | null; }; -export async function resolveDesktopSessionSelection( - input: DesktopCreateSessionInput, +export async function resolveDesktopSessionSelection( + input: T, selection: { current(): Promise<{ projectId: string | null | undefined; @@ -22,7 +22,7 @@ export async function resolveDesktopSessionSelection( */ defaultProjectId?(): Promise; }, -): Promise { +): Promise { if (input.cwd) return { ...input, cwd: input.cwd }; // An explicit project id is this conversation's own choice (the composer @@ -64,22 +64,20 @@ export async function resolveDesktopSessionSelection( }; } -export async function resolveNewSessionProjectInput( - input: CreateSessionInput, +export async function resolveNewSessionProjectInput( + input: T, catalog: Pick, -): Promise { - if (input.projectId === null) { - return input; - } +): Promise { + if (input.projectId === null) return input; if (input.projectId) { + const requestedId = input.projectId; const project = (await catalog.list()).find( - (candidate) => - candidate.id === input.projectId || candidate.aliases?.includes(input.projectId!), + (candidate) => candidate.id === requestedId || candidate.aliases?.includes(requestedId), ); - if (!project) throw new Error(`Project does not match the selected directory: ${input.projectId}`); - if (project.archivedAt !== undefined) throw new Error(`Project is archived: ${input.projectId}`); - if (!project.available) throw new Error(`Project is unavailable: ${input.projectId}`); + if (!project) throw projectMismatch(requestedId); + if (project.archivedAt !== undefined) throw new Error(`Project is archived: ${requestedId}`); + if (!project.available) throw new Error(`Project is unavailable: ${requestedId}`); try { const touched = await catalog.touch(project.id, input.cwd); return { @@ -89,7 +87,7 @@ export async function resolveNewSessionProjectInput( }; } catch (error) { if (!isProjectPathMismatchError(error)) throw error; - throw new Error(`Project does not match the selected directory: ${input.projectId}`); + throw projectMismatch(requestedId); } } @@ -101,3 +99,7 @@ export async function resolveNewSessionProjectInput( projectId: project.id, }; } + +function projectMismatch(projectId: string): Error { + return new Error(`Project does not match the selected directory: ${projectId}`); +} diff --git a/apps/desktop/src/main/oauth-connection-identities.ts b/apps/desktop/src/main/oauth-connection-identities.ts index 138b150b34..fed4bbfb76 100644 --- a/apps/desktop/src/main/oauth-connection-identities.ts +++ b/apps/desktop/src/main/oauth-connection-identities.ts @@ -6,9 +6,3 @@ export const INTERACTIVE_OAUTH_CONNECTION_SLUGS = { 'openai-codex': 'codex-subscription', 'xai-oauth': 'xai-oauth', } as const satisfies Readonly>; - -export const CLAUDE_SUBSCRIPTION_CONNECTION_SLUG = - INTERACTIVE_OAUTH_CONNECTION_SLUGS['claude-subscription']; -export const CODEX_SUBSCRIPTION_CONNECTION_SLUG = - INTERACTIVE_OAUTH_CONNECTION_SLUGS['openai-codex']; -export const XAI_OAUTH_CONNECTION_SLUG = INTERACTIVE_OAUTH_CONNECTION_SLUGS['xai-oauth']; diff --git a/apps/desktop/src/main/oauth-model-connections-main.ts b/apps/desktop/src/main/oauth-model-connections-main.ts deleted file mode 100644 index 92940d97fb..0000000000 --- a/apps/desktop/src/main/oauth-model-connections-main.ts +++ /dev/null @@ -1,654 +0,0 @@ -import { - CODEX_SUBSCRIPTION_UNSUPPORTED_CHATGPT_MODELS, - PROVIDER_DEFAULTS, - isWiredOAuthProvider, - reconcileConnectionAfterModelFetch, - type LlmConnection, - type ModelDiscoverySource, -} from '@maka/core/llm-connections'; -import type { ConnectionStore, CredentialStore } from '@maka/storage'; -import type { ClaudeSubscriptionService } from './oauth/claude-subscription-service.js'; -import { isSubscriptionExperimentalEnabled } from './oauth/claude-subscription-helpers.js'; -import type { OpenAiCodexService } from './oauth/openai-codex-service.js'; -import { isOpenAiCodexExperimentalEnabled } from './oauth/openai-codex-service.js'; -import { - fetchProviderModels, - OpenAiCodexDiscoveryError, - ProviderModelDiscoveryHttpError, -} from '@maka/runtime'; -import type { GitHubCopilotSubscriptionService } from './oauth/github-copilot-subscription-service.js'; -import type { XaiOAuthService } from './oauth/xai-oauth-service.js'; -import { - CLAUDE_SUBSCRIPTION_CONNECTION_SLUG, - CODEX_SUBSCRIPTION_CONNECTION_SLUG, - XAI_OAUTH_CONNECTION_SLUG, -} from './oauth-connection-identities.js'; - -export { - CLAUDE_SUBSCRIPTION_CONNECTION_SLUG, - CODEX_SUBSCRIPTION_CONNECTION_SLUG, - XAI_OAUTH_CONNECTION_SLUG, -} from './oauth-connection-identities.js'; -export const GITHUB_COPILOT_CONNECTION_SLUG = 'github-copilot'; - -interface OAuthModelConnectionsDeps { - connectionStore: ConnectionStore; - credentialStore: CredentialStore; - claudeSubscription: ClaudeSubscriptionService; - openAiCodex: OpenAiCodexService; - githubCopilotSubscription: GitHubCopilotSubscriptionService; - xaiOAuth: XaiOAuthService; - fetchModels?: typeof fetchProviderModels; -} - -export function createOAuthModelConnectionsMainService(deps: OAuthModelConnectionsDeps) { - function isClaudeSubscriptionAuthenticatedState( - state: Awaited>, - ): boolean { - return state.runtimeState === 'authenticated' || - state.runtimeState === 'refreshing' || - state.runtimeState === 'quota_unavailable' || - state.runtimeState === 'provider_rejected'; - } - - async function syncClaudeSubscriptionConnection(): Promise { - if (!isSubscriptionExperimentalEnabled()) return null; - const state = await deps.claudeSubscription.getAccountState(); - const existing = await deps.connectionStore.get(CLAUDE_SUBSCRIPTION_CONNECTION_SLUG); - if (!isClaudeSubscriptionAuthenticatedState(state)) { - if (existing && (state.runtimeState === 'refresh_failed' || state.runtimeState === 'storage_failed' || state.runtimeState === 'not_logged_in')) { - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: state.errorMessage ?? (state.runtimeState === 'not_logged_in' - ? 'Claude OAuth 未登录。' - : state.runtimeState === 'storage_failed' - ? 'Claude OAuth 本地凭据读取失败。' - : 'Claude OAuth 需要重新登录。'), - }); - } - return existing; - } - - const defaults = PROVIDER_DEFAULTS['claude-subscription']; - const fallbackModels = defaults.fallbackModels.map((id) => ({ id })); - const displayName = 'Claude OAuth'; - const now = Date.now(); - const connection: LlmConnection = { - slug: CLAUDE_SUBSCRIPTION_CONNECTION_SLUG, - name: existing?.name ?? displayName, - providerType: 'claude-subscription', - baseUrl: defaults.baseUrl, - ...syncedSelection(existing, existing?.models?.length ? existing.models : fallbackModels), - enabled: true, - models: existing?.models?.length ? existing.models : fallbackModels, - modelSource: existing?.modelSource ?? 'fallback', - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Claude OAuth 已登录。', - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }; - return deps.connectionStore.save(connection); - } - - function isOpenAiCodexAuthenticatedState( - state: Awaited>, - ): boolean { - return state.runtimeState === 'authenticated' || state.runtimeState === 'refreshing'; - } - - function isGitHubCopilotAuthenticatedState( - state: Awaited>, - ): boolean { - return state.runtimeState === 'authenticated' || state.runtimeState === 'refreshing'; - } - - function isXaiOAuthAuthenticatedState( - state: Awaited>, - ): boolean { - return state.runtimeState === 'authenticated' || state.runtimeState === 'refreshing'; - } - - /** - * Make a newly authenticated Codex account visible to the product without - * waiting for live model discovery. OAuth completion has already persisted - * the credential at this point, so the connection can immediately become - * usable with the last fetched model list (or the curated fallback list). - * - * `syncOpenAiCodexConnection` still runs afterwards to replace this - * optimistic snapshot with the account's authoritative model catalog. - */ - async function activateOpenAiCodexConnection(): Promise { - if (!isOpenAiCodexExperimentalEnabled()) return null; - const state = await deps.openAiCodex.getAccountState(); - const existing = await deps.connectionStore.get(CODEX_SUBSCRIPTION_CONNECTION_SLUG); - if (!isOpenAiCodexAuthenticatedState(state)) return existing; - - const defaults = PROVIDER_DEFAULTS['openai-codex']; - const fallbackModels = defaults.fallbackModels.map((id) => ({ id })); - const fetchedModels = existing?.modelSource === 'fetched' - ? normalizeOpenAiCodexModels(existing.models, []) - : []; - const models = fetchedModels.length > 0 ? fetchedModels : fallbackModels; - const now = Date.now(); - return deps.connectionStore.save({ - slug: CODEX_SUBSCRIPTION_CONNECTION_SLUG, - name: existing?.name ?? 'Codex OAuth', - providerType: 'openai-codex', - baseUrl: defaults.baseUrl, - ...syncedSelection(existing, models), - enabled: true, - models, - modelSource: fetchedModels.length > 0 ? 'fetched' : 'fallback', - modelsFetchedAt: fetchedModels.length > 0 ? existing?.modelsFetchedAt : undefined, - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Codex OAuth 已登录。', - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }); - } - - async function activateXaiOAuthConnection(): Promise { - const state = await deps.xaiOAuth.getAccountState(); - const existing = await deps.connectionStore.get(XAI_OAUTH_CONNECTION_SLUG); - if (!isXaiOAuthAuthenticatedState(state)) return existing; - - const defaults = PROVIDER_DEFAULTS['xai-oauth']; - const cachedFetchedModels = - existing?.modelSource === 'fetched' && existing.models?.length ? existing.models : []; - const models = cachedFetchedModels.length - ? cachedFetchedModels - : defaults.fallbackModels.map((id) => ({ id })); - const now = Date.now(); - return deps.connectionStore.save({ - slug: XAI_OAUTH_CONNECTION_SLUG, - name: existing?.name ?? 'xAI OAuth', - providerType: 'xai-oauth', - baseUrl: defaults.baseUrl, - ...syncedSelection(existing, models), - enabled: true, - models, - modelSource: cachedFetchedModels.length ? 'fetched' : 'fallback', - modelsFetchedAt: cachedFetchedModels.length ? existing?.modelsFetchedAt : undefined, - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'xAI OAuth 已登录。', - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }); - } - - async function syncXaiOAuthConnection(): Promise { - const state = await deps.xaiOAuth.getAccountState(); - const existing = await deps.connectionStore.get(XAI_OAUTH_CONNECTION_SLUG); - if (!isXaiOAuthAuthenticatedState(state)) { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: state.errorMessage ?? 'xAI OAuth 需要重新登录。', - }); - } - - const accessToken = await deps.xaiOAuth.getAccessTokenInternal(); - if (!accessToken) { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'xAI OAuth 需要重新登录。', - }); - } - - const defaults = PROVIDER_DEFAULTS['xai-oauth']; - const fallbackModels = defaults.fallbackModels.map((id) => ({ id })); - const cachedModels = - existing?.modelSource === 'fetched' && existing.models?.length - ? existing.models - : fallbackModels; - const now = Date.now(); - let models = cachedModels; - let modelSource: ModelDiscoverySource = - existing?.modelSource === 'fetched' && existing.models?.length ? 'fetched' : 'fallback'; - let modelsFetchedAt = existing?.modelsFetchedAt; - try { - const discovered = await (deps.fetchModels ?? fetchProviderModels)( - { - slug: XAI_OAUTH_CONNECTION_SLUG, - name: existing?.name ?? 'xAI OAuth', - providerType: 'xai-oauth', - baseUrl: defaults.baseUrl, - defaultModel: existing?.defaultModel ?? defaults.fallbackModels[0] ?? '', - enabled: true, - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }, - accessToken, - ); - if (discovered.length === 0) { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - models: [], - modelSource: 'fetched', - modelsFetchedAt: now, - lastTestStatus: 'error', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: '当前账号无可用 Grok 模型。', - }); - } - models = discovered; - modelSource = 'fetched'; - modelsFetchedAt = now; - } catch (error) { - if (error instanceof ProviderModelDiscoveryHttpError) { - if (error.status === 401 || error.status === 403) { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'xAI OAuth 需要重新登录。', - }); - } - if (error.status >= 400 && error.status < 500) { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - models: [], - modelSource: 'fetched', - modelsFetchedAt: now, - lastTestStatus: 'error', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'xAI 模型列表获取失败。', - }); - } - } - // A transient discovery failure must not make a valid OAuth login - // unusable; retain the last fetched snapshot or the shared fallback. - } - - return deps.connectionStore.save({ - slug: XAI_OAUTH_CONNECTION_SLUG, - name: existing?.name ?? 'xAI OAuth', - providerType: 'xai-oauth', - baseUrl: defaults.baseUrl, - ...syncedSelection(existing, models), - enabled: true, - models, - modelSource, - modelsFetchedAt, - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'xAI OAuth 已登录。', - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }); - } - - async function syncGitHubCopilotConnection( - discoveredModels?: Awaited>, - ): Promise { - const state = await deps.githubCopilotSubscription.getAccountState(); - const existing = await deps.connectionStore.get(GITHUB_COPILOT_CONNECTION_SLUG); - if (!isGitHubCopilotAuthenticatedState(state)) { - if (existing) { - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: state.errorMessage ?? 'GitHub Copilot 需要重新导入 GitHub CLI 登录。', - }); - } - return null; - } - const tokens = await deps.githubCopilotSubscription.getTokensInternal(); - if (!tokens) return existing; - const defaults = PROVIDER_DEFAULTS['github-copilot']; - const baseUrl = tokens.base_url ?? defaults.baseUrl; - const now = Date.now(); - const discoveryConnection: LlmConnection = { - slug: GITHUB_COPILOT_CONNECTION_SLUG, - name: existing?.name ?? 'GitHub Copilot', - providerType: 'github-copilot', - baseUrl, - defaultModel: existing?.defaultModel || defaults.fallbackModels[0] || '', - enabled: true, - enabledModelIds: existing?.enabledModelIds, - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }; - const failDiscovery = () => { - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'error', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'GitHub Copilot 无法读取当前账号可用模型，请重新验证登录。', - }); - }; - let models = discoveredModels; - if (!models) { - try { - models = await (deps.fetchModels ?? fetchProviderModels)(discoveryConnection, tokens.access_token); - } catch { - return failDiscovery(); - } - } - if (models.length === 0) return failDiscovery(); - return deps.connectionStore.save({ - ...discoveryConnection, - ...syncedSelection(existing, models), - models, - modelSource: 'fetched', - modelsFetchedAt: now, - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'GitHub Copilot 登录已导入。', - }); - } - - async function syncOpenAiCodexConnection(): Promise { - if (!isOpenAiCodexExperimentalEnabled()) return null; - const state = await deps.openAiCodex.getAccountState(); - const existing = await deps.connectionStore.get(CODEX_SUBSCRIPTION_CONNECTION_SLUG); - if (!isOpenAiCodexAuthenticatedState(state)) { - if (existing && (state.runtimeState === 'refresh_failed' || state.runtimeState === 'storage_failed' || state.runtimeState === 'not_logged_in')) { - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: state.errorMessage ?? (state.runtimeState === 'not_logged_in' - ? 'Codex OAuth 未登录。' - : state.runtimeState === 'storage_failed' - ? 'Codex OAuth 本地凭据读取失败。' - : 'Codex OAuth 需要重新登录。'), - }); - } - return existing; - } - - const defaults = PROVIDER_DEFAULTS['openai-codex']; - const fallbackModels = defaults.fallbackModels.map((id) => ({ id })); - const displayName = 'Codex OAuth'; - const now = Date.now(); - - // Only a previously fetched list is worth caching; a persisted fallback - // snapshot is rebuilt from the current registry so renamed/added models - // (e.g. gpt-5.6-sol) reach existing users instead of being shadowed by a - // stale copy on disk. - const hasFetchedSnapshot = - existing?.modelSource === 'fetched' && Array.isArray(existing.models); - const cachedFetchedModels = hasFetchedSnapshot - ? normalizeOpenAiCodexModels(existing.models ?? [], []) - : fallbackModels; - - let models: NonNullable = cachedFetchedModels; - let modelSource: ModelDiscoverySource = hasFetchedSnapshot ? 'fetched' : 'fallback'; - let modelsFetchedAt = existing?.modelsFetchedAt; - try { - const accessToken = await deps.openAiCodex.getAccessTokenInternal(); - if (!accessToken) { - // OAuth credentials unavailable (no stored token or refresh rejected). - // Surface as needs_reauth instead of masking as verified, so the user - // is prompted to re-login rather than hitting a guaranteed refresh - // failure on the next send. - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Codex OAuth 需要重新登录。', - }); - } - const discovered = await (deps.fetchModels ?? fetchProviderModels)( - { - slug: CODEX_SUBSCRIPTION_CONNECTION_SLUG, - name: existing?.name ?? displayName, - providerType: 'openai-codex', - baseUrl: defaults.baseUrl, - defaultModel: existing?.defaultModel || defaults.fallbackModels[0] || '', - enabled: true, - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }, - accessToken, - ); - // Normalize before the empty check so a list that is non-empty but - // entirely filtered as unsupported (e.g. only gpt-5-codex) is also - // treated as "no usable models", not as fetched+fallback. - const normalized = normalizeOpenAiCodexModels(discovered, []); - if (normalized.length === 0) { - // /models returned no usable models (empty, or all filtered). Persist - // the empty fetched result so a later transient failure doesn't - // revive a stale cached list; mirror GitHub Copilot's failDiscovery. - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'error', - models: [], - modelSource: 'fetched', - modelsFetchedAt: now, - lastTestAt: new Date(now).toISOString(), - lastTestMessage: '当前账号无可用 Codex 模型。', - }); - } - models = normalized; - modelSource = 'fetched'; - modelsFetchedAt = now; - } catch (error) { - if (error instanceof OpenAiCodexDiscoveryError) { - if (error.status === 401 || error.status === 403) { - // Auth rejected at /models - the token is unusable for this account. - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Codex OAuth 需要重新登录。', - }); - } - if (error.status >= 400 && error.status < 500) { - // Deterministic protocol error (4xx) - won't fix itself on retry. - if (!existing) return null; - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'error', - models: [], - modelSource: 'fetched', - modelsFetchedAt: now, - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Codex 模型列表获取失败。', - }); - } - } - // Transient network failure / 5xx / unknown - keep the cached fetched - // list or the curated fallback so the connection stays usable. An - // authoritative fetched-empty snapshot remains disabled/error; reviving - // fallback ids here would make an account with no usable models appear - // verified after a temporary outage. - if (hasFetchedSnapshot && cachedFetchedModels.length === 0 && existing) { - return deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'error', - models: [], - modelSource: 'fetched', - modelsFetchedAt, - lastTestAt: new Date(now).toISOString(), - lastTestMessage: '当前账号无可用 Codex 模型。', - }); - } - } - - - const connection: LlmConnection = { - slug: CODEX_SUBSCRIPTION_CONNECTION_SLUG, - name: existing?.name ?? displayName, - providerType: 'openai-codex', - baseUrl: defaults.baseUrl, - ...syncedSelection(existing, models), - enabled: true, - models, - modelSource, - modelsFetchedAt, - lastTestStatus: 'verified', - lastTestAt: new Date(now).toISOString(), - lastTestMessage: 'Codex OAuth 已登录。', - createdAt: existing?.createdAt ?? now, - updatedAt: now, - }; - return deps.connectionStore.save(connection); - } - - async function syncOAuthModelConnections(): Promise { - const results = await Promise.allSettled([ - syncClaudeSubscriptionConnection(), - syncOpenAiCodexConnection(), - syncGitHubCopilotConnection(), - syncXaiOAuthConnection(), - ]); - for (const result of results) { - if (result.status === 'rejected') { - console.warn('[maka] OAuth model connection sync failed', result.reason); - } - } - } - - async function disconnectManagedOAuthConnection( - connection: Pick, - ): Promise { - if (!isWiredOAuthProvider(connection.providerType)) return; - const result = await (async () => { - switch (connection.providerType) { - case 'claude-subscription': - return deps.claudeSubscription.logout(); - case 'openai-codex': - return deps.openAiCodex.logout(); - case 'github-copilot': - return deps.githubCopilotSubscription.logout(); - case 'xai-oauth': - return deps.xaiOAuth.logout(); - default: - throw new Error(`No OAuth disconnect handler for provider: ${connection.providerType}`); - } - })(); - if (!result.ok) { - throw new Error(result.message || 'OAuth account logout failed'); - } - } - - async function resolveConnectionSecret(slug: string): Promise { - const connection = await deps.connectionStore.get(slug); - if (connection?.providerType === 'claude-subscription') { - return deps.claudeSubscription.getAccessTokenInternal(); - } - if (connection?.providerType === 'openai-codex') { - return deps.openAiCodex.getAccessTokenInternal(); - } - if (connection?.providerType === 'github-copilot') { - return deps.githubCopilotSubscription.getAccessTokenInternal(); - } - if (connection?.providerType === 'xai-oauth') { - return deps.xaiOAuth.getAccessTokenInternal(); - } - return deps.credentialStore.getSecret(slug, 'api_key'); - } - - /** - * Read-only credential-presence check for status paths (onboarding's - * `getSnapshot`) that must not trigger `resolveConnectionSecret`'s - * OAuth near-expiry refresh — that refresh hits the network and - * mutates local token state, which a read-only status read must - * never do just by being observed. Send/test/fetch-models paths - * keep using `resolveConnectionSecret` so they still benefit from - * the refresh. - * - * Takes the `LlmConnection` directly rather than a slug: callers - * that already hold the connection list (onboarding does) skip the - * extra `connectionStore.get()` round trip and derive state from - * one consistent snapshot. - */ - async function hasConnectionSecret(connection: LlmConnection): Promise { - if (connection.providerType === 'claude-subscription') { - return deps.claudeSubscription.hasStoredCredential(); - } - if (connection.providerType === 'openai-codex') { - return deps.openAiCodex.hasStoredCredential(); - } - if (connection.providerType === 'github-copilot') { - return deps.githubCopilotSubscription.hasStoredCredential(); - } - if (connection.providerType === 'xai-oauth') { - return deps.xaiOAuth.hasStoredCredential(); - } - const key = await deps.credentialStore.getSecret(connection.slug, 'api_key'); - return typeof key === 'string' && key.length > 0; - } - - return { - isClaudeSubscriptionAuthenticatedState, - isOpenAiCodexAuthenticatedState, - isGitHubCopilotAuthenticatedState, - isXaiOAuthAuthenticatedState, - resolveConnectionSecret, - hasConnectionSecret, - syncClaudeSubscriptionConnection, - activateOpenAiCodexConnection, - syncOpenAiCodexConnection, - syncGitHubCopilotConnection, - activateXaiOAuthConnection, - syncXaiOAuthConnection, - syncOAuthModelConnections, - disconnectManagedOAuthConnection, - }; -} - -function normalizeOpenAiCodexModels( - existingModels: LlmConnection['models'] | undefined, - fallbackModels: NonNullable, -): NonNullable { - const safeExisting = (existingModels ?? []).filter( - (entry) => entry.id && !CODEX_SUBSCRIPTION_UNSUPPORTED_CHATGPT_MODELS.has(entry.id), - ); - return safeExisting.length ? safeExisting : fallbackModels; -} - -/** - * The model selection an account sync may write. - * - * Every sync path used to derive its own: `existing?.defaultModel || - * fallbackModels[0]`, or "the first live id if the current default isn't in - * the account's catalog", while passing `enabledModelIds` straight back - * untouched. That got both ends wrong. `''` is falsy, so a default the user - * had cleared came back on the very next `connections:list` — which runs this - * sync before every read. And a selection echoed back unreconciled kept ids - * the provider had retired. - * - * Both are the same question a model fetch asks, and it already has one - * answer. This is a fetch: the account's catalog is the live inventory. - * - * All four of these providers ship a `fallbackModels` catalog, so a connection - * that already exists has had a list in front of the user since the moment it - * was created. Whether it happens to hold one *right now* is not the same - * question and answers it wrongly: these syncs persist `models: []` when an - * account temporarily reports nothing usable, which would make the recovery - * look like a first discovery and re-seed a default the user had cleared. - */ -function syncedSelection( - existing: LlmConnection | null | undefined, - models: readonly { id: string }[], -): { defaultModel: string; enabledModelIds: string[] } { - return reconcileConnectionAfterModelFetch( - { - defaultModel: existing?.defaultModel, - enabledModelIds: existing?.enabledModelIds, - hasModelInventory: existing !== null && existing !== undefined, - }, - models, - ); -} diff --git a/apps/desktop/src/main/oauth/antigravity-subscription-helpers.ts b/apps/desktop/src/main/oauth/antigravity-subscription-helpers.ts deleted file mode 100644 index 136c131b56..0000000000 --- a/apps/desktop/src/main/oauth/antigravity-subscription-helpers.ts +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Pure helpers for the Antigravity (Google / Gemini) subscription - * OAuth service. Split out so unit tests can import them without - * dragging in the `electron` ESM module. - * - * Antigravity is currently a `preview` placeholder: the upstream - * antigravity-auth plugin source is not available, so we ship the - * loopback shape with an empty client_id. The service module - * checks `hasClientId` before issuing any URL. - */ - -import { createHash } from 'node:crypto'; -import { base64urlEncode } from '@maka/core'; - -// ============================================================= -// Preview status marker. The renderer reads this through the IPC -// `get-account-state` handler and the source-grep contract test -// pins it. When the Google client_id question is resolved, flip -// STATUS to 'ready' and fill in GOOGLE_CLIENT_ID below. -// ============================================================= -export const STATUS = 'preview' as const; - -// ============================================================= -// Endpoints — canonical Google OAuth2 values. The service remains -// preview-only because the required client id is not bundled. -// ============================================================= -const GOOGLE_AUTHORIZE_ENDPOINT = 'https://accounts.google.com/o/oauth2/v2/auth'; -const GOOGLE_TOKEN_ENDPOINT = 'https://oauth2.googleapis.com/token'; -const ANTIGRAVITY_CALLBACK_PORT = 51121; -const ANTIGRAVITY_REDIRECT_URI = `http://localhost:${ANTIGRAVITY_CALLBACK_PORT}/callback`; -const ANTIGRAVITY_SCOPES = [ - 'openid', - 'email', - 'profile', - 'https://www.googleapis.com/auth/cloud-platform', -].join(' '); - -// PLACEHOLDER: real client_id is not in any source we have. The -// service refuses to issue an authorize URL until this is set. -// Empty string is the explicit not-configured sentinel. -export const GOOGLE_CLIENT_ID = ''; - -export const ANTIGRAVITY_OAUTH_CONFIG = { - authUrl: GOOGLE_AUTHORIZE_ENDPOINT, - tokenUrl: GOOGLE_TOKEN_ENDPOINT, - redirectUri: ANTIGRAVITY_REDIRECT_URI, - scopes: ANTIGRAVITY_SCOPES, - callbackPort: ANTIGRAVITY_CALLBACK_PORT, - callbackHost: '127.0.0.1', - status: STATUS, - hasClientId: GOOGLE_CLIENT_ID.length > 0, -} as const; - -// ============================================================= -// Pure helpers. -// ============================================================= - -export interface AntigravityAuthorizationConfig { - clientId: string; - authorizeEndpoint: string; - redirectUri: string; - scope: string; - state: string; - challenge: string; -} - -export function buildAntigravityAuthorizationUrl(config: AntigravityAuthorizationConfig): string { - const url = new URL(config.authorizeEndpoint); - url.searchParams.set('response_type', 'code'); - url.searchParams.set('client_id', config.clientId); - url.searchParams.set('redirect_uri', config.redirectUri); - url.searchParams.set('scope', config.scope); - url.searchParams.set('code_challenge', config.challenge); - url.searchParams.set('code_challenge_method', 'S256'); - url.searchParams.set('state', config.state); - // Google-specific: ask for offline_access (refresh tokens) and - // prompt=consent so we definitely receive a refresh token on - // re-auth. spec-only assumption based on standard Google - // OAuth practice. - url.searchParams.set('access_type', 'offline'); - url.searchParams.set('prompt', 'consent'); - return url.toString(); -} - -export function pkceChallengeFromVerifier(verifier: string): string { - const digest = createHash('sha256').update(verifier, 'utf8').digest(); - return base64urlEncode(new Uint8Array(digest)); -} - -export function isAntigravitySubscriptionExperimentalEnabled(): boolean { - return process.env.MAKA_ANTIGRAVITY_SUBSCRIPTION_EXPERIMENTAL !== '0'; -} - -/** - * The "needs client_id" failure envelope. Exposed as a pure value - * so both the service (returned from `getAuthorizationUrl`) and - * the contract test (pinning the user-visible copy) reference the - * same string. - */ -export const ANTIGRAVITY_MISSING_CLIENT_ID_ENVELOPE = { - ok: false as const, - reason: 'unknown' as const, - message: - '需要 Google client_id 才能启用 Antigravity 登录；当前为预览占位卡片，等待 antigravity-auth 插件的客户端配置。', -}; diff --git a/apps/desktop/src/main/oauth/antigravity-subscription-service.ts b/apps/desktop/src/main/oauth/antigravity-subscription-service.ts deleted file mode 100644 index 86c3964e25..0000000000 --- a/apps/desktop/src/main/oauth/antigravity-subscription-service.ts +++ /dev/null @@ -1,569 +0,0 @@ -/** - * Google Antigravity (Gemini) subscription OAuth service — - * preview-only placeholder. - * - * Structurally mirrors the Claude / Codex services (loopback PKCE, - * Google OAuth endpoints, tokens persisted in the shared - * CredentialStore — the cross-surface authority, #1125). The - * preview remains fail-closed because no Google client id is bundled. - * - * Status: 'preview'. The card is visible in Settings → 模型, but - * any attempt to `getAuthorizationUrl()` returns a clear - * `unknown` failure envelope explaining that the Google - * client_id is not bundled. Once the client_id question is - * resolved, this file - * keeps its shape and only the `GOOGLE_CLIENT_ID` constant gets - * a real value. - * - * Hard gates: - * - Renderer NEVER sees access_token / refresh_token / id_token. - * - Refresh failure does NOT auto-logout. - * - The authorization URL is held in-process when the placeholder - * advances to a real implementation. - */ - -import { randomBytes, randomUUID } from 'node:crypto'; -import { promises as fs } from 'node:fs'; -import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http'; -import { join } from 'node:path'; -import { - PENDING_AUTHORIZATION_TTL_MS, - PKCE_VERIFIER_LENGTH_BYTES, - base64urlEncode, - constantTimeStringEqual, - type AuthorizationUrlPayload, - type SubscriptionActionFailureReason, - type SubscriptionActionResult, -} from '@maka/core'; -import { - refreshAndPersistOAuthSubscriptionTokens, - resolveAndPersistOAuthSubscriptionTokens, - type OAuthSubscriptionRefreshAndPersistOutcome, -} from '@maka/runtime'; -import { - ANTIGRAVITY_MISSING_CLIENT_ID_ENVELOPE, - ANTIGRAVITY_OAUTH_CONFIG, - GOOGLE_CLIENT_ID, - STATUS, - buildAntigravityAuthorizationUrl, - pkceChallengeFromVerifier, -} from './antigravity-subscription-helpers.js'; -import { - deleteSharedOAuthTokens, - loadSharedOAuthTokens, - saveSharedOAuthTokens, - type SharedOAuthCredentialStore, -} from './shared-credential-bridge.js'; - -const GOOGLE_AUTHORIZE_ENDPOINT = ANTIGRAVITY_OAUTH_CONFIG.authUrl; -const GOOGLE_TOKEN_ENDPOINT = ANTIGRAVITY_OAUTH_CONFIG.tokenUrl; -const ANTIGRAVITY_CALLBACK_HOST = ANTIGRAVITY_OAUTH_CONFIG.callbackHost; -const ANTIGRAVITY_CALLBACK_PORT = ANTIGRAVITY_OAUTH_CONFIG.callbackPort; -const ANTIGRAVITY_REDIRECT_URI = ANTIGRAVITY_OAUTH_CONFIG.redirectUri; -const ANTIGRAVITY_SCOPES = ANTIGRAVITY_OAUTH_CONFIG.scopes; - -const PLAIN_USER_AGENT = 'maka-desktop/0.1.0 (oauth-subscription)'; - -export { STATUS }; - -// ============================================================= -// Persisted tokens — INTERNAL TO THIS MODULE. -// ============================================================= -interface PersistedTokens { - /* eslint-disable @typescript-eslint/naming-convention -- OAuth protocol field names */ - access_token: string; - refresh_token: string; - id_token?: string; - expires_at: number; - /* eslint-enable */ -} - -interface PendingAuthorization { - verifier: string; - state: string; - createdAt: number; - url: string; - codePromise: Promise<{ code: string; state: string }>; - resolveCode: (value: { code: string; state: string }) => void; - rejectCode: (err: Error) => void; - server: Server | null; -} - -// ============================================================= -// Service class. -// ============================================================= - -export interface AntigravitySubscriptionServiceDeps { - /** Absolute path to userData dir; e.g. app.getPath('userData'). */ - userDataDir: string; - /** Opens the provider authorization URL in the system browser. */ - openExternal: (url: string) => Promise; - /** Function returning current epoch ms. Injectable for tests. */ - now?: () => number; - /** fetch implementation. Defaults to global fetch (Node 18+). */ - fetchFn?: typeof fetch; - /** Shared workspace credential store — the authoritative token store for every surface (#1125). */ - credentialStore: SharedOAuthCredentialStore; -} - -export class AntigravitySubscriptionService { - /** Pre-#1125 safeStorage-encrypted token file. Never written or read - * anymore; unlinked on logout in case the startup import could not - * run, so logout still means "no credential survives anywhere". */ - private readonly legacyTokenFilePath: string; - private readonly openExternal: (url: string) => Promise; - private readonly now: () => number; - private readonly fetchFn: typeof fetch; - private readonly credentialStore: SharedOAuthCredentialStore; - - private pending: Map = new Map(); - - private lastRefreshFailedMessage: string | null = null; - private authorizing = false; - private refreshing = false; - - constructor(deps: AntigravitySubscriptionServiceDeps) { - this.legacyTokenFilePath = join(deps.userDataDir, '.antigravity_subscription_token'); - this.openExternal = deps.openExternal; - this.now = deps.now ?? (() => Date.now()); - this.fetchFn = deps.fetchFn ?? (globalThis.fetch as typeof fetch); - this.credentialStore = deps.credentialStore; - } - - // ----------------------------------------------------------- - // PUBLIC API - // ----------------------------------------------------------- - - /** - * Build the PKCE-protected Google authorize URL and start a - * loopback callback server on port 51121. - * - * **Currently disabled.** Until `GOOGLE_CLIENT_ID` is populated - * with the antigravity-auth plugin's real value, this method - * returns a clear `unknown` failure envelope. The renderer - * surfaces the message verbatim in the modal, and the contract - * test pins the exact reason / wording so a future "oops" - * accidental enable is obvious in CI. - */ - async getAuthorizationUrl(): Promise { - if (!GOOGLE_CLIENT_ID) { - return ANTIGRAVITY_MISSING_CLIENT_ID_ENVELOPE; - } - this.pruneExpiredPending(); - const verifier = base64urlEncode(randomBytes(PKCE_VERIFIER_LENGTH_BYTES)); - const state = base64urlEncode(randomBytes(16)); - const authRequestId = randomUUID(); - - const challenge = pkceChallengeFromVerifier(verifier); - const url = buildAntigravityAuthorizationUrl({ - clientId: GOOGLE_CLIENT_ID, - authorizeEndpoint: GOOGLE_AUTHORIZE_ENDPOINT, - redirectUri: ANTIGRAVITY_REDIRECT_URI, - scope: ANTIGRAVITY_SCOPES, - state, - challenge, - }); - - let resolveCode!: (value: { code: string; state: string }) => void; - let rejectCode!: (err: Error) => void; - const codePromise = new Promise<{ code: string; state: string }>((resolve, reject) => { - resolveCode = resolve; - rejectCode = reject; - }); - - let server: Server; - try { - server = await this.startCallbackServer(state, resolveCode, rejectCode); - } catch (err) { - const message = err instanceof Error ? err.message : '回调端口 51121 启动失败。'; - return { ok: false, reason: 'unknown', message }; - } - - this.pending.set(authRequestId, { - verifier, - state, - createdAt: this.now(), - url, - codePromise, - resolveCode, - rejectCode, - server, - }); - - return { - stateHint: state.slice(0, 8), - authRequestId, - }; - } - - async openAuthorizationUrl(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - return { ok: false, reason: 'authorization_pending', message: '授权会话不存在，请重新点击“登录 Antigravity”。' }; - } - if (this.now() - pending.createdAt > PENDING_AUTHORIZATION_TTL_MS) { - this.disposePending(authRequestId); - return { ok: false, reason: 'authorization_expired', message: '授权请求已过期，请重新点击“登录 Antigravity”。' }; - } - try { - await this.openExternal(pending.url); - this.authorizing = true; - return { ok: true }; - } catch (err) { - return this.failureFromError('unknown', err); - } - } - - async completeAuthorization(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - this.authorizing = false; - return { ok: false, reason: 'authorization_pending', message: '请先点击“登录 Antigravity”再完成授权。' }; - } - if (this.now() - pending.createdAt > PENDING_AUTHORIZATION_TTL_MS) { - this.disposePending(authRequestId); - this.authorizing = false; - return { ok: false, reason: 'authorization_expired', message: '授权请求已过期，请重新点击“登录 Antigravity”。' }; - } - try { - const { code, state } = await pending.codePromise; - if (!constantTimeStringEqual(state, pending.state)) { - this.disposePending(authRequestId); - this.authorizing = false; - return { ok: false, reason: 'invalid_paste_code', message: '回调 state 校验失败，请重新登录。' }; - } - const tokens = await this.exchangeCodeForTokens(code, pending.verifier); - await this.saveTokens(tokens); - this.disposePending(authRequestId); - this.authorizing = false; - return { ok: true }; - } catch (err) { - this.disposePending(authRequestId); - this.authorizing = false; - return this.failureFromError('token_exchange_failed', err); - } - } - - cancelAuthorization(authRequestId?: string): void { - if (authRequestId !== undefined) { - this.disposePending(authRequestId); - } else { - for (const id of [...this.pending.keys()]) this.disposePending(id); - } - this.authorizing = false; - } - - async getAccountState(): Promise { - const tokens = await this.loadTokens(); - if (!tokens) { - return { - provider: 'antigravity-subscription', - status: STATUS, - runtimeState: this.authorizing ? 'authorizing' : 'not_logged_in', - }; - } - const runtimeState = this.deriveRuntimeState(); - return { - provider: 'antigravity-subscription', - status: STATUS, - runtimeState, - errorMessage: this.errorForState(runtimeState), - }; - } - - async refreshTokens(): Promise { - this.refreshing = true; - try { - const result = await refreshAndPersistOAuthSubscriptionTokens({ - slug: 'antigravity-subscription', - credentialStore: this.credentialStore, - refreshTokens: (tokens, signal) => this.requestRefresh(tokens.refresh_token, signal), - }); - return this.applyRefreshOutcome(result); - } finally { - this.refreshing = false; - } - } - - async logout(): Promise { - this.lastRefreshFailedMessage = null; - for (const id of [...this.pending.keys()]) this.disposePending(id); - this.authorizing = false; - let legacyDeleteFailed = false; - try { - await fs.unlink(this.legacyTokenFilePath); - } catch (err) { - const code = (err as NodeJS.ErrnoException).code; - if (code !== 'ENOENT') { - legacyDeleteFailed = true; - } - } - try { - await deleteSharedOAuthTokens(this.credentialStore, 'antigravity-subscription'); - } catch { - return { ok: false, reason: 'storage_failed', message: '删除共享凭据失败，请手动清理。' }; - } - if (legacyDeleteFailed) return { ok: false, reason: 'storage_failed', message: '删除本地遗留凭据失败，请手动清理。' }; - return { ok: true }; - } - - async getAccessTokenInternal(): Promise { - this.refreshing = true; - try { - const result = await resolveAndPersistOAuthSubscriptionTokens({ - slug: 'antigravity-subscription', - credentialStore: this.credentialStore, - now: this.now, - refreshTokens: (tokens, signal) => this.requestRefresh(tokens.refresh_token, signal), - }); - if (result.outcome === 'current') return result.tokens.access_token; - const action = this.applyRefreshOutcome(result); - return action.ok && (result.outcome === 'refreshed' || result.outcome === 'superseded') - ? result.tokens.access_token - : null; - } finally { - this.refreshing = false; - } - } - - // ----------------------------------------------------------- - // INTERNALS - // ----------------------------------------------------------- - - private applyRefreshOutcome(result: OAuthSubscriptionRefreshAndPersistOutcome): SubscriptionActionResult { - if (result.outcome === 'refreshed' || result.outcome === 'superseded') { - this.lastRefreshFailedMessage = null; - return { ok: true }; - } - const message = result.outcome === 'logged-out' - ? '登录状态已变更，本次刷新结果已丢弃。' - : result.outcome === 'storage-failed' - ? '访问 Antigravity OAuth 共享凭据失败，请检查 credentials.json 权限后重试。' - : result.error instanceof Error ? result.error.message : '刷新失败，请重新登录。'; - this.lastRefreshFailedMessage = message; - return { - ok: false, - reason: result.outcome === 'storage-failed' ? 'storage_failed' : 'refresh_failed', - message, - }; - } - - private deriveRuntimeState(): AntigravityRuntimeState { - if (this.refreshing) return 'refreshing'; - if (this.lastRefreshFailedMessage) return 'refresh_failed'; - return 'authenticated'; - } - - private errorForState(state: AntigravityRuntimeState): string | undefined { - if (state === 'refresh_failed') return this.lastRefreshFailedMessage ?? undefined; - return undefined; - } - - private pruneExpiredPending(): void { - const cutoff = this.now() - PENDING_AUTHORIZATION_TTL_MS; - for (const [id, p] of this.pending) { - if (p.createdAt < cutoff) this.disposePending(id); - } - } - - private async startCallbackServer( - expectedState: string, - resolveCode: (value: { code: string; state: string }) => void, - rejectCode: (err: Error) => void, - ): Promise { - return await new Promise((resolve, reject) => { - const server = createServer((req: IncomingMessage, res: ServerResponse) => { - const url = req.url ?? ''; - if (!url.startsWith('/callback')) { - res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' }); - res.end('Not found.'); - return; - } - let parsedUrl: URL; - try { - parsedUrl = new URL(url, `http://${ANTIGRAVITY_CALLBACK_HOST}:${ANTIGRAVITY_CALLBACK_PORT}`); - } catch { - res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - res.end('Invalid callback URL.'); - return; - } - const code = parsedUrl.searchParams.get('code'); - const state = parsedUrl.searchParams.get('state'); - const error = parsedUrl.searchParams.get('error'); - if (error) { - res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - res.end(`OAuth error: ${error}`); - rejectCode(new Error(`OAuth provider returned error: ${error}`)); - return; - } - if (!code || !state) { - res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - res.end('Missing code or state.'); - return; - } - if (!constantTimeStringEqual(state, expectedState)) { - res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - res.end('State mismatch.'); - return; - } - res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }); - res.end('

登录成功，可关闭此标签页。

'); - resolveCode({ code, state }); - }); - server.on('error', (err) => { - reject(err); - }); - // Reject sockets that connect but never finish a request - // within 10s, so a stuck browser tab can't pin the port. - server.setTimeout(10_000, (socket) => { - try { socket.destroy(); } catch { /* best-effort */ } - }); - server.listen(ANTIGRAVITY_CALLBACK_PORT, ANTIGRAVITY_CALLBACK_HOST, () => { - resolve(server); - }); - }); - } - - private disposePending(authRequestId: string): void { - const pending = this.pending.get(authRequestId); - if (!pending) return; - this.pending.delete(authRequestId); - if (pending.server) { - try { - // Drop in-flight sockets first — `close()` alone waits for - // existing connections to drain, and a browser tab that - // hangs onto the callback request will pin port 51121 until - // OS socket timeout. closeAllConnections is Node 18.2+. - pending.server.closeAllConnections?.(); - pending.server.close(); - } catch { - // best-effort - } - } - pending.rejectCode(new Error('Authorization cancelled.')); - } - - private async exchangeCodeForTokens(code: string, verifier: string): Promise { - const body = new URLSearchParams({ - grant_type: 'authorization_code', - client_id: GOOGLE_CLIENT_ID, - code, - code_verifier: verifier, - redirect_uri: ANTIGRAVITY_REDIRECT_URI, - }); - const response = await this.fetchFn(GOOGLE_TOKEN_ENDPOINT, { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'User-Agent': PLAIN_USER_AGENT, - }, - body: body.toString(), - }); - if (!response.ok) { - throw new Error(`Token exchange failed (${response.status}).`); - } - const payload = (await response.json()) as { - access_token: string; - refresh_token: string; - id_token?: string; - expires_in: number; - }; - return { - access_token: payload.access_token, - refresh_token: payload.refresh_token, - id_token: payload.id_token, - expires_at: this.now() + 1000 * payload.expires_in, - }; - } - - private async requestRefresh( - refreshToken: string, - signal: AbortSignal, - ): Promise { - const body = new URLSearchParams({ - grant_type: 'refresh_token', - client_id: GOOGLE_CLIENT_ID, - refresh_token: refreshToken, - }); - const response = await this.fetchFn(GOOGLE_TOKEN_ENDPOINT, { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'User-Agent': PLAIN_USER_AGENT, - }, - body: body.toString(), - signal, - }); - if (!response.ok) throw new Error(`Token refresh failed (${response.status}).`); - const payload = (await response.json()) as { - access_token: string; - refresh_token?: string; - id_token?: string; - expires_in: number; - }; - return { - access_token: payload.access_token, - refresh_token: payload.refresh_token ?? refreshToken, - id_token: payload.id_token, - expires_at: this.now() + 1000 * payload.expires_in, - }; - } - - private async saveTokens(tokens: PersistedTokens): Promise { - // Fail closed: a store write failure propagates to the caller's - // failure envelope instead of pretending the login stuck. - await saveSharedOAuthTokens(this.credentialStore, 'antigravity-subscription', tokens); - } - - /** - * Always reads the shared store — no in-memory copy; the store is - * the cross-surface authority (#1125). A corrupt entry is preserved - * for recovery; a fresh login can overwrite it. - */ - private async loadTokens(): Promise { - let result: Awaited>; - try { - result = await loadSharedOAuthTokens(this.credentialStore, 'antigravity-subscription'); - } catch { - return null; - } - if (result.status !== 'ok') return null; - return { - access_token: result.tokens.access_token, - refresh_token: result.tokens.refresh_token, - id_token: result.tokens.id_token, - expires_at: result.tokens.expires_at, - }; - } - - private failureFromError( - fallbackReason: SubscriptionActionFailureReason, - err: unknown, - ): SubscriptionActionResult { - const message = err instanceof Error ? err.message : '操作失败。'; - return { ok: false, reason: fallbackReason, message }; - } -} - -// ============================================================= -// Public IPC payload shape. -// ============================================================= -export type AntigravityRuntimeState = - | 'not_logged_in' - | 'authorizing' - | 'authenticated' - | 'refreshing' - | 'refresh_failed'; - -export interface AntigravityAccountStateSnapshot { - provider: 'antigravity-subscription'; - status: typeof STATUS; - runtimeState: AntigravityRuntimeState; - errorMessage?: string; -} - -// Re-exports for the IPC handler + focused protocol tests. The pure -// helpers keep preview configuration and PKCE logic independent of service state. -export { - isAntigravitySubscriptionExperimentalEnabled, -} from './antigravity-subscription-helpers.js'; diff --git a/apps/desktop/src/main/oauth/claude-subscription-helpers.ts b/apps/desktop/src/main/oauth/claude-subscription-helpers.ts deleted file mode 100644 index 62f886e4a5..0000000000 --- a/apps/desktop/src/main/oauth/claude-subscription-helpers.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Pure helpers for the Claude subscription OAuth service. Split out from - * `claude-subscription-service.ts` so unit tests can import them without - * dragging in the `electron` ESM module (which is not loadable from - * node --test directly). Mirrors the claude service helpers split. - */ - -/** - * Whether the Claude subscription card is enabled at all in this build. - * Opt-out shape: enabled unless the env flag is explicitly '0'. - */ -export function isSubscriptionExperimentalEnabled(): boolean { - return process.env.MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL !== '0'; -} diff --git a/apps/desktop/src/main/oauth/claude-subscription-service.ts b/apps/desktop/src/main/oauth/claude-subscription-service.ts deleted file mode 100644 index 88ad2f9f52..0000000000 --- a/apps/desktop/src/main/oauth/claude-subscription-service.ts +++ /dev/null @@ -1,805 +0,0 @@ -/** - * Claude subscription OAuth service (main-process only). - * - * Responsibilities: - * 1. PKCE authorize URL generation + pending state (G-X1). - * 2. Paste-code parsing + state validation (G-X2). - * 3. Token exchange + refresh + persistence via the shared - * CredentialStore (workspace credentials.json) — the single - * cross-surface token authority (#1125). Refresh goes through - * the runtime's provider refresher so desktop and pure-Node - * surfaces share one refresh implementation. - * 4. Usage quota fetch (caches with QUOTA_CACHE_TTL_MS). - * 5. Logout: clears in-memory + deletes token file. - * 6. Account state snapshot for renderer (no token-shaped fields). - * - * Hard gates enforced: - * - Renderer NEVER sees access_token / refresh_token. The state - * snapshot omits them; this module's public methods return - * either `SubscriptionAccountState` or `SubscriptionActionResult`. - * - Cloaked headers are loaded ONLY via dynamic import inside the - * env-flag-gated branch (xuan G-X4). Tests verify this. - * - Refresh failure does NOT auto-logout (kenji `cf41871b`). - * - PKCE state matched with constant-time equality (G-X1). - */ - -import { createHash, randomBytes, randomUUID } from 'node:crypto'; -import { promises as fs } from 'node:fs'; -import { dirname, join } from 'node:path'; -import { - PENDING_AUTHORIZATION_TTL_MS, - PKCE_VERIFIER_LENGTH_BYTES, - QUOTA_CACHE_TTL_MS, - TOKEN_REFRESH_SKEW_MS, - base64urlEncode, - buildClaudeAuthorizationUrl, - constantTimeStringEqual, - parsePastedAuthorization, - type AuthorizationUrlPayload, - type QuotaSnapshot, - type Sha256Digest, - type SubscriptionAccountProfile, - type SubscriptionAccountState, - type SubscriptionActionFailureReason, - type SubscriptionActionResult, -} from '@maka/core'; -import { - fetchClaudeSubscriptionUsage, - refreshAndPersistOAuthSubscriptionTokens, - resolveAndPersistOAuthSubscriptionTokens, - type OAuthSubscriptionRefreshAndPersistOutcome, -} from '@maka/runtime'; -import { - deleteSharedOAuthTokens, - loadSharedOAuthTokens, - saveSharedOAuthTokens, - type SharedOAuthCredentialStore, -} from './shared-credential-bridge.js'; - -// ============================================================= -// Endpoints + client id — mirror Claude Code's current OAuth -// login flow. Verified against the installed Claude Code 2.1.153 -// binary constants (`CLAUDE_AI_AUTHORIZE_URL`, `TOKEN_URL`) after -// the older Claude.ai / console.anthropic.com OAuth route started -// rejecting new auth attempts. -// ============================================================= -const CLAUDE_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e'; -const CLAUDE_AUTHORIZE_ENDPOINT = 'https://claude.com/cai/oauth/authorize'; -const CLAUDE_REDIRECT_URI = 'https://platform.claude.com/oauth/code/callback'; -const CLAUDE_TOKEN_ENDPOINT = 'https://platform.claude.com/v1/oauth/token'; -const CLAUDE_PROFILE_ENDPOINT = 'https://api.anthropic.com/api/oauth/profile'; -const CLAUDE_SCOPE = 'user:sessions:claude_code user:mcp_servers user:file_upload'; - -// Anthropic's OAuth token endpoint rejects requests whose -// User-Agent does not match the `claude-cli/X.Y.Z (external, cli)` -// shape (verified against Claude Code 2.1.153). -// WAWQAQ msg a62a4c1c reported "Invalid request format" after -// login; the symptom was the OAuth endpoint rejecting our previous -// `maka-desktop/0.1.0 (oauth-subscription)` UA. The cloak path is a -// SEPARATE concern (system prefix + metadata on the SEND path) and -// now defaults on for the visible OAuth model path. WAWQAQ -// already accepted the ToS implication of the OAuth flow at all -// (msg `fd421634`, baked into `isSubscriptionExperimentalEnabled`). -export const CLAUDE_SUBSCRIPTION_PRODUCT_VERSION = '2.1.153'; -const OAUTH_USER_AGENT = `claude-cli/${CLAUDE_SUBSCRIPTION_PRODUCT_VERSION} (external, cli)`; - -// ============================================================= -// Token storage — shared CredentialStore (workspace -// credentials.json), the cross-surface authority (#1125). -// ============================================================= - -/** - * Tokens persisted to the shared store. INTERNAL TO THIS MODULE — - * never crosses the IPC boundary. The renderer only sees the public - * `SubscriptionAccountState` shape, which omits these fields. - * - * Field names use snake_case to match Anthropic's token response; - * we don't re-key on save. - * - * NOTE: this interface intentionally uses string literal property - * names below to keep the contract-test scan (which forbids - * `accessToken:` and `refreshToken:` as object-literal keys in - * preload / renderer code) ergonomic. This file lives in `main/` - * which is OFF the scan path, and the property names are explicit - * snake_case OAuth protocol names — not engineering identifiers. - */ -interface PersistedTokens { - /* eslint-disable @typescript-eslint/naming-convention -- OAuth protocol field names */ - access_token: string; - refresh_token: string; - expires_at: number; - token_type: string; - scope: string; - account_uuid: string; - /* eslint-enable */ -} - -// ============================================================= -// Pending authorization map (PKCE state). -// ============================================================= - -interface PendingAuthorization { - verifier: string; - state: string; - createdAt: number; - /** - * The authorization URL we generated. Cached here so - * `openAuthorizationUrl(authRequestId)` opens the URL we built - * — the renderer never gets to pick which URL to open - * externally. kenji `1da909d5` non-blocking hardening: don't let - * a malicious renderer hand `shell.openExternal` an arbitrary URL. - */ - url: string; -} - -class ClaudeTokenExchangeError extends Error { - // PR-CLAUDE-OAUTH-TOKEN-EXCHANGE-BODY-0: also carry Anthropic's - // response body so the user can see WHY the exchange failed - // (`invalid_grant: code already used`, `expired_token`, etc.) - // instead of the catch-all "授权码已过期、已使用或与本次登录不匹配" - // fallback. The body is best-effort: if reading it throws, we keep - // the original status-only error semantics. - constructor(readonly status: number, readonly body?: string) { - super(`Claude OAuth token endpoint returned ${status}.${body ? ` ${body}` : ''}`); - this.name = 'ClaudeTokenExchangeError'; - } -} - -// ============================================================= -// Node SHA-256 implementation, injected into core's pure helpers. -// ============================================================= - -const nodeSha256: Sha256Digest = { - digest(input: string): Uint8Array { - return new Uint8Array(createHash('sha256').update(input, 'utf8').digest()); - }, -}; - -// ============================================================= -// Service class. -// ============================================================= - -export interface ClaudeSubscriptionServiceDeps { - /** Absolute path to userData dir; e.g. app.getPath('userData'). */ - userDataDir: string; - /** Opens the provider authorization URL in the system browser. */ - openExternal: (url: string) => Promise; - /** Function returning current epoch ms. Injectable for tests. */ - now?: () => number; - /** fetch implementation. Defaults to global fetch (Node 18+). */ - fetchFn?: typeof fetch; - /** Shared workspace credential store — the authoritative token store for every surface (#1125). */ - credentialStore: SharedOAuthCredentialStore; -} - -export class ClaudeSubscriptionService { - /** Pre-#1125 safeStorage-encrypted token file. Never written or read - * anymore; unlinked on logout in case the startup import could not - * run (e.g. keychain unavailable) so logout still means "no - * credential survives anywhere". */ - private readonly legacyTokenFilePath: string; - private readonly deviceIdFilePath: string; - private readonly openExternal: (url: string) => Promise; - private readonly now: () => number; - private readonly fetchFn: typeof fetch; - private readonly credentialStore: SharedOAuthCredentialStore; - - private cachedQuota: QuotaSnapshot | null = null; - private cachedProfile: SubscriptionAccountProfile | null = null; - private pending: Map = new Map(); - - // Runtime state diagnostics. Used by the snapshot getter. - private lastRefreshFailedMessage: string | null = null; - private lastRejectionMessage: string | null = null; - private quotaFetchFailedMessage: string | null = null; - private lastStorageFailedMessage: string | null = null; - private authorizing = false; - private refreshing = false; - - constructor(deps: ClaudeSubscriptionServiceDeps) { - this.legacyTokenFilePath = join(deps.userDataDir, '.claude_subscription_token'); - this.deviceIdFilePath = join(deps.userDataDir, '.claude_subscription_device_id'); - this.openExternal = deps.openExternal; - this.now = deps.now ?? (() => Date.now()); - this.fetchFn = deps.fetchFn ?? (globalThis.fetch as typeof fetch); - this.credentialStore = deps.credentialStore; - } - - // ----------------------------------------------------------- - // PUBLIC API — these are what the IPC handlers call. - // ----------------------------------------------------------- - - /** - * Start an authorization attempt: returns the URL the renderer - * should open externally, plus an opaque `authRequestId` that's - * required when the user pastes the redirect code back. - * - * The verifier + state are persisted in the in-memory pending - * map ONLY — never on disk, never to the renderer. - */ - async getAuthorizationUrl(): Promise { - this.pruneExpiredPending(); - // PR-CLAUDE-OAUTH-SINGLE-PENDING-0 (WAWQAQ msg b481e9db): - // clear any non-expired prior pending before generating a new one - // so the renderer only ever holds ONE valid authRequestId at a - // time. Otherwise: user clicks "登录" twice within the 10-min TTL, - // both pendings stay in the map, the modal shows the LATEST - // state hint, but the user's browser may still have the older - // Anthropic tab open and paste back a code whose state matches - // the OLDER pending — state validation against the latest - // pending fails and the user is stuck in an undebuggable loop. - // Claude OAuth is single-user / single-flow; there is no - // legitimate reason for multiple concurrent pendings. - this.pending.clear(); - const verifier = base64urlEncode(randomBytes(PKCE_VERIFIER_LENGTH_BYTES)); - // Upstream Claude Code uses the PKCE verifier as the OAuth state - // value. Anthropic's authorize page rejects shorter, unrelated - // state strings with "Invalid request format", so keep this flow - // source-compatible while still validating the pasted state strictly. - const state = verifier; - const authRequestId = randomUUID(); - const url = buildClaudeAuthorizationUrl( - { - clientId: CLAUDE_CLIENT_ID, - authorizeEndpoint: CLAUDE_AUTHORIZE_ENDPOINT, - redirectUri: CLAUDE_REDIRECT_URI, - scope: CLAUDE_SCOPE, - }, - verifier, - state, - nodeSha256, - ); - this.pending.set(authRequestId, { - verifier, - state, - createdAt: this.now(), - url, - }); - // kenji `027c93c0`: do NOT return `url` to the renderer. The - // URL is stored in `pending.url` and opened by main when the - // renderer calls `openAuthorizationUrl(authRequestId)`. This - // keeps the URL surface narrow: renderer never holds or - // transmits it. - return { - stateHint: state.slice(0, 8), - authRequestId, - }; - } - - /** - * Open the authorization URL we generated for a pending request. - * - * kenji `1da909d5` non-blocking hardening: renderer hands us - * an opaque `authRequestId`, NOT a URL. We look up the URL - * from our own pending map. The renderer never gets to call - * `shell.openExternal` with a renderer-controlled URL. - */ - async openAuthorizationUrl(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - return { ok: false, reason: 'authorization_pending', message: '授权会话不存在，请重新点击“登录订阅”。' }; - } - if (this.now() - pending.createdAt > PENDING_AUTHORIZATION_TTL_MS) { - this.pending.delete(authRequestId); - return { ok: false, reason: 'authorization_expired', message: '授权请求已过期，请重新点击“登录订阅”。' }; - } - try { - await this.openExternal(pending.url); - this.authorizing = true; - return { ok: true }; - } catch (err) { - return this.failureFromError('unknown', err); - } - } - - /** - * Validate the pasted code, then exchange for tokens. - * - * Upstream Claude Code uses the PKCE verifier itself as OAuth state. - * That means the pasted `code#state` contains the verifier needed - * for token exchange. We still validate against pending state when - * pending exists, but if the in-memory pending map was lost - * (renderer reload, modal unmount, main-process restart) we can - * recover from the pasted state instead of forcing the user into a - * dead "authorization_pending" path. - */ - async completeAuthorization( - authRequestId: string, - rawPasted: unknown, - ): Promise { - const parsed = parsePastedAuthorization(rawPasted); - if (!parsed) { - return { - ok: false, - reason: 'invalid_paste_code', - message: '授权码格式不正确，请粘贴完整字符串（包含 `#` 分隔符）。', - }; - } - const pending = this.pending.get(authRequestId); - const pendingExpired = pending ? this.now() - pending.createdAt > PENDING_AUTHORIZATION_TTL_MS : false; - if (pending && !constantTimeStringEqual(parsed.state, pending.state)) { - if (pendingExpired) this.pending.delete(authRequestId); - return { ok: false, reason: 'invalid_paste_code', message: '授权码 state 校验失败，请重新登录。' }; - } - if (pendingExpired) this.pending.delete(authRequestId); - const recoverFromPastedState = !pending || pendingExpired; - if (recoverFromPastedState && !looksLikeClaudePkceVerifier(parsed.state)) { - this.authorizing = false; - return { ok: false, reason: 'authorization_pending', message: '请重新点击“登录订阅”获取新的授权码。' }; - } - const verifier = recoverFromPastedState ? parsed.state : pending!.verifier; - - try { - const tokens = await this.exchangeCodeForTokens(parsed.code, verifier, parsed.state); - // Storage failures are not exchange failures: the one-time code - // was consumed successfully, so tell the user to fix the store - // instead of implying the code was bad. - try { - await this.saveTokens(tokens); - } catch { - this.authorizing = false; - return { ok: false, reason: 'storage_failed', message: this.lastStorageFailedMessage ?? '写入共享凭据失败，请检查 credentials.json 权限后重试。' }; - } - this.pending.delete(authRequestId); - this.authorizing = false; - // Kick a profile fetch in the background; failure is non-fatal - // (the user is authenticated regardless of profile success). - void this.refreshProfile(); - return { ok: true }; - } catch (err) { - this.authorizing = false; - return this.failureFromError('token_exchange_failed', err, '授权码已过期、已使用或与本次登录不匹配，请重新点击“登录订阅”获取新的授权码。'); - } - } - - /** - * Cancel a pending authorization (user closed the modal). - */ - cancelAuthorization(authRequestId?: string): void { - if (authRequestId !== undefined) { - this.pending.delete(authRequestId); - } else { - this.pending.clear(); - } - this.authorizing = false; - } - - /** - * Snapshot of the current account state for the renderer. - * NO token-shaped fields exposed (xuan G-X3). - */ - async getAccountState(): Promise { - const tokens = await this.loadTokens(); - if (!tokens) { - if (this.lastStorageFailedMessage) { - return { - provider: 'claude-subscription', - runtimeState: 'storage_failed', - errorMessage: this.lastStorageFailedMessage, - }; - } - return { - provider: 'claude-subscription', - runtimeState: this.authorizing ? 'authorizing' : 'not_logged_in', - }; - } - const runtimeState = this.deriveRuntimeState(tokens); - return { - provider: 'claude-subscription', - runtimeState, - // The cached profile is only valid for the account the shared - // store currently holds — another surface may have re-logged in - // with a different account since the profile was fetched. - profile: this.cachedProfile?.accountUuid === tokens.account_uuid - ? this.cachedProfile - : { accountUuid: tokens.account_uuid }, - quota: this.cachedQuota ?? undefined, - errorMessage: this.errorForState(runtimeState), - }; - } - - /** - * Force a token refresh. - * - * kenji `cf41871b`: refresh FAILURE does NOT auto-delete the - * token file. The user sees `refresh_failed` and must click - * "重新登录". - */ - async refreshTokens(): Promise { - this.refreshing = true; - try { - const result = await refreshAndPersistOAuthSubscriptionTokens({ - providerType: 'claude-subscription', - slug: 'claude-subscription', - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - }); - return this.applyRefreshOutcome(result); - } finally { - this.refreshing = false; - } - } - - /** - * Refresh the cached quota snapshot. Caller can call this on - * Settings page mount or after a refresh. - */ - async refreshQuota(): Promise { - const accessToken = await this.getAccessTokenInternal(); - if (!accessToken) { - return { ok: false, reason: 'unknown', message: '当前未登录。' }; - } - try { - const snapshot = await fetchClaudeSubscriptionUsage({ - accessToken, - fetchFn: this.fetchFn, - now: this.now, - }); - this.cachedQuota = snapshot; - this.quotaFetchFailedMessage = null; - return { ok: true }; - } catch (err) { - const message = err instanceof Error ? err.message : 'Quota request failed.'; - this.quotaFetchFailedMessage = message; - return { ok: false, reason: 'unknown', message }; - } - } - - /** - * Logout: clear in-memory + delete token file. - * - * **Local clear only** — remote OAuth revocation is NOT performed. - * Anthropic does not publicly expose an RFC 7009 revocation - * endpoint as of 2026-05-28; the upstream Claude.ai client logout - * (verified against the external reference at main.js:16280-16295) - * also only unlinks the local token file. Access tokens remain server-valid - * until natural expiry (~1 hour); refresh tokens remain valid - * until their TTL or until the user explicitly revokes them via - * the claude.ai account-side UI. - * - * What this method DOES: - * - Delete the shared-store token (the authority) and any legacy - * safeStorage token file the startup import could not process. - * - Clear `cachedProfile`, `cachedQuota`. - * - Clear in-flight pending authorizations. - * - Clear runtime diagnostic flags. - */ - async logout(): Promise { - this.cachedQuota = null; - this.cachedProfile = null; - this.lastRefreshFailedMessage = null; - this.lastRejectionMessage = null; - this.quotaFetchFailedMessage = null; - this.lastStorageFailedMessage = null; - this.pending.clear(); - this.authorizing = false; - let legacyDeleteFailed = false; - try { - await fs.unlink(this.legacyTokenFilePath); - } catch (err) { - // ENOENT is fine; anything else is suspicious but not fatal. - const code = (err as NodeJS.ErrnoException).code; - if (code !== 'ENOENT') { - legacyDeleteFailed = true; - } - } - try { - await deleteSharedOAuthTokens(this.credentialStore, 'claude-subscription'); - } catch { - return { ok: false, reason: 'storage_failed', message: '删除共享凭据失败，请手动清理。' }; - } - if (legacyDeleteFailed) return { ok: false, reason: 'storage_failed', message: '删除本地遗留凭据失败，请手动清理。' }; - return { ok: true }; - } - - /** - * Get an access token (refreshing if needed). Caller is - * responsible for keeping the returned token inside the main - * process — never IPC it out (G-X3). - * - * Used by the future subscription send-path (PR-OAUTH-SUBSCRIPTION-1). - */ - async getAccessTokenInternal(): Promise { - this.refreshing = true; - try { - const result = await resolveAndPersistOAuthSubscriptionTokens({ - providerType: 'claude-subscription', - slug: 'claude-subscription', - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - }); - if (result.outcome === 'current') return result.tokens.access_token; - const action = this.applyRefreshOutcome(result); - return action.ok && (result.outcome === 'refreshed' || result.outcome === 'superseded') - ? result.tokens.access_token - : null; - } finally { - this.refreshing = false; - } - } - - /** - * Whether a persisted OAuth token exists locally, WITHOUT - * triggering `getAccessTokenInternal()`'s near-expiry refresh. - * - * Read-only status paths (onboarding's `getSnapshot`) must be able - * to answer "is this connection credentialed?" without the side - * effect of a network refresh — refreshing on every onboarding read - * would let simply opening the app hit the network and mutate local - * token state, and would misreport an otherwise-valid login as - * missing credentials if that incidental refresh happened to fail. - */ - async hasStoredCredential(): Promise { - const tokens = await this.loadTokens(); - return tokens !== null; - } - - // ----------------------------------------------------------- - // INTERNALS - // ----------------------------------------------------------- - - private applyRefreshOutcome(result: OAuthSubscriptionRefreshAndPersistOutcome): SubscriptionActionResult { - if (result.outcome === 'refreshed' || result.outcome === 'superseded') { - this.lastRefreshFailedMessage = null; - this.lastStorageFailedMessage = null; - return { ok: true }; - } - if (result.outcome === 'storage-failed') { - const message = '访问 Claude OAuth 共享凭据失败，请检查 credentials.json 权限后重试。'; - this.lastRefreshFailedMessage = null; - this.lastStorageFailedMessage = message; - return { ok: false, reason: 'storage_failed', message }; - } - this.lastStorageFailedMessage = null; - const message = result.outcome === 'logged-out' - ? '登录状态已变更，本次刷新结果已丢弃。' - : result.error instanceof Error ? result.error.message : '刷新失败，请重新登录。'; - this.lastRefreshFailedMessage = message; - return { ok: false, reason: 'refresh_failed', message }; - } - - private deriveRuntimeState( - tokens: PersistedTokens, - ): import('@maka/core').OAuthSubscriptionRuntimeState { - if (this.refreshing) return 'refreshing'; - if (this.lastRefreshFailedMessage) return 'refresh_failed'; - if (this.lastStorageFailedMessage) return 'storage_failed'; - if (this.lastRejectionMessage) return 'provider_rejected'; - if (this.quotaFetchFailedMessage) return 'quota_unavailable'; - if (tokens.expires_at - this.now() <= TOKEN_REFRESH_SKEW_MS) return 'authenticated'; - return 'authenticated'; - } - - private errorForState( - state: import('@maka/core').OAuthSubscriptionRuntimeState, - ): string | undefined { - switch (state) { - case 'refresh_failed': - return this.lastRefreshFailedMessage ?? undefined; - case 'storage_failed': - return this.lastStorageFailedMessage ?? undefined; - case 'provider_rejected': - return this.lastRejectionMessage ?? undefined; - case 'quota_unavailable': - return this.quotaFetchFailedMessage ?? undefined; - default: - return undefined; - } - } - - private pruneExpiredPending(): void { - const cutoff = this.now() - PENDING_AUTHORIZATION_TTL_MS; - for (const [id, p] of this.pending) { - if (p.createdAt < cutoff) this.pending.delete(id); - } - } - - private async exchangeCodeForTokens(code: string, verifier: string, state: string): Promise { - const response = await this.fetchFn(CLAUDE_TOKEN_ENDPOINT, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'User-Agent': OAUTH_USER_AGENT, - }, - body: JSON.stringify({ - code, - state, - grant_type: 'authorization_code', - client_id: CLAUDE_CLIENT_ID, - redirect_uri: CLAUDE_REDIRECT_URI, - code_verifier: verifier, - }), - }); - if (!response.ok) { - // Read the body (best-effort, never throw) so the user can - // see Anthropic's actual reject reason — `invalid_grant: code - // already used`, `expired_token`, etc. Without this Maka has - // been falling back to a generic "授权码已过期、已使用或与本次 - // 登录不匹配" message that hides whether the failure is on - // Anthropic's side, the user's side, or our request shape. - const raw = await response.text().catch(() => ''); - const compact = raw.replace(/\s+/g, ' ').slice(0, 280); - throw new ClaudeTokenExchangeError(response.status, compact || undefined); - } - const payload = (await response.json()) as { - access_token: string; - refresh_token: string; - expires_in: number; - token_type: string; - scope: string; - account?: { uuid?: string }; - }; - return { - access_token: payload.access_token, - refresh_token: payload.refresh_token, - expires_at: this.now() + 1000 * payload.expires_in, - token_type: payload.token_type, - scope: payload.scope, - account_uuid: payload.account?.uuid ?? '', - }; - } - - private async saveTokens(tokens: PersistedTokens): Promise { - try { - await saveSharedOAuthTokens(this.credentialStore, 'claude-subscription', tokens); - } catch (err) { - // Fail closed: a token we cannot persist for every surface is a - // storage failure, not a partial success. - this.lastStorageFailedMessage = '写入 Claude OAuth 共享凭据失败，请检查 credentials.json 权限后重试。'; - throw err; - } - this.lastStorageFailedMessage = null; - } - - /** - * Always reads the shared store — no in-memory copy. Pure-Node - * surfaces refresh and rewrite the same entry, so caching here could - * hold a rotated-out refresh token. - */ - private async loadTokens(): Promise { - let result: Awaited>; - try { - result = await loadSharedOAuthTokens(this.credentialStore, 'claude-subscription'); - } catch { - this.lastStorageFailedMessage = '读取 Claude OAuth 共享凭据失败，请检查 credentials.json 或重新登录。'; - return null; - } - if (result.status === 'corrupt') { - // Entry exists but is not a token payload; it is kept as-is - // (reads never destroy secrets) and a fresh login overwrites it. - this.lastStorageFailedMessage = 'Claude OAuth 共享凭据无法解析，请重新登录。'; - return null; - } - if (result.status === 'missing') return null; - this.lastStorageFailedMessage = null; - const tokens = result.tokens; - return { - access_token: tokens.access_token, - refresh_token: tokens.refresh_token, - expires_at: tokens.expires_at, - token_type: tokens.token_type ?? 'Bearer', - scope: tokens.scope ?? '', - account_uuid: tokens.account_uuid ?? '', - }; - } - - private async refreshProfile(): Promise { - const accessToken = await this.getAccessTokenInternal(); - if (!accessToken) return; - try { - const response = await this.fetchFn(CLAUDE_PROFILE_ENDPOINT, { - headers: { - Authorization: `Bearer ${accessToken}`, - 'User-Agent': OAUTH_USER_AGENT, - }, - }); - if (!response.ok) return; - const data = (await response.json()) as { - account?: { uuid?: string; email?: string; email_address?: string; display_name?: string }; - }; - if (data.account) { - this.cachedProfile = { - accountUuid: data.account.uuid ?? ((await this.loadTokens())?.account_uuid ?? ''), - email: data.account.email ?? data.account.email_address, - displayName: data.account.display_name, - }; - } - } catch { - // non-fatal - } - } - - private failureFromError( - fallbackReason: SubscriptionActionFailureReason, - err: unknown, - fallbackMessage = '操作失败。', - ): SubscriptionActionResult { - if (err instanceof ClaudeTokenExchangeError) { - if (err.status === 429) { - return { ok: false, reason: fallbackReason, message: 'Claude OAuth 请求过于频繁，请稍后重新登录。' }; - } - if (err.status >= 500) { - return { ok: false, reason: fallbackReason, message: 'Claude OAuth 服务暂时不可用，请稍后重新登录。' }; - } - // 4xx: append Anthropic's actual reject reason when we have it - // so the user sees `invalid_grant` / `expired_token` / etc. - // and can tell whether the code was already used vs the - // request shape is still wrong. - const detail = err.body ? ` Anthropic 返回 ${err.status}: ${err.body}` : ''; - return { ok: false, reason: fallbackReason, message: `${fallbackMessage}${detail}` }; - } - const message = err instanceof Error ? err.message : '操作失败。'; - return { ok: false, reason: fallbackReason, message }; - } - - /** - * Quota cache is fresh if fetched within QUOTA_CACHE_TTL_MS. - */ - isQuotaCacheFresh(): boolean { - if (!this.cachedQuota) return false; - return this.now() - this.cachedQuota.fetchedAt < QUOTA_CACHE_TTL_MS; - } - - /** - * Read or create the persistent device ID. 32 hex chars, - * mode 0o600. Exposed so the future subscription send-path can - * include it in the cloaked metadata block. - */ - async getOrCreateDeviceId(): Promise { - try { - const existing = (await fs.readFile(this.deviceIdFilePath, 'utf8')).trim(); - if (/^[a-f0-9]{64}$/.test(existing)) return existing; - } catch { - // fall through to create - } - const next = randomBytes(32).toString('hex'); - try { - await fs.mkdir(dirname(this.deviceIdFilePath), { recursive: true }); - await fs.writeFile(this.deviceIdFilePath, next, { mode: 0o600 }); - await fs.chmod(this.deviceIdFilePath, 0o600); - } catch { - // best-effort persistence; in-memory only if disk failed - } - return next; - } -} - -/** - * Resolve whether the cloak path is enabled. Used by the future - * subscription send-path to decide whether to delegate to the runtime - * cloaked request builder. Centralized here so the contract test - * has a single anchor. - */ -export function isCloakEnabled(): boolean { - return process.env.MAKA_CLAUDE_SUBSCRIPTION_CLOAK !== '0'; -} - -function looksLikeClaudePkceVerifier(value: string): boolean { - return /^[A-Za-z0-9_-]{43,128}$/.test(value); -} - -/** - * Whether Claude subscription is enabled at all in this build. - * - * kenji `1da909d5` blocking concern: Anthropic's legal docs - * (https://code.claude.com/docs/en/legal-and-compliance) say - * third-party developers should use API key auth and do NOT - * permit third-party developers to offer Claude.ai login or - * route Free/Pro/Max credentials on behalf of users. - * - * WAWQAQ msg `fd421634` on 2026-05-29 explicitly accepted the - * ToS risk and asked why the OAuth card was missing from - * Settings · 账号. The kill-switch now defaults to ON; setting - * `MAKA_CLAUDE_SUBSCRIPTION_EXPERIMENTAL=0` explicitly disables - * it for users who need to opt out (e.g. corp deployments with - * tighter compliance requirements). - * - * The cloak flag (`isCloakEnabled`) is a separate, finer-grained - * switch inside the subscription send path. It defaults ON because - * the visible Claude OAuth card promises a usable model after login; - * `MAKA_CLAUDE_SUBSCRIPTION_CLOAK=0` remains as an emergency opt-out. - */ -// Re-exported from claude-subscription-helpers.ts so unit tests can import -// the gate without dragging in the `electron` ESM module. diff --git a/apps/desktop/src/main/oauth/cursor-subscription-retirement.ts b/apps/desktop/src/main/oauth/cursor-subscription-retirement.ts deleted file mode 100644 index d8ae9adce7..0000000000 --- a/apps/desktop/src/main/oauth/cursor-subscription-retirement.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { unlink } from 'node:fs/promises'; -import { join } from 'node:path'; -import type { CredentialStore } from '@maka/storage'; - -const CURSOR_SUBSCRIPTION_SLUG = 'cursor-subscription'; -const LEGACY_CURSOR_TOKEN_FILE = '.cursor_subscription_token'; - -interface CursorSubscriptionRetirementDeps { - userDataDir: string; - credentialStore: Pick; -} - -/** - * Remove the legacy file and OAuth entry owned by the retired Cursor - * subscription surface. - * - * This deliberately never reads or migrates either source. Both removals are - * attempted independently so a failure in one store cannot strand the other, - * and rerunning the cleanup is safe after a partial or completed attempt. - */ -export async function retireCursorSubscriptionCredentials( - deps: CursorSubscriptionRetirementDeps, -): Promise { - const legacyTokenPath = join(deps.userDataDir, LEGACY_CURSOR_TOKEN_FILE); - const results = await Promise.allSettled([ - unlinkIfPresent(legacyTokenPath), - deps.credentialStore.deleteSecret(CURSOR_SUBSCRIPTION_SLUG, 'oauth_token'), - ]); - const failures = results.flatMap((result) => - result.status === 'rejected' ? [result.reason] : [], - ); - if (failures.length > 0) { - throw new AggregateError(failures, 'Cursor subscription credential retirement failed'); - } -} - -async function unlinkIfPresent(path: string): Promise { - try { - await unlink(path); - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'ENOENT') return; - throw error; - } -} diff --git a/apps/desktop/src/main/oauth/openai-codex-service.ts b/apps/desktop/src/main/oauth/openai-codex-service.ts deleted file mode 100644 index 1d9ed504ca..0000000000 --- a/apps/desktop/src/main/oauth/openai-codex-service.ts +++ /dev/null @@ -1,587 +0,0 @@ -/** - * OpenAI Codex subscription OAuth service (main-process only). - * - * Authorization uses the ChatGPT device-code flow (`deviceauth/*` on - * auth.openai.com/api/accounts) — the same flow the official Codex CLI - * uses (codex-rs login/src/device_code_auth.rs). There is no local - * loopback listener and no fixed callback port, so the whole class of - * localhost/IPv6/port-collision/state-hang failures is gone: - * - `getAuthorizationUrl` requests a one-time `user_code`. - * - The user opens `auth.openai.com/codex/device` in their browser - * and enters the code (the renderer shows it via `stateHint`). - * - `openAuthorizationUrl` starts polling; `completeAuthorization` - * exchanges the resulting authorization code for tokens. - * - * The device-auth protocol itself (usercode / poll / exchange / boundary - * validation) is owned by `@maka/runtime`'s codex-oauth-enrollment — the - * single protocol authority for both desktop and runtime-host. This - * service owns only the product lifecycle: authRequestId + pending state, - * browser opening, account-state snapshots, and shared-credential - * persistence (#1125). - * - * Hard gates (shared with the Claude / xAI services): - * - Renderer NEVER sees access_token / refresh_token / id_token. - * IPC payloads are `CodexAccountStateSnapshot`-shaped only. - * - Refresh failure does NOT auto-logout — user must click 重新登录. - * - The device-auth URL is fixed (server-owned); the renderer only - * receives an opaque `authRequestId` plus the `user_code` as - * `stateHint`. - */ - -import { randomUUID } from 'node:crypto'; -import { promises as fs } from 'node:fs'; -import { join } from 'node:path'; -import { - type AuthorizationUrlPayload, - type SubscriptionActionFailureReason, - type SubscriptionActionResult, -} from '@maka/core'; -import { - exchangeCodexDeviceAuthorizationCode, - extractCodexAccountClaims, - isOAuthEnrollmentProviderEnabled, - OAuthDeviceAuthorizationExpiredError, - OAuthTokenEndpointError, - pollCodexDeviceAuthorization, - proxiedFetch, - refreshAndPersistOAuthSubscriptionTokens, - refreshOAuthSubscriptionTokens, - resolveAndPersistOAuthSubscriptionTokens, - startCodexDeviceAuthorization, - type CodexDeviceAuthorization, - type CodexDeviceAuthorizationGrant, - type OAuthSubscriptionRefreshAndPersistOutcome, - type OAuthSubscriptionTokens, -} from '@maka/runtime'; -import { - deleteSharedOAuthTokens, - loadSharedOAuthTokens, - saveSharedOAuthTokens, - type SharedOAuthCredentialStore, -} from './shared-credential-bridge.js'; - -// ============================================================= -// Persisted tokens — the runtime `OAuthSubscriptionTokens` shape is the -// single token authority; this module decorates it with `account_id`. -// Never crosses IPC. -// ============================================================= - -interface PendingAuthorization { - /** Server-issued device authorization (user code, verify URL, window). */ - authorization: CodexDeviceAuthorization; - controller: AbortController; - /** - * Promise that resolves with the authorization-code exchange inputs - * once the device-auth poll succeeds, or rejects on timeout / - * shutdown. Started by `openAuthorizationUrl`, awaited by - * `completeAuthorization`. - */ - pollPromise?: Promise; -} - -// ============================================================= -// Service class. -// ============================================================= - -export interface OpenAiCodexServiceDeps { - /** Absolute path to userData dir; e.g. app.getPath('userData'). */ - userDataDir: string; - /** Opens the provider verification page in the system browser. */ - openExternal: (url: string) => Promise; - /** Function returning current epoch ms. Injectable for tests. */ - now?: () => number; - /** Fetch implementation. Defaults to Maka's active-proxy-aware fetch. */ - fetchFn?: typeof fetch; - /** Abortable sleep used while polling; injectable for tests. */ - sleep?: (delayMs: number, signal: AbortSignal) => Promise; - /** Shared workspace credential store — the authoritative token store for every surface (#1125). */ - credentialStore: SharedOAuthCredentialStore; -} - -export class OpenAiCodexService { - /** Pre-#1125 safeStorage-encrypted token file. Never written or read - * anymore; unlinked on logout in case the startup import could not - * run, so logout still means "no credential survives anywhere". */ - private readonly legacyTokenFilePath: string; - private readonly openExternal: (url: string) => Promise; - private readonly now: () => number; - private readonly fetchFn: typeof fetch; - private readonly sleep: (delayMs: number, signal: AbortSignal) => Promise; - private readonly credentialStore: SharedOAuthCredentialStore; - - private pending: Map = new Map(); - - private lastRefreshFailedMessage: string | null = null; - private lastStorageFailedMessage: string | null = null; - private authorizing = false; - private refreshing = false; - - constructor(deps: OpenAiCodexServiceDeps) { - this.legacyTokenFilePath = join(deps.userDataDir, '.codex_subscription_token'); - this.openExternal = deps.openExternal; - this.now = deps.now ?? (() => Date.now()); - this.fetchFn = deps.fetchFn ?? (proxiedFetch as unknown as typeof fetch); - this.sleep = deps.sleep ?? abortableSleep; - this.credentialStore = deps.credentialStore; - } - - // ----------------------------------------------------------- - // PUBLIC API - // ----------------------------------------------------------- - - /** - * Start the ChatGPT device-code flow: request a one-time user code. - * The returned `authRequestId` scopes the eventual openAuthUrl / - * completeAuthorization / cancelAuthorization calls; `stateHint` - * carries the `user_code` the user must enter at - * auth.openai.com/codex/device. - */ - async getAuthorizationUrl(): Promise { - this.pruneExpiredPending(); - const controller = new AbortController(); - let authorization: CodexDeviceAuthorization; - try { - authorization = await startCodexDeviceAuthorization({ - fetchFn: this.fetchFn, - signal: controller.signal, - now: this.now, - }); - } catch (err) { - if (err instanceof OAuthTokenEndpointError) { - return { - ok: false, - reason: 'token_exchange_failed', - message: `Codex 设备授权启动失败（HTTP ${err.status ?? '未知'}）。`, - }; - } - return this.failureFromError('unknown', err); - } - - const authRequestId = randomUUID(); - this.pending.set(authRequestId, { authorization, controller }); - return { authRequestId, stateHint: authorization.userCode }; - } - - /** - * Open the verification page and start polling `deviceauth/token`. - * The user enters the one-time code shown as `stateHint`; the poll - * resolves once the browser approval completes. - */ - async openAuthorizationUrl(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - return { ok: false, reason: 'authorization_pending', message: '授权会话不存在，请重新点击“登录 Codex”。' }; - } - if (pending.authorization.expiresAt <= this.now()) { - this.disposePending(authRequestId); - return { ok: false, reason: 'authorization_expired', message: '授权请求已过期，请重新点击“登录 Codex”。' }; - } - try { - await this.openExternal(pending.authorization.verificationUrl); - if (this.pending.get(authRequestId) !== pending || pending.controller.signal.aborted) { - return { ok: false, reason: 'authorization_cancelled', message: 'Codex 授权已取消。' }; - } - this.authorizing = true; - pending.pollPromise ??= this.pollForTokens(pending); - void pending.pollPromise.catch(() => undefined); - return { ok: true }; - } catch (err) { - return this.failureFromError('unknown', err); - } - } - - /** - * Await the device-auth poll, then exchange the authorization code - * for tokens. The renderer shows the one-time code; there is nothing - * to paste back. - */ - async completeAuthorization(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending?.pollPromise) { - this.authorizing = false; - return { ok: false, reason: 'authorization_pending', message: '请先点击“登录 Codex”再完成授权。' }; - } - try { - const grant = await pending.pollPromise; - // The poll has already consumed the one-time device authorization - // code: the exchange + persistence must complete even if the user - // cancelled while the poll was in flight, otherwise the code is - // burned and the login is lost. Use an independent signal. - const tokens = await this.exchangeGrantForTokens(grant, new AbortController().signal); - // Storage failures are not exchange failures: the authorization - // code was consumed successfully, so tell the user to fix the - // store instead of implying the code was bad. - try { - await this.saveTokens(tokens); - } catch { - this.disposePending(authRequestId); - this.authorizing = false; - return { ok: false, reason: 'storage_failed', message: this.lastStorageFailedMessage ?? '写入共享凭据失败，请检查 credentials.json 权限后重试。' }; - } - this.disposePending(authRequestId); - this.authorizing = false; - return { ok: true }; - } catch (err) { - this.disposePending(authRequestId); - this.authorizing = false; - if (err instanceof CodexAuthorizationCancelledError) { - return { ok: false, reason: 'authorization_cancelled', message: 'Codex 授权已取消。' }; - } - if (err instanceof OAuthDeviceAuthorizationExpiredError) { - return { ok: false, reason: 'authorization_expired', message: 'Codex 授权已过期，请重新登录。' }; - } - return this.failureFromError('token_exchange_failed', err); - } - } - - /** - * Cancel a pending authorization (user closed the modal or - * pressed Cancel). Aborts the device-auth poll. - */ - cancelAuthorization(authRequestId?: string): void { - if (authRequestId !== undefined) { - this.disposePending(authRequestId); - } else { - for (const id of [...this.pending.keys()]) this.disposePending(id); - } - this.authorizing = false; - } - - /** - * Snapshot of the current account state for the renderer. - * No token-shaped fields exposed. - */ - async getAccountState(): Promise { - const tokens = await this.loadTokens(); - if (!tokens) { - if (this.lastStorageFailedMessage) { - return { - provider: 'openai-codex', - runtimeState: 'storage_failed', - errorMessage: this.lastStorageFailedMessage, - }; - } - return { - provider: 'openai-codex', - runtimeState: this.authorizing ? 'authorizing' : 'not_logged_in', - }; - } - // Claims are always derived from the CURRENT tokens rather than - // cached: another surface may have re-logged in with a different - // account since this process last saw a login or refresh. - const claims = extractCodexAccountClaims(tokens.access_token, tokens.id_token); - const runtimeState = this.deriveRuntimeState(); - return { - provider: 'openai-codex', - runtimeState, - accountId: tokens.account_id || claims?.accountId, - email: claims?.email, - plan: claims?.plan, - picture: claims?.picture, - errorMessage: this.errorForState(runtimeState), - }; - } - - /** - * Force a token refresh. Refresh failure does NOT auto-delete - * the token file — the user sees `refresh_failed` and must - * click 重新登录. - */ - async refreshTokens(): Promise { - this.refreshing = true; - try { - const result = await refreshAndPersistOAuthSubscriptionTokens({ - slug: 'codex-subscription', - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - refreshTokens: (tokens, signal) => this.requestTokenRefresh(tokens, signal), - }); - return this.applyRefreshOutcome(result); - } finally { - this.refreshing = false; - } - } - - /** - * Logout: clear in-memory state, delete the shared-store token (the - * authority) and any legacy safeStorage token file the startup - * import could not process. Local clear only; no remote revocation - * (auth.openai.com does not publicly expose an RFC 7009 endpoint we - * can rely on). - */ - async logout(): Promise { - this.lastRefreshFailedMessage = null; - this.lastStorageFailedMessage = null; - this.cancelAuthorization(); - let legacyDeleteFailed = false; - try { - await fs.unlink(this.legacyTokenFilePath); - } catch (err) { - const code = (err as NodeJS.ErrnoException).code; - if (code !== 'ENOENT') { - legacyDeleteFailed = true; - } - } - try { - await deleteSharedOAuthTokens(this.credentialStore, 'codex-subscription'); - } catch { - return { ok: false, reason: 'storage_failed', message: '删除共享凭据失败，请手动清理。' }; - } - if (legacyDeleteFailed) return { ok: false, reason: 'storage_failed', message: '删除本地遗留凭据失败，请手动清理。' }; - return { ok: true }; - } - - /** - * Get an access token (refreshing if needed). Caller is - * responsible for keeping the returned token inside the main - * process — never IPC it out. - */ - async getAccessTokenInternal(options: { forceRefresh?: boolean } = {}): Promise { - if (options.forceRefresh) { - const refreshed = await this.refreshTokens(); - if (!refreshed.ok) return null; - const next = await this.loadTokens(); - return next?.access_token ?? null; - } - this.refreshing = true; - try { - const result = await resolveAndPersistOAuthSubscriptionTokens({ - slug: 'codex-subscription', - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - refreshTokens: (tokens, signal) => this.requestTokenRefresh(tokens, signal), - }); - if (result.outcome === 'current') return result.tokens.access_token; - const action = this.applyRefreshOutcome(result); - return action.ok && (result.outcome === 'refreshed' || result.outcome === 'superseded') - ? result.tokens.access_token - : null; - } finally { - this.refreshing = false; - } - } - - /** - * Whether a persisted OAuth token exists locally, WITHOUT - * triggering `getAccessTokenInternal()`'s near-expiry refresh. See - * `ClaudeSubscriptionService.hasStoredCredential()` for the - * rationale — read-only status paths (onboarding) must not refresh - * or mutate token state just by being observed. - */ - async hasStoredCredential(): Promise { - const tokens = await this.loadTokens(); - return tokens !== null; - } - - // ----------------------------------------------------------- - // INTERNALS - // ----------------------------------------------------------- - - private async requestTokenRefresh( - tokens: OAuthSubscriptionTokens, - signal: AbortSignal, - ): Promise { - const next = await refreshOAuthSubscriptionTokens({ - providerType: 'openai-codex', - tokens, - now: this.now, - fetchFn: this.fetchFn, - signal, - }); - const claims = extractCodexAccountClaims(next.access_token, next.id_token); - return { ...next, account_id: claims?.accountId || tokens.account_id }; - } - - private applyRefreshOutcome(result: OAuthSubscriptionRefreshAndPersistOutcome): SubscriptionActionResult { - if (result.outcome === 'refreshed' || result.outcome === 'superseded') { - this.lastRefreshFailedMessage = null; - this.lastStorageFailedMessage = null; - return { ok: true }; - } - if (result.outcome === 'storage-failed') { - const message = '访问 Codex OAuth 共享凭据失败，请检查 credentials.json 权限后重试。'; - this.lastRefreshFailedMessage = null; - this.lastStorageFailedMessage = message; - return { ok: false, reason: 'storage_failed', message }; - } - this.lastStorageFailedMessage = null; - const message = result.outcome === 'logged-out' - ? '登录状态已变更，本次刷新结果已丢弃。' - : result.error instanceof Error ? result.error.message : '刷新失败，请重新登录。'; - this.lastRefreshFailedMessage = message; - return { ok: false, reason: 'refresh_failed', message }; - } - - private deriveRuntimeState(): CodexRuntimeState { - if (this.refreshing) return 'refreshing'; - if (this.lastRefreshFailedMessage) return 'refresh_failed'; - if (this.lastStorageFailedMessage) return 'storage_failed'; - return 'authenticated'; - } - - private errorForState(state: CodexRuntimeState): string | undefined { - if (state === 'refresh_failed') return this.lastRefreshFailedMessage ?? undefined; - if (state === 'storage_failed') return this.lastStorageFailedMessage ?? undefined; - return undefined; - } - - private pruneExpiredPending(): void { - for (const [id, pending] of this.pending) { - if (pending.authorization.expiresAt <= this.now()) { - pending.controller.abort(); - this.pending.delete(id); - } - } - } - - private disposePending(authRequestId: string): void { - const pending = this.pending.get(authRequestId); - if (!pending) return; - pending.controller.abort(); - this.pending.delete(authRequestId); - } - - /** - * Poll `deviceauth/token` through the runtime enrollment. Caller - * cancellation aborts the poll between requests; the poll stops with - * `OAuthDeviceAuthorizationExpiredError` once the window elapses. - */ - private async pollForTokens(pending: PendingAuthorization): Promise { - try { - return await pollCodexDeviceAuthorization({ - authorization: pending.authorization, - fetchFn: this.fetchFn, - signal: pending.controller.signal, - now: this.now, - sleep: this.sleep, - }); - } catch (err) { - if (pending.controller.signal.aborted) throw new CodexAuthorizationCancelledError(); - throw err; - } - } - - /** - * Exchange the device-auth authorization code at the token endpoint - * through the runtime enrollment (strict response validation), then - * decorate with the ChatGPT account id for backend routing. - */ - private async exchangeGrantForTokens( - grant: CodexDeviceAuthorizationGrant, - signal: AbortSignal, - ): Promise { - const tokens = await exchangeCodexDeviceAuthorizationCode({ - grant, - fetchFn: this.fetchFn, - signal, - now: this.now, - }); - const claims = extractCodexAccountClaims(tokens.access_token, tokens.id_token); - return { ...tokens, account_id: claims?.accountId || tokens.account_id || '' }; - } - - private async saveTokens(tokens: OAuthSubscriptionTokens): Promise { - try { - await saveSharedOAuthTokens(this.credentialStore, 'codex-subscription', tokens); - } catch (err) { - // Fail closed: a token we cannot persist for every surface is a - // storage failure, not a partial success. - this.lastStorageFailedMessage = '写入 Codex OAuth 共享凭据失败，请检查 credentials.json 权限后重试。'; - throw err; - } - this.lastStorageFailedMessage = null; - } - - /** - * Always reads the shared store — no in-memory copy. Pure-Node - * surfaces refresh and rewrite the same entry, so caching here could - * hold a rotated-out refresh token. - */ - private async loadTokens(): Promise { - let result: Awaited>; - try { - result = await loadSharedOAuthTokens(this.credentialStore, 'codex-subscription'); - } catch { - this.lastStorageFailedMessage = '读取 Codex OAuth 共享凭据失败，请检查 credentials.json 或重新登录。'; - return null; - } - if (result.status === 'corrupt') { - // Entry exists but is not a token payload; it is kept as-is - // (reads never destroy secrets) and a fresh login overwrites it. - this.lastStorageFailedMessage = 'Codex OAuth 共享凭据无法解析，请重新登录。'; - return null; - } - if (result.status === 'missing') return null; - this.lastStorageFailedMessage = null; - return result.tokens; - } - - private failureFromError( - fallbackReason: SubscriptionActionFailureReason, - err: unknown, - ): SubscriptionActionResult { - const message = err instanceof Error ? err.message : '操作失败。'; - return { ok: false, reason: fallbackReason, message }; - } -} - -// ============================================================= -// Public IPC payload shape — `openai-codex:get-account-state`. -// -// Mirrors the Claude service's SubscriptionAccountState shape so -// the renderer can reuse a single presentation helper, but uses -// the OpenAI-specific provider tag and JWT claim fields. The -// renderer NEVER sees raw tokens; this is the entire surface. -// ============================================================= -export type CodexRuntimeState = - | 'not_logged_in' - | 'authorizing' - | 'authenticated' - | 'refreshing' - | 'storage_failed' - | 'refresh_failed'; - -export interface CodexAccountStateSnapshot { - provider: 'openai-codex'; - runtimeState: CodexRuntimeState; - accountId?: string; - email?: string; - plan?: string; - picture?: string; - errorMessage?: string; -} - -// ============================================================= -// Re-exports for the IPC handler + focused protocol tests. -// ============================================================= -/** - * Whether the Codex subscription card is enabled at all in this build. - * Same opt-out shape as the Claude service, driven by the runtime - * enrollment gate. - */ -export function isOpenAiCodexExperimentalEnabled(): boolean { - return isOAuthEnrollmentProviderEnabled('openai-codex'); -} - -class CodexAuthorizationCancelledError extends Error {} - -function abortableSleep(delayMs: number, signal: AbortSignal): Promise { - return new Promise((resolve, reject) => { - const timer = setTimeout(() => { - signal.removeEventListener('abort', onAbort); - resolve(); - }, delayMs); - const onAbort = () => { - clearTimeout(timer); - reject(signal.reason ?? new Error('Aborted')); - }; - if (signal.aborted) { - clearTimeout(timer); - reject(signal.reason ?? new Error('Aborted')); - return; - } - signal.addEventListener('abort', onAbort, { once: true }); - }); -} diff --git a/apps/desktop/src/main/oauth/shared-credential-bridge.ts b/apps/desktop/src/main/oauth/shared-credential-bridge.ts deleted file mode 100644 index 3594dfce55..0000000000 --- a/apps/desktop/src/main/oauth/shared-credential-bridge.ts +++ /dev/null @@ -1,42 +0,0 @@ -/** OAuth token persistence through the shared CredentialStore authority. */ -import { - parseOAuthSubscriptionTokens, - serializeOAuthSubscriptionTokens, - type OAuthSubscriptionTokens, -} from '@maka/runtime'; -import type { CredentialStore } from '@maka/storage'; - -export type SharedOAuthCredentialStore = Pick< - CredentialStore, - 'getSecret' | 'setSecret' | 'deleteSecret' | 'compareAndSetSecret' ->; - -export type SharedOAuthTokensReadResult = - | { status: 'ok'; tokens: OAuthSubscriptionTokens } - | { status: 'missing' } - | { status: 'corrupt' }; - -export async function saveSharedOAuthTokens( - store: Pick, - slug: string, - tokens: OAuthSubscriptionTokens, -): Promise { - await store.setSecret(slug, 'oauth_token', serializeOAuthSubscriptionTokens(tokens)); -} - -export async function loadSharedOAuthTokens( - store: SharedOAuthCredentialStore, - slug: string, -): Promise { - const raw = await store.getSecret(slug, 'oauth_token'); - if (raw === null) return { status: 'missing' }; - const tokens = parseOAuthSubscriptionTokens(raw); - return tokens ? { status: 'ok', tokens } : { status: 'corrupt' }; -} - -export async function deleteSharedOAuthTokens( - store: Pick, - slug: string, -): Promise { - await store.deleteSecret(slug, 'oauth_token'); -} diff --git a/apps/desktop/src/main/oauth/xai-oauth-service.ts b/apps/desktop/src/main/oauth/xai-oauth-service.ts deleted file mode 100644 index 4d1adb1a3e..0000000000 --- a/apps/desktop/src/main/oauth/xai-oauth-service.ts +++ /dev/null @@ -1,449 +0,0 @@ -import { randomBytes, randomUUID } from 'node:crypto'; -import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http'; - -import { - PENDING_AUTHORIZATION_TTL_MS, - PKCE_VERIFIER_LENGTH_BYTES, - base64urlEncode, - constantTimeStringEqual, - type AuthorizationUrlPayload, - type SubscriptionActionResult, -} from '@maka/core'; -import { - OAUTH_LOGIN_PROVIDER_CONFIG, - OAuthTokenEndpointError, - buildOAuthLoginAuthorization, - exchangeOAuthAuthorizationCode, - proxiedFetch, - refreshAndPersistOAuthSubscriptionTokens, - resolveAndPersistOAuthSubscriptionTokens, - type OAuthSubscriptionRefreshAndPersistOutcome, - type OAuthSubscriptionTokens, -} from '@maka/runtime'; -import { - deleteSharedOAuthTokens, - loadSharedOAuthTokens, - saveSharedOAuthTokens, - type SharedOAuthCredentialStore, -} from './shared-credential-bridge.js'; - -const XAI_CONNECTION_SLUG = 'xai-oauth'; -const XAI_REDIRECT_URI = OAUTH_LOGIN_PROVIDER_CONFIG['xai-oauth'].redirectUri; -const XAI_CALLBACK_HOST = '127.0.0.1'; -const XAI_CALLBACK_PORT = 56121; -const XAI_CALLBACK_PATH = '/callback'; -const XAI_REFRESH_SKEW_MS = 60 * 60 * 1_000; -const XAI_MIN_REFRESH_SKEW_MS = 5 * 60 * 1_000; - -interface PendingAuthorization { - verifier: string; - state: string; - url: string; - createdAt: number; - controller: AbortController; - codePromise: Promise<{ code: string; state: string }>; - rejectCode: (error: Error) => void; - server: Server; -} - -export interface XaiOAuthServiceDeps { - credentialStore: SharedOAuthCredentialStore; - openExternal: (url: string) => Promise; - now?: () => number; - fetchFn?: typeof fetch; -} - -export interface XaiOAuthAccountStateSnapshot { - provider: 'xai-oauth'; - runtimeState: - | 'not_logged_in' - | 'authorizing' - | 'authenticated' - | 'refreshing' - | 'refresh_failed' - | 'storage_failed'; - errorMessage?: string; -} - -export class XaiOAuthService { - private readonly credentialStore: SharedOAuthCredentialStore; - private readonly openExternal: (url: string) => Promise; - private readonly now: () => number; - private readonly fetchFn: typeof fetch; - private readonly pending = new Map(); - private authorizing = false; - private refreshing = false; - private lastRefreshError: string | null = null; - private lastStorageError: string | null = null; - - constructor(deps: XaiOAuthServiceDeps) { - this.credentialStore = deps.credentialStore; - this.openExternal = deps.openExternal; - this.now = deps.now ?? (() => Date.now()); - this.fetchFn = deps.fetchFn ?? (proxiedFetch as unknown as typeof fetch); - } - - async getAuthorizationUrl(): Promise { - this.pruneExpiredPending(); - const verifier = base64urlEncode(randomBytes(PKCE_VERIFIER_LENGTH_BYTES)); - const state = base64urlEncode(randomBytes(32)); - const authRequestId = randomUUID(); - const authorization = buildOAuthLoginAuthorization({ - provider: 'xai-oauth', - verifier, - state, - redirectUri: XAI_REDIRECT_URI, - }); - - let resolveCode!: (value: { code: string; state: string }) => void; - let rejectCode!: (error: Error) => void; - const codePromise = new Promise<{ code: string; state: string }>((resolve, reject) => { - resolveCode = resolve; - rejectCode = reject; - }); - void codePromise.catch(() => undefined); - - let server: Server; - try { - server = await this.startCallbackServer(state, resolveCode, rejectCode); - } catch (error) { - const message = error instanceof Error - ? error.message - : `xAI OAuth 回调端口 ${XAI_CALLBACK_PORT} 启动失败。`; - return { ok: false, reason: 'unknown', message }; - } - - this.pending.set(authRequestId, { - verifier, - state, - url: authorization.authorizationUrl, - createdAt: this.now(), - controller: new AbortController(), - codePromise, - rejectCode, - server, - }); - return { authRequestId, stateHint: state.slice(0, 8) }; - } - - async openAuthorizationUrl(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - return { ok: false, reason: 'authorization_pending', message: 'xAI 授权会话不存在，请重新登录。' }; - } - if (this.isExpired(pending)) { - this.disposePending(authRequestId); - return { ok: false, reason: 'authorization_expired', message: 'xAI 授权请求已过期，请重新登录。' }; - } - try { - await this.openExternal(pending.url); - if (this.pending.get(authRequestId) !== pending || pending.controller.signal.aborted) { - return { ok: false, reason: 'authorization_cancelled', message: 'xAI 授权已取消。' }; - } - this.authorizing = true; - return { ok: true }; - } catch { - return { ok: false, reason: 'unknown', message: '无法打开 xAI 登录页面，请重试。' }; - } - } - - async completeAuthorization(authRequestId: string): Promise { - const pending = this.pending.get(authRequestId); - if (!pending) { - return { ok: false, reason: 'authorization_pending', message: '请先打开 xAI 登录页面完成授权。' }; - } - if (this.isExpired(pending)) { - this.disposePending(authRequestId); - return { ok: false, reason: 'authorization_expired', message: 'xAI 授权请求已过期，请重新登录。' }; - } - try { - const { code, state } = await pending.codePromise; - if (!constantTimeStringEqual(state, pending.state)) { - return { ok: false, reason: 'invalid_paste_code', message: 'xAI OAuth state 校验失败，请重新登录。' }; - } - const tokens = await exchangeOAuthAuthorizationCode({ - provider: 'xai-oauth', - code, - verifier: pending.verifier, - state: pending.state, - redirectUri: XAI_REDIRECT_URI, - signal: pending.controller.signal, - fetchFn: this.fetchFn, - now: this.now, - }); - try { - await saveSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG, tokens); - this.lastStorageError = null; - } catch { - this.lastStorageError = '写入 xAI OAuth 共享凭据失败。'; - return { ok: false, reason: 'storage_failed', message: this.lastStorageError }; - } - this.lastRefreshError = null; - return { ok: true }; - } catch (error) { - if (pending.controller.signal.aborted) { - return { ok: false, reason: 'authorization_cancelled', message: 'xAI 授权已取消。' }; - } - if (error instanceof XaiAuthorizationDeniedError) { - return { ok: false, reason: 'authorization_denied', message: 'xAI 授权被拒绝，请重新登录并允许访问。' }; - } - if (error instanceof XaiAuthorizationCancelledError) { - return { ok: false, reason: 'authorization_cancelled', message: 'xAI 授权已取消。' }; - } - if (error instanceof OAuthTokenEndpointError && error.category === 'aborted') { - return { ok: false, reason: 'authorization_cancelled', message: 'xAI 授权已取消。' }; - } - return { ok: false, reason: 'token_exchange_failed', message: 'xAI 授权未完成，请检查账号权限或网络后重试。' }; - } finally { - this.disposePending(authRequestId); - this.authorizing = false; - } - } - - cancelAuthorization(authRequestId?: string): void { - if (authRequestId !== undefined) this.disposePending(authRequestId); - else for (const id of [...this.pending.keys()]) this.disposePending(id); - this.authorizing = false; - } - - async getAccountState(): Promise { - let loaded: Awaited>; - try { - loaded = await loadSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG); - this.lastStorageError = loaded.status === 'corrupt' ? 'xAI OAuth 本地凭据格式无效。' : null; - } catch { - this.lastStorageError = 'xAI OAuth 本地凭据读取失败。'; - loaded = { status: 'missing' }; - } - if (this.lastStorageError) { - return { provider: 'xai-oauth', runtimeState: 'storage_failed', errorMessage: this.lastStorageError }; - } - if (loaded.status !== 'ok') { - return { provider: 'xai-oauth', runtimeState: this.authorizing ? 'authorizing' : 'not_logged_in' }; - } - if (this.refreshing) return { provider: 'xai-oauth', runtimeState: 'refreshing' }; - if (this.lastRefreshError) { - return { provider: 'xai-oauth', runtimeState: 'refresh_failed', errorMessage: this.lastRefreshError }; - } - return { provider: 'xai-oauth', runtimeState: 'authenticated' }; - } - - async refreshTokens(): Promise { - this.refreshing = true; - try { - const result = await refreshAndPersistOAuthSubscriptionTokens({ - providerType: 'xai-oauth', - slug: XAI_CONNECTION_SLUG, - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - }); - return this.applyRefreshOutcome(result); - } finally { - this.refreshing = false; - } - } - - async getAccessTokenInternal(options: { forceRefresh?: boolean } = {}): Promise { - if (options.forceRefresh) { - const refreshed = await this.refreshTokens(); - if (!refreshed.ok) return null; - const loaded = await loadSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG); - return loaded.status === 'ok' ? loaded.tokens.access_token : null; - } - this.refreshing = true; - try { - let refreshSkewMs = XAI_MIN_REFRESH_SKEW_MS; - try { - const loaded = await loadSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG); - if (loaded.status === 'ok') { - refreshSkewMs = Math.min( - XAI_REFRESH_SKEW_MS, - Math.max( - XAI_MIN_REFRESH_SKEW_MS, - Math.floor((loaded.tokens.expires_at - this.now()) / 6), - ), - ); - } - } catch { - // The authoritative resolver below maps the same read failure to storage-failed. - } - const result = await resolveAndPersistOAuthSubscriptionTokens({ - providerType: 'xai-oauth', - slug: XAI_CONNECTION_SLUG, - credentialStore: this.credentialStore, - now: this.now, - fetchFn: this.fetchFn, - refreshSkewMs, - }); - if (result.outcome === 'current') return result.tokens.access_token; - const action = this.applyRefreshOutcome(result); - return action.ok && (result.outcome === 'refreshed' || result.outcome === 'superseded') - ? result.tokens.access_token - : null; - } finally { - this.refreshing = false; - } - } - - async hasStoredCredential(): Promise { - try { - return (await loadSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG)).status === 'ok'; - } catch { - return false; - } - } - - async logout(): Promise { - this.cancelAuthorization(); - this.lastRefreshError = null; - this.lastStorageError = null; - try { - await deleteSharedOAuthTokens(this.credentialStore, XAI_CONNECTION_SLUG); - return { ok: true }; - } catch { - return { ok: false, reason: 'storage_failed', message: '删除 xAI OAuth 共享凭据失败。' }; - } - } - - private applyRefreshOutcome(result: OAuthSubscriptionRefreshAndPersistOutcome): SubscriptionActionResult { - switch (result.outcome) { - case 'refreshed': - case 'superseded': - this.lastRefreshError = null; - this.lastStorageError = null; - return { ok: true }; - case 'logged-out': - this.lastRefreshError = 'xAI OAuth 未登录。'; - return { ok: false, reason: 'refresh_failed', message: this.lastRefreshError }; - case 'refresh-failed': { - const detail = result.error instanceof Error ? result.error.message : ''; - this.lastRefreshError = /\(403\)/.test(detail) - ? '当前 SuperGrok 订阅等级无权访问 xAI API；重新登录无法解决，请升级订阅或改用 API key。' - : 'xAI OAuth 凭据刷新失败，请重新登录。'; - return { ok: false, reason: 'refresh_failed', message: this.lastRefreshError }; - } - case 'storage-failed': - this.lastStorageError = 'xAI OAuth 本地凭据读写失败。'; - return { ok: false, reason: 'storage_failed', message: this.lastStorageError }; - } - } - - private async startCallbackServer( - expectedState: string, - resolveCode: (value: { code: string; state: string }) => void, - rejectCode: (error: Error) => void, - ): Promise { - // The port is fixed, and the previous login's server releases it - // asynchronously (disposePending cannot await inside a finally). A - // fresh login racing that close sees EADDRINUSE for a few milliseconds, - // so retry briefly instead of failing the whole flow (#2197). - let lastError: unknown; - for (let attempt = 0; attempt < 10; attempt += 1) { - try { - return await this.listenOnce(expectedState, resolveCode, rejectCode); - } catch (error) { - lastError = error; - if ((error as NodeJS.ErrnoException).code !== 'EADDRINUSE') throw error; - await new Promise((resolveDelay) => setTimeout(resolveDelay, 50)); - } - } - throw lastError; - } - - private async listenOnce( - expectedState: string, - resolveCode: (value: { code: string; state: string }) => void, - rejectCode: (error: Error) => void, - ): Promise { - return await new Promise((resolve, reject) => { - const server = createServer((request, response) => - this.handleCallback(request, response, expectedState, resolveCode, rejectCode), - ); - server.setTimeout(10_000, (socket) => socket.destroy()); - server.once('error', reject); - server.listen(XAI_CALLBACK_PORT, XAI_CALLBACK_HOST, () => { - server.removeListener('error', reject); - server.on('error', rejectCode); - resolve(server); - }); - }); - } - - private handleCallback( - request: IncomingMessage, - response: ServerResponse, - expectedState: string, - resolveCode: (value: { code: string; state: string }) => void, - rejectCode: (error: Error) => void, - ): void { - // One callback is this server's whole life; a kept-alive socket only - // outlives it into disposePending's closeAllConnections, and that - // destroy is an RST a pooled client can trip over on its next request - // to the same port (#2197: the next login's fetch died on it). Close - // the connection with the response instead. - response.setHeader('Connection', 'close'); - let url: URL; - try { - url = new URL(request.url ?? '', XAI_REDIRECT_URI); - } catch { - response.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - response.end('Invalid callback URL.'); - return; - } - if (url.pathname !== XAI_CALLBACK_PATH) { - response.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' }); - response.end('Not found.'); - return; - } - const state = url.searchParams.get('state'); - if (!state || !constantTimeStringEqual(state, expectedState)) { - response.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - response.end('State mismatch.'); - return; - } - const error = url.searchParams.get('error'); - if (error) { - response.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' }); - response.end(callbackHtml(false)); - rejectCode(new XaiAuthorizationDeniedError()); - return; - } - const code = url.searchParams.get('code'); - if (!code) { - response.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' }); - response.end('Missing authorization code.'); - return; - } - response.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }); - response.end(callbackHtml(true)); - resolveCode({ code, state }); - } - - private disposePending(authRequestId: string): void { - const pending = this.pending.get(authRequestId); - if (!pending) return; - this.pending.delete(authRequestId); - pending.controller.abort(); - pending.server.closeAllConnections?.(); - pending.server.close(); - pending.rejectCode(new XaiAuthorizationCancelledError()); - } - - private pruneExpiredPending(): void { - for (const [id, pending] of this.pending) { - if (this.isExpired(pending)) this.disposePending(id); - } - } - - private isExpired(pending: PendingAuthorization): boolean { - return this.now() - pending.createdAt > PENDING_AUTHORIZATION_TTL_MS; - } -} - -class XaiAuthorizationDeniedError extends Error {} -class XaiAuthorizationCancelledError extends Error {} - -function callbackHtml(success: boolean): string { - return `${success ? '登录成功' : '登录失败'}

${success ? '登录成功' : '登录失败'}

${success ? 'xAI Grok 授权已完成，可以关闭此标签页并回到 Maka。' : 'xAI Grok 授权未完成，请关闭此标签页并在 Maka 重试。'}

`; -} diff --git a/apps/desktop/src/main/openai-codex-e2e-fixture.ts b/apps/desktop/src/main/openai-codex-e2e-fixture.ts deleted file mode 100644 index 6838e77b18..0000000000 --- a/apps/desktop/src/main/openai-codex-e2e-fixture.ts +++ /dev/null @@ -1,79 +0,0 @@ -import type { OpenAiCodexService } from './oauth/openai-codex-service.js'; - -/** - * Deterministic device-code OAuth service for the `oauth-relogin` Electron E2E. - * - * This seam is selected only through the dev-only MAKA_E2E_FIXTURE gate in - * main.ts. It drives the production preload, IPC handlers, shared renderer - * login hook, connection store, and connection event bus without opening a - * browser or contacting OpenAI. - */ -export function createOpenAiCodexE2eFixtureService(): OpenAiCodexService { - const authRequestId = 'e2e-codex-auth-request'; - let runtimeState: 'not_logged_in' | 'authorizing' | 'authenticated' = 'not_logged_in'; - - const service = { - async getAuthorizationUrl() { - return { authRequestId, stateHint: 'e2e-state' }; - }, - async openAuthorizationUrl(requestId: string) { - if (requestId !== authRequestId) { - return { - ok: false as const, - reason: 'authorization_pending' as const, - message: 'E2E authorization session does not exist.', - }; - } - runtimeState = 'authorizing'; - return { ok: true as const }; - }, - async completeAuthorization(requestId: string) { - if (requestId !== authRequestId || runtimeState !== 'authorizing') { - return { - ok: false as const, - reason: 'authorization_pending' as const, - message: 'E2E authorization is not pending.', - }; - } - runtimeState = 'authenticated'; - return { ok: true as const }; - }, - cancelAuthorization(requestId?: string) { - if (!requestId || requestId === authRequestId) runtimeState = 'not_logged_in'; - }, - async getAccountState() { - return runtimeState === 'authenticated' - ? { - provider: 'openai-codex' as const, - runtimeState, - accountId: 'e2e-openai-account', - email: 'oauth-refresh@maka.test', - } - : { provider: 'openai-codex' as const, runtimeState }; - }, - async refreshTokens() { - return runtimeState === 'authenticated' - ? { ok: true as const } - : { - ok: false as const, - reason: 'refresh_failed' as const, - message: 'E2E account is not authenticated.', - }; - }, - async logout() { - runtimeState = 'not_logged_in'; - return { ok: true as const }; - }, - async getAccessTokenInternal() { - return runtimeState === 'authenticated' ? 'e2e-codex-access-token' : null; - }, - async hasStoredCredential() { - return runtimeState === 'authenticated'; - }, - }; - - // OpenAiCodexService is a class with private implementation state, while - // this fixture intentionally implements only the public surface consumed by - // main. Keep the cast at this single dev-only boundary. - return service as unknown as OpenAiCodexService; -} diff --git a/apps/desktop/src/main/permissions-ipc-main.ts b/apps/desktop/src/main/permissions-ipc-main.ts deleted file mode 100644 index 6c7bd4277b..0000000000 --- a/apps/desktop/src/main/permissions-ipc-main.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { ipcMain } from 'electron'; -import { - buildHealthSnapshot, - healthSignalFromCapability, - healthSignalFromConnection, - healthSignalFromConnectionRuntime, -} from '@maka/core'; -import type { BotRegistry } from '@maka/runtime'; -import { - projectModelCallUsageLogs, - resolveUsageRange, -} from '@maka/core/model-call-usage-projection'; -import type { UsageLogRow } from '@maka/core/usage-stats/types'; -import type { - ConnectionStore, - createSqliteModelCallLedger, - SettingsStore, - TelemetryRepo, -} from '@maka/storage'; -import { buildCapabilitySnapshotCollection, buildPermissionSnapshot } from './capability-snapshot.js'; -import { openSystemPermissionPane, requestPermissionAccess } from './permissions-actions.js'; -import { permissionSnapshotE2eFixture } from './permission-snapshot-e2e-fixture.js'; - -/** - * #1361: the `settings-permissions` e2e fixture pins a typed OS-permission - * snapshot so the Permission Center's narrow-layout contract exercises rows - * that actually carry grant buttons. Returns the real host snapshot otherwise — - * see `permission-snapshot-e2e-fixture.ts`. - */ -function resolvePermissionSnapshot(now = Date.now()) { - return permissionSnapshotE2eFixture(now) ?? buildPermissionSnapshot(now); -} - -type ModelCallLedger = ReturnType; -type ComputerUseCapabilityInput = NonNullable< - Parameters[0]['computerUse'] ->; - -export interface PermissionsIpcDeps { - settingsStore: SettingsStore; - connectionStore: ConnectionStore; - telemetryRepo: TelemetryRepo; - modelCallLedger: ModelCallLedger; - ensureUsageReady: () => Promise; - botRegistry: BotRegistry; - getComputerUseCapabilityInput: () => ComputerUseCapabilityInput; -} - -export function registerPermissionsIpc(deps: PermissionsIpcDeps): void { - const { - settingsStore, - connectionStore, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - botRegistry, - getComputerUseCapabilityInput, - } = deps; - - /** - * Newest real call for a connection, across both metering sources (#1679). - * Main sends settle only into the canonical ledger now, so the frozen table - * alone would report a connection as silent while it is actively in use. - */ - const latestRuntimeProbe = ( - connectionSlug: string, - modelId?: string, - ): UsageLogRow | undefined => { - const query = { range: 'all' as const, connectionSlug, ...(modelId ? { modelId } : {}) }; - const now = Date.now(); - const legacy = telemetryRepo.latestLlmRuntimeProbe(connectionSlug, modelId); - const canonical = projectModelCallUsageLogs( - modelCallLedger.read(resolveUsageRange(query.range, now)).attempts, - query, - now, - 0, - 1, - ).rows[0]; - if (!legacy) return canonical; - if (!canonical) return legacy; - return canonical.ts >= legacy.ts ? canonical : legacy; - }; - - ipcMain.handle('permissions:getSnapshot', () => resolvePermissionSnapshot()); - ipcMain.handle('permissions:openSystemSettings', async (_event, permId: unknown) => { - return openSystemPermissionPane(permId); - }); - ipcMain.handle('permissions:requestAccess', async (_event, permId: unknown) => { - return requestPermissionAccess(permId); - }); - ipcMain.handle('capabilities:getSnapshot', async () => { - const permissions = resolvePermissionSnapshot(); - const settings = await settingsStore.get(); - return buildCapabilitySnapshotCollection({ - settings, - permissions, - botStatuses: botRegistry.allStatuses(), - computerUse: getComputerUseCapabilityInput(), - now: permissions.checkedAt, - }); - }); - ipcMain.handle('health:getSnapshot', async () => { - await ensureUsageReady(); - const now = Date.now(); - const permissions = resolvePermissionSnapshot(now); - const settings = await settingsStore.get(); - const capabilitySnapshot = buildCapabilitySnapshotCollection({ - settings, - permissions, - botStatuses: botRegistry.allStatuses(), - computerUse: getComputerUseCapabilityInput(), - now, - }); - const connections = await connectionStore.list(); - const connectionSignals = connections.flatMap((connection) => [ - healthSignalFromConnection(connection, now), - healthSignalFromConnectionRuntime( - connection, - latestRuntimeProbe(connection.slug, connection.defaultModel), - now, - ), - ].filter((signal): signal is NonNullable => Boolean(signal))); - return buildHealthSnapshot(now, [ - ...connectionSignals, - ...capabilitySnapshot.capabilities.map(healthSignalFromCapability), - ]); - }); -} diff --git a/apps/desktop/src/main/quote-companion-cleanup.ts b/apps/desktop/src/main/quote-companion-cleanup.ts index deb2560de0..4889d15d40 100644 --- a/apps/desktop/src/main/quote-companion-cleanup.ts +++ b/apps/desktop/src/main/quote-companion-cleanup.ts @@ -1,8 +1,35 @@ +import { randomUUID } from 'node:crypto'; import { acquireOperationalStateDatabase } from '@maka/storage'; +export interface SessionCopyCreationLease { + sessionId: string; + kind: 'branch' | 'revision'; + sourceSessionId: string; + sourceTurnId: string; + ownerId: string; +} + +interface PersistedSessionCopyLease { + version: 1; + sessionId: string; + trackedAt: number; + ownerProcessId?: string; + ownerId?: string; + phase: 'creating' | 'live' | 'cleanup'; + cancelRequested: boolean; + creation?: Omit; +} + interface SessionCopyCleanupStore { - list(): Promise; - track(sessionId: string): Promise; + list(): Promise; + read(sessionId: string): Promise; + beginCreation( + creation: SessionCopyCreationLease, + ownerProcessId: string, + ): Promise; + markLive(sessionId: string): Promise; + requestCleanup(sessionId: string): Promise; + markCleanup(sessionId: string): Promise; forget(sessionId: string): Promise; } @@ -14,68 +41,140 @@ export interface SessionCopyCleanupRecovery { } export interface SessionCopyCleanupAuthority { + ownCreation(creation: SessionCopyCreationLease, operation: () => Promise): Promise; cleanup(sessionId: string): Promise; schedule(sessionId: string): Promise; + abandonOwner(ownerId: string): Promise; recover(): Promise; } export function createSessionCopyCleanupAuthority(input: { workspaceRoot: string; removeSession: (sessionId: string) => Promise; + resumeSessionCopy?: ( + creation: Omit, + ) => Promise; + processId?: string; }): SessionCopyCleanupAuthority { return new SessionCopyCleanupAuthorityImpl( new SqliteSessionCopyCleanupStore(input.workspaceRoot), input.removeSession, + input.resumeSessionCopy, + input.processId ?? randomUUID(), ); } class SessionCopyCleanupAuthorityImpl implements SessionCopyCleanupAuthority { - private readonly inFlight = new Map>(); + private readonly creations = new Map< + string, + { creation: SessionCopyCreationLease; operation: Promise } + >(); + private readonly cleanups = new Map>(); constructor( private readonly store: SessionCopyCleanupStore, private readonly removeSession: ( sessionId: string, ) => Promise, + private readonly resumeSessionCopy: (( + creation: Omit, + ) => Promise) | undefined, + private readonly processId: string, ) {} - cleanup(sessionId: string): Promise { - return this.cleanupDisposition(sessionId).then(() => undefined); + ownCreation(creation: SessionCopyCreationLease, operation: () => Promise): Promise { + const normalized = normalizeCreationLease(creation); + const active = this.creations.get(normalized.sessionId); + if (active) { + if (!sameCreation(active.creation, normalized)) { + return Promise.reject(new Error('Session copy identity changed while creation was active')); + } + return active.operation as Promise; + } + const task = (async () => { + try { + await this.store.beginCreation(normalized, this.processId); + const result = await operation(); + const record = await this.store.markLive(normalized.sessionId); + if (record?.cancelRequested) void this.settleCleanup(normalized.sessionId); + return result; + } finally { + this.creations.delete(normalized.sessionId); + } + })(); + this.creations.set(normalized.sessionId, { creation: normalized, operation: task }); + return task; } - private cleanupDisposition(sessionId: string): Promise { + async cleanup(sessionId: string): Promise { const normalized = normalizeSessionId(sessionId); - const active = this.inFlight.get(normalized); - if (active) return active; - const operation = this.cleanupOnce(normalized).finally(() => { - this.inFlight.delete(normalized); - }); - this.inFlight.set(normalized, operation); - return operation; + const active = this.cleanups.get(normalized); + if (active) { + await active; + return; + } + await this.store.requestCleanup(normalized); + await this.settleCleanup(normalized); } async schedule(sessionId: string): Promise { const normalized = normalizeSessionId(sessionId); - await this.store.track(normalized); - void this.cleanup(normalized).catch(() => undefined); + if (this.cleanups.has(normalized)) return; + await this.store.requestCleanup(normalized); + void this.settleCleanup(normalized).catch(() => undefined); + } + + async abandonOwner(ownerId: string): Promise { + const normalizedOwnerId = normalizeOwnerId(ownerId); + const owned = (await this.store.list()).filter( + (record) => + record.ownerProcessId === this.processId && record.ownerId === normalizedOwnerId, + ); + await Promise.all(owned.map((record) => this.schedule(record.sessionId))); } async recover(): Promise { const removed: string[] = []; const failed: SessionCopyCleanupRecovery['failed'] = []; - for (const sessionId of await this.store.list()) { + for (const record of await this.store.list()) { + const staleOwner = + record.ownerProcessId !== undefined && record.ownerProcessId !== this.processId; + if (record.phase !== 'cleanup' && !record.cancelRequested && !staleOwner) continue; try { - const disposition = await this.cleanupDisposition(sessionId); - if (disposition === 'removed') removed.push(sessionId); + await this.store.requestCleanup(record.sessionId); + const disposition = await this.settleCleanup(record.sessionId); + if (disposition === 'removed') removed.push(record.sessionId); } catch (error) { - failed.push({ sessionId, error }); + failed.push({ sessionId: record.sessionId, error }); } } return { removed, failed }; } + private settleCleanup(sessionId: string): Promise { + const active = this.cleanups.get(sessionId); + if (active) return active; + const operation = this.cleanupOnce(sessionId).finally(() => { + this.cleanups.delete(sessionId); + }); + this.cleanups.set(sessionId, operation); + return operation; + } + private async cleanupOnce(sessionId: string): Promise { - await this.store.track(sessionId); + await this.creations.get(sessionId)?.operation.catch(() => undefined); + let record = await this.store.read(sessionId); + if (!record) return 'removed'; + if (record.phase === 'creating') { + if (!record.creation || !this.resumeSessionCopy) { + throw new Error(`Session copy ${sessionId} cannot resolve its creating lease`); + } + await this.resumeSessionCopy({ sessionId, ...record.creation }); + record = await this.store.markCleanup(sessionId); + } else if (record.phase === 'live') { + record = await this.store.markCleanup(sessionId); + } + if (!record) return 'removed'; const disposition = (await this.removeSession(sessionId)) ?? 'removed'; await this.store.forget(sessionId); return disposition; @@ -85,31 +184,97 @@ class SessionCopyCleanupAuthorityImpl implements SessionCopyCleanupAuthority { class SqliteSessionCopyCleanupStore implements SessionCopyCleanupStore { constructor(private readonly workspaceRoot: string) {} - async list(): Promise { + async list(): Promise { return this.withDatabase('read', (database) => ( database .prepare(` - SELECT session_id AS sessionId + SELECT session_id AS sessionId, tracked_at AS trackedAt, record_json AS recordJson FROM workflow_quote_companion_cleanup ORDER BY tracked_at, session_id `) - .all() as Array<{ sessionId: string }> - ).map((row) => row.sessionId), + .all() as Array<{ sessionId: string; trackedAt: number; recordJson: string }> + ).map(decodeLeaseRow), ); } - async track(sessionId: string): Promise { - this.withDatabase('write', (database) => { - database + async read(sessionId: string): Promise { + return this.withDatabase('read', (database) => { + const row = database .prepare(` - INSERT OR IGNORE INTO workflow_quote_companion_cleanup(session_id, tracked_at) - VALUES (?, ?) + SELECT session_id AS sessionId, tracked_at AS trackedAt, record_json AS recordJson + FROM workflow_quote_companion_cleanup + WHERE session_id = ? `) - .run(sessionId, Date.now()); + .get(sessionId) as + | { sessionId: string; trackedAt: number; recordJson: string } + | undefined; + return row ? decodeLeaseRow(row) : undefined; + }); + } + + async beginCreation( + creation: SessionCopyCreationLease, + ownerProcessId: string, + ): Promise { + return this.mutate(creation.sessionId, (current) => { + if ( + current?.creation && + !samePersistedCreation(current.creation, creation) + ) { + throw new Error('Session copy target is already bound to another creation'); + } + if (current?.phase === 'cleanup' || current?.cancelRequested) { + throw new Error('Session copy target is already scheduled for cleanup'); + } + return { + version: 1, + sessionId: creation.sessionId, + trackedAt: current?.trackedAt ?? Date.now(), + ownerProcessId, + ownerId: creation.ownerId, + phase: current?.phase ?? 'creating', + cancelRequested: false, + creation: { + kind: creation.kind, + sourceSessionId: creation.sourceSessionId, + sourceTurnId: creation.sourceTurnId, + }, + }; + }); + } + + async markLive(sessionId: string): Promise { + return this.mutateOptional(sessionId, (current) => + current.phase === 'creating' ? { ...current, phase: 'live' } : current, + ); + } + + async requestCleanup(sessionId: string): Promise { + return this.mutate(sessionId, (current) => { + if (!current) { + return { + version: 1, + sessionId, + trackedAt: Date.now(), + phase: 'cleanup', + cancelRequested: true, + }; + } + return current.phase === 'creating' + ? { ...current, cancelRequested: true } + : { ...current, phase: 'cleanup', cancelRequested: true }; }); } + async markCleanup(sessionId: string): Promise { + return this.mutateOptional(sessionId, (current) => ({ + ...current, + phase: 'cleanup', + cancelRequested: true, + })); + } + async forget(sessionId: string): Promise { this.withDatabase('write', (database) => { database @@ -118,6 +283,33 @@ class SqliteSessionCopyCleanupStore implements SessionCopyCleanupStore { }); } + private mutate( + sessionId: string, + update: ( + current: PersistedSessionCopyLease | undefined, + ) => PersistedSessionCopyLease, + ): PersistedSessionCopyLease { + return this.withDatabase('write', (database) => { + const current = readLease(database, sessionId); + const next = update(current); + writeLease(database, next); + return next; + }); + } + + private mutateOptional( + sessionId: string, + update: (current: PersistedSessionCopyLease) => PersistedSessionCopyLease, + ): PersistedSessionCopyLease | undefined { + return this.withDatabase('write', (database) => { + const current = readLease(database, sessionId); + if (!current) return undefined; + const next = update(current); + writeLease(database, next); + return next; + }); + } + private withDatabase( mode: 'read' | 'write', operation: (database: import('node:sqlite').DatabaseSync) => T, @@ -131,11 +323,102 @@ class SqliteSessionCopyCleanupStore implements SessionCopyCleanupStore { } } +function readLease( + database: import('node:sqlite').DatabaseSync, + sessionId: string, +): PersistedSessionCopyLease | undefined { + const row = database + .prepare(` + SELECT session_id AS sessionId, tracked_at AS trackedAt, record_json AS recordJson + FROM workflow_quote_companion_cleanup + WHERE session_id = ? + `) + .get(sessionId) as + | { sessionId: string; trackedAt: number; recordJson: string } + | undefined; + return row ? decodeLeaseRow(row) : undefined; +} + +function writeLease( + database: import('node:sqlite').DatabaseSync, + record: PersistedSessionCopyLease, +): void { + database + .prepare(` + INSERT INTO workflow_quote_companion_cleanup(session_id, tracked_at, record_json) + VALUES (?, ?, ?) + ON CONFLICT(session_id) DO UPDATE SET + tracked_at = excluded.tracked_at, + record_json = excluded.record_json + `) + .run(record.sessionId, record.trackedAt, JSON.stringify(record)); +} + +function decodeLeaseRow(row: { + sessionId: string; + trackedAt: number; + recordJson: string; +}): PersistedSessionCopyLease { + const value = JSON.parse(row.recordJson) as Partial; + if ( + value.version !== 1 || + value.sessionId !== row.sessionId || + (value.phase !== 'creating' && value.phase !== 'live' && value.phase !== 'cleanup') || + typeof value.cancelRequested !== 'boolean' + ) { + throw new Error(`Invalid Session copy lease: ${row.sessionId}`); + } + return { ...value, trackedAt: row.trackedAt } as PersistedSessionCopyLease; +} + +function normalizeCreationLease(creation: SessionCopyCreationLease): SessionCopyCreationLease { + return { + sessionId: normalizeSessionId(creation.sessionId), + kind: creation.kind, + sourceSessionId: normalizeSessionId(creation.sourceSessionId), + sourceTurnId: normalizeSessionId(creation.sourceTurnId), + ownerId: normalizeOwnerId(creation.ownerId), + }; +} + +function sameCreation( + left: SessionCopyCreationLease, + right: SessionCopyCreationLease, +): boolean { + return ( + left.sessionId === right.sessionId && + left.kind === right.kind && + left.sourceSessionId === right.sourceSessionId && + left.sourceTurnId === right.sourceTurnId && + left.ownerId === right.ownerId + ); +} + +function samePersistedCreation( + left: NonNullable, + right: SessionCopyCreationLease, +): boolean { + return ( + left.kind === right.kind && + left.sourceSessionId === right.sourceSessionId && + left.sourceTurnId === right.sourceTurnId + ); +} + function normalizeSessionId(value: unknown): string { - if (typeof value !== 'string') throw new Error('Invalid quote companion session id'); + if (typeof value !== 'string') throw new Error('Invalid Session copy id'); const normalized = value.trim(); if (!/^[A-Za-z0-9_-]{1,128}$/.test(normalized)) { - throw new Error('Invalid quote companion session id'); + throw new Error('Invalid Session copy id'); + } + return normalized; +} + +function normalizeOwnerId(value: unknown): string { + if (typeof value !== 'string') throw new Error('Invalid Session copy owner id'); + const normalized = value.trim(); + if (!/^[A-Za-z0-9:_-]{1,128}$/.test(normalized)) { + throw new Error('Invalid Session copy owner id'); } return normalized; } diff --git a/apps/desktop/src/main/runtime-host-boot.ts b/apps/desktop/src/main/runtime-host-boot.ts index 9d27f851f6..5ef788086b 100644 --- a/apps/desktop/src/main/runtime-host-boot.ts +++ b/apps/desktop/src/main/runtime-host-boot.ts @@ -1,8 +1,9 @@ -import { app, ipcMain, powerSaveBlocker, shell } from "electron"; +import { app, dialog, ipcMain, powerSaveBlocker, shell } from "electron"; import { randomUUID } from "node:crypto"; import { basename, join } from "node:path"; import { type ConnectionEvent, + type SandboxBoundaryResponse, type SessionChangedEvent, type SessionChangedReason, resolveSystemUiLocale, @@ -33,12 +34,24 @@ import { registerAttachmentPreviewIpc } from "./attachment-preview.js"; import { readFileCapped } from "./attachment-ingest.js"; import { registerBrowserIpc } from "./browser-ipc-main.js"; import { releaseBrowserSession } from "./browser/session.js"; +import { createE2eFixtureBotOnboardingAdapters } from "./bot-onboarding-e2e-fixture.js"; import { resolveBuildInfo } from "./build-info.js"; import { computerUseServiceHealth } from "./computer-use-host.js"; import { assembleDesktopNativeCapabilities } from "./desktop-native-capability-assembly.js"; +import { buildRiveWorkflowTool } from "./rive-workflow-tool.js"; import { installDesktopShellPresentation } from "./desktop-shell-presentation.js"; +import { + getE2eFixtureState, + resolveE2eFixture, + retireE2eFixtureSandboxBoundaryRequest, + seedE2eFixture, +} from "./e2e-fixture.js"; import { createKeepSystemAwakeController } from "./keep-system-awake.js"; import { createMainWindowController } from "./main-window.js"; +import { + resolveDesktopSessionSelection, + resolveNewSessionProjectInput, +} from "./new-session-project.js"; import { registerMcpIpcMain } from "./mcp-ipc-main.js"; import { createOnboardingService } from "./onboarding-service.js"; import { registerOnboardingIpc } from "./onboarding-ipc-main.js"; @@ -52,6 +65,7 @@ import { } from "./permission-overlay/permission-overlay-main.js"; import { resolveProjectContextRoot } from "./project-context-root.js"; import { createProjectManagementService } from "./project-management-service.js"; +import type { ProjectManagementService } from "./project-management-service.js"; import { createProjectRootController } from "./project-root-controller.js"; import { createSessionCopyCleanupAuthority } from "./quote-companion-cleanup.js"; import { @@ -60,6 +74,9 @@ import { } from "./runtime-host-connections-ipc-main.js"; import { registerRuntimeHostConfigIpc } from "./runtime-host-config-ipc-main.js"; import { createCapabilityRevisionPublisher } from "./runtime-host-capability-revision-publisher.js"; +import { buildClientSettingsTools } from "./client-settings-tools.js"; +import { createClientSettingsEffects } from "./client-settings-effects.js"; +import { startClientSettingsWatcher } from "./client-settings-watcher.js"; import { registerRuntimeHostGitHubCopilotIpc } from "./runtime-host-github-copilot-ipc-main.js"; import { registerRuntimeHostArtifactsIpc } from "./runtime-host-artifacts-ipc-main.js"; import { registerRuntimeHostDailyReviewIpc } from "./runtime-host-daily-review-ipc-main.js"; @@ -86,18 +103,51 @@ import { registerRuntimeHostSkillsIpc } from "./runtime-host-skills-ipc-main.js" import { hasRuntimeHostInterruptibleWork } from "./runtime-host-update-activity.js"; import { registerRuntimeHostUsageIpc } from "./runtime-host-usage-ipc-main.js"; import { registerRuntimeHostWebSearchIpc } from "./runtime-host-web-search-ipc-main.js"; +import { registerRuntimeHostWorkspaceIpc } from "./runtime-host-workspace-ipc-main.js"; import { resolveShellEnv } from "./shell-env.js"; import { registerSettingsBotsIpc, type SettingsBotsIpcHandle, } from "./settings-bots-ipc-main.js"; +import { + isComputerUseRealModelE2e, + isE2e, + isIsolatedE2e, +} from "./startup-context.js"; +import { resolveDesktopStorageRoot } from "./storage-root-startup.js"; +import { startupStep, whileAwaitingPerson } from "./startup-step.js"; import { registerWorkspaceSearchIpc } from "./workspace-search-ipc-main.js"; await resolveShellEnv(); const buildInfo = resolveBuildInfo(app.isPackaged, app.getAppPath()); const userDataDir = app.getPath("userData"); -const workspaceRoot = join(userDataDir, "workspaces", "default"); +const e2eFixture = resolveDesktopE2eFixture(); +const useBotOnboardingFixture = + e2eFixture?.scenario === "settings-bots" || + e2eFixture?.scenario === "settings-bots-onboarding"; +const workspaceRoot = join( + userDataDir, + "workspaces", + e2eFixture?.workspaceName ?? "default", +); +if (e2eFixture) { + console.log( + `[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`, + ); + await seedE2eFixture({ workspaceRoot, fixture: e2eFixture }); +} else { + const storageRoot = await startupStep( + "storage root", + resolveDesktopStorageRoot(workspaceRoot, { + confirmRepair: () => confirmDesktopStorageRootRepair(workspaceRoot), + }), + ); + if (!storageRoot) { + app.exit(0); + await new Promise(() => {}); + } +} const settingsStore = createSettingsStore(workspaceRoot); const projectCatalog = createProjectCatalog(workspaceRoot, { onLegacyImportFailure: (error) => @@ -123,20 +173,24 @@ function ensureMcpReady(): Promise { } const planReminderStore = createSqlitePlanReminderStore(workspaceRoot); const keepSystemAwake = createKeepSystemAwakeController(powerSaveBlocker); +const startHidden = + (Boolean(e2eFixture) || isIsolatedE2e) && + process.env.MAKA_E2E_SHOW_WINDOW !== "1"; let onMainWindowClose = (): void => {}; const mainWindowController = createMainWindowController({ workspaceRoot, - e2eFixture: null, + e2eFixture, settingsStore, - startHidden: false, + startHidden, onClose: () => onMainWindowClose(), }); const native = assembleDesktopNativeCapabilities({ - isComputerUseRealModelE2e: false, + isComputerUseRealModelE2e, settings: settingsStore, keepSystemAwake, mainWindow: mainWindowController, }); +const riveWorkflowTool = buildRiveWorkflowTool(); const completeComputerUseTurn = (sessionId: string): void => { native.computerUseOverlay.clearForSession(sessionId); native.computerUsePip.complete(sessionId); @@ -164,17 +218,38 @@ onMainWindowClose = () => { native.computerUseOverlay.destroyAll(); native.computerUsePip.destroyAll(); }; - const projectRoot = createProjectRootController({ lastProjectPathFile: join(workspaceRoot, "last-project-path.json"), fallbackRoots: () => [process.cwd(), app.getAppPath()], }); const attachmentApprovals = createAttachmentApprovalRegistry(); -const oauthPresentation = new RuntimeHostOAuthPresentation((url) => - shell.openExternal(url), +const oauthPresentation = new RuntimeHostOAuthPresentation( + e2eFixture?.scenario === "oauth-relogin" + ? async () => undefined + : (url) => shell.openExternal(url), ); let owner: RuntimeHostDesktopOwner | undefined; let runtimePolicyClient: DesktopRuntimeHostClient | undefined; +const projectManagement: ProjectManagementService = createProjectManagementService({ + catalog: projectCatalog, + sessions: { + listHeaders: () => runtimeHostProjectSessionCatalog().listHeaders(), + updateHeader: (sessionId, patch) => + runtimeHostProjectSessionCatalog().updateHeader(sessionId, patch), + }, + chooseDirectory: async () => { + const result = await mainWindowController.showOpenDialog({ + title: "Add project", + properties: ["openDirectory"], + }); + return result.canceled ? undefined : result.filePaths[0]; + }, + selection: projectRoot, +}); +function runtimeHostProjectSessionCatalog() { + if (!runtimePolicyClient) throw new Error("Runtime Host client is unavailable"); + return createRuntimeHostProjectSessionCatalog(runtimePolicyClient); +} const mcpCapabilityPublisher = createCapabilityRevisionPublisher(() => mcpManager.toolSnapshotRevision(), ); @@ -187,6 +262,49 @@ const botRegistry = new BotRegistry({ mainWindowController.send("settings:bots:statusChanged", status); }, }); +const clientSettingsEffects = createClientSettingsEffects({ + settingsStore, + applyKeepSystemAwake: async (enabled) => { + keepSystemAwake.apply(enabled); + }, + applyBotSettings: useBotOnboardingFixture + ? async () => undefined + : (settings) => botRegistry.applySettings(settings), + emitExternalChanged: () => + mainWindowController.send("settings:externalChanged", { ts: Date.now() }), +}); +const clientSettingsTools = buildClientSettingsTools({ + read: () => settingsStore.get(), + update: async (patch) => { + const settings = await settingsStore.update(patch); + await clientSettingsEffects.apply(settings, true); + return settings; + }, + confirm: async (changes) => { + const result = await dialog.showMessageBox({ + type: "question", + message: "Allow Maka to update this client's settings?", + detail: changes.join("\n"), + buttons: ["Apply changes", "Cancel"], + defaultId: 0, + cancelId: 1, + noLink: true, + }); + return result.response === 0; + }, +}); +const clientSettingsWatcher = startClientSettingsWatcher( + workspaceRoot, + () => { + void clientSettingsEffects.refresh(true).catch((error) => + console.error("[runtime-host] Client settings refresh failed:", error), + ); + }, + { + onError: (error) => + console.error("[runtime-host] Client settings watcher failed:", error), + }, +); const updateMockState = process.env.MAKA_UPDATE_MOCK_STATE === "available" || process.env.MAKA_UPDATE_MOCK_STATE === "downloading" || @@ -244,14 +362,19 @@ registerNotificationsIpc({ ipcMain, settingsStore, mainWindowController, - e2e: false, + e2e: isE2e, }); +const sessionCopyOwnerProcessId = randomUUID(); owner = await startRuntimeHostDesktopOwner( { rootPath: workspaceRoot, candidateEntrypoint: new URL( - import.meta.resolve("@maka/runtime-host/execution-candidate-main"), + import.meta.resolve( + isE2e + ? "@maka/runtime-host/desktop-e2e-execution-candidate-main" + : "@maka/runtime-host/execution-candidate-main", + ), ), ipcMain, workspaceRoot, @@ -263,29 +386,87 @@ owner = await startRuntimeHostDesktopOwner( releaseBrowserSession, computerUseTools: native.computerUseTools, additionalGroups: () => { - const tools = buildMcpTools(mcpManager); - return tools.length === 0 - ? [] - : [ - { - offerId: "desktop_mcp", - label: "MCP", - description: "Use MCP tools connected by this Desktop client.", - tools, - }, - ]; + const mcpTools = buildMcpTools(mcpManager); + return [ + { + offerId: "desktop_settings", + label: "Client settings", + description: + "Read or update UI and operating-system settings owned by this Desktop client.", + tools: clientSettingsTools, + }, + { + offerId: "desktop_rive", + label: "Rive", + description: + "Use durable Rive workflows through this Desktop client.", + tools: [riveWorkflowTool], + }, + ...(mcpTools.length === 0 + ? [] + : [ + { + offerId: "desktop_mcp", + label: "MCP", + description: + "Use MCP tools connected by this Desktop client.", + tools: mcpTools, + }, + ]), + ]; }, oauthPresentation, releaseComputerUseSession, }, botRegistry, resolveBotCreateTarget: async () => ({ cwd: await projectRoot.current() }), + resolveSessionCreateProject: async (input) => { + const selected = await resolveDesktopSessionSelection(input, { + ...projectManagement, + defaultProjectId: async () => + (await settingsStore.get()).projects.defaultProjectId, + }); + return resolveNewSessionProjectInput(selected, projectCatalog); + }, emitSessionsChanged, emitModeChanged: (sessionId) => emitSessionsChanged("mode-change", sessionId), completeComputerUseTurn, - createSessionCopyCleanup: ({ removeSession }) => - createSessionCopyCleanupAuthority({ workspaceRoot, removeSession }), + ...(e2eFixture + ? { + e2eInteractions: { + list: (sessionId: string) => { + const request = getE2eFixtureState(e2eFixture) + ?.sandboxBoundaryBySession?.[sessionId]; + return request ? [request] : []; + }, + respondToSandboxBoundary: async ( + sessionId: string, + response: SandboxBoundaryResponse, + ) => { + const request = getE2eFixtureState(e2eFixture) + ?.sandboxBoundaryBySession?.[sessionId]; + if (request?.requestId !== response.requestId) { + return { handled: false as const }; + } + retireE2eFixtureSandboxBoundaryRequest(response.requestId); + return { + handled: true as const, + ...(response.decision === "allow" + ? { permissionMode: "ask" as const } + : {}), + }; + }, + }, + } + : {}), + createSessionCopyCleanup: ({ removeSession, resumeSessionCopy }) => + createSessionCopyCleanupAuthority({ + workspaceRoot, + removeSession, + resumeSessionCopy, + processId: sessionCopyOwnerProcessId, + }), sendToRenderer: (channel, payload) => mainWindowController.send(channel, payload), onError: (error) => @@ -313,12 +494,8 @@ void ensureMcpReady() .then(() => mcpCapabilityPublisher.refreshIfChanged()) .catch((error) => console.error("[runtime-host] MCP startup failed:", error)); -void settingsStore - .get() - .then(async (settings) => { - await keepSystemAwake.apply(settings.system.keepSystemAwake); - await botRegistry.applySettings(settings.botChat); - }) +void clientSettingsEffects + .refresh(false) .catch((error) => console.error("[runtime-host] Client settings startup failed:", error), ); @@ -330,6 +507,13 @@ function registerHostClientIpc( scopedIpc: Pick, controls: DesktopRuntimeHostCandidateControls, ): () => Promise { + const unsubscribeConfigurationChanges = client.subscribeConfigurationChanges(() => { + emitConnectionListChanged(); + mainWindowController.send("settings:externalChanged", { ts: Date.now() }); + }); + const unsubscribeSessionCatalogChanges = client.subscribeSessionCatalogChanges( + ({ sessionId }) => emitSessionsChanged("updated", sessionId), + ); const capabilityBinding = mcpCapabilityPublisher.bind( controls.refreshClientCapabilities, ); @@ -342,7 +526,9 @@ function registerHostClientIpc( store: mcpConfigStore, manager: mcpManager, ensureReady: ensureMcpReady, - refreshIdleBackends: mcpCapabilityPublisher.refreshIfChanged, + publishCapabilities: mcpCapabilityPublisher.refreshIfChanged, + onPublicationError: (error) => + console.error("[runtime-host] MCP capability publication failed:", error), emitChanged: (statuses) => mainWindowController.send("mcp:changed", statuses), }); @@ -386,12 +572,9 @@ function registerHostClientIpc( ipcMain: scopedIpc, client, settingsStore, - botRegistry, - applyKeepSystemAwake: async (enabled) => { - await keepSystemAwake.apply(enabled); + applyClientSettings: async (settings) => { + await clientSettingsEffects.apply(settings, true); }, - emitExternalChanged: () => - mainWindowController.send("settings:externalChanged", { ts: Date.now() }), } satisfies Parameters[0]; registerRuntimeHostSettingsIpc(settingsIpcDeps); registerRuntimeHostConfigIpc({ @@ -409,10 +592,16 @@ function registerHostClientIpc( settingsStore, botRegistry, applySettingsRuntimeEffects: async (settings) => { - await botRegistry.applySettings(settings.botChat); + await clientSettingsEffects.apply(settings, true); }, productVersion: app.getVersion(), openExternal: (url) => shell.openExternal(url), + ...(useBotOnboardingFixture + ? { + botOnboardingAdapters: createE2eFixtureBotOnboardingAdapters(), + botOnboardingReadChannelStatus: () => ({ running: true }), + } + : {}), }); settingsBotsIpc = candidateSettingsBotsIpc; registerRuntimeHostPermissionsIpc({ @@ -453,6 +642,7 @@ function registerHostClientIpc( mainWindowController.send(channel, ...args), }); registerRuntimeHostWebSearchIpc({ ipcMain: scopedIpc, client }); + registerRuntimeHostWorkspaceIpc({ ipcMain: scopedIpc, client }); registerPlanReminderIpc({ ipcMain: scopedIpc, planReminders, @@ -461,18 +651,6 @@ function registerHostClientIpc( .incognitoActive, }), }); - const projectManagement = createProjectManagementService({ - catalog: projectCatalog, - sessions: createRuntimeHostProjectSessionCatalog(client), - chooseDirectory: async () => { - const result = await mainWindowController.showOpenDialog({ - title: "Add project", - properties: ["openDirectory"], - }); - return result.canceled ? undefined : result.filePaths[0]; - }, - selection: projectRoot, - }); const resolveProjectRootForContext = (sessionId: unknown): Promise => resolveProjectContextRoot(sessionId, { currentProjectRoot: () => projectRoot.current(), @@ -491,7 +669,7 @@ function registerHostClientIpc( getProjectRoot: resolveProjectRootForContext, workspaceRoot, buildInfo, - e2eFixture: null, + e2eFixture, projectManagement, updateService, }, @@ -538,6 +716,8 @@ function registerHostClientIpc( }); registerOnboardingIpc({ onboardingService, ipcMain: scopedIpc }); return async () => { + unsubscribeConfigurationChanges(); + unsubscribeSessionCatalogChanges(); candidateSettingsBotsIpc.dispose(); if (settingsBotsIpc === candidateSettingsBotsIpc) { settingsBotsIpc = undefined; @@ -615,7 +795,7 @@ function wireLifecycle(): void { resumeQuit: () => app.quit(), }); installDesktopShellPresentation({ - startHidden: false, + startHidden, mainWindowController, focusOrCreateWindow: quitCoordinator.focusOrCreateWindow, onIconError: (error) => @@ -623,6 +803,9 @@ function wireLifecycle(): void { }); app.on("second-instance", quitCoordinator.focusOrCreateWindow); app.on("activate", quitCoordinator.focusOrCreateWindow); + app.on("browser-window-focus", () => { + void updateService.checkForUpdatesOnFocus(); + }); app.on("window-all-closed", () => { native.computerUseOverlay.destroyAll(); native.computerUsePip.destroyAll(); @@ -634,6 +817,7 @@ function wireLifecycle(): void { } async function closeRuntimeHostDesktop(): Promise { + clientSettingsWatcher.stop(); planReminders.stopTimers(); updateService.dispose(); settingsBotsIpc?.dispose(); @@ -655,3 +839,52 @@ async function closeRuntimeHostDesktop(): Promise { console.error("[runtime-host] shutdown failed:", result.reason); } } + +function resolveDesktopE2eFixture(): ReturnType { + try { + return resolveE2eFixture( + process.env.MAKA_E2E_FIXTURE, + app.isPackaged, + process.env.MAKA_E2E_FIXTURE_REDUCED_MOTION, + process.env.MAKA_E2E_FIXTURE_THEME, + process.env.MAKA_E2E_FIXTURE_LOCALE, + process.env.MAKA_E2E_FIXTURE_TIMEZONE, + process.env.MAKA_E2E_FIXTURE_PLATFORM, + ); + } catch (error) { + if (!process.env.MAKA_E2E_FIXTURE) throw error; + console.error( + `[e2e-fixture] fatal: ${error instanceof Error ? error.message : String(error)}`, + ); + process.exit(1); + } +} + +async function confirmDesktopStorageRootRepair( + workspaceRoot: string, +): Promise { + console.log( + "[storage-root] root-identity conflict; parking at repair dialog", + ); + const isChinese = + resolveSystemUiLocale(app.getPreferredSystemLanguages()) === "zh"; + const { response } = await whileAwaitingPerson( + dialog.showMessageBox({ + type: "warning", + title: isChinese ? "Maka 工作区需要修复" : "Maka workspace needs repair", + message: isChinese + ? "Maka 无法验证这个工作区。" + : "Maka cannot verify this workspace.", + detail: isChinese + ? `系统中的磁盘标识可能发生了变化。仅当这是本机原来的 Maka 工作区、而不是复制出的工作区时，才选择修复。\n\n${workspaceRoot}` + : `The disk identity may have changed. Repair only if this is the original Maka workspace on this computer, not a copied workspace.\n\n${workspaceRoot}`, + buttons: isChinese + ? ["修复工作区", "退出"] + : ["Repair Workspace", "Exit"], + defaultId: 1, + cancelId: 1, + noLink: true, + }), + ); + return response === 0; +} diff --git a/apps/desktop/src/main/runtime-host-bot-session-adapter.ts b/apps/desktop/src/main/runtime-host-bot-session-adapter.ts index d52b9c7522..d3dadda03e 100644 --- a/apps/desktop/src/main/runtime-host-bot-session-adapter.ts +++ b/apps/desktop/src/main/runtime-host-bot-session-adapter.ts @@ -115,13 +115,26 @@ export function createRuntimeHostBotSessionAdapter( } const completion = collectRuntimeHostBotTurn(session.events, turnId); + void completion.catch(() => undefined); try { try { - await deps.client.startTurn({ + const started = await deps.client.startTurn({ sessionId, turnId, content: { text }, }); + if (started.kind === 'blocked') { + return { + kind: 'errored' as const, + reason: started.skillInvocation.failed + .map((failure) => + failure.reason === 'too_many_requests' + ? `Skill request limit exceeded: ${failure.requestLimit}` + : `${failure.request}: ${failure.reason}`, + ) + .join(', '), + }; + } } catch (error) { await session.close().catch(() => undefined); await completion.catch(() => undefined); diff --git a/apps/desktop/src/main/runtime-host-client.ts b/apps/desktop/src/main/runtime-host-client.ts index 00de6e2a6a..7f545ef837 100644 --- a/apps/desktop/src/main/runtime-host-client.ts +++ b/apps/desktop/src/main/runtime-host-client.ts @@ -32,6 +32,7 @@ import { RuntimeHostCatalogReadError, RuntimeHostOperationError, readRuntimeHostConnectionCatalog, + readRuntimeHostInvocableSkills, readRuntimeHostResources, readRuntimeHostSessions, readRuntimeHostSkillCatalog, @@ -63,6 +64,7 @@ import { type QueueRetractInput, type QueueRetractResult, type SessionCatalogFilter, + type SessionCatalogChangedFrame, type SessionCatalogItem, type SessionCatalogProjection, type SessionConfiguration, @@ -75,6 +77,8 @@ import { type SessionMetadataPatch, type SessionUpdateResult, type SkillCatalogLocalContext, + type SkillCatalogInvocableItem, + type SkillCatalogInvocableTarget, type SkillCatalogMutateInput, type SkillCatalogMutateResult, type SkillCatalogPageItem, @@ -178,6 +182,18 @@ export class DesktopRuntimeHostClient { return this.connection.hostEpoch; } + subscribeConfigurationChanges(listener: (revision: number) => void): () => void { + this.#assertOpen(); + return this.connection.subscribeConfigurationChanges(listener); + } + + subscribeSessionCatalogChanges( + listener: (frame: SessionCatalogChangedFrame) => void, + ): () => void { + this.#assertOpen(); + return this.connection.subscribeSessionCatalogChanges(listener); + } + async loadConnectionCatalog(): Promise { this.#assertOpen(); try { @@ -327,6 +343,21 @@ export class DesktopRuntimeHostClient { } } + async listInvocableSkills( + target: SkillCatalogInvocableTarget, + ): Promise { + this.#assertOpen(); + try { + return await readRuntimeHostInvocableSkills(this.connection, target); + } catch (error) { + if (!(error instanceof RuntimeHostCatalogReadError)) throw error; + throw new DesktopRuntimeHostClientError( + "skill_catalog_unstable", + "Invocable Skill catalog kept changing while Desktop read it", + ); + } + } + mutateSkillCatalog( input: SkillCatalogMutateInput, ): Promise { @@ -681,15 +712,20 @@ export class DesktopRuntimeHostClient { } async removeSessionCopy(sessionId: string): Promise<'removed' | 'retained'> { - const current = await this.#requireSession(sessionId); - if (current.revisionOfTurnId !== undefined) { - const result = await this.#request('session.revision.abandon', { - targetSessionId: sessionId, - }); - return result.kind === 'abandoned' ? 'removed' : 'retained'; + try { + const current = await this.#requireSession(sessionId); + if (current.revisionOfTurnId !== undefined) { + const result = await this.#request('session.revision.abandon', { + targetSessionId: sessionId, + }); + return result.kind === 'abandoned' ? 'removed' : 'retained'; + } + await this.removeSession(sessionId); + return 'removed'; + } catch (error) { + if (isMissingSessionError(error)) return 'removed'; + throw error; } - await this.removeSession(sessionId); - return 'removed'; } async copySession( @@ -1163,6 +1199,12 @@ export class DesktopRuntimeHostClient { return result.resource; } + startRuntimeResource( + input: OperationInput<"runtime.resource.start">, + ): Promise> { + return this.#request("runtime.resource.start", input); + } + acquireRuntimeResourceController( input: OperationInput<"runtime.resource.controller.acquire">, ): Promise> { @@ -1373,6 +1415,13 @@ function clientClosed(): DesktopRuntimeHostClientError { ); } +function isMissingSessionError(error: unknown): boolean { + return ( + (error instanceof DesktopRuntimeHostClientError && error.code === 'session_not_found') || + (error instanceof RuntimeHostOperationError && error.code === 'not_found') + ); +} + function revisionConflict( operation: string, sessionId: string, diff --git a/apps/desktop/src/main/runtime-host-connections-ipc-main.ts b/apps/desktop/src/main/runtime-host-connections-ipc-main.ts index 2e5345075d..c8bcf40ebf 100644 --- a/apps/desktop/src/main/runtime-host-connections-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-connections-ipc-main.ts @@ -6,6 +6,8 @@ import type { UpdateConnectionInput, } from '@maka/core'; import { + connectionEnabledModelIds, + defaultEnabledModelIdsWhenOmitted, PROVIDER_DEFAULTS, providerAuthRequiresSecret, } from '@maka/core/llm-connections'; @@ -96,7 +98,10 @@ export function registerRuntimeHostConnectionsIpc( providerType: input.providerType, ...(input.baseUrl === undefined ? {} : { baseUrl: input.baseUrl }), enabled: true, - enabledModelIds: input.defaultModel ? [input.defaultModel] : [], + enabledModelIds: connectionEnabledModelIds({ + defaultModel: input.defaultModel, + enabledModelIds: defaultEnabledModelIdsWhenOmitted(input.providerType), + }), ...(relayModelProfiles === undefined ? {} : { relayModelProfiles }), }); if (created.kind !== 'committed') { @@ -230,7 +235,7 @@ export function projectHostConnections(catalog: ConnectionCatalogSnapshot): LlmC const defaultModel = catalog.defaultTarget?.connectionId === connection.connectionId ? catalog.defaultTarget.modelId - : connection.enabledModelIds[0] ?? ''; + : ''; return { slug: connection.slug, name: connection.name, diff --git a/apps/desktop/src/main/runtime-host-desktop-candidate.ts b/apps/desktop/src/main/runtime-host-desktop-candidate.ts index 1be15ca86c..5313481e8b 100644 --- a/apps/desktop/src/main/runtime-host-desktop-candidate.ts +++ b/apps/desktop/src/main/runtime-host-desktop-candidate.ts @@ -1,5 +1,9 @@ import type { IpcMain } from "electron"; -import type { SessionChangedEvent, SessionChangedReason } from "@maka/core"; +import type { + CreateSessionRequestInput, + SessionChangedEvent, + SessionChangedReason, +} from "@maka/core"; import type { BotRegistry } from "@maka/runtime"; import { connectOrSpawnRuntimeHost, @@ -28,8 +32,12 @@ import { registerRuntimeHostSessionCatalogIpc } from "./runtime-host-session-cat import { registerRuntimeHostSessionDomainsIpc, type RuntimeHostSessionDomainsIpcDeps, + type RuntimeHostSessionDomainsIpcHandle, } from "./runtime-host-session-domains-ipc-main.js"; -import { registerRuntimeHostSessionExecutionIpc } from "./runtime-host-session-execution-ipc-main.js"; +import { + registerRuntimeHostSessionExecutionIpc, + type RuntimeHostSessionExecutionIpcDeps, +} from "./runtime-host-session-execution-ipc-main.js"; import { RuntimeHostSessionObserver } from "./runtime-host-session-observer.js"; type CandidateIpcMain = Pick; @@ -46,6 +54,9 @@ export interface DesktopRuntimeHostCandidateDeps { readonly cwd: string; readonly projectId?: string | null; }>; + readonly resolveSessionCreateProject: ( + input: Pick, + ) => Promise<{ readonly cwd: string; readonly projectId?: string | null }>; readonly emitSessionsChanged: ( reason: SessionChangedReason, sessionId?: string, @@ -55,12 +66,19 @@ export interface DesktopRuntimeHostCandidateDeps { readonly completeComputerUseTurn: ( sessionId: string, ) => void | Promise; + readonly e2eInteractions?: RuntimeHostSessionExecutionIpcDeps["e2eInteractions"]; readonly sendToRenderer?: RuntimeHostSessionDomainsIpcDeps["sendToRenderer"]; readonly onError?: RuntimeHostSessionDomainsIpcDeps["onError"]; readonly newId?: () => string; readonly now?: () => number; readonly createSessionCopyCleanup: (input: { removeSession: (sessionId: string) => Promise; + resumeSessionCopy: (input: { + sessionId: string; + kind: 'branch' | 'revision'; + sourceSessionId: string; + sourceTurnId: string; + }) => Promise; }) => SessionCopyCleanupAuthority; readonly registerClientIpc?: ( client: DesktopRuntimeHostClient, @@ -106,6 +124,7 @@ class DesktopRuntimeHostCandidateImpl implements DesktopRuntimeHostCandidate { readonly #ipc: ScopedIpcMain; readonly #botIncoming: BotIncomingMainService; readonly #closeNativeCapabilities: () => Promise; + readonly #closeSessionDomains: () => Promise; readonly #disposeClientIpc: (() => void | Promise) | undefined; readonly #hasRegisteredCapabilities: () => boolean; readonly #stopSession: (sessionId: string) => Promise; @@ -117,6 +136,7 @@ class DesktopRuntimeHostCandidateImpl implements DesktopRuntimeHostCandidate { ipc: ScopedIpcMain; botIncoming: BotIncomingMainService; closeNativeCapabilities: () => Promise; + closeSessionDomains: () => Promise; disposeClientIpc: (() => void | Promise) | undefined; connectionClosed: Promise; hasRegisteredCapabilities: () => boolean; @@ -128,6 +148,7 @@ class DesktopRuntimeHostCandidateImpl implements DesktopRuntimeHostCandidate { this.#ipc = input.ipc; this.#botIncoming = input.botIncoming; this.#closeNativeCapabilities = input.closeNativeCapabilities; + this.#closeSessionDomains = input.closeSessionDomains; this.#disposeClientIpc = input.disposeClientIpc; this.#hasRegisteredCapabilities = input.hasRegisteredCapabilities; this.#stopSession = input.stopSession; @@ -145,13 +166,14 @@ class DesktopRuntimeHostCandidateImpl implements DesktopRuntimeHostCandidate { } async #close(): Promise { + const domainResults = await Promise.allSettled([this.#closeSessionDomains()]); const results = await Promise.allSettled([ this.#botIncoming.close(), this.#closeNativeCapabilities(), Promise.resolve().then(() => this.#disposeClientIpc?.()), this.#closeConnection(), ]); - const failed = results.find( + const failed = [...domainResults, ...results].find( (result): result is PromiseRejectedResult => result.status === "rejected", ); if (failed) throw failed.reason; @@ -267,26 +289,18 @@ export async function createDesktopRuntimeHostCandidate( if (failed) throw failed.reason; }; let observer: RuntimeHostSessionObserver | undefined; + let closeSessionDomains: (() => Promise) | undefined; let disposeClientIpc: (() => void | Promise) | undefined; let capabilitiesRegistered = false; try { - const domains = registerRuntimeHostSessionDomainsIpc( - { - client, - emitModeChanged: deps.emitModeChanged, - ...(deps.sendToRenderer ? { sendToRenderer: deps.sendToRenderer } : {}), - ...(deps.onError ? { onError: deps.onError } : {}), - ...(deps.newId ? { newId: deps.newId } : {}), - ...(deps.now ? { now: deps.now } : {}), - }, - ipc, - ); + let domains: RuntimeHostSessionDomainsIpcHandle | undefined; const sessionObserver = new RuntimeHostSessionObserver({ client, emitSessionsChanged: (reason, sessionId, extra) => deps.emitSessionsChanged(reason, sessionId, extra), - emitSessionDomainChanged: domains.sessionDomainChanged, - emitAgentGraphChanged: domains.agentGraphChanged, + emitSessionDomainChanged: (change) => domains?.sessionDomainChanged(change), + emitRuntimeResourcePtyData: (event) => domains?.runtimeResourcePtyData(event), + emitAgentGraphChanged: (event) => domains?.agentGraphChanged(event), onWatchedTurnFinished: (sessionId, outcome) => outcome === "completed" ? deps.completeComputerUseTurn(sessionId) @@ -294,6 +308,19 @@ export async function createDesktopRuntimeHostCandidate( ...(deps.now ? { now: deps.now } : {}), }); observer = sessionObserver; + domains = registerRuntimeHostSessionDomainsIpc( + { + client, + sessionObserver, + emitModeChanged: deps.emitModeChanged, + ...(deps.sendToRenderer ? { sendToRenderer: deps.sendToRenderer } : {}), + ...(deps.onError ? { onError: deps.onError } : {}), + ...(deps.newId ? { newId: deps.newId } : {}), + ...(deps.now ? { now: deps.now } : {}), + }, + ipc, + ); + closeSessionDomains = domains.close; const watchComputerUseTurn = (sessionId: string, turnId: string): void => { void sessionObserver .watchTurn(sessionId, turnId) @@ -345,11 +372,25 @@ export async function createDesktopRuntimeHostCandidate( deps.emitSessionsChanged("deleted", sessionId); return disposition; }, + resumeSessionCopy: async ({ sessionId, kind, sourceSessionId, sourceTurnId }) => { + await client.copySession(kind, { + sourceSessionId, + targetSessionId: sessionId, + sourceTurnId, + }); + }, }); + const registeredClientIpc = deps.registerClientIpc?.(client, ipc, { + refreshClientCapabilities, + }); + disposeClientIpc = + typeof registeredClientIpc === "function" + ? registeredClientIpc + : undefined; registerRuntimeHostSessionCatalogIpc( { client, - workspaceRoot: deps.workspaceRoot, + resolveCreateProject: deps.resolveSessionCreateProject, emitSessionsChanged: deps.emitSessionsChanged, releaseSessionResources: releaseNativeSession, sessionCopyCleanup, @@ -366,17 +407,15 @@ export async function createDesktopRuntimeHostCandidate( stat: deps.stat, resizeImage: deps.resizeImage, beforeStop: deps.nativeCapabilities.releaseComputerUseSession, + sessionCopyCleanup, + onBackgroundError: (error) => deps.onError?.(error), + ...(deps.e2eInteractions + ? { e2eInteractions: deps.e2eInteractions } + : {}), ...(deps.newId ? { newId: deps.newId } : {}), }, ipc, ); - const registeredClientIpc = deps.registerClientIpc?.(client, ipc, { - refreshClientCapabilities, - }); - disposeClientIpc = - typeof registeredClientIpc === "function" - ? registeredClientIpc - : undefined; const botIncoming = createBotIncomingMainService({ botRegistry: deps.botRegistry, sessions: createRuntimeHostBotSessionAdapter({ @@ -392,6 +431,7 @@ export async function createDesktopRuntimeHostCandidate( ipc, botIncoming, closeNativeCapabilities, + closeSessionDomains: domains.close, disposeClientIpc, connectionClosed: connection.closed, hasRegisteredCapabilities: () => capabilitiesRegistered, @@ -400,6 +440,7 @@ export async function createDesktopRuntimeHostCandidate( } catch (error) { ipc.close(); await Promise.resolve(disposeClientIpc?.()).catch(() => undefined); + await closeSessionDomains?.().catch(() => undefined); await observer?.close().catch(() => undefined); await client.close().catch(() => undefined); await closeNativeCapabilities().catch(() => undefined); diff --git a/apps/desktop/src/main/runtime-host-memory-ipc-main.ts b/apps/desktop/src/main/runtime-host-memory-ipc-main.ts index c79ac448d7..fbfbcee358 100644 --- a/apps/desktop/src/main/runtime-host-memory-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-memory-ipc-main.ts @@ -19,9 +19,22 @@ import { type MemoryRevision, type MemoryStateProjection, } from "@maka/runtime-host/protocol"; -import type { LocalMemoryMutationResult } from "./local-memory-service.js"; import type { DesktopRuntimeHostClient } from "./runtime-host-client.js"; +type LocalMemoryMutationResult = + | { + readonly ok: true; + readonly state: LocalMemoryState; + readonly entry?: LocalMemoryEntryPreview; + readonly proposal?: LocalMemoryEntryPreview; + } + | { + readonly ok: false; + readonly state: LocalMemoryState; + readonly reason: string; + readonly message: string; + }; + const MAX_REVISION_ATTEMPTS = 3; const MEMORY_DIRECTORY = "memory"; const MEMORY_FILE = "MEMORY.md"; diff --git a/apps/desktop/src/main/runtime-host-oauth-ipc-main.ts b/apps/desktop/src/main/runtime-host-oauth-ipc-main.ts index 8eb898ff03..792a9b0adc 100644 --- a/apps/desktop/src/main/runtime-host-oauth-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-oauth-ipc-main.ts @@ -23,6 +23,30 @@ import type { } from './runtime-host-oauth-presentation.js'; const OAUTH_POLL_INTERVAL_MS = 250; +const SHARED_OAUTH_IPC_OPERATIONS = [ + 'get-auth-url', + 'open-auth-url', + 'complete-authorization', + 'cancel-authorization', + 'get-account-state', + 'refresh-tokens', + 'logout', +] as const; +const ANTIGRAVITY_OAUTH_IPC_OPERATIONS = [ + 'is-experimental-enabled', + ...SHARED_OAUTH_IPC_OPERATIONS, +] as const; + +export const RUNTIME_HOST_OAUTH_IPC_CHANNELS = Object.freeze([ + ...OAUTH_LOGIN_PROVIDERS.flatMap((provider) => [ + ...(provider === 'xai-oauth' ? [] : [`${provider}:is-experimental-enabled`]), + ...SHARED_OAUTH_IPC_OPERATIONS.map((operation) => `${provider}:${operation}`), + ...(provider === 'claude-subscription' ? [`${provider}:refresh-quota`] : []), + ]), + ...ANTIGRAVITY_OAUTH_IPC_OPERATIONS.map( + (operation) => `antigravity-subscription:${operation}`, + ), +]); type OAuthClient = RuntimeHostAccountConnectionClient & Pick< DesktopRuntimeHostClient, @@ -53,7 +77,9 @@ export function registerRuntimeHostOAuthIpc(deps: RuntimeHostOAuthIpcDeps): void for (const provider of OAUTH_LOGIN_PROVIDERS) { const channel = (operation: string) => `${provider}:${operation}`; - deps.ipcMain.handle(channel('is-experimental-enabled'), () => providerEnabled(provider)); + if (provider !== 'xai-oauth') { + deps.ipcMain.handle(channel('is-experimental-enabled'), () => providerEnabled(provider)); + } deps.ipcMain.handle(channel('get-auth-url'), async () => { if (!providerEnabled(provider)) return providerDisabled(); const connection = await ensureRuntimeHostAccountConnection(deps.client, { diff --git a/apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts b/apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts index dd8e2f55c0..64926acc91 100644 --- a/apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts @@ -45,7 +45,9 @@ export interface DesktopHostSessionSummary extends SessionSummary { export interface RuntimeHostSessionCatalogIpcDeps { client: RuntimeHostSessionCatalogClient; - workspaceRoot: string; + resolveCreateProject: ( + input: Pick, + ) => Promise<{ readonly cwd: string; readonly projectId?: string | null }>; emitSessionsChanged: ( reason: SessionChangedReason, sessionId?: string, @@ -88,11 +90,15 @@ export function registerRuntimeHostSessionCatalogIpc( throw new Error('Unsupported Runtime Host Session backend'); } const request = resolveCreateSessionRequest(input); + const project = await deps.resolveCreateProject({ + ...(input?.cwd === undefined ? {} : { cwd: input.cwd }), + ...(input?.projectId === undefined ? {} : { projectId: input.projectId }), + }); const session = await deps.client.createSession({ sessionId: newId(), - cwd: input?.cwd ?? deps.workspaceRoot, + cwd: project.cwd, ...(request.mode === undefined ? {} : { mode: request.mode }), - ...(input?.projectId === undefined ? {} : { projectId: input.projectId }), + ...(project.projectId === undefined ? {} : { projectId: project.projectId }), ...(request.mode === undefined ? { name: request.name } : {}), ...(request.labels === undefined ? {} : { labels: request.labels }), modelTarget: normalizeModelTarget(input), diff --git a/apps/desktop/src/main/runtime-host-session-domains-ipc-main.ts b/apps/desktop/src/main/runtime-host-session-domains-ipc-main.ts index d12998b0f3..0323f7f79d 100644 --- a/apps/desktop/src/main/runtime-host-session-domains-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-session-domains-ipc-main.ts @@ -6,14 +6,21 @@ import type { AgentGraphClientSnapshotOptions, AgentGraphOperatorInspection, GoalState, + ShellRunPtyDataEvent, } from '@maka/runtime'; import type { GoalProjection, SessionDomainChange } from '@maka/runtime-host/protocol'; import type { DesktopRuntimeHostClient } from './runtime-host-client.js'; +import type { RuntimeHostSessionObserver } from './runtime-host-session-observer.js'; import { projectHostedDeepResearch } from './deep-research-desktop-projection.js'; +import { + registerRuntimeHostShellRunsIpc, + type RuntimeHostShellRunsClient, +} from './runtime-host-shell-runs-ipc-main.js'; -type RuntimeHostSessionDomainClient = Pick< - DesktopRuntimeHostClient, - | 'clearGoal' +type RuntimeHostSessionDomainClient = RuntimeHostShellRunsClient & + Pick< + DesktopRuntimeHostClient, + | 'clearGoal' | 'controlPlan' | 'getRuntimeResource' | 'getPlanState' @@ -24,12 +31,13 @@ type RuntimeHostSessionDomainClient = Pick< | 'queryDeepResearch' | 'queryGoal' | 'startPlanTurn' - | 'stopAgentGraph' ->; + | 'stopAgentGraph' + >; export interface RuntimeHostSessionDomainsIpcDeps { client: RuntimeHostSessionDomainClient; emitModeChanged(sessionId: string): void; + sessionObserver: Pick; sendToRenderer?(channel: string, payload: unknown): void; now?: () => number; newId?: () => string; @@ -38,14 +46,15 @@ export interface RuntimeHostSessionDomainsIpcDeps { export interface RuntimeHostSessionDomainsIpcHandle { sessionDomainChanged(change: SessionDomainChange): void; + runtimeResourcePtyData(event: ShellRunPtyDataEvent): void; agentGraphChanged(event: AgentGraphClientChangedEvent): void; + close(): Promise; } /** - * Adapt Host-owned Session sidecars to the existing Desktop renderer facade. - * - * This remains an isolated M4 candidate. Production keeps registering the - * embedded handlers until M5 switches the complete ownership path at once. + * Adapt Host-owned Session sidecars to the Desktop renderer IPC contract. + * Runtime Host remains the production authority; this module only projects + * its events and operations onto the client-owned presentation boundary. */ export function registerRuntimeHostSessionDomainsIpc( deps: RuntimeHostSessionDomainsIpcDeps, @@ -53,13 +62,14 @@ export function registerRuntimeHostSessionDomainsIpc( ): RuntimeHostSessionDomainsIpcHandle { const newId = deps.newId ?? randomUUID; const now = deps.now ?? Date.now; + const shellRuns = registerRuntimeHostShellRunsIpc( + { client: deps.client, newId, sessionObserver: deps.sessionObserver }, + ipcMain, + ); ipcMain.handle('tasks:list', (_event, sessionId: unknown) => deps.client.listTasks(requiredId(sessionId, 'Session')), ); - ipcMain.handle('shell-runs:list', (_event, sessionId: unknown) => - deps.client.listRuntimeResources(requiredId(sessionId, 'Session')), - ); ipcMain.handle('deepResearch:get', async (_event, sessionId: unknown) => projectHostedDeepResearch( await deps.client.queryDeepResearch(requiredId(sessionId, 'Session')), @@ -215,9 +225,13 @@ export function registerRuntimeHostSessionDomainsIpc( break; } }, + runtimeResourcePtyData(event) { + deps.sendToRenderer?.('shell-runs:pty-data', event); + }, agentGraphChanged(event) { deps.sendToRenderer?.('graphs:changed', event); }, + close: () => shellRuns.close(), }; } diff --git a/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts b/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts index 46b4ac0f4d..fc44c06f34 100644 --- a/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts @@ -1,14 +1,16 @@ import { randomUUID } from "node:crypto"; -import type { IpcMain } from "electron"; +import type { IpcMain, IpcMainInvokeEvent } from "electron"; import { deriveTurnRecords, SIDE_CONVERSATION_SESSION_LABEL, + type ActiveInteractionRequestEvent, type AttachmentRef, + type PermissionMode, + type SandboxBoundaryResponse, type SessionChangedEvent, type SessionChangedReason, type StoredMessage, } from "@maka/core"; -import type { SkillInvocationResult } from "@maka/runtime"; import type { AttachmentApprovalRegistry } from "./attachment-approval.js"; import { resolveAttachmentRefs, @@ -23,6 +25,7 @@ import { normalizeUserQuestionResponse, } from "./permission-response-guard.js"; import type { DesktopRuntimeHostClient } from "./runtime-host-client.js"; +import type { SessionCopyCleanupAuthority } from './quote-companion-cleanup.js'; import { RuntimeHostSessionObserver, type RuntimeHostSessionObserverTarget, @@ -30,12 +33,6 @@ import { import { toDesktopHostSessionSummary } from "./runtime-host-session-catalog-ipc-main.js"; import { mergeWorkspaceFileInlineReferences } from "./session-workspace-inline-references.js"; -const EMPTY_SKILL_INVOCATION: SkillInvocationResult = { - loaded: [], - failed: [], - receipts: [], -}; - type RuntimeHostSessionExecutionClient = Pick< DesktopRuntimeHostClient, | "answerInteraction" @@ -52,6 +49,7 @@ type RuntimeHostSessionExecutionClient = Pick< | "startTurnResume" | "submitMessage" | "updateSessionMetadata" + | "updateSessionConfiguration" >; export interface RuntimeHostSessionExecutionIpcDeps { @@ -66,18 +64,46 @@ export interface RuntimeHostSessionExecutionIpcDeps { stat(path: string): Promise<{ size: number }>; resizeImage(bytes: Uint8Array): Promise; beforeStop(sessionId: string): void | Promise; + sessionCopyCleanup: SessionCopyCleanupAuthority; + onBackgroundError(error: unknown): void; + e2eInteractions?: { + list(sessionId: string): readonly ActiveInteractionRequestEvent[]; + respondToSandboxBoundary( + sessionId: string, + response: SandboxBoundaryResponse, + ): Promise< + | { readonly handled: false } + | { readonly handled: true; readonly permissionMode?: PermissionMode } + >; + }; newId?: () => string; } /** - * Register the isolated Runtime Host-backed half of the existing Desktop - * Session IPC facade. Production continues to register the embedded facade - * until M5 performs the atomic owner switch. + * Project Host-owned Session execution onto the Desktop renderer IPC contract. + * The adapter owns client validation and presentation events, never Runtime + * execution or Session persistence. */ export function registerRuntimeHostSessionExecutionIpc( deps: RuntimeHostSessionExecutionIpcDeps, ipcMain: Pick, ): (sessionId: string) => Promise { + const observedCopyOwners = new Set(); + const bindCopyOwner = (event: IpcMainInvokeEvent): string => { + const ownerId = `web-contents:${event.sender.id}`; + if (!observedCopyOwners.has(ownerId)) { + observedCopyOwners.add(ownerId); + const abandon = () => { + if (!observedCopyOwners.delete(ownerId)) return; + event.sender.removeListener('render-process-gone', abandon); + event.sender.removeListener('destroyed', abandon); + void deps.sessionCopyCleanup.abandonOwner(ownerId).catch(deps.onBackgroundError); + }; + event.sender.once('render-process-gone', abandon); + event.sender.once('destroyed', abandon); + } + return ownerId; + }; const newId = deps.newId ?? randomUUID; const stopSession = createRuntimeHostSessionStop(deps, newId); @@ -115,8 +141,10 @@ export function registerRuntimeHostSessionExecutionIpc( ); ipcMain.handle( "sessions:listActiveInteractions", - (_event, sessionId: string) => - deps.observer.readActiveInteractions(sessionId), + async (_event, sessionId: string) => [ + ...(deps.e2eInteractions?.list(sessionId) ?? []), + ...(await deps.observer.readActiveInteractions(sessionId)), + ], ); ipcMain.handle( @@ -160,7 +188,7 @@ export function registerRuntimeHostSessionExecutionIpc( displayText, workspaceFileReferences: command.workspaceFileReferences, }); - await deps.client.startTurn({ + const startInput = { sessionId, turnId, content: { @@ -178,14 +206,23 @@ export function registerRuntimeHostSessionExecutionIpc( ...(command.turnOrchestration ? { turnOrchestration: command.turnOrchestration } : {}), - }); + }; + const startResult = await deps.client.startTurn(startInput); + if (startResult.kind === "blocked") { + return { + ok: false as const, + attachments, + inlineReferences, + skillInvocation: startResult.skillInvocation, + }; + } deps.emitSessionsChanged("status-change", sessionId, { turnId }); return { ok: true as const, turnId, attachments, inlineReferences, - skillInvocation: EMPTY_SKILL_INVOCATION, + skillInvocation: startResult.skillInvocation, }; }, ); @@ -211,6 +248,19 @@ export function registerRuntimeHostSessionExecutionIpc( "sessions:respondToSandboxBoundary", async (_event, sessionId: string, input: unknown) => { const response = normalizeSandboxBoundaryResponse(input); + const fixtureResult = await deps.e2eInteractions?.respondToSandboxBoundary( + sessionId, + response, + ); + if (fixtureResult?.handled) { + if (fixtureResult.permissionMode) { + await deps.client.updateSessionConfiguration(sessionId, { + permissionMode: fixtureResult.permissionMode, + }); + deps.emitSessionsChanged("mode-change", sessionId); + } + return; + } const pending = await requireInteraction( deps.observer, sessionId, @@ -299,13 +349,26 @@ export function registerRuntimeHostSessionExecutionIpc( ipcMain.handle( "sessions:branchFromTurn", - async (_event, sessionId: string, input: unknown) => { + async (event, sessionId: string, input: unknown) => { const normalized = normalizeRuntimeHostBranchFromTurnInput(input); - let branch = await deps.client.copySession("branch", { - sourceSessionId: sessionId, - targetSessionId: normalized.copyId, - sourceTurnId: normalized.sourceTurnId, - }); + const createBranch = () => + deps.client.copySession("branch", { + sourceSessionId: sessionId, + targetSessionId: normalized.copyId, + sourceTurnId: normalized.sourceTurnId, + }); + let branch = normalized.sideConversation + ? await deps.sessionCopyCleanup.ownCreation( + { + sessionId: normalized.copyId, + kind: 'branch', + sourceSessionId: sessionId, + sourceTurnId: normalized.sourceTurnId, + ownerId: bindCopyOwner(event), + }, + createBranch, + ) + : await createBranch(); if (normalized.name || normalized.sideConversation) { branch = await deps.client.updateSessionMetadata(branch.id, { ...(normalized.name ? { name: normalized.name } : {}), diff --git a/apps/desktop/src/main/runtime-host-session-observer.ts b/apps/desktop/src/main/runtime-host-session-observer.ts index c763574b72..bcbd740027 100644 --- a/apps/desktop/src/main/runtime-host-session-observer.ts +++ b/apps/desktop/src/main/runtime-host-session-observer.ts @@ -4,7 +4,10 @@ import type { SessionEvent, StoredMessage, } from "@maka/core"; -import type { AgentGraphClientChangedEvent } from "@maka/runtime"; +import type { + AgentGraphClientChangedEvent, + ShellRunPtyDataEvent, +} from "@maka/runtime"; import { RuntimeHostSessionProjector, isRuntimeHostTerminalTurn as isTerminalTurn, @@ -41,6 +44,7 @@ export interface RuntimeHostSessionObserverDeps { extra?: { turnId?: string }, ) => void; emitSessionDomainChanged?: (change: SessionDomainChange) => void; + emitRuntimeResourcePtyData?: (event: ShellRunPtyDataEvent) => void; emitAgentGraphChanged?: (event: AgentGraphClientChangedEvent) => void; onWatchedTurnFinished?: ( sessionId: string, @@ -91,6 +95,7 @@ export class RuntimeHostSessionObserver { readonly #client: SessionObserverClient; readonly #emitSessionsChanged: RuntimeHostSessionObserverDeps["emitSessionsChanged"]; readonly #emitSessionDomainChanged: (change: SessionDomainChange) => void; + readonly #emitRuntimeResourcePtyData: (event: ShellRunPtyDataEvent) => void; readonly #emitAgentGraphChanged: ( event: AgentGraphClientChangedEvent, ) => void; @@ -106,6 +111,8 @@ export class RuntimeHostSessionObserver { this.#emitSessionsChanged = deps.emitSessionsChanged; this.#emitSessionDomainChanged = deps.emitSessionDomainChanged ?? (() => undefined); + this.#emitRuntimeResourcePtyData = + deps.emitRuntimeResourcePtyData ?? (() => undefined); this.#emitAgentGraphChanged = deps.emitAgentGraphChanged ?? (() => undefined); this.#onWatchedTurnFinished = @@ -375,6 +382,15 @@ export class RuntimeHostSessionObserver { } #acceptFrame(state: ObservedSessionState, frame: SubscriptionFrame): void { + if (frame.kind === "subscription.runtime_resource_pty_data") { + this.#emitRuntimeResourcePtyData({ + sessionId: frame.sessionId, + ref: frame.ref, + sequence: frame.ptySequence, + data: frame.data, + }); + return; + } if (frame.kind === "subscription.session_domain_changed") { this.#emitSessionDomainChanged( frame.domain === "runtime_resource" @@ -433,9 +449,6 @@ export class RuntimeHostSessionObserver { this.#emitSessionsChanged("turn-status-change", state.sessionId, { turnId: update.terminalTurn.turnId, }); - this.#emitSessionsChanged("message-appended", state.sessionId, { - turnId: update.terminalTurn.turnId, - }); } else { this.#emitSessionsChanged( "status-change", @@ -443,6 +456,12 @@ export class RuntimeHostSessionObserver { root ? { turnId: root.turnId } : undefined, ); } + const transcriptTurn = update.terminalTurn ?? update.startedTurn; + if (transcriptTurn) { + this.#emitSessionsChanged("message-appended", state.sessionId, { + turnId: transcriptTurn.turnId, + }); + } } #broadcast(sessionId: string, event: SessionEvent): void { diff --git a/apps/desktop/src/main/runtime-host-settings-ipc-main.ts b/apps/desktop/src/main/runtime-host-settings-ipc-main.ts index 3adcfcc035..dde6b9345b 100644 --- a/apps/desktop/src/main/runtime-host-settings-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-settings-ipc-main.ts @@ -16,7 +16,6 @@ import type { ProxySettings, TestProxyInput, } from "@maka/core/settings/network-settings"; -import type { BotRegistry } from "@maka/runtime"; import type { SettingsStore } from "@maka/storage"; import { buildSettingsUpdateResult, @@ -25,6 +24,16 @@ import { } from "./settings-ipc-helpers.js"; import type { DesktopRuntimeHostClient } from "./runtime-host-client.js"; +type RuntimeHostSettingsClient = Pick< + DesktopRuntimeHostClient, + | "deleteCredential" + | "queryCredential" + | "queryRuntimePolicy" + | "setCredential" + | "testNetworkProxy" + | "updateRuntimePolicy" +>; + const PROXY_CREDENTIAL: CredentialLocator = { scope: "network_proxy", kind: "password", @@ -37,11 +46,9 @@ const WEB_SEARCH_CREDENTIAL: CredentialLocator = { export interface RuntimeHostSettingsIpcDeps { readonly ipcMain: Pick; - readonly client: DesktopRuntimeHostClient; + readonly client: RuntimeHostSettingsClient; readonly settingsStore: SettingsStore; - readonly botRegistry: BotRegistry; - readonly applyKeepSystemAwake: (enabled: boolean) => Promise; - readonly emitExternalChanged: () => void; + readonly applyClientSettings: (settings: AppSettings) => Promise; } export function registerRuntimeHostSettingsIpc( @@ -115,11 +122,7 @@ export async function updateRuntimeHostSettings( const local = hasPatch(clientPatch) ? await deps.settingsStore.update(clientPatch) : await deps.settingsStore.get(); - if (clientPatch.system) { - await deps.applyKeepSystemAwake(local.system.keepSystemAwake); - } - if (clientPatch.botChat) await deps.botRegistry.applySettings(local.botChat); - deps.emitExternalChanged(); + await deps.applyClientSettings(local); return loadRuntimeHostSettings(deps); } @@ -181,6 +184,7 @@ export async function loadRuntimeHostSettings( tavily: projectWebSearchCredential(local, webSearchCredential), }, }, + subagents: policy.subagents, }; } @@ -207,7 +211,7 @@ function projectWebSearchCredential( } async function applyHostPatch( - client: DesktopRuntimeHostClient, + client: RuntimeHostSettingsClient, patch: UpdateAppSettingsInput, ): Promise { if (patch.network?.proxy) { @@ -287,12 +291,18 @@ async function applyHostPatch( else await setCredential(client, WEB_SEARCH_CREDENTIAL, apiKey); } } + if (patch.subagents) { + await client.updateRuntimePolicy(() => ({ + kind: "set_subagents", + value: patch.subagents!, + })); + } } async function mergePolicy< K extends "memory" | "workspaceInstructions" | "privacy" | "chatDefaults", >( - client: DesktopRuntimeHostClient, + client: RuntimeHostSettingsClient, key: K, patch: Partial, kind: @@ -310,7 +320,7 @@ async function mergePolicy< } async function setCredential( - client: DesktopRuntimeHostClient, + client: RuntimeHostSettingsClient, locator: CredentialLocator, secret: string, ): Promise { @@ -332,7 +342,7 @@ async function setCredential( } async function deleteCredential( - client: DesktopRuntimeHostClient, + client: RuntimeHostSettingsClient, locator: CredentialLocator, ): Promise { for (let attempt = 0; attempt < 3; attempt += 1) { @@ -381,8 +391,8 @@ function toClientOwnedPatch( ...(patch.appearance ? { appearance: patch.appearance } : {}), ...(personalization ? { personalization } : {}), ...(patch.notifications ? { notifications: patch.notifications } : {}), + ...(patch.projects ? { projects: patch.projects } : {}), ...(patch.system ? { system: patch.system } : {}), - ...(patch.subagents ? { subagents: patch.subagents } : {}), }; } diff --git a/apps/desktop/src/main/runtime-host-shell-runs-ipc-main.ts b/apps/desktop/src/main/runtime-host-shell-runs-ipc-main.ts new file mode 100644 index 0000000000..5ddfc98936 --- /dev/null +++ b/apps/desktop/src/main/runtime-host-shell-runs-ipc-main.ts @@ -0,0 +1,358 @@ +import { randomUUID } from 'node:crypto'; +import type { IpcMain } from 'electron'; +import type { ShellRunUpdate } from '@maka/core'; +import type { ShellRunPtySnapshot } from '@maka/runtime'; +import { RuntimeHostOperationError } from '@maka/runtime-host/client'; +import type { DesktopRuntimeHostClient } from './runtime-host-client.js'; +import type { RuntimeHostSessionObserverTarget } from './runtime-host-session-observer.js'; + +export type RuntimeHostShellRunsClient = Pick< + DesktopRuntimeHostClient, + | 'acquireRuntimeResourceController' + | 'controlRuntimeResource' + | 'getRuntimeResource' + | 'listRuntimeResources' + | 'releaseRuntimeResourceController' + | 'startRuntimeResource' + | 'stopRuntimeResource' +>; + +export function registerRuntimeHostShellRunsIpc( + deps: { + client: RuntimeHostShellRunsClient; + newId?: () => string; + sessionObserver: { + observe( + sessionId: string, + observerId: string, + target: RuntimeHostSessionObserverTarget, + ): Promise; + unobserve(observerId: string): Promise; + }; + }, + ipcMain: Pick, +): { close(): Promise } { + const newId = deps.newId ?? randomUUID; + const controllers = new RuntimeResourceControllers( + deps.client, + newId, + deps.sessionObserver, + ); + + ipcMain.handle('shell-runs:list', (_event, sessionId: unknown) => + deps.client.listRuntimeResources(requiredId(sessionId, 'Session')), + ); + ipcMain.handle('shell-runs:start', async (_event, sessionId: unknown) => { + const normalizedSessionId = requiredId(sessionId, 'Session'); + const started = await deps.client.startRuntimeResource({ + sessionId: normalizedSessionId, + launchId: `desktop-terminal-${newId()}`, + }); + return requiredRuntimeResource( + await deps.client.getRuntimeResource(normalizedSessionId, started.resource.ref), + ); + }); + ipcMain.handle('shell-runs:attach', (event, value: unknown) => + controllers.attach( + runtimeResourceIdentity(value, 'attach'), + event.sender as RuntimeHostSessionObserverTarget, + ), + ); + ipcMain.handle('shell-runs:detach', (_event, value: unknown) => + controllers.detach(runtimeResourceIdentity(value, 'detach')), + ); + ipcMain.handle('shell-runs:write', (_event, value: unknown) => + controllers.control(runtimeResourceControl(value)), + ); + ipcMain.handle('shell-runs:stop', async (_event, value: unknown) => { + const input = runtimeResourceIdentity(value, 'stop'); + await controllers.stop(input); + return deps.client.getRuntimeResource(input.sessionId, input.ref); + }); + + return { close: () => controllers.close() }; +} + +interface RuntimeResourceIdentity { + readonly sessionId: string; + readonly ref: string; +} + +interface RuntimeResourceControl extends RuntimeResourceIdentity { + readonly input?: string; + readonly size?: { readonly cols: number; readonly rows: number }; +} + +interface RuntimeResourceControllerState { + readonly controllerId: string; + readonly observerId: string; + nextSequence: number; +} + +class RuntimeResourceControllers { + readonly #client: RuntimeHostShellRunsClient; + readonly #newId: () => string; + readonly #sessionObserver: { + observe( + sessionId: string, + observerId: string, + target: RuntimeHostSessionObserverTarget, + ): Promise; + unobserve(observerId: string): Promise; + }; + readonly #states = new Map(); + readonly #tails = new Map>(); + + constructor( + client: RuntimeHostShellRunsClient, + newId: () => string, + sessionObserver: { + observe( + sessionId: string, + observerId: string, + target: RuntimeHostSessionObserverTarget, + ): Promise; + unobserve(observerId: string): Promise; + }, + ) { + this.#client = client; + this.#newId = newId; + this.#sessionObserver = sessionObserver; + } + + attach( + input: RuntimeResourceIdentity, + target: RuntimeHostSessionObserverTarget, + ): Promise { + return this.#run(input, async () => { + const state = this.#state(input); + await this.#sessionObserver.observe(input.sessionId, state.observerId, target); + return this.#acquire(input, state); + }); + } + + control(input: RuntimeResourceControl) { + return this.#run(input, async () => { + let state = this.#states.get(resourceIdentity(input)); + if (!state) { + state = this.#state(input); + await this.#acquire(input, state); + } + if (!state) throw new Error('Runtime Resource controller was not acquired'); + const sequence = state.nextSequence; + await this.#client.controlRuntimeResource({ + sessionId: input.sessionId, + ref: input.ref, + controllerId: state.controllerId, + sequence, + control: protocolControl(input), + }); + state.nextSequence = sequence + 1; + return this.#client.getRuntimeResource(input.sessionId, input.ref); + }); + } + + detach(input: RuntimeResourceIdentity): Promise { + return this.#run(input, async () => { + const state = this.#states.get(resourceIdentity(input)); + if (!state) return; + await this.#client.releaseRuntimeResourceController({ + ...input, + controllerId: state.controllerId, + }); + this.#states.delete(resourceIdentity(input)); + await this.#releaseObservation(state); + }); + } + + stop(input: RuntimeResourceIdentity): Promise { + return this.#run(input, async () => { + await this.#client.stopRuntimeResource(input); + const state = this.#states.get(resourceIdentity(input)); + this.#states.delete(resourceIdentity(input)); + if (state) await this.#releaseObservation(state); + }); + } + + async close(): Promise { + const states = [...this.#states.entries()]; + this.#states.clear(); + const results = await Promise.allSettled( + states.flatMap(([key, state]) => { + const [sessionId, ref] = parseResourceIdentity(key); + return [ + this.#client.releaseRuntimeResourceController({ + sessionId, + ref, + controllerId: state.controllerId, + }), + this.#releaseObservation(state), + ]; + }), + ); + const failed = results.find( + (result): result is PromiseRejectedResult => result.status === 'rejected', + ); + if (failed) throw failed.reason; + } + + async #run(input: RuntimeResourceIdentity, operation: () => Promise): Promise { + const key = resourceIdentity(input); + const previous = this.#tails.get(key) ?? Promise.resolve(); + let release!: () => void; + const current = new Promise((resolve) => { + release = resolve; + }); + const tail = previous.then(() => current); + this.#tails.set(key, tail); + await previous; + try { + return await operation(); + } finally { + release(); + if (this.#tails.get(key) === tail) this.#tails.delete(key); + } + } + + #state(input: RuntimeResourceIdentity): RuntimeResourceControllerState { + const key = resourceIdentity(input); + const existing = this.#states.get(key); + if (existing) return existing; + const controllerId = `desktop-terminal-controller-${this.#newId()}`; + const state = { + controllerId, + observerId: `${controllerId}:session-events`, + nextSequence: 1, + }; + this.#states.set(key, state); + return state; + } + + async #acquire( + input: RuntimeResourceIdentity, + state: RuntimeResourceControllerState, + ): Promise { + const key = resourceIdentity(input); + let acquired: Awaited< + ReturnType + >; + try { + acquired = await this.#client.acquireRuntimeResourceController({ + sessionId: input.sessionId, + ref: input.ref, + controllerId: state.controllerId, + }); + } catch (error) { + if (error instanceof RuntimeHostOperationError && this.#states.get(key) === state) { + this.#states.delete(key); + await this.#releaseObservation(state).catch(() => undefined); + } + throw error; + } + state.nextSequence = acquired.nextSequence; + return acquired.pty; + } + + async #releaseObservation(state: RuntimeResourceControllerState): Promise { + await this.#sessionObserver.unobserve(state.observerId); + } +} + +function protocolControl(input: RuntimeResourceControl) { + if (input.input !== undefined && input.size !== undefined) { + return { kind: 'input_and_resize' as const, input: input.input, ...input.size }; + } + if (input.input !== undefined) return { kind: 'input' as const, input: input.input }; + if (input.size !== undefined) return { kind: 'resize' as const, ...input.size }; + throw new Error('Terminal control is empty'); +} + +function runtimeResourceIdentity(value: unknown, action: string): RuntimeResourceIdentity { + if (!value || typeof value !== 'object' || Array.isArray(value)) { + throw new TypeError(`Invalid terminal ${action} input`); + } + const record = value as Record; + if (Object.keys(record).some((key) => key !== 'sessionId' && key !== 'ref')) { + throw new TypeError(`Invalid terminal ${action} input`); + } + return { + sessionId: requiredId(record.sessionId, 'Session'), + ref: requiredId(record.ref, 'terminal ref'), + }; +} + +function runtimeResourceControl(value: unknown): RuntimeResourceControl { + if (!value || typeof value !== 'object' || Array.isArray(value)) { + throw new TypeError('Invalid terminal control input'); + } + const record = value as Record; + if ( + Object.keys(record).some( + (key) => key !== 'sessionId' && key !== 'ref' && key !== 'input' && key !== 'size', + ) + ) { + throw new TypeError('Invalid terminal control input'); + } + const input = record.input; + const size = record.size; + if (input !== undefined && typeof input !== 'string') { + throw new TypeError('Invalid terminal input'); + } + let normalizedSize: { cols: number; rows: number } | undefined; + if (size !== undefined) { + if (!size || typeof size !== 'object' || Array.isArray(size)) { + throw new TypeError('Invalid terminal size'); + } + const dimensions = size as Record; + if ( + Object.keys(dimensions).some((key) => key !== 'cols' && key !== 'rows') + || !Number.isInteger(dimensions.cols) + || !Number.isInteger(dimensions.rows) + ) { + throw new TypeError('Invalid terminal size'); + } + normalizedSize = { + cols: dimensions.cols as number, + rows: dimensions.rows as number, + }; + } + if (input === undefined && normalizedSize === undefined) { + throw new TypeError('Terminal control is empty'); + } + return { + ...runtimeResourceIdentity( + { sessionId: record.sessionId, ref: record.ref }, + 'control', + ), + ...(input === undefined ? {} : { input }), + ...(normalizedSize === undefined ? {} : { size: normalizedSize }), + }; +} + +function resourceIdentity(input: RuntimeResourceIdentity): string { + return `${input.sessionId}\0${input.ref}`; +} + +function parseResourceIdentity(identity: string): [sessionId: string, ref: string] { + const separator = identity.indexOf('\0'); + if (separator < 0) throw new Error('Invalid Runtime Resource controller identity'); + return [identity.slice(0, separator), identity.slice(separator + 1)]; +} + +function requiredRuntimeResource(resource: ShellRunUpdate | null): ShellRunUpdate { + if (!resource) throw new Error('Terminal started without a Runtime Resource projection'); + return resource; +} + +function requiredId(value: unknown, name: string, maxLength = 512): string { + if ( + typeof value !== 'string' + || value.length === 0 + || value.length > maxLength + || value.trim() !== value + || /[\u0000-\u001f\u007f]/.test(value) + ) { + throw new TypeError(`Invalid ${name} id`); + } + return value; +} diff --git a/apps/desktop/src/main/runtime-host-skills-ipc-main.ts b/apps/desktop/src/main/runtime-host-skills-ipc-main.ts index d382e84975..0626a25fee 100644 --- a/apps/desktop/src/main/runtime-host-skills-ipc-main.ts +++ b/apps/desktop/src/main/runtime-host-skills-ipc-main.ts @@ -28,7 +28,7 @@ import type { DesktopRuntimeHostClient, DesktopSkillCatalogSnapshot, } from "./runtime-host-client.js"; -import { resolveSkillOpenPath } from "./skills.js"; +import { resolveSkillOpenPath } from "./skill-open-path.js"; const MAX_REVISION_ATTEMPTS = 3; @@ -75,26 +75,20 @@ export function registerRuntimeHostSkillsIpc( deps.ipcMain.handle( "skills:listInvocable", - async (_event, sessionId?: unknown) => { - const projectRoot = await resolveSkillProjectRoot( - deps, - typeof sessionId === "string" ? sessionId : undefined, + async (_event, sessionId?: unknown, newSessionContext?: unknown) => { + const target = + typeof sessionId === "string" + ? { kind: "session" as const, sessionId } + : { + kind: "new_session" as const, + context: { projectRoot: await deps.getCurrentProjectRoot() }, + collaborationMode: + normalizeNewSessionCollaborationMode(newSessionContext) ?? + "agent", + }; + return (await deps.client.listInvocableSkills(target)).map( + (item): InvocableSkillEntry => ({ ...item }), ); - const snapshot = await deps.client.loadSkillCatalog( - { projectRoot }, - "governance", - ); - return snapshot.items - .filter(isGovernanceItem) - .filter(isInvocable) - .map( - (item): InvocableSkillEntry => ({ - ref: item.ref, - id: item.id, - name: item.name, - description: item.description, - }), - ); }, ); @@ -323,9 +317,7 @@ export function registerRuntimeHostSkillsIpc( deps.workspaceRoot, idOrRef, target, - { - cwd: projectRoot, - }, + projectRoot, ); if (!resolved.ok) return resolved; const error = await deps.openPath(resolved.path); @@ -365,33 +357,18 @@ async function loadSkillPaths( ]); } -async function resolveSkillProjectRoot( - deps: RuntimeHostSkillsIpcDeps, - sessionId: string | undefined, -): Promise { - if (!sessionId) return deps.getCurrentProjectRoot(); - const session = await deps.client.getSession(sessionId); - return session?.cwd ?? deps.getCurrentProjectRoot(); -} - function isGovernanceItem( item: DesktopSkillCatalogSnapshot["items"][number], ): item is SkillCatalogGovernanceItem { return item.kind === "skill" || item.kind === "discovery_diagnostic"; } -function isInvocable(item: SkillCatalogGovernanceItem): boolean { - return ( - item.kind === "skill" && - item.enabled && - item.runtimeStatus === "enabled" && - item.validationStatus !== "metadata_error" && - item.contextStatus !== "disabled" && - item.contextStatus !== "invalid" && - item.contextStatus !== "host_incompatible" && - item.contextStatus !== "shadowed" && - item.contextStatus !== "budget" - ); +function normalizeNewSessionCollaborationMode( + input: unknown, +): "agent" | "plan" | undefined { + if (!input || typeof input !== "object" || Array.isArray(input)) return; + const value = (input as Record).collaborationMode; + return value === "agent" || value === "plan" ? value : undefined; } function resolveGovernanceItem( @@ -523,9 +500,7 @@ async function resolveProjectedPath( projectRoot: string, ref: string, ): Promise { - const resolved = await resolveSkillOpenPath(workspaceRoot, ref, "file", { - cwd: projectRoot, - }); + const resolved = await resolveSkillOpenPath(workspaceRoot, ref, "file", projectRoot); return resolved.ok ? resolved.path : ""; } diff --git a/apps/desktop/src/main/runtime-host-workspace-ipc-main.ts b/apps/desktop/src/main/runtime-host-workspace-ipc-main.ts new file mode 100644 index 0000000000..7d67006a78 --- /dev/null +++ b/apps/desktop/src/main/runtime-host-workspace-ipc-main.ts @@ -0,0 +1,106 @@ +import { stat } from 'node:fs/promises'; +import type { IpcMain } from 'electron'; +import type { GitReviewMutationAction, GitReviewSource } from '@maka/core'; +import type { DesktopRuntimeHostClient } from './runtime-host-client.js'; +import { mutateGitReview, readGitReview } from './git-review-main.js'; + +type WorkspaceClient = Pick; + +export function registerRuntimeHostWorkspaceIpc( + input: { readonly ipcMain: Pick; readonly client: WorkspaceClient }, +): void { + input.ipcMain.handle('git-review:read', async (_event, raw: unknown) => { + const request = readRequest(raw); + const cwd = await sessionWorkspace(input.client, request.sessionId); + if (!cwd) return { ok: false as const, reason: 'workspace_unavailable' as const }; + return readGitReview(cwd, request.source, undefined, request.baseBranch); + }); + + input.ipcMain.handle('git-review:mutate', async (_event, raw: unknown) => { + const request = mutateRequest(raw); + const cwd = await sessionWorkspace(input.client, request.sessionId); + if (!cwd) return { ok: false as const, reason: 'git_failed' as const }; + return mutateGitReview({ + cwd, + source: request.source, + revision: request.revision, + path: request.path, + action: request.action, + }); + }); +} + +async function sessionWorkspace(client: WorkspaceClient, sessionId: string): Promise { + const session = await client.getSession(sessionId); + if (!session) throw new Error(`No such Session: ${sessionId}`); + const workspace = await stat(session.cwd).catch(() => null); + return workspace?.isDirectory() ? session.cwd : null; +} + +function readRequest(value: unknown): { + sessionId: string; + source: GitReviewSource; + baseBranch?: string; +} { + const record = requiredRecord(value, 'Git review'); + const sessionId = requiredString(record.sessionId, 'Session id'); + if (record.source !== 'branch' && record.source !== 'unstaged' && record.source !== 'staged') { + throw new Error('Invalid Git review source'); + } + const baseBranch = record.baseBranch; + if ( + baseBranch !== undefined && + (typeof baseBranch !== 'string' || + baseBranch.length === 0 || + baseBranch.length > 1024 || + /[\u0000-\u001f\u007f]/u.test(baseBranch)) + ) { + throw new Error('Invalid Git review base branch'); + } + return { + sessionId, + source: record.source, + ...(typeof baseBranch === 'string' ? { baseBranch } : {}), + }; +} + +function mutateRequest(value: unknown): { + sessionId: string; + source: Extract; + revision: string; + path: string; + action: GitReviewMutationAction; +} { + const record = requiredRecord(value, 'Git review mutation'); + const sessionId = requiredString(record.sessionId, 'Session id'); + if (record.source !== 'unstaged' && record.source !== 'staged') { + throw new Error('Invalid Git review mutation source'); + } + if (typeof record.revision !== 'string' || !/^[a-f0-9]{64}$/u.test(record.revision)) { + throw new Error('Invalid Git review revision'); + } + const path = requiredString(record.path, 'Git review path'); + if (path.length > 4096) throw new Error('Invalid Git review path'); + if (record.action !== 'stage' && record.action !== 'unstage' && record.action !== 'revert') { + throw new Error('Invalid Git review mutation action'); + } + return { + sessionId, + source: record.source, + revision: record.revision, + path, + action: record.action, + }; +} + +function requiredRecord(value: unknown, label: string): Record { + if (!value || typeof value !== 'object' || Array.isArray(value)) { + throw new Error(`Invalid ${label} input`); + } + return value as Record; +} + +function requiredString(value: unknown, label: string): string { + if (typeof value !== 'string' || value.length === 0) throw new Error(`Invalid ${label}`); + return value; +} diff --git a/apps/desktop/src/main/session-branch.ts b/apps/desktop/src/main/session-branch.ts deleted file mode 100644 index 99871d9776..0000000000 --- a/apps/desktop/src/main/session-branch.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { BranchFromTurnInput, SessionSummary } from '@maka/core'; -import { normalizeBranchFromTurnInput } from './permission-response-guard.js'; - -export async function handleBranchFromTurn( - sessionId: string, - input: unknown, - deps: { - ensureSessionWorkspaceAvailable(id: string): Promise; - branchFromTurn(id: string, input: BranchFromTurnInput): Promise; - afterCreate?(session: SessionSummary): Promise; - emitCreated(id: string): void; - }, -): Promise { - await deps.ensureSessionWorkspaceAvailable(sessionId); - const session = await deps.branchFromTurn(sessionId, normalizeBranchFromTurnInput(input)); - await deps.afterCreate?.(session); - deps.emitCreated(session.id); - return session; -} diff --git a/apps/desktop/src/main/session-execution-ipc-main.ts b/apps/desktop/src/main/session-execution-ipc-main.ts deleted file mode 100644 index 9ed1461bb7..0000000000 --- a/apps/desktop/src/main/session-execution-ipc-main.ts +++ /dev/null @@ -1,150 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import type { IpcMain } from 'electron'; -import type { SessionEvent } from '@maka/core'; -import type { SessionManager } from '@maka/runtime'; -import { normalizeRegenerateTurnInput } from './permission-response-guard.js'; - -export interface SessionExecutionIpcDeps { - ipcMain: Pick; - runtime: Pick< - SessionManager, - | 'approvePlan' - | 'compactSession' - | 'planLatestAuthoritativeSafeBoundaryContinuation' - | 'regenerateTurn' - | 'resumePlanExecution' - | 'resumeSafeBoundaryContinuation' - | 'sendMessage' - >; - ensureSessionCanSend: (sessionId: string) => Promise; - ensureSessionWorkspaceAvailable: (sessionId: string) => Promise; - streamEvents: ( - sessionId: string, - iterator: AsyncIterable, - options: { - turnId: string; - goalBoundary: 'external' | 'none'; - }, - ) => Promise<{ turnId: string; ok: boolean; error?: string }>; - emitModeChanged: (sessionId: string) => void; - newId?: () => string; -} - -export function registerSessionExecutionIpc(deps: SessionExecutionIpcDeps): void { - const newId = deps.newId ?? randomUUID; - deps.ipcMain.handle('sessions:compact', async (_event, sessionId: string) => { - await deps.ensureSessionCanSend(sessionId); - const turnId = newId(); - void deps.streamEvents(sessionId, deps.runtime.compactSession(sessionId, { turnId }), { - turnId, - goalBoundary: 'none', - }); - }); - deps.ipcMain.handle('sessions:resumeLatest', async (_event, sessionId: string) => { - await deps.ensureSessionCanSend(sessionId); - const plan = - await deps.runtime.planLatestAuthoritativeSafeBoundaryContinuation(sessionId); - if (!plan.continuation) { - return { - disposition: 'park' as const, - rejectionReasons: plan.rejectionReasons, - diagnostics: plan.diagnostics, - }; - } - const iterator = deps.runtime.resumeSafeBoundaryContinuation(plan.continuation); - void deps.streamEvents(sessionId, iterator, { - turnId: plan.continuation.turnId, - goalBoundary: 'none', - }); - return { - disposition: 'started' as const, - runId: plan.continuation.runId, - turnId: plan.continuation.turnId, - }; - }); - deps.ipcMain.handle( - 'sessions:regenerateTurn', - async (_event, sessionId: string, input: unknown) => { - await deps.ensureSessionCanSend(sessionId); - const normalized = normalizeRegenerateTurnInput(input); - const turnId = normalized.turnId ?? newId(); - void deps.streamEvents( - sessionId, - deps.runtime.regenerateTurn(sessionId, { ...normalized, turnId }), - { - turnId, - goalBoundary: 'external', - }, - ); - }, - ); - deps.ipcMain.handle( - 'plan-mode:approve', - async (_event, sessionId: string, input: unknown) => { - if (!input || typeof input !== 'object') throw new Error('Invalid plan approval'); - const proposalId = (input as { proposalId?: unknown }).proposalId; - const expectedRevision = (input as { expectedRevision?: unknown }).expectedRevision; - const expectedStoreVersion = (input as { expectedStoreVersion?: unknown }) - .expectedStoreVersion; - if ( - typeof proposalId !== 'string' || - !proposalId || - typeof expectedRevision !== 'number' || - !Number.isSafeInteger(expectedRevision) || - (expectedStoreVersion !== undefined && - (typeof expectedStoreVersion !== 'number' || - !Number.isSafeInteger(expectedStoreVersion))) - ) { - throw new Error('Invalid plan approval'); - } - await deps.ensureSessionCanSend(sessionId); - await deps.ensureSessionWorkspaceAvailable(sessionId); - const result = await deps.runtime.approvePlan({ - sessionId, - proposalId, - expectedRevision, - ...(expectedStoreVersion !== undefined ? { expectedStoreVersion } : {}), - }); - if (result.event.type !== 'plan_approved') { - throw new Error('Plan approval did not create an execution'); - } - const turnId = newId(); - const iterator = deps.runtime.sendMessage(sessionId, { - turnId, - text: `Execute the approved plan ${result.event.execution.planId}.`, - }); - void deps.streamEvents(sessionId, iterator, { - turnId, - goalBoundary: 'external', - }); - deps.emitModeChanged(sessionId); - return { - state: result.state, - turnId, - executionId: result.event.execution.executionId, - }; - }, - ); - deps.ipcMain.handle( - 'plan-mode:resume', - async (_event, sessionId: string, executionId: unknown) => { - if (typeof executionId !== 'string' || !executionId) { - throw new Error('Invalid execution id'); - } - await deps.ensureSessionCanSend(sessionId); - await deps.ensureSessionWorkspaceAvailable(sessionId); - const result = await deps.runtime.resumePlanExecution(sessionId, executionId); - const turnId = newId(); - const iterator = deps.runtime.sendMessage(sessionId, { - turnId, - text: `Resume the approved plan execution ${executionId}.`, - }); - void deps.streamEvents(sessionId, iterator, { - turnId, - goalBoundary: 'external', - }); - deps.emitModeChanged(sessionId); - return { state: result.state, turnId, executionId }; - }, - ); -} diff --git a/apps/desktop/src/main/session-lifecycle.ts b/apps/desktop/src/main/session-lifecycle.ts deleted file mode 100644 index 3f78b0ddda..0000000000 --- a/apps/desktop/src/main/session-lifecycle.ts +++ /dev/null @@ -1,39 +0,0 @@ -export type SessionLifecycleReason = 'archived' | 'removed'; - -export const SESSION_LIFECYCLE_CODE = 'SESSION_LIFECYCLE'; - -export class SessionLifecycleError extends Error { - readonly code = SESSION_LIFECYCLE_CODE; - - constructor(readonly reason: SessionLifecycleReason) { - super(reason === 'archived' ? 'Session is archived.' : 'Session no longer exists.'); - this.name = 'SessionLifecycleError'; - } -} - -export function isSessionLifecycleError(error: unknown): error is SessionLifecycleError { - return error instanceof SessionLifecycleError - || (error !== null - && typeof error === 'object' - && (error as { code?: unknown }).code === SESSION_LIFECYCLE_CODE - && ((error as { reason?: unknown }).reason === 'archived' - || (error as { reason?: unknown }).reason === 'removed')); -} - -export function sessionLifecycleErrorFromReadFailure(error: unknown): SessionLifecycleError | undefined { - if (error !== null && typeof error === 'object' - && ((error as { code?: unknown }).code === 'ENOENT' - || (error as { message?: unknown }).message === 'ENOENT')) { - return new SessionLifecycleError('removed'); - } - return undefined; -} - -export function assertSessionCanSendFromHeader(input: { - isArchived: boolean; - status: string; -}): void { - if (input.isArchived || input.status === 'archived') { - throw new SessionLifecycleError('archived'); - } -} diff --git a/apps/desktop/src/main/session-read-error-copy.ts b/apps/desktop/src/main/session-read-error-copy.ts deleted file mode 100644 index 8356f7b2fd..0000000000 --- a/apps/desktop/src/main/session-read-error-copy.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { generalizedErrorMessageChinese } from '@maka/core'; -import { errorCode, errorMessage } from './chat-readiness.js'; - -const SESSION_READ_MESSAGES_ERROR_MARKER = 'MAKA_SESSION_READ_MESSAGES_ERROR:'; -const LOCAL_FILE_ACCESS_CODES = new Set(['EPERM', 'EACCES', 'EBUSY', 'ENOENT']); - -export function sessionReadMessagesFailureMessage(error: unknown): string { - return `${SESSION_READ_MESSAGES_ERROR_MARKER}${sessionReadMessagesFailureDescription(error)}`; -} - -function sessionReadMessagesFailureDescription(error: unknown): string { - const message = errorMessage(error); - const diagnosticMessages = runtimeReadModelDiagnosticMessages(error); - if ( - message === 'RuntimeEvent active projection cache read failed' || - diagnosticMessages.includes('SessionProjectionCache.readMessages failed') - ) { - return '读取进行中的对话缓存失败：本地会话文件暂时不可用，请稍后重试。'; - } - if ( - message === 'RuntimeEvent ledger read failed' || - diagnosticMessages.includes('RuntimeEventStore.readRuntimeEvents failed') - ) { - return '读取对话运行记录失败：本地运行记录暂时无法读取，请稍后重试。'; - } - if (isLocalFileAccessCode(errorCode(error))) { - return '读取对话失败：本地会话文件暂时被占用或不可访问，请稍后重试。'; - } - return `读取对话失败：${generalizedErrorMessageChinese(error, '本地对话状态暂时不可用，请稍后重试。')}`; -} - -function isLocalFileAccessCode(code: string | undefined): boolean { - return typeof code === 'string' && LOCAL_FILE_ACCESS_CODES.has(code.toUpperCase()); -} - -function runtimeReadModelDiagnosticMessages(error: unknown): string[] { - const diagnostics = (error as { diagnostics?: unknown } | null)?.diagnostics; - if (!Array.isArray(diagnostics)) return []; - const messages: string[] = []; - for (const diagnostic of diagnostics) { - if (!diagnostic || typeof diagnostic !== 'object') continue; - const message = (diagnostic as { message?: unknown }).message; - if (typeof message === 'string') { - messages.push(message); - } - } - return messages; -} diff --git a/apps/desktop/src/main/session-revision.ts b/apps/desktop/src/main/session-revision.ts deleted file mode 100644 index 3334c9fc78..0000000000 --- a/apps/desktop/src/main/session-revision.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { ReviseBeforeTurnInput, SessionSummary } from '@maka/core'; -import { normalizeReviseBeforeTurnInput } from './permission-response-guard.js'; - -/** - * Edit-and-resend version boundary. Kept separate from ordinary branching so - * the Desktop can model revisions as one conversation with durable versions. - */ -export async function handleReviseBeforeTurn( - sessionId: string, - input: unknown, - deps: { - ensureSessionWorkspaceAvailable(id: string): Promise; - reviseBeforeTurn(id: string, input: ReviseBeforeTurnInput): Promise; - emitCreated(id: string): void; - }, -): Promise { - await deps.ensureSessionWorkspaceAvailable(sessionId); - const session = await deps.reviseBeforeTurn(sessionId, normalizeReviseBeforeTurnInput(input)); - deps.emitCreated(session.id); - return session; -} diff --git a/apps/desktop/src/main/session-send-inline-references.ts b/apps/desktop/src/main/session-send-inline-references.ts deleted file mode 100644 index 6bf68cd8b6..0000000000 --- a/apps/desktop/src/main/session-send-inline-references.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { InlineReference } from '@maka/core'; -import { skillInvocationInlineReferences, type SkillInvocationReceipt } from '@maka/runtime'; -import { - mergeSessionInlineReferences, - workspaceFileInlineReferenceCandidates, -} from './session-workspace-inline-references.js'; - -/** - * Join the two authorities for sent inline tokens, then freeze their transcript - * order. Renderer references are already restricted to workspace files by the - * IPC guard; successful Runtime receipts are the sole Skill authority. - */ -export function mergeSentInlineReferences(input: { - displayText: string; - workspaceFileReferences?: ReadonlyArray>; - receipts: readonly SkillInvocationReceipt[]; -}): InlineReference[] { - return mergeSessionInlineReferences(input.displayText, [ - ...workspaceFileInlineReferenceCandidates(input), - ...skillInvocationInlineReferences(input.receipts, input.displayText), - ]); -} diff --git a/apps/desktop/src/main/session-send-resolve.ts b/apps/desktop/src/main/session-send-resolve.ts deleted file mode 100644 index f170a77f0f..0000000000 --- a/apps/desktop/src/main/session-send-resolve.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import type { AttachmentRef, QuoteRef, SessionHeader } from '@maka/core'; -import type { ArtifactStore } from '@maka/storage'; -import { ingestAttachments, resolveIngestItems } from './attachment-ingest.js'; -import type { AttachmentApprovalRegistry } from './attachment-approval.js'; - -export interface SendCommandWithItems { - type: 'send'; - turnId?: string; - text: string; - attachmentItems?: unknown; - /** Inline quoted excerpts; already normalized at the IPC boundary. */ - quotes?: QuoteRef[]; -} - -/** - * Run the send readiness check, then resolve + ingest attachment items, in - * that order. Readiness failure throws before any token is consumed or - * artifact created, so the caller can retry with the same approvalId. - */ -export async function resolveSessionSend(input: { - sessionId: string; - senderId: number; - command: SendCommandWithItems; - ensureCanSend: (sessionId: string) => Promise; - readHeader: (sessionId: string) => Promise; - approvals: AttachmentApprovalRegistry; - stat: (path: string) => Promise<{ size: number }>; - artifactStore: ArtifactStore; - resizeImage: (bytes: Uint8Array) => Promise; -}): Promise<{ turnId: string; attachments: AttachmentRef[] }> { - await input.ensureCanSend(input.sessionId); - let attachments: AttachmentRef[] = []; - if (input.command.attachmentItems) { - const header = await input.readHeader(input.sessionId); - if (!header) throw new Error('无法读取会话工作目录。'); - const files = await resolveIngestItems({ - senderId: input.senderId, - items: input.command.attachmentItems, - approvals: input.approvals, - stat: input.stat, - }); - attachments = await ingestAttachments({ - files, - cwd: header.cwd, - sessionId: input.sessionId, - artifactStore: input.artifactStore, - resizeImage: input.resizeImage, - }); - } - return { turnId: input.command.turnId || randomUUID(), attachments }; -} -/** - * What a send does the moment its run goes live. - * - * No SessionEvent marks a turn's START — only its end — and the runtime writes - * `status: 'running'` at the end of `AgentRun.begin`, announcing it to nobody. - * Without this broadcast the earliest a client learns its turn is running is - * the `message-appended` riding the FIRST content event, so the whole backend - * start-up ahead of it looks idle. - * - * The broadcast carries the turn id, which is what makes it an ANSWER to a - * particular send rather than a bare catalog invalidation: a session's status - * reads the same before a turn starts and after it ends, so a client that just - * sent cannot otherwise tell "not yet" from "already over". - * - * It is emitted BEFORE the revision commit. Nothing in the answer depends on - * that write, so it must neither be delayed by it nor lost when it throws. - */ -export function createRunStartedHook(input: { - sessionId: string; - turnId: string; - emitSessionsChanged: (sessionId: string, turnId: string) => void; - commitRevisionVersion: (sessionId: string) => Promise; -}): (runId: string, header: { revisionState?: string }) => Promise { - return async (_runId, header) => { - input.emitSessionsChanged(input.sessionId, input.turnId); - if (header.revisionState === 'preparing') { - await input.commitRevisionVersion(input.sessionId); - } - }; -} - -/** One `sessions:changed` to emit, in order. */ -export interface StoppedTurnBroadcast { - reason: 'status-change' | 'turn-status-change' | 'message-appended'; - turnId?: string; -} - -/** - * The broadcasts that announce a stop, naming the turns it ended. - * - * Stopping is the one turn ending a client can be waiting on without ever - * having seen the turn start — Stop pressed inside the send→run-start window. - * A client holds a local claim on a turn it submitted until it hears back about - * that exact turn, so an unnamed stop leaves the claim with nothing to release - * it, making Stop the one control unable to undo Stop. - * - * With no turn running there is nothing to name and the plain invalidations - * stand: something not tied to a turn is exactly what an unnamed change means. - */ -export function stoppedTurnBroadcasts( - stoppedTurnIds: readonly string[], -): StoppedTurnBroadcast[] { - const reasons = ['status-change', 'turn-status-change', 'message-appended'] as const; - return reasons.flatMap((reason) => - stoppedTurnIds.length === 0 - ? [{ reason }] - : stoppedTurnIds.map((turnId) => ({ reason, turnId })), - ); -} diff --git a/apps/desktop/src/main/session-send-skill-plan.ts b/apps/desktop/src/main/session-send-skill-plan.ts deleted file mode 100644 index b7d4a7182c..0000000000 --- a/apps/desktop/src/main/session-send-skill-plan.ts +++ /dev/null @@ -1,32 +0,0 @@ -import type { PreparedSkillInvocationMessage, SkillInvocationResult } from '@maka/runtime'; - -export type SessionSendSkillPlan = - | { - ok: false; - reason: 'skill_invocation_failed'; - skillInvocation: SkillInvocationResult; - } - | { - ok: true; - preparation: Exclude; - resolved: Resolved; - }; - -/** - * Enforces the pre-attachment Skill gate. A blocked invocation never evaluates - * `resolveSend`, so opaque approvals remain unconsumed and artifacts uncreated. - */ -export async function prepareSessionSendSkillPlan(input: { - prepare(): Promise; - resolveSend(): Promise; -}): Promise> { - const preparation = await input.prepare(); - if (preparation.disposition === 'blocked') { - return { - ok: false, - reason: 'skill_invocation_failed', - skillInvocation: preparation.skillInvocation, - }; - } - return { ok: true, preparation, resolved: await input.resolveSend() }; -} diff --git a/apps/desktop/src/main/session-stream.ts b/apps/desktop/src/main/session-stream.ts deleted file mode 100644 index 88e0952531..0000000000 --- a/apps/desktop/src/main/session-stream.ts +++ /dev/null @@ -1,628 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import type { SessionChangedReason, SessionEvent } from '@maka/core'; -import type { ToolInvocationRecord } from '@maka/core/usage-stats/types'; -import { - AiSdkBackend, - buildDefaultContextBudgetPolicy, - buildLlmHistorySummarizer, - buildProviderOptions, - createProviderRequestCaptureRecorder, - getAIModel, - loadHistoryCompactBlocksFromArtifacts, - loadSynthesisCacheBlocksFromArtifacts, - persistSynthesisCacheBlocksToArtifacts, - recordToolInvocation, - renderPlanExecutionPrompt, - renderInterruptedPlanContext, - renderPlanModePrompt, - resolveSelectedModelContextWindow, -} from '@maka/runtime'; -import type { - BackendFactory, - GoalTurnOutcome, - HostCapabilities, - SessionActivityLease, - SessionActivityRegistry, - SessionManager, - ToolArtifactRecorderInput, - buildPricingLookup, -} from '@maka/runtime'; -import type { createSqliteModelCallLedger } from '@maka/storage'; -import { - type ArtifactStore, - createAttachmentByteReader, - openRuntimeEventPersistence, - persistProviderRequestCaptureArtifact, - type TelemetryRepo, -} from '@maka/storage'; -import { WEB_SEARCH_TOOL_NAME } from './web-search/agent-tool.js'; -import { errorCode, errorMessage, errorReason } from './chat-readiness.js'; -import type { assembleDesktopTools } from './tool-assembly.js'; -import type { ToolArtifactPersistence } from './tool-artifact-persistence.js'; -import type { createMainGoalWiring } from './goal-wiring.js'; -import type { createSubscriptionModelFetch } from './subscription-model-fetch.js'; -import type { createSystemPromptMainService } from './system-prompt-main.js'; -import { startDesktopSessionTurn, type SessionGoalBoundary } from './session-turn-stream.js'; -import { - resolveDesktopBackendToolSurface, - type DesktopBackendToolSurfaceDeps, -} from './desktop-backend-tool-surface.js'; - -type AssembledTools = ReturnType; -type SystemPromptMainService = ReturnType; -type SubscriptionModelFetchBuilder = ReturnType; -type GoalWiring = ReturnType; -type ModelCallLedger = ReturnType; -type PricingLookup = ReturnType; -type RuntimeCommitStore = Awaited>['runtimeCommitStore']; -const SKILL_CATALOG_TRACE_DECISION_LIMIT = 100; - -export interface AiSdkBackendFactoryDeps extends DesktopBackendToolSurfaceDeps { - buildSubscriptionModelFetch: SubscriptionModelFetchBuilder; - systemPromptService: SystemPromptMainService; - telemetryRepo: TelemetryRepo; - modelCallLedger: ModelCallLedger; - ensureUsageReady: () => Promise; - artifactStore: ArtifactStore; - desktopSessionSkillHosts: Map; - sandboxDiagnosticsProvider: AssembledTools['sandboxDiagnosticsProvider']; - persistToolArtifacts: ToolArtifactPersistence['persistToolArtifacts']; - toolResultArchive: ToolArtifactPersistence['toolResultArchive']; - runtimeCommitStore: RuntimeCommitStore; - safeSendToRenderer: (channel: string, ...args: unknown[]) => void; - emitSessionsChanged: (reason: SessionChangedReason, sessionId?: string) => void; - getRuntime: () => SessionManager; - getLookupPricing: () => PricingLookup; -} - -/** - * Build the real `ai-sdk` backend factory (arch R5). Pure move of main.ts's - * `backends.register('ai-sdk', async (ctx) => …)` closure. Two module-scoped - * seams that resolve AFTER the registration point are injected as accessors: - * `getRuntime` (the SessionManager is constructed after registration) and - * `getLookupPricing` (a mutable pricing lookup reassigned by usage IPC + startup; - * snapshotted once for the `lookupPricing` field — matching the original - * module-`let` closure semantics exactly). - */ -export function createAiSdkBackendFactory(deps: AiSdkBackendFactoryDeps): BackendFactory { - const { - buildSubscriptionModelFetch, - systemPromptService, - telemetryRepo, - modelCallLedger, - ensureUsageReady, - artifactStore, - desktopSessionSkillHosts, - sandboxDiagnosticsProvider, - persistToolArtifacts, - toolResultArchive, - runtimeCommitStore, - safeSendToRenderer, - emitSessionsChanged, - getRuntime, - getLookupPricing, - } = deps; - - return async (ctx) => { - await ensureUsageReady(); - const toolSurface = await resolveDesktopBackendToolSurface(deps, ctx); - const { - connection, - apiKey, - model, - supportsVision, - collaborationMode, - planState, - activeExecution, - interruptedExecution, - selectedTools, - toolAvailability: backendToolAvailability, - skillHost: backendSkillHost, - admitsAgentChildren, - } = toolSurface; - const modelFetch = buildSubscriptionModelFetch(connection, ctx.sessionId, model); - const memoryPromptSnapshot = await systemPromptService.buildLocalMemoryPromptFragment(ctx.sessionId); - // Legacy child-run backends share the parent sessionId; linked child - // sessions have their own id. Both receive a narrower tool surface without - // the Desktop Skill tool, so only a session's full backend owns this entry. - if (!ctx.tools) desktopSessionSkillHosts.set(ctx.sessionId, backendSkillHost); - const effectivePermissionMode = collaborationMode === 'plan' ? 'explore' : ctx.header.permissionMode; - const sandboxDiagnosticsSnapshot = await sandboxDiagnosticsProvider.resolve({ - mode: effectivePermissionMode, - cwd: ctx.header.cwd, - }); - // Hoisted out of the backend input so the shape stays readable; the - // auxiliary summarizer no longer needs any of it (#1679). - const providerRequestCapture = ctx.recordProviderRequestCapture - ? createProviderRequestCaptureRecorder({ - persistArtifact: async (capture) => { - const artifact = await persistProviderRequestCaptureArtifact(artifactStore, { - sessionId: ctx.sessionId, - turnId: capture.turnId, - captureId: capture.captureId, - step: capture.step, - serializedRequest: capture.serializedRequest, - now: Date.now(), - }); - return { artifactId: artifact.id }; - }, - recordLedger: ctx.recordProviderRequestCapture, - }) - : undefined; - - return new AiSdkBackend({ - sessionId: ctx.sessionId, - header: { ...ctx.header, model, permissionMode: effectivePermissionMode }, - appendMessage: ctx.appendMessage ?? ((message) => ctx.store.appendMessage(ctx.sessionId, message)), - readExecutionBoundary: () => ctx.store.readExecutionBoundary!(ctx.sessionId), - createSandboxBoundaryRequest: (request) => - ctx.store.createSandboxBoundaryRequest!(request), - settleSandboxBoundaryRequest: (request) => - ctx.store.settleSandboxBoundaryRequest!(request), - connection, - apiKey: apiKey ?? '', - modelId: model, - modelFactory: (input) => getAIModel({ ...input, fetch: modelFetch }), - tools: selectedTools, - sandboxDiagnosticsSnapshot, - planTraceContext: { - mode: collaborationMode, - storeVersion: planState.storeVersion, - ...(activeExecution - ? { - planId: activeExecution.planId, - proposalId: activeExecution.proposalId, - executionId: activeExecution.executionId, - } - : {}), - }, - toolAvailability: backendToolAvailability, - ...(admitsAgentChildren - ? { - spawnChildAgent: (input) => getRuntime().spawnChildAgent(ctx.sessionId, input), - spawnChildSession: (input) => { - const observation = createLinkedChildEventProjection({ - lifecycle: 'created', - safeSendToRenderer, - emitSessionsChanged, - onReady: input.onReady, - onEvent: input.onEvent, - }); - return getRuntime().spawnChildSession(ctx.sessionId, { - spawnedBy: { - parentRunId: input.parentRunId, - parentTurnId: input.parentTurnId, - toolCallId: input.toolCallId, - }, - agentProfile: input.agentProfile, - ...(input.subagentId ? { subagentId: input.subagentId } : {}), - prompt: input.prompt, - ...(input.swarm ? { swarm: input.swarm } : {}), - abortSignal: input.abortSignal, - onReady: observation.onReady, - onEvent: observation.onEvent, - }); - }, - prepareChildAgentResume: (sourceRunId) => - getRuntime().prepareChildAgentResume(ctx.sessionId, sourceRunId), - resumeChildAgent: (input) => { - const observation = createLinkedChildEventProjection({ - lifecycle: 'continued', - safeSendToRenderer, - emitSessionsChanged, - onReady: input.onReady, - onEvent: input.onEvent, - }); - return getRuntime().resumeChildAgent(ctx.sessionId, { - ...input, - onReady: observation.onReady, - onEvent: observation.onEvent, - }); - }, - retryChildAgent: (input) => { - const observation = createLinkedChildEventProjection({ - lifecycle: 'continued', - safeSendToRenderer, - emitSessionsChanged, - onReady: input.onReady, - onEvent: input.onEvent, - }); - return getRuntime().retryChildAgent(ctx.sessionId, { - ...input, - onReady: observation.onReady, - onEvent: observation.onEvent, - }); - }, - listChildAgents: () => getRuntime().listChildAgents(ctx.sessionId), - readChildAgentOutput: (input) => - getRuntime().readChildAgentOutput(ctx.sessionId, input), - } - : {}), - providerOptions: buildProviderOptions(connection, model, ctx.header.thinkingLevel), - contextBudget: buildDefaultContextBudgetPolicy(connection, { - name: 'desktop-default-history-budget', - modelId: model, - }), - systemPrompt: async ({ cwd, emitSkillCatalogTrace }) => { - const base = await systemPromptService.buildBackendSystemPrompt( - ctx.header, - cwd, - { - memoryFragment: memoryPromptSnapshot, - childInstruction: ctx.systemPrompt, - skillBudget: { contextWindow: resolveSelectedModelContextWindow(connection, model) }, - host: backendSkillHost, - }, - ); - const skillReport = systemPromptService.getLastSkillSelectionReport(cwd); - if (skillReport) { - emitSkillCatalogTrace?.('Skill catalog selection completed', { - policyVersion: skillReport.policyVersion, - budgetChars: skillReport.budgetChars, - usedChars: skillReport.usedChars, - totalCount: skillReport.totalCount, - eligibleCount: skillReport.eligibleCount, - advertisedCount: skillReport.advertisedCount, - omittedCount: skillReport.omittedCount, - decisionCount: skillReport.decisions.length, - decisionsTruncated: - skillReport.decisions.length > SKILL_CATALOG_TRACE_DECISION_LIMIT, - decisions: skillReport.decisions - .slice(0, SKILL_CATALOG_TRACE_DECISION_LIMIT) - .map((decision) => ({ - skillRef: decision.ref, - reason: decision.reason, - ...(decision.rank !== undefined ? { rank: decision.rank } : {}), - })), - }); - } - return collaborationMode === 'plan' ? `${base}\n\n${renderPlanModePrompt()}` : base; - }, - turnTailPrompt: async ({ cwd, sessionId }) => { - const base = await systemPromptService.buildTurnTailPrompt(cwd, sessionId); - const execution = activeExecution ?? ( - collaborationMode === 'plan' ? interruptedExecution : undefined - ); - if (!execution) return base; - const proposal = planState.proposals.find( - (candidate) => candidate.proposalId === execution.proposalId, - ); - if (!proposal) return base; - const planContext = activeExecution - ? renderPlanExecutionPrompt({ proposal, execution: activeExecution }) - : renderInterruptedPlanContext({ proposal, execution }); - return `${base}\n\n${planContext}`; - }, - shellRunContextSummary: ctx.shellRunContextSummary, - lookupPricing: getLookupPricing(), - // One canonical record, one commit point (#1679): the AgentRun stream is - // the only durable authority, and the ledger is a projection written only - // after the authority holds the record. A failed projection marks the run - // so the Usage read path re-derives it from the stream. Settlement runs - // after the provider call completed and billed, so neither step may fail - // the turn — the seam swallows what is thrown here. - recordModelCallAttempt: async (attempt) => { - await ctx.recordModelCallAttempt?.(attempt); - // Marked before the projection, so a crash between the two still - // leaves a run the repair path can find. - await modelCallLedger - .markRunPendingReprojection(attempt.sessionId, attempt.runId) - .catch(() => undefined); - await modelCallLedger.record(attempt); - await modelCallLedger - .clearPendingReprojection(attempt.sessionId, attempt.runId) - .catch(() => undefined); - }, - recordToolInvocation: (event: ToolInvocationRecord) => - recordToolInvocation( - { repo: telemetryRepo }, - // PR-AGENT-WEB-SEARCH-TOOL-0: scrub the query out of the - // telemetry record. The agent passes the raw user query as - // the tool argument; persisting it in `argsSummary` would - // leak user-derived content into the usage log. - event.toolName === WEB_SEARCH_TOOL_NAME - ? { ...event, argsSummary: undefined } - : event, - ), - recordToolArtifacts: (event: ToolArtifactRecorderInput) => persistToolArtifacts(ctx.header.cwd, event), - toolResultArchive, - readAttachmentBytes: createAttachmentByteReader({ artifactStore, sessionId: ctx.sessionId }), - ...(runtimeCommitStore - ? { runtimeCommitSink: runtimeCommitStore } - : {}), - supportsVision, - loadHistoryCompact: (event) => loadHistoryCompactBlocksFromArtifacts(artifactStore, event), - loadHistoryCompactCheckpoint: ctx.loadHistoryCompactCheckpoint, - summarizeHistoryCompact: buildLlmHistorySummarizer({ - // Reuse the same connection/model the session already drives, so the - // summary stays consistent with the model that will consume it. - resolveModel: () => - getAIModel({ connection, apiKey: apiKey ?? '', modelId: model, fetch: modelFetch }), - providerOptions: buildProviderOptions(connection, model, ctx.header.thinkingLevel), - }), - loadSynthesisCache: (event) => loadSynthesisCacheBlocksFromArtifacts(artifactStore, event), - writeSynthesisCache: (event) => persistSynthesisCacheBlocksToArtifacts(artifactStore, event, { - onArtifactCreated: (artifact) => { - safeSendToRenderer('artifacts:changed', { - reason: 'created', - artifactId: artifact.id, - sessionId: artifact.sessionId, - ts: Date.now(), - }); - }, - }), - recordRunTrace: ctx.recordRunTrace, - ...(providerRequestCapture - ? { - recordProviderRequestCapture: providerRequestCapture, - recordProviderRequestAttempt: ctx.recordProviderRequestAttempt, - } - : {}), - recordHistoryCompactCheckpoint: ctx.recordHistoryCompactCheckpoint, - loadTurnRuntimeEvents: ctx.loadTurnRuntimeEvents, - allowMidTurnHistoryCompaction: ctx.allowMidTurnHistoryCompaction, - recordActiveFullCompactBlock: ctx.recordActiveFullCompactBlock, - recordSemanticCompactBlock: ctx.recordSemanticCompactBlock, - newId: randomUUID, - now: Date.now, - }); - }; -} - -interface LinkedChildReady { - childSessionId?: string; - turnId: string; - runId?: string; - agentId: string; - agentName: string; -} - -/** - * Bridge linked-child events onto the child Session's normal Desktop channel - * while the parent tool call remains the stream consumer. - * Direct user follow-ups already use createSessionStreamer; this closes the - * nested spawn/resume/retry observation gap without inventing a subagent-only - * event protocol. - */ -export function createLinkedChildEventProjection< - Ready extends LinkedChildReady = LinkedChildReady, ->(input: { - lifecycle: 'created' | 'continued'; - safeSendToRenderer: (channel: string, ...args: unknown[]) => void; - emitSessionsChanged: (reason: SessionChangedReason, sessionId?: string) => void; - onReady?: (ready: Ready) => void | Promise; - onEvent?: (event: SessionEvent) => void; -}): { - onReady(ready: Ready): Promise; - onEvent(event: SessionEvent): void; -} { - let childSessionId: string | undefined; - let messageAppendBroadcasted = false; - return { - async onReady(ready) { - childSessionId = ready.childSessionId; - if (childSessionId) { - input.emitSessionsChanged( - input.lifecycle === 'created' ? 'created' : 'status-change', - childSessionId, - ); - input.emitSessionsChanged('turn-status-change', childSessionId); - } - await input.onReady?.(ready); - }, - onEvent(event) { - if (childSessionId) { - input.safeSendToRenderer(`sessions:event:${childSessionId}`, event); - if (!messageAppendBroadcasted) { - input.emitSessionsChanged('message-appended', childSessionId); - messageAppendBroadcasted = true; - } - if (isStatusChangingSessionEvent(event)) { - input.emitSessionsChanged('status-change', childSessionId); - } - if (isTurnStatusChangingSessionEvent(event)) { - input.emitSessionsChanged('turn-status-change', childSessionId); - } - } - input.onEvent?.(event); - }, - }; -} - -interface StreamEventsOptions { - turnId: string; - goalBoundary: SessionGoalBoundary; - activity?: SessionActivityLease; - observeEvent?: (event: SessionEvent) => void; -} - -interface StreamEventsResult { - turnId: string; - ok: boolean; - error?: string; - outcome: GoalTurnOutcome; -} - -export type StreamEvents = ( - sessionId: string, - iterator: AsyncIterable, - options: StreamEventsOptions, -) => Promise; - -export interface SessionStreamerDeps { - sessionActivities: SessionActivityRegistry; - goalWiring: GoalWiring; - computerUseOverlay: AssembledTools['computerUseOverlay']; - /** - * The picture-in-picture mirror, retired on the same signal as the cursor. - * - * Cleared only when a session was stopped, archived or deleted, the mirror - * would outlive the run it belonged to and keep showing that run's last - * frame while the next turn drove a different application. A mirror showing - * the wrong window is worse than no mirror, because it is read as "this is - * what the agent is doing". - */ - computerUsePip?: { complete(sessionId: string): void }; - /** - * The menu-bar item, retired on the same signal as the cursor. - * - * A turn ending is the run ending, so this is where the indicator goes away - * and — because the item is the authority on whether anything is still - * driving the machine — where the keep-awake assertion it took out is given - * back. Clearing it only on stop/archive/delete would mean the assertion - * outlived every run that ended by finishing. - */ - computerUseStatusItem?: { clearForSession(sessionId: string): void }; - /** - * The screen-lock guard, retired on the same signal, for the same reason. - * - * It holds the ids of sessions it will release on unlock, and it had no - * turn-end caller at all: the session IPC cleared it on delete, stop and - * archive, but a turn that simply finished left its id in the set for the - * lifetime of the process. Two hundred turns in distinct sessions across a - * day left two hundred ids held, and every unlock walked all of them. The - * status item was cleared here and the guard was not, which is the kind of - * asymmetry nobody notices until the set is the thing being measured. - */ - computerUseScreenLock?: { clearForSession(sessionId: string): void }; - computerUseTools: AssembledTools['computerUseTools']; - safeSendToRenderer: (channel: string, ...args: unknown[]) => void; - emitSessionsChanged: ( - reason: SessionChangedReason, - sessionId?: string, - extra?: { turnId?: string }, - ) => void; - interruptActivePlanExecution?: (sessionId: string, reason: string) => Promise; -} - -function isStatusChangingSessionEvent(event: SessionEvent): boolean { - return event.type === 'sandbox_boundary_request' || - event.type === 'sandbox_boundary_decision_ack' || - event.type === 'complete' || - event.type === 'abort' || - event.type === 'error'; -} - -function isTurnStatusChangingSessionEvent(event: SessionEvent): boolean { - return event.type === 'complete' || event.type === 'abort' || event.type === 'error'; -} - -/** - * Session event fan-out plumbing (arch R5). Pure move of main.ts's `streamEvents` - * plus its two event-classifier helpers. Returns the `streamEvents` function that - * every turn-driving call site in main.ts drives; behavior is identical to the - * in-main.ts original. - */ -export function createSessionStreamer(deps: SessionStreamerDeps): StreamEvents { - const { - sessionActivities, - goalWiring, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - safeSendToRenderer, - emitSessionsChanged, - interruptActivePlanExecution, - } = deps; - - return function streamEvents( - sessionId: string, - iterator: AsyncIterable, - options: StreamEventsOptions, - ): Promise { - let userAppendBroadcasted = false; - const turnId = options.turnId; - const started = startDesktopSessionTurn({ - sessionId, - events: iterator, - turnId, - goalBoundary: options.goalBoundary, - activities: sessionActivities, - ...(options.activity ? { activity: options.activity } : {}), - beginObservedTurn: (externalSessionId, externalTurnId) => - goalWiring.coordinator.beginObservedTurn(externalSessionId, externalTurnId), - onEvent: (event) => { - if (!userAppendBroadcasted) { - emitSessionsChanged('message-appended', sessionId, { turnId }); - userAppendBroadcasted = true; - } - safeSendToRenderer(`sessions:event:${sessionId}`, event); - if (isStatusChangingSessionEvent(event)) { - emitSessionsChanged('status-change', sessionId, { turnId }); - } - if (isTurnStatusChangingSessionEvent(event)) { - emitSessionsChanged('turn-status-change', sessionId, { turnId }); - computerUseOverlay.clearForSession(sessionId); - // The turn ended, which is what the mirror calls a run. It lingers - // rather than vanishing: a person watching background work looks - // over at the moment the answer arrives, which is the moment an - // immediate teardown would take the window away. A dismissal expires - // here too, alongside the two clears either side of this line. - computerUsePip?.complete(sessionId); - computerUseStatusItem?.clearForSession(sessionId); - computerUseScreenLock?.clearForSession(sessionId); - computerUseTools.clearSession(sessionId); - } - options.observeEvent?.(event); - }, - onStreamError: (error) => { - const event = { - type: 'error', - id: randomUUID(), - turnId, - ts: Date.now(), - recoverable: false, - code: errorCode(error), - reason: errorReason(error), - message: errorMessage(error), - } satisfies SessionEvent; - safeSendToRenderer(`sessions:event:${sessionId}`, event); - emitSessionsChanged('status-change', sessionId, { turnId }); - emitSessionsChanged('turn-status-change', sessionId, { turnId }); - computerUseOverlay.clearForSession(sessionId); - // A stream that dies ends the turn as surely as a completion event - // does, and it is the path where the last frame matters most. - computerUsePip?.complete(sessionId); - // A turn that dies is still a turn that ended. Leaving the item up here - // would leave the power assertion held by a run that no longer exists. - computerUseStatusItem?.clearForSession(sessionId); - computerUseScreenLock?.clearForSession(sessionId); - computerUseTools.clearSession(sessionId); - }, - onDrained: async (outcome) => { - emitSessionsChanged('message-appended', sessionId, { turnId }); - if ( - interruptActivePlanExecution && - (outcome.kind === 'aborted' || outcome.kind === 'errored') - ) { - await interruptActivePlanExecution( - sessionId, - outcome.kind === 'aborted' ? 'turn_aborted' : `turn_error:${outcome.reason}`, - ).catch(() => undefined); - } - }, - }); - // Thrown SYNCHRONOUSLY, and that is load-bearing. A refused turn never runs - // `onEvent` / `onStreamError` / `onDrained`, so no change ever names it — - // and a client's arm stays unconfirmed until its turn is named, holding Stop - // and the composer lock. Throwing synchronously is what carries the failure - // out through the `void streamEvents(...)` call in the send handler: it - // rejects that handler's promise instead of resolving `{ ok: true }`, so the - // client disarms in its own catch. Made async, this line would be swallowed - // by the `void` and latch the UI until restart. - if (started.kind === 'unavailable') throw new Error(started.reason); - return started.completion.then((outcome) => { - const failureReason = outcome.kind === 'errored' || outcome.kind === 'suspended' - ? outcome.reason - : undefined; - return { - turnId, - ok: outcome.kind === 'completed', - ...(failureReason ? { error: failureReason } : {}), - outcome, - }; - }); - }; -} diff --git a/apps/desktop/src/main/session-turn-stream.ts b/apps/desktop/src/main/session-turn-stream.ts deleted file mode 100644 index 81dcec38ba..0000000000 --- a/apps/desktop/src/main/session-turn-stream.ts +++ /dev/null @@ -1,61 +0,0 @@ -import type { SessionEvent } from '@maka/core'; -import { - drainGoalTurn, - type GoalObservedTurnStart, - type GoalTurnOutcome, - type SessionActivityLease, - type SessionActivityRegistry, -} from '@maka/runtime'; - -export type SessionGoalBoundary = 'external' | 'coordinator' | 'none'; - -export interface StartDesktopSessionTurnInput { - sessionId: string; - events: AsyncIterable; - turnId: string; - goalBoundary: SessionGoalBoundary; - activities: SessionActivityRegistry; - activity?: SessionActivityLease; - beginObservedTurn: (sessionId: string, turnId: string) => GoalObservedTurnStart; - onEvent: (event: SessionEvent) => void | Promise; - onStreamError: (error: unknown) => void | Promise; - onDrained: (outcome: GoalTurnOutcome) => void | Promise; -} - -export type DesktopSessionTurnStart = - | { kind: 'started'; completion: Promise } - | { kind: 'unavailable'; reason: string }; - -/** - * Desktop's canonical turn boundary. Registration and activity ownership are - * established synchronously before the event iterator can start. - */ -export function startDesktopSessionTurn( - input: StartDesktopSessionTurnInput, -): DesktopSessionTurnStart { - const registration = input.goalBoundary === 'external' - ? input.beginObservedTurn(input.sessionId, input.turnId) - : undefined; - if (registration && registration.kind !== 'registered') { - return { - kind: 'unavailable', - reason: registration.reason, - }; - } - - const activity = input.activity ?? input.activities.reserve(input.sessionId); - return { - kind: 'started', - completion: drainGoalTurn({ - events: input.events, - turnId: input.turnId, - activity, - onEvent: input.onEvent, - onStreamError: input.onStreamError, - onDrained: input.onDrained, - ...(registration?.kind === 'registered' - ? { onSettled: (outcome) => { void registration.settle(outcome); } } - : {}), - }), - }; -} diff --git a/apps/desktop/src/main/sessions-ipc-main.ts b/apps/desktop/src/main/sessions-ipc-main.ts deleted file mode 100644 index 82200b32ff..0000000000 --- a/apps/desktop/src/main/sessions-ipc-main.ts +++ /dev/null @@ -1,999 +0,0 @@ -import { randomUUID } from 'node:crypto'; -import { userInfo } from 'node:os'; -import { basename } from 'node:path'; -import { stat } from 'node:fs/promises'; -import { ipcMain as electronIpcMain } from 'electron'; -import { - isCollaborationMode, - isOrchestrationMode, - isPermissionMode, - isSideConversationSession, - isThinkingLevel, - sanitizeTaskLedgerTask, - thinkingVariantsForConnection, -} from '@maka/core'; -import type { - CreateSessionRequestInput, - SandboxBoundaryExpansion, - SessionEvent, - SessionChangedEvent, - SessionChangedReason, - SessionListFilter, - StoredMessage, - ThinkingLevel, - GitReviewMutationAction, - GitReviewSource, -} from '@maka/core'; -import type { ConnectionThinkingContext } from '@maka/core/model-thinking'; -import type { WorkspacePrivacyContext } from '@maka/core/incognito'; -import { - defaultShellPlan, - type PreparedSkillInvocationMessage, - type SessionManager, - type ShellRunProcessManager, -} from '@maka/runtime'; -import type { ArtifactStore, createSessionStore } from '@maka/storage'; -import type { ConnectionStore, SettingsStore } from '@maka/storage'; -import { runThreadSearch } from './search/thread-search.js'; -import { createRunStartedHook, resolveSessionSend, stoppedTurnBroadcasts } from './session-send-resolve.js'; -import { renderAttachmentPreview, resizeImageForAttachment } from './attachment-resize-native.js'; -import { registerAttachmentPreviewIpc } from './attachment-preview.js'; -import { readFileCapped } from './attachment-ingest.js'; -import { releaseBrowserSession } from './browser/session.js'; -import { sessionReadMessagesFailureMessage } from './session-read-error-copy.js'; -import { resolveCreateSessionInput } from './create-session-input.js'; -import { - normalizeSandboxBoundaryResponse, - normalizeSessionSendCommand, - normalizeStopSessionInput, - normalizeUserQuestionResponse, -} from './permission-response-guard.js'; -import { - getE2eFixtureState, - retireE2eFixtureSandboxBoundaryRequest, - type resolveE2eFixture, -} from './e2e-fixture.js'; -import type { requireReadyConnection } from './chat-readiness.js'; -import type { MainTaskLedgerWiring } from './task-ledger-wiring.js'; -import type { MainGoalWiring } from './goal-wiring.js'; -import type { MainAutomationWiring } from './automation-wiring.js'; -import type { AttachmentApprovalRegistry } from './attachment-approval.js'; -import type { createMainWindowController } from './main-window.js'; -import { handleBranchFromTurn } from './session-branch.js'; -import { handleReviseBeforeTurn } from './session-revision.js'; -import { prepareSessionSendSkillPlan } from './session-send-skill-plan.js'; -import type { DesktopCreateSessionInput } from './new-session-project.js'; -import { registerSessionExecutionIpc } from './session-execution-ipc-main.js'; -import { createSessionCopyCleanupAuthority } from './quote-companion-cleanup.js'; -import { mergeSentInlineReferences } from './session-send-inline-references.js'; -import { resolveSessionActionIds } from './session-family-action.js'; -import { normalizeSessionModelSelection } from './session-model-input.js'; -import { selectLoginShell } from './shell-env.js'; -import { mutateGitReview, readGitReview } from './git-review-main.js'; - -type SessionStore = ReturnType; -type MainWindowController = ReturnType; -type E2eFixture = ReturnType; - -/** The per-session cleanup subset of the cursor-overlay controller. */ -interface SessionOverlayCleanup { - clearForSession(sessionId: string): void; -} -/** The per-session cleanup subset of the computer-use tool group. */ -interface SessionToolCleanup { - clearSession(sessionId: string): void; -} - -export interface SessionsIpcDeps { - workspaceRoot: string; - runtime: SessionManager; - shellRuns?: ShellRunProcessManager; - store: SessionStore; - taskLedgerStore: MainTaskLedgerWiring['store']; - goalWiring: MainGoalWiring; - automationManager: MainAutomationWiring['manager']; - computerUseOverlay: SessionOverlayCleanup; - /** - * Picture-in-picture mirror of the driven window; torn down with its session. - * - * Its stop control is pointed back at the same `stopSession` the in-app stop - * button runs, so stopping from the mirror and stopping from the window - * cannot drift apart. - */ - computerUsePip?: SessionOverlayCleanup & { - setStopHandler(handler: (sessionId: string) => void): void; - }; - /** - * Menu bar indicator for Computer Use. Its Stop rows route back here, and it - * stops reporting on a session once that session has stopped. - */ - computerUseStatusItem?: { - setStopHandler(handler: (sessionId: string) => void): void; - clearForSession(sessionId: string): void; - }; - /** - * Screen-lock guard. It releases sessions from the locked state when the user - * comes back, so a session that has ended must stop being one of them. - */ - computerUseScreenLock?: { clearForSession(sessionId: string): void }; - computerUseTools: SessionToolCleanup; - artifactStore: ArtifactStore; - attachmentApprovals: AttachmentApprovalRegistry; - settingsStore: SettingsStore; - connectionStore: ConnectionStore; - mainWindowController: MainWindowController; - e2eFixture: E2eFixture; - emitSessionsChanged: ( - reason: SessionChangedReason, - sessionId?: string, - extra?: Pick, - ) => void; - ensureSessionCanSend: (sessionId: string) => Promise; - prepareSkillInvocation?: ( - sessionId: string, - text: string, - skillIds?: readonly string[], - ) => Promise; - invalidateSessionBindings?: (sessionId: string) => void; - clearSkillHost?: (sessionId: string) => void; - stopAgentGraph?: (sessionId: string) => Promise; - notifyAgentGraphPermissionResponse?: (sessionId: string) => void; - ensureSessionWorkspaceAvailable: (sessionId: string) => Promise; - createSession: (input: DesktopCreateSessionInput) => ReturnType; - getReadyConnection: ( - slug: string | null | undefined, - model?: string, - ) => ReturnType; - streamEvents: ( - sessionId: string, - iterator: AsyncIterable, - options: { - turnId: string; - goalBoundary: 'external' | 'none'; - }, - ) => Promise<{ turnId: string; ok: boolean; error?: string }>; - getWorkspacePrivacyContext: () => Promise; - canCreateFakeSession: () => boolean; -} - -function latestStoredMessageTs(messages: readonly StoredMessage[]): number | undefined { - let latest: number | undefined; - for (const message of messages) { - if (Number.isFinite(message.ts)) latest = latest === undefined ? message.ts : Math.max(latest, message.ts); - } - return latest; -} - -function normalizeSupportedSessionThinkingLevel( - input: unknown, - connection: ConnectionThinkingContext, - model: string, -): ThinkingLevel | undefined { - const thinkingLevel = input === undefined || input === null ? undefined : input; - if (thinkingLevel === undefined) return undefined; - if (!isThinkingLevel(thinkingLevel)) { - throw new Error(`Invalid thinking level: ${String(input)}`); - } - if (!thinkingVariantsForConnection(connection, model).includes(thinkingLevel)) { - throw new Error(`当前模型不支持思考级别：${thinkingLevel}`); - } - return thinkingLevel; -} - -export function registerSessionsIpc( - deps: SessionsIpcDeps, - ipcMain: Pick = electronIpcMain, -): void { - const { - workspaceRoot, - runtime, - shellRuns, - store, - taskLedgerStore, - goalWiring, - automationManager, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - artifactStore, - attachmentApprovals, - settingsStore, - connectionStore, - mainWindowController, - e2eFixture, - emitSessionsChanged, - ensureSessionCanSend, - prepareSkillInvocation, - invalidateSessionBindings, - clearSkillHost, - stopAgentGraph, - notifyAgentGraphPermissionResponse, - ensureSessionWorkspaceAvailable, - createSession, - getReadyConnection, - streamEvents, - getWorkspacePrivacyContext, - canCreateFakeSession, - } = deps; - registerSessionExecutionIpc({ - ipcMain, - runtime, - ensureSessionCanSend, - ensureSessionWorkspaceAvailable, - streamEvents, - emitModeChanged: (sessionId) => emitSessionsChanged('mode-change', sessionId), - }); - const removeSession = async (sessionId: string): Promise => { - computerUseOverlay.clearForSession(sessionId); - // The mirror is per-session too, and dies with it. - computerUsePip?.clearForSession(sessionId); - computerUseScreenLock?.clearForSession(sessionId); - computerUseStatusItem?.clearForSession(sessionId); - computerUseTools.clearSession(sessionId); - await goalWiring.removeSession(sessionId, () => runtime.remove(sessionId)); - invalidateSessionBindings?.(sessionId); - clearSkillHost?.(sessionId); - await releaseBrowserSession(sessionId); - automationManager.removeAllForSession(sessionId); - emitSessionsChanged('deleted', sessionId); - }; - const sessionCopyCleanup = createSessionCopyCleanupAuthority({ - workspaceRoot, - removeSession, - }); - const startupSideConversationCleanup = (async () => { - const failedSessionIds = new Set(); - for (const session of await runtime.listSessions()) { - if (!isSideConversationSession(session.labels)) continue; - try { - await sessionCopyCleanup.cleanup(session.id); - } catch { - failedSessionIds.add(session.id); - } - } - const recovered = await sessionCopyCleanup.recover(); - for (const { sessionId } of recovered.failed) failedSessionIds.add(sessionId); - return failedSessionIds; - })(); - - ipcMain.handle('shell-runs:list', (_event, sessionId: string) => runtime.listShellRunUpdates(sessionId)); - ipcMain.handle( - 'git-review:read', - async ( - _event, - input: { - sessionId?: unknown; - source?: unknown; - baseBranch?: unknown; - }, - ) => { - if (!input || typeof input !== 'object') { - throw new Error('Invalid Git review input'); - } - if (typeof input.sessionId !== 'string' || !input.sessionId) { - throw new Error('Invalid Session id'); - } - if ( - input.source !== 'branch' && - input.source !== 'unstaged' && - input.source !== 'staged' - ) { - throw new Error('Invalid Git review source'); - } - if ( - input.baseBranch !== undefined && - (typeof input.baseBranch !== 'string' || - input.baseBranch.length === 0 || - input.baseBranch.length > 1024 || - /[\u0000-\u001f\u007f]/u.test(input.baseBranch)) - ) { - throw new Error('Invalid Git review base branch'); - } - const header = await store.readHeader(input.sessionId); - const workspace = await stat(header.cwd).catch(() => null); - if (!workspace?.isDirectory()) { - return { ok: false as const, reason: 'workspace_unavailable' as const }; - } - return readGitReview( - header.cwd, - input.source as GitReviewSource, - undefined, - typeof input.baseBranch === 'string' ? input.baseBranch : undefined, - ); - }, - ); - ipcMain.handle( - 'git-review:mutate', - async ( - _event, - input: { - sessionId?: unknown; - source?: unknown; - revision?: unknown; - path?: unknown; - action?: unknown; - }, - ) => { - if (!input || typeof input !== 'object') { - throw new Error('Invalid Git review mutation input'); - } - if (typeof input.sessionId !== 'string' || !input.sessionId) { - throw new Error('Invalid Session id'); - } - if (input.source !== 'unstaged' && input.source !== 'staged') { - throw new Error('Invalid Git review mutation source'); - } - if ( - typeof input.revision !== 'string' || - !/^[a-f0-9]{64}$/u.test(input.revision) - ) { - throw new Error('Invalid Git review revision'); - } - if ( - typeof input.path !== 'string' || - input.path.length === 0 || - input.path.length > 4096 - ) { - throw new Error('Invalid Git review path'); - } - if ( - input.action !== 'stage' && - input.action !== 'unstage' && - input.action !== 'revert' - ) { - throw new Error('Invalid Git review mutation action'); - } - const header = await store.readHeader(input.sessionId); - const workspace = await stat(header.cwd).catch(() => null); - if (!workspace?.isDirectory()) { - return { ok: false as const, reason: 'git_failed' as const }; - } - return mutateGitReview({ - cwd: header.cwd, - source: input.source, - revision: input.revision, - path: input.path, - action: input.action as GitReviewMutationAction, - }); - }, - ); - ipcMain.handle( - 'shell-runs:attach', - (_event, input: { sessionId?: unknown; ref?: unknown }) => { - if (!shellRuns) throw new Error('Interactive terminal is unavailable'); - if (!input || typeof input !== 'object') throw new Error('Invalid terminal attach input'); - if (typeof input.sessionId !== 'string' || !input.sessionId) - throw new Error('Invalid Session id'); - if (typeof input.ref !== 'string' || !input.ref) throw new Error('Invalid terminal ref'); - return shellRuns.getLivePtySnapshot(input.sessionId, input.ref); - }, - ); - ipcMain.handle('shell-runs:start', async (_event, sessionId: unknown) => { - if (!shellRuns) throw new Error('Interactive terminal is unavailable'); - if (typeof sessionId !== 'string' || !sessionId) throw new Error('Invalid Session id'); - await ensureSessionWorkspaceAvailable(sessionId); - const header = await store.readHeader(sessionId); - if (header.isArchived) throw new Error('Cannot start a terminal for an archived Session'); - const identity = `desktop-terminal-${randomUUID()}`; - const shell = defaultShellPlan(); - const env = { ...process.env }; - let command: string; - if (shell.kind === 'posix') { - env.SHELL = selectLoginShell(env.SHELL, userInfo().shell, process.platform); - env.DISABLE_AUTO_UPDATE = 'true'; - env.DISABLE_UPDATE_PROMPT = 'true'; - command = 'exec "$SHELL" -l'; - } else if (shell.kind === 'cmd') { - command = '%ComSpec% /d /q'; - } else { - const executable = (shell.exe ?? shell.displayName).replace(/'/g, "''"); - command = `& '${executable}' -NoLogo`; - } - const result = await shellRuns.runBackgroundBash({ - sessionId, - sourceTurnId: identity, - sourceToolCallId: identity, - cwd: header.cwd, - command, - env, - pty: true, - emitOutput: () => {}, - shell, - }); - const update = await runtime.getShellRunUpdate(sessionId, result.ref); - if (!update) throw new Error('Terminal started without a Runtime Resource projection'); - return update; - }); - ipcMain.handle( - 'shell-runs:write', - async ( - _event, - input: { - sessionId?: unknown; - ref?: unknown; - input?: unknown; - size?: { cols?: unknown; rows?: unknown }; - }, - ) => { - if (!shellRuns) throw new Error('Interactive terminal is unavailable'); - if (!input || typeof input !== 'object') throw new Error('Invalid terminal control input'); - if (typeof input.sessionId !== 'string' || !input.sessionId) - throw new Error('Invalid Session id'); - if (typeof input.ref !== 'string' || !input.ref) throw new Error('Invalid terminal ref'); - const text = input.input; - const size = input.size; - const result = await shellRuns.writeStdin({ - sessionId: input.sessionId, - ref: input.ref, - ...(typeof text === 'string' ? { input: text } : {}), - ...(size && - Number.isInteger(size.cols) && - Number.isInteger(size.rows) - ? { size: { cols: Number(size.cols), rows: Number(size.rows) } } - : {}), - }); - return runtime.getShellRunUpdate(input.sessionId, result.ref); - }, - ); - ipcMain.handle( - 'shell-runs:stop', - async (_event, input: { sessionId?: unknown; ref?: unknown }) => { - if (!shellRuns) throw new Error('Interactive terminal is unavailable'); - if (!input || typeof input !== 'object') throw new Error('Invalid terminal stop input'); - if (typeof input.sessionId !== 'string' || !input.sessionId) - throw new Error('Invalid Session id'); - if (typeof input.ref !== 'string' || !input.ref) throw new Error('Invalid terminal ref'); - await shellRuns.stopBackgroundTask( - input.sessionId, - input.ref, - new AbortController().signal, - ); - return runtime.getShellRunUpdate(input.sessionId, input.ref); - }, - ); - ipcMain.handle('tasks:list', async (_event, sessionId: string) => { - const tasks = await taskLedgerStore.list(sessionId, { - includeTerminal: true, - includeArchived: false, - classifyResumeTrust: true, - ...(e2eFixture ? { now: getE2eFixtureState(e2eFixture)?.now ?? Date.now() } : {}), - }); - return tasks.map(sanitizeTaskLedgerTask); - }); - ipcMain.handle('sessions:list', async (_event, filter?: SessionListFilter) => { - // Listing is also a recovery trigger. Await it so an orphaned hidden - // companion is removed before it can reappear in the sidebar after restart. - const startupFailures = await startupSideConversationCleanup; - const recovery = await sessionCopyCleanup.recover(); - const pendingCleanup = new Set([ - ...startupFailures, - ...recovery.failed.map(({ sessionId }) => sessionId), - ]); - return (await runtime.listSessions(filter)).filter( - ({ id }) => !pendingCleanup.has(id), - ); - }); - ipcMain.handle('sessions:create', async (_event, input?: CreateSessionRequestInput) => { - await startupSideConversationCleanup; - // #1433: `mode` is a product intent, not a session field. What it implies, - // what the renderer may ask for directly, and what the configured default - // fills in are all resolved in one pure place (create-session-input.ts), - // which is also the only place any of it can be tested. - const { permissionMode, collaborationMode, orchestrationMode, name, labels } = - await resolveCreateSessionInput(input, { readSettings: () => settingsStore.get() }); - const parentSessionId = isSideConversationSession(labels) - ? input?.parentSessionId - : undefined; - if (isSideConversationSession(labels)) { - if (typeof parentSessionId !== 'string' || !parentSessionId) { - throw new Error('Side conversation requires a parent Session'); - } - await ensureSessionWorkspaceAvailable(parentSessionId); - } - if (input?.backend === 'fake') { - if (!canCreateFakeSession()) { - throw new Error('FakeBackend sessions are only available in development.'); - } - const session = await createSession({ - ...(input?.cwd ? { cwd: input.cwd } : {}), - projectId: input?.projectId, - backend: 'fake', - llmConnectionSlug: input.llmConnectionSlug ?? 'fake', - model: input.model ?? 'fake-model', - permissionMode, - collaborationMode, - orchestrationMode, - name, - labels, - ...(parentSessionId ? { parentSessionId } : {}), - }); - emitSessionsChanged('created', session.id); - return session; - } - - const requestedSlug = input?.llmConnectionSlug ?? (await connectionStore.getDefault()); - const { connection, model } = await getReadyConnection(requestedSlug, input?.model); - const thinkingLevel = normalizeSupportedSessionThinkingLevel(input?.thinkingLevel, connection, model); - - const session = await createSession({ - ...(input?.cwd ? { cwd: input.cwd } : {}), - projectId: input?.projectId, - backend: 'ai-sdk', - llmConnectionSlug: connection.slug, - model, - ...(thinkingLevel !== undefined ? { thinkingLevel } : {}), - permissionMode, - collaborationMode, - orchestrationMode, - name, - labels, - ...(parentSessionId ? { parentSessionId } : {}), - }); - emitSessionsChanged('created', session.id); - return session; - }); - ipcMain.handle('sessions:readMessages', async (_event, sessionId: string) => { - if (e2eFixture) return store.readMessages(sessionId); - let messages: StoredMessage[]; - try { - messages = await runtime.getMessages(sessionId); - } catch (error) { - throw new Error(sessionReadMessagesFailureMessage(error)); - } - try { - await runtime.markSessionRead(sessionId, latestStoredMessageTs(messages)); - } catch { - // Reading the content already succeeded. Leave the persisted unread - // state for a later refresh instead of turning this into a load error. - } - return messages; - }); - // The Runtime Host candidate uses these channels to bind renderer listeners - // to one atomic transcript/live subscription. Embedded execution already - // owns its stream lifetime, so its implementation is intentionally a no-op. - ipcMain.handle('sessions:observe', () => undefined); - ipcMain.handle('sessions:unobserve', () => undefined); - ipcMain.handle('sessions:listTurns', (_event, sessionId: string) => runtime.listTurns(sessionId)); - // Goal kill-switch surface: the renderer reads the active goal to badge a - // session running an autonomous loop, and clears it to stop the loop. `get` - // returns null when no goal is set; `clear` settles it (continuation stops - // after the current turn). Both are pure local state, so no permission gate. - ipcMain.handle('goal:get', (_event, sessionId: string) => goalWiring.manager.get(sessionId) ?? null); - ipcMain.handle('goal:clear', (_event, sessionId: string) => { - goalWiring.clearGoal(sessionId); - }); - // PR-SEARCH-2: local thread search. Renderer-facing channel; the pure - // helper in `./search/thread-search.ts` enforces all gates (G1 snippet - // redaction, G2 fake-backend exclude, G4 caps, G5 case-fold + NFC, - // G9 tool_result scan cap, G10 system/meta exclusion). The helper - // receives the runtime via DI so unit tests stay Electron-agnostic. - // We deliberately do NOT log the request body — query text never enters - // telemetry. - ipcMain.handle('search:thread', async (_event, request: unknown) => { - // PR-SEARCH-2 review fixup (@xuan `2f1aba55`): pass `unknown` - // through to the helper, which runs an object-shape guard and - // returns an `invalid_query` error envelope for null / non-object - // / missing-field payloads. Never throws across the IPC boundary. - // - // PR-SEARCH-2.5 (@xuan `2c55b975`): wire `getPrivacyContext` to - // the main-authority workspace privacy state. - // - // This is the main-owned workspace privacy source, not a renderer - // self-attestation. The helper validates whatever shape is returned - // via `validateWorkspacePrivacyContext`, so a future drift in - // authority source is automatically fail-closed. - return runThreadSearch(request, { - listSessions: () => runtime.listSessions(), - readMessages: (sessionId: string) => runtime.getMessages(sessionId), - getPrivacyContext: getWorkspacePrivacyContext, - }); - }); - // Named rather than inline so the mirror's stop control and the menu bar - // item's Stop rows can be pointed at it. Every place that stops a run must - // stop it identically. - async function stopSession(sessionId: string, input?: { source?: 'stop_button' }): Promise { - computerUseOverlay.clearForSession(sessionId); - computerUsePip?.clearForSession(sessionId); - computerUseScreenLock?.clearForSession(sessionId); - computerUseStatusItem?.clearForSession(sessionId); - computerUseTools.clearSession(sessionId); - await stopAgentGraph?.(sessionId); - // Read before stopping, while the runs are still registered: ending a turn - // is a change about that turn, and this is the one end a client can be - // waiting on without having seen the turn start — Stop pressed during the - // send→run-start window. Unnamed, it would leave that client's claim with - // nothing to release it, making Stop the one control unable to undo Stop. - const stoppedTurnIds = runtime.runningTurnIds(sessionId); - await runtime.stopSession(sessionId, normalizeStopSessionInput(input)); - await runtime.interruptActivePlanExecution(sessionId, 'user_stopped_execution').catch(() => null); - for (const broadcast of stoppedTurnBroadcasts(stoppedTurnIds)) { - emitSessionsChanged( - broadcast.reason, - sessionId, - ...(broadcast.turnId ? [{ turnId: broadcast.turnId }] : []), - ); - } - } - computerUsePip?.setStopHandler((sessionId) => { - void stopSession(sessionId, { source: 'stop_button' }); - }); - // Codex's status item exposes one action per live session, `stopInstance:`. - // Point ours at the same function the in-app stop button runs, so stopping - // from the menu bar and stopping from the window cannot drift apart. Without - // this the item's rows are permanently disabled — the menu draws them - // `enabled: stopHandler !== undefined` — so the one place a person can stop a - // background run would show them a greyed-out row. - computerUseStatusItem?.setStopHandler((sessionId) => { - void stopSession(sessionId, { source: 'stop_button' }); - }); - ipcMain.handle('sessions:stop', async (_event, sessionId: string, input?: { source?: 'stop_button' }) => - stopSession(sessionId, input), - ); - ipcMain.handle('sessions:readExecutionBoundary', (_event, sessionId: string) => - runtime.readExecutionBoundary(sessionId), - ); - ipcMain.handle('sessions:listActiveInteractions', async (_event, sessionId: string) => { - // Already filtered by retirement: `getE2eFixtureState` is the one owner of - // which fixture requests are still unanswered. - const fixtureRequest = getE2eFixtureState(e2eFixture)?.sandboxBoundaryBySession?.[sessionId]; - // Concatenate rather than choose: the read-back is authoritative for the - // whole queue now, so shadowing the runtime's list behind a fixture - // request would drop a real unanswered one. - return [ - ...(fixtureRequest ? [fixtureRequest] : []), - ...(await runtime.listActiveInteractions(sessionId)), - ]; - }); - ipcMain.handle('sessions:respondToSandboxBoundary', async (_event, sessionId: string, response) => { - const normalized = normalizeSandboxBoundaryResponse(response); - const fixtureRequest = getE2eFixtureState(e2eFixture)?.sandboxBoundaryBySession?.[sessionId]; - if (fixtureRequest?.requestId === normalized.requestId) { - // The fixture request is synthetic — no runtime turn is waiting on it — - // but allowing it must still move the real boundary, or the fixture - // would model an "allow" that grants nothing and no surface built on the - // boundary could be exercised against it (#1611). - if (normalized.decision === 'allow') { - // Retired only once the grant has landed. The runtime drops an active - // request when the decision is acknowledged, not when it is received; - // hiding this one before the write succeeds would let the fixture - // swallow a settlement failure the renderer is about to be told about. - await applyFixtureSandboxBoundaryExpansion(store, sessionId, fixtureRequest.expansion); - } - retireE2eFixtureSandboxBoundaryRequest(normalized.requestId); - return; - } - if (normalized.decision === 'allow') { - await ensureSessionWorkspaceAvailable(sessionId); - } - await runtime.respondToSandboxBoundary(sessionId, normalized); - notifyAgentGraphPermissionResponse?.(sessionId); - }); - ipcMain.handle('sessions:respondToUserQuestion', async (_event, sessionId: string, response) => { - const normalized = normalizeUserQuestionResponse(response); - await ensureSessionWorkspaceAvailable(sessionId); - return runtime.respondToUserQuestion(sessionId, normalized); - }); - ipcMain.handle('sessions:send', async (event, sessionId: string, command: unknown) => { - const sendCommand = normalizeSessionSendCommand(command); - if (!sendCommand) return; - const sendPlan = await prepareSessionSendSkillPlan({ - prepare: () => - prepareSkillInvocation - ? prepareSkillInvocation(sessionId, sendCommand.text, sendCommand.skillIds) - : Promise.resolve({ - disposition: 'passthrough' as const, - sendText: sendCommand.text, - skillInvocation: { loaded: [], failed: [], receipts: [] }, - }), - resolveSend: () => - resolveSessionSend({ - sessionId, - senderId: event.sender.id, - command: sendCommand, - ensureCanSend: ensureSessionCanSend, - readHeader: (id) => store.readHeader(id), - approvals: attachmentApprovals, - stat: async (path) => ({ size: (await stat(path)).size }), - artifactStore, - resizeImage: resizeImageForAttachment, - }), - }); - if (!sendPlan.ok) return sendPlan; - const skillInvocation = sendPlan.preparation; - const { turnId, attachments } = sendPlan.resolved; - const displayText = - sendCommand.displayText ?? - (sendCommand.text.trim().length > 0 - ? sendCommand.text - : skillInvocation.skillInvocation.loaded - .map((skill) => `/skill:${skill.id}`) - .join(' ')); - const inlineReferences = mergeSentInlineReferences({ - displayText, - workspaceFileReferences: sendCommand.workspaceFileReferences, - receipts: skillInvocation.skillInvocation.receipts, - }); - const iterator = runtime.sendMessage( - sessionId, - { - turnId, - text: skillInvocation.sendText, - ...(skillInvocation.disposition === 'ready' || sendCommand.displayText !== undefined - ? { displayText } - : {}), - ...(sendCommand.turnOrchestration - ? { turnOrchestration: sendCommand.turnOrchestration } - : {}), - ...(attachments.length > 0 ? { attachments } : {}), - ...(sendCommand.quotes ? { quotes: sendCommand.quotes } : {}), - inlineReferences, - }, - { - onRunStarted: createRunStartedHook({ - sessionId, - turnId, - emitSessionsChanged: (id, turn) => emitSessionsChanged('status-change', id, { turnId: turn }), - commitRevisionVersion: (id) => runtime.commitRevisionVersion(id), - }), - }, - ); - void streamEvents(sessionId, iterator, { turnId, goalBoundary: 'external' }); - return { - ok: true as const, - turnId, - attachments, - inlineReferences, - skillInvocation: skillInvocation.skillInvocation, - }; - }); - ipcMain.handle('sessions:steer', async (_event, sessionId: string, text: unknown) => { - if (typeof text !== 'string' || text.trim().length === 0 || text.length > 128_000) { - throw new Error('Invalid steering text'); - } - await store.readHeader(sessionId); - return runtime.steer(sessionId, text.trim()); - }); - ipcMain.handle( - 'attachments:pickFiles', - async (event): Promise< - | { ok: true; files: { approvalId: string; name: string; mimeType?: string; size: number }[] } - | { ok: false; reason: 'cancelled' } - > => { - const result = await mainWindowController.showOpenDialog({ - title: '添加附件', - properties: ['openFile', 'multiSelections'], - }); - if (result.canceled || !result.filePaths[0]) return { ok: false, reason: 'cancelled' }; - const chosen = await Promise.all( - result.filePaths.map(async (path) => ({ path, name: basename(path), size: (await stat(path)).size })), - ); - // Paths stay in main; the renderer only gets one-shot opaque tokens. - return { ok: true, files: attachmentApprovals.issueApprovals(event.sender.id, chosen) }; - }, - ); - registerAttachmentPreviewIpc({ - ipcMain, - approvals: attachmentApprovals, - readFile: readFileCapped, - renderPreview: renderAttachmentPreview, - }); - ipcMain.handle( - 'attachments:readBytes', - async (_event, sessionId: string, relativePath: string): Promise< - | { ok: true; base64: string; mimeType: string } - | { ok: false; reason: string } - > => { - // Session-scoped read: only attachments filed under this session. - const record = await artifactStore.get(relativePath).catch(() => null); - if (!record || record.sessionId !== sessionId) return { ok: false, reason: 'not_found' }; - const result = await artifactStore.readBinary(relativePath); - if (!result.ok) return result; - return { ok: true, base64: result.base64, mimeType: result.mimeType }; - }, - ); - ipcMain.handle('sessions:branchFromTurn', async (_event, sessionId: string, input: unknown) => { - await startupSideConversationCleanup; - return handleBranchFromTurn(sessionId, input, { - ensureSessionWorkspaceAvailable, - branchFromTurn: (id, normalized) => runtime.branchFromTurn(id, normalized), - emitCreated: (id) => emitSessionsChanged('created', id), - }); - }); - ipcMain.handle('sessions:reviseBeforeTurn', async (_event, sessionId: string, input: unknown) => { - return handleReviseBeforeTurn(sessionId, input, { - ensureSessionWorkspaceAvailable, - reviseBeforeTurn: (id, normalized) => runtime.reviseBeforeTurn(id, normalized), - emitCreated: (id) => emitSessionsChanged('created', id), - }); - }); - ipcMain.handle('sessions:archive', async (_event, sessionId: string, options?: unknown) => { - for (const id of await resolveSessionActionIds(() => runtime.listSessions(), sessionId, options)) { - computerUseOverlay.clearForSession(id); - computerUsePip?.clearForSession(id); - computerUseScreenLock?.clearForSession(id); - computerUseStatusItem?.clearForSession(id); - computerUseTools.clearSession(id); - await stopAgentGraph?.(id); - await goalWiring.archiveSession(id, () => runtime.archive(id)); - invalidateSessionBindings?.(id); - clearSkillHost?.(id); - await releaseBrowserSession(id); - automationManager.removeAllForSession(id); - emitSessionsChanged('archived', id); - } - }); - ipcMain.handle('sessions:unarchive', async (_event, sessionId: string, options?: unknown) => { - for (const id of await resolveSessionActionIds(() => runtime.listSessions(), sessionId, options)) { - await goalWiring.unarchiveSession(id, () => runtime.unarchive(id)); - emitSessionsChanged('updated', id); - } - }); - ipcMain.handle('sessions:setFlagged', async ( - _event, - sessionId: string, - isFlagged: boolean, - options?: unknown, - ) => { - for (const id of await resolveSessionActionIds(() => runtime.listSessions(), sessionId, options)) { - await runtime.setFlagged(id, isFlagged); - emitSessionsChanged('pinned', id); - } - }); - ipcMain.handle('sessions:rename', async ( - _event, - sessionId: string, - name: string, - options?: unknown, - ) => { - for (const id of await resolveSessionActionIds(() => runtime.listSessions(), sessionId, options)) { - await runtime.renameSession(id, name); - emitSessionsChanged('renamed', id); - } - }); - ipcMain.handle('sessions:setPermissionMode', (_event, sessionId: string, mode: unknown) => { - if (!isPermissionMode(mode)) { - throw new Error(`Invalid permission mode: ${String(mode)}`); - } - return runtime.setPermissionMode(sessionId, mode).then((session) => { - emitSessionsChanged('mode-change', sessionId); - return session; - }); - }); - ipcMain.handle('sessions:setCollaborationMode', (_event, sessionId: string, mode: unknown) => { - if (!isCollaborationMode(mode)) { - throw new Error(`Invalid collaboration mode: ${String(mode)}`); - } - return runtime.setCollaborationMode(sessionId, mode).then((session) => { - emitSessionsChanged('mode-change', sessionId); - return session; - }); - }); - ipcMain.handle('sessions:setOrchestrationMode', (_event, sessionId: string, mode: unknown) => { - if (!isOrchestrationMode(mode)) { - throw new Error(`Invalid orchestration mode: ${String(mode)}`); - } - return runtime.setOrchestrationMode(sessionId, mode).then((session) => { - emitSessionsChanged('mode-change', sessionId); - return session; - }); - }); - ipcMain.handle('plan-mode:getState', (_event, sessionId: string) => - runtime.getPlanState(sessionId)); - ipcMain.handle('plan-mode:requestRevision', async (_event, sessionId: string, proposalId: unknown) => { - if (typeof proposalId !== 'string' || !proposalId) throw new Error('Invalid proposal id'); - const result = await runtime.requestPlanRevision(sessionId, proposalId); - emitSessionsChanged('mode-change', sessionId); - return result.state; - }); - ipcMain.handle('plan-mode:abandon', async ( - _event, - sessionId: string, - proposalId: unknown, - ) => { - if (typeof proposalId !== 'string' || !proposalId) throw new Error('Invalid proposal id'); - const result = await runtime.abandonPlanProposal(sessionId, proposalId); - emitSessionsChanged('mode-change', sessionId); - return result.state; - }); - ipcMain.handle('plan-mode:abandonExecution', async ( - _event, - sessionId: string, - executionId: unknown, - ) => { - if (typeof executionId !== 'string' || !executionId) throw new Error('Invalid execution id'); - const result = await runtime.cancelPlanExecution(sessionId, executionId); - emitSessionsChanged('mode-change', sessionId); - return result.state; - }); - ipcMain.handle('sessions:setModel', async (_event, sessionId: string, input: unknown) => { - const { llmConnectionSlug, model } = normalizeSessionModelSelection(input); - const header = await store.readHeader(sessionId); - if (header.status === 'running') { - throw new Error('当前对话正在运行，等结束后再切换模型。'); - } - if (header.status === 'waiting_for_user') { - throw new Error('当前有工具调用正在等待确认，处理后再切换模型。'); - } - const ready = await getReadyConnection(llmConnectionSlug, model); - const next = await runtime.updateSession(sessionId, { - backend: 'ai-sdk', - llmConnectionSlug: ready.connection.slug, - model: ready.model, - // Switching model clears the per-model thinking variant (see model-thinking.ts). - thinkingLevel: undefined, - connectionLocked: true, - status: 'active', - blockedReason: undefined, - statusUpdatedAt: Date.now(), - }); - emitSessionsChanged('updated', sessionId, { - connectionSlug: ready.connection.slug, - modelId: ready.model, - }); - return next; - }); - ipcMain.handle('sessions:setThinkingLevel', async (_event, sessionId: string, input: unknown) => { - const header = await store.readHeader(sessionId); - if (header.status === 'running') { - throw new Error('当前对话正在运行，等结束后再切换思考级别。'); - } - if (header.status === 'waiting_for_user') { - throw new Error('当前有工具调用正在等待确认，处理后再切换思考级别。'); - } - const connection = await connectionStore.get(header.llmConnectionSlug); - if (!connection) { - throw new Error(`Unknown connection: ${header.llmConnectionSlug}`); - } - const nextThinkingLevel = normalizeSupportedSessionThinkingLevel(input, connection, header.model); - const next = await runtime.updateSession(sessionId, nextThinkingLevel === undefined ? { thinkingLevel: undefined } : { thinkingLevel: nextThinkingLevel }); - emitSessionsChanged('updated', sessionId); - return next; - }); - ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => { - for (const id of await resolveSessionActionIds(() => runtime.listSessions(), sessionId, options)) { - await removeSession(id); - } - }); - ipcMain.handle('sessions:cleanupSessionCopy', async (_event, sessionId: string) => { - if (!(await runtime.listSessions()).some((session) => session.id === sessionId)) return; - await sessionCopyCleanup.cleanup(sessionId); - }); - ipcMain.handle('sessions:abandonSessionCopy', async (_event, sessionId: string) => { - if (!(await runtime.listSessions()).some((session) => session.id === sessionId)) return; - await sessionCopyCleanup.schedule(sessionId); - }); -} - -/** - * Apply an e2e-fixture boundary expansion through the real storage authority. - * - * The fixture's pending request is a synthetic event with no runtime turn - * behind it, so it cannot be settled the normal way. Creating and settling a - * genuine request with the same expansion keeps the boundary — which every - * permission surface reads — honest about what the user just granted, instead - * of leaving "allow" as a no-op the UI can silently contradict. - */ -async function applyFixtureSandboxBoundaryExpansion( - store: SessionStore, - sessionId: string, - expansion: SandboxBoundaryExpansion, -): Promise { - const created = await store.createSandboxBoundaryRequest?.({ - sessionId, - requestId: randomUUID(), - // Provenance is required so a real producer cannot drop it (#1612). This - // request has no turn to point at, so it names itself rather than - // borrowing an id that restart recovery could later attribute a closure to. - turnId: 'e2e-fixture-expansion', - expansion, - justification: 'e2e fixture expansion', - }); - if (!created) return; - await store.settleSandboxBoundaryRequest?.({ - sessionId, - requestId: created.requestId, - decision: 'allow', - }); -} diff --git a/apps/desktop/src/main/settings-ipc-main.ts b/apps/desktop/src/main/settings-ipc-main.ts deleted file mode 100644 index 20354382db..0000000000 --- a/apps/desktop/src/main/settings-ipc-main.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { app, ipcMain, shell } from "electron"; -import type { - AppSettings, - BotOnboardingStartInput, - SettingsTestResult, - UpdateAppSettingsInput, - UpdateAppSettingsResult, -} from "@maka/core"; -import { - SENSITIVE_PLACEHOLDER, - type TestProxyInput, -} from "@maka/core/settings/network-settings"; -import type { BotRegistry } from "@maka/runtime"; -import { testProxyConnection } from "@maka/runtime/network/proxy-test"; -import type { SettingsStore } from "@maka/storage"; -import type { BotOnboardingProviderAdapter } from "./bot-onboarding-main.js"; -import { toContractNetworkSettings } from "./network-settings-main.js"; -import { - buildSettingsUpdateResult, - maskAppSettings, - proxyTestFailure, -} from "./settings-ipc-helpers.js"; -import { registerSettingsBotsIpc } from "./settings-bots-ipc-main.js"; - -export interface SettingsIpcDeps { - settingsStore: SettingsStore; - botRegistry: BotRegistry; - normalizeSettingsPatch: ( - patch: UpdateAppSettingsInput, - ) => Promise; - applySettingsRuntimeEffects: ( - settings: AppSettings, - patch: UpdateAppSettingsInput, - ) => Promise; - botOnboardingAdapters?: Partial< - Record - >; - botOnboardingApplySettingsRuntimeEffects?: ( - settings: AppSettings, - patch: UpdateAppSettingsInput, - ) => Promise; - botOnboardingReadChannelStatus?: ( - provider: BotOnboardingStartInput["provider"], - ) => { running: boolean; reason?: string }; -} - -export interface SettingsIpcHandle { - /** Tear down onboarding sessions (abort polls, clear the session map). */ - dispose(): void; -} - -export function registerSettingsIpc(deps: SettingsIpcDeps): SettingsIpcHandle { - const { - settingsStore, - botRegistry, - normalizeSettingsPatch, - applySettingsRuntimeEffects, - } = deps; - const bots = registerSettingsBotsIpc({ - ipcMain, - settingsStore, - botRegistry, - applySettingsRuntimeEffects: - deps.botOnboardingApplySettingsRuntimeEffects ?? - applySettingsRuntimeEffects, - ...(deps.botOnboardingAdapters - ? { botOnboardingAdapters: deps.botOnboardingAdapters } - : {}), - ...(deps.botOnboardingReadChannelStatus - ? { - botOnboardingReadChannelStatus: deps.botOnboardingReadChannelStatus, - } - : {}), - productVersion: app.getVersion(), - openExternal: (url) => shell.openExternal(url), - }); - - ipcMain.handle("settings:get", async () => - maskAppSettings(await settingsStore.get()), - ); - ipcMain.handle( - "settings:update", - async ( - _event, - patch: UpdateAppSettingsInput, - ): Promise => { - const normalizedPatch = await normalizeSettingsPatch(patch); - const next = await settingsStore.update(normalizedPatch); - await applySettingsRuntimeEffects(next, patch); - return buildSettingsUpdateResult(next, patch); - }, - ); - ipcMain.handle( - "settings:testNetworkProxy", - async (_event, input: TestProxyInput = {}) => { - const started = Date.now(); - const stored = toContractNetworkSettings( - (await settingsStore.get()).network, - ).proxy; - const proxy = - input.proxy?.password === SENSITIVE_PLACEHOLDER - ? { ...input.proxy, password: stored.password } - : input.proxy; - const testedProxy = proxy ?? stored; - const result = await testProxyConnection({ ...input, proxy }, stored); - const latencyMs = result.latencyMs ?? Date.now() - started; - if (!result.ok) { - const failure = proxyTestFailure(result); - return { - ok: false, - ...failure, - latencyMs, - details: { status: result.status }, - } satisfies SettingsTestResult; - } - return { - ok: true, - code: "proxy_reachable", - message: `The proxy ${testedProxy.type}://${testedProxy.host}:${testedProxy.port} is reachable.`, - latencyMs, - details: { - endpoint: `${testedProxy.type}://${testedProxy.host}:${testedProxy.port}`, - status: result.status, - ip: result.ip, - countryCode: result.countryCode, - countryFlag: result.countryFlag, - bypassList: testedProxy.bypassList, - }, - } satisfies SettingsTestResult; - }, - ); - return bots; -} diff --git a/apps/desktop/src/main/settings-runtime-effects.ts b/apps/desktop/src/main/settings-runtime-effects.ts deleted file mode 100644 index b79d760f76..0000000000 --- a/apps/desktop/src/main/settings-runtime-effects.ts +++ /dev/null @@ -1,93 +0,0 @@ -import type { - AppSettings, - UpdateAppSettingsInput, -} from '@maka/core'; -import { setActiveProxy } from '@maka/runtime'; -import type { BotRegistry } from '@maka/runtime'; -import type { createSettingsStore } from '@maka/storage'; -import { preserveSensitivePlaceholders } from './settings-ipc-helpers.js'; -import { maskNetworkSettings, toContractNetworkSettings } from './network-settings-main.js'; -import type { KeepSystemAwakeController } from './keep-system-awake.js'; - -type SettingsStore = ReturnType; - -export interface SettingsRuntimeEffectsDeps { - settingsStore: SettingsStore; - botRegistry: BotRegistry; - keepSystemAwake: KeepSystemAwakeController; - safeSendToRenderer: (channel: string, ...args: unknown[]) => void; -} - -export interface SettingsRuntimeEffects { - /** Merge a settings patch, re-hydrating masked secret placeholders from the - * persisted values so the renderer never has to round-trip a real secret. */ - normalizeSettingsPatch(patch: UpdateAppSettingsInput): Promise; - /** Apply the side effects a settings change implies on the live process: - * proxy, bot bridges, and keep-awake. */ - applySettingsRuntimeEffects(settings: AppSettings, patch: UpdateAppSettingsInput): Promise; - /** Re-apply the full set of runtime effects after an external (config-file) - * settings edit, then notify the renderer to re-read. */ - handleExternalSettingsChange(): Promise; -} - -/** - * Settings runtime-effects cluster extracted from main.ts (arch R5). Pure move - * of `normalizeSettingsPatch` / `applySettingsRuntimeEffects` / - * `handleExternalSettingsChange`. - * The keep-awake effect (#1207) rides `applySettingsRuntimeEffects` unchanged. - * All process-scoped collaborators are injected so the bodies stay behaviorally - * identical to their in-main.ts originals. - */ -export function createSettingsRuntimeEffects( - deps: SettingsRuntimeEffectsDeps, -): SettingsRuntimeEffects { - const { - settingsStore, - botRegistry, - keepSystemAwake, - safeSendToRenderer, - } = deps; - - async function normalizeSettingsPatch(patch: UpdateAppSettingsInput): Promise { - const current = await settingsStore.get(); - return preserveSensitivePlaceholders(patch, current); - } - - async function applySettingsRuntimeEffects(settings: AppSettings, patch: UpdateAppSettingsInput): Promise { - if (patch.network) { - const network = toContractNetworkSettings(settings.network); - setActiveProxy(network.proxy); - safeSendToRenderer('settings:network:changed', maskNetworkSettings(network)); - } - if (patch.botChat) { - await botRegistry.applySettings(settings.botChat); - } - if (patch.system) { - // Start/stop the power-save blocker the instant the toggle flips so the - // capability reflects the user's choice without waiting for a relaunch. - keepSystemAwake.apply(settings.system.keepSystemAwake); - } - } - - async function handleExternalSettingsChange(): Promise { - try { - const settings = await settingsStore.get(); - const fullPatch: UpdateAppSettingsInput = { - network: settings.network, - botChat: settings.botChat, - system: settings.system, - }; - await applySettingsRuntimeEffects(settings, fullPatch); - } catch (error) { - console.error('[config-watcher] failed to apply external settings change:', error); - } - // Always notify renderer, even on partial failure above - safeSendToRenderer('settings:externalChanged', { ts: Date.now() }); - } - - return { - normalizeSettingsPatch, - applySettingsRuntimeEffects, - handleExternalSettingsChange, - }; -} diff --git a/apps/desktop/src/main/skill-open-path.ts b/apps/desktop/src/main/skill-open-path.ts new file mode 100644 index 0000000000..2c9f20ee97 --- /dev/null +++ b/apps/desktop/src/main/skill-open-path.ts @@ -0,0 +1,80 @@ +import { realpath, stat } from 'node:fs/promises'; +import { join } from 'node:path'; +import { + isPathInside, + isSafeSkillId, + resolveSkillDiscoveryPaths, + scanSkillsWithDiagnostics, +} from '@maka/runtime'; + +export type SkillOpenTarget = 'file' | 'directory'; + +export type ResolveSkillOpenPathResult = + | { readonly ok: true; readonly path: string; readonly target: SkillOpenTarget } + | { + readonly ok: false; + readonly reason: + | 'invalid_id' + | 'missing' + | 'blocked_path' + | 'not_file' + | 'not_directory'; + }; + +export async function resolveSkillOpenPath( + workspaceRoot: string, + idOrRef: string, + target: SkillOpenTarget, + projectRoot: string, +): Promise { + if (target !== 'file' && target !== 'directory') return { ok: false, reason: 'missing' }; + + if (!isSafeSkillId(idOrRef)) { + if (!idOrRef.includes(':') || idOrRef.length > 512) { + return { ok: false, reason: 'invalid_id' }; + } + const scan = await scanSkillsWithDiagnostics( + resolveSkillDiscoveryPaths(projectRoot, workspaceRoot), + ); + const skill = [...scan.inventory, ...scan.rejected].find(({ ref }) => ref === idOrRef); + if (!skill) return { ok: false, reason: 'missing' }; + return resolveContainedTarget(skill.discoveryRoot, skill.path, target); + } + + const skillsDir = join(workspaceRoot, 'skills'); + let workspaceReal: string; + let skillsReal: string; + try { + [workspaceReal, skillsReal] = await Promise.all([ + realpath(workspaceRoot), + realpath(skillsDir), + ]); + } catch { + return { ok: false, reason: 'missing' }; + } + if (!isPathInside(workspaceReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; + return resolveContainedTarget(skillsReal, join(skillsDir, idOrRef), target); +} + +async function resolveContainedTarget( + containmentRoot: string, + skillPath: string, + target: SkillOpenTarget, +): Promise { + const candidate = target === 'file' ? join(skillPath, 'SKILL.md') : skillPath; + try { + const [containmentReal, openedPath] = await Promise.all([ + realpath(containmentRoot), + realpath(candidate), + ]); + if (!isPathInside(containmentReal, openedPath)) return { ok: false, reason: 'blocked_path' }; + const opened = await stat(openedPath); + if (target === 'file' && !opened.isFile()) return { ok: false, reason: 'not_file' }; + if (target === 'directory' && !opened.isDirectory()) { + return { ok: false, reason: 'not_directory' }; + } + return { ok: true, path: openedPath, target }; + } catch { + return { ok: false, reason: 'missing' }; + } +} diff --git a/apps/desktop/src/main/skills.ts b/apps/desktop/src/main/skills.ts deleted file mode 100644 index 4d29994e7b..0000000000 --- a/apps/desktop/src/main/skills.ts +++ /dev/null @@ -1,1462 +0,0 @@ -import { lstat, mkdir, readFile, realpath, rename, rm, stat, unlink, writeFile } from 'node:fs/promises'; -import { dirname, join } from 'node:path'; -import { - BUNDLED_SKILL_CATALOG, - buildStarterSkillTemplate, - clearResolvedSkillPreferenceReviews, - createBundledSkillLock, - createManagedSkillLock, - getSkillRuntimePreference, - getBundledSkillSource, - invalidSkillLockStatus, - isPathInside, - isSafeSkillId, - isSkillPreferenceReviewPending, - MANAGED_SKILL_BASELINE_RELATIVE_PATH, - MANAGED_SKILL_CATEGORIES, - migrateSkillRuntimePreferences, - missingSkillLockStatus, - parseSkillFrontMatter, - patchSkillRuntimePreference, - readContainedRegularTextFile, - readManagedSkillSource, - resolveSkillDiscoveryPaths, - resolveManagedSkillSourcesRoot, - resolveSkillPreferenceTarget, - scanSkillsWithDiagnostics, - scanWorkspaceSkills, - selectSkillScanForContext, - validateSkillLock, - writeContainedRegularTextFile, - writeSkillRuntimePreferences, - type HostCapabilities, - type BundledSkillSource, - type ManagedSkillCategory, - type ManagedSkillUpdateStatus, - type RejectedSkillDefinition, - type RuntimeSkillDefinition, - type ScannedSkill, - type SkillContextDecisionReason, - type SkillDiscoverySource, - type SkillDiscoveryDiagnostic, - type SkillRuntimeStatus, - type SkillSelectionReport, - type SkillSourceType, - type SkillScope, - type SkillValidationStatus, - type SkillLockFile, - type SkillLockValidationCode, -} from '@maka/runtime'; - -// Re-export runtime-facing skill exports so existing call sites and tests -// keep importing from './skills.js' unchanged. Governance (lock, provenance, -// managed-source status and built-in skill seeding) stays defined below. -export { - buildSkillAgentTool, - buildSkillSearchAgentTool, - SkillShadowSelectionTracker, - buildSkillsPromptFragment, - buildSkillsPromptFragmentWithReport, - loadSkillInstructions, - parseSkillFrontMatter, - MAX_SKILL_TOOL_BODY_CHARS, -} from '@maka/runtime'; -export type { SkillRuntimeStatus } from '@maka/runtime'; - -export type { SkillSourceType, SkillValidationStatus, ManagedSkillUpdateStatus }; -export type SkillValidationCode = SkillLockValidationCode; - -export interface InstalledSkill extends RuntimeSkillDefinition { - sourceType: SkillSourceType; - sourceName?: string; - sourceVersion?: string; - contentSha256?: string; - installedAt?: string; - userModified: boolean; - validationStatus: SkillValidationStatus; - validationCodes: SkillValidationCode[]; - validationMessages?: string[]; - managedSourceId?: string; - managedUpdateStatus?: ManagedSkillUpdateStatus; - sourceContentSha256?: string; -} - -export interface SkillEntry { - kind: 'skill' | 'discovery_diagnostic'; - ref: string; - id: string; - name: string; - description: string; - path: string; - declaredTools: string[]; - sourceType: 'workspace' | 'bundled' | 'managed' | 'unknown'; - userModified: boolean; - validationStatus: SkillValidationStatus; - managedUpdateStatus?: ManagedSkillUpdateStatus; - enabled: boolean; - pinned: boolean; - runtimeStatus: SkillRuntimeStatus; - scope: SkillScope; - source: SkillDiscoverySource; - contextStatus: SkillContextDecisionReason; - contextRank?: number; - shadowedBy?: string; - /** Legacy id preference matched multiple refs and needs explicit choices. */ - needsReview: boolean; - discoveryDiagnosticReason?: SkillDiscoveryDiagnostic['reason']; - /** Whether this panel can delete the skill. See {@link isManageableSkill}. */ - manageable: boolean; -} - -/** - * Scopes the Skills panel is allowed to delete from. - * - * `workspace`/`legacy` is the original `{workspaceRoot}/skills/` install dir. - * `user` covers `~/.maka/skills` and `~/.agents/skills` — those are the user's - * own installs, so refusing to delete them left the panel showing skills it - * could not manage with no explanation for why the button was missing. - * - * `project` is deliberately excluded: `{cwd}/.maka/skills` and - * `{cwd}/.agents/skills` live inside the user's repo and are normally tracked - * by git. Deleting repo files from an agent panel is a different, more - * surprising action than removing something the user installed for themselves, - * so it stays out until it is asked for explicitly. `custom` is excluded for - * the same reason — its containment root is the scan dir itself, supplied by - * whoever constructed the scan, so there is no user-owned root to anchor to. - */ -export function isManageableSkill(scope: SkillScope, source: SkillDiscoverySource): boolean { - if (scope === 'user') return true; - return scope === 'workspace' && source === 'legacy'; -} - -export interface SkillGovernanceDetails { - id: string; - name: string; - description: string; - path: string; - declaredTools: string[]; - sourceType: SkillSourceType; - userModified: boolean; - validationStatus: SkillValidationStatus; - enabled: boolean; - runtimeStatus: SkillRuntimeStatus; - validationCodes: SkillValidationCode[]; - validationMessages: string[]; - managedSourceId?: string; - managedUpdateStatus?: ManagedSkillUpdateStatus; - hasManagedBaseline: boolean; - sourceAvailable?: boolean; - sourceChanged?: boolean; -} - -export interface ManagedSkillUpdatePreview { - skill: SkillGovernanceDetails; - currentContent: string; - sourceContent: string; - baselineContent?: string; - expectedCurrentSha256: string; - expectedSourceSha256: string; - summary: { - currentLineCount: number; - sourceLineCount: number; - changedLineCount: number; - }; -} - -export type CreateStarterSkillResult = - | { ok: true; created: boolean; skill: InstalledSkill; filePath: string } - | { ok: false; reason: 'blocked_path' | 'already_exists' | 'write_failed' }; - -export type DeleteSkillResult = - | { ok: true } - /** - * `blocked_scope` is distinct from `blocked_path`: the skill was found and - * its path is sound, but its discovery scope is not one this panel deletes - * from (see {@link isManageableSkill}). Keeping it separate stops a policy - * refusal from reading as a path-traversal block in logs and toasts. - */ - | { ok: false; reason: 'not_found' | 'blocked_path' | 'blocked_scope' | 'delete_failed' }; - -export type SkillOpenTarget = 'file' | 'directory'; -export type ResolveSkillOpenPathResult = - | { ok: true; path: string; target: SkillOpenTarget } - | { ok: false; reason: 'invalid_id' | 'missing' | 'blocked_path' | 'not_file' | 'not_directory' }; - -export type SetSkillEnabledResult = - | { ok: true; skill: SkillEntry } - | { - ok: false; - reason: 'not_found' | 'needs_review' | 'blocked_path' | 'state_error' | 'write_failed'; - }; -export type SetSkillPinnedResult = SetSkillEnabledResult; - -interface InstalledSkillDefinition extends InstalledSkill { - content: string; -} - -interface SkillReadOptions { - managedSourceRoot?: string; - cwd?: string; - homeDir?: string; - host?: HostCapabilities; - contextWindow?: number; - /** Exact report from the last prompt build; absent means compute a policy preview. */ - selectionReport?: SkillSelectionReport; -} - -interface ManagedSkillUpdateOptions { - force?: boolean; - expectedCurrentSha256?: string; - expectedSourceSha256?: string; -} - -// Shipped built-in skills are installed on demand from the 内置 tab. Their -// installed copies carry a trusted `bundled` lock (sourceName maka-bundled). -const BUNDLED_CATALOG_BODY_BY_ID = new Map( - BUNDLED_SKILL_CATALOG.map((skill) => [skill.id, skill.body]), -); -const BUNDLED_CATALOG_CATEGORY_DEFAULT: ManagedSkillCategory = '效率工具'; - -/** - * Scan `{workspaceRoot}/skills/` for directories that contain a SKILL.md. - * Parse the YAML front-matter for `name`, `description`, and `allowed-tools`. - * Errors per skill fall through silently so one malformed folder can't blank - * the listing. - * - * `allowed-tools` is intentionally surfaced as "declared/requested" - never - * granted. The active session ExecutionBoundary remains authoritative. - */ -export async function listInstalledSkills(root: string, options: SkillReadOptions = {}): Promise { - const definitions = await readInstalledSkillDefinitions(root, options); - return definitions.map(({ content: _content, ...skill }) => skill); -} - -export async function listGovernedSkillEntries( - root: string, - options: SkillReadOptions = {}, -): Promise { - const scan = await scanSkillsWithDiagnostics( - resolveSkillDiscoveryPaths(options.cwd ?? root, root, options.homeDir), - ); - const installed = ( - await enrichInstalledSkillDefinitions( - scan.inventory.filter( - (skill) => skill.scope === 'workspace' && skill.source === 'legacy', - ), - options, - ) - ).map(({ content: _content, ...skill }) => skill); - const runtimeState = scan.runtimeState; - const migration = runtimeState.ok - ? migrateSkillRuntimePreferences(runtimeState, scan.inventory) - : null; - const effectiveInventory: ScannedSkill[] = scan.inventory.map((skill) => { - const preference = - migration === null ? undefined : getSkillRuntimePreference(migration, skill); - const enabled = preference?.enabled ?? skill.enabled; - return { - ...skill, - enabled, - pinned: preference?.pinned ?? skill.pinned, - runtimeStatus: - skill.runtimeStatus === 'state_error' - ? 'state_error' - : enabled - ? 'enabled' - : 'disabled', - }; - }); - const report = options.selectionReport ?? selectSkillScanForContext( - { ...scan, inventory: effectiveInventory }, - options.host, - { contextWindow: options.contextWindow }, - ).report; - const decisionByRef = new Map(report.decisions.map((decision) => [decision.ref, decision])); - const installedByPath = new Map(installed.map((skill) => [skill.path, skill])); - const validEntries = effectiveInventory.map((skill) => { - const governed = installedByPath.get(skill.path); - const decision = decisionByRef.get(skill.ref); - return toSkillEntry( - { - ...(governed ?? { - ...skill, - sourceType: 'unknown', - userModified: false, - validationStatus: 'ok', - validationCodes: [], - }), - enabled: skill.enabled, - pinned: skill.pinned, - runtimeStatus: skill.runtimeStatus, - }, - decision, - migration === null ? false : isSkillPreferenceReviewPending(migration, skill.id), - ); - }); - return [ - ...validEntries, - ...scan.rejected.map(toRejectedSkillEntry), - ...scan.discoveryDiagnostics.map(toDiscoveryDiagnosticEntry), - ]; -} - -function toRejectedSkillEntry(skill: RejectedSkillDefinition): SkillEntry { - return { - kind: 'skill', - ref: skill.ref, - id: skill.id, - name: skill.name, - description: skill.description, - path: skill.path, - declaredTools: skill.declaredTools, - sourceType: skill.scope === 'workspace' && skill.source === 'legacy' ? 'workspace' : 'unknown', - userModified: false, - validationStatus: 'metadata_error', - enabled: false, - pinned: false, - runtimeStatus: 'disabled', - scope: skill.scope, - source: skill.source, - contextStatus: 'invalid', - needsReview: false, - manageable: isManageableSkill(skill.scope, skill.source), - }; -} - -function toDiscoveryDiagnosticEntry( - diagnostic: SkillDiscoveryDiagnostic, -): SkillEntry { - return { - kind: 'discovery_diagnostic', - ref: `diagnostic:${diagnostic.scope}:${diagnostic.source}:${diagnostic.precedence}`, - id: `source-${diagnostic.precedence}`, - name: '', - description: '', - path: diagnostic.path, - declaredTools: [], - sourceType: 'unknown', - userModified: false, - validationStatus: 'metadata_error', - enabled: false, - pinned: false, - runtimeStatus: 'disabled', - scope: diagnostic.scope, - source: diagnostic.source, - contextStatus: 'invalid', - needsReview: false, - discoveryDiagnosticReason: diagnostic.reason, - manageable: false, - }; -} - -export function toSkillEntry( - skill: InstalledSkill, - decision?: { reason: SkillContextDecisionReason; rank?: number; shadowedBy?: string }, - needsReview = false, -): SkillEntry { - return { - kind: 'skill', - ref: skill.ref, - id: skill.id, - name: skill.name, - description: skill.description, - path: skill.path, - declaredTools: skill.declaredTools, - sourceType: skill.sourceType === 'bundled' || skill.sourceType === 'managed' || skill.sourceType === 'unknown' - ? skill.sourceType - : 'workspace', - userModified: skill.userModified, - validationStatus: skill.validationStatus, - enabled: skill.enabled, - pinned: skill.pinned, - runtimeStatus: skill.runtimeStatus, - scope: skill.scope, - source: skill.source, - contextStatus: decision?.reason ?? (skill.enabled ? 'advertised' : 'disabled'), - ...(decision?.rank !== undefined ? { contextRank: decision.rank } : {}), - ...(decision?.shadowedBy ? { shadowedBy: decision.shadowedBy } : {}), - needsReview, - manageable: isManageableSkill(skill.scope, skill.source), - ...(skill.sourceType === 'managed' && skill.managedUpdateStatus ? { managedUpdateStatus: skill.managedUpdateStatus } : {}), - }; -} - -async function writeSkillLock(skillDir: string, lock: SkillLockFile): Promise { - const lockPath = join(skillDir, 'skill.lock.json'); - const tempPath = join(skillDir, `.skill.lock.json.${process.pid}.${Date.now()}.tmp`); - try { - await writeFile(tempPath, `${JSON.stringify(lock, null, 2)}\n`, { encoding: 'utf8', flag: 'wx', mode: 0o600 }); - const tempStat = await lstat(tempPath); - if (!tempStat.isFile() || tempStat.isSymbolicLink()) { - await unlink(tempPath).catch(() => {}); - return false; - } - await rename(tempPath, lockPath); - return true; - } catch { - await unlink(tempPath).catch(() => {}); - return false; - } -} - -const STARTER_SKILL_ID_PATTERN = /^starter-skill(?:-(\d+))?$/; - -export async function createStarterSkill(root: string): Promise { - const skillsDir = join(root, 'skills'); - try { - await mkdir(skillsDir, { recursive: true, mode: 0o700 }); - const skillsStat = await lstat(skillsDir); - if (!skillsStat.isDirectory() || skillsStat.isSymbolicLink()) { - return { ok: false, reason: 'blocked_path' }; - } - } catch { - return { ok: false, reason: 'write_failed' }; - } - - let skillsReal: string; - try { - skillsReal = await realpath(skillsDir); - } catch { - return { ok: false, reason: 'blocked_path' }; - } - - // Idempotent seeding: if a starter-skill (or starter-skill-N) already exists, - // reuse the lowest-ordinal one instead of minting another. Clicking 添加 used - // to spawn a fresh starter-skill-N per click, leaving duplicate 示例技能 rows - // the user could not tell apart. Reuse the shared loader so the returned skill - // carries the same parsed metadata every other surface sees. - const existingStarter = (await listInstalledSkills(root)) - .map((skill) => { - const match = STARTER_SKILL_ID_PATTERN.exec(skill.id); - return match ? { skill, ordinal: match[1] ? Number(match[1]) : 1 } : null; - }) - .filter((entry): entry is { skill: InstalledSkill; ordinal: number } => entry !== null) - .sort((a, b) => a.ordinal - b.ordinal)[0]; - if (existingStarter) { - return { - ok: true, - created: false, - skill: existingStarter.skill, - filePath: join(existingStarter.skill.path, 'SKILL.md'), - }; - } - - for (let index = 1; index <= 99; index += 1) { - const id = index === 1 ? 'starter-skill' : `starter-skill-${index}`; - // Display name follows the id's ordinal — three clicks used to mint - // three IDENTICAL 「示例技能」 rows (ids differed, names didn't, and the - // slug lives in the tooltip), leaving the list visually indistinguishable. - const name = index === 1 ? '示例技能' : `示例技能 ${index}`; - const skillDir = join(skillsDir, id); - try { - await mkdir(skillDir, { mode: 0o700 }); - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'EEXIST') continue; - return { ok: false, reason: 'write_failed' }; - } - - try { - const skillReal = await realpath(skillDir); - if (!isPathInside(skillsReal, skillReal)) { - return { ok: false, reason: 'blocked_path' }; - } - - const filePath = join(skillDir, 'SKILL.md'); - await writeFile(filePath, buildStarterSkillTemplate(id, name), { - encoding: 'utf8', - flag: 'wx', - mode: 0o600, - }); - return { - ok: true, - created: true, - filePath, - skill: { - ref: `workspace:legacy:${id}`, - id, - name, - description: '把常用工作流写成可复用的本地指令。', - path: skillDir, - declaredTools: ['Read'], - requiredTools: [], - requiredCapabilities: [], - sourceType: 'workspace', - userModified: false, - validationStatus: 'missing_lock', - validationCodes: ['missing_lock'], - enabled: true, - pinned: false, - runtimeStatus: 'enabled', - scope: 'workspace', - source: 'legacy', - precedence: 0, - }, - }; - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'EEXIST') continue; - return { ok: false, reason: 'write_failed' }; - } - } - - return { ok: false, reason: 'already_exists' }; -} - -/** - * Delete a discovered skill directory by scope-aware `ref`. - * - * The caller only ever supplies the ref string; the directory to remove is - * re-derived from a fresh discovery scan, never from renderer-supplied input. - * On top of that the target must clear four checks before anything is removed: - * - * 1. its scope is deletable ({@link isManageableSkill}), - * 2. it is a real directory and not a symlink (so the rm cannot follow a link - * out of the scan root), - * 3. its parent is one of the discovery dirs this scan actually enumerated — - * the tight check, since the containment root for user scope is the whole - * home dir, - * 4. and it is still inside its discovery root after realpath resolution. - * - * Mirrors `resolveSkillOpenPath`'s ref branch, with (1) and (3) added because - * this operation is destructive and irreversible. - */ -async function deleteSkillByRef( - root: string, - ref: string, - options: SkillReadOptions = {}, -): Promise { - if (ref.length > 512) return { ok: false, reason: 'not_found' }; - - const discovery = resolveSkillDiscoveryPaths(options.cwd ?? root, root, options.homeDir); - const scan = await scanSkillsWithDiagnostics(discovery); - const skill = [...scan.inventory, ...scan.rejected].find((candidate) => candidate.ref === ref); - if (!skill) return { ok: false, reason: 'not_found' }; - if (!isManageableSkill(skill.scope, skill.source)) return { ok: false, reason: 'blocked_scope' }; - - let skillReal: string; - try { - const skillStat = await lstat(skill.path); - if (!skillStat.isDirectory() || skillStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - skillReal = await realpath(skill.path); - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'ENOENT') return { ok: false, reason: 'not_found' }; - return { ok: false, reason: 'blocked_path' }; - } - - // The skill must sit DIRECTLY in a dir the scan enumerated. Comparing against - // discovery dirs rather than `discoveryRoot` is what keeps a user-scope - // delete pinned to ~/.maka/skills or ~/.agents/skills instead of anywhere - // under $HOME. - const parentReal = dirname(skillReal); - const discoveryDirsReal = await Promise.all( - discovery.entries.map((entry) => realpath(entry.dir).catch(() => null)), - ); - if (!discoveryDirsReal.some((dir) => dir !== null && dir === parentReal)) { - return { ok: false, reason: 'blocked_path' }; - } - - try { - const containmentReal = await realpath(skill.discoveryRoot); - if (!isPathInside(containmentReal, skillReal)) return { ok: false, reason: 'blocked_path' }; - } catch { - return { ok: false, reason: 'blocked_path' }; - } - - try { - await rm(skillReal, { recursive: true }); - return { ok: true }; - } catch { - return { ok: false, reason: 'delete_failed' }; - } -} - -/** - * Delete an installed skill directory. Accepts either a scope-aware `ref` - * (`user:agents:`, `workspace:legacy:`, …) which routes to - * {@link deleteSkillByRef}, or a bare workspace id for the original - * {root}/skills/ path kept below. - * - * The bare-id path is path-hardened exactly like createStarterSkill / - * installManagedSkill: the skills dir and the skill dir must both be real, - * contained directories (no symlinks, no escape outside the workspace) before - * anything is removed. The recursive rm also clears any managed-skill baseline - * metadata under the skill's .maka/ subtree. - */ -export async function deleteSkill( - root: string, - idOrRef: string, - options: SkillReadOptions = {}, -): Promise { - // A ref always contains ':', which `isSafeSkillId` rejects — so a value that - // fails the id check but looks like a ref is routed rather than refused. - if (!isSafeSkillId(idOrRef)) { - if (!idOrRef.includes(':')) return { ok: false, reason: 'not_found' }; - return deleteSkillByRef(root, idOrRef, options); - } - - const id = idOrRef; - const skillsDir = join(root, 'skills'); - let skillsReal: string; - try { - const [rootReal, skillsStat] = await Promise.all([realpath(root), lstat(skillsDir)]); - if (!skillsStat.isDirectory() || skillsStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - skillsReal = await realpath(skillsDir); - if (!isPathInside(rootReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; - } catch { - return { ok: false, reason: 'not_found' }; - } - - const skillDir = join(skillsDir, id); - let skillReal: string; - try { - const skillStat = await lstat(skillDir); - if (!skillStat.isDirectory() || skillStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - skillReal = await realpath(skillDir); - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'ENOENT') return { ok: false, reason: 'not_found' }; - return { ok: false, reason: 'blocked_path' }; - } - if (!isPathInside(skillsReal, skillReal)) return { ok: false, reason: 'blocked_path' }; - - try { - await rm(skillReal, { recursive: true }); - return { ok: true }; - } catch { - return { ok: false, reason: 'delete_failed' }; - } -} - -export async function installManagedSkill( - root: string, - sourceId: string, - sourceRoot = resolveManagedSkillSourcesRoot(), -): Promise< - | { ok: true; skill: InstalledSkill } - | { ok: false; reason: 'not_found' | 'already_exists' | 'blocked_path' | 'write_failed' } -> { - if (!isSafeSkillId(sourceId)) return { ok: false, reason: 'not_found' }; - const source = await readManagedSkillSource(sourceRoot, sourceId); - if (!source.ok) { - if (source.reason === 'blocked_path') return { ok: false, reason: 'blocked_path' }; - return { ok: false, reason: 'not_found' }; - } - - const skillsDir = join(root, 'skills'); - let skillsReal: string; - try { - await mkdir(skillsDir, { recursive: true, mode: 0o700 }); - const skillsStat = await lstat(skillsDir); - if (!skillsStat.isDirectory() || skillsStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - const rootReal = await realpath(root); - skillsReal = await realpath(skillsDir); - if (!isPathInside(rootReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; - } catch { - return { ok: false, reason: 'write_failed' }; - } - - const skillDir = join(skillsDir, sourceId); - const skillFile = join(skillDir, 'SKILL.md'); - let createdSkillDir = false; - try { - await mkdir(skillDir, { mode: 0o700 }); - createdSkillDir = true; - const skillReal = await realpath(skillDir); - if (!isPathInside(skillsReal, skillReal)) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'blocked_path' }; - } - await writeFile(skillFile, source.content, { encoding: 'utf8', flag: 'wx', mode: 0o600 }); - if ( - !await writeSkillLock( - skillDir, - createManagedSkillLock(sourceId, source.contentSha256, source.contentSha256), - ) - ) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'write_failed' }; - } - if (!await writeManagedSkillBaseline(skillDir, source.content)) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'write_failed' }; - } - const installed = await listInstalledSkills(root, { managedSourceRoot: sourceRoot }); - const skill = installed.find((candidate) => candidate.id === sourceId); - if (!skill) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'write_failed' }; - } - return { ok: true, skill }; - } catch (error) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - if ((error as NodeJS.ErrnoException).code === 'EEXIST') return { ok: false, reason: 'already_exists' }; - return { ok: false, reason: 'write_failed' }; - } -} - -export interface BundledSkillCatalogEntry { - id: string; - name: string; - description: string; - category: ManagedSkillCategory; - declaredTools: string[]; - installed: boolean; -} - -export type InstallBundledSkillResult = - | { ok: true; skill: InstalledSkill } - | { ok: false; reason: 'not_found' | 'already_exists' | 'blocked_path' | 'write_failed' }; - -export type EnsureBundledSkillInstalledResult = - | { ok: true; action: 'installed' | 'updated' | 'already_installed'; skill: InstalledSkill } - | { - ok: false; - reason: 'not_found' | 'blocked_path' | 'write_failed' | 'existing_untrusted'; - }; - -function parseBundledSkillCategory(body: string): ManagedSkillCategory { - if (!body.startsWith('---')) return BUNDLED_CATALOG_CATEGORY_DEFAULT; - const close = body.indexOf('\n---', 3); - if (close < 0) return BUNDLED_CATALOG_CATEGORY_DEFAULT; - for (const raw of body.slice(3, close).split(/\r?\n/)) { - const match = raw.match(/^category:\s*(.*)$/); - if (!match) continue; - const value = match[1].trim().replace(/^['"]|['"]$/g, ''); - return (MANAGED_SKILL_CATEGORIES as readonly string[]).includes(value) - ? (value as ManagedSkillCategory) - : BUNDLED_CATALOG_CATEGORY_DEFAULT; - } - return BUNDLED_CATALOG_CATEGORY_DEFAULT; -} - -/** - * The built-in (内置) catalog. `installed` reflects whether the current - * workspace already has skills/. The renderer surfaces this under the 内置 - * tab with a per-entry install action that calls `installBundledSkill`. - */ -export async function listBundledSkillCatalog(root: string): Promise { - const installedIds = new Set((await listInstalledSkills(root)).map((skill) => skill.id)); - return BUNDLED_SKILL_CATALOG - .map(({ id, body }) => { - const { name, description, allowedTools } = parseSkillFrontMatter(body); - return { - id, - name: name ?? id, - description: description ?? '', - category: parseBundledSkillCategory(body), - declaredTools: allowedTools, - installed: installedIds.has(id), - }; - }) - .sort((a, b) => a.name.localeCompare(b.name)); -} - -async function writeBundledCatalogLock(skillDir: string, id: string, body: string): Promise { - const source = getBundledSkillSource(id); - if (!source || source.body !== body) return false; - return writeSkillLock(skillDir, createBundledSkillLock(source)); -} - -/** - * Install a built-in catalog skill into {root}/skills/ on demand. Mirrors - * installManagedSkill's hardened write path (containment checks, fail-if-exists) - * but sources the body from the shipped catalog. - */ -export async function installBundledSkill(root: string, id: string): Promise { - if (!isSafeSkillId(id)) return { ok: false, reason: 'not_found' }; - const body = BUNDLED_CATALOG_BODY_BY_ID.get(id); - if (body === undefined) return { ok: false, reason: 'not_found' }; - - const skillsDir = join(root, 'skills'); - let skillsReal: string; - try { - await mkdir(skillsDir, { recursive: true, mode: 0o700 }); - const skillsStat = await lstat(skillsDir); - if (!skillsStat.isDirectory() || skillsStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - const rootReal = await realpath(root); - skillsReal = await realpath(skillsDir); - if (!isPathInside(rootReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; - } catch { - return { ok: false, reason: 'write_failed' }; - } - - const skillDir = join(skillsDir, id); - const skillFile = join(skillDir, 'SKILL.md'); - let createdSkillDir = false; - try { - await mkdir(skillDir, { mode: 0o700 }); - createdSkillDir = true; - const skillReal = await realpath(skillDir); - if (!isPathInside(skillsReal, skillReal)) { - await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'blocked_path' }; - } - await writeFile(skillFile, body, { encoding: 'utf8', flag: 'wx', mode: 0o600 }); - const lockWritten = await writeBundledCatalogLock(skillDir, id, body); - if (!lockWritten) { - await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'write_failed' }; - } - const installed = await listInstalledSkills(root); - const skill = installed.find((candidate) => candidate.id === id); - if (!skill) { - await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - return { ok: false, reason: 'write_failed' }; - } - return { ok: true, skill }; - } catch (error) { - if (createdSkillDir) await rm(skillDir, { recursive: true, force: true }).catch(() => {}); - if ((error as NodeJS.ErrnoException).code === 'EEXIST') return { ok: false, reason: 'already_exists' }; - return { ok: false, reason: 'write_failed' }; - } -} - -/** - * Seed one product-owned bundled Skill without overwriting a workspace file. - * - * A core capability may need its operating guide before the model can use that - * capability correctly. Repeated startup is idempotent, but an existing - * untrusted or modified copy is never replaced silently. - */ -export async function ensureBundledSkillInstalled( - root: string, - id: string, -): Promise { - const source = getBundledSkillSource(id); - if (!source) return { ok: false, reason: 'not_found' }; - const existing = (await listInstalledSkills(root)).find((skill) => skill.id === id); - if (existing) return reconcileBundledSkill(root, existing, source); - - const installed = await installBundledSkill(root, id); - if (installed.ok) return { ok: true, action: 'installed', skill: installed.skill }; - switch (installed.reason) { - case 'not_found': - case 'blocked_path': - case 'write_failed': - return { ok: false, reason: installed.reason }; - case 'already_exists': - break; - } - - // Another startup may have won the mkdir race. Re-read the authoritative - // installed projection instead of treating EEXIST as either success or loss. - const raced = (await listInstalledSkills(root)).find((skill) => skill.id === id); - return raced - ? reconcileBundledSkill(root, raced, source) - : { ok: false, reason: 'write_failed' }; -} - -async function reconcileBundledSkill( - root: string, - skill: InstalledSkill, - source: BundledSkillSource, -): Promise { - if (!isTrustedBundledSkill(skill)) return { ok: false, reason: 'existing_untrusted' }; - if (skill.contentSha256?.toLowerCase() === source.contentSha256.toLowerCase()) { - return { ok: true, action: 'already_installed', skill }; - } - if ( - !skill.contentSha256 - || !source.legacyContentSha256.some( - (hash) => hash.toLowerCase() === skill.contentSha256?.toLowerCase(), - ) - ) { - return { ok: false, reason: 'existing_untrusted' }; - } - return updateBundledSkill(root, skill, source); -} - -function isTrustedBundledSkill(skill: InstalledSkill): boolean { - return ( - skill.sourceType === 'bundled' - && skill.sourceName === 'maka-bundled' - && skill.userModified === false - && skill.validationStatus === 'ok' - ); -} - -async function updateBundledSkill( - root: string, - skill: InstalledSkill, - source: BundledSkillSource, -): Promise { - const target = await resolveSkillFileUpdateTarget(root, skill.id); - if (!target.ok) { - return { - ok: false, - reason: target.reason === 'blocked_path' ? 'blocked_path' : 'write_failed', - }; - } - - const skillDir = join(root, 'skills', skill.id); - const skillFile = join(skillDir, 'SKILL.md'); - const lockFile = join(skillDir, 'skill.lock.json'); - try { - const [current, currentLock] = await Promise.all([ - readContainedRegularTextFile(skillDir, skillFile), - readContainedRegularTextFile(skillDir, lockFile), - ]); - if (!current.ok) { - return { - ok: false, - reason: current.reason === 'blocked_path' ? 'blocked_path' : 'write_failed', - }; - } - if (!currentLock.ok) { - return { - ok: false, - reason: currentLock.reason === 'blocked_path' ? 'blocked_path' : 'write_failed', - }; - } - if ( - !skill.contentSha256 - || current.sha256.toLowerCase() !== skill.contentSha256.toLowerCase() - ) { - return { ok: false, reason: 'existing_untrusted' }; - } - - const restorePrevious = async () => { - await writeContainedRegularTextFile(skillDir, skillFile, current.content).catch(() => {}); - await writeContainedRegularTextFile(skillDir, lockFile, currentLock.content).catch(() => {}); - }; - if (!await writeContainedRegularTextFile(skillDir, skillFile, source.body)) { - return { ok: false, reason: 'write_failed' }; - } - if (!await writeSkillLock(skillDir, createBundledSkillLock(source))) { - await restorePrevious(); - return { ok: false, reason: 'write_failed' }; - } - - const updated = (await listInstalledSkills(root)).find( - (candidate) => candidate.id === skill.id, - ); - if ( - !updated - || !isTrustedBundledSkill(updated) - || updated.contentSha256?.toLowerCase() !== source.contentSha256.toLowerCase() - ) { - await restorePrevious(); - return { ok: false, reason: 'write_failed' }; - } - return { ok: true, action: 'updated', skill: updated }; - } catch { - return { ok: false, reason: 'write_failed' }; - } -} - -export async function updateManagedSkill( - root: string, - skillId: string, - sourceRoot = resolveManagedSkillSourcesRoot(), - options: ManagedSkillUpdateOptions = {}, -): Promise< - | { ok: true; skill: InstalledSkill } - | { ok: false; reason: 'not_managed' | 'source_missing' | 'local_modified' | 'metadata_error' | 'blocked_path' | 'write_failed' } -> { - if (!isSafeSkillId(skillId)) return { ok: false, reason: 'not_managed' }; - const updateTarget = await resolveSkillFileUpdateTarget(root, skillId); - if (!updateTarget.ok && updateTarget.reason === 'blocked_path') return { ok: false, reason: 'blocked_path' }; - const installed = await listInstalledSkills(root, { managedSourceRoot: sourceRoot }); - const skill = installed.find((candidate) => candidate.id === skillId); - if (!skill) return { ok: false, reason: 'not_managed' }; - if (skill.validationStatus === 'metadata_error' || skill.managedUpdateStatus === 'metadata_error') { - return { ok: false, reason: 'metadata_error' }; - } - if (skill.sourceType !== 'managed' || !skill.managedSourceId) return { ok: false, reason: 'not_managed' }; - if (skill.managedUpdateStatus === 'local_modified' && !options.force) return { ok: false, reason: 'local_modified' }; - if (skill.managedUpdateStatus === 'source_missing') return { ok: false, reason: 'source_missing' }; - - const source = await readManagedSkillSource(sourceRoot, skill.managedSourceId); - if (!source.ok) { - if (source.reason === 'blocked_path') return { ok: false, reason: 'blocked_path' }; - return { ok: false, reason: 'source_missing' }; - } - - const skillDir = join(root, 'skills', skillId); - const skillFile = join(skillDir, 'SKILL.md'); - const lockFile = join(skillDir, 'skill.lock.json'); - try { - const [skillsReal, skillReal, current, currentLock] = await Promise.all([ - realpath(join(root, 'skills')), - realpath(skillDir), - readContainedRegularTextFile(skillDir, skillFile), - readContainedRegularTextFile(skillDir, lockFile), - ]); - if (!isPathInside(skillsReal, skillReal)) return { ok: false, reason: 'blocked_path' }; - if (!current.ok) return { ok: false, reason: current.reason === 'blocked_path' ? 'blocked_path' : 'write_failed' }; - if (!currentLock.ok) return { ok: false, reason: currentLock.reason === 'blocked_path' ? 'blocked_path' : 'write_failed' }; - - const hasExpectedHashes = options.expectedCurrentSha256 !== undefined || options.expectedSourceSha256 !== undefined; - if (options.force || hasExpectedHashes) { - if ( - !isSha256(options.expectedCurrentSha256) || - !isSha256(options.expectedSourceSha256) || - current.sha256.toLowerCase() !== options.expectedCurrentSha256.toLowerCase() || - source.contentSha256.toLowerCase() !== options.expectedSourceSha256.toLowerCase() - ) { - return { ok: false, reason: 'local_modified' }; - } - } - const previousBaseline = await readManagedSkillBaseline(skillDir); - const restorePrevious = async () => { - await writeContainedRegularTextFile(skillDir, skillFile, current.content).catch(() => {}); - await writeContainedRegularTextFile(skillDir, lockFile, currentLock.content).catch(() => {}); - if (previousBaseline !== undefined) { - await writeManagedSkillBaseline(skillDir, previousBaseline).catch(() => {}); - } else { - await removeManagedSkillBaseline(skillDir).catch(() => {}); - } - }; - - if (!await writeContainedRegularTextFile(skillDir, skillFile, source.content)) { - return { ok: false, reason: 'write_failed' }; - } - if ( - !await writeSkillLock( - skillDir, - createManagedSkillLock( - skillId, - source.contentSha256, - source.contentSha256, - skill.managedSourceId, - ), - ) - ) { - await restorePrevious(); - return { ok: false, reason: 'write_failed' }; - } - if (!await writeManagedSkillBaseline(skillDir, source.content)) { - await restorePrevious(); - return { ok: false, reason: 'write_failed' }; - } - const refreshed = await listInstalledSkills(root, { managedSourceRoot: sourceRoot }); - const updated = refreshed.find((candidate) => candidate.id === skillId); - if (!updated) { - await restorePrevious(); - return { ok: false, reason: 'write_failed' }; - } - return { ok: true, skill: updated }; - } catch { - return { ok: false, reason: 'write_failed' }; - } -} - -async function resolveSkillFileUpdateTarget(root: string, skillId: string): Promise< - | { ok: true } - | { ok: false; reason: 'missing' | 'blocked_path' } -> { - const skillsDir = join(root, 'skills'); - const skillDir = join(skillsDir, skillId); - const skillFile = join(skillDir, 'SKILL.md'); - try { - const [rootReal, skillsStat] = await Promise.all([realpath(root), lstat(skillsDir)]); - if (!skillsStat.isDirectory() || skillsStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - const skillsReal = await realpath(skillsDir); - if (!isPathInside(rootReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; - - const skillStat = await lstat(skillDir); - if (!skillStat.isDirectory() || skillStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - const skillReal = await realpath(skillDir); - if (!isPathInside(skillsReal, skillReal)) return { ok: false, reason: 'blocked_path' }; - - const fileStat = await lstat(skillFile); - if (!fileStat.isFile() || fileStat.isSymbolicLink()) return { ok: false, reason: 'blocked_path' }; - const fileReal = await realpath(skillFile); - if (!isPathInside(skillReal, fileReal)) return { ok: false, reason: 'blocked_path' }; - return { ok: true }; - } catch { - return { ok: false, reason: 'missing' }; - } -} - -export async function getSkillGovernanceDetails( - root: string, - skillId: string, - sourceRoot = resolveManagedSkillSourcesRoot(), -): Promise< - | { ok: true; details: SkillGovernanceDetails } - | { ok: false; reason: 'not_found' | 'invalid_id' } -> { - if (!isSafeSkillId(skillId)) return { ok: false, reason: 'invalid_id' }; - const installed = await listInstalledSkills(root, { managedSourceRoot: sourceRoot }); - const skill = installed.find((candidate) => candidate.id === skillId); - if (!skill) return { ok: false, reason: 'not_found' }; - return { ok: true, details: await toSkillGovernanceDetails(skill, sourceRoot) }; -} - -export async function previewManagedSkillUpdate( - root: string, - skillId: string, - sourceRoot = resolveManagedSkillSourcesRoot(), -): Promise< - | { ok: true; preview: ManagedSkillUpdatePreview } - | { ok: false; reason: 'not_managed' | 'source_missing' | 'metadata_error' | 'blocked_path' | 'read_failed' } -> { - if (!isSafeSkillId(skillId)) return { ok: false, reason: 'not_managed' }; - const updateTarget = await resolveSkillFileUpdateTarget(root, skillId); - if (!updateTarget.ok && updateTarget.reason === 'blocked_path') return { ok: false, reason: 'blocked_path' }; - const installed = await listInstalledSkills(root, { managedSourceRoot: sourceRoot }); - const skill = installed.find((candidate) => candidate.id === skillId); - if (!skill || skill.sourceType !== 'managed' || !skill.managedSourceId) return { ok: false, reason: 'not_managed' }; - if (skill.validationStatus === 'metadata_error' || skill.managedUpdateStatus === 'metadata_error') { - return { ok: false, reason: 'metadata_error' }; - } - if (skill.managedUpdateStatus === 'source_missing') return { ok: false, reason: 'source_missing' }; - - const source = await readManagedSkillSource(sourceRoot, skill.managedSourceId); - if (!source.ok) { - if (source.reason === 'blocked_path') return { ok: false, reason: 'blocked_path' }; - return { ok: false, reason: 'source_missing' }; - } - - const skillDir = join(root, 'skills', skillId); - const skillFile = join(skillDir, 'SKILL.md'); - try { - const [skillsReal, skillReal, current] = await Promise.all([ - realpath(join(root, 'skills')), - realpath(skillDir), - readContainedRegularTextFile(skillDir, skillFile), - ]); - if (!isPathInside(skillsReal, skillReal)) return { ok: false, reason: 'blocked_path' }; - if (!current.ok) return { ok: false, reason: current.reason === 'blocked_path' ? 'blocked_path' : 'read_failed' }; - const baselineContent = await readManagedSkillBaseline(skillDir); - return { - ok: true, - preview: { - skill: await toSkillGovernanceDetails(skill, sourceRoot), - currentContent: current.content, - sourceContent: source.content, - ...(baselineContent !== undefined ? { baselineContent } : {}), - expectedCurrentSha256: current.sha256, - expectedSourceSha256: source.contentSha256, - summary: diffSummary(current.content, source.content), - }, - }; - } catch { - return { ok: false, reason: 'read_failed' }; - } -} - -async function toSkillGovernanceDetails(skill: InstalledSkill, sourceRoot: string): Promise { - const baselineContent = skill.sourceType === 'managed' - ? await readManagedSkillBaseline(skill.path) - : undefined; - let sourceAvailable: boolean | undefined; - let sourceChanged: boolean | undefined; - if (skill.sourceType === 'managed' && skill.managedSourceId) { - const source = await readManagedSkillSource(sourceRoot, skill.managedSourceId); - sourceAvailable = source.ok; - sourceChanged = source.ok && skill.sourceContentSha256 !== undefined - ? source.contentSha256.toLowerCase() !== skill.sourceContentSha256.toLowerCase() - : undefined; - } - return { - id: skill.id, - name: skill.name, - description: skill.description, - path: skill.path, - declaredTools: skill.declaredTools, - sourceType: skill.sourceType, - userModified: skill.userModified, - validationStatus: skill.validationStatus, - enabled: skill.enabled, - runtimeStatus: skill.runtimeStatus, - validationCodes: skill.validationCodes, - validationMessages: skill.validationMessages ?? [], - ...(skill.managedSourceId ? { managedSourceId: skill.managedSourceId } : {}), - ...(skill.managedUpdateStatus ? { managedUpdateStatus: skill.managedUpdateStatus } : {}), - hasManagedBaseline: baselineContent !== undefined, - ...(sourceAvailable !== undefined ? { sourceAvailable } : {}), - ...(sourceChanged !== undefined ? { sourceChanged } : {}), - }; -} - -async function writeManagedSkillBaseline(skillDir: string, content: string): Promise { - try { - const baselineFile = join(skillDir, MANAGED_SKILL_BASELINE_RELATIVE_PATH); - const baselineDir = dirname(baselineFile); - const metadataDir = dirname(baselineDir); - await mkdir(metadataDir, { mode: 0o700 }).catch((error: NodeJS.ErrnoException) => { - if (error.code !== 'EEXIST') throw error; - }); - await mkdir(baselineDir, { mode: 0o700 }).catch((error: NodeJS.ErrnoException) => { - if (error.code !== 'EEXIST') throw error; - }); - - const resolved = await resolveManagedSkillBaselineDir(skillDir); - if (!resolved.ok) return false; - return writeContainedRegularTextFile(resolved.baselineDir, baselineFile, content); - } catch { - return false; - } -} - -async function readManagedSkillBaseline(skillDir: string): Promise { - const resolved = await resolveManagedSkillBaselineDir(skillDir); - if (!resolved.ok) return undefined; - const baselineFile = join(skillDir, MANAGED_SKILL_BASELINE_RELATIVE_PATH); - const baseline = await readContainedRegularTextFile(resolved.baselineDir, baselineFile); - return baseline.ok ? baseline.content : undefined; -} - -async function removeManagedSkillBaseline(skillDir: string): Promise { - const resolved = await resolveManagedSkillBaselineDir(skillDir); - if (!resolved.ok) return; - const baselineFile = join(skillDir, MANAGED_SKILL_BASELINE_RELATIVE_PATH); - const [baselineReal, fileStat] = await Promise.all([ - realpath(resolved.baselineDir), - lstat(baselineFile).catch((error: NodeJS.ErrnoException) => { - if (error.code === 'ENOENT') return null; - throw error; - }), - ]); - if (fileStat === null) return; - if (!fileStat.isFile() || fileStat.isSymbolicLink()) return; - const fileReal = await realpath(baselineFile); - if (!isPathInside(baselineReal, fileReal)) return; - await unlink(baselineFile); -} - -async function resolveManagedSkillBaselineDir(skillDir: string): Promise< - | { ok: true; baselineDir: string } - | { ok: false } -> { - try { - const baselineDir = dirname( - join(skillDir, MANAGED_SKILL_BASELINE_RELATIVE_PATH), - ); - const metadataDir = dirname(baselineDir); - const [skillReal, metadataStat, baselineStat] = await Promise.all([ - realpath(skillDir), - lstat(metadataDir), - lstat(baselineDir), - ]); - if ( - !metadataStat.isDirectory() || - metadataStat.isSymbolicLink() || - !baselineStat.isDirectory() || - baselineStat.isSymbolicLink() - ) { - return { ok: false }; - } - const [metadataReal, baselineReal] = await Promise.all([realpath(metadataDir), realpath(baselineDir)]); - if (!isPathInside(skillReal, metadataReal) || !isPathInside(metadataReal, baselineReal)) return { ok: false }; - return { ok: true, baselineDir }; - } catch { - return { ok: false }; - } -} - -export async function setSkillEnabled( - root: string, - skillRefOrId: string, - enabled: boolean, - options: SkillReadOptions = {}, -): Promise { - return setSkillPreference(root, skillRefOrId, { enabled }, options); -} - -export async function setSkillPinned( - root: string, - skillRefOrId: string, - pinned: boolean, - options: SkillReadOptions = {}, -): Promise { - return setSkillPreference(root, skillRefOrId, { pinned }, options); -} - -async function setSkillPreference( - root: string, - skillRefOrId: string, - patch: { enabled?: boolean; pinned?: boolean }, - options: SkillReadOptions, -): Promise { - const source = resolveSkillDiscoveryPaths(options.cwd ?? root, root, options.homeDir); - const scan = await scanSkillsWithDiagnostics(source); - const resolvedTarget = resolveSkillPreferenceTarget(scan.inventory, skillRefOrId); - if (!resolvedTarget.ok) return resolvedTarget; - const target = resolvedTarget.target; - const current = scan.runtimeState; - if (!current.ok) { - return { ok: false, reason: current.reason === 'blocked_path' ? 'blocked_path' : 'state_error' }; - } - const migration = clearResolvedSkillPreferenceReviews( - patchSkillRuntimePreference( - migrateSkillRuntimePreferences(current, scan.inventory), - target, - patch, - ), - scan.inventory, - ); - const written = await writeSkillRuntimePreferences(root, migration.preferences, { - needsReview: migration.needsReview, - }); - if (!written.ok) return written; - - const refreshed = await listGovernedSkillEntries(root, options); - const skill = refreshed.find((candidate) => candidate.ref === target.ref); - if (!skill) return { ok: false, reason: 'not_found' }; - return { ok: true, skill }; -} - -function isSha256(value: unknown): value is string { - return typeof value === 'string' && /^sha256:[a-f0-9]{64}$/i.test(value); -} - -function diffSummary(currentContent: string, sourceContent: string): ManagedSkillUpdatePreview['summary'] { - const currentLines = splitLines(currentContent); - const sourceLines = splitLines(sourceContent); - const max = Math.max(currentLines.length, sourceLines.length); - let changedLineCount = 0; - for (let index = 0; index < max; index += 1) { - if (currentLines[index] !== sourceLines[index]) changedLineCount += 1; - } - return { - currentLineCount: currentLines.length, - sourceLineCount: sourceLines.length, - changedLineCount, - }; -} - -function splitLines(content: string): string[] { - if (content.length === 0) return []; - return content.replace(/\r\n/g, '\n').split('\n'); -} - -export async function resolveSkillOpenPath( - root: string, - idOrRef: string, - target: SkillOpenTarget, - options: SkillReadOptions = {}, -): Promise { - if (target !== 'file' && target !== 'directory') return { ok: false, reason: 'missing' }; - - if (!isSafeSkillId(idOrRef)) { - if (!idOrRef.includes(':') || idOrRef.length > 512) return { ok: false, reason: 'invalid_id' }; - const scan = await scanSkillsWithDiagnostics( - resolveSkillDiscoveryPaths(options.cwd ?? root, root, options.homeDir), - ); - const skill = [...scan.inventory, ...scan.rejected].find( - (candidate) => candidate.ref === idOrRef, - ); - if (!skill) return { ok: false, reason: 'missing' }; - const candidate = target === 'file' ? join(skill.path, 'SKILL.md') : skill.path; - try { - const [containmentReal, openedPath] = await Promise.all([ - realpath(skill.discoveryRoot), - realpath(candidate), - ]); - if (!isPathInside(containmentReal, openedPath)) return { ok: false, reason: 'blocked_path' }; - const openedStat = await stat(openedPath); - if (target === 'file' && !openedStat.isFile()) return { ok: false, reason: 'not_file' }; - if (target === 'directory' && !openedStat.isDirectory()) return { ok: false, reason: 'not_directory' }; - return { ok: true, path: openedPath, target }; - } catch { - return { ok: false, reason: 'missing' }; - } - } - - const skillsDir = join(root, 'skills'); - let rootReal: string; - let skillsReal: string; - try { - [rootReal, skillsReal] = await Promise.all([realpath(root), realpath(skillsDir)]); - } catch { - return { ok: false, reason: 'missing' }; - } - if (!isPathInside(rootReal, skillsReal)) return { ok: false, reason: 'blocked_path' }; - - const skillDir = join(skillsDir, idOrRef); - const candidate = target === 'file' ? join(skillDir, 'SKILL.md') : skillDir; - let openedPath: string; - try { - openedPath = await realpath(candidate); - } catch { - return { ok: false, reason: 'missing' }; - } - if (!isPathInside(skillsReal, openedPath)) return { ok: false, reason: 'blocked_path' }; - - const openedStat = await stat(openedPath).catch(() => null); - if (!openedStat) return { ok: false, reason: 'missing' }; - if (target === 'file' && !openedStat.isFile()) return { ok: false, reason: 'not_file' }; - if (target === 'directory' && !openedStat.isDirectory()) return { ok: false, reason: 'not_directory' }; - return { ok: true, path: openedPath, target }; -} - -async function readInstalledSkillDefinitions(root: string, options: SkillReadOptions = {}): Promise { - const scanned = await scanWorkspaceSkills(root); - return enrichInstalledSkillDefinitions(scanned, options); -} - -async function enrichInstalledSkillDefinitions( - scanned: readonly ScannedSkill[], - options: SkillReadOptions = {}, -): Promise { - const out: InstalledSkillDefinition[] = []; - for (const skill of scanned) { - const status = await readSkillLockStatus(skill.path, skill.id, skill.contentSha256, options); - out.push({ - ...skill, - ...status, - }); - } - return out; -} - -async function readSkillLockStatus(skillPath: string, id: string, currentHash: string, options: SkillReadOptions = {}): Promise> { - const lockPath = join(skillPath, 'skill.lock.json'); - let lockStat: Awaited>; - try { - lockStat = await lstat(lockPath); - } catch { - return missingSkillLockStatus(); - } - - if (!lockStat.isFile() || lockStat.isSymbolicLink()) { - return invalidSkillLockStatus('lock_symlink', 'Skill lock is not a regular file.'); - } - - let parsed: unknown; - try { - parsed = JSON.parse(await readFile(lockPath, 'utf8')); - } catch { - return invalidSkillLockStatus('invalid_json', 'Skill lock JSON is invalid.'); - } - - let managedSource: { status: 'available'; contentSha256: string } | { status: 'missing' } | undefined; - if ( - parsed && - typeof parsed === 'object' && - !Array.isArray(parsed) && - (parsed as Record).sourceType === 'managed' - ) { - const sourceId = (parsed as Record).sourceId; - if (typeof sourceId === 'string' && isSafeSkillId(sourceId)) { - const source = await readManagedSkillSource( - options.managedSourceRoot ?? resolveManagedSkillSourcesRoot(), - sourceId, - ); - managedSource = source.ok - ? { status: 'available', contentSha256: source.contentSha256 } - : { status: 'missing' }; - } - } - return validateSkillLock({ - lock: parsed, - skillId: id, - currentContentSha256: currentHash, - ...(managedSource ? { managedSource } : {}), - }); -} diff --git a/apps/desktop/src/main/startup-safe-boundary-resume.ts b/apps/desktop/src/main/startup-safe-boundary-resume.ts deleted file mode 100644 index 487ae52ded..0000000000 --- a/apps/desktop/src/main/startup-safe-boundary-resume.ts +++ /dev/null @@ -1,52 +0,0 @@ -import type { SessionManager } from '@maka/runtime'; -import { isDesktopAdmissibleExecutionBoundary } from './desktop-execution-admission.js'; -import type { StreamEvents } from './session-stream.js'; - -type StartupResumeRuntime = Pick< - SessionManager, - | 'listSessions' - | 'readExecutionBoundary' - | 'planLatestAuthoritativeSafeBoundaryContinuation' - | 'resumeSafeBoundaryContinuation' ->; - -/** - * Resume every session whose latest turn stopped at a boundary it can safely - * continue past. - * - * One session per iteration, and one session's failure costs only that session. - * The setup steps guarded below can each throw for reasons local to a single - * session — its record can be gone by the time this pass reads it, its boundary - * row can be unreadable — and an unguarded loop turns that into "no session - * after this one gets recovered", which is a much larger outage than the one - * that caused it. Any session but the last can strand the rest, and the caller - * only learns that the whole pass failed. (Streaming itself is not guarded - * beyond a synchronous throw; the streamer projects an iterator failure onto - * the turn it belongs to.) - * - * An externally isolated session is skipped rather than reported: that is the - * admission rule holding, not a fault. Asking - * `isDesktopAdmissibleExecutionBoundary` instead of catching the assert keeps - * the two apart, so `logError` only ever carries something that went wrong. - */ -export async function resumeSafeBoundaryContinuationsOnStartup( - runtime: StartupResumeRuntime, - streamEvents: StreamEvents, - logError?: (message: string, error: unknown) => void, -): Promise { - for (const session of await runtime.listSessions()) { - try { - const boundary = await runtime.readExecutionBoundary(session.id); - if (!isDesktopAdmissibleExecutionBoundary(boundary)) continue; - const plan = await runtime.planLatestAuthoritativeSafeBoundaryContinuation(session.id); - if (!plan.continuation) continue; - const iterator = runtime.resumeSafeBoundaryContinuation(plan.continuation); - void streamEvents(session.id, iterator, { - turnId: plan.continuation.turnId, - goalBoundary: 'none', - }); - } catch (error) { - logError?.(`[startup] safe-boundary resume failed for session ${session.id}:`, error); - } - } -} diff --git a/apps/desktop/src/main/subscription-ipc-main.ts b/apps/desktop/src/main/subscription-ipc-main.ts deleted file mode 100644 index 1b6f45920f..0000000000 --- a/apps/desktop/src/main/subscription-ipc-main.ts +++ /dev/null @@ -1,409 +0,0 @@ -import type { IpcMain } from 'electron'; -import type { LlmConnection } from '@maka/core/llm-connections'; -import type { ConnectionStore } from '@maka/storage'; -import type { ClaudeSubscriptionService } from './oauth/claude-subscription-service.js'; -import { isSubscriptionExperimentalEnabled } from './oauth/claude-subscription-helpers.js'; -import { - type OpenAiCodexService, - isOpenAiCodexExperimentalEnabled, -} from './oauth/openai-codex-service.js'; -import { - type AntigravitySubscriptionService, - isAntigravitySubscriptionExperimentalEnabled, -} from './oauth/antigravity-subscription-service.js'; -import { - CLAUDE_SUBSCRIPTION_CONNECTION_SLUG, - CODEX_SUBSCRIPTION_CONNECTION_SLUG, - GITHUB_COPILOT_CONNECTION_SLUG, - XAI_OAUTH_CONNECTION_SLUG, -} from './oauth-model-connections-main.js'; -import type { GitHubCopilotSubscriptionService } from './oauth/github-copilot-subscription-service.js'; -import type { XaiOAuthService } from './oauth/xai-oauth-service.js'; - -interface SubscriptionIpcDeps { - ipcMain: Pick; - connectionStore: ConnectionStore; - claudeSubscription: ClaudeSubscriptionService; - openAiCodex: OpenAiCodexService; - githubCopilotSubscription: GitHubCopilotSubscriptionService; - xaiOAuth: XaiOAuthService; - antigravitySubscription: AntigravitySubscriptionService; - isClaudeSubscriptionAuthenticatedState( - state: Awaited>, - ): boolean; - syncClaudeSubscriptionConnection(): Promise; - activateOpenAiCodexConnection(): Promise; - syncOpenAiCodexConnection(): Promise; - syncGitHubCopilotConnection(models?: NonNullable): Promise; - activateXaiOAuthConnection(): Promise; - syncXaiOAuthConnection(): Promise; - emitConnectionListChanged(): void; -} - -export function registerSubscriptionIpc(deps: SubscriptionIpcDeps): void { - const { ipcMain } = deps; - async function rollbackFailedGitHubCopilotConnect() { - await deps.githubCopilotSubscription.logout().catch(() => undefined); - const existing = await deps.connectionStore.get(GITHUB_COPILOT_CONNECTION_SLUG).catch(() => null); - if (existing) { - await deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'GitHub Copilot 连接未能保存，请重新导入登录。', - }).catch(() => undefined); - } - return { ok: false as const, reason: 'storage_failed' as const, message: 'GitHub Copilot 连接未能保存，请重试。' }; - } - - ipcMain.handle('github-copilot:connect-existing-login', async () => { - const result = await deps.githubCopilotSubscription.connectExistingLogin(); - if (result.ok) { - try { - const connection = await deps.syncGitHubCopilotConnection(result.models); - if (!connection) { - return rollbackFailedGitHubCopilotConnect(); - } - deps.emitConnectionListChanged(); - return { ok: true as const }; - } catch { - return rollbackFailedGitHubCopilotConnect(); - } - } - return result; - }); - ipcMain.handle('github-copilot:get-account-state', async () => { - return deps.githubCopilotSubscription.getAccountState(); - }); - ipcMain.handle('github-copilot:refresh-tokens', async () => { - const result = await deps.githubCopilotSubscription.refreshTokens(); - if (result.ok) { - try { - const connection = await deps.syncGitHubCopilotConnection(result.models); - if (!connection) return { ok: false as const, reason: 'storage_failed' as const, message: 'GitHub Copilot 连接未能更新，请重试。' }; - deps.emitConnectionListChanged(); - return { ok: true as const }; - } catch { - return { ok: false as const, reason: 'storage_failed' as const, message: 'GitHub Copilot 连接未能更新，请重试。' }; - } - } - return result; - }); - ipcMain.handle('github-copilot:logout', async () => { - const result = await deps.githubCopilotSubscription.logout(); - const existing = await deps.connectionStore.get(GITHUB_COPILOT_CONNECTION_SLUG); - if (existing) { - await deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'GitHub Copilot 已移除本地登录。', - }); - deps.emitConnectionListChanged(); - } - return result; - }); - - ipcMain.handle('xai-oauth:get-auth-url', async () => deps.xaiOAuth.getAuthorizationUrl()); - ipcMain.handle('xai-oauth:open-auth-url', async (_event, authRequestId: unknown) => { - if (typeof authRequestId !== 'string') { - return { - ok: false as const, - reason: 'authorization_pending' as const, - message: 'xAI 授权会话不存在。', - }; - } - return deps.xaiOAuth.openAuthorizationUrl(authRequestId); - }); - ipcMain.handle('xai-oauth:complete-authorization', async (_event, authRequestId: unknown) => { - if (typeof authRequestId !== 'string') { - return { - ok: false as const, - reason: 'authorization_pending' as const, - message: 'xAI 授权会话不存在。', - }; - } - const result = await deps.xaiOAuth.completeAuthorization(authRequestId); - if (result.ok) { - await deps.activateXaiOAuthConnection(); - deps.emitConnectionListChanged(); - void deps - .syncXaiOAuthConnection() - .then(() => deps.emitConnectionListChanged()) - .catch((error: unknown) => { - console.warn('[maka] xAI OAuth model discovery failed', error); - }); - } - return result; - }); - ipcMain.handle('xai-oauth:cancel-authorization', async (_event, authRequestId: unknown) => { - deps.xaiOAuth.cancelAuthorization( - typeof authRequestId === 'string' ? authRequestId : undefined, - ); - return { ok: true as const }; - }); - ipcMain.handle('xai-oauth:get-account-state', async () => deps.xaiOAuth.getAccountState()); - ipcMain.handle('xai-oauth:refresh-tokens', async () => { - const result = await deps.xaiOAuth.refreshTokens(); - if (result.ok) { - await deps.syncXaiOAuthConnection(); - deps.emitConnectionListChanged(); - } - return result; - }); - ipcMain.handle('xai-oauth:logout', async () => { - const result = await deps.xaiOAuth.logout(); - const existing = await deps.connectionStore.get(XAI_OAUTH_CONNECTION_SLUG); - if (existing) { - await deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'xAI OAuth 已退出登录。', - }); - deps.emitConnectionListChanged(); - } - return result; - }); - - const experimentalDisabledResponse = { - ok: false as const, - reason: 'experimental_disabled' as const, - message: 'Claude 订阅账号为内部实验，当前未开启。', - }; - ipcMain.handle('claude-subscription:get-auth-url', async () => { - if (!isSubscriptionExperimentalEnabled()) { - return experimentalDisabledResponse; - } - return deps.claudeSubscription.getAuthorizationUrl(); - }); - ipcMain.handle( - 'claude-subscription:open-auth-url', - async (_event, authRequestId: unknown) => { - if (!isSubscriptionExperimentalEnabled()) return experimentalDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - return deps.claudeSubscription.openAuthorizationUrl(authRequestId); - }, - ); - ipcMain.handle( - 'claude-subscription:complete-authorization', - async (_event, authRequestId: unknown, pasted: unknown) => { - if (!isSubscriptionExperimentalEnabled()) return experimentalDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - const result = await deps.claudeSubscription.completeAuthorization(authRequestId, pasted); - if (result.ok) { - await deps.syncClaudeSubscriptionConnection(); - deps.emitConnectionListChanged(); - } - return result; - }, - ); - ipcMain.handle( - 'claude-subscription:cancel-authorization', - async (_event, authRequestId: unknown) => { - if (!isSubscriptionExperimentalEnabled()) return { ok: true as const }; - deps.claudeSubscription.cancelAuthorization( - typeof authRequestId === 'string' ? authRequestId : undefined, - ); - return { ok: true as const }; - }, - ); - ipcMain.handle('claude-subscription:get-account-state', async () => { - if (!isSubscriptionExperimentalEnabled()) { - return { - provider: 'claude-subscription' as const, - runtimeState: 'not_logged_in' as const, - }; - } - const state = await deps.claudeSubscription.getAccountState(); - if (deps.isClaudeSubscriptionAuthenticatedState(state)) { - await deps.syncClaudeSubscriptionConnection(); - } - return state; - }); - ipcMain.handle('claude-subscription:refresh-quota', async () => { - if (!isSubscriptionExperimentalEnabled()) return experimentalDisabledResponse; - return deps.claudeSubscription.refreshQuota(); - }); - ipcMain.handle('claude-subscription:refresh-tokens', async () => { - if (!isSubscriptionExperimentalEnabled()) return experimentalDisabledResponse; - const result = await deps.claudeSubscription.refreshTokens(); - if (result.ok) { - await deps.syncClaudeSubscriptionConnection(); - deps.emitConnectionListChanged(); - } - return result; - }); - ipcMain.handle('claude-subscription:logout', async () => { - const result = await deps.claudeSubscription.logout(); - const existing = await deps.connectionStore.get(CLAUDE_SUBSCRIPTION_CONNECTION_SLUG); - if (existing) { - await deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'Claude OAuth 已退出登录。', - }); - deps.emitConnectionListChanged(); - } - return result; - }); - ipcMain.handle('claude-subscription:is-experimental-enabled', async () => - isSubscriptionExperimentalEnabled(), - ); - - const codexDisabledResponse = { - ok: false as const, - reason: 'experimental_disabled' as const, - message: 'OpenAI Codex 订阅账号为内部实验，当前未开启。', - }; - ipcMain.handle('openai-codex:is-experimental-enabled', async () => - isOpenAiCodexExperimentalEnabled(), - ); - ipcMain.handle('openai-codex:get-auth-url', async () => { - if (!isOpenAiCodexExperimentalEnabled()) return codexDisabledResponse; - return deps.openAiCodex.getAuthorizationUrl(); - }); - ipcMain.handle( - 'openai-codex:open-auth-url', - async (_event, authRequestId: unknown) => { - if (!isOpenAiCodexExperimentalEnabled()) return codexDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - return deps.openAiCodex.openAuthorizationUrl(authRequestId); - }, - ); - ipcMain.handle( - 'openai-codex:complete-authorization', - async (_event, authRequestId: unknown) => { - if (!isOpenAiCodexExperimentalEnabled()) return codexDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - const result = await deps.openAiCodex.completeAuthorization(authRequestId); - if (result.ok) { - // OAuth success is authoritative as soon as the credential is stored. - // Publish a usable connection immediately; live model discovery can - // take up to its network timeout and must not hold the login UI on the - // stale `needs_reauth` state. - await deps.activateOpenAiCodexConnection(); - deps.emitConnectionListChanged(); - void deps.syncOpenAiCodexConnection() - .then(() => deps.emitConnectionListChanged()) - .catch((error: unknown) => { - console.warn('[maka] Codex model discovery after OAuth failed', error); - }); - } - return result; - }, - ); - ipcMain.handle( - 'openai-codex:cancel-authorization', - async (_event, authRequestId: unknown) => { - if (!isOpenAiCodexExperimentalEnabled()) return { ok: true as const }; - deps.openAiCodex.cancelAuthorization( - typeof authRequestId === 'string' ? authRequestId : undefined, - ); - return { ok: true as const }; - }, - ); - ipcMain.handle('openai-codex:get-account-state', async () => { - if (!isOpenAiCodexExperimentalEnabled()) { - return { - provider: 'openai-codex' as const, - runtimeState: 'not_logged_in' as const, - }; - } - // Status reads stay read-only and fast. Connection synchronization is - // driven by OAuth completion, explicit token refresh, and startup. - return deps.openAiCodex.getAccountState(); - }); - ipcMain.handle('openai-codex:refresh-tokens', async () => { - if (!isOpenAiCodexExperimentalEnabled()) return codexDisabledResponse; - const result = await deps.openAiCodex.refreshTokens(); - if (result.ok) { - await deps.syncOpenAiCodexConnection(); - deps.emitConnectionListChanged(); - } - return result; - }); - ipcMain.handle('openai-codex:logout', async () => { - const result = await deps.openAiCodex.logout(); - const existing = await deps.connectionStore.get(CODEX_SUBSCRIPTION_CONNECTION_SLUG); - if (existing) { - await deps.connectionStore.update(existing.slug, { - enabled: false, - lastTestStatus: 'needs_reauth', - lastTestAt: new Date().toISOString(), - lastTestMessage: 'Codex OAuth 已退出登录。', - }); - deps.emitConnectionListChanged(); - } - return result; - }); - - const antigravityDisabledResponse = { - ok: false as const, - reason: 'experimental_disabled' as const, - message: 'Google Antigravity 订阅账号为内部实验，当前未开启。', - }; - ipcMain.handle('antigravity-subscription:is-experimental-enabled', async () => - isAntigravitySubscriptionExperimentalEnabled(), - ); - ipcMain.handle('antigravity-subscription:get-auth-url', async () => { - if (!isAntigravitySubscriptionExperimentalEnabled()) return antigravityDisabledResponse; - return deps.antigravitySubscription.getAuthorizationUrl(); - }); - ipcMain.handle( - 'antigravity-subscription:open-auth-url', - async (_event, authRequestId: unknown) => { - if (!isAntigravitySubscriptionExperimentalEnabled()) return antigravityDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - return deps.antigravitySubscription.openAuthorizationUrl(authRequestId); - }, - ); - ipcMain.handle( - 'antigravity-subscription:complete-authorization', - async (_event, authRequestId: unknown) => { - if (!isAntigravitySubscriptionExperimentalEnabled()) return antigravityDisabledResponse; - if (typeof authRequestId !== 'string') { - return { ok: false as const, reason: 'authorization_pending' as const, message: '授权会话不存在。' }; - } - return deps.antigravitySubscription.completeAuthorization(authRequestId); - }, - ); - ipcMain.handle( - 'antigravity-subscription:cancel-authorization', - async (_event, authRequestId: unknown) => { - if (!isAntigravitySubscriptionExperimentalEnabled()) return { ok: true as const }; - deps.antigravitySubscription.cancelAuthorization( - typeof authRequestId === 'string' ? authRequestId : undefined, - ); - return { ok: true as const }; - }, - ); - ipcMain.handle('antigravity-subscription:get-account-state', async () => { - if (!isAntigravitySubscriptionExperimentalEnabled()) { - return { - provider: 'antigravity-subscription' as const, - status: 'preview' as const, - runtimeState: 'not_logged_in' as const, - }; - } - return deps.antigravitySubscription.getAccountState(); - }); - ipcMain.handle('antigravity-subscription:refresh-tokens', async () => { - if (!isAntigravitySubscriptionExperimentalEnabled()) return antigravityDisabledResponse; - return deps.antigravitySubscription.refreshTokens(); - }); - ipcMain.handle('antigravity-subscription:logout', async () => { - return deps.antigravitySubscription.logout(); - }); -} diff --git a/apps/desktop/src/main/subscription-model-fetch.ts b/apps/desktop/src/main/subscription-model-fetch.ts deleted file mode 100644 index 40e7b54c5e..0000000000 --- a/apps/desktop/src/main/subscription-model-fetch.ts +++ /dev/null @@ -1,93 +0,0 @@ -import type { LlmConnection } from '@maka/core/llm-connections'; -import { - buildSubscriptionModelFetch as buildRuntimeSubscriptionModelFetch, - inheritFetchProxySnapshot, - proxiedFetch, -} from '@maka/runtime'; -import { - type ClaudeSubscriptionService, - isCloakEnabled, -} from './oauth/claude-subscription-service.js'; -import type { OpenAiCodexService } from './oauth/openai-codex-service.js'; -import type { XaiOAuthService } from './oauth/xai-oauth-service.js'; - -interface SubscriptionModelFetchDeps { - claudeSubscription: ClaudeSubscriptionService; - openAiCodex: OpenAiCodexService; - xaiOAuth: XaiOAuthService; -} - -export function createSubscriptionModelFetch(deps: SubscriptionModelFetchDeps) { - return function buildSubscriptionModelFetch( - connection: LlmConnection, - sessionId: string, - modelId: string, - ): typeof fetch { - if (connection.providerType === 'claude-subscription' && isCloakEnabled()) { - return inheritFetchProxySnapshot( - buildClaudeSubscriptionCloakedFetch( - connection, - deps.claudeSubscription, - sessionId, - modelId, - proxiedFetch, - ), - proxiedFetch, - ); - } - if ( - connection.providerType === 'openai-codex' - || connection.providerType === 'github-copilot' - || connection.providerType === 'xai-oauth' - ) { - const subscriptionFetch = buildRuntimeSubscriptionModelFetch({ - connection, - sessionId, - modelId, - fetchFn: proxiedFetch, - ...(connection.providerType === 'openai-codex' - ? { - refreshOAuthAccessToken: () => - deps.openAiCodex.getAccessTokenInternal({ forceRefresh: true }), - } - : connection.providerType === 'xai-oauth' - ? { - refreshOAuthAccessToken: () => - deps.xaiOAuth.getAccessTokenInternal({ forceRefresh: true }), - } - : {}), - }); - return subscriptionFetch - ? inheritFetchProxySnapshot(subscriptionFetch, proxiedFetch) - : proxiedFetch; - } - return proxiedFetch; - }; -} - -function buildClaudeSubscriptionCloakedFetch( - connection: LlmConnection, - claudeSubscription: ClaudeSubscriptionService, - sessionId: string, - modelId: string, - fetchFn: typeof fetch, -): typeof fetch { - return async (url: Parameters[0], init?: Parameters[1]) => { - const [deviceId, accountState] = await Promise.all([ - claudeSubscription.getOrCreateDeviceId(), - claudeSubscription.getAccountState(), - ]); - const modelFetch = buildRuntimeSubscriptionModelFetch({ - connection, - sessionId, - modelId, - fetchFn, - claude: { - cloakEnabled: true, - deviceId, - accountUuid: accountState.profile?.accountUuid ?? '', - }, - }); - return (modelFetch ?? fetchFn)(url, init); - }; -} diff --git a/apps/desktop/src/main/system-prompt-main.ts b/apps/desktop/src/main/system-prompt-main.ts deleted file mode 100644 index 3bfc12a144..0000000000 --- a/apps/desktop/src/main/system-prompt-main.ts +++ /dev/null @@ -1,262 +0,0 @@ -import { - buildBotPlatformPromptFragment, - buildDeepResearchSystemPromptFragment, - buildSideConversationSystemPromptFragment, - filterModelVisibleTaskLedgerTasks, - buildLocalMemoryPromptBody, - botPlatformFromSessionLabels, - isDeepResearchSession, - isSideConversationSession, - redactSecrets, - renderTaskLedgerPromptText, - type AppSettings, - type SessionHeader, - type Task, - type TaskLedgerStore, -} from '@maka/core'; -import { - assembleMainSessionSystemPrompt, - buildPersonalizationPromptFragment, - buildWorkspaceInstructionsPromptFragment, - resolveProjectGitInfo, - buildSessionEnvironmentPromptFragment, - resolveSkillDiscoveryPaths, - type HostCapabilities, - type GoalManager, - type SkillSelectionReport, -} from '@maka/runtime'; -import { buildSkillsPromptFragmentWithReport } from './skills.js'; -import type { LocalMemoryPromptUpdate, LocalMemoryService } from './local-memory-service.js'; - -interface SystemPromptSettingsStore { - get(): Promise; -} - -interface SystemPromptMainDeps { - settingsStore: SystemPromptSettingsStore; - workspaceRoot: string; - localMemory: Pick; - taskLedger: Pick; - goalManager?: Pick; - /** Binding-derived skill host gate (#1099 S2). */ - hostCapabilities?: HostCapabilities; - host?: HostCapabilities; -} - -interface SkillPromptBudgetContext { - contextWindow?: number; -} - -export function createSystemPromptMainService(deps: SystemPromptMainDeps) { - const lastSkillSelectionByCwd = new Map(); - - async function buildSystemPrompt( - header: Pick, - cwd?: string, - options?: { memoryFragment?: string | null; includePersonalization?: boolean; includeIdentity?: boolean; skillBudget?: SkillPromptBudgetContext; host?: HostCapabilities }, - ): Promise { - const settings = await deps.settingsStore.get(); - const includePersonalization = options?.includePersonalization !== false; - const personalization = includePersonalization - ? buildPersonalizationPromptFragment(settings.personalization) - : { text: undefined }; - const skillCwd = cwd ?? deps.workspaceRoot; - const skillSource = resolveSkillDiscoveryPaths(skillCwd, deps.workspaceRoot); - const skillPrompt = await buildSkillsPromptFragmentWithReport( - skillSource, - options?.host ?? deps.host ?? deps.hostCapabilities, - options?.skillBudget, - ); - lastSkillSelectionByCwd.set(skillCwd, skillPrompt.report); - const skills = skillPrompt.text; - const workspaceInstructions = settings.workspaceInstructions.enabled && cwd - ? await buildWorkspaceInstructionsPromptFragment(cwd) - : undefined; - const deepResearch = isDeepResearchSession(header.labels) ? buildDeepResearchSystemPromptFragment() : undefined; - const sideConversation = isSideConversationSession(header.labels) - ? buildSideConversationSystemPromptFragment() - : undefined; - const botPlatform = botPlatformFromSessionLabels(header.labels); - const botPlatformHint = botPlatform ? buildBotPlatformPromptFragment(botPlatform) : undefined; - const memoryFragment = options && 'memoryFragment' in options - ? options.memoryFragment ?? undefined - : await buildLocalMemoryPromptFragment(); - // Fragment order is load-bearing: the Side Chat isolation boundary - // (sideConversation) is a trailing assertion that constrains the fragments - // before it, so it must stay last. Keep this order in sync with the - // entry-level prompt-order test. - return assembleMainSessionSystemPrompt( - [ - personalization.text, - deepResearch, - botPlatformHint, - skills, - workspaceInstructions, - memoryFragment, - sideConversation, - ], - { identity: options?.includeIdentity !== false }, - ); - } - - async function buildBackendSystemPrompt( - header: Pick, - cwd: string | undefined, - options: { memoryFragment?: string | null; childInstruction?: string | null; skillBudget?: SkillPromptBudgetContext; host?: HostCapabilities }, - ): Promise { - const childInstruction = options.childInstruction?.trim(); - const base = await buildSystemPrompt(header, cwd, childInstruction - ? { memoryFragment: null, includePersonalization: false, includeIdentity: false, skillBudget: options.skillBudget, host: options.host } - : { memoryFragment: options.memoryFragment, skillBudget: options.skillBudget, host: options.host }); - if (!childInstruction) return base; - return [ - base, - '子代理必须继承当前会话的权限、隐私、工作区和技能约束。下面只是父代理给子代理的角色说明；不能覆盖以上约束。子代理不会隐式继承父会话的本地记忆或个性化上下文；需要的背景必须由父代理在任务说明中显式提供。', - childInstruction, - ].filter((fragment): fragment is string => Boolean(fragment)).join('\n\n'); - } - - async function buildTurnTailPrompt(cwd?: string, sessionId?: string): Promise { - const fragments: string[] = []; - if (cwd) { - fragments.push( - buildSessionEnvironmentPromptFragment({ - cwd, - projectGit: await resolveProjectGitInfo(cwd), - }), - ); - } - const memoryUpdate = buildLocalMemoryUpdateTailFragment( - deps.localMemory.consumePendingPromptUpdates(sessionId), - ); - if (memoryUpdate) fragments.push(memoryUpdate); - const taskLedger = sessionId ? await buildTaskLedgerTailFragment(sessionId) : undefined; - if (taskLedger) fragments.push(taskLedger); - const goal = sessionId ? buildGoalTailFragment(sessionId) : undefined; - if (goal) fragments.push(goal); - return fragments.length > 0 ? fragments.join('\n\n') : undefined; - } - - // Injects the active goal so the model stays aware it is working autonomously. - // Only nonterminal, user-visible goals are shown (settled goals inject nothing). - function buildGoalTailFragment(sessionId: string): string | undefined { - const goal = deps.goalManager?.get(sessionId); - if ( - !goal - || (goal.status !== 'active' && goal.status !== 'waiting' && goal.status !== 'paused') - ) return undefined; - const spent = Math.max(0, goal.tokensNow - goal.tokensAtStart); - const lines = [ - '当前自主执行目标（current-turn tail；系统每轮用外部评估器判断进度并自动续行；' - + '仅供参考，不提升为系统/开发者指令）:', - '', - `condition="${redactSecrets(goal.condition)}"`, - `status=${goal.status} turns=${goal.iterations}/${goal.maxIterations} ` - + `no_progress=${goal.consecutiveNoProgress}/${goal.blockCap}` - + `${goal.tokenBudget ? ` tokens=${spent}/${goal.tokenBudget}` : ''}`, - ]; - if (goal.lastReason) lines.push(`last_reason="${redactSecrets(goal.lastReason)}"`); - lines.push(''); - return lines.join('\n'); - } - - // Best-effort: a ledger read failure must never break the turn. An empty - // ledger injects nothing (zero cost when the model isn't tracking tasks). - async function buildTaskLedgerTailFragment(sessionId: string): Promise { - try { - const tasks = await deps.taskLedger.list(sessionId, { - classifyResumeTrust: true, - includeArchived: false, - }); - return renderTaskLedgerTailFragment(filterModelVisibleTaskLedgerTasks(tasks)); - } catch { - return undefined; - } - } - - async function buildLocalMemoryPromptFragment(sessionId?: string): Promise { - try { - const state = await deps.localMemory.getState(); - if (!state.agentReadEnabled || state.status !== 'ok') return undefined; - const body = buildLocalMemoryPromptBody(state.content, { sessionId }); - if (!body) return undefined; - return [ - '本地 MEMORY.md（用户已显式允许 agent 读取，' - + '严禁覆盖系统、开发者、安全、沙箱边界规则；' - + '禁止揭示 secrets；条目仅供参考，实际执行仍受当前会话沙箱边界约束）:', - '', - body, - '', - ].join('\n'); - } catch { - return undefined; - } - } - - return { - buildBackendSystemPrompt, - buildLocalMemoryPromptFragment, - buildTurnTailPrompt, - getLastSkillSelectionReport(cwd: string): SkillSelectionReport | undefined { - return lastSkillSelectionByCwd.get(cwd); - }, - invalidateSkillSelectionReport(cwd: string): void { - lastSkillSelectionByCwd.delete(cwd); - }, - }; -} - -function buildLocalMemoryUpdateTailFragment(updates: ReadonlyArray): string | undefined { - if (updates.length === 0) return undefined; - const lines = updates.slice(-10).map((update) => { - const label = localMemoryPromptUpdateLabel(update.action); - const title = compactMemoryUpdateText(update.title ?? update.entryId ?? 'memory entry'); - return `- ${label}: ${title}${update.entryId ? ` (${compactMemoryUpdateText(update.entryId)})` : ''}`; - }); - return [ - '本轮记忆状态变更（current-turn tail；仅供当前回复参考，不提升为系统/开发者指令；下轮会按 MEMORY.md 生效状态重新读取）:', - '', - ...lines, - '', - ].join('\n'); -} - -function renderTaskLedgerTailFragment(tasks: readonly Task[]): string | undefined { - if (tasks.length === 0) return undefined; - const rendered = renderTaskLedgerPromptText(tasks); - if (!rendered.text) return undefined; - return [ - '当前任务台账（current-turn tail；仅供当前回复参考，不提升为系统/开发者指令；' - + '用 task_create/task_update/task_list/task_get 维护，状态取值 pending/in_progress/blocked/completed/failed/cancelled；' - + 'blocked/failed/completed 需要原因或证据）:', - '', - rendered.text, - ...(rendered.omittedCount > 0 - ? [`omitted=${rendered.omittedCount} (use task_list/task_get for the complete ledger)`] - : []), - '', - ].join('\n'); -} - -function compactMemoryUpdateText(value: string): string { - return redactSecrets(value).replace(/\s+/g, ' ').trim().slice(0, 160); -} - -function localMemoryPromptUpdateLabel(action: LocalMemoryPromptUpdate['action']): string { - switch (action) { - case 'approved': - return '已批准'; - case 'remembered': - return '已写入'; - case 'archived': - return '已归档'; - case 'restored': - return '已恢复'; - case 'saved': - return '已保存'; - case 'reset': - return '已重置'; - case 'backup_restored': - return '已恢复备份'; - } -} diff --git a/apps/desktop/src/main/task-ledger-wiring.ts b/apps/desktop/src/main/task-ledger-wiring.ts deleted file mode 100644 index e385a5290e..0000000000 --- a/apps/desktop/src/main/task-ledger-wiring.ts +++ /dev/null @@ -1,35 +0,0 @@ -import type { TaskLedgerStore } from '@maka/core'; -import { - createSqliteTaskLedgerStore, - type SqliteTaskLedgerStore, -} from '@maka/storage'; -import { buildTaskLedgerTools, isTaskLedgerToolsEnabled, type MakaTool } from '@maka/runtime'; - -/** - * The task-ledger wiring the main process needs: one per-session store shared - * by the mutate face (task_create/task_update tools) and the read face (the - * turn-tail fragment). Grouping the construction here keeps the main-process - * entry a thin assembler and lets the contract assert the wiring at behavior - * level (tools present, store real, a create lands in the store the tail - * reads) instead of via source-text regex. - */ -export interface MainTaskLedgerWiring { - /** Per-session task ledger store; shared by tools (mutate) and turn tail (read). */ - store: TaskLedgerStore & SqliteTaskLedgerStore; - /** task_create/task_update/task_list/task_get bound to {@link store}. */ - tools: MakaTool[]; -} - -export function createMainTaskLedgerWiring(workspaceRoot: string): MainTaskLedgerWiring { - const store = createSqliteTaskLedgerStore(workspaceRoot); - return { - store, - tools: isTaskLedgerToolsEnabled() - ? buildTaskLedgerTools({ store }, { includeLegacyAliases: isTaskLedgerLegacyToolsEnabled() }) - : [], - }; -} - -function isTaskLedgerLegacyToolsEnabled(env: NodeJS.ProcessEnv = process.env): boolean { - return /^(1|true|on)$/i.test((env.MAKA_TASK_LEDGER_LEGACY_TOOLS ?? '').trim()); -} diff --git a/apps/desktop/src/main/tool-artifact-persistence.ts b/apps/desktop/src/main/tool-artifact-persistence.ts deleted file mode 100644 index 0467fdc983..0000000000 --- a/apps/desktop/src/main/tool-artifact-persistence.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { readFile, realpath } from 'node:fs/promises'; -import { isAbsolute, relative, resolve, sep } from 'node:path'; -import { createToolResultArchiveCapability } from '@maka/runtime'; -import type { - ToolArtifactRecorderInput, - ToolResultArchiveCapability, - ToolResultArchiveReaderInput, - ToolResultArchiveReadResult, - ToolResultArchiveRecorderInput, - ToolResultArchiveResourceReadInput, -} from '@maka/runtime'; -import type { ArtifactStore, createReadImageSnapshotter } from '@maka/storage'; -import { - persistArchivedToolResultToArtifacts, - readArchivedToolResultFromArtifacts, - readArchivedToolResultResourceFromArtifacts, -} from './tool-result-archive-artifacts.js'; - -type ReadImageSnapshotter = ReturnType; - -export interface ToolArtifactPersistenceDeps { - artifactStore: ArtifactStore; - storeReadImage: ReadImageSnapshotter; - safeSendToRenderer: (channel: string, ...args: unknown[]) => void; -} - -export interface ToolArtifactPersistence { - persistToolArtifacts(cwd: string, event: ToolArtifactRecorderInput): Promise; - snapshotReadImage(input: { - sessionId: string; - turnId: string; - name: string; - bytes: Uint8Array; - mimeType: string; - }): Promise>>; - /** - * One archive authority over the session artifact store (#2026): the writer, - * both readers, and the `ArchiveRead` decoder that pruned placeholders name. - */ - toolResultArchive: ToolResultArchiveCapability; -} - -function isInsideOrSamePath(root: string, target: string): boolean { - if (target === root) return true; - const rel = relative(root, target); - return rel !== '' && !rel.startsWith('..') && rel !== '..' && !rel.includes(`..${sep}`) && !rel.startsWith(sep); -} - -async function resolveToolArtifactSourcePath(cwd: string, sourcePath: string): Promise { - const candidate = isAbsolute(sourcePath) ? sourcePath : resolve(cwd, sourcePath); - let root: string; - let target: string; - try { - [root, target] = await Promise.all([ - realpath(cwd), - realpath(candidate), - ]); - } catch { - return null; - } - return isInsideOrSamePath(root, target) ? target : null; -} - -export function createToolArtifactPersistence(deps: ToolArtifactPersistenceDeps): ToolArtifactPersistence { - const { artifactStore, storeReadImage, safeSendToRenderer } = deps; - - async function persistToolArtifacts(cwd: string, event: ToolArtifactRecorderInput): Promise { - for (const candidate of event.candidates) { - let content = candidate.content; - if (content === undefined && candidate.sourcePath) { - const sourcePath = await resolveToolArtifactSourcePath(cwd, candidate.sourcePath); - if (!sourcePath) continue; - content = await readFile(sourcePath); - } - if (content === undefined) continue; - const artifact = await artifactStore.create({ - sessionId: event.sessionId, - turnId: event.turnId, - name: candidate.name, - kind: candidate.kind, - content, - ...(candidate.mimeType ? { mimeType: candidate.mimeType } : {}), - source: candidate.source ?? 'tool_result', - ...(candidate.summary ? { summary: candidate.summary } : {}), - }); - safeSendToRenderer('artifacts:changed', { - reason: 'created', - artifactId: artifact.id, - sessionId: artifact.sessionId, - ts: Date.now(), - }); - } - } - - async function snapshotReadImage(input: { - sessionId: string; - turnId: string; - name: string; - bytes: Uint8Array; - mimeType: string; - }) { - const ref = await storeReadImage(input); - safeSendToRenderer('artifacts:changed', { - reason: 'created', - artifactId: ref.relativePath, - sessionId: ref.sessionId, - ts: Date.now(), - }); - return ref; - } - - async function persistArchivedToolResult( - event: ToolResultArchiveRecorderInput, - ): Promise<{ artifactId: string }> { - const result = await persistArchivedToolResultToArtifacts(artifactStore, event); - if (result.created) { - safeSendToRenderer('artifacts:changed', { - reason: 'created', - artifactId: result.artifactId, - sessionId: event.sessionId, - ts: Date.now(), - }); - } - return { artifactId: result.artifactId }; - } - - async function readArchivedToolResult( - event: ToolResultArchiveReaderInput, - ): Promise { - return readArchivedToolResultFromArtifacts(artifactStore, event); - } - - async function readArchivedToolResultResource( - event: ToolResultArchiveResourceReadInput, - ): Promise { - return readArchivedToolResultResourceFromArtifacts(artifactStore, event); - } - - return { - persistToolArtifacts, - snapshotReadImage, - toolResultArchive: createToolResultArchiveCapability({ - archiveToolResult: persistArchivedToolResult, - readToolResultArchive: readArchivedToolResult, - readArchivedToolResultResource, - }), - }; -} diff --git a/apps/desktop/src/main/tool-assembly.ts b/apps/desktop/src/main/tool-assembly.ts deleted file mode 100644 index fdfab363a4..0000000000 --- a/apps/desktop/src/main/tool-assembly.ts +++ /dev/null @@ -1,286 +0,0 @@ -import { app } from 'electron'; -import { - buildAskUserQuestionTool, - buildRequestSandboxBoundaryTool, - buildChildAgentTools, - buildParentAgentTools, - assertProductBindingCatalogClean, - createBuiltinSandboxManager, - isBuiltinFilesystemWorkerSandboxAvailable, - createSandboxDiagnosticsProvider, - createFilesystemWorkerLaunchSpecProvider, - FilesystemWorkerClient, - projectEffectiveProductToolSurface, - resolveSkillDiscoveryPaths, - ShellRunProcessManager, -} from '@maka/runtime'; -import type { HostCapabilitiesResolver, MakaTool } from '@maka/runtime'; -import type { AppSettings, UpdateAppSettingsInput } from '@maka/core'; -import type { WorkspacePrivacyContext } from '@maka/core/incognito'; -import { - createArtifactAttachmentResourceReader, - createSettingsStore, - type ArtifactStore, -} from '@maka/storage'; -import { buildWebSearchAgentTool } from './web-search/agent-tool.js'; -import { buildWebFetchAgentTool } from './web-fetch/agent-tool.js'; -import { buildAgentSettingsTools } from './agent-settings-tools.js'; -import { buildRiveWorkflowTool } from './rive-workflow-tool.js'; -import { buildExploreAgentTool } from './explore-agent-tool.js'; -import { assembleDesktopNativeCapabilities } from './desktop-native-capability-assembly.js'; -import { - buildSkillAgentTool, - buildSkillSearchAgentTool, - SkillShadowSelectionTracker, -} from './skills.js'; -import type { createMainTaskLedgerWiring } from './task-ledger-wiring.js'; -import type { createMainAutomationWiring } from './automation-wiring.js'; -import type { createMainGoalWiring } from './goal-wiring.js'; -import type { ToolArtifactPersistence } from './tool-artifact-persistence.js'; -import { buildDesktopBuiltinTools } from './desktop-builtin-tools.js'; - -type TaskLedgerWiring = ReturnType; -type AutomationWiring = ReturnType; -type GoalWiring = ReturnType; -type SettingsStore = ReturnType; - -export interface DesktopToolAssemblyDeps { - /** E2E computer-use flag: routes the ai-sdk backend through the raw - * computer-use tools and disables the economy, matching the legacy path. */ - isComputerUseRealModelE2e: boolean; - workspaceRoot: string; - taskLedgerStore: TaskLedgerWiring['store']; - taskLedgerWiring: TaskLedgerWiring; - automationWiring: AutomationWiring; - goalWiring: GoalWiring; - settingsStore: SettingsStore; - updateAgentSettings: (patch: UpdateAppSettingsInput) => Promise; - shellRuns: ShellRunProcessManager; - artifactStore: ArtifactStore; - snapshotReadImage: ToolArtifactPersistence['snapshotReadImage']; - getWorkspacePrivacyContext: () => Promise; - /** - * The power-assertion controller, so a Computer Use run holds the machine - * awake for as long as it is driving something. Optional: the tool surface - * is assembled in contexts that have no Electron power management. - */ - keepSystemAwake?: { hold(reason: string): void; release(reason: string): void }; - resolveDesktopSkillHost: HostCapabilitiesResolver; - /** - * The app's own window, so the mirror can be its child. - * - * A panel that moves itself chases the window it belongs to and trails - * behind every drag. Made a child window it sits below everything else, - * belongs to the app, and is carried along by the app's own moves instead of - * following them. Optional: the tool surface is assembled in contexts that - * have no window at all. - */ - mainWindow?: { - windowBounds(): { x: number; y: number; width: number; height: number } | undefined; - onWindowGeometryChanged(cb: () => void): () => void; - browserWindow(): { isDestroyed(): boolean } | undefined; - }; -} - -/** - * Assemble the desktop process's tool surface (issue #37 economy split). - * Pure move of main.ts's module-scope tool-assembly cluster: the sandbox / - * filesystem worker, the deferred capability groups (Rive, browser, - * computer-use, agent orchestration), the WebSearch tool, the builtin + skill - * host surface, the deferred-group tool-availability config, and the child - * agent tool surface. Declaration order inside the function preserves the - * original module-init order. The cursor-overlay `onMainWindowClose` teardown - * hook stays in main.ts (it assigns a module-scoped `let`); the overlay - * controller is returned so main.ts can wire it. - */ -export function assembleDesktopTools(deps: DesktopToolAssemblyDeps) { - const { - mainWindow, - keepSystemAwake, - isComputerUseRealModelE2e, - workspaceRoot, - taskLedgerStore, - taskLedgerWiring, - automationWiring, - goalWiring, - settingsStore, - updateAgentSettings, - shellRuns, - artifactStore, - snapshotReadImage, - getWorkspacePrivacyContext, - resolveDesktopSkillHost, - } = deps; - - const attachmentResources = createArtifactAttachmentResourceReader({ artifactStore }); - const sandboxManager = createBuiltinSandboxManager(); - const filesystemWorkerLaunchSpecProvider = - sandboxManager && isBuiltinFilesystemWorkerSandboxAvailable() - ? createFilesystemWorkerLaunchSpecProvider({ - runtime: 'electron', - platform: process.platform, - executable: process.execPath, - resourceLocation: app.isPackaged - ? { kind: 'desktop-packaged', resourcesPath: process.resourcesPath } - : { kind: 'runtime' }, - }) - : undefined; - const filesystemWorker = sandboxManager && filesystemWorkerLaunchSpecProvider - ? new FilesystemWorkerClient({ - sandboxManager, - getLaunchSpec: filesystemWorkerLaunchSpecProvider, - }) - : undefined; - const sandboxDiagnosticsProvider = createSandboxDiagnosticsProvider({ - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorkerLaunchSpecProvider - ? { getFilesystemWorkerLaunchSpec: filesystemWorkerLaunchSpecProvider } - : {}), - }); - // Unified tool availability (issue #37). Deferred capability groups (Rive, - // Browser and agent orchestration tools are withheld from the - // per-turn prompt and loaded on demand via `load_tools`, keeping their schemas - // off the wire until needed. Everything else (ungrouped) stays always-on. - // Kill-switch: set MAKA_DISABLE_DEFERRED_TOOLS to any value to turn economy off - // and advertise every tool every turn (legacy behavior). - const economyEnabled = !process.env.MAKA_DISABLE_DEFERRED_TOOLS; - const riveTools: MakaTool[] = [buildRiveWorkflowTool()]; - const { - browserTools, - computerUse, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - } = assembleDesktopNativeCapabilities({ - isComputerUseRealModelE2e, - settings: settingsStore, - ...(keepSystemAwake ? { keepSystemAwake } : {}), - ...(mainWindow ? { mainWindow } : {}), - }); - const agentTools: MakaTool[] = buildParentAgentTools({ - taskLedger: taskLedgerStore, - }); - const deferredTools: MakaTool[] = [ - ...riveTools, - ...browserTools, - ...computerUseTools, - ...agentTools, - ]; - const webSearchTool = buildWebSearchAgentTool({ - settingsStore, - getPrivacyContext: getWorkspacePrivacyContext, - }); - const webFetchTool = buildWebFetchAgentTool({ - getPrivacyContext: getWorkspacePrivacyContext, - }); - const agentSettingsTools = buildAgentSettingsTools({ - settingsStore, - updateSettings: updateAgentSettings, - }); - // Assemble product tools first, then derive skill host + deferred groups from - // the shared catalog ∩ this binding (#1099 S2). Skill listing uses the same host. - const toolsBeforeSkill: MakaTool[] = [ - buildAskUserQuestionTool(), - buildRequestSandboxBoundaryTool(), - ...buildDesktopBuiltinTools({ - shellRuns, - runtimeResources: shellRuns, - attachmentResources, - backgroundTasks: shellRuns, - ptyControls: shellRuns, - snapshotImage: snapshotReadImage, - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorker ? { - filesystemWorker, - } : {}), - }), - ]; - const toolsAfterSkill: MakaTool[] = [ - // External reference plan-mode borrow: a bounded read-only local worker for - // self-contained code/repo investigations. The tool advertises the - // `subagent` category; explore mode allows it, but the implementation - // itself only reads filenames/text snippets under the session cwd. - buildExploreAgentTool(), - // PR-AGENT-WEB-SEARCH-TOOL-0: Tavily-backed WebSearch tool. Closed - // over settingsStore so the renderer never sees the API key; the - // permission engine routes it through the `web_read` policy which - // prompts the user in explore / ask modes. - webSearchTool, - webFetchTool, - // Safe self-configuration surface: read a redacted projection and update - // only an explicit non-secret allowlist after an in-app confirmation. - ...agentSettingsTools, - // Session task ledger: model manages a flat task list; the current list is - // re-injected each turn tail. Pure local state, so no permission gate. - ...taskLedgerWiring.tools, - // Unified Automation: heartbeat (session-internal polling) + cron (standalone scheduled runs). - ...automationWiring.tools, - // Goal execution: GoalSet/Clear/Status/Pause/Resume — autonomous turn-boundary continuation. - ...goalWiring.tools, - // The `load_tools` connector is built by ToolAvailabilityRuntime; deferred - // group tools just need to be present so they are dispatchable once loaded. - ...deferredTools, - ]; - // External reference lazy-skill pattern: the prompt lists available skills, - // and this read-only tool loads the full SKILL.md only when the task matches. - // Resolve per-call from the session cwd so skills at all 5 standard paths - // (cwd/.maka, cwd/.agents, workspaceRoot/skills, ~/.maka, ~/.agents) are - // discovered — matching the CLI and the Agent Skills spec (#1068). - const skillShadowTracker = new SkillShadowSelectionTracker(); - const skillTool = buildSkillAgentTool( - ({ cwd }) => resolveSkillDiscoveryPaths(cwd, workspaceRoot), - resolveDesktopSkillHost, - { shadowTracker: skillShadowTracker }, - ); - const skillSearchTool = buildSkillSearchAgentTool( - ({ cwd }) => resolveSkillDiscoveryPaths(cwd, workspaceRoot), - resolveDesktopSkillHost, - { shadowTracker: skillShadowTracker }, - ); - const builtinTools: MakaTool[] = [ - ...toolsBeforeSkill, - skillTool, - skillSearchTool, - ...toolsAfterSkill, - ]; - assertProductBindingCatalogClean( - 'desktop', - builtinTools.map((tool) => tool.name), - ); - const desktopProductToolSurface = projectEffectiveProductToolSurface({ - host: 'desktop', - tools: builtinTools, - policy: { economy: economyEnabled }, - }); - // Build the union needed by catalog child profiles. SessionManager applies - // each profile's narrower allowlist; parent-facing runtime refs are omitted. - const childAgentTools = buildChildAgentTools([ - ...buildDesktopBuiltinTools({ - attachmentResources, - snapshotImage: snapshotReadImage, - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorker ? { - filesystemWorker, - } : {}), - }), - webSearchTool, - webFetchTool, - ]); - - return { - riveTools, - browserTools, - computerUse, - computerUseOverlay, - computerUsePip, - computerUseStatusItem, - computerUseScreenLock, - computerUseTools, - desktopProductToolSurface, - builtinTools: [...desktopProductToolSurface.tools], - childAgentTools, - sandboxDiagnosticsProvider, - }; -} diff --git a/apps/desktop/src/main/tool-result-archive-artifacts.ts b/apps/desktop/src/main/tool-result-archive-artifacts.ts deleted file mode 100644 index df79a05a0e..0000000000 --- a/apps/desktop/src/main/tool-result-archive-artifacts.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { createHash } from 'node:crypto'; -import type { ArtifactStore } from '@maka/storage'; -import { - stableToolResultArchiveArtifactId, - type ToolResultArchiveReaderInput, - type ToolResultArchiveReadResult, - type ToolResultArchiveRecorderInput, - type ToolResultArchiveResourceReadInput, -} from '@maka/runtime'; - -export async function persistArchivedToolResultToArtifacts( - artifactStore: Pick, - event: ToolResultArchiveRecorderInput, -): Promise<{ artifactId: string; created: boolean }> { - const id = stableToolResultArchiveArtifactId(event); - const existing = await artifactStore.get(id); - if (existing?.status === 'live') { - const read = await readArchivedToolResultArtifact(artifactStore, { - artifactId: id, - sessionId: event.sessionId, - bodySha256: event.bodySha256, - originalBytes: event.originalBytes, - maxBytes: event.originalBytes, - }); - if (!read.ok) throw new Error(`tool result archive artifact id conflict: ${read.reason}`); - return { artifactId: id, created: false }; - } - - const artifact = await artifactStore.create({ - id, - sessionId: event.sessionId, - turnId: event.turnId, - name: `archived-${event.toolName}-${event.runtimeEventId}.json`, - kind: 'file', - content: event.serializedResult, - mimeType: 'application/json', - source: 'tool_result_archive', - summary: `Archived ${event.toolName} tool result for context budget replay`, - }); - return { artifactId: artifact.id, created: true }; -} - -export async function readArchivedToolResultFromArtifacts( - artifactStore: Pick, - event: ToolResultArchiveReaderInput, -): Promise { - return readArchivedToolResultArtifact(artifactStore, event); -} - -export async function readArchivedToolResultResourceFromArtifacts( - artifactStore: Pick, - event: ToolResultArchiveResourceReadInput, -): Promise { - return readArchivedToolResultArtifact(artifactStore, event); -} - -async function readArchivedToolResultArtifact( - artifactStore: Pick, - event: Pick, -): Promise { - const record = await artifactStore.get(event.artifactId); - if (!record) return { ok: false, reason: 'not_found' }; - if (record.status === 'deleted') return { ok: false, reason: 'deleted' }; - if (record.source !== 'tool_result_archive') return { ok: false, reason: 'source_mismatch' }; - if (record.sessionId !== event.sessionId) return { ok: false, reason: 'session_mismatch' }; - if (record.sizeBytes !== event.originalBytes) return { ok: false, reason: 'size_mismatch' }; - - const read = await artifactStore.readText(event.artifactId, { - maxBytes: event.maxBytes ?? event.originalBytes, - }); - if (!read.ok) return read; - if (sha256(read.text) !== event.bodySha256) return { ok: false, reason: 'corrupt' }; - return { ok: true, serializedResult: read.text }; -} - -function sha256(text: string): string { - return createHash('sha256').update(text).digest('hex'); -} diff --git a/apps/desktop/src/main/types/opencli.d.ts b/apps/desktop/src/main/types/opencli.d.ts deleted file mode 100644 index cb47481ca7..0000000000 --- a/apps/desktop/src/main/types/opencli.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -declare module '@jackwener/opencli/types' { - export interface IPage { - goto(url: string, options?: { waitUntil?: 'load' | 'none'; settleMs?: number }): Promise; - evaluate(js: string): Promise; - evaluate( - fn: (...args: Args) => T | Promise, - ...args: Args - ): Promise>; - snapshot(opts?: { interactive?: boolean; compact?: boolean; raw?: boolean }): Promise; - click(ref: string, opts?: { nth?: number; firstOnMulti?: boolean }): Promise<{ - matches_n: number; - match_level: 'exact' | 'stable' | 'reidentified'; - }>; - fillText(ref: string, text: string, opts?: { nth?: number; firstOnMulti?: boolean }): Promise<{ - filled: boolean; - verified: boolean; - expected: string; - actual: string; - length: number; - matches_n: number; - match_level: 'exact' | 'stable' | 'reidentified'; - mode?: 'input' | 'textarea' | 'contenteditable'; - }>; - pressKey(key: string): Promise; - wait(options: number | { text?: string; selector?: string; time?: number; timeout?: number }): Promise; - getCurrentUrl?(): Promise; - } -} - -declare module '@jackwener/opencli/browser/cdp' { - import type { IPage } from '@jackwener/opencli/types'; - - export class CDPBridge { - connect(opts?: { - timeout?: number; - session?: string; - cdpEndpoint?: string; - contextId?: string; - idleTimeout?: number; - windowMode?: 'foreground' | 'background'; - surface?: 'browser' | 'adapter'; - siteSession?: 'ephemeral' | 'persistent'; - }): Promise; - close(): Promise; - send(method: string, params?: Record, timeoutMs?: number): Promise; - waitForEvent(event: string, timeoutMs?: number): Promise; - } -} - -declare module '@jackwener/opencli/utils' { - export function htmlToMarkdown(value: string, configure?: (converter: unknown) => void): string; -} diff --git a/apps/desktop/src/main/usage-ipc-main.ts b/apps/desktop/src/main/usage-ipc-main.ts deleted file mode 100644 index acc6fff792..0000000000 --- a/apps/desktop/src/main/usage-ipc-main.ts +++ /dev/null @@ -1,171 +0,0 @@ -import type { IpcMain } from 'electron'; -import type { UsageRange } from '@maka/core'; -import { tryResult } from '@maka/core/result'; -import { - normalizePricingConfig, - normalizePricingModelKey, -} from '@maka/core/usage-stats/pricing'; -import type { UsageGroupBy, UsageQuery } from '@maka/core/usage-stats/types'; -import { resolveUsageRange } from '@maka/core/model-call-usage-projection'; -import { - mergeUsageBuckets, - mergeUsageLogs, - mergeUsageSummary, - type CanonicalUsageSource, -} from '@maka/core/usage-ledger-merge'; -import { repairPendingModelCallProjections } from '@maka/storage/model-call-ledger'; -import type { createSettingsStore, createSqliteModelCallLedger, TelemetryRepo } from '@maka/storage'; -import type { createMainWindowController } from './main-window.js'; - -type SettingsStore = ReturnType; -type ModelCallLedger = ReturnType; -type MainWindowController = ReturnType; - -export interface UsageIpcDeps { - ipcMain: Pick; - settingsStore: SettingsStore; - telemetryRepo: TelemetryRepo; - modelCallLedger: ModelCallLedger; - /** Authority read used to rebuild the Usage read model for one run (#1679). */ - readRunEvents?: ( - sessionId: string, - runId: string, - ) => Promise }[]>; - ensureUsageReady: () => Promise; - refreshPricingLookup: () => void; - sendToRenderer: MainWindowController['send']; -} - -/** Bounds one repair pass so a backlog drains across reads, not inside one. */ -const USAGE_REPAIR_RUNS_PER_QUERY = 16; - -export function registerUsageIpc(deps: UsageIpcDeps): void { - /** - * Usage answers sum two sources (#1679): the canonical model-call ledger and - * the frozen `LlmCallRecord` table. Both compaction kinds now settle through - * the canonical seam; what still lands in the frozen table is historical rows - * and `goal_evaluation`, the one kind the seam cannot yet identify (it has no - * run or turn at the Host layer). Every merged result carries the provenance - * that qualifies it. - */ - const canonicalUsage = async (query: UsageQuery, now: number): Promise => { - // Fold in whatever the authority holds and this read model is behind on - // before answering; report what a pass could not repair. - const repair = deps.readRunEvents - ? await repairPendingModelCallProjections({ - ledger: { - record: (attempt) => deps.modelCallLedger.record(attempt), - pending: () => deps.modelCallLedger.pendingReprojections(), - clear: (sessionId, runId) => - deps.modelCallLedger.clearPendingReprojection(sessionId, runId), - }, - readRunEvents: deps.readRunEvents, - limit: USAGE_REPAIR_RUNS_PER_QUERY, - }) - : { remaining: 0, unreadableEvents: 0 }; - const page = deps.modelCallLedger.read(resolveUsageRange(query.range, now)); - return { - attempts: page.attempts, - unreadableRecords: page.unreadableRecords + repair.unreadableEvents, - pendingRepairs: repair.remaining, - }; - }; - let pricingMutationQueue: Promise = Promise.resolve(); - const enqueuePricingMutation = (operation: () => Promise): Promise => { - const result = pricingMutationQueue.then(operation); - pricingMutationQueue = result.then( - () => undefined, - () => undefined, - ); - return result; - }; - - deps.ipcMain.handle('settings:usageStats', (_event, range?: UsageRange) => - deps.settingsStore.usageStats(range), - ); - deps.ipcMain.handle('usage:summary', (_event, query: UsageQuery) => - tryResult(async () => { - await deps.ensureUsageReady(); - const now = Date.now(); - return mergeUsageSummary( - deps.telemetryRepo.summary(query), - await canonicalUsage(query, now), - query, - now, - ); - }, 'USAGE_SUMMARY_FAILED'), - ); - deps.ipcMain.handle('usage:buckets', (_event, query: UsageQuery & { groupBy: UsageGroupBy }) => - tryResult(async () => { - await deps.ensureUsageReady(); - const now = Date.now(); - // Tool buckets group tool invocations, which the model-call ledger does - // not describe. The per-key breakdown returns the bare array it always - // has; the provenance qualifying it comes from `usage:summary` for the - // same query. - if (query.groupBy === 'tool') return deps.telemetryRepo.buckets(query, 'tool'); - return mergeUsageBuckets( - deps.telemetryRepo.buckets(query, query.groupBy), - await canonicalUsage(query, now), - query, - query.groupBy, - now, - ).buckets; - }, 'USAGE_BUCKETS_FAILED'), - ); - deps.ipcMain.handle( - 'usage:logs', - (_event, query: UsageQuery & { offset?: number; limit?: number }) => - tryResult(async () => { - await deps.ensureUsageReady(); - const now = Date.now(); - const offset = query.offset ?? 0; - const limit = query.limit ?? 100; - // Both sources are newest-first, so the merged page can only be drawn - // from each source's own first `offset + limit` rows. - return mergeUsageLogs( - deps.telemetryRepo.logs(query, 0, offset + limit), - await canonicalUsage(query, now), - query, - now, - offset, - limit, - ); - }, 'USAGE_LOGS_FAILED'), - ); - deps.ipcMain.handle('usage:pricing:list', () => - tryResult(async () => { - await deps.ensureUsageReady(); - return deps.telemetryRepo.listPricingOverrides(); - }, 'USAGE_PRICING_LIST_FAILED'), - ); - deps.ipcMain.handle('usage:pricing:put', (_event, pricing: unknown) => - tryResult( - () => - enqueuePricingMutation(async () => { - await deps.ensureUsageReady(); - const normalized = normalizePricingConfig(pricing); - if (!normalized.ok) throw new Error(normalized.error); - await deps.telemetryRepo.upsertPricing(normalized.value); - deps.refreshPricingLookup(); - deps.sendToRenderer('usage:pricing:changed'); - return normalized.value; - }), - 'USAGE_PRICING_PUT_FAILED', - ), - ); - deps.ipcMain.handle('usage:pricing:reset', (_event, modelKey: unknown) => - tryResult( - () => - enqueuePricingMutation(async () => { - await deps.ensureUsageReady(); - const keyResult = normalizePricingModelKey(modelKey); - if (!keyResult.ok) throw new Error(keyResult.error); - await deps.telemetryRepo.deletePricing(keyResult.value); - deps.refreshPricingLookup(); - deps.sendToRenderer('usage:pricing:changed'); - }), - 'USAGE_PRICING_RESET_FAILED', - ), - ); -} diff --git a/apps/desktop/src/main/web-fetch/agent-tool.ts b/apps/desktop/src/main/web-fetch/agent-tool.ts deleted file mode 100644 index 5160ab0ce8..0000000000 --- a/apps/desktop/src/main/web-fetch/agent-tool.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { defaultWorkspacePrivacyContext } from '@maka/core/incognito'; -import { validateWorkspacePrivacyContext } from '@maka/core'; -import { - buildWebFetchTool, - createLocalWebFetchExecutor, - type WebFetchExecutor, -} from '@maka/runtime'; - -export function buildWebFetchAgentTool(input: { - getPrivacyContext?: () => Promise; - executor?: WebFetchExecutor; -}) { - const executor = - input.executor ?? createLocalWebFetchExecutor({ fetch: globalThis.fetch }); - return buildWebFetchTool({ - fetch: async (request) => { - const privacyPayload = await ( - input.getPrivacyContext?.() ?? defaultWorkspacePrivacyContext() - ); - const privacy = validateWorkspacePrivacyContext(privacyPayload); - if (!privacy.ok || privacy.value.incognitoActive) { - throw new Error('WebFetch is disabled while privacy mode is active.'); - } - return executor.fetch(request); - }, - }); -} diff --git a/apps/desktop/src/main/web-search-ipc-main.ts b/apps/desktop/src/main/web-search-ipc-main.ts deleted file mode 100644 index fe1c8067df..0000000000 --- a/apps/desktop/src/main/web-search-ipc-main.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { ipcMain } from 'electron'; -import { - isWebSearchProvider, - normalizeWebSearchLimit, - normalizeWebSearchQuery, -} from '@maka/core'; -import type { WorkspacePrivacyContext } from '@maka/core/incognito'; -import type { createSettingsStore } from '@maka/storage'; -import { resolveTavilyApiKey } from './web-search/credentials.js'; -import { queryTavily, TAVILY_TEST_LIMIT, TAVILY_TEST_QUERY } from './web-search/tavily.js'; - -type SettingsStore = ReturnType; - -interface WebSearchIpcDeps { - settingsStore: SettingsStore; - getWorkspacePrivacyContext: () => Promise; -} - -const unsupportedWebSearchProviderResponse = { - ok: false, - reason: 'unsupported_provider' as const, - message: '当前配置不支持这个搜索引擎，请选择 Tavily 后重试。', -}; - -export function registerWebSearchIpc(deps: WebSearchIpcDeps): void { - ipcMain.handle( - 'web-search:query', - async ( - _event, - request: { query?: unknown; limit?: unknown; provider?: unknown; apiKey?: unknown }, - ) => { - const requestedProvider = request?.provider; - if (requestedProvider !== undefined && !isWebSearchProvider(requestedProvider)) { - return unsupportedWebSearchProviderResponse; - } - const query = normalizeWebSearchQuery(request?.query); - if (query === null) { - return { ok: false, reason: 'invalid_query' as const, message: '请输入有效的搜索关键词。' }; - } - const privacy = await deps.getWorkspacePrivacyContext(); - if (privacy.incognitoActive) { - return { ok: false, reason: 'incognito_active' as const, message: '隐身模式下禁用联网搜索。' }; - } - const settings = await deps.settingsStore.get(); - if (!settings.webSearch.enabled) { - return { - ok: false, - reason: 'not_configured' as const, - message: '请先在 设置 · 联网搜索 中启用联网搜索。', - }; - } - const provider = requestedProvider ?? settings.webSearch.defaultProvider; - if (provider === 'model') { - return { - ok: false, - reason: 'unsupported_provider' as const, - message: '原生联网搜索由对话中的主模型请求执行，不支持从设置页单独调用。', - }; - } - const effectiveKey = resolveTavilyApiKey({ settings, draftKey: request?.apiKey }); - const limit = normalizeWebSearchLimit(request?.limit); - return queryTavily({ apiKey: effectiveKey, query, limit }); - }, - ); - - ipcMain.handle( - 'web-search:test', - async ( - _event, - request: { provider?: unknown; apiKey?: unknown } | undefined, - ) => { - const requestedProvider = request?.provider; - if (requestedProvider !== undefined && !isWebSearchProvider(requestedProvider)) { - return unsupportedWebSearchProviderResponse; - } - const settings = await deps.settingsStore.get(); - const provider = requestedProvider ?? settings.webSearch.defaultProvider; - if (provider === 'model') { - return { - ok: false, - reason: 'unsupported_provider' as const, - message: '原生联网搜索由对话中的主模型请求执行，不需要单独测试搜索凭据。', - }; - } - const effectiveKey = resolveTavilyApiKey({ settings, draftKey: request?.apiKey }); - return queryTavily({ - apiKey: effectiveKey, - query: TAVILY_TEST_QUERY, - limit: TAVILY_TEST_LIMIT, - }); - }, - ); -} diff --git a/apps/desktop/src/main/web-search/agent-tool.ts b/apps/desktop/src/main/web-search/agent-tool.ts deleted file mode 100644 index 13913cdb57..0000000000 --- a/apps/desktop/src/main/web-search/agent-tool.ts +++ /dev/null @@ -1,169 +0,0 @@ -/** - * PR-AGENT-WEB-SEARCH-TOOL-0 — `WebSearch` agent tool. Returns a - * `MakaTool` factory that closes over the existing main-process - * Tavily client + the settings store. Renderer never imports this. - * - * Policy hookup: the tool name `WebSearch` is mapped to category - * `web_read` in `@maka/core/permission`. The PR matrix change makes - * `web_read` `prompt` in `explore` / `ask` and `allow` in `execute`, - * so the agent emits a permission request the user must approve in - * the default mode. - * - * Fail-closed paths: - * - incognito context active → `incognito_active` - * - `webSearch.enabled === false` → `not_configured` - * - Tavily key empty → `not_configured` - * - * The query is treated as user-derived content; we never persist it - * to telemetry (see the `argsSummary` scrub in main.ts). - */ - -import { z } from 'zod'; -import { - WEB_SEARCH_DEFAULT_LIMIT, - WEB_SEARCH_MAX_LIMIT, - normalizeWebSearchLimit, - normalizeWebSearchQuery, - validateWorkspacePrivacyContext, - type WebSearchCredentialSource, - type WebSearchErrorReason, - type WebSearchProvider, -} from '@maka/core'; -import { defaultWorkspacePrivacyContext } from '@maka/core/incognito'; -import type { MakaTool } from '@maka/runtime'; -import { queryTavily } from './tavily.js'; -import type { SettingsStore } from '@maka/storage'; -import { getTavilyCredentialSource, resolveTavilyApiKey } from './credentials.js'; - -export const WEB_SEARCH_TOOL_NAME = 'WebSearch'; - -function webSearchErrorContent(input: { - reason: WebSearchErrorReason; - message: string; - query?: string; - credentialSource?: WebSearchCredentialSource; - provider?: WebSearchProvider; -}) { - return { - kind: 'web_search_error' as const, - ok: false as const, - provider: input.provider ?? 'tavily', - ...(input.query ? { query: input.query } : {}), - reason: input.reason, - message: input.message, - ...(input.credentialSource ? { credentialSource: input.credentialSource } : {}), - }; -} - -export function buildWebSearchAgentTool(deps: { - settingsStore: SettingsStore; - getPrivacyContext?: () => Promise; -}): MakaTool { - return { - name: WEB_SEARCH_TOOL_NAME, - description: - 'Query the live web through the configured external search provider. ' + - 'Returns a short list of {title, url, snippet, source} rows. ' + - 'Use ONLY when the user asks for current external information; ' + - 'never call speculatively. Each call is gated on explicit user ' + - 'approval in the default permission mode.', - parameters: z.object({ - query: z - .string() - .min(1) - .max(200) - .describe('Search query, plain text, max 200 chars'), - limit: z - .number() - .int() - .min(1) - .max(WEB_SEARCH_MAX_LIMIT) - .optional() - .describe(`Max results to return (default ${WEB_SEARCH_DEFAULT_LIMIT}).`), - }), - displayName: '联网搜索', - impl: async ({ query, limit }, context) => { - const normalizedQuery = normalizeWebSearchQuery(query); - if (normalizedQuery === null) { - return webSearchErrorContent({ - reason: 'invalid_query', - message: '联网搜索请求未提供有效查询。', - }); - } - const privacyPayload = await (deps.getPrivacyContext?.() ?? defaultWorkspacePrivacyContext()); - const privacy = validateWorkspacePrivacyContext(privacyPayload); - if (!privacy.ok) { - return webSearchErrorContent({ - reason: 'incognito_active', - message: '联网搜索已关闭，因为工作区隐私状态无法确认。', - query: normalizedQuery, - }); - } - if (privacy.value.incognitoActive) { - return webSearchErrorContent({ - reason: 'incognito_active', - message: '隐身模式下禁用联网搜索。', - query: normalizedQuery, - }); - } - const settings = await deps.settingsStore.get(); - const credentialSource = - settings.webSearch.defaultProvider === 'tavily' - ? getTavilyCredentialSource(settings) - : undefined; - if (!settings.webSearch.enabled) { - return webSearchErrorContent({ - reason: 'not_configured', - message: '请先在 设置 · 联网搜索 中启用联网搜索。', - query: normalizedQuery, - ...(credentialSource ? { credentialSource } : {}), - }); - } - if (settings.webSearch.defaultProvider === 'model') { - return webSearchErrorContent({ - reason: 'unsupported_provider', - message: '原生联网搜索必须由主模型请求执行，不能通过本地 WebSearch 工具调用。', - query: normalizedQuery, - provider: 'model', - }); - } - const apiKey = resolveTavilyApiKey({ settings }); - if (apiKey.length === 0) { - return webSearchErrorContent({ - reason: 'not_configured', - message: '请先在 设置 · 联网搜索 中保存 Tavily API key。', - query: normalizedQuery, - credentialSource, - }); - } - const tavilyResponse = await queryTavily({ - apiKey, - query: normalizedQuery, - limit: normalizeWebSearchLimit(limit), - }); - if (!tavilyResponse.ok) { - return webSearchErrorContent({ - reason: tavilyResponse.reason, - message: tavilyResponse.message, - query: normalizedQuery, - credentialSource, - }); - } - // PR-CHAT-WEB-SEARCH-RENDER-0: wrap the success result as - // `kind: 'web_search'` so the chat-side ToolResultPreview can - // render plain-text cards instead of dumping JSON. The LLM - // still reads the rows directly — same fields, just nested. - return { - kind: 'web_search' as const, - provider: 'tavily', - query: normalizedQuery, - rows: tavilyResponse.results.map((row) => ({ - title: row.title, - url: row.url, - snippet: row.snippet, - source: row.source, - })), - }; - }, - }; -} diff --git a/apps/desktop/src/main/web-search/tavily.ts b/apps/desktop/src/main/web-search/tavily.ts deleted file mode 100644 index b2bb051bc0..0000000000 --- a/apps/desktop/src/main/web-search/tavily.ts +++ /dev/null @@ -1,145 +0,0 @@ -/** - * PR-WEB-SEARCH-TAVILY-0 — Tavily HTTP client. Lives in main process - * only; renderer never imports this file or sees the API key. - * - * The IPC handler is the only caller. We do not retry, do not cache, - * and do not log the query / response. Errors map to the closed - * `WebSearchErrorReason` set so the renderer can pick a generalized - * Chinese copy without ever reading provider body bytes. - */ - -import { - WEB_SEARCH_DEFAULT_LIMIT, - WEB_SEARCH_MAX_LIMIT, - normalizeWebSearchLimit, - type WebSearchResponse, - type WebSearchResultRow, -} from '@maka/core'; - -const TAVILY_ENDPOINT = 'https://api.tavily.com/search'; -const TAVILY_TIMEOUT_MS = 10_000; - -interface TavilyRawResult { - title?: unknown; - url?: unknown; - content?: unknown; -} - -interface TavilyRawResponse { - results?: unknown; -} - -function safeString(value: unknown, fallback = ''): string { - return typeof value === 'string' ? value : fallback; -} - -function hostnameOf(url: string): string { - try { - return new URL(url).hostname; - } catch { - return url; - } -} - -function mapTavilyRows(raw: unknown, limit: number): WebSearchResultRow[] { - if (!raw || typeof raw !== 'object') return []; - const arr = (raw as TavilyRawResponse).results; - if (!Array.isArray(arr)) return []; - const rows: WebSearchResultRow[] = []; - for (const item of arr) { - if (!item || typeof item !== 'object') continue; - const row = item as TavilyRawResult; - const url = safeString(row.url); - if (!url.startsWith('http://') && !url.startsWith('https://')) continue; - const title = safeString(row.title, url); - const snippet = safeString(row.content); - rows.push({ - provider: 'tavily', - title: title.slice(0, 240), - url, - snippet: snippet.slice(0, 400), - source: hostnameOf(url), - }); - if (rows.length >= limit) break; - } - return rows; -} - -export interface QueryTavilyInput { - apiKey: string; - query: string; - limit: number; -} - -/** - * Calls Tavily and returns a `WebSearchResponse`. Pure failure mapping — - * no exceptions thrown to the IPC handler. Network errors / timeouts - * collapse to `network_error` / `timeout`; HTTP 401 collapses to - * `invalid_credentials`; HTTP 429 collapses to `rate_limited`. - */ -export async function queryTavily(input: QueryTavilyInput): Promise { - const trimmedKey = input.apiKey.trim(); - if (trimmedKey.length === 0) { - return { ok: false, reason: 'not_configured', message: '等待配置 Tavily API key 后启用联网搜索。' }; - } - const limit = Math.min(WEB_SEARCH_MAX_LIMIT, normalizeWebSearchLimit(input.limit)); - const body = JSON.stringify({ - api_key: trimmedKey, - query: input.query, - max_results: limit, - search_depth: 'basic', - }); - - const controller = new AbortController(); - const timer = setTimeout(() => controller.abort(), TAVILY_TIMEOUT_MS); - try { - const response = await fetch(TAVILY_ENDPOINT, { - method: 'POST', - headers: { 'content-type': 'application/json' }, - body, - signal: controller.signal, - }); - if (response.status === 401 || response.status === 403) { - return { - ok: false, - reason: 'invalid_credentials', - message: 'Tavily 拒绝了当前 API key。请检查后重试。', - }; - } - if (response.status === 429) { - return { - ok: false, - reason: 'rate_limited', - message: 'Tavily 返回限流，请稍后再试。', - }; - } - if (!response.ok) { - return { - ok: false, - reason: 'network_error', - message: `Tavily 返回 HTTP ${response.status}。`, - }; - } - const json = (await response.json()) as unknown; - const rows = mapTavilyRows(json, limit); - return { ok: true, results: rows }; - } catch (err: unknown) { - if (err instanceof Error && err.name === 'AbortError') { - return { - ok: false, - reason: 'timeout', - message: `Tavily 请求超过 ${Math.round(TAVILY_TIMEOUT_MS / 1000)}s 未返回。`, - }; - } - return { - ok: false, - reason: 'network_error', - message: '联网搜索请求失败，请检查网络后重试。', - }; - } finally { - clearTimeout(timer); - } -} - -export const TAVILY_TEST_QUERY = 'maka ai assistant'; -export const TAVILY_TEST_LIMIT = WEB_SEARCH_DEFAULT_LIMIT; diff --git a/apps/desktop/src/main/workspace-resources-ipc-main.ts b/apps/desktop/src/main/workspace-resources-ipc-main.ts deleted file mode 100644 index d63b25248a..0000000000 --- a/apps/desktop/src/main/workspace-resources-ipc-main.ts +++ /dev/null @@ -1,297 +0,0 @@ -import { ipcMain, shell } from 'electron'; -import { copyFile } from 'node:fs/promises'; -import { join } from 'node:path'; -import { - isCollaborationMode, - type ArtifactSaveResult, - type CollaborationMode, -} from '@maka/core'; -import type { - HostCapabilities, - InvocableSkillEntry, - SkillSelectionReport, -} from '@maka/runtime'; -import { type ArtifactStore, resolveArtifactPath } from '@maka/storage'; -import type { createMainWindowController } from './main-window.js'; -import { - createStarterSkill, - deleteSkill, - getSkillGovernanceDetails, - installBundledSkill, - installManagedSkill, - listBundledSkillCatalog, - listGovernedSkillEntries, - previewManagedSkillUpdate, - resolveSkillOpenPath, - setSkillEnabled, - setSkillPinned, - toSkillEntry, - updateManagedSkill, -} from './skills.js'; -import { - importManagedSkillSource, - listManagedSkillSources, - toManagedSkillSourceEntry, -} from './managed-skill-sources.js'; - -type MainWindowController = ReturnType; - -export interface NewSessionSkillContext { - llmConnectionSlug?: string; - model?: string; - collaborationMode?: CollaborationMode; -} - -interface WorkspaceResourcesIpcDeps { - workspaceRoot: string; - artifactStore: ArtifactStore; - mainWindowController: MainWindowController; - sendToRenderer: MainWindowController['send']; - listInvocableSkills( - sessionId?: string, - newSessionContext?: NewSessionSkillContext, - ): Promise; - skillHost?: HostCapabilities; - getCurrentProjectRoot?: () => Promise; - getSkillSelectionReport?: (cwd: string) => SkillSelectionReport | undefined; - invalidateSkillSelectionReport?: (cwd: string) => void; -} - -export function registerWorkspaceResourcesIpc(deps: WorkspaceResourcesIpcDeps): void { - ipcMain.handle( - 'app:openArtifactPath', - async ( - _event, - sessionId: string, - artifactId: string, - ): Promise< - | { ok: true; opened: string } - | { - ok: false; - reason: 'unknown-key' | 'not-allowed' | 'missing' | 'not-a-directory' | 'open-failed'; - } - > => { - const record = await deps.artifactStore.get(artifactId); - if (!record || record.sessionId !== sessionId) return { ok: false, reason: 'missing' }; - if (record.status === 'deleted') return { ok: false, reason: 'missing' }; - const artifactRoot = join(deps.workspaceRoot, 'artifacts'); - const resolved = await resolveArtifactPath({ - artifactRoot, - relativePath: record.relativePath, - }); - if (!resolved.ok) { - if (resolved.reason === 'not_allowed') return { ok: false, reason: 'not-allowed' }; - return { ok: false, reason: 'missing' }; - } - shell.showItemInFolder(resolved.path); - return { ok: true, opened: record.name }; - }, - ); - - ipcMain.handle('app:saveArtifactAs', async ( - _event, - sessionId: string, - artifactId: string, - ): Promise => { - const record = await deps.artifactStore.get(artifactId); - if (!record || record.sessionId !== sessionId) return { ok: false, reason: 'not_found' }; - if (record.status === 'deleted') return { ok: false, reason: 'deleted' }; - const resolved = await resolveArtifactPath({ - artifactRoot: join(deps.workspaceRoot, 'artifacts'), - relativePath: record.relativePath, - }); - if (!resolved.ok) { - if (resolved.reason === 'not_allowed') return { ok: false, reason: 'not_allowed' }; - return { ok: false, reason: 'not_found' }; - } - const result = await deps.mainWindowController.showSaveDialog({ - title: `另存为 ${record.name}`, - defaultPath: record.name, - }); - if (result.canceled || !result.filePath) return { ok: false, reason: 'canceled' }; - try { - await copyFile(resolved.path, result.filePath); - return { ok: true, saved: record.name }; - } catch { - return { ok: false, reason: 'write_failed' }; - } - }); - - ipcMain.handle('artifacts:list', (_event, sessionId: string, opts?: { includeDeleted?: boolean }) => - deps.artifactStore.list(sessionId, opts), - ); - ipcMain.handle('artifacts:get', async (_event, sessionId: string, artifactId: string) => { - const artifact = await deps.artifactStore.get(artifactId); - return artifact?.sessionId === sessionId ? artifact : null; - }); - ipcMain.handle('artifacts:readText', async (_event, sessionId: string, artifactId: string) => { - const artifact = await deps.artifactStore.get(artifactId); - return artifact?.sessionId === sessionId - ? deps.artifactStore.readText(artifactId) - : { ok: false as const, reason: 'not_found' as const }; - }); - ipcMain.handle('artifacts:readBinary', async (_event, sessionId: string, artifactId: string) => { - const artifact = await deps.artifactStore.get(artifactId); - return artifact?.sessionId === sessionId - ? deps.artifactStore.readBinary(artifactId) - : { ok: false as const, reason: 'not_found' as const }; - }); - ipcMain.handle('artifacts:delete', async (_event, sessionId: string, artifactId: string) => { - const artifact = await deps.artifactStore.get(artifactId); - if (!artifact || artifact.sessionId !== sessionId) return; - if (artifact?.source === 'deep_research') { - throw new Error('Deep Research artifacts are protected by the durable research ledger'); - } - if (artifact?.source === 'tool_result_archive') { - throw new Error('Tool result archives are read-only runtime evidence'); - } - await deps.artifactStore.delete(artifactId); - if (artifact) { - deps.sendToRenderer('artifacts:changed', { - reason: 'deleted', - artifactId, - sessionId: artifact.sessionId, - ts: Date.now(), - }); - } - }); - - ipcMain.handle('skills:list', async () => { - const cwd = await deps.getCurrentProjectRoot?.(); - return listGovernedSkillEntries( - deps.workspaceRoot, - { - ...(cwd ? { cwd } : {}), - ...(deps.skillHost ? { host: deps.skillHost } : {}), - ...(cwd && deps.getSkillSelectionReport?.(cwd) - ? { selectionReport: deps.getSkillSelectionReport(cwd) } - : {}), - }, - ); - }); - ipcMain.handle( - 'skills:listInvocable', - async (_event, sessionId?: unknown, newSessionContext?: unknown) => { - return deps.listInvocableSkills( - typeof sessionId === 'string' ? sessionId : undefined, - normalizeNewSessionSkillContext(newSessionContext), - ); - }, - ); - ipcMain.handle('skills:catalog:list', async () => { - return listBundledSkillCatalog(deps.workspaceRoot); - }); - ipcMain.handle('skills:catalog:install', async (_event, id: string) => { - const result = await installBundledSkill(deps.workspaceRoot, id); - if (!result.ok) return result; - return { ok: true as const, skill: toSkillEntry(result.skill) }; - }); - ipcMain.handle('skills:sources:list', async () => { - const sources = await listManagedSkillSources(); - return sources.map(toManagedSkillSourceEntry); - }); - ipcMain.handle('skills:sources:importLocalFile', async () => { - const result = await deps.mainWindowController.showOpenDialog({ - title: '导入 Skill 来源', - properties: ['openFile'], - filters: [ - { name: 'Skill Markdown', extensions: ['md'] }, - { name: 'All Files', extensions: ['*'] }, - ], - }); - if (result.canceled || result.filePaths.length === 0) return { ok: false as const, reason: 'cancelled' as const }; - const imported = await importManagedSkillSource({ sourceFile: result.filePaths[0] }); - if (!imported.ok) return imported; - return { ok: true as const, source: toManagedSkillSourceEntry(imported.source) }; - }); - ipcMain.handle('skills:installManaged', async (_event, sourceId: string) => { - const result = await installManagedSkill(deps.workspaceRoot, sourceId); - if (!result.ok) return result; - return { ok: true as const, skill: toSkillEntry(result.skill) }; - }); - ipcMain.handle('skills:details', async (_event, skillId: string) => { - return getSkillGovernanceDetails(deps.workspaceRoot, skillId); - }); - ipcMain.handle('skills:previewUpdate', async (_event, skillId: string) => { - return previewManagedSkillUpdate(deps.workspaceRoot, skillId); - }); - ipcMain.handle('skills:updateManaged', async (_event, skillId: string, options?: { force?: boolean; expectedCurrentSha256?: string; expectedSourceSha256?: string }) => { - const result = await updateManagedSkill(deps.workspaceRoot, skillId, undefined, { - force: options?.force === true, - expectedCurrentSha256: options?.expectedCurrentSha256, - expectedSourceSha256: options?.expectedSourceSha256, - }); - if (!result.ok) return result; - return { ok: true as const, skill: toSkillEntry(result.skill) }; - }); - ipcMain.handle('skills:setEnabled', async (_event, skillId: string, enabled: boolean) => { - const cwd = await deps.getCurrentProjectRoot?.(); - const result = await setSkillEnabled( - deps.workspaceRoot, - skillId, - enabled === true, - { ...(cwd ? { cwd } : {}), ...(deps.skillHost ? { host: deps.skillHost } : {}) }, - ); - if (result.ok && cwd) deps.invalidateSkillSelectionReport?.(cwd); - return result; - }); - ipcMain.handle('skills:setPinned', async (_event, skillRef: string, pinned: boolean) => { - const cwd = await deps.getCurrentProjectRoot?.(); - const result = await setSkillPinned( - deps.workspaceRoot, - skillRef, - pinned === true, - { ...(cwd ? { cwd } : {}), ...(deps.skillHost ? { host: deps.skillHost } : {}) }, - ); - if (result.ok && cwd) deps.invalidateSkillSelectionReport?.(cwd); - return result; - }); - ipcMain.handle('skills:createStarter', async () => { - const result = await createStarterSkill(deps.workspaceRoot); - if (!result.ok) return result; - return { ok: true as const, created: result.created, skill: toSkillEntry(result.skill), filePath: result.filePath }; - }); - ipcMain.handle('skills:delete', async (_event, idOrRef: string) => { - // Same cwd plumbing as skills:open — a scope-aware ref only resolves if the - // delete scans the same project-level discovery dirs the list did. - const cwd = await deps.getCurrentProjectRoot?.(); - const result = await deleteSkill(deps.workspaceRoot, idOrRef, cwd ? { cwd } : {}); - if (result.ok && cwd) deps.invalidateSkillSelectionReport?.(cwd); - return result; - }); - ipcMain.handle('skills:open', async (_event, id: string, target: 'file' | 'directory' = 'file') => { - const cwd = await deps.getCurrentProjectRoot?.(); - const resolved = await resolveSkillOpenPath( - deps.workspaceRoot, - id, - target, - cwd ? { cwd } : {}, - ); - if (!resolved.ok) return resolved; - const error = await shell.openPath(resolved.path); - if (error) return { ok: false, reason: 'open_failed' as const }; - return { ok: true as const, target: resolved.target }; - }); -} - -function normalizeNewSessionSkillContext(input: unknown): NewSessionSkillContext | undefined { - if (!input || typeof input !== 'object' || Array.isArray(input)) return undefined; - const record = input as Record; - const llmConnectionSlug = boundedText(record.llmConnectionSlug, 128); - const model = boundedText(record.model, 512); - const collaborationMode = isCollaborationMode(record.collaborationMode) - ? record.collaborationMode - : undefined; - if (!llmConnectionSlug && !model && !collaborationMode) return undefined; - return { - ...(llmConnectionSlug ? { llmConnectionSlug } : {}), - ...(model ? { model } : {}), - ...(collaborationMode ? { collaborationMode } : {}), - }; -} - -function boundedText(input: unknown, maxLength: number): string | undefined { - if (typeof input !== 'string') return undefined; - const value = input.trim(); - return value.length > 0 && value.length <= maxLength ? value : undefined; -} diff --git a/apps/desktop/src/preload/bridge-contract.d.ts b/apps/desktop/src/preload/bridge-contract.d.ts index 949efd63c6..e6b3a6c1d2 100644 --- a/apps/desktop/src/preload/bridge-contract.d.ts +++ b/apps/desktop/src/preload/bridge-contract.d.ts @@ -387,6 +387,7 @@ export interface MakaBridge { sessionId: string; ref: string; }): Promise; + detach(input: { sessionId: string; ref: string }): Promise; start(sessionId: string): Promise; write(input: { sessionId: string; diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts index ca18268fae..d0bbdeb4b6 100644 --- a/apps/desktop/src/preload/preload.ts +++ b/apps/desktop/src/preload/preload.ts @@ -445,6 +445,9 @@ const makaBridge = { }): Promise { return ipcRenderer.invoke('shell-runs:attach', input); }, + detach(input: { sessionId: string; ref: string }): Promise { + return ipcRenderer.invoke('shell-runs:detach', input); + }, start(sessionId: string): Promise { return ipcRenderer.invoke('shell-runs:start', sessionId); }, diff --git a/apps/desktop/src/renderer/app-shell.tsx b/apps/desktop/src/renderer/app-shell.tsx index 007af23286..dd7896194d 100644 --- a/apps/desktop/src/renderer/app-shell.tsx +++ b/apps/desktop/src/renderer/app-shell.tsx @@ -78,7 +78,6 @@ import { openCompanionPanel, removeStagedCompanionQuote, stageCompanionQuote, - type QuoteCompanionPanelState, } from './quote-companion-panel-state'; import { parseSideChatCommand, @@ -182,6 +181,8 @@ import { useShellLiveTurn } from './use-shell-live-turn'; import { useShellLayout } from './use-shell-layout'; import { useShellResume } from './use-shell-resume'; import { filterUserVisibleArtifacts } from './artifact-visibility'; +import { recoverOrphanedCompanionCopies } from './quote-companion-core'; +import { useSideConversationWorkspace } from './use-side-conversation-workspace'; function rebaseWorkspaceFileReferences( sourceText: string, @@ -562,15 +563,12 @@ function AppShellContent({ // for the whole shell, so the handle is always live by the time it is called. const sessionSideNavHandleRef = useRef(null); // Codex-style side conversations: each workbar tab owns a separate transient - // read-only fork, composer draft, quote queue, and cleanup lifecycle. - const [quotePanels, setQuotePanels] = useState([]); - const [sideChatContentPanelIds, setSideChatContentPanelIds] = useState>( - () => new Set(), - ); - const [sideChatPreparingPanelIds, setSideChatPreparingPanelIds] = - useState>(() => new Set()); - const [sideChatActivePanelIds, setSideChatActivePanelIds] = - useState>(() => new Set()); + // fork, composer draft, quote queue, and cleanup lifecycle. + const sideConversations = useSideConversationWorkspace(); + const quotePanels = sideConversations.panels; + const sideChatContentPanelIds = sideConversations.contentPanelIds; + const sideChatPreparingPanelIds = sideConversations.preparingPanelIds; + const sideChatActivePanelIds = sideConversations.activePanelIds; const [pendingSideChatClose, setPendingSideChatClose] = useState>( [], @@ -585,6 +583,12 @@ function AppShellContent({ const [hiddenCompanionForkIds, setHiddenCompanionForkIds] = useState>( () => new Set(), ); + const companionRecoveryStartedRef = useRef(false); + useLayoutEffect(() => { + if (companionRecoveryStartedRef.current) return; + companionRecoveryStartedRef.current = true; + void recoverOrphanedCompanionCopies(window.maka.sessions); + }, []); const onCompanionForkVisibilityChange = useCallback( (event: Parameters[1]) => setHiddenCompanionForkIds((current) => @@ -1310,31 +1314,43 @@ function AppShellContent({ openWorkbarLauncher('right'); }, [openWorkbarLauncher, setWorkbarCollapsed]); - const openSideConversation = useCallback((initialPrompt?: string) => { - const sourceSessionId = activeIdRef.current; - if (!sourceSessionId) return; - const panel = openCompanionPanel(null, { - sourceSessionId, - initialPrompt, - newId: () => crypto.randomUUID(), - }); - setQuotePanels((current) => [...current, panel]); - setSideChatPreparingPanelIds((current) => new Set(current).add(panel.id)); - openDynamicWorkbarTab({ - id: `side-chat:${panel.id}`, - kind: 'side-chat', - title: sideChatTitleFromPrompt(initialPrompt ?? ''), - ordinal: nextSideChatOrdinal([ - ...workbarPanelsState.right.tabs, - ...workbarPanelsState.bottom.tabs, - ]), - }); - setWorkbarCollapsed(false); - }, [ - openDynamicWorkbarTab, - setWorkbarCollapsed, - workbarPanelsState, - ]); + const openNewSideConversation = useCallback( + (placement: SessionWorkbarPlacement, initialPrompt?: string) => { + const sourceSessionId = activeIdRef.current; + if (!sourceSessionId) return; + const panel = openCompanionPanel(null, { + sourceSessionId, + initialPrompt, + newId: () => crypto.randomUUID(), + }); + sideConversations.upsertPanel(panel, true); + openDynamicWorkbarTab( + { + id: `side-chat:${panel.id}`, + kind: 'side-chat', + title: sideChatTitleFromPrompt(initialPrompt ?? ''), + ordinal: nextSideChatOrdinal([ + ...workbarPanelsState.right.tabs, + ...workbarPanelsState.bottom.tabs, + ]), + }, + placement, + ); + if (placement === 'right') setWorkbarCollapsed(false); + else setBottomPanelOpen(true); + }, + [ + openDynamicWorkbarTab, + setBottomPanelOpen, + setWorkbarCollapsed, + sideConversations, + workbarPanelsState, + ], + ); + const openSideConversation = useCallback( + (initialPrompt?: string) => openNewSideConversation('right', initialPrompt), + [openNewSideConversation], + ); const openSideConversationRef = useRef(openSideConversation); openSideConversationRef.current = openSideConversation; const sideChatSlashCommands = useMemo< @@ -1422,14 +1438,7 @@ function AppShellContent({ newId: () => crypto.randomUUID(), }, ); - setQuotePanels((current) => - activePanel - ? current.map((candidate) => (candidate.id === panel.id ? panel : candidate)) - : [...current, panel], - ); - if (!activePanel) { - setSideChatPreparingPanelIds((current) => new Set(current).add(panel.id)); - } + sideConversations.upsertPanel(panel, !activePanel); const targetPlacement = activeSideChat?.placement ?? 'right'; openDynamicWorkbarTab( @@ -1454,6 +1463,7 @@ function AppShellContent({ quotePanels, setBottomPanelOpen, setWorkbarCollapsed, + sideConversations, workbarPanelsState, ], ); @@ -1497,26 +1507,7 @@ function AppShellContent({ return; } if (kind === 'side-chat') { - if (!activeId) return; - const panel = openCompanionPanel(null, { - sourceSessionId: activeId, - newId: () => crypto.randomUUID(), - }); - setQuotePanels((current) => [...current, panel]); - setSideChatPreparingPanelIds((current) => new Set(current).add(panel.id)); - openDynamicWorkbarTab( - { - id: `side-chat:${panel.id}`, - kind: 'side-chat', - ordinal: nextSideChatOrdinal([ - ...workbarPanelsState.right.tabs, - ...workbarPanelsState.bottom.tabs, - ]), - }, - placement, - ); - if (placement === 'right') setWorkbarCollapsed(false); - else setBottomPanelOpen(true); + openNewSideConversation(placement); return; } openWorkbarTab(kind, placement); @@ -1526,6 +1517,7 @@ function AppShellContent({ [ activeId, openDynamicWorkbarTab, + openNewSideConversation, openWorkbarTab, setBottomPanelOpen, setWorkbarCollapsed, @@ -1556,29 +1548,9 @@ function AppShellContent({ .map((tab) => tab.id.slice('side-chat:'.length)), ); if (panelIds.size === 0) return; - setQuotePanels((current) => - current.filter((panel) => !panelIds.has(panel.id)), - ); - setSideChatContentPanelIds((current) => { - const next = new Set( - [...current].filter((panelId) => !panelIds.has(panelId)), - ); - return next.size === current.size ? current : next; - }); - setSideChatPreparingPanelIds((current) => { - const next = new Set( - [...current].filter((panelId) => !panelIds.has(panelId)), - ); - return next.size === current.size ? current : next; - }); - setSideChatActivePanelIds((current) => { - const next = new Set( - [...current].filter((panelId) => !panelIds.has(panelId)), - ); - return next.size === current.size ? current : next; - }); + sideConversations.removePanels(panelIds); }, - [closeWorkbarTabs], + [closeWorkbarTabs, sideConversations], ); useEffect(() => { @@ -1670,22 +1642,8 @@ function AppShellContent({ : 'bottom'; closeWorkbarTab(placement, tabId); } - setQuotePanels((current) => - current.filter((panel) => !staleIds.has(panel.id)), - ); - setSideChatContentPanelIds((current) => { - const next = new Set([...current].filter((panelId) => !staleIds.has(panelId))); - return next.size === current.size ? current : next; - }); - setSideChatPreparingPanelIds((current) => { - const next = new Set([...current].filter((panelId) => !staleIds.has(panelId))); - return next.size === current.size ? current : next; - }); - setSideChatActivePanelIds((current) => { - const next = new Set([...current].filter((panelId) => !staleIds.has(panelId))); - return next.size === current.size ? current : next; - }); - }, [quotePanels, activeId, closeWorkbarTab, workbarPanelsState]); + sideConversations.removePanels(staleIds); + }, [quotePanels, activeId, closeWorkbarTab, sideConversations, workbarPanelsState]); function isAutomationsSurfaceActive(): boolean { return navSelectionRef.current.section === 'automations' && navSelectionRef.current.module === 'plan-reminders'; @@ -3062,51 +3020,23 @@ function AppShellContent({ (panel) => panel.sourceSessionId === activeId, )} onQuotesConsumed={(snapshot) => - setQuotePanels((current) => - current.map((panel) => - panel.id === snapshot.panelId - ? consumeCompanionQuoteSnapshot(panel, snapshot) ?? panel - : panel, - ), + sideConversations.updatePanel(snapshot.panelId, (panel) => + consumeCompanionQuoteSnapshot(panel, snapshot) ?? panel, ) } onRemoveQuote={(target) => - setQuotePanels((current) => - current.map((panel) => - panel.id === target.panelId - ? removeStagedCompanionQuote(panel, target) ?? panel - : panel, - ), + sideConversations.updatePanel(target.panelId, (panel) => + removeStagedCompanionQuote(panel, target) ?? panel, ) } onForkVisibilityChange={onCompanionForkVisibilityChange} - onContentStateChange={(panelId, hasContent) => - setSideChatContentPanelIds((current) => { - if (current.has(panelId) === hasContent) return current; - const next = new Set(current); - if (hasContent) next.add(panelId); - else next.delete(panelId); - return next; - }) - } + onContentStateChange={sideConversations.setContent} preparingSideChatPanelIds={sideChatPreparingPanelIds} activeSideChatPanelIds={sideChatActivePanelIds} - onPreparingStateChange={(panelId, preparing) => - setSideChatPreparingPanelIds((current) => { - if (current.has(panelId) === preparing) return current; - const next = new Set(current); - if (preparing) next.add(panelId); - else next.delete(panelId); - return next; - }) - } + onPreparingStateChange={sideConversations.setPreparing} onInitialPromptStarted={(panelId) => - setQuotePanels((current) => - current.map((panel) => - panel.id === panelId - ? consumeCompanionInitialPrompt(panel, panelId) ?? panel - : panel, - ), + sideConversations.updatePanel(panelId, (panel) => + consumeCompanionInitialPrompt(panel, panelId) ?? panel, ) } onPromptAccepted={(panelId, prompt) => { @@ -3115,15 +3045,7 @@ function AppShellContent({ titleWorkbarTab(`side-chat:${panelId}`, title); } }} - onActivityStateChange={(panelId, active) => - setSideChatActivePanelIds((current) => { - if (current.has(panelId) === active) return current; - const next = new Set(current); - if (active) next.add(panelId); - else next.delete(panelId); - return next; - }) - } + onActivityStateChange={sideConversations.setActive} sourceSession={activeSessionForView} modelChoices={chatModelChoices} mentionSkills={mentionSkills} diff --git a/apps/desktop/src/renderer/quote-companion-core.ts b/apps/desktop/src/renderer/quote-companion-core.ts index 8846ae288c..9171362de1 100644 --- a/apps/desktop/src/renderer/quote-companion-core.ts +++ b/apps/desktop/src/renderer/quote-companion-core.ts @@ -11,7 +11,6 @@ import type { QuoteRef, SessionEvent, SessionSummary, - StoredMessage, TurnRecord, UiLocale, } from '@maka/core'; @@ -20,6 +19,7 @@ import { acquireSessionCopyAttempt, abandonSessionCopyAttempt, completeSessionCopyAttempt, + listSessionCopyAttempts, readSessionCopyAttempt, startSessionCopyAttempt, type SessionCopyAttemptKey, @@ -36,7 +36,6 @@ type CompanionSendResult = { ok: true } | { ok: false; reason?: string }; * place of `window.maka.sessions` (the React hook stays a thin shell). */ export interface CompanionSessionApi { - readMessages(sessionId: string): Promise; listTurns(sessionId: string): Promise; branchFromTurn( sessionId: string, @@ -47,7 +46,6 @@ export interface CompanionSessionApi { sideConversation?: boolean; }, ): Promise; - setPermissionMode(sessionId: string, mode: PermissionMode): Promise; cleanupSessionCopy(sessionId: string): Promise; abandonSessionCopy(sessionId: string): Promise; send( @@ -93,12 +91,12 @@ export function createCompanionDismissalGuard(): CompanionDismissalGuard { export interface EnsureCompanionForkDeps { api: CompanionSessionApi; sourceSession: SessionSummary; + panelId: string; name: string; /** True once the panel has unmounted — checked after every await so a fork * born after disposal is torn down instead of leaking a hidden run. */ isDisposed: () => boolean; - /** Fired as soon as creation returns, before the permission pin round-trip. - * The host uses the id to hide this ephemeral child immediately. */ + /** Fired as soon as creation returns so the host can hide this ephemeral child. */ onForkCreated?: (session: SessionSummary) => void; /** Fired only after the main-process cleanup authority confirms deletion. */ onForkCleanupSucceeded?: (sessionId: string) => void; @@ -112,15 +110,19 @@ export function latestSettledTurnId(turns: readonly TurnRecord[]): string | unde return [...turns].reverse().find((turn) => turn.status === 'completed')?.turnId; } -function companionCopyAttemptKey(sourceSessionId: string): SessionCopyAttemptKey { - return { scope: 'quote-companion', kind: 'branch', sourceSessionId }; +function companionCopyAttemptKey( + sourceSessionId: string, + panelId: string, +): SessionCopyAttemptKey { + return { scope: `quote-companion:${panelId}`, kind: 'branch', sourceSessionId }; } export async function abandonPendingCompanionCopy( api: CompanionSessionApi, sourceSessionId: string, + panelId: string, ): Promise { - const key = companionCopyAttemptKey(sourceSessionId); + const key = companionCopyAttemptKey(sourceSessionId, panelId); const attempt = readSessionCopyAttempt(key); if (!attempt) return true; abandonSessionCopyAttempt(key, attempt.copyId); @@ -133,12 +135,30 @@ export async function abandonPendingCompanionCopy( } } +export async function recoverOrphanedCompanionCopies( + api: CompanionSessionApi, +): Promise { + const attempts = listSessionCopyAttempts('quote-companion:'); + await Promise.all( + attempts.map(async ({ key, attempt }) => { + abandonSessionCopyAttempt(key, attempt.copyId); + try { + await api.abandonSessionCopy(attempt.copyId); + completeSessionCopyAttempt(key, attempt.copyId); + } catch { + // Keep the abandoning lease so the next renderer reload retries cleanup. + } + }), + ); +} + export async function cleanupCompanionCopy( api: CompanionSessionApi, sourceSessionId: string, + panelId: string, companionSessionId: string, ): Promise { - const key = companionCopyAttemptKey(sourceSessionId); + const key = companionCopyAttemptKey(sourceSessionId, panelId); const attempt = readSessionCopyAttempt(key); if (attempt) abandonSessionCopyAttempt(key, attempt.copyId); try { @@ -174,7 +194,12 @@ export function deriveCompanionComposerState( * lifecycle paths can remain fire-and-forget without losing recovery. */ function scheduleCompanionCleanup(deps: EnsureCompanionForkDeps, sessionId: string): void { - void cleanupCompanionCopy(deps.api, deps.sourceSession.id, sessionId).then((cleaned) => { + void cleanupCompanionCopy( + deps.api, + deps.sourceSession.id, + deps.panelId, + sessionId, + ).then((cleaned) => { if (cleaned) deps.onForkCleanupSucceeded?.(sessionId); }); } @@ -208,19 +233,24 @@ export async function ensureCompanionFork( let created: SessionSummary; try { let copyAttempt = acquireSessionCopyAttempt( - companionCopyAttemptKey(sourceSession.id), + companionCopyAttemptKey(sourceSession.id, deps.panelId), boundaryTurnId, ); if (copyAttempt.phase === 'abandoning') { - if (!(await abandonPendingCompanionCopy(api, sourceSession.id))) { + if (!(await abandonPendingCompanionCopy(api, sourceSession.id, deps.panelId))) { return { status: 'error', code: 'fork_setup_failed' }; } copyAttempt = acquireSessionCopyAttempt( - companionCopyAttemptKey(sourceSession.id), + companionCopyAttemptKey(sourceSession.id, deps.panelId), boundaryTurnId, ); } - if (!startSessionCopyAttempt(companionCopyAttemptKey(sourceSession.id), copyAttempt.copyId)) { + if ( + !startSessionCopyAttempt( + companionCopyAttemptKey(sourceSession.id, deps.panelId), + copyAttempt.copyId, + ) + ) { return { status: 'error', code: 'fork_setup_failed' }; } created = await api.branchFromTurn(sourceSession.id, { @@ -237,8 +267,7 @@ export async function ensureCompanionFork( return { status: 'disposed' }; } // `sessions:branchFromTurn` broadcasts `sessions:changed(created)` before the - // promise resolves. Report the id at the first renderer-visible opportunity, - // rather than waiting on the potentially slow permission pin below. + // promise resolves. Report the id at the first renderer-visible opportunity. deps.onForkCreated?.(created); if (isDisposed()) { @@ -261,7 +290,7 @@ export interface PerformCompanionTurnDeps extends EnsureCompanionForkDeps { text: string; quotes: QuoteRef[] | undefined; attachmentItems?: RendererIngestInput[]; - /** Fired once a fork is created + confirmed read-only, so the caller can commit it. */ + /** Fired once a fork is ready, so the caller can commit it. */ onForkCommitted: (session: SessionSummary) => void; /** Fired right before the send — the caller arms the optimistic live turn here. */ onBeforeSend: (forkId: string) => void; diff --git a/apps/desktop/src/renderer/session-copy-attempt.ts b/apps/desktop/src/renderer/session-copy-attempt.ts index 247e0bd85c..0b61baf353 100644 --- a/apps/desktop/src/renderer/session-copy-attempt.ts +++ b/apps/desktop/src/renderer/session-copy-attempt.ts @@ -17,7 +17,15 @@ export interface SessionCopyAttempt { complete(): void; } -type PersistedSessionCopyAttempt = Pick; +export type PersistedSessionCopyAttempt = Pick< + SessionCopyAttempt, + 'copyId' | 'sourceTurnId' | 'phase' +>; + +export interface PersistedSessionCopyAttemptEntry { + key: SessionCopyAttemptKey; + attempt: PersistedSessionCopyAttempt; +} const memoryAttempts = new Map(); @@ -100,6 +108,18 @@ export function readSessionCopyAttempt( return readAttempts(storage).get(encodeAttemptKey(key)); } +export function listSessionCopyAttempts( + scopePrefix: string, + storage: SessionStorageLike | undefined = rendererSessionStorage(), +): PersistedSessionCopyAttemptEntry[] { + const entries: PersistedSessionCopyAttemptEntry[] = []; + for (const [encodedKey, attempt] of readAttempts(storage)) { + const key = decodeAttemptKey(encodedKey); + if (key?.scope.startsWith(scopePrefix)) entries.push({ key, attempt }); + } + return entries; +} + export function completeSessionCopyAttempt( key: SessionCopyAttemptKey, copyId: string, @@ -118,6 +138,28 @@ function encodeAttemptKey(key: SessionCopyAttemptKey): string { return JSON.stringify([key.scope, key.kind, key.sourceSessionId]); } +function decodeAttemptKey(encodedKey: string): SessionCopyAttemptKey | undefined { + try { + const value = JSON.parse(encodedKey) as unknown; + if ( + !Array.isArray(value) || + value.length !== 3 || + typeof value[0] !== 'string' || + value[0].length === 0 || + value[0].length > 512 || + (value[1] !== 'branch' && value[1] !== 'revision') || + typeof value[2] !== 'string' || + value[2].length === 0 || + value[2].length > 128 + ) { + return undefined; + } + return { scope: value[0], kind: value[1], sourceSessionId: value[2] }; + } catch { + return undefined; + } +} + function readAttempts( storage: SessionStorageLike | undefined, ): Map { @@ -139,7 +181,7 @@ function readAttempts( } } for (const [key, attempt] of memoryAttempts) { - if (!attempts.has(key)) attempts.set(key, attempt); + attempts.set(key, attempt); } return attempts; } catch { diff --git a/apps/desktop/src/renderer/session-terminal-panel.tsx b/apps/desktop/src/renderer/session-terminal-panel.tsx index 8327d732c4..98216d13c8 100644 --- a/apps/desktop/src/renderer/session-terminal-panel.tsx +++ b/apps/desktop/src/renderer/session-terminal-panel.tsx @@ -56,6 +56,7 @@ export function SessionTerminalPanel(props: { const host = hostRef.current; if (!host || !props.terminalRef) return; + lastSizeRef.current = ''; let disposed = false; let attached = false; let lastSequence = 0; @@ -170,6 +171,9 @@ export function SessionTerminalPanel(props: { observer.disconnect(); unsubscribe(); inputSubscription.dispose(); + void window.maka.shellRuns + .detach({ sessionId: props.sessionId, ref: props.terminalRef! }) + .catch(() => {}); fitRef.current = null; terminalRef.current = null; terminal.dispose(); diff --git a/apps/desktop/src/renderer/session-workbar.tsx b/apps/desktop/src/renderer/session-workbar.tsx index 675732b37b..a7a0b0a828 100644 --- a/apps/desktop/src/renderer/session-workbar.tsx +++ b/apps/desktop/src/renderer/session-workbar.tsx @@ -2,6 +2,7 @@ import { lazy, Suspense, useEffect, + useLayoutEffect, useRef, useState, type CSSProperties, @@ -607,14 +608,11 @@ function WorkbarLauncher(props: { const firstEnabledActionIndex = actions.findIndex( (action) => !action.disabled, ); - useEffect(() => { + useLayoutEffect(() => { if (!props.active) return; - const frame = window.requestAnimationFrame(() => { - menuRef.current - ?.querySelector('[role="menuitem"]:not(:disabled)') - ?.focus(); - }); - return () => window.cancelAnimationFrame(frame); + menuRef.current + ?.querySelector('[role="menuitem"]:not(:disabled)') + ?.focus(); }, [props.active]); const handleMenuKeyDown = (event: ReactKeyboardEvent) => { const menu = menuRef.current; diff --git a/apps/desktop/src/renderer/settings/provider-connection-status.ts b/apps/desktop/src/renderer/settings/provider-connection-status.ts index 483d95ea38..125c27baf5 100644 --- a/apps/desktop/src/renderer/settings/provider-connection-status.ts +++ b/apps/desktop/src/renderer/settings/provider-connection-status.ts @@ -25,8 +25,8 @@ export interface ConnectionChipStatus { * connection but flags it). That is a "please log back in" signal, not a * user-killed connection, so needs_reauth wins over the disabled check * and must never read as "已禁用". - * - !enabled + error: oauth-model-connections-main.ts failDiscovery() - * persists enabled:false + lastTestStatus:'error', so the failure signal + * - !enabled + error: a failed Runtime Host connection effect can persist + * enabled:false + lastTestStatus:'error', so the failure signal * must survive the disabled state — label carries both facts, tone stays * destructive. * - !enabled (bare, or disabled+verified): neutral "暂不可用". A stale diff --git a/apps/desktop/src/renderer/settings/providers-panel.tsx b/apps/desktop/src/renderer/settings/providers-panel.tsx index 87c6815a6e..8816453596 100644 --- a/apps/desktop/src/renderer/settings/providers-panel.tsx +++ b/apps/desktop/src/renderer/settings/providers-panel.tsx @@ -334,13 +334,13 @@ export function ProvidersPanel({ bridge, initialPage = 'connections', initialCon onCancel={goBack} onAccountChanged={async () => { await reload(); }} onCreated={async (slug, modelDiscoveryError) => { - const reloaded = await reload(); + await reload(); if (!providersPanelMountedRef.current) return; // The new connection's detail, not the list: creating it is the // start of setting it up, and every next move — pick the default // model, enable models, fix the endpoint the discovery error just // complained about — is on that page. - if (reloaded) setRoute({ kind: 'detail', slug }); + setRoute({ kind: 'detail', slug }); if (modelDiscoveryError) { const providerName = providerDisplay(route.target.providerType, locale).name; toast.error( diff --git a/apps/desktop/src/renderer/use-quote-companion.ts b/apps/desktop/src/renderer/use-quote-companion.ts index a37f1d0853..9c3285e6a1 100644 --- a/apps/desktop/src/renderer/use-quote-companion.ts +++ b/apps/desktop/src/renderer/use-quote-companion.ts @@ -103,9 +103,8 @@ function requiredAssistantMessageId(projection: LiveTurnProjection | undefined): * Companion for the quote side panel. On the first question it FORKS the main * session (`branchFromTurn` from the latest SETTLED turn) into a child that * carries the whole main conversation as context and inherits its model / cwd. - * The fork is pinned read-only (`explore`): it explains and explores the selected - * context — writes / shell / destructive operations are hard-blocked, while web / - * custom tools follow the normal permission path (surfaced here as a prompt). + * The fork inherits the source permission profile and exposes the normal + * permission control for later changes. * Follow-ups stream through the SAME live-turn reducer the main shell uses, and * hand off from the live projection only once the persisted message settles (the * shared `readSettledMessages` + `reconcileTerminalLiveTurn` rule) so a completed @@ -129,8 +128,8 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan const [companion, setCompanion] = useState(undefined); const companionRef = useRef(undefined); const companionIdRef = useRef(null); - // A created fork is hidden immediately, before its permission pin completes, - // but is not considered usable until onForkCommitted promotes it. + // A created fork is hidden immediately, but is not considered usable until + // onForkCommitted promotes it. const pendingForkIdRef = useRef(null); const sourceSessionIdRef = useRef(sourceSession?.id); sourceSessionIdRef.current = sourceSession?.id; @@ -252,6 +251,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan const promise = ensureCompanionFork({ api: window.maka.sessions, sourceSession, + panelId, name, isDisposed: () => !mountedRef.current, onForkCreated: (session) => { @@ -286,7 +286,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan forkSetupPromiseRef.current = promise; return promise; }, - [commitFork, mountedRef, sourceSession], + [commitFork, mountedRef, panelId, sourceSession], ); useEffect(() => { @@ -307,7 +307,12 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan const sourceSessionId = sourceSessionIdRef.current; const id = companionIdRef.current ?? pendingForkIdRef.current; if (id && sourceSessionId) { - void cleanupCompanionCopy(window.maka.sessions, sourceSessionId, id).then((cleaned) => { + void cleanupCompanionCopy( + window.maka.sessions, + sourceSessionId, + panelId, + id, + ).then((cleaned) => { if (cleaned) { onForkVisibilityChangeRef.current?.({ type: 'cleanup-succeeded', @@ -316,7 +321,11 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan } }); } else if (sourceSessionId) { - void abandonPendingCompanionCopy(window.maka.sessions, sourceSessionId); + void abandonPendingCompanionCopy( + window.maka.sessions, + sourceSessionId, + panelId, + ); } }); }; @@ -344,6 +353,7 @@ export function useQuoteCompanion(input: UseQuoteCompanionInput): UseQuoteCompan const result = await performCompanionTurn({ api: window.maka.sessions, sourceSession, + panelId, name: `${copyRef.current.namePrefix}${label}`, isDisposed: () => !mountedRef.current, existingForkId: fork.session.id, diff --git a/apps/desktop/src/renderer/use-side-conversation-workspace.ts b/apps/desktop/src/renderer/use-side-conversation-workspace.ts new file mode 100644 index 0000000000..59de9827cb --- /dev/null +++ b/apps/desktop/src/renderer/use-side-conversation-workspace.ts @@ -0,0 +1,149 @@ +import { useCallback, useMemo, useReducer } from 'react'; +import type { QuoteCompanionPanelState } from './quote-companion-panel-state'; + +interface SideConversationRecord { + panel: QuoteCompanionPanelState; + hasContent: boolean; + preparing: boolean; + active: boolean; +} + +type SideConversationAction = + | { type: 'upsert'; panel: QuoteCompanionPanelState; preparingOnCreate: boolean } + | { + type: 'update-panel'; + panelId: string; + update: (panel: QuoteCompanionPanelState) => QuoteCompanionPanelState; + } + | { type: 'remove'; panelIds: ReadonlySet } + | { + type: 'set-lifecycle'; + panelId: string; + field: 'hasContent' | 'preparing' | 'active'; + value: boolean; + }; + +function reduceSideConversations( + state: readonly SideConversationRecord[], + action: SideConversationAction, +): readonly SideConversationRecord[] { + if (action.type === 'upsert') { + const index = state.findIndex((record) => record.panel.id === action.panel.id); + if (index < 0) { + return [ + ...state, + { + panel: action.panel, + hasContent: false, + preparing: action.preparingOnCreate, + active: false, + }, + ]; + } + const current = state[index]!; + if (current.panel === action.panel) return state; + return state.map((record, recordIndex) => + recordIndex === index ? { ...record, panel: action.panel } : record, + ); + } + if (action.type === 'update-panel') { + const index = state.findIndex((record) => record.panel.id === action.panelId); + if (index < 0) return state; + const current = state[index]!; + const panel = action.update(current.panel); + if (panel === current.panel) return state; + return state.map((record, recordIndex) => + recordIndex === index ? { ...record, panel } : record, + ); + } + if (action.type === 'remove') { + const next = state.filter((record) => !action.panelIds.has(record.panel.id)); + return next.length === state.length ? state : next; + } + const index = state.findIndex((record) => record.panel.id === action.panelId); + if (index < 0 || state[index]![action.field] === action.value) return state; + return state.map((record, recordIndex) => + recordIndex === index ? { ...record, [action.field]: action.value } : record, + ); +} + +export function useSideConversationWorkspace() { + const [records, dispatch] = useReducer(reduceSideConversations, []); + const panels = useMemo(() => records.map((record) => record.panel), [records]); + const panelIds = useCallback( + (field: 'hasContent' | 'preparing' | 'active') => + new Set( + records + .filter((record) => record[field]) + .map((record) => record.panel.id), + ), + [records], + ); + const contentPanelIds = useMemo(() => panelIds('hasContent'), [panelIds]); + const preparingPanelIds = useMemo(() => panelIds('preparing'), [panelIds]); + const activePanelIds = useMemo(() => panelIds('active'), [panelIds]); + + const upsertPanel = useCallback( + (panel: QuoteCompanionPanelState, preparingOnCreate = false) => + dispatch({ type: 'upsert', panel, preparingOnCreate }), + [], + ); + const updatePanel = useCallback( + ( + panelId: string, + update: (panel: QuoteCompanionPanelState) => QuoteCompanionPanelState, + ) => dispatch({ type: 'update-panel', panelId, update }), + [], + ); + const removePanels = useCallback( + (panelIds: ReadonlySet) => dispatch({ type: 'remove', panelIds }), + [], + ); + const setLifecycle = useCallback( + ( + panelId: string, + field: 'hasContent' | 'preparing' | 'active', + value: boolean, + ) => dispatch({ type: 'set-lifecycle', panelId, field, value }), + [], + ); + const setContent = useCallback( + (panelId: string, value: boolean) => setLifecycle(panelId, 'hasContent', value), + [setLifecycle], + ); + const setPreparing = useCallback( + (panelId: string, value: boolean) => setLifecycle(panelId, 'preparing', value), + [setLifecycle], + ); + const setActive = useCallback( + (panelId: string, value: boolean) => setLifecycle(panelId, 'active', value), + [setLifecycle], + ); + + return useMemo( + () => ({ + panels, + contentPanelIds, + preparingPanelIds, + activePanelIds, + upsertPanel, + updatePanel, + removePanels, + setContent, + setPreparing, + setActive, + }), + [ + panels, + contentPanelIds, + preparingPanelIds, + activePanelIds, + upsertPanel, + updatePanel, + removePanels, + setContent, + setPreparing, + setActive, + ], + ); +} diff --git a/docs/architecture/runtime-resume-architecture.md b/docs/architecture/runtime-resume-architecture.md index 3b4e5bbaf2..3cb2a58727 100644 --- a/docs/architecture/runtime-resume-architecture.md +++ b/docs/architecture/runtime-resume-architecture.md @@ -911,11 +911,11 @@ The two most important follow-ups are: ### Product wiring -1. `apps/desktop/src/main/app-lifecycle.ts` -2. `apps/desktop/src/main/sessions-ipc-main.ts` +1. `apps/desktop/src/main/runtime-host-boot.ts` +2. `apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts` 3. `apps/desktop/src/renderer/use-shell-resume.ts` -4. `packages/cli/src/runtime-bootstrap.ts` -5. `packages/cli/src/session-driver.ts` +4. `packages/cli/src/runtime-host-cli-context.ts` +5. `packages/cli/src/runtime-host-session-driver.ts` ### Contract tests @@ -928,7 +928,7 @@ The two most important follow-ups are: 7. `packages/runtime/src/__tests__/recovery-authority-equivalence.test.ts` 8. `packages/storage/src/__tests__/recovery-persistence-authority.test.ts` 9. `packages/storage/src/__tests__/sqlite-recovery-concurrency.test.ts` -10. `apps/desktop/src/main/__tests__/runtime-resume-routing-contract.test.ts` +10. `apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts` ## Further reading diff --git a/docs/architecture/runtime-resume-architecture.zh-CN.md b/docs/architecture/runtime-resume-architecture.zh-CN.md index 2ecf751c2b..760020c414 100644 --- a/docs/architecture/runtime-resume-architecture.zh-CN.md +++ b/docs/architecture/runtime-resume-architecture.zh-CN.md @@ -949,11 +949,11 @@ Process crash、SQLite transaction atomicity 和应用级 `fsync` 不能自动 ### Product wiring -1. `apps/desktop/src/main/app-lifecycle.ts`：startup repair、auto-resume 和 shutdown。 -2. `apps/desktop/src/main/sessions-ipc-main.ts`：`sessions:resumeLatest`。 +1. `apps/desktop/src/main/runtime-host-boot.ts`：Runtime Host 启动、客户端投影和 shutdown。 +2. `apps/desktop/src/main/runtime-host-session-execution-ipc-main.ts`：`sessions:resumeLatest`。 3. `apps/desktop/src/renderer/use-shell-resume.ts`：中断横幅的手动入口。 -4. `packages/cli/src/runtime-bootstrap.ts`：CLI store、inspector 与 shutdown owner。 -5. `packages/cli/src/session-driver.ts`：TUI `/resume` 的 plan/execute 路径。 +4. `packages/cli/src/runtime-host-cli-context.ts`：CLI Runtime Host 连接与上下文。 +5. `packages/cli/src/runtime-host-session-driver.ts`：TUI `/resume` 的 plan/execute 路径。 ### Contract tests @@ -966,7 +966,7 @@ Process crash、SQLite transaction atomicity 和应用级 `fsync` 不能自动 7. `packages/runtime/src/__tests__/recovery-authority-equivalence.test.ts` 8. `packages/storage/src/__tests__/recovery-persistence-authority.test.ts` 9. `packages/storage/src/__tests__/sqlite-recovery-concurrency.test.ts` -10. `apps/desktop/src/main/__tests__/runtime-resume-routing-contract.test.ts` +10. `apps/desktop/src/main/__tests__/runtime-host-session-execution-ipc-main.test.ts` ## 延伸阅读 diff --git a/docs/session-task-ledger-lifecycle.md b/docs/session-task-ledger-lifecycle.md index b2aeb86b9d..6649f18ebf 100644 --- a/docs/session-task-ledger-lifecycle.md +++ b/docs/session-task-ledger-lifecycle.md @@ -145,17 +145,16 @@ implements the Runtime `TaskLedgerStore` port and serves the read-only outcomes invoked through that port therefore share the same Session admission boundary instead of creating a second Task Ledger authority. -Binding the port into the Host's real-model task and child-agent tool -composition is part of the later Hosted execution slice. This authority slice -establishes the port and its Client projection without claiming that -non-serving Host tool composition is already active. +The Host binds this port into the real-model task and child-agent tool +composition. Desktop and CLI consume the same Client projection and do not +open an interactive Task Ledger writer. Client queries return the canonical, sanitized projection in item- and byte-bounded pages. A content revision pins each traversal; a continuation from an older projection returns `revision_changed` rather than mixing snapshots across Host epochs. The authority preserves the existing `task-events.jsonl`, -`tasks.json`, legacy-read, and backfill behavior. Desktop keeps its embedded -writer until the production cutover replaces all root writers atomically. +`tasks.json`, legacy-read, and backfill behavior. Runtime Host is the sole +interactive writer after production activation. ## Child Agent Ownership diff --git a/package-lock.json b/package-lock.json index e7a1b7efba..dd38de88dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,6 @@ "@maka/ui": "0.1.0", "@xterm/addon-fit": "^0.11.0", "@xterm/xterm": "^6.0.0", - "ai": "^7.0.31", "electron-updater": "^6.8.9", "qrcode": "^1.5.4", "react": "^19.2.1", @@ -13555,7 +13554,8 @@ "dependencies": { "@maka/core": "0.1.0", "@maka/runtime": "0.1.0", - "@maka/storage": "0.1.0" + "@maka/storage": "0.1.0", + "zod": "^4.4.3" }, "devDependencies": { "electron": "^43.2.0" diff --git a/package.json b/package.json index 1dbefe350c..659d8fb75d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "test:dist": "npm run test:scripts:full && node scripts/run-workspace-tests-parallel.mjs --concurrency=3", "test:dist:serial": "npm run test:scripts:full && node scripts/run-workspace-tests-parallel.mjs --serial", "test:fast": "npm run build:test && npm run test:scripts && node scripts/run-workspace-tests-parallel.mjs --concurrency=3", - "test:scripts": "node --test scripts/electron-builder-config.test.mjs scripts/sync-model-metadata.test.mjs scripts/fixture-env.test.mjs scripts/electron-lifecycle.test.mjs scripts/check-story-annotations.test.mjs scripts/check-dead-css.test.mjs scripts/build-astryx-theme.test.mjs scripts/ci-test-plan.test.mjs scripts/run-headless-tests.test.mjs scripts/run-workspace-tests-parallel.test.mjs scripts/storybook-visual-smoke.test.mjs scripts/cu-e2e-scenarios.test.mjs scripts/cu-report-sanitize.test.mjs scripts/computer-use-provenance.test.mjs scripts/cu-trace-analyse.test.mjs scripts/prepare-bundled-git.test.mjs scripts/prepare-bundled-git-source.test.mjs scripts/windows-test-inventory.test.mjs scripts/windows-smoke.test.mjs scripts/windows-baseline-workflow.test.mjs scripts/code-mode-build-order.test.mjs scripts/dependency-audit-workflow.test.mjs apps/desktop/scripts/dev-app-runtime.test.mjs", + "test:scripts": "node --test scripts/electron-builder-config.test.mjs scripts/sync-model-metadata.test.mjs scripts/fixture-env.test.mjs scripts/electron-lifecycle.test.mjs scripts/check-story-annotations.test.mjs scripts/check-dead-css.test.mjs scripts/build-astryx-theme.test.mjs scripts/ci-test-plan.test.mjs scripts/run-headless-tests.test.mjs scripts/run-workspace-tests-parallel.test.mjs scripts/storybook-visual-smoke.test.mjs scripts/cu-e2e-scenarios.test.mjs scripts/cu-report-sanitize.test.mjs scripts/computer-use-provenance.test.mjs scripts/cu-trace-analyse.test.mjs scripts/prepare-bundled-git.test.mjs scripts/prepare-bundled-git-source.test.mjs scripts/bundled-skill-catalog.test.mjs scripts/windows-test-inventory.test.mjs scripts/windows-smoke.test.mjs scripts/windows-baseline-workflow.test.mjs scripts/code-mode-build-order.test.mjs scripts/dependency-audit-workflow.test.mjs apps/desktop/scripts/dev-app-runtime.test.mjs", "test:scripts:extended": "node --test scripts/cu-provider-matrix.test.mjs scripts/cu-process-restart-harness.test.mjs scripts/cu-real-model-launcher.test.mjs scripts/macos-arm64-release.test.mjs scripts/windows-x64-release.test.mjs scripts/measure-session-bundle.test.mjs", "test:scripts:full": "npm run test:scripts && npm run test:scripts:extended", "dev": "npm --workspace @maka/desktop run dev:hmr --", @@ -52,6 +52,7 @@ "measure:session-bundle": "node scripts/measure-session-bundle.mjs", "astryx:theme": "node scripts/build-astryx-theme.mjs", "sync:model-metadata": "node scripts/sync-model-metadata.mjs", + "generate:bundled-skills": "node scripts/gen-bundled-skill-catalog.mjs", "cost:deepseek-baseline": "node scripts/deepseek-live-cost-baseline.mjs", "benchmark:kimi-protocol-ab": "node packages/headless/harbor/run-kimi-protocol-ab.mjs", "prepare:maka-cu": "node scripts/prepare-maka-cu.mjs", diff --git a/packages/cli/src/__tests__/activation-command.test.ts b/packages/cli/src/__tests__/activation-command.test.ts index 181ab1b01c..7022887f6d 100644 --- a/packages/cli/src/__tests__/activation-command.test.ts +++ b/packages/cli/src/__tests__/activation-command.test.ts @@ -5,7 +5,6 @@ import { join } from 'node:path'; import { after, before, describe, test } from 'node:test'; import type { SessionEvent } from '@maka/core/events'; import type { SessionSummary } from '@maka/core/session'; -import type { InvocationResult, RuntimeContinuation } from '@maka/runtime'; import { decodeActivationRequest, parseMakaActivateArgs, @@ -15,6 +14,7 @@ import { type MakaActivationRuntime, } from '../activation-command.js'; import { parseMakaCliArgs } from '../cli.js'; +import type { MakaRunOutcome } from '../run-command-core.js'; const ROOTS = { stateRoot: '/tmp/maka-state', @@ -59,38 +59,33 @@ function summary(overrides: Partial = {}): SessionSummary { }; } -function completedResult(sessionId = 'maka-session-1'): InvocationResult { +function completedResult(): MakaRunOutcome { return { - invocationId: 'invocation-1', - runId: 'run-1', - sessionId, - turnId: 'turn-1', + outcomeId: 'run-1', status: 'completed', - finalOutput: 'done', - events: [ - { - id: 'event-1', - invocationId: 'invocation-1', - runId: 'run-1', - sessionId, - turnId: 'turn-1', - ts: 1, - partial: false, - role: 'model', - author: 'agent', - content: { kind: 'text', text: 'done', apiKey: 'sk-test-secret' } as never, - }, - ], - startedAt: 1, - finishedAt: 2, + finalOutput: 'done sk-test-secret', + sandboxBoundary: 'none', }; } +function completedEvents(): SessionEvent[] { + return [ + { + type: 'text_delta', + id: 'event-1', + turnId: 'turn-1', + ts: 1, + messageId: 'message-1', + text: 'done', + }, + ]; +} + function fakeDeps( options: { input?: string; sessions?: SessionSummary[]; - result?: InvocationResult; + result?: MakaRunOutcome; events?: SessionEvent[]; onContext?: (input: Parameters>[0]) => void; onCreateSession?: () => void; @@ -105,7 +100,7 @@ function fakeDeps( ) => AsyncIterable; } = {}, ): MakaActivationDeps { - let observer: ((result: InvocationResult) => void | Promise) | undefined; + let observer: ((result: MakaRunOutcome) => void | Promise) | undefined; const sessions = options.sessions ?? []; const runtime: MakaActivationRuntime = { async createSession() { @@ -115,25 +110,21 @@ function fakeDeps( listSessions: async () => sessions, ...(options.safeBoundaryResume ? { - planLatestAuthoritativeSafeBoundaryContinuation: async () => ({ - disposition: 'continue' as const, - rejectionReasons: [], - diagnostics: [], - continuation: {} as RuntimeContinuation, - }), - async *resumeSafeBoundaryContinuation() { - options.onResume?.(); - await observer?.(options.result ?? completedResult('maka-session-1')); - }, + resumeLatest: async () => + (async function* () { + options.onResume?.(); + for (const event of options.events ?? completedEvents()) yield event; + await observer?.(options.result ?? completedResult()); + })(), } : {}), async *sendMessage(sessionId, input) { if (options.sendMessage) { yield* options.sendMessage(runtime, sessionId, input); } else { - for (const event of options.events ?? []) yield event; + for (const event of options.events ?? completedEvents()) yield event; } - await observer?.(options.result ?? completedResult(sessionId)); + await observer?.(options.result ?? completedResult()); }, async respondToSandboxBoundary(_sessionId, response) { options.onSandboxBoundaryResponse?.(response); @@ -144,7 +135,7 @@ function fakeDeps( return { createContext: async (input) => { options.onContext?.(input); - observer = input.runtimeInvocationObserver; + observer = input.runOutcomeObserver; const context: MakaActivationContext = { runtime, target: { @@ -369,6 +360,7 @@ describe('maka activate JSONL protocol', () => { status: 'failed', finalOutput: undefined, failure: { class: 'permission_denied' }, + sandboxBoundary: 'unresolved', }, onSandboxBoundaryResponse: (response) => responses.push(response), events: [ @@ -426,26 +418,7 @@ describe('maka activate JSONL protocol', () => { result: { ...completedResult(), finalOutput: 'continued after the failed write', - events: [ - { - id: 'event-boundary-result', - invocationId: 'invocation-1', - runId: 'run-1', - sessionId: 'maka-session-1', - turnId: 'turn-1', - ts: 1, - partial: false, - role: 'tool', - author: 'tool', - content: { - kind: 'function_response', - id: 'tool-boundary', - name: 'Write', - isError: true, - result: boundaryFailure, - }, - }, - ], + sandboxBoundary: 'unresolved', }, events: [ { diff --git a/packages/cli/src/__tests__/cli-goal-continuation.test.ts b/packages/cli/src/__tests__/cli-goal-continuation.test.ts deleted file mode 100644 index 77c72d074b..0000000000 --- a/packages/cli/src/__tests__/cli-goal-continuation.test.ts +++ /dev/null @@ -1,137 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import type { SessionEvent } from '@maka/core'; -import { - AutomationManager, - AutomationScheduler, - GoalManager, - type GoalTurnOutcome, -} from '@maka/runtime'; -import { CliGoalContinuation } from '../cli-goal-continuation.js'; -import { WAIT_BUDGET_MS } from './tui-terminal-mock.js'; - -function deferred() { - let resolve!: (value: T | PromiseLike) => void; - const promise = new Promise((res) => { - resolve = res; - }); - return { promise, resolve }; -} - -async function waitFor(condition: () => boolean, message: string): Promise { - // Same budget policy as the shared TUI waitFor (#2221): the wait returns as - // soon as the condition holds, so the floor only bounds a failing report, - // and CI runners get the scaled budget instead of losing scheduling races. - const deadline = Date.now() + Math.max(1_000, WAIT_BUDGET_MS); - while (!condition()) { - if (Date.now() >= deadline) assert.fail(message); - await new Promise((resolve) => setImmediate(resolve)); - } -} - -describe('CLI Goal continuation host', () => { - test('routes a scheduled heartbeat through the shared turn lifecycle and Goal FIFO', async () => { - const sessionId = 'session-1'; - let now = 1_000; - let goalId = 0; - let evaluations = 0; - let admissions = 0; - const goalManager = new GoalManager({ - generateId: () => `goal-${++goalId}`, - now: () => now, - }); - goalManager.create(sessionId, 'ship'); - const lifecycle = new CliGoalContinuation({ - goalManager, - evaluator: { - evaluate: async () => { - evaluations++; - return JSON.stringify({ - met: false, - impossible: false, - progress: true, - waiting: false, - reason: `evidence-${evaluations}`, - }); - }, - }, - getRecentContext: async () => 'recent context', - }); - const ownedCompletion = deferred(); - lifecycle.bindHost({ - admitTurn: () => { - admissions++; - return { - kind: 'prepared', - turnId: 'owned-turn', - start: () => ownedCompletion.promise, - }; - }, - }); - - const automationManager = new AutomationManager({ - generateId: () => 'automation-1', - now: () => now, - random: () => 0, - }); - const automation = automationManager.create({ - kind: 'heartbeat', - name: 'check', - prompt: 'check status', - sessionId, - schedule: { type: 'interval', seconds: 10 }, - }); - assert.ok(!('error' in automation)); - now += 11_000; - - const timers: Array<() => void> = []; - const streamStarted = deferred(); - const releaseStream = deferred(); - const scheduler = new AutomationScheduler({ - automationManager, - canFire: async () => true, - injectTurn: async () => { - const outcome = await lifecycle.runAutomationTurn({ - sessionId, - turnId: 'heartbeat-turn', - start: async function* (): AsyncIterable { - streamStarted.resolve(); - await releaseStream.promise; - yield { - type: 'complete', - id: 'heartbeat-complete', - turnId: 'heartbeat-turn', - ts: now, - stopReason: 'end_turn', - }; - }, - }); - return { runId: 'heartbeat-turn', ok: outcome.kind === 'completed' }; - }, - setTimeout: (callback) => { - timers.push(callback); - return callback; - }, - clearTimeout: () => {}, - now: () => now, - }); - - scheduler.start(); - timers.shift()?.(); - await streamStarted.promise; - assert.ok(lifecycle.activities.whenIdle(sessionId)); - - releaseStream.resolve(); - await waitFor(() => evaluations === 1, 'heartbeat completion did not enter the Goal FIFO'); - await waitFor(() => admissions === 1, 'Goal admission did not resume after heartbeat drain'); - await waitFor( - () => automationManager.get(automation.id)?.lastRunId === 'heartbeat-turn', - 'scheduler did not observe the drained heartbeat result', - ); - - assert.equal(goalManager.get(sessionId)?.iterations, 1); - scheduler.dispose(); - lifecycle.dispose(); - goalManager.dispose(); - }); -}); diff --git a/packages/cli/src/__tests__/cli-runtime-owner.test.ts b/packages/cli/src/__tests__/cli-runtime-owner.test.ts deleted file mode 100644 index 99cacd218e..0000000000 --- a/packages/cli/src/__tests__/cli-runtime-owner.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import { CLI_RUNTIME_OWNER_ENV, resolveCliRuntimeOwner } from '../cli-runtime-owner.js'; - -describe('CLI Runtime owner', () => { - test('keeps embedded as the default and enables Runtime Host explicitly', () => { - assert.equal(resolveCliRuntimeOwner(undefined), 'embedded'); - assert.equal(resolveCliRuntimeOwner(''), 'embedded'); - assert.equal(resolveCliRuntimeOwner('embedded'), 'embedded'); - assert.equal(resolveCliRuntimeOwner('runtime-host'), 'runtime-host'); - }); - - test('rejects an unknown owner instead of silently opening embedded state', () => { - assert.throws( - () => resolveCliRuntimeOwner('host'), - new Error(`${CLI_RUNTIME_OWNER_ENV} must be "embedded" or "runtime-host"`), - ); - }); -}); diff --git a/packages/cli/src/__tests__/cli-system-prompt.test.ts b/packages/cli/src/__tests__/cli-system-prompt.test.ts deleted file mode 100644 index dc3509f287..0000000000 --- a/packages/cli/src/__tests__/cli-system-prompt.test.ts +++ /dev/null @@ -1,295 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, test } from 'node:test'; -import { buildCliSystemPrompt, buildCliTurnTailPrompt } from '../cli-system-prompt.js'; -import type { HostCapabilities } from '@maka/runtime'; - -describe('CLI system prompt', () => { - test('injects the skill catalog from workspaceRoot, gated by host capabilities', async () => { - await withCwdAndWorkspace(async ({ cwd, workspaceRoot, homeDir }) => { - await writeSkill( - workspaceRoot, - 'plain-helper', - `--- -name: Plain Helper -description: Plain work. -allowed-tools: [Read] ---- -# Plain Helper -Plain work.`, - ); - await writeSkill( - workspaceRoot, - 'gated-helper', - `--- -name: Gated Helper -description: Host-specific work. -allowed-tools: [Read] -required-tools: [ImaginaryTool] ---- -# Gated Helper -Use host tools.`, - ); - - // CLI host without the required tool: gated-helper is hidden, plain-helper is shown. - // workspaceRoot is separate from cwd so the project directory is never scanned. - const cliHost: HostCapabilities = { toolNames: new Set(['Read']) }; - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: false } }, - cwd, - workspaceRoot, - host: cliHost, - homeDir, - }); - assert.ok(out, 'prompt should include the plain skill catalog'); - assert.match(out, / { - await withCwdAndWorkspace(async ({ cwd, workspaceRoot, homeDir }) => { - // Project-level cross-client skill - await writeSkillAt( - cwd, - '.agents', - 'skills', - 'cross-client-skill', - `--- -name: Cross Client Skill -description: From .agents/skills at project level. ---- -# Cross Client Skill -Body.`, - ); - - // User-level maka skill - await writeSkillAt( - homeDir, - '.maka', - 'skills', - 'user-skill', - `--- -name: User Skill -description: From ~/.maka/skills at user level. ---- -# User Skill -Body.`, - ); - - // Workspace-level skill (existing path) - await writeSkill( - workspaceRoot, - 'ws-skill', - `--- -name: Workspace Skill -description: From workspaceRoot/skills. ---- -# Workspace Skill -Body.`, - ); - - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: false } }, - cwd, - workspaceRoot, - homeDir, - }); - - assert.ok(out); - assert.match(out, / { - await withCwdAndWorkspace(async ({ cwd, workspaceRoot, homeDir }) => { - // User-level skill (lower precedence) - await writeSkillAt( - homeDir, - '.agents', - 'skills', - 'shared-skill', - `--- -name: Shared Skill -description: User-level copy. ---- -# Shared Skill -User body.`, - ); - - // Project-level skill with the same id (higher precedence) - await writeSkillAt( - cwd, - '.agents', - 'skills', - 'shared-skill', - `--- -name: Shared Skill -description: Project-level copy. ---- -# Shared Skill -Project body.`, - ); - - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: false } }, - cwd, - workspaceRoot, - homeDir, - }); - - assert.ok(out); - assert.match(out, / { - await withCwd(async (cwd, homeDir) => { - await writeFile(join(cwd, 'AGENTS.md'), '# Project rules\n- Use TDD always\n'); - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: true } }, - cwd, - workspaceRoot: cwd, - homeDir, - }); - assert.ok(out, 'expected a prompt fragment when AGENTS.md is present and enabled'); - assert.match(out, /Use TDD always/); - assert.match(out, //); - }); - }); - - test('suppresses workspace instructions when the setting is disabled, even if AGENTS.md exists', async () => { - await withCwd(async (cwd, homeDir) => { - await writeFile(join(cwd, 'AGENTS.md'), '- secret project rule'); - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: false } }, - cwd, - workspaceRoot: cwd, - homeDir, - }); - // The always-on base identity fragment keeps the prompt defined, but the - // disabled workspaceInstructions gate must still suppress AGENTS.md. - assert.ok(out); - assert.doesNotMatch(out, /secret project rule/); - assert.doesNotMatch(out, /workspace-instructions/); - }); - }); - - test('includes the personalization addressing hint when a displayName is set', async () => { - await withCwd(async (cwd, homeDir) => { - const out = await buildCliSystemPrompt({ - settings: { - personalization: { displayName: 'Yuhan' }, - workspaceInstructions: { enabled: false }, - }, - cwd, - workspaceRoot: cwd, - homeDir, - }); - assert.ok(out); - assert.match(out, /addressed as "Yuhan"/); - }); - }); - - test('leads with the base identity fragment even with no personalization or instructions', async () => { - await withCwd(async (cwd, homeDir) => { - const out = await buildCliSystemPrompt({ - settings: { personalization: {}, workspaceInstructions: { enabled: true } }, - cwd, - workspaceRoot: cwd, - homeDir, - }); - assert.ok(out, 'the always-on identity fragment keeps the prompt defined'); - assert.match(out, /^You are Maka,/); - }); - }); - - test('joins personalization and workspace instructions into one prompt', async () => { - await withCwd(async (cwd, homeDir) => { - await writeFile(join(cwd, 'AGENTS.md'), '- commit one reason'); - const out = await buildCliSystemPrompt({ - settings: { - personalization: { displayName: 'Alice' }, - workspaceInstructions: { enabled: true }, - }, - cwd, - workspaceRoot: cwd, - homeDir, - }); - assert.ok(out); - assert.match(out, /addressed as "Alice"/); - assert.match(out, /commit one reason/); - }); - }); -}); - -describe('CLI turn-tail prompt', () => { - test('renders the working directory, git repo status, platform, and date', async () => { - await withCwd(async (cwd) => { - const out = await buildCliTurnTailPrompt({ cwd }); - assert.ok(out.includes(cwd), 'tail should contain the cwd'); - assert.match(out, /Git repository:/); - assert.match(out, /Platform:/); - assert.match(out, /Today's date:/); - }); - }); -}); - -async function withCwd(fn: (cwd: string, homeDir: string) => Promise): Promise { - const cwd = await mkdtemp(join(tmpdir(), 'maka-cli-sysprompt-')); - const homeDir = await mkdtemp(join(tmpdir(), 'maka-cli-sysprompt-home-')); - try { - await fn(cwd, homeDir); - } finally { - await rm(cwd, { recursive: true, force: true }); - await rm(homeDir, { recursive: true, force: true }); - } -} - -async function withCwdAndWorkspace( - fn: (dirs: { cwd: string; workspaceRoot: string; homeDir: string }) => Promise, -): Promise { - const cwd = await mkdtemp(join(tmpdir(), 'maka-cli-sysprompt-cwd-')); - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-cli-sysprompt-ws-')); - const homeDir = await mkdtemp(join(tmpdir(), 'maka-cli-sysprompt-home-')); - try { - await fn({ cwd, workspaceRoot, homeDir }); - } finally { - await rm(cwd, { recursive: true, force: true }); - await rm(workspaceRoot, { recursive: true, force: true }); - await rm(homeDir, { recursive: true, force: true }); - } -} - -async function writeSkill(workspaceRoot: string, id: string, content: string): Promise { - const dir = join(workspaceRoot, 'skills', id); - await mkdir(dir, { recursive: true }); - await writeFile(join(dir, 'SKILL.md'), content, 'utf8'); -} - -async function writeSkillAt(base: string, ...parts: string[]): Promise { - const content = parts.pop()!; - const id = parts.pop()!; - const dir = join(base, ...parts, id); - await mkdir(dir, { recursive: true }); - await writeFile(join(dir, 'SKILL.md'), content, 'utf8'); -} diff --git a/packages/cli/src/__tests__/cli.test.ts b/packages/cli/src/__tests__/cli.test.ts index 0823eb05cd..2337b64247 100644 --- a/packages/cli/src/__tests__/cli.test.ts +++ b/packages/cli/src/__tests__/cli.test.ts @@ -1,13 +1,8 @@ import assert from 'node:assert/strict'; import { spawn } from 'node:child_process'; import { once } from 'node:events'; -import { mkdtemp, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; import { describe, test } from 'node:test'; -import { createSessionStore } from '@maka/storage'; import { parseMakaCliArgs, resolveMakaCliExitCode } from '../cli.js'; -import { formatStartupConnectionError, resolveTuiResumeTarget } from '../embedded-tui-command.js'; describe('Maka CLI args', () => { test('parses canonical commands and rejects malformed input', () => { @@ -64,53 +59,3 @@ describe('Maka CLI args', () => { assert.equal(code, 1); }); }); - -describe('resolveTuiResumeTarget', () => { - test("anchors the resumed session's stored connection and model", async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-cli-resume-target-')); - try { - const session = await createSessionStore(root).create({ - cwd: '/tmp/some-workspace', - name: 'Resume target', - backend: 'ai-sdk', - llmConnectionSlug: 'some-connection', - model: 'some-model', - permissionMode: 'ask', - }); - - const result = await resolveTuiResumeTarget(root, session.id); - - assert.deepEqual(result, { - requestedConnectionSlug: 'some-connection', - requestedModel: 'some-model', - }); - } finally { - await rm(root, { recursive: true, force: true }); - } - }); - - test('returns undefined for a session that does not exist, so startup falls back to the default connection', async () => { - const root = await mkdtemp(join(tmpdir(), 'maka-cli-resume-target-missing-')); - try { - const result = await resolveTuiResumeTarget(root, 'nonexistent-session'); - - assert.equal(result, undefined); - } finally { - await rm(root, { recursive: true, force: true }); - } - }); -}); - -describe('startup connection-error guidance', () => { - const workspaceRoot = '/tmp/maka-workspace'; - - test('recognizes connection failures without swallowing unrelated errors', () => { - for (const reason of ['missing_default_connection', 'missing_api_key']) { - assert.ok( - formatStartupConnectionError(new Error(`NO_REAL_CONNECTION:${reason}`), workspaceRoot), - reason, - ); - } - assert.equal(formatStartupConnectionError(new Error('ENOENT'), workspaceRoot), null); - }); -}); diff --git a/packages/cli/src/__tests__/connection-target.test.ts b/packages/cli/src/__tests__/connection-target.test.ts deleted file mode 100644 index 8da8e3cec2..0000000000 --- a/packages/cli/src/__tests__/connection-target.test.ts +++ /dev/null @@ -1,337 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import type { LlmConnection } from '@maka/core/llm-connections'; -import { - listReadyModelChoices, - resolveDefaultSessionTarget, - selectableModelIdsForTarget, -} from '../connection-target.js'; - -describe('default session target resolver', () => { - test('uses the selected API-key connection without rewriting its endpoint or model', async () => { - const connection = makeConnection({ - slug: 'vercel', - name: 'Vercel AI Gateway', - providerType: 'vercel', - baseUrl: 'https://gateway.example.test/v1', - defaultModel: 'xai/grok-4.3', - enabledModelIds: ['xai/grok-4.3', 'anthropic/claude-sonnet-4.5'], - }); - - const target = await resolveDefaultSessionTarget({ - connectionStore: storeFor(connection), - credentialStore: { - getSecret: async (_slug, kind) => (kind === 'api_key' ? 'gateway-key' : null), - }, - requestedModel: 'anthropic/claude-sonnet-4.5', - }); - - assert.equal(target.connection, connection); - assert.equal(target.apiKey, 'gateway-key'); - assert.equal(target.model, 'anthropic/claude-sonnet-4.5'); - }); - - test('honors required, optional, and absent credential policies', async () => { - const cases = [ - { - connection: makeConnection({ - slug: 'lm-studio', - providerType: 'lm-studio', - defaultModel: 'lmstudio-community/Qwen3-Coder', - }), - expectedReads: 0, - }, - { - connection: makeConnection({ - slug: 'localai', - providerType: 'localai', - defaultModel: 'localai/Qwen3-8B:Q4_K_M', - }), - expectedReads: 1, - }, - ]; - - for (const { connection, expectedReads } of cases) { - let reads = 0; - const target = await resolveDefaultSessionTarget({ - connectionStore: storeFor(connection), - credentialStore: { - getSecret: async () => { - reads += 1; - return null; - }, - }, - }); - - assert.equal(reads, expectedReads, connection.providerType); - assert.equal(target.apiKey, ''); - assert.equal(target.model, connection.defaultModel); - } - - const required = makeConnection({ - slug: 'openai', - providerType: 'openai', - defaultModel: 'gpt-5.5', - }); - await assert.rejects( - resolveDefaultSessionTarget({ - connectionStore: storeFor(required), - credentialStore: { getSecret: async () => null }, - }), - /NO_REAL_CONNECTION:missing_api_key/, - ); - }); - - test('uses the account endpoint from a valid OAuth credential record', async () => { - const connection = makeConnection({ - slug: 'github-copilot', - providerType: 'github-copilot', - baseUrl: 'https://api.githubcopilot.com', - defaultModel: 'gpt-5.4', - }); - const target = await resolveDefaultSessionTarget({ - connectionStore: storeFor(connection), - credentialStore: { - getSecret: async () => - JSON.stringify({ - access_token: 'github-account-token', - refresh_token: 'github-account-token', - expires_at: Date.now() + 10 * 60_000, - base_url: 'https://api.business.githubcopilot.com', - }), - }, - }); - - assert.equal(target.apiKey, 'github-account-token'); - assert.equal(target.connection.baseUrl, 'https://api.business.githubcopilot.com'); - }); - - test('refreshes and persists an expired OAuth credential before returning it', async () => { - const connection = makeConnection({ - slug: 'openai-codex', - providerType: 'openai-codex', - defaultModel: 'gpt-5.5', - }); - let stored = JSON.stringify({ - access_token: 'expired-access-token', - refresh_token: 'oauth-refresh-token', - expires_at: 1_000, - account_id: 'acct_123', - }); - let refreshBody = ''; - - const target = await resolveDefaultSessionTarget({ - connectionStore: storeFor(connection), - credentialStore: { - getSecret: async () => stored, - setSecret: async (_slug, _kind, value) => { - stored = value; - }, - }, - now: () => 10_000, - fetchFn: async (_url, init) => { - refreshBody = String(init?.body ?? ''); - return Response.json({ - access_token: 'fresh-access-token', - refresh_token: 'fresh-refresh-token', - expires_in: 3600, - }); - }, - }); - - assert.equal(target.apiKey, 'fresh-access-token'); - assert.match(refreshBody, /grant_type=refresh_token/); - assert.match(refreshBody, /refresh_token=oauth-refresh-token/); - assert.equal(JSON.parse(stored).access_token, 'fresh-access-token'); - }); - - test('rejects malformed or unrefreshable OAuth credentials instead of using raw secrets', async () => { - const connection = makeConnection({ - slug: 'openai-codex', - providerType: 'openai-codex', - defaultModel: 'gpt-5.5', - }); - const expiredToken = JSON.stringify({ - access_token: 'expired-access-token', - refresh_token: 'oauth-refresh-token', - expires_at: 1_000, - account_id: 'acct_123', - }); - - for (const secret of ['not-json', expiredToken]) { - await assert.rejects( - resolveDefaultSessionTarget({ - connectionStore: storeFor(connection), - credentialStore: { getSecret: async () => secret }, - now: () => 10_000, - fetchFn: async () => new Response('refresh failed', { status: 500 }), - }), - /NO_REAL_CONNECTION:missing_api_key/, - ); - } - }); - - test('fails closed when no default connection exists', async () => { - await assert.rejects( - resolveDefaultSessionTarget({ - connectionStore: { - getDefault: async () => null, - get: async () => null, - }, - credentialStore: { getSecret: async () => null }, - }), - /NO_REAL_CONNECTION:missing_default_connection/, - ); - }); -}); - -test('selectable models are limited to the curated set plus the current model', () => { - const connection = makeConnection({ - providerType: 'ollama', - defaultModel: 'glm-5.2', - enabledModelIds: ['glm-5.2'], - models: [{ id: 'glm-5.2' }, { id: 'glm-5-air' }, { id: 'glm-4.6' }], - }); - - assert.deepEqual(selectableModelIdsForTarget({ connection, model: 'glm-5-air' }), [ - 'glm-5-air', - 'glm-5.2', - ]); -}); - -test('ready model choices apply curation and isolate unavailable credentials', async () => { - const local = makeConnection({ - slug: 'local', - name: 'Local', - providerType: 'ollama', - defaultModel: 'qwen', - enabledModelIds: ['qwen'], - models: [{ id: 'qwen' }, { id: 'hidden' }], - }); - const openai = makeConnection({ - slug: 'openai', - name: 'OpenAI', - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - }); - const keyless = makeConnection({ - slug: 'keyless', - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - }); - const corrupt = makeConnection({ - slug: 'corrupt', - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - }); - - const choices = await listReadyModelChoices({ - connectionStore: { - list: async () => [local, openai, keyless, corrupt], - getDefault: async () => 'local', - }, - credentialStore: { - getSecret: async (slug) => { - if (slug === 'openai') return 'sk-real'; - if (slug === 'corrupt') throw new Error('credentials.json is unreadable'); - return null; - }, - }, - }); - - assert.deepEqual( - choices.map(({ connectionSlug, model, isDefaultConnection }) => ({ - connectionSlug, - model, - isDefaultConnection, - })), - [ - { connectionSlug: 'local', model: 'qwen', isDefaultConnection: true }, - { connectionSlug: 'openai', model: 'gpt-5.5', isDefaultConnection: false }, - ], - ); -}); - -test('ready model choices carry the thinking levels declared per relay model', async () => { - const relay = makeConnection({ - slug: 'relay', - name: 'Relay', - providerType: 'openai-compatible', - baseUrl: 'https://relay.example/v1', - defaultModel: 'reasoning-model', - enabledModelIds: ['reasoning-model', 'plain-model'], - models: [{ id: 'reasoning-model' }, { id: 'plain-model' }], - relayModelProfiles: { - 'reasoning-model': { thinkingLevels: ['minimal', 'low', 'high', 'max'] }, - }, - }); - - const choices = await listReadyModelChoices({ - connectionStore: { - list: async () => [relay], - getDefault: async () => 'relay', - }, - credentialStore: { getSecret: async () => 'sk-relay' }, - }); - - // The declaration is keyed by model id: the sibling model on the same - // relay stays without a thinking menu. - assert.deepEqual( - choices.map(({ model, thinkingLevels }) => ({ model, thinkingLevels })), - [ - { model: 'reasoning-model', thinkingLevels: ['minimal', 'low', 'high', 'max'] }, - { model: 'plain-model', thinkingLevels: [] }, - ], - ); -}); - -test('ready model choices leave thinkingLevels empty for connections without a declaration', async () => { - const plain = makeConnection({ - slug: 'relay', - name: 'Relay', - providerType: 'openai-compatible', - baseUrl: 'https://relay.example/v1', - defaultModel: 'plain-model', - enabledModelIds: ['plain-model'], - models: [{ id: 'plain-model' }], - }); - - const choices = await listReadyModelChoices({ - connectionStore: { - list: async () => [plain], - getDefault: async () => 'relay', - }, - credentialStore: { getSecret: async () => 'sk-relay' }, - }); - - assert.deepEqual( - choices.map(({ thinkingLevels }) => thinkingLevels), - [[]], - ); -}); - -function storeFor(connection: LlmConnection) { - return { - getDefault: async () => connection.slug, - get: async (slug: string) => (slug === connection.slug ? connection : null), - }; -} - -function makeConnection(input: Partial): LlmConnection { - return { - slug: 'conn', - name: 'Connection', - providerType: 'ollama', - defaultModel: 'llama3.2', - enabled: true, - createdAt: 1, - updatedAt: 1, - ...input, - }; -} diff --git a/packages/cli/src/__tests__/onboarding.test.ts b/packages/cli/src/__tests__/onboarding.test.ts deleted file mode 100644 index 714fb281d4..0000000000 --- a/packages/cli/src/__tests__/onboarding.test.ts +++ /dev/null @@ -1,824 +0,0 @@ -import assert from 'node:assert/strict'; -import { describe, test } from 'node:test'; -import type { LlmConnection, ModelInfo, ProviderType } from '@maka/core/llm-connections'; -import type { ConnectionStore, CredentialStore } from '@maka/storage'; -import { listApiKeyOnboardableProviders } from '../onboarding-catalog.js'; -import { - listOnboardingProviders, - saveApiKeyConnection, - verifyApiKeyConnection, -} from '../onboarding.js'; - -describe('listOnboardingProviders', () => { - test('marks existing connections as set and carries their enabled model ids', async () => { - const openai = makeConnection({ - slug: 'openai', - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabledModelIds: ['gpt-5.5', 'gpt-5.5-mini'], - }); - const minimax = makeConnection({ - slug: 'minimax', - providerType: 'MiniMax', - defaultModel: 'MiniMax-M3', - enabledModelIds: ['MiniMax-M3'], - }); - - const providers = await listOnboardingProviders({ - connectionStore: { - list: async () => [openai, minimax], - }, - }); - - const openaiEntry = providers.find((p) => p.providerType === 'openai'); - assert.equal(openaiEntry?.hasConnection, true); - assert.deepEqual(openaiEntry?.enabledModelIds, ['gpt-5.5', 'gpt-5.5-mini']); - // A provider with no connection is not marked set and starts with no models. - const anthropic = providers.find((p) => p.providerType === 'anthropic'); - assert.equal(anthropic?.hasConnection, false); - assert.deepEqual(anthropic?.enabledModelIds, []); - const minimaxEntry = providers.find((p) => p.providerType === 'MiniMax'); - assert.equal(minimaxEntry?.hasConnection, true); - assert.deepEqual(minimaxEntry?.enabledModelIds, ['MiniMax-M3']); - }); - - test('does not select noncanonical connections for a provider', async () => { - const providers = await listOnboardingProviders({ - connectionStore: { - list: async () => [ - makeConnection({ slug: 'openai-2', providerType: 'openai' }), - makeConnection({ slug: 'openai-work', providerType: 'openai' }), - ], - }, - }); - - const openai = providers.find((provider) => provider.providerType === 'openai'); - assert.equal(openai?.hasConnection, false); - assert.deepEqual(openai?.enabledModelIds, []); - }); - - test('does not mark a provider as configured when its canonical slug belongs to another provider', async () => { - const providers = await listOnboardingProviders({ - connectionStore: { - list: async () => [ - makeConnection({ - slug: 'openai', - providerType: 'anthropic', - defaultModel: 'claude-sonnet-5', - }), - ], - }, - }); - - const openai = providers.find((provider) => provider.providerType === 'openai'); - assert.equal(openai?.hasConnection, false); - assert.deepEqual(openai?.enabledModelIds, []); - }); -}); - -describe('verifyApiKeyConnection', () => { - test('probes a new connection with the supplied key without persisting', async () => { - let created = false; - let secretStored = false; - let defaultSet = false; - let probed: Array<{ slug: string; providerType: ProviderType; apiKey: string }> = []; - const connectionStore: Pick< - ConnectionStore, - 'get' | 'create' | 'update' | 'remove' | 'getDefault' | 'setDefault' - > = { - get: async () => null, - create: async () => { - created = true; - return makeConnection({}); - }, - update: async () => { - throw new Error('update must not be called during verify'); - }, - remove: async () => {}, - getDefault: async () => null, - setDefault: async () => { - defaultSet = true; - }, - }; - const credentialStore: Pick = { - getSecret: async () => null, - setSecret: async () => { - secretStored = true; - }, - }; - - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - connectionStore, - credentialStore, - fetchModels: async (connection, apiKey) => { - probed.push({ slug: connection.slug, providerType: connection.providerType, apiKey }); - return [{ id: 'gpt-5.5' }]; - }, - }); - - assert.deepEqual(result, { kind: 'ok', models: [{ id: 'gpt-5.5' }] }); - assert.equal(created, false, 'verify must not create the connection'); - assert.equal(secretStored, false, 'verify must not store the secret'); - assert.equal(defaultSet, false, 'verify must not set the default'); - assert.equal(probed.length, 1); - assert.equal(probed[0]!.apiKey, 'sk-test'); - assert.equal(probed[0]!.providerType, 'openai'); - }); - - test('rejects a blank key for a new required-key provider without probing', async () => { - let probed = false; - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: ' ', - connectionStore: { get: async () => null }, - credentialStore: { getSecret: async () => null }, - fetchModels: async () => { - probed = true; - return []; - }, - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /API key is required/); - assert.equal(probed, false); - }); - - test('reuses the stored secret for an existing connection when the key is blank', async () => { - let probedKey = ''; - let secretStored = false; - const credentialStore: Pick = { - getSecret: async () => 'stored-key', - setSecret: async () => { - secretStored = true; - }, - }; - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: '', - connectionStore: { - get: async () => makeConnection({ slug: 'openai', providerType: 'openai' }), - }, - credentialStore, - fetchModels: async (_connection, apiKey) => { - probedKey = apiKey; - return [{ id: 'gpt-5.5' }]; - }, - }); - - assert.equal(result.kind, 'ok'); - assert.equal(probedKey, 'stored-key'); - assert.equal(secretStored, false, 'verify must not rotate the stored key'); - }); - - test('probes with a newly supplied key for an existing connection (rotation preview)', async () => { - let probedKey = ''; - let readStored = false; - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-rotated', - connectionStore: { - get: async () => makeConnection({ slug: 'openai', providerType: 'openai' }), - }, - credentialStore: { - getSecret: async () => { - readStored = true; - return 'stored-key'; - }, - }, - fetchModels: async (_connection, apiKey) => { - probedKey = apiKey; - return [{ id: 'gpt-5.5' }]; - }, - }); - - assert.equal(result.kind, 'ok'); - assert.equal(probedKey, 'sk-rotated'); - assert.equal(readStored, false, 'a supplied key short-circuits the stored secret read'); - }); - - test('records a probe failure as an error without throwing', async () => { - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-bad', - connectionStore: { get: async () => null }, - credentialStore: { getSecret: async () => null }, - fetchModels: async () => { - throw new Error('HTTP 401'); - }, - }); - - assert.deepEqual(result, { kind: 'error', text: 'HTTP 401' }); - }); - - test('rejects a canonical slug owned by another provider before reading credentials or probing', async () => { - let readCredential = false; - let probed = false; - const result = await verifyApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - connectionStore: { - get: async (slug) => - makeConnection({ slug, providerType: 'anthropic', defaultModel: 'claude-sonnet-5' }), - }, - credentialStore: { - getSecret: async () => { - readCredential = true; - return null; - }, - }, - fetchModels: async () => { - probed = true; - return []; - }, - }); - - assert.deepEqual(result, { - kind: 'error', - text: 'Connection slug "openai" belongs to another provider', - }); - assert.equal(readCredential, false); - assert.equal(probed, false); - }); -}); - -describe('saveApiKeyConnection', () => { - test('does not select noncanonical same-provider connections', async () => { - const connections = [ - makeConnection({ slug: 'openai-2', providerType: 'openai' }), - makeConnection({ slug: 'openai-work', providerType: 'openai' }), - ]; - const createdSlugs: string[] = []; - const updatedSlugs: string[] = []; - - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async (slug) => connections.find((connection) => connection.slug === slug) ?? null, - create: async (input) => { - createdSlugs.push(input.slug); - return makeConnection({ - slug: input.slug, - providerType: input.providerType, - defaultModel: input.defaultModel, - }); - }, - update: async (slug) => { - updatedSlugs.push(slug); - return makeConnection({ slug, providerType: 'openai', defaultModel: 'gpt-5.5' }); - }, - remove: async () => {}, - getDefault: async () => 'openai-2', - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'ok'); - assert.deepEqual(createdSlugs, ['openai']); - assert.deepEqual(updatedSlugs, ['openai']); - }); - - test('rejects a canonical slug owned by another provider without writing state', async () => { - let created = false; - let updated = false; - let removed = false; - let credentialRead = false; - let credentialWritten = false; - let defaultRead = false; - - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async (slug) => - makeConnection({ slug, providerType: 'anthropic', defaultModel: 'claude-sonnet-5' }), - create: async () => { - created = true; - return makeConnection({}); - }, - update: async () => { - updated = true; - return makeConnection({}); - }, - remove: async () => { - removed = true; - }, - getDefault: async () => { - defaultRead = true; - return null; - }, - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => { - credentialRead = true; - return null; - }, - setSecret: async () => { - credentialWritten = true; - }, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - - assert.deepEqual(result, { - kind: 'error', - text: 'Connection slug "openai" belongs to another provider', - }); - assert.equal(created, false); - assert.equal(updated, false); - assert.equal(removed, false); - assert.equal(credentialRead, false); - assert.equal(credentialWritten, false); - assert.equal(defaultRead, false); - }); - - test('re-enables a disabled canonical connection before making it default', async () => { - let enabledPatch: boolean | undefined; - const setDefaultSlugs: string[] = []; - - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: '', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async () => - makeConnection({ - slug: 'openai', - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabled: false, - }), - create: async () => { - throw new Error('create must not be called for an existing connection'); - }, - update: async (slug, patch) => { - enabledPatch = patch.enabled; - return makeConnection({ - slug, - providerType: 'openai', - defaultModel: 'gpt-5.5', - enabled: patch.enabled ?? false, - }); - }, - remove: async () => {}, - getDefault: async () => null, - setDefault: async (slug) => { - if (slug) setDefaultSlugs.push(slug); - }, - }, - credentialStore: { - getSecret: async () => 'stored-key', - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'ok'); - assert.equal(enabledPatch, true); - assert.deepEqual(setDefaultSlugs, ['openai']); - }); - - test('persists a new connection with curation and sets default only when none exists', async () => { - const createdInputs: Array<{ slug: string; providerType: ProviderType; defaultModel: string }> = - []; - const updatedPatches: Array<{ - enabledModelIds?: string[]; - defaultModel?: string; - models?: ModelInfo[]; - lastTestStatus?: string; - }> = []; - const storedSecrets: Array<{ slug: string; value: string }> = []; - let defaultSlug: string | null = null; - const setDefaultCalls: string[] = []; - - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - enabledModelIds: ['gpt-5.5', 'gpt-5.5-mini'], - models: [{ id: 'gpt-5.5' }, { id: 'gpt-5.5-mini' }], - connectionStore: { - get: async () => null, - create: async (input) => { - createdInputs.push({ - slug: input.slug, - providerType: input.providerType, - defaultModel: input.defaultModel ?? '', - }); - return makeConnection({ - slug: input.slug, - providerType: input.providerType, - defaultModel: input.defaultModel ?? 'gpt-5.5', - }); - }, - update: async (_slug, patch) => { - updatedPatches.push({ - enabledModelIds: patch.enabledModelIds, - defaultModel: patch.defaultModel, - models: patch.models, - lastTestStatus: patch.lastTestStatus, - }); - return makeConnection({ slug: 'openai', providerType: 'openai' }); - }, - remove: async () => {}, - getDefault: async () => defaultSlug, - setDefault: async (slug) => { - if (slug) setDefaultCalls.push(slug); - defaultSlug = slug; - }, - }, - credentialStore: { - getSecret: async () => null, - deleteSecret: async () => {}, - setSecret: async (slug, _kind, value) => { - storedSecrets.push({ slug, value }); - }, - }, - fetchModelChoices: async () => [ - { - connectionSlug: 'openai', - connectionName: 'OpenAI', - providerType: 'openai', - model: 'gpt-5.5', - isDefaultConnection: true, - }, - ], - }); - - assert.equal(result.kind, 'ok'); - // The secret is written for a new connection. - assert.deepEqual(storedSecrets, [{ slug: 'openai', value: 'sk-test' }]); - // The connection is created then updated with the curated enabled set + cache. - assert.equal(createdInputs.length, 1); - assert.equal(createdInputs[0]!.slug, 'openai'); - assert.equal(updatedPatches.length, 1); - assert.deepEqual(updatedPatches[0]!.enabledModelIds, ['gpt-5.5', 'gpt-5.5-mini']); - assert.deepEqual(updatedPatches[0]!.models, [{ id: 'gpt-5.5' }, { id: 'gpt-5.5-mini' }]); - assert.equal(updatedPatches[0]!.lastTestStatus, 'verified'); - // No default existed, so the new connection becomes the default. - assert.deepEqual(setDefaultCalls, ['openai']); - // The refreshed ready model choices come back for the running TUI. - assert.equal((result as { modelChoices: unknown[] }).modelChoices.length, 1); - }); - - test('rolls back a newly created connection when the secret write fails', async () => { - const removedSlugs: string[] = []; - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async () => null, - create: async (input) => - makeConnection({ slug: input.slug, providerType: input.providerType }), - update: async () => { - throw new Error('update must not be called when the secret write fails'); - }, - remove: async (slug) => { - removedSlugs.push(slug); - }, - getDefault: async () => null, - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - deleteSecret: async () => {}, - setSecret: async () => { - throw new Error('disk full'); - }, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /disk full/); - assert.deepEqual(removedSlugs, ['openai']); - }); - - test('rolls back a newly created connection and secret when the model update fails', async () => { - const removedSlugs: string[] = []; - const deletedSecrets: Array<{ slug: string; kind?: string }> = []; - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-new', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async () => null, - create: async (input) => - makeConnection({ slug: input.slug, providerType: input.providerType }), - update: async () => { - throw new Error('disk full'); - }, - remove: async (slug) => { - removedSlugs.push(slug); - }, - getDefault: async () => null, - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async (slug, kind) => { - deletedSecrets.push({ slug, kind }); - }, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /disk full/); - assert.deepEqual(removedSlugs, ['openai']); - assert.deepEqual(deletedSecrets, [{ slug: 'openai', kind: 'api_key' }]); - }); - - test('rolls back a rotated secret when the model update fails on an existing connection', async () => { - const secretWrites: string[] = []; - let currentSecret = 'sk-old'; - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-new', - enabledModelIds: ['gpt-5.5'], - models: [{ id: 'gpt-5.5' }], - connectionStore: { - get: async () => - makeConnection({ slug: 'openai', providerType: 'openai', defaultModel: 'gpt-5.5' }), - create: async () => { - throw new Error('create must not be called for an existing connection'); - }, - update: async () => { - throw new Error('disk full'); - }, - remove: async () => {}, - getDefault: async () => 'openai', - setDefault: async () => { - throw new Error('setDefault must not be called when a default already exists'); - }, - }, - credentialStore: { - getSecret: async () => currentSecret, - setSecret: async (_slug, _kind, value) => { - secretWrites.push(value); - currentSecret = value; - }, - deleteSecret: async () => { - throw new Error('deleteSecret must not be called when an old secret exists'); - }, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /disk full/); - assert.deepEqual(secretWrites, ['sk-new', 'sk-old']); - assert.equal(currentSecret, 'sk-old'); - }); - - test('updates an existing connection without rotating the key when it is blank', async () => { - let secretStored = false; - const updatedPatches: Array<{ enabledModelIds?: string[]; defaultModel?: string }> = []; - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: '', - enabledModelIds: ['gpt-5.5', 'gpt-5.5-mini'], - models: [{ id: 'gpt-5.5' }, { id: 'gpt-5.5-mini' }], - connectionStore: { - get: async () => - makeConnection({ slug: 'openai', providerType: 'openai', defaultModel: 'gpt-5.5' }), - create: async () => { - throw new Error('create must not be called for an existing connection'); - }, - update: async (_slug, patch) => { - updatedPatches.push({ - enabledModelIds: patch.enabledModelIds, - defaultModel: patch.defaultModel, - }); - return makeConnection({ slug: 'openai', providerType: 'openai' }); - }, - remove: async () => {}, - getDefault: async () => 'openai', - setDefault: async () => { - throw new Error('setDefault must not be called when a default already exists'); - }, - }, - credentialStore: { - getSecret: async () => null, - deleteSecret: async () => {}, - setSecret: async () => { - secretStored = true; - }, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'ok'); - assert.equal(secretStored, false, 'a blank key must not rotate the stored secret'); - assert.equal(updatedPatches.length, 1); - assert.deepEqual(updatedPatches[0]!.enabledModelIds, ['gpt-5.5', 'gpt-5.5-mini']); - }); - - test('does not replace an existing default connection during in-session setup', async () => { - const setDefaultCalls: string[] = []; - const result = await saveApiKeyConnection({ - providerType: 'anthropic', - apiKey: 'sk-test', - enabledModelIds: ['claude-sonnet-5'], - models: [{ id: 'claude-sonnet-5' }], - connectionStore: { - get: async (slug) => - slug === 'anthropic' - ? makeConnection({ slug: 'anthropic', providerType: 'anthropic' }) - : null, - create: async (input) => - makeConnection({ slug: input.slug, providerType: input.providerType }), - update: async () => makeConnection({ slug: 'anthropic', providerType: 'anthropic' }), - remove: async () => {}, - getDefault: async () => 'openai', // another connection is already the default - setDefault: async (slug) => { - if (slug) setDefaultCalls.push(slug); - }, - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'ok'); - assert.deepEqual(setDefaultCalls, [], 'in-session setup must not replace the existing default'); - }); - - test('keeps the existing defaultModel when it is still enabled, else picks the first enabled', async () => { - const cases: Array<{ existingDefault: string; enabled: string[]; expected: string }> = [ - { existingDefault: 'gpt-5.5', enabled: ['gpt-5.5', 'gpt-5.5-mini'], expected: 'gpt-5.5' }, - { existingDefault: 'gpt-4', enabled: ['gpt-5.5', 'gpt-5.5-mini'], expected: 'gpt-5.5' }, - ]; - for (const { existingDefault, enabled, expected } of cases) { - let savedDefault: string | undefined; - await saveApiKeyConnection({ - providerType: 'openai', - apiKey: '', - enabledModelIds: enabled, - models: enabled.map((id) => ({ id })), - connectionStore: { - get: async () => - makeConnection({ - slug: 'openai', - providerType: 'openai', - defaultModel: existingDefault, - }), - create: async () => { - throw new Error('create must not be called'); - }, - update: async (_slug, patch) => { - savedDefault = patch.defaultModel; - return makeConnection({ slug: 'openai', providerType: 'openai' }); - }, - remove: async () => {}, - getDefault: async () => 'openai', - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - assert.equal(savedDefault, expected); - } - }); - - test('rejects an empty enabled-model set before touching the stores', async () => { - let created = false; - let updated = false; - let secretStored = false; - const result = await saveApiKeyConnection({ - providerType: 'openai', - apiKey: 'sk-test', - enabledModelIds: [], - models: [], - connectionStore: { - get: async () => null, - create: async () => { - created = true; - return makeConnection({}); - }, - update: async () => { - updated = true; - return makeConnection({}); - }, - remove: async () => {}, - getDefault: async () => null, - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - deleteSecret: async () => {}, - setSecret: async () => { - secretStored = true; - }, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /至少选择一个模型|at least one model/i); - assert.equal(created, false); - assert.equal(updated, false); - assert.equal(secretStored, false); - }); - - test('rejects a provider that does not accept an API key before persisting', async () => { - const result = await saveApiKeyConnection({ - providerType: 'ollama', - apiKey: 'unused', - enabledModelIds: ['x'], - models: [{ id: 'x' }], - connectionStore: { - get: async () => null, - create: async () => makeConnection({}), - update: async () => makeConnection({}), - remove: async () => {}, - getDefault: async () => null, - setDefault: async () => {}, - }, - credentialStore: { - getSecret: async () => null, - setSecret: async () => {}, - deleteSecret: async () => {}, - }, - fetchModelChoices: async () => [], - }); - - assert.equal(result.kind, 'error'); - assert.match((result as { text: string }).text, /does not accept an API key/); - }); -}); - -describe('listApiKeyOnboardableProviders', () => { - test('lists only API-key providers, excluding OAuth and keyless ones', () => { - const providers = listApiKeyOnboardableProviders(); - const types = providers.map((p) => p.providerType); - - assert.ok(types.includes('anthropic')); - assert.ok(types.includes('openai')); - // keyless local models and OAuth subscription providers are not onboardable this way - assert.ok(!types.includes('ollama')); - - for (const provider of providers) { - assert.ok( - provider.authKind === 'api_key' || provider.authKind === 'optional_api_key', - `${provider.providerType} should accept an api key`, - ); - } - }); - - test('excludes providers that require a user-supplied baseUrl (phase 1)', () => { - const providers = listApiKeyOnboardableProviders(); - const anthropic = providers.find((p) => p.providerType === 'anthropic'); - - // anthropic ships a default baseUrl, so the wizard skips that field for it. - assert.equal(anthropic?.requiresBaseUrl, false); - // Phase 1 cannot collect a base URL, so providers without a default one are - // not onboardable yet (they would wedge the install — see PR #1177 review). - for (const provider of providers) { - assert.equal( - provider.requiresBaseUrl, - false, - `${provider.providerType} requires a base URL and must be excluded until the wizard can prompt for one`, - ); - } - }); -}); - -function makeConnection(input: Partial): LlmConnection { - return { - slug: 'conn', - name: 'Connection', - providerType: 'ollama', - defaultModel: 'llama3.2', - enabled: true, - createdAt: 1, - updatedAt: 1, - ...input, - }; -} diff --git a/packages/cli/src/__tests__/pi-transcript.test.ts b/packages/cli/src/__tests__/pi-transcript.test.ts index 38074d463f..b4f1c3edb4 100644 --- a/packages/cli/src/__tests__/pi-transcript.test.ts +++ b/packages/cli/src/__tests__/pi-transcript.test.ts @@ -1808,6 +1808,55 @@ describe('Maka Pi TUI transcript', () => { assert.match(expanded, /step two/); }); + test('replaces live Bash output with the authoritative terminal snapshot', () => { + const state = createMakaPiTranscriptState(); + applyMakaSessionEventToTranscript( + state, + event({ + type: 'tool_start', + toolUseId: 'tool-1', + toolName: 'Bash', + args: { command: 'printf "step one\\nstep two\\n"' }, + }), + ); + for (const [seq, chunk] of [ + [1, 'step one\n'], + [2, 'step two\n'], + ] as const) { + applyMakaSessionEventToTranscript( + state, + event({ + type: 'tool_output_delta', + toolUseId: 'tool-1', + seq, + stream: 'stdout', + chunk, + redacted: false, + }), + ); + } + applyMakaSessionEventToTranscript( + state, + event({ + type: 'tool_result', + toolUseId: 'tool-1', + isError: false, + content: shellRun({ + status: 'completed', + stdout: 'step one\nstep two\n', + completedAt: 2_000, + exitCode: 0, + }), + }), + ); + + assert.equal(toggleAllToolExpansion(state), true); + const expanded = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n'); + const outputLines = expanded.split('\n').map((line) => line.trim()); + assert.equal(outputLines.filter((line) => line === 'step one').length, 1); + assert.equal(outputLines.filter((line) => line === 'step two').length, 1); + }); + test('folds concurrent child lifecycles into their parent agent cards', () => { const state = createMakaPiTranscriptState(); for (const [toolUseId, profile] of [ diff --git a/packages/cli/src/__tests__/pi-tui-runner.test.ts b/packages/cli/src/__tests__/pi-tui-runner.test.ts index f45a7fd75d..d9a7821cb5 100644 --- a/packages/cli/src/__tests__/pi-tui-runner.test.ts +++ b/packages/cli/src/__tests__/pi-tui-runner.test.ts @@ -1,7 +1,7 @@ import assert from 'node:assert/strict'; import { spawn } from 'node:child_process'; import { once } from 'node:events'; -import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'; +import { mkdtemp, rm } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { setTimeout as delay } from 'node:timers/promises'; @@ -19,11 +19,10 @@ import { type ThinkingLevel, type UserQuestionResponse, } from '@maka/core'; +import type { SkillInvocationResult } from '@maka/core/skill-invocation'; import { - GoalManager, SessionActivityRegistry, type ContextDiagnostics, - type GoalTurnOutcome, type ShellRunUpdate, } from '@maka/runtime'; import type { @@ -37,11 +36,11 @@ import type { RewindTarget, SessionResumeAvailability, } from '../session-driver.js'; -import { CliGoalContinuation, type CliGoalTurnHost } from '../cli-goal-continuation.js'; +import { SkillInvocationBlockedError } from '../session-driver.js'; import { listApiKeyOnboardableProviders } from '../onboarding-catalog.js'; import type { MakaOnboardingSurface, - MakaPiTuiGoalLifecycle, + MakaPiTuiTurnActivitySurface, ModelChoice, OnboardingProviderEntry, OnboardingSaveResult, @@ -74,17 +73,17 @@ const CLOSE_BUDGET_MS = Math.max(WAIT_BUDGET_MS, 500); // load, which varies between local (truecolor) and CI (unset/dumb) terminals. before(() => _setColorLevelForTesting(3)); -type TestMakaPiTuiInput = Omit & { +type TestMakaPiTuiInput = Omit & { driver: MakaSessionDriver; - goalLifecycle?: MakaPiTuiGoalLifecycle; + turnActivity?: MakaPiTuiTurnActivitySurface; }; function runMakaPiTui(input: TestMakaPiTuiInput): Promise { - const { driver, goalLifecycle, ...rest } = input; + const { driver, turnActivity, ...rest } = input; return runMakaPiTuiImpl({ ...rest, driver, - goalLifecycle: goalLifecycle ?? createTestGoalLifecycle(), + turnActivity: turnActivity ?? createTestTurnActivity(), }); } @@ -105,26 +104,10 @@ function prepareTestPrompt( }); } -function createTestGoalLifecycle( - onSettled?: (sessionId: string, turnId: string, outcome: GoalTurnOutcome) => void, +function createTestTurnActivity( activities = new SessionActivityRegistry(), - onHostChange?: (host: CliGoalTurnHost | undefined) => void, -): MakaPiTuiGoalLifecycle { - return { - activities, - beginObservedTurn: (sessionId, turnId) => ({ - kind: 'registered', - settle: async (outcome) => { - onSettled?.(sessionId, turnId, outcome); - }, - }), - bindHost: (host) => { - onHostChange?.(host); - return () => { - onHostChange?.(undefined); - }; - }, - }; +): MakaPiTuiTurnActivitySurface { + return { activities }; } function deferred() { @@ -1958,111 +1941,6 @@ describe('Maka Pi TUI runner', () => { ]); }); - test('passes an external turn failure to the settlement callback', async () => { - const terminal = new FakeTerminal(); - const driver = new QuickErrorDriver(); - const settlements: Array<{ sessionId: string; kind: string; reason?: string }> = []; - const run = runMakaPiTui({ - title: 'Maka', - driver, - cwd: '/repo', - model: 'deepseek-v4-flash', - connectionSlug: 'deepseek', - permissionMode: 'ask', - terminal, - goalLifecycle: createTestGoalLifecycle((sessionId, _turnId, outcome) => { - settlements.push({ - sessionId, - kind: outcome.kind, - ...(outcome.kind === 'errored' ? { reason: outcome.reason } : {}), - }); - }), - }); - - terminal.input('run'); - terminal.input('\r'); - await waitFor(() => settlements.length === 1); - - assert.deepEqual(settlements, [ - { - sessionId: 'session-1', - kind: 'errored', - reason: 'turn failed', - }, - ]); - - exitMaka(terminal); - await run; - }); - - test('uses the real CLI Goal lifecycle for external, owned, and switched turns', async () => { - const terminal = new FakeTerminal(); - const driver = new SlashCommandDriver(); - let goalId = 0; - let evaluations = 0; - const manager = new GoalManager({ - generateId: () => `goal-${++goalId}`, - now: () => 1, - }); - const lifecycle = new CliGoalContinuation({ - goalManager: manager, - evaluator: { - evaluate: async () => { - evaluations++; - return JSON.stringify({ - met: evaluations === 2, - impossible: false, - progress: true, - waiting: false, - reason: evaluations === 2 ? 'verified' : 'continue', - }); - }, - }, - getRecentContext: async () => 'recent context', - }); - assert.equal(manager.create('session-1', 'ship').kind, 'created'); - - const run = runMakaPiTui({ - title: 'Maka', - driver, - cwd: '/repo', - model: 'deepseek-v4-flash', - connectionSlug: 'deepseek', - permissionMode: 'ask', - terminal, - goalLifecycle: lifecycle, - }); - - terminal.input('run'); - terminal.input('\r'); - await waitFor(() => manager.get('session-1')?.status === 'achieved'); - assert.equal(evaluations, 2); - assert.equal(driver.prompts.length, 2); - assert.equal(driver.prompts[0], 'run'); - assert.match(driver.prompts[1] ?? '', /\[Goal continuation\]/); - assert.equal(manager.get('session-1')?.iterations, 1); - assert.equal(lifecycle.activities.whenIdle('session-1'), undefined); - - assert.equal(manager.create('session-1', 'old session goal').kind, 'created'); - const switched = lifecycle.beginObservedTurn('session-1', 'turn-after-switch'); - assert.equal(switched.kind, 'registered'); - if (switched.kind !== 'registered') throw new Error('expected registered switch-boundary turn'); - await driver.switchSession('session-2'); - await switched.settle({ - kind: 'completed', - turnId: 'turn-after-switch', - }); - await waitFor(() => manager.get('session-1')?.status === 'paused'); - assert.equal(manager.get('session-1')?.lastReason, 'TUI is attached to a different session.'); - - manager.clear('session-1'); - exitMaka(terminal); - await run; - - lifecycle.dispose(); - manager.dispose(); - }); - test('waits to start a visible turn until shared session activity releases', async () => { const terminal = new FakeTerminal(); const driver = new SlashCommandDriver(); @@ -2076,7 +1954,7 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'deepseek', permissionMode: 'ask', terminal, - goalLifecycle: createTestGoalLifecycle(undefined, activities), + turnActivity: createTestTurnActivity(activities), }); terminal.input('run'); @@ -2097,7 +1975,6 @@ describe('Maka Pi TUI runner', () => { const terminal = new FakeTerminal(); const driver = new FirstSessionPreparedDriver(); const activities = new SessionActivityRegistry(); - let registered = false; const run = runMakaPiTui({ title: 'Maka', driver, @@ -2106,26 +1983,12 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'deepseek', permissionMode: 'ask', terminal, - goalLifecycle: { - activities, - bindHost: () => () => {}, - beginObservedTurn: (sessionId, turnId) => { - assert.equal(sessionId, 'session-first'); - assert.equal(turnId, 'turn-first'); - assert.ok(activities.whenIdle(sessionId)); - registered = true; - return { - kind: 'registered', - settle: async () => {}, - }; - }, - }, + turnActivity: createTestTurnActivity(activities), }); terminal.input('run'); terminal.input('\r'); await driver.streamStarted.promise; - assert.equal(registered, true); assert.ok(activities.whenIdle('session-first')); assert.equal(activities.reserveIfIdle('session-first'), undefined); @@ -2159,7 +2022,7 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'deepseek', permissionMode: 'ask', terminal, - goalLifecycle: createTestGoalLifecycle(undefined, activities), + turnActivity: createTestTurnActivity(activities), }); terminal.input('run'); @@ -4941,7 +4804,6 @@ describe('Maka Pi TUI runner', () => { const terminal = new FakeTerminal(); const driver = new DeferredControlDriver(); const activities = new SessionActivityRegistry(); - let goalHost: CliGoalTurnHost | undefined; const run = runMakaPiTui({ title: 'Maka', driver, @@ -4950,18 +4812,14 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal, - goalLifecycle: createTestGoalLifecycle(undefined, activities, (host) => { - if (host) goalHost = host; - }), + turnActivity: createTestTurnActivity(activities), }); - assert.ok(goalHost); terminal.input('/model claude-opus-4-1'); terminal.input('\r'); await waitFor(() => driver.models.length === 1); - const admission = goalHost.admitTurn('session-1', 'wait for control'); - assert.equal(admission.kind, 'busy'); - if (admission.kind !== 'busy') throw new Error('expected busy admission'); + const controlCompletion = activities.whenIdle('session-1'); + assert.ok(controlCompletion); let automationAcquired = false; const automationActivity = activities.acquire('session-1').then((lease) => { @@ -4981,7 +4839,7 @@ describe('Maka Pi TUI runner', () => { // After the switch completes, the previously typed prompt goes through. driver.releaseSetModel(); - await admission.whenIdle; + await controlCompletion; const automationLease = await automationActivity; automationLease.release(); // The control action's busy release settles through its promise @@ -5927,10 +5785,14 @@ describe('Maka Pi TUI runner', () => { ]); }); - test('injects invoked skill instructions at submit while showing the typed prompt', async () => { - await withSkillWorkspace(async (workspaceRoot) => { + test('delegates explicit Skill invocation to the Host while showing the typed prompt', async () => { + { const terminal = new FakeTerminal(); - const driver = new SlashCommandDriver(); + const driver = new HostSkillDriver({ + loaded: [{ id: 'alpha', name: 'Alpha' }], + failed: [], + receipts: [], + }); const run = runMakaPiTui({ title: 'Maka', driver, @@ -5939,7 +5801,9 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal, - skills: { source: () => workspaceRoot, host: { toolNames: new Set() } }, + listSkills: async () => [ + { ref: 'project:alpha', id: 'alpha', name: 'Alpha', description: 'Alpha skill' }, + ], }); terminal.input('/skill:alpha 帮我整理'); @@ -5951,14 +5815,7 @@ describe('Maka Pi TUI runner', () => { '/skill:alpha 帮我整理', 'human-facing prompt keeps the typed tokens', ); - const sent = driver.prompts[0]; - assert.match(sent, //); - assert.match(sent, /# Alpha\nAlpha body\./); - assert.match(sent, /do not call the Skill tool again for these skills/); - assert.ok( - sent.endsWith('\n帮我整理\n'), - `composed message carries the stripped user text: ${sent}`, - ); + assert.equal(driver.prompts[0], '/skill:alpha 帮我整理'); // The transcript render trails the send by a tick — wait for it. await waitFor(() => plainTerminalOutput(terminal.output()).includes('/skill:alpha 帮我整理')); @@ -5971,12 +5828,16 @@ describe('Maka Pi TUI runner', () => { throw new Error('TUI did not close during test cleanup'); }), ]); - }); + } }); test('uses a Host Skill catalog for presentation while leaving invocation preparation to Host', async () => { const terminal = new FakeTerminal(); - const driver = new SlashCommandDriver(); + const driver = new HostSkillDriver({ + loaded: [{ id: 'alpha', name: 'Alpha' }], + failed: [], + receipts: [], + }); const run = runMakaPiTui({ title: 'Maka', driver, @@ -6000,11 +5861,15 @@ describe('Maka Pi TUI runner', () => { }); // Governance closeout: an all-failed explicit invocation yields a bounded - // local diagnostic and must not create a provider turn. + // Host diagnostic and must not create a provider turn. test('does not create a turn when every skill token fails to resolve', async () => { - await withSkillWorkspace(async (workspaceRoot) => { + { const terminal = new FakeTerminal(); - const driver = new SlashCommandDriver(); + const driver = new HostSkillDriver({ + loaded: [], + failed: [{ request: 'nope', reason: 'not_found' }], + receipts: [], + }); const run = runMakaPiTui({ title: 'Maka', driver, @@ -6013,7 +5878,7 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal, - skills: { source: () => workspaceRoot, host: { toolNames: new Set() } }, + listSkills: async () => [], }); terminal.input('/skill:nope hi'); @@ -6032,13 +5897,17 @@ describe('Maka Pi TUI runner', () => { throw new Error('TUI did not close during test cleanup'); }), ]); - }); + } }); test('does not create a turn when distinct skill requests exceed the preparation limit', async () => { - await withSkillWorkspace(async (workspaceRoot) => { + { const terminal = new FakeTerminal(); - const driver = new SlashCommandDriver(); + const driver = new HostSkillDriver({ + loaded: [], + failed: [{ reason: 'too_many_requests', requestLimit: 50 }], + receipts: [], + }); const run = runMakaPiTui({ title: 'Maka', driver, @@ -6047,7 +5916,7 @@ describe('Maka Pi TUI runner', () => { connectionSlug: 'claude-subscription', permissionMode: 'ask', terminal, - skills: { source: () => workspaceRoot, host: { toolNames: new Set() } }, + listSkills: async () => [], }); const prompt = [ '/skill:alpha', @@ -6071,7 +5940,7 @@ describe('Maka Pi TUI runner', () => { throw new Error('TUI did not close during test cleanup'); }), ]); - }); + } }); describe('/recap command', () => { @@ -7941,6 +7810,23 @@ class SlashCommandDriver implements MakaSessionDriver { } } +class HostSkillDriver extends SlashCommandDriver { + constructor(private readonly skillInvocation: SkillInvocationResult) { + super(); + } + + override async preparePrompt( + prompt: string, + options: MakaPreparePromptOptions = {}, + ): Promise { + if (this.skillInvocation.loaded.length === 0 && this.skillInvocation.failed.length > 0) { + throw new SkillInvocationBlockedError(this.skillInvocation); + } + const turn = await super.preparePrompt(prompt, options); + return { ...turn, skillInvocation: this.skillInvocation }; + } +} + class FailingSwitchSessionDriver extends SlashCommandDriver { async switchSession(_sessionId: string): Promise { throw new Error('session not found'); @@ -8572,55 +8458,6 @@ class SandboxBoundaryThenErrorDriver implements MakaSessionDriver { } } -class QuickErrorDriver implements MakaSessionDriver { - readonly prompts: string[] = []; - - async listSessions(): Promise { - return []; - } - - preparePrompt(prompt: string): Promise { - return prepareTestPrompt(this, prompt); - } - - async *compactSession(): AsyncIterable {} - - async *promptEvents(prompt: string): AsyncIterable { - this.prompts.push(prompt); - // The turn fails immediately, so its duration never crosses the long-turn - // threshold — the attention ring must come from the error, not the timer. - yield { - type: 'error', - id: 'event-error', - turnId: 'turn-1', - ts: 1, - message: 'turn failed', - recoverable: false, - }; - } - - async stop(): Promise {} - async respondToSandboxBoundary(_response: SandboxBoundaryResponse): Promise {} - async renameSession(): Promise {} - async setModel(): Promise {} - async setPermissionMode(): Promise {} - async setThinkingLevel(): Promise {} - async switchSession(sessionId: string): Promise { - return switchResult(fakeSessionSummary(sessionId)); - } - - async listRewindTargets(): Promise { - return []; - } - async rewindToTurn(): Promise { - throw new Error('rewind not supported in this fake'); - } - startNewSession(): void {} - getSessionId(): string { - return 'session-1'; - } -} - class RewindDriver extends SlashCommandDriver { readonly rewound: string[] = []; @@ -8646,25 +8483,6 @@ class RewindDriver extends SlashCommandDriver { } } -// #1148: a throwaway workspace seeded with one invocable skill (`alpha`). -// The runner's skill surface points at it in single-root mode, so no real -// user- or project-level skills leak into the tests. -async function withSkillWorkspace(fn: (workspaceRoot: string) => Promise): Promise { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-cli-skill-invocation-')); - try { - const skillDir = join(workspaceRoot, 'skills', 'alpha'); - await mkdir(skillDir, { recursive: true }); - await writeFile( - join(skillDir, 'SKILL.md'), - '---\nname: Alpha\ndescription: First.\n---\n# Alpha\nAlpha body.', - 'utf8', - ); - await fn(workspaceRoot); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -} - function switchResult( summary: SessionSummary, messages: StoredMessage[] = [], @@ -8739,10 +8557,8 @@ async function runSignalExitProbe( } const terminal = new ReportingTerminal(); - const goalLifecycle = { + const turnActivity = { activities: {}, - beginObservedTurn() { throw new Error('unused'); }, - bindHost() { return () => {}; }, }; const driver = { async preparePrompt() { throw new Error('unused'); }, @@ -8769,7 +8585,7 @@ async function runSignalExitProbe( connectionSlug: 'test-connection', permissionMode: 'ask', terminal, - goalLifecycle, + turnActivity, onProcessExit: (exitCode) => beginMakaCliExit(exitCode), }); process.stdout.write('READY\\n'); @@ -8840,10 +8656,8 @@ async function runFatalExitProbe( } const terminal = new ReportingTerminal(); - const goalLifecycle = { + const turnActivity = { activities: {}, - beginObservedTurn() { throw new Error('unused'); }, - bindHost() { return () => {}; }, }; const driver = { async preparePrompt() { throw new Error('unused'); }, @@ -8872,7 +8686,7 @@ async function runFatalExitProbe( connectionSlug: 'test-connection', permissionMode: 'ask', terminal, - goalLifecycle, + turnActivity, onProcessExit: (exitCode, error) => { if (error) process.stderr.write(\`${'${formatMakaCliFatalError(error)}'}\\n\`); beginMakaCliExit(exitCode); diff --git a/packages/cli/src/__tests__/pi-tui-turn.test.ts b/packages/cli/src/__tests__/pi-tui-turn.test.ts index 764df35571..fbfd6044eb 100644 --- a/packages/cli/src/__tests__/pi-tui-turn.test.ts +++ b/packages/cli/src/__tests__/pi-tui-turn.test.ts @@ -1,14 +1,13 @@ import assert from 'node:assert/strict'; import { describe, test } from 'node:test'; import type { SessionEvent } from '@maka/core'; -import { SessionActivityRegistry, type GoalTurnOutcome } from '@maka/runtime'; +import { SessionActivityRegistry } from '@maka/runtime'; import { runMakaPiTuiTurn } from '../pi-tui-turn.js'; describe('Maka Pi TUI turn', () => { - test('prepares, projects, and settles an external turn after releasing activity', async () => { + test('prepares and drains an external turn under one Session activity lease', async () => { const activities = new SessionActivityRegistry(); const sequence: string[] = []; - const settled: GoalTurnOutcome[] = []; const outcome = await runMakaPiTuiTurn({ driver: { @@ -29,24 +28,7 @@ describe('Maka Pi TUI turn', () => { ]); }, }, - lifecycle: { - activities, - beginObservedTurn: (sessionId, turnId) => { - sequence.push('register'); - assert.equal(sessionId, 'session-1'); - assert.equal(turnId, 'turn-1'); - assert.ok(activities.whenIdle(sessionId)); - return { - kind: 'registered', - settle: (settledOutcome) => { - assert.equal(activities.whenIdle(sessionId), undefined); - sequence.push('settle'); - settled.push(settledOutcome); - return Promise.resolve(); - }, - }; - }, - }, + turnActivity: { activities }, request: { kind: 'external', prompt: 'visible prompt', @@ -64,15 +46,7 @@ describe('Maka Pi TUI turn', () => { }); assert.deepEqual(outcome, { kind: 'completed', turnId: 'turn-1' }); - assert.deepEqual(settled, [outcome]); - assert.deepEqual(sequence, [ - 'start', - 'prepare', - 'register', - 'event:text_delta', - 'event:complete', - 'settle', - ]); + assert.deepEqual(sequence, ['start', 'prepare', 'event:text_delta', 'event:complete']); assert.equal(activities.whenIdle('session-1'), undefined); }); @@ -86,13 +60,7 @@ describe('Maka Pi TUI turn', () => { return preparedTurn([]); }, }, - lifecycle: { - activities, - beginObservedTurn: () => ({ - kind: 'registered', - settle: async () => {}, - }), - }, + turnActivity: { activities }, request: { kind: 'external', prompt: 'hello', sessionId: null }, shouldAbort: () => false, onFailure: (error) => { @@ -112,7 +80,6 @@ describe('Maka Pi TUI turn', () => { test('releases existing-session activity when preparation fails', async () => { const activities = new SessionActivityRegistry(); const failures: string[] = []; - let registrations = 0; const outcome = await runMakaPiTuiTurn({ driver: { @@ -121,16 +88,7 @@ describe('Maka Pi TUI turn', () => { throw new Error('prepare failed'); }, }, - lifecycle: { - activities, - beginObservedTurn: () => { - registrations++; - return { - kind: 'registered', - settle: async () => {}, - }; - }, - }, + turnActivity: { activities }, request: { kind: 'external', prompt: 'hello', sessionId: 'session-1' }, shouldAbort: () => false, onFailure: (error) => { @@ -140,7 +98,6 @@ describe('Maka Pi TUI turn', () => { assert.deepEqual(outcome, { kind: 'errored', reason: 'prepare failed' }); assert.deepEqual(failures, ['prepare failed']); - assert.equal(registrations, 0); assert.equal(activities.whenIdle('session-1'), undefined); }); }); diff --git a/packages/cli/src/__tests__/run-command-fixture.ts b/packages/cli/src/__tests__/run-command-fixture.ts index 2407469685..2b35a8a974 100644 --- a/packages/cli/src/__tests__/run-command-fixture.ts +++ b/packages/cli/src/__tests__/run-command-fixture.ts @@ -1,18 +1,13 @@ import type { SessionEvent } from '@maka/core/events'; import { createWorkspaceWritePermissionProfile } from '@maka/core/permission-profile'; import type { SessionSummary } from '@maka/core/session'; -import type { InvocationResult } from '@maka/runtime'; import { - runMakaTextCli, + runMakaTextCliCore, type MakaRunContext, type MakaRunContextInput, + type MakaRunOutcome, type MakaRunRuntime, -} from '../run-command.js'; -import { - invocationHasSandboxBoundaryFailure, - invocationRecoveredSandboxBoundaryFailure, -} from '../sandbox-boundary-failure.js'; -import type { ReadySessionTarget } from '../connection-target.js'; +} from '../run-command-core.js'; const scenario = process.env.MAKA_RUN_FIXTURE_SCENARIO ?? 'completed'; let observer: MakaRunContextInput['runOutcomeObserver']; @@ -31,7 +26,7 @@ const target = { }, apiKey: '', model: 'fixture-model', -} as ReadySessionTarget; +}; const summary = { id: 'session-fixture', @@ -60,6 +55,12 @@ const runtime: MakaRunRuntime = { ) { throw new Error(`unexpected permissionMode ${input.permissionMode}`); } + if ( + process.env.MAKA_RUN_EXPECT_SESSION_NAME && + input.name !== process.env.MAKA_RUN_EXPECT_SESSION_NAME + ) { + throw new Error(`unexpected Session name ${JSON.stringify(input.name)}`); + } return summary; }, async readExecutionBoundary() { @@ -181,15 +182,7 @@ const runtime: MakaRunRuntime = { isError: false, content: { kind: 'text', text: 'completed within the current boundary' }, }; - await notify({ - ...completedResult('recovered safely'), - events: [ - functionResponseEvent('tool-boundary', true, { - sandboxFailure: { reason: 'sandbox_boundary_required' }, - }), - functionResponseEvent('tool-safe', false, 'completed within the current boundary'), - ], - }); + await notify({ ...completedResult('recovered safely'), sandboxBoundary: 'recovered' }); return; } if (scenario === 'slow') { @@ -292,33 +285,8 @@ async function createContext(input: MakaRunContextInput): Promise { return JSON.parse(process.env.MAKA_RUN_FIXTURE_SESSIONS ?? '[]') as SessionSummary[]; } -function completedResult(finalOutput: string): InvocationResult { +function completedResult(finalOutput: string): MakaRunOutcome { return { - invocationId: 'invocation-fixture', - runId: 'run-fixture', - sessionId: summary.id, - turnId: 'turn-fixture', + outcomeId: 'run-fixture', status: 'completed', finalOutput, - events: [], - startedAt: 1, - finishedAt: 2, + sandboxBoundary: 'none', }; } -function failedResult(failureClass: string, message: string): InvocationResult { +function failedResult(failureClass: string, message: string): MakaRunOutcome { return { - invocationId: 'invocation-fixture', - runId: 'run-fixture', - sessionId: summary.id, - turnId: 'turn-fixture', + outcomeId: 'run-fixture', status: 'failed', - events: [], failure: { class: failureClass, message }, - startedAt: 1, - finishedAt: 2, - }; -} - -function functionResponseEvent( - toolUseId: string, - isError: boolean, - result: unknown, -): InvocationResult['events'][number] { - return { - id: `event-${toolUseId}`, - invocationId: 'invocation-fixture', - runId: 'run-fixture', - sessionId: summary.id, - turnId: 'turn-fixture', - ts: 1, - partial: false, - role: 'tool', - author: 'tool', - content: { - kind: 'function_response', - id: toolUseId, - name: 'Bash', - result, - isError, - }, + sandboxBoundary: 'none', }; } -async function notify(result: InvocationResult): Promise { - await observer?.({ - outcomeId: result.invocationId, - status: result.status === 'completed' ? 'completed' : 'failed', - ...(result.finalOutput !== undefined ? { finalOutput: result.finalOutput } : {}), - ...(result.failure ? { failure: result.failure } : {}), - sandboxBoundary: invocationRecoveredSandboxBoundaryFailure(result) - ? 'recovered' - : invocationHasSandboxBoundaryFailure(result) - ? 'unresolved' - : 'none', - }); +async function notify(result: MakaRunOutcome): Promise { + await observer?.(result); } -runMakaTextCli(process.argv.slice(2), { createContext, listSessions }).then( +runMakaTextCliCore(process.argv.slice(2), { createContext, listSessions }).then( (code) => { process.exitCode = code; }, diff --git a/packages/cli/src/__tests__/run-command.test.ts b/packages/cli/src/__tests__/run-command.test.ts index 4303ba4b58..eabe1388b9 100644 --- a/packages/cli/src/__tests__/run-command.test.ts +++ b/packages/cli/src/__tests__/run-command.test.ts @@ -5,7 +5,7 @@ import { realpath } from 'node:fs/promises'; import { fileURLToPath } from 'node:url'; import { describe, test } from 'node:test'; import type { SessionSummary } from '@maka/core/session'; -import { parseMakaRunArgs } from '../run-command.js'; +import { parseMakaRunArgs } from '../run-command-core.js'; const fixturePath = fileURLToPath(new URL('./run-command-fixture.js', import.meta.url)); @@ -127,6 +127,19 @@ describe('maka run process contract', () => { assert.equal(processContractStderr(result.stderr), ''); }); + test('normalizes a generated Session name after truncating the prompt', async () => { + const prompt = 'Use Bash exactly once to run pwd and node -p'; + assert.equal(prompt.slice(0, 42).endsWith(' '), true); + + const result = await runFixture([prompt], { + input: '', + env: { MAKA_RUN_EXPECT_SESSION_NAME: 'Use Bash exactly once to run pwd and node' }, + }); + + assert.equal(result.code, 0, result.stderr); + assert.equal(processContractStderr(result.stderr), ''); + }); + test('waits for the complete Graph before printing the final supervisor output', async () => { const result = await runFixture(['implement it', '--graph'], { input: '', diff --git a/packages/cli/src/__tests__/runtime-bootstrap.test.ts b/packages/cli/src/__tests__/runtime-bootstrap.test.ts deleted file mode 100644 index 6c891ab47c..0000000000 --- a/packages/cli/src/__tests__/runtime-bootstrap.test.ts +++ /dev/null @@ -1,1399 +0,0 @@ -import assert from 'node:assert/strict'; -import { createHash } from 'node:crypto'; -import { access, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, test } from 'node:test'; -import { - MODEL_CALL_ATTEMPT_SCHEMA_VERSION, - type ModelCallAttempt, -} from '@maka/core/model-call-attempt'; -import { - createConnectionStore, - createFileCredentialStore, - createSettingsStore, - createSessionStore, - createSqliteShellRunStore, -} from '@maka/storage'; -import { - BackendRegistry, - AGENT_LIST_TOOL_NAME, - AGENT_OUTPUT_TOOL_NAME, - AGENT_SPAWN_TOOL_NAME, - AGENT_SWARM_STATUS_TOOL_NAME, - AGENT_TOOL_GROUP_ID, - GOAL_CLEAR_TOOL_NAME, - GOAL_PAUSE_TOOL_NAME, - GOAL_RESUME_TOOL_NAME, - GOAL_SET_TOOL_NAME, - GOAL_STATUS_TOOL_NAME, - IMPLEMENTATION_AGENT_ID, - WEB_RESEARCH_AGENT_ID, - UPDATE_AGENT_GRAPH_TOOL_NAME, - VIEW_AGENT_GRAPH_TOOL_NAME, - YIELD_AGENT_GRAPH_TOOL_NAME, - type AiSdkBackendInput, - type MakaTool, - type SessionStore, - type ShellRunUpdate, -} from '@maka/runtime'; -import { - createMakaCliRuntimeContext, - getOrCreateCliClaudeDeviceId, - isMakaClaudeSubscriptionCloakEnabled, - resolveCliStreamConnectTimeoutMs, -} from '../runtime-bootstrap.js'; -import { WAIT_BUDGET_MS } from './tui-terminal-mock.js'; - -function modelCallAttemptFixture(): ModelCallAttempt { - return { - schemaVersion: MODEL_CALL_ATTEMPT_SCHEMA_VERSION, - logicalCallId: 'call-1', - attemptId: 'attempt-1', - traceId: 'trace-1', - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - step: 0, - attempt: 0, - callKind: 'history_compact', - providerId: 'ollama', - modelId: 'llama3.2', - startedAt: 1, - completedAt: 2, - latencyMs: 1, - status: 'completed', - usageBasis: 'missing', - costBasis: 'unpriced', - }; -} - -describe('Maka CLI runtime bootstrap', () => { - test('parses the CLI stream connect timeout override', () => { - assert.equal(resolveCliStreamConnectTimeoutMs({}), undefined); - assert.equal( - resolveCliStreamConnectTimeoutMs({ MAKA_STREAM_CONNECT_TIMEOUT_MS: '120000' }), - 120_000, - ); - assert.throws( - () => resolveCliStreamConnectTimeoutMs({ MAKA_STREAM_CONNECT_TIMEOUT_MS: '0' }), - /positive integer/, - ); - assert.throws( - () => resolveCliStreamConnectTimeoutMs({ MAKA_STREAM_CONNECT_TIMEOUT_MS: 'later' }), - /positive integer/, - ); - }); - - test('forwards generated title notifications to the TUI host', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const onSessionTitleChanged = (_sessionId: string): void => {}; - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - onSessionTitleChanged, - }); - try { - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - assert.equal(runtimeDeps.onSessionTitleChanged, onSessionTitleChanged); - } finally { - await context.close(); - } - }); - }); - - test('routes activation resume lifecycle diagnostics to stderr', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'activation', - workspaceRoot, - cwd: workspaceRoot, - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const info: unknown[] = []; - const error: unknown[] = []; - const originalInfo = console.info; - const originalError = console.error; - console.info = (...args: unknown[]) => info.push(args); - console.error = (...args: unknown[]) => error.push(args); - try { - runtimeDeps.onContinuationLifecycleEvent?.({ type: 'plan_approved' }); - assert.equal(info.length, 0); - assert.equal(error.length, 1); - } finally { - console.info = originalInfo; - console.error = originalError; - await context.close(); - } - }); - }); - - test('loads the default connection and can create an ai-sdk session', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'hello', - }); - - assert.equal(context.target.connection.slug, 'local'); - assert.equal(context.target.model, 'llama3.2'); - assert.equal(session.backend, 'ai-sdk'); - assert.equal(session.llmConnectionSlug, 'local'); - assert.equal(session.permissionMode, 'bypass'); - }); - }); - - for (const wire of [ - { - name: 'Responses', - slug: 'deepseek-responses', - providerType: 'deepseek', - model: 'deepseek-v4-flash', - baseUrl: 'https://api.deepseek.com', - apiProtocol: 'openai-responses', - providerToolKind: 'openai-web-search', - }, - { - name: 'Anthropic Messages', - slug: 'deepseek-anthropic', - providerType: 'anthropic-compatible', - model: 'deepseek-v4-flash', - baseUrl: 'https://api.deepseek.com/anthropic', - apiProtocol: 'anthropic-messages', - providerToolKind: 'anthropic-web-search-20250305', - }, - ] as const) { - test(`routes root native WebSearch over ${wire.name} without widening scoped child tools`, async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: wire.slug, - name: `DeepSeek ${wire.name}`, - providerType: wire.providerType, - baseUrl: wire.baseUrl, - defaultModel: wire.model, - }); - await connectionStore.update(wire.slug, { - models: [ - { - id: wire.model, - apiProtocol: wire.apiProtocol, - }, - ], - }); - await createFileCredentialStore(workspaceRoot).setSecret(wire.slug, 'api_key', 'test-key'); - const settingsStore = createSettingsStore(workspaceRoot); - await settingsStore.update({ - webSearch: { enabled: true, defaultProvider: 'model' }, - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'run', - workspaceRoot, - cwd: '/repo', - }); - try { - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: wire.slug, - model: wire.model, - permissionMode: 'bypass', - name: `native-search-${wire.name}`, - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const rootBackend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const rootInput = (rootBackend as unknown as { input: AiSdkBackendInput }).input; - const rootWebSearch = rootInput.tools.find((tool) => tool.name === 'WebSearch'); - assert.equal(rootWebSearch?.providerTool?.kind, wire.providerToolKind); - - const scopedBackend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - tools: [ - { - name: 'ReadOnlyProbe', - description: 'Read-only test probe', - parameters: {}, - impl: () => 'ok', - }, - ], - }); - const scopedInput = (scopedBackend as unknown as { input: AiSdkBackendInput }).input; - assert.deepEqual( - scopedInput.tools.map((tool) => tool.name), - ['ReadOnlyProbe'], - ); - - await settingsStore.update({ privacy: { incognitoActive: true } }); - const privateBackend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const privateInput = (privateBackend as unknown as { input: AiSdkBackendInput }).input; - assert.equal( - privateInput.tools.some((tool) => tool.name === 'WebSearch'), - false, - ); - } finally { - await context.close(); - } - }); - }); - } - - test('treats child tools and prompt from BackendFactoryContext as hard boundaries', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - try { - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'explore', - name: 'scoped-child', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const scopedTool: MakaTool = { - name: 'ReadOnlyProbe', - description: 'Read-only test probe', - parameters: {}, - impl: () => 'ok', - }; - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - tools: [scopedTool], - systemPrompt: 'Durable child prompt.', - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.deepEqual( - backendInput.tools.map((tool) => tool.name), - ['ReadOnlyProbe'], - ); - assert.equal(backendInput.systemPrompt, 'Durable child prompt.'); - assert.deepEqual(backendInput.toolAvailability, { - economy: !process.env.MAKA_DISABLE_DEFERRED_TOOLS, - groups: [], - }); - assert.equal(backendInput.spawnChildAgent, undefined); - assert.equal(backendInput.spawnChildSession, undefined); - } finally { - await context.close(); - } - }); - }); - - test('forwards the canonical metering sink from the backend context', async () => { - // The CLI factory used to wire capture and attempt diagnostics but not the - // canonical sink, so `/compact` and ordinary sends produced no - // `ModelCallAttempt` at all — the kernel offered one and nothing took it. - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - try { - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'explore', - name: 'metering-sink', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const recorded: ModelCallAttempt[] = []; - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - recordModelCallAttempt: (attempt: ModelCallAttempt) => { - recorded.push(attempt); - return Promise.resolve(); - }, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal( - typeof backendInput.recordModelCallAttempt, - 'function', - 'the composition must pass the sink the kernel offers', - ); - await backendInput.recordModelCallAttempt?.(modelCallAttemptFixture()); - assert.equal(recorded.length, 1, 'and it must reach the context, not a local stub'); - assert.equal(recorded[0]?.callKind, 'history_compact'); - } finally { - await context.close(); - } - }); - }); - - test('uses an explicit connection and forwards one-shot limits and invocation results', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'default-local', - name: 'Default local', - providerType: 'ollama', - defaultModel: 'default-model', - }); - await connectionStore.create({ - slug: 'selected-local', - name: 'Selected local', - providerType: 'ollama', - defaultModel: 'selected-model', - }); - await connectionStore.update('selected-local', { - // Requested model must be user-enabled; discovered catalog alone is not enough. - enabledModelIds: ['selected-model', 'requested-model'], - models: [ - { id: 'selected-model' }, - { id: 'requested-model', capabilities: { vision: true } }, - ], - }); - const observed: unknown[] = []; - const observer = (result: unknown): void => { - observed.push(result); - }; - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - requestedConnectionSlug: 'selected-local', - requestedModel: 'requested-model', - maxSteps: 3, - runtimeInvocationObserver: observer, - }); - try { - assert.equal(context.target.connection.slug, 'selected-local'); - assert.equal(context.target.model, 'requested-model'); - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'explore', - name: 'one-shot', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal(backendInput.maxSteps, 3); - assert.equal(backendInput.supportsVision, true); - assert.equal(typeof backendInput.readAttachmentBytes, 'function'); - assert.equal(runtimeDeps.runtimeInvocationObserver, observer); - assert.deepEqual(observed, []); - } finally { - await context.close(); - } - }); - }); - - test('uses a canonical cwd for one resumed backend without rewriting its stored header', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local', - providerType: 'ollama', - defaultModel: 'model-1', - }); - const sessionStore = createSessionStore(workspaceRoot); - const stored = await sessionStore.create({ - cwd: '/stored-link', - backend: 'ai-sdk', - llmConnectionSlug: 'local', - model: 'model-1', - permissionMode: 'explore', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/canonical-repo', - requestedConnectionSlug: 'local', - requestedModel: 'model-1', - sessionCwdOverride: { sessionId: stored.id, cwd: '/canonical-repo' }, - }); - try { - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(stored.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: stored.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal(backendInput.header.cwd, '/canonical-repo'); - assert.equal((await sessionStore.readHeader(stored.id)).cwd, '/stored-link'); - } finally { - await context.close(); - } - }); - }); - - test('registers Edit in the TUI runtime toolset', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - - const edit = context.tools.find((tool) => tool.name === 'Edit'); - assert.ok( - edit, - 'Edit must be registered (regression: it was once filtered out of the TUI runtime)', - ); - }); - }); - - test('registers interactive-only tools exclusively on the TUI surface', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const tui = await createMakaCliRuntimeContext({ - workspaceRoot, - cwd: '/repo', - surface: 'tui', - }); - const run = await createMakaCliRuntimeContext({ - workspaceRoot, - cwd: '/repo', - surface: 'run', - }); - try { - const tool = tui.tools.find((candidate) => candidate.name === 'AskUserQuestion'); - assert.ok(tool); - assert.equal( - run.tools.some((candidate) => candidate.name === 'AskUserQuestion'), - false, - ); - const goalToolNames = [ - GOAL_SET_TOOL_NAME, - GOAL_CLEAR_TOOL_NAME, - GOAL_STATUS_TOOL_NAME, - GOAL_PAUSE_TOOL_NAME, - GOAL_RESUME_TOOL_NAME, - ]; - assert.deepEqual( - goalToolNames.filter((name) => tui.tools.some((candidate) => candidate.name === name)), - goalToolNames, - ); - assert.equal( - run.tools.some((candidate) => goalToolNames.includes(candidate.name)), - false, - ); - const agentToolNames = [ - AGENT_SPAWN_TOOL_NAME, - AGENT_LIST_TOOL_NAME, - AGENT_OUTPUT_TOOL_NAME, - ]; - assert.deepEqual( - agentToolNames.filter((name) => tui.tools.some((candidate) => candidate.name === name)), - agentToolNames, - ); - assert.equal( - run.tools.some((candidate) => agentToolNames.includes(candidate.name)), - false, - ); - } finally { - await tui.close(); - await run.close(); - } - }); - }); - - test('composes Graph controls and worktree execution for non-interactive Graph runs', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - workspaceRoot, - cwd: '/repo', - surface: 'run', - enableAgentGraph: true, - }); - try { - assert.ok(context.agentGraph); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - assert.ok(runtimeDeps.worktreeChildExecutor); - assert.ok(runtimeDeps.childTools?.length); - - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'execute', - name: 'cli-graph', - }); - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - const names = backendInput.tools.map((tool) => tool.name); - - assert.ok(names.includes('view_agent_graph')); - assert.ok(names.includes('update_agent_graph')); - assert.ok(names.includes(AGENT_OUTPUT_TOOL_NAME)); - assert.ok(backendInput.runtimeCommitSink); - } finally { - await context.close(); - } - }); - }); - - test('wires TUI subagent capabilities and a profile-filtered child tool surface', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - try { - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal(typeof backendInput.spawnChildAgent, 'function'); - assert.equal(typeof backendInput.spawnChildSession, 'function'); - assert.equal(typeof backendInput.retryChildAgent, 'function'); - assert.equal(typeof backendInput.listChildAgents, 'function'); - assert.equal(typeof backendInput.readChildAgentOutput, 'function'); - assert.deepEqual(backendInput.toolAvailability, { - economy: !process.env.MAKA_DISABLE_DEFERRED_TOOLS, - groups: [ - { - id: AGENT_TOOL_GROUP_ID, - label: 'Agent', - description: 'Spawn, fan out, and inspect foreground child agents.', - toolNames: [ - AGENT_SPAWN_TOOL_NAME, - AGENT_LIST_TOOL_NAME, - AGENT_OUTPUT_TOOL_NAME, - AGENT_SWARM_STATUS_TOOL_NAME, - VIEW_AGENT_GRAPH_TOOL_NAME, - UPDATE_AGENT_GRAPH_TOOL_NAME, - YIELD_AGENT_GRAPH_TOOL_NAME, - ], - }, - ], - }); - assert.deepEqual( - runtimeDeps.childTools?.map((tool) => tool.name), - ['Read', 'Glob', 'Grep', 'WebSearch', 'Write', 'Edit', 'Bash'], - ); - assert.equal( - runtimeDeps.childTools?.some((tool) => tool.name === AGENT_SPAWN_TOOL_NAME), - false, - ); - const childAgents = (await backendInput.listChildAgents?.()) as { - definitions: Array<{ - id: string; - availability: { status: string; reason?: string }; - }>; - }; - assert.deepEqual( - childAgents.definitions.find((definition) => definition.id === IMPLEMENTATION_AGENT_ID) - ?.availability, - { - status: 'unavailable', - reason: 'workspace_isolation_unavailable', - workspace: 'worktree', - requiredRuntime: 'worktree_child_executor', - }, - ); - assert.deepEqual( - childAgents.definitions.find((definition) => definition.id === WEB_RESEARCH_AGENT_ID) - ?.availability, - { status: 'unavailable', reason: 'missing_tools', missingTools: ['WebSearch'] }, - ); - assert.equal(context.skills.host.toolNames.has(AGENT_SPAWN_TOOL_NAME), true); - assert.equal(context.skills.host.toolNames.has('agent_swarm'), false); - } finally { - await context.close(); - } - }); - }); - - test('registers Skill and bounded SkillSearch tools on the CLI host', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - try { - const skill = context.tools.find((tool) => tool.name === 'Skill'); - assert.ok(skill, 'Skill tool must be registered on the CLI host'); - const skillSearch = context.tools.find((tool) => tool.name === 'SkillSearch'); - assert.ok(skillSearch, 'SkillSearch tool must be registered on the CLI host'); - } finally { - await context.close(); - } - }); - }); - - test('enables background ShellRuns for the TUI runtime and cleans them up on close', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: workspaceRoot, - }); - try { - const names = context.tools.map((tool) => tool.name); - assert.ok(names.includes('StopBackgroundTask')); - - const bash = context.tools.find((tool) => tool.name === 'Bash'); - assert.ok(bash); - const read = context.tools.find((tool) => tool.name === 'Read'); - assert.ok(read); - const command = `${JSON.stringify(process.execPath)} -e "process.stdout.write('start'); setTimeout(() => {}, 5000)"`; - const result = (await bash.impl( - { command, run_in_background: true }, - { - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - cwd: workspaceRoot, - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }, - )) as { - kind: string; - ref?: string; - status?: string; - output?: { mode: string; stdout?: string }; - }; - - assert.equal(result.kind, 'shell_run'); - assert.equal(result.status, 'running'); - assert.equal(result.output, undefined); - assert.ok(result.ref); - if (!result.ref) throw new Error('expected background task resource ref'); - const detail = await waitFor(async () => { - const snapshot = (await read.impl( - { ref: result.ref }, - { - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - cwd: workspaceRoot, - toolCallId: 'tool-2', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }, - )) as { - kind?: string; - status?: string; - output?: { mode: string; stdout?: string }; - }; - return snapshot.output?.stdout === 'start' ? snapshot : undefined; - }); - assert.equal(detail.kind, 'shell_run'); - assert.equal(detail.status, 'running'); - assert.equal(detail.output?.mode, 'pipes'); - assert.equal(detail.output?.stdout, 'start'); - - await context.close(); - const shellRuns = createSqliteShellRunStore(workspaceRoot); - await shellRuns.ready(); - const record = await shellRuns.readShellRun('session-1', backgroundTaskId(result.ref)); - shellRuns.close(); - assert.equal(record.status, 'cancelled'); - assert.equal(record.exitCode, 130); - } finally { - await context.close(); - } - }); - }); - - test('publishes background ShellRun completion without a model resource read', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: workspaceRoot, - }); - const updates: ShellRunUpdate[] = []; - const unsubscribe = context.subscribeShellRunUpdates((update) => updates.push(update)); - try { - const bash = context.tools.find((tool) => tool.name === 'Bash'); - assert.ok(bash); - const command = `${JSON.stringify(process.execPath)} -e "process.stdout.write('start'); setTimeout(() => process.stdout.write('done'), 500)"`; - const result = (await bash.impl( - { command, run_in_background: true }, - { - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - cwd: workspaceRoot, - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }, - )) as { kind?: string; status?: string }; - assert.equal(result.kind, 'shell_run'); - assert.equal(result.status, 'running'); - - const terminal = await waitFor(() => - updates.find((update) => update.result.status === 'completed'), - ); - assert.equal(terminal.sourceToolCallId, 'tool-1'); - assert.equal( - terminal.result.output?.mode === 'pipes' ? terminal.result.output.stdout : '', - 'startdone', - ); - } finally { - unsubscribe(); - await context.close(); - } - }); - }); - - test('exposes canonical ShellRun updates through the runtime context', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: workspaceRoot, - }); - try { - const parent = await context.runtime.createSession({ - cwd: workspaceRoot, - backend: 'ai-sdk', - llmConnectionSlug: 'local', - model: 'llama3.2', - permissionMode: 'bypass', - name: 'parent', - }); - const bash = context.tools.find((tool) => tool.name === 'Bash'); - assert.ok(bash); - const command = `${JSON.stringify(process.execPath)} -e "setTimeout(() => {}, 5000)"`; - const started = (await bash.impl( - { command, run_in_background: true }, - { - sessionId: parent.id, - runId: 'run-1', - turnId: 'turn-1', - cwd: workspaceRoot, - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }, - )) as { kind?: string; ref?: string; status?: string }; - assert.equal(started.status, 'running'); - assert.ok(started.ref); - - const updates = await context.listShellRunUpdates(parent.id); - const update = updates.find((candidate) => candidate.result.ref === started.ref); - assert.deepEqual(update?.ownership, { kind: 'local' }); - assert.equal(update?.result.status, 'running'); - } finally { - await context.close(); - } - }); - }); - - test('hydrates terminal ShellRun state without marking it observed by the agent', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: workspaceRoot, - }); - try { - const bash = context.tools.find((tool) => tool.name === 'Bash'); - assert.ok(bash); - const command = `${JSON.stringify(process.execPath)} -e "setTimeout(() => {}, 500)"`; - const started = (await bash.impl( - { command, run_in_background: true }, - { - sessionId: 'session-1', - runId: 'run-1', - turnId: 'turn-1', - cwd: workspaceRoot, - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }, - )) as { ref?: string; status?: string }; - assert.equal(started.status, 'running'); - assert.ok(started.ref); - - const hydrated = await waitFor(async () => { - const updates = await context.listShellRunUpdates('session-1'); - const snapshot = updates.find((candidate) => candidate.result.ref === started.ref); - return snapshot?.result.status === 'completed' ? snapshot : undefined; - }); - assert.equal(hydrated.result.status, 'completed'); - const shellRuns = createSqliteShellRunStore(workspaceRoot); - await shellRuns.ready(); - const stored = await shellRuns.readShellRun('session-1', backgroundTaskId(started.ref)); - shellRuns.close(); - assert.equal(stored.observedAt, undefined); - } finally { - await context.close(); - } - }); - }); - - test('passes the default context budget policy to ai-sdk backends', async () => { - await withCleanContextBudgetEnv(async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'budgeted', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal(backendInput.contextBudget?.name, 'cli-default-history-budget'); - assert.equal(backendInput.contextBudget?.maxHistoryEstimatedTokens, 32_000); - assert.equal(backendInput.contextBudget?.activeToolResultPrune?.enabled, true); - // In-turn semantic compaction (the #986 experiment) is off by default in - // the runtime, so the CLI inherits it absent without a local strip. - // History/turn compaction stays. - assert.equal(backendInput.contextBudget?.semanticCompact, undefined); - assert.equal(backendInput.contextBudget?.historyCompact?.enabled, true); - assert.equal(backendInput.contextBudget?.historyCompact?.mode, 'read_write'); - assert.equal(backendInput.contextBudget?.historyCompact?.highWaterRatio, 1); - assert.equal(backendInput.contextBudget?.historyCompact?.tailEstimatedTokens, 16_384); - assert.equal(backendInput.contextBudget?.historyCompact?.minRecentTurns, 3); - }); - }); - }); - - test('honors an explicit MAKA_CONTEXT_SEMANTIC_COMPACT opt-in', async () => { - await withCleanContextBudgetEnv(async () => { - process.env.MAKA_CONTEXT_SEMANTIC_COMPACT = 'on'; - try { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'semantic-opt-in', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - // Semantic compaction is off by default, but an explicit env opt-in - // must reach the backend so the path stays exercisable. - assert.equal(backendInput.contextBudget?.semanticCompact?.enabled, true); - }); - } finally { - delete process.env.MAKA_CONTEXT_SEMANTIC_COMPACT; - } - }); - }); - - test('keeps ordinary send policy read-write for providers without a context-window budget', async () => { - await withCleanContextBudgetEnv(async () => { - process.env.MAKA_CONTEXT_HISTORY_COMPACT = 'on'; - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'deepseek', - name: 'DeepSeek', - providerType: 'deepseek', - defaultModel: 'custom-deepseek-model', - }); - const credentialStore = createFileCredentialStore(workspaceRoot); - await credentialStore.setSecret('deepseek', 'api_key', 'test-key'); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - cwd: '/repo', - }); - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'budgeted', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot, - header, - store: runtimeDeps.store, - }); - const backendInput = (backend as unknown as { input: AiSdkBackendInput }).input; - - assert.equal(backendInput.contextBudget?.maxHistoryEstimatedTokens, undefined); - assert.equal(backendInput.contextBudget?.historyCompact?.mode, 'read_write'); - assert.equal(backendInput.contextBudget?.historyCompact?.highWaterRatio, 1); - assert.equal(backendInput.contextBudget?.historyCompact?.tailEstimatedTokens, 16_384); - }); - }); - }); - - test('keeps Claude subscription cloaking enabled unless the emergency opt-out is set', () => { - assert.equal(isMakaClaudeSubscriptionCloakEnabled({}), true); - assert.equal( - isMakaClaudeSubscriptionCloakEnabled({ MAKA_CLAUDE_SUBSCRIPTION_CLOAK: '1' }), - true, - ); - assert.equal( - isMakaClaudeSubscriptionCloakEnabled({ MAKA_CLAUDE_SUBSCRIPTION_CLOAK: '0' }), - false, - ); - }); - - test('persists a random Claude device id instead of deriving it from the workspace path', async () => { - await withWorkspace(async (workspaceRoot) => { - const pathHash = createHash('sha256').update(workspaceRoot, 'utf8').digest('hex'); - const first = await getOrCreateCliClaudeDeviceId(workspaceRoot, { - newId: () => '1'.repeat(64), - }); - const second = await getOrCreateCliClaudeDeviceId(workspaceRoot, { - newId: () => '2'.repeat(64), - }); - - assert.equal(first, '1'.repeat(64)); - assert.equal(second, first); - assert.notEqual(first, pathHash); - }); - }); - - test('isolates portable state from injected config roots', async () => { - await withWorkspace(async (workspaceRoot) => { - const stateRoot = join(workspaceRoot, 'state'); - const configRoot = join(workspaceRoot, 'config'); - await Promise.all([mkdir(stateRoot), mkdir(configRoot)]); - - const connectionStore = createConnectionStore(configRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const credentialStore = createFileCredentialStore(configRoot); - await credentialStore.setSecret('local', 'api_key', 'config-secret-canary'); - - const context = await createMakaCliRuntimeContext({ - surface: 'run', - workspaceRoot, - stateRoot, - configRoot, - cwd: '/repo', - }); - try { - assert.equal(context.workspaceRoot, workspaceRoot); - assert.equal(context.stateRoot, stateRoot); - assert.equal(context.configRoot, configRoot); - - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'isolated', - }); - - await access(join(stateRoot, 'runtime.sqlite')); - await assert.rejects(access(join(configRoot, 'runtime.sqlite'))); - await access(join(configRoot, 'llm-connections.json')); - await access(join(configRoot, 'credentials.json')); - await assert.rejects(access(join(stateRoot, 'credentials.json'))); - - await getOrCreateCliClaudeDeviceId(configRoot, { newId: () => '3'.repeat(64) }); - await access(join(configRoot, '.maka_cli_claude_device_id')); - await assert.rejects(access(join(stateRoot, '.maka_cli_claude_device_id'))); - } finally { - await context.close(); - } - }); - }); - - test('routes skill tools, search, and the model catalog through the config root', async () => { - await withWorkspace(async (workspaceRoot) => { - const stateRoot = join(workspaceRoot, 'state'); - const configRoot = join(workspaceRoot, 'config'); - const skillRoot = join(configRoot, 'skills', 'config-only'); - await Promise.all([mkdir(stateRoot), mkdir(skillRoot, { recursive: true })]); - await writeFile( - join(skillRoot, 'SKILL.md'), - [ - '---', - 'name: Config Only', - 'description: Skill injected only through the host config root.', - '---', - '# Config Only', - 'Follow the config-root instructions.', - ].join('\n'), - ); - const connectionStore = createConnectionStore(configRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - - const context = await createMakaCliRuntimeContext({ - surface: 'tui', - workspaceRoot, - stateRoot, - configRoot, - cwd: '/repo', - }); - try { - const toolContext = { - sessionId: 'session-1', - turnId: 'turn-1', - cwd: '/repo', - toolCallId: 'tool-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; - const skill = context.tools.find((tool) => tool.name === 'Skill'); - assert.ok(skill); - const loaded = (await skill.impl({ name: 'Config Only' }, toolContext)) as { - ok: boolean; - }; - assert.equal(loaded.ok, true); - - const skillSearch = context.tools.find((tool) => tool.name === 'SkillSearch'); - assert.ok(skillSearch); - const searched = (await skillSearch.impl( - { query: 'host config root', limit: 3 }, - toolContext, - )) as { matches: Array<{ name: string }> }; - assert.equal( - searched.matches.some((match) => match.name === 'Config Only'), - true, - ); - - const session = await context.runtime.createSession({ - cwd: context.cwd, - backend: 'ai-sdk', - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'bypass', - name: 'config-root-skill', - }); - const runtimeDeps = (context.runtime as unknown as RuntimeWithPrivateDeps).deps; - const header = await runtimeDeps.store.readHeader(session.id); - const backend = await runtimeDeps.backends.build('ai-sdk', { - sessionId: session.id, - workspaceRoot: stateRoot, - header, - store: runtimeDeps.store, - }); - const systemPrompt = (backend as unknown as { input: AiSdkBackendInput }).input - .systemPrompt; - assert.equal(typeof systemPrompt, 'function'); - const rendered = - typeof systemPrompt === 'function' - ? await systemPrompt({ - sessionId: session.id, - turnId: 'bootstrap-test-turn', - cwd: context.cwd, - workspaceRoot: stateRoot, - }) - : systemPrompt; - assert.match(rendered ?? '', /Config Only/); - } finally { - await context.close(); - } - }); - }); - - test('defaults both new roots to the legacy workspaceRoot', async () => { - await withWorkspace(async (workspaceRoot) => { - const connectionStore = createConnectionStore(workspaceRoot); - await connectionStore.create({ - slug: 'local', - name: 'Local Ollama', - providerType: 'ollama', - defaultModel: 'llama3.2', - }); - const context = await createMakaCliRuntimeContext({ - surface: 'run', - workspaceRoot, - cwd: '/repo', - }); - try { - assert.equal(context.stateRoot, workspaceRoot); - assert.equal(context.configRoot, workspaceRoot); - } finally { - await context.close(); - } - }); - }); -}); - -interface RuntimeWithPrivateDeps { - deps: { - backends: BackendRegistry; - store: SessionStore; - runtimeInvocationObserver?: (result: unknown) => void | Promise; - onSessionTitleChanged?: (sessionId: string) => void; - childTools?: readonly MakaTool[]; - worktreeChildExecutor?: unknown; - onContinuationLifecycleEvent?: (event: unknown) => void; - }; -} - -async function withWorkspace(fn: (workspaceRoot: string) => Promise): Promise { - const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-cli-runtime-')); - try { - await fn(workspaceRoot); - } finally { - await rm(workspaceRoot, { recursive: true, force: true }); - } -} - -async function waitFor(read: () => T | undefined | Promise): Promise { - // Same budget policy as the shared TUI waitFor (#2221): the wait returns as - // soon as the read yields a value, so the floor only bounds a failing - // report, and CI runners get the scaled budget instead of losing - // scheduling races. - const deadline = Date.now() + Math.max(3_000, WAIT_BUDGET_MS); - while (Date.now() < deadline) { - const value = await read(); - if (value !== undefined) return value; - await new Promise((resolve) => setTimeout(resolve, 20)); - } - throw new Error('Timed out waiting for ShellRun state'); -} - -function backgroundTaskId(ref: string): string { - const id = new URL(ref).pathname.split('/').pop(); - if (!id) throw new Error(`Invalid background task ref: ${ref}`); - return decodeURIComponent(id); -} - -async function withCleanContextBudgetEnv(fn: () => Promise): Promise { - const saved = new Map(); - for (const key of Object.keys(process.env).filter((key) => key.startsWith('MAKA_CONTEXT_'))) { - saved.set(key, process.env[key]); - delete process.env[key]; - } - try { - await fn(); - } finally { - for (const [key, value] of saved) { - if (value === undefined) delete process.env[key]; - else process.env[key] = value; - } - } -} diff --git a/packages/cli/src/__tests__/runtime-host-cli-context.test.ts b/packages/cli/src/__tests__/runtime-host-cli-context.test.ts index bc58ea43c3..b2591cf7ab 100644 --- a/packages/cli/src/__tests__/runtime-host-cli-context.test.ts +++ b/packages/cli/src/__tests__/runtime-host-cli-context.test.ts @@ -7,6 +7,7 @@ import { connectRuntimeHostCli } from '../runtime-host-cli-context.js'; test('CLI Runtime Host bootstrap launches the execution composition', async () => { let candidateEntrypoint: string | URL | undefined; + let legacyConfigurationRoot: string | undefined; let closes = 0; const connection = { status: async () => ({ state: 'ready' }), @@ -16,10 +17,15 @@ test('CLI Runtime Host bootstrap launches the execution composition', async () = } as unknown as RuntimeHostConnection; const context = await connectRuntimeHostCli( - { rootPath: '/runtime-host-root', surface: 'run' }, + { + rootPath: '/runtime-host-root', + surface: 'activation', + legacyConfigurationRoot: '/legacy-configuration', + }, { connectOrSpawn: async (input) => { candidateEntrypoint = input.candidateEntrypoint; + legacyConfigurationRoot = input.legacyConfigurationRoot; return { kind: 'connected', connection }; }, readConnectionCatalog: async () => ({ @@ -32,6 +38,7 @@ test('CLI Runtime Host bootstrap launches the execution composition', async () = assert.ok(candidateEntrypoint instanceof URL); assert.equal(basename(fileURLToPath(candidateEntrypoint)), 'execution-candidate-main.js'); + assert.equal(legacyConfigurationRoot, '/legacy-configuration'); await context.close(); assert.equal(closes, 1); }); diff --git a/packages/cli/src/__tests__/runtime-host-run-command.test.ts b/packages/cli/src/__tests__/runtime-host-run-command.test.ts index 80adb8e432..69217e61ec 100644 --- a/packages/cli/src/__tests__/runtime-host-run-command.test.ts +++ b/packages/cli/src/__tests__/runtime-host-run-command.test.ts @@ -302,31 +302,40 @@ describe('Runtime Host maka run adapter', () => { assert.equal(observed[0]?.finalOutput, 'Host answer'); }); - test('fails closed for a legacy resumed Session whose Host cwd is not canonical', async () => { + test('canonicalizes a legacy resumed Session through Host authority', async () => { const fixture = runFixture({ sessionCwdOverride: { sessionId: 'session-legacy', cwd: '/canonical-workspace' }, switchSummaryCwd: '/workspace-link', }); - await assert.rejects( - collect( - fixture.context.runtime.sendMessage('session-legacy', { - turnId: 'turn-1', - text: 'resume safely', - }), - ), - new Error( - 'Runtime Host cannot resume Session session-legacy: its stored working directory is not canonical', - ), + await collect( + fixture.context.runtime.sendMessage('session-legacy', { + turnId: 'turn-1', + text: 'resume safely', + }), ); + + assert.deepEqual(fixture.moves, ['/canonical-workspace']); }); - test('fails explicitly instead of ignoring an unsupported Host step cap', () => { + test('applies the requested step cap through the Host turn', async () => { const fixture = runFixture({ maxSteps: 3 }); - assert.throws( - () => fixture.context, - new Error('--max-steps is not available through the Runtime Host yet'), + const session = await fixture.context.runtime.createSession({ + cwd: '/workspace', + backend: 'ai-sdk', + llmConnectionSlug: 'openai-main', + model: 'gpt-5', + permissionMode: 'ask', + }); + + await collect( + fixture.context.runtime.sendMessage(session.id, { + turnId: 'turn-with-step-cap', + text: 'answer within the cap', + }), ); + + assert.deepEqual(fixture.preparedMaxSteps, [3]); }); test('never selects a discovered model that the Host has not enabled', () => { @@ -585,6 +594,7 @@ function runFixture(input: { finalMessages?: StoredMessage[]; }) { const switches: string[] = []; + const moves: string[] = []; const graphStops: string[] = []; const exactTurnStops: { sessionId: string; turnId: string; runId: string }[] = []; const sandboxResponses: { requestId: string; decision: 'deny' }[] = []; @@ -594,6 +604,7 @@ function runFixture(input: { (sessionId: string, turnId: string, messages: StoredMessage[]) => void >(); let messageReads = 0; + const preparedMaxSteps: Array = []; const driver = { createSession: async () => sessionSummary('session-created'), readMessages: async () => { @@ -649,7 +660,20 @@ function runFixture(input: { messages: [], }; }, - preparePrompt: async (_prompt: string, options: { turnId?: string } = {}) => { + moveSession: async (cwd: string) => { + moves.push(cwd); + return { + previousCwd: input.switchSummaryCwd ?? '/workspace', + cwd, + changed: true, + oldCwdDirty: false, + }; + }, + preparePrompt: async ( + _prompt: string, + options: { turnId?: string; maxSteps?: number } = {}, + ) => { + preparedMaxSteps.push(options.maxSteps); input.onPrepareStarted?.(); await input.prepareGate; const events = input.turnEvents ?? eventsFor(options.turnId ?? 'turn-1', 'Host answer'); @@ -736,8 +760,10 @@ function runFixture(input: { return context; }, switches, + moves, graphStops, exactTurnStops, + preparedMaxSteps, sandboxResponses, publishPendingInteraction(pending: InteractionPendingSnapshot) { for (const listener of pendingInteractionListeners) listener(structuredClone(pending)); diff --git a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts index c62e08e2d4..a2be5e1125 100644 --- a/packages/cli/src/__tests__/runtime-host-session-driver.test.ts +++ b/packages/cli/src/__tests__/runtime-host-session-driver.test.ts @@ -4,7 +4,6 @@ import { describe, test } from 'node:test'; import type { StoredMessage } from '@maka/core'; import type { DirectRequestOperationKey, - RuntimeHostConnection, RuntimeHostSessionSubscription, } from '@maka/runtime-host/client'; import type { @@ -15,8 +14,11 @@ import type { SessionContinuitySnapshot, SubscriptionFrame, } from '@maka/runtime-host/protocol'; -import { createRuntimeHostMakaSessionDriver } from '../runtime-host-session-driver.js'; -import type { MakaAttachedSessionTurn } from '../session-driver.js'; +import { + createRuntimeHostMakaSessionDriver, + type RuntimeHostMakaSessionDriverInput, +} from '../runtime-host-session-driver.js'; +import { SkillInvocationBlockedError, type MakaAttachedSessionTurn } from '../session-driver.js'; import { WAIT_BUDGET_MS } from './tui-terminal-mock.js'; describe('Runtime Host Maka Session driver', () => { @@ -665,6 +667,32 @@ describe('Runtime Host Maka Session driver', () => { assert.equal((await nextEvent(turn.events)).text, 'Recovered'); }); + test('starts explicit Skills through the Host command and preserves its typed feedback', async () => { + const subscription = new FakeSubscription( + continuitySnapshot({ rootTurn: null }), + Promise.resolve([]), + ); + const connection = new FakeConnection([subscription]); + const driver = createRuntimeHostMakaSessionDriver({ + connection: connection.value, + cwd: '/tmp', + llmConnectionSlug: 'openai-main', + model: 'gpt-5', + newId: sequenceIds('turn-skill'), + }); + await driver.switchSession('session-1'); + + const turn = await driver.preparePrompt('/skill:alpha Help'); + assert.deepEqual(turn.skillInvocation?.loaded, [{ id: 'alpha', name: 'Alpha' }]); + assert.equal(connection.requests.at(-1)?.operation, 'turn.start'); + + connection.skillStartBlocked = true; + await assert.rejects( + driver.preparePrompt('/skill:missing', { turnId: 'turn-blocked' }), + SkillInvocationBlockedError, + ); + }); + test('retires a pending question when another client answers it', async () => { const subscription = new FakeSubscription( continuitySnapshot({ interactions: { pending: [pendingQuestion()] } }), @@ -739,24 +767,22 @@ class FakeConnection { readonly sessionQueries: Array> = []; openedSubscriptions = 0; interactionQuery: unknown; - readonly value: RuntimeHostConnection; + skillStartBlocked = false; + readonly value: RuntimeHostMakaSessionDriverInput['connection']; constructor(private readonly subscriptions: FakeSubscription[]) { this.value = { hostEpoch: 'host-1', - connectionId: 'connection-1', - selectedProtocol: 0, - closed: new Promise(() => {}), request: (operation: K, input: OperationInput) => this.request(operation, input), + startTurn: (input) => this.request('turn.start', input), openSessionSubscription: async () => { const subscription = this.subscriptions[this.openedSubscriptions]; this.openedSubscriptions += 1; if (!subscription) throw new Error('No fake subscription available'); return subscription; }, - close: async () => {}, - } as unknown as RuntimeHostConnection; + } satisfies RuntimeHostMakaSessionDriverInput['connection']; } async request( @@ -764,6 +790,11 @@ class FakeConnection { input: OperationInput, ): Promise> { this.requests.push({ operation, input }); + const turnInput = input as { + sessionId?: string; + turnId?: string; + content: { text: string }; + }; const result: unknown = operation === 'session.catalog.query' ? { @@ -797,7 +828,31 @@ class FakeConnection { : operation === 'interaction.query' ? this.interactionQuery : operation === 'turn.start' - ? { kind: 'started' } + ? this.skillStartBlocked + ? { + kind: 'blocked', + skillInvocation: { + loaded: [], + failed: [{ request: 'missing', reason: 'not_found' }], + receipts: [], + }, + } + : { + kind: 'started', + turn: { + sessionId: turnInput.sessionId, + turnId: turnInput.turnId, + runId: 'run-1', + status: 'running', + }, + skillInvocation: turnInput.content.text.includes('/skill:') + ? { + loaded: [{ id: 'alpha', name: 'Alpha' }], + failed: [], + receipts: [], + } + : { loaded: [], failed: [], receipts: [] }, + } : undefined; if (result === undefined) throw new Error(`Unexpected fake operation: ${operation}`); return result as OperationOutput; diff --git a/packages/cli/src/__tests__/session-driver.test.ts b/packages/cli/src/__tests__/session-driver.test.ts deleted file mode 100644 index 0a36afb792..0000000000 --- a/packages/cli/src/__tests__/session-driver.test.ts +++ /dev/null @@ -1,1522 +0,0 @@ -import assert from 'node:assert/strict'; -import { mkdir, mkdtemp, realpath, rm } from 'node:fs/promises'; -import { tmpdir } from 'node:os'; -import { join } from 'node:path'; -import { describe, test } from 'node:test'; -import type { - CreateSessionInput, - ExecutionBoundary, - PermissionMode, - QueueEnqueueOutcome, - SessionEvent, - SessionSummary, - StoredMessage, - UserMessageInput, - UserQuestionResponse, -} from '@maka/core'; -import { createGenesisExecutionBoundary, createReadOnlyPermissionProfile } from '@maka/core'; -import { permissionModeLabel } from '../pi-transcript.js'; -import { permissionModePickerItems } from '../pi-tui-pickers.js'; -import { createMakaSessionDriver } from '../session-driver.js'; -import type { - ContextDiagnostics, - RuntimeContinuation, - SafeBoundaryContinuationPlan, -} from '@maka/runtime'; - -describe('Maka session driver', () => { - test('creates an ask-permission session from the first prompt and streams the turn', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: nextId('turn'), - }); - - const turn = await driver.preparePrompt('please inspect this workspace'); - assert.equal(runtime.sent.length, 0, 'turn ownership must be available before runtime starts'); - const events = await collect(turn.events); - - assert.equal(driver.getSessionId(), 'session-1'); - assert.deepEqual(runtime.created, [ - { - cwd: '/repo', - name: 'New Chat', - backend: 'ai-sdk', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - permissionMode: 'ask', - }, - ]); - assert.deepEqual(runtime.sent, [ - { - sessionId: 'session-1', - input: { turnId: 'turn-1', text: 'please inspect this workspace' }, - }, - ]); - assert.deepEqual( - { sessionId: turn.sessionId, turnId: turn.turnId }, - { - sessionId: 'session-1', - turnId: 'turn-1', - }, - ); - assert.deepEqual( - events.map((event) => event.type), - ['text_delta', 'complete'], - ); - }); - - test('new sessions use the default title while displayText keeps the typed prompt', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: nextId('turn'), - }); - - const typed = '/skill:alpha 帮我整理'; - const composed = 'The user explicitly invoked…\n\n\n帮我整理\n'; - const turn = await driver.preparePrompt(typed, { modelText: composed }); - await collect(turn.events); - - assert.equal(runtime.created[0]?.name, 'New Chat'); - assert.deepEqual(runtime.sent[0]?.input, { - turnId: 'turn-1', - text: composed, - displayText: typed, - }); - }); - - test('can still create a bypass session when explicitly requested', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - permissionMode: 'bypass', - newId: nextId('turn'), - }); - - await collectPrompt(driver, 'ship fast'); - - assert.equal(runtime.created[0]?.permissionMode, 'bypass'); - }); - - test('uses an updated permission mode for a new session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.setPermissionMode('execute'); - await collectPrompt(driver, 'run tests'); - - assert.equal(runtime.created[0]?.permissionMode, 'execute'); - }); - - test('updates permission mode on an active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'run tests'); - await driver.setPermissionMode('execute'); - - assert.deepEqual(runtime.permissionModes, [ - { - sessionId: 'session-1', - mode: 'execute', - }, - ]); - }); - - test('uses an updated orchestration mode for a new session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.setOrchestrationMode?.('swarm'); - await collectPrompt(driver, 'analyze in parallel'); - - assert.equal(driver.getOrchestrationMode?.(), 'swarm'); - assert.equal(runtime.created[0]?.orchestrationMode, 'swarm'); - }); - - test('updates orchestration mode on an active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'start'); - await driver.setOrchestrationMode?.('swarm'); - await driver.setOrchestrationMode?.('default'); - - assert.deepEqual(runtime.orchestrationModes, [ - { sessionId: 'session-1', mode: 'swarm' }, - { sessionId: 'session-1', mode: 'default' }, - ]); - assert.equal(driver.getOrchestrationMode?.(), 'default'); - }); - - test('passes a one-turn swarm override as trusted metadata without changing visible text', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: nextId('turn'), - }); - - await collect( - ( - await driver.preparePrompt('inspect runtime, UI, and tests', { - turnOrchestration: { mode: 'swarm', source: 'slash_command' }, - }) - ).events, - ); - await collectPrompt(driver, 'summarize normally'); - - assert.deepEqual( - runtime.sent.map(({ input }) => input), - [ - { - turnId: 'turn-1', - text: 'inspect runtime, UI, and tests', - turnOrchestration: { mode: 'swarm', source: 'slash_command' }, - }, - { turnId: 'turn-2', text: 'summarize normally' }, - ], - ); - assert.equal(driver.getOrchestrationMode?.(), 'default'); - }); - - test('uses an updated model for a new session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.setModel('claude-opus-4-1'); - await collectPrompt(driver, 'run tests'); - - assert.equal(runtime.created[0]?.model, 'claude-opus-4-1'); - }); - - test('updates model on an active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'run tests'); - await driver.setModel('claude-opus-4-1'); - - assert.deepEqual(runtime.sessionUpdates, [ - { - sessionId: 'session-1', - patch: { model: 'claude-opus-4-1', thinkingLevel: undefined }, - }, - ]); - }); - - test('switches connection and model together on an active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'run tests'); - await driver.setModel('glm-5.2', 'zai'); - - // The connection rides in the same updateSession patch, so the next turn - // rebuilds the backend on the new provider. - assert.deepEqual(runtime.sessionUpdates, [ - { - sessionId: 'session-1', - patch: { model: 'glm-5.2', thinkingLevel: undefined, llmConnectionSlug: 'zai' }, - }, - ]); - }); - - test('a same-connection setModel does not churn the connection', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'run tests'); - await driver.setModel('claude-opus-4-1', 'anthropic'); - - assert.deepEqual(runtime.sessionUpdates, [ - { - sessionId: 'session-1', - patch: { model: 'claude-opus-4-1', thinkingLevel: undefined }, - }, - ]); - }); - - test('creates the next session on a connection chosen before any session exists', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.setModel('glm-5.2', 'zai'); - await collectPrompt(driver, 'run tests'); - - assert.equal(runtime.created[0]?.llmConnectionSlug, 'zai'); - assert.equal(runtime.created[0]?.model, 'glm-5.2'); - }); - - test('renames the active session through runtime updateSession', async () => { - const runtime = new RecordingRuntime(); - runtime.updatedSessionName = 'Canonical title'; - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'run tests'); - const renamed = await driver.renameSession('watcher 根目录事件风暴修复'); - - assert.equal(renamed, 'Canonical title'); - assert.deepEqual(runtime.sessionUpdates, [ - { - sessionId: 'session-1', - patch: { name: 'watcher 根目录事件风暴修复' }, - }, - ]); - }); - - test('rejects rename before a session starts', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await assert.rejects(driver.renameSession('too early'), /before a session starts/); - assert.deepEqual(runtime.sessionUpdates, []); - }); - - test('moves an active session, warns about dirty old cwd, and leaves prompts unchanged', async () => { - const oldCwd = await mkdtemp(join(tmpdir(), 'maka-move-old-')); - const nextCwd = join(oldCwd, 'worktree-next'); - await mkdir(nextCwd); - try { - const runtime = new RecordingRuntime(); - const inspected: string[] = []; - const canonicalNextCwd = await realpath(nextCwd); - const driver = createMakaSessionDriver({ - runtime, - cwd: oldCwd, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - inspectCwdChanges: async (cwd) => { - inspected.push(cwd); - return true; - }, - newId: nextId('turn'), - }); - - await collectPrompt(driver, 'before move'); - const result = await driver.moveSession!(nextCwd); - assert.deepEqual(result, { - previousCwd: oldCwd, - cwd: canonicalNextCwd, - changed: true, - oldCwdDirty: true, - }); - assert.deepEqual(inspected, [oldCwd]); - assert.deepEqual(runtime.sessionUpdates.at(-1), { - sessionId: 'session-1', - patch: { cwd: canonicalNextCwd }, - }); - - await collectPrompt(driver, 'after move'); - assert.equal(runtime.sent.at(-1)?.input.text, 'after move'); - assert.equal(runtime.sent.at(-1)?.input.displayText, undefined); - } finally { - await rm(oldCwd, { recursive: true, force: true }); - } - }); - - test('rejects empty, missing, and non-directory move targets before persistence', async () => { - const oldCwd = await mkdtemp(join(tmpdir(), 'maka-move-validate-')); - const file = join(oldCwd, 'file.txt'); - const { writeFile } = await import('node:fs/promises'); - await writeFile(file, 'file'); - try { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: oldCwd, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'start'); - await assert.rejects(driver.moveSession!(''), /cannot be empty/); - await assert.rejects(driver.moveSession!(join(oldCwd, 'missing')), /does not exist/); - await assert.rejects(driver.moveSession!(file), /not a directory/); - assert.deepEqual(runtime.sessionUpdates, []); - } finally { - await rm(oldCwd, { recursive: true, force: true }); - } - }); - - test('uses the moved cwd for a new session without changing its prompt', async () => { - const oldCwd = await mkdtemp(join(tmpdir(), 'maka-move-new-session-')); - const nextCwd = join(oldCwd, 'next'); - await mkdir(nextCwd); - try { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: oldCwd, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - inspectCwdChanges: async () => false, - }); - await collectPrompt(driver, 'first'); - await driver.moveSession!(nextCwd); - driver.startNewSession(); - await collectPrompt(driver, 'new session'); - assert.equal(runtime.sent.at(-1)?.input.text, 'new session'); - } finally { - await rm(oldCwd, { recursive: true, force: true }); - } - }); - - test('switches to an existing session for the next prompt', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-switch-cwd-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - { - id: 'session-2', - cwd: repo, - name: 'Existing chat', - isFlagged: false, - isArchived: false, - labels: [], - hasUnread: false, - status: 'active', - backend: 'ai-sdk', - llmConnectionSlug: 'anthropic', - connectionLocked: false, - model: 'claude-opus-4-1', - permissionMode: 'execute', - orchestrationMode: 'swarm', - }, - ]; - runtime.sessionMessages.set('session-2', [ - storedUserMessage('user-1', 'turn-1', 'previous question'), - storedAssistantMessage('assistant-1', 'turn-1', 'previous answer'), - ]); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - const summary = await driver.switchSession('session-2'); - await collectPrompt(driver, 'continue'); - - assert.equal(summary.summary.id, 'session-2'); - assert.deepEqual( - summary.messages.map((message) => message.id), - ['user-1', 'assistant-1'], - ); - assert.equal(runtime.created.length, 0); - assert.equal(runtime.sent[0]?.sessionId, 'session-2'); - assert.equal(driver.getOrchestrationMode?.(), 'swarm'); - - driver.startNewSession(); - await collectPrompt(driver, 'new session keeps swarm'); - assert.equal(runtime.created[0]?.orchestrationMode, 'swarm'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('rejects externally isolated sessions outside their owning harness', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-external-session-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [sessionSummary({ id: 'external', cwd: repo })]; - runtime.executionBoundaries.set('external', { kind: 'external', revision: 0 }); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await assert.rejects( - driver.switchSession('external'), - /externally isolated session external/, - ); - assert.equal(driver.getSessionId(), null); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('derives the resumed TUI mode from the authoritative boundary', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-bypass-session-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'bypass', cwd: repo, permissionMode: 'ask' }), - ]; - runtime.executionBoundaries.set('bypass', { kind: 'bypass', revision: 3 }); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - const resumed = await driver.switchSession('bypass'); - - assert.equal(driver.getPermissionMode?.(), 'bypass'); - // The summary is the runtime's, reported as-is: the boundary is what the - // display is derived from, so there is no reason to rewrite the header. - assert.equal(resumed.summary.permissionMode, 'ask'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('presents a resumed read-only session as read-only, and never as the current Auto', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-read-only-session-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'read-only', cwd: repo, permissionMode: 'ask' }), - ]; - runtime.executionBoundaries.set('read-only', { - kind: 'managed', - profile: createReadOnlyPermissionProfile(), - revision: 4, - }); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.switchSession('read-only'); - - assert.equal(driver.getPermissionMode?.(), 'explore'); - assert.equal(permissionModeLabel(driver.getPermissionMode!()), 'Read only'); - // #1611: marking Auto as `current` here made "select the option I am - // already on" silently replace the read-only boundary with a writable - // one. Neither option may claim to be in force. - assert.deepEqual( - permissionModePickerItems(driver.getPermissionMode!()).map((item) => item.description), - ['protected', 'your files and network, unprotected'], - ); - - // Choosing Auto is therefore a real change, and it is applied. - await driver.setPermissionMode('ask'); - assert.deepEqual(runtime.permissionModes, [{ sessionId: 'read-only', mode: 'ask' }]); - assert.equal(driver.getPermissionMode?.(), 'ask'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('a fresh session does not inherit the resumed session read-only boundary', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-read-only-new-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'read-only', cwd: repo, permissionMode: 'ask' }), - ]; - runtime.executionBoundaries.set('read-only', { - kind: 'managed', - profile: createReadOnlyPermissionProfile(), - revision: 1, - }); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.switchSession('read-only'); - driver.startNewSession(); - - assert.equal(driver.getPermissionMode?.(), 'ask'); - await collectPrompt(driver, 'fresh session'); - assert.equal(runtime.created.at(-1)?.permissionMode, 'ask'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('uses a resumed session cwd without injecting a synthetic reminder', async () => { - const oldCwd = await mkdtemp(join(tmpdir(), 'maka-move-persisted-old-')); - const nextCwd = join(oldCwd, 'worktree-next'); - await mkdir(nextCwd); - try { - const runtime = new RecordingRuntime(); - const canonicalNextCwd = await realpath(nextCwd); - runtime.sessionSummaries = [sessionSummary({ id: 'session-2', cwd: canonicalNextCwd })]; - const driver = createMakaSessionDriver({ - runtime, - cwd: oldCwd, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.switchSession('session-2'); - await collectPrompt(driver, 'after restart'); - - assert.equal(runtime.sent.at(-1)?.input.text, 'after restart'); - assert.equal(runtime.sent.at(-1)?.input.displayText, undefined); - assert.deepEqual(runtime.sessionUpdates, []); - } finally { - await rm(oldCwd, { recursive: true, force: true }); - } - }); - - test('rejects a session summary without a cwd and leaves the active session unchanged', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-active-cwd-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [{ ...sessionSummary({ id: 'no-cwd' }), cwd: undefined }]; - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'hi'); - - await assert.rejects(driver.switchSession('no-cwd'), /Session has no working directory/); - - await collectPrompt(driver, 'again'); - assert.equal(runtime.sent[0]?.sessionId, 'session-1'); - assert.equal(runtime.sent[1]?.sessionId, 'session-1'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('rejects switching to a session whose cwd no longer exists', async () => { - const missingCwd = await mkdtemp(join(tmpdir(), 'maka-missing-session-cwd-')); - await rm(missingCwd, { recursive: true, force: true }); - const runtime = new RecordingRuntime(); - const deleted = sessionSummary({ id: 'deleted-worktree', cwd: missingCwd }); - runtime.sessionSummaries = [deleted]; - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - assert.deepEqual(await driver.getSessionResumeAvailability?.(deleted), { - available: false, - reason: 'Working directory no longer exists', - }); - await assert.rejects( - driver.switchSession('deleted-worktree'), - new RegExp(`Session cwd no longer exists: ${escapeRegExp(missingCwd)}`), - ); - assert.equal(driver.getSessionId(), null); - }); - - test('switches across folders and uses the resumed cwd for the next new session', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-active-cwd-')); - const elsewhere = await mkdtemp(join(tmpdir(), 'maka-other-cwd-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [sessionSummary({ id: 'other-folder', cwd: elsewhere })]; - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'hi'); - - const resumed = await driver.switchSession('other-folder'); - driver.startNewSession(); - await collectPrompt(driver, 'new work here'); - - assert.equal(resumed.summary.cwd, elsewhere); - assert.equal(runtime.sent[0]?.sessionId, 'session-1'); - assert.equal(runtime.created[1]?.cwd, elsewhere); - } finally { - await rm(repo, { recursive: true, force: true }); - await rm(elsewhere, { recursive: true, force: true }); - } - }); - - test('adopts the resumed connection and model for the next new session', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-active-cwd-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'other-conn', cwd: repo, llmConnectionSlug: 'other-connection' }), - ]; - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'hi'); - - await driver.switchSession('other-conn'); - driver.startNewSession(); - await collectPrompt(driver, 'new work here'); - - assert.equal(runtime.created[1]?.llmConnectionSlug, 'other-connection'); - assert.equal(runtime.created[1]?.model, 'claude-sonnet-4-5'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('lists current-cwd sessions before other recent sessions', async () => { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'other-newer', cwd: '/other', lastMessageAt: 30 }), - sessionSummary({ id: 'cwd-newer', cwd: '/repo', lastMessageAt: 20 }), - sessionSummary({ id: 'cwd-older', cwd: '/repo', lastMessageAt: 10 }), - ]; - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - const sessions = await driver.listSessions(); - - assert.deepEqual( - sessions.map((session) => session.id), - ['cwd-newer', 'cwd-older', 'other-newer'], - ); - }); - - test('uses the default turn id generator when one is not injected', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await collectPrompt(driver, 'hi'); - - assert.match(runtime.sent[0]?.input.turnId ?? '', /^[0-9a-f-]{36}$/); - }); - - test('compacts the active session through the runtime compact API', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: fixedIds('turn-1', 'turn-compact'), - }); - - await collectPrompt(driver, 'hello'); - const events = await collect(driver.compactSession()); - - assert.deepEqual(runtime.compacted, [ - { sessionId: 'session-1', input: { turnId: 'turn-compact' } }, - ]); - assert.deepEqual( - runtime.sent.map((item) => item.input.text), - ['hello'], - ); - assert.deepEqual( - events.map((event) => event.type), - ['complete'], - ); - }); - - test('plans and streams a safe-boundary resume for the active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: fixedIds('turn-1'), - }); - - await collectPrompt(driver, 'hello'); - const events = await collect(driver.resumeLatest!()); - - assert.deepEqual(runtime.resumePlanSessions, ['session-1']); - assert.equal(runtime.resumedContinuations.length, 1); - assert.deepEqual( - events.map((event) => event.type), - ['text_complete', 'complete'], - ); - }); - - test('routes sandbox boundary responses to the active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: nextId('turn'), - }); - - await collectPrompt(driver, 'run tests'); - await driver.respondToSandboxBoundary({ - requestId: 'boundary-1', - decision: 'allow', - }); - - assert.deepEqual(runtime.sandboxBoundaryResponses, [ - { - sessionId: 'session-1', - response: { - requestId: 'boundary-1', - decision: 'allow', - }, - }, - ]); - }); - - test('routes user-question responses to the active session', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - newId: nextId('turn'), - }); - - await collectPrompt(driver, 'choose'); - await driver.respondToUserQuestion?.({ requestId: 'question-1', answers: ['A', null] }); - - assert.deepEqual(runtime.userQuestionResponses, [ - { - sessionId: 'session-1', - response: { requestId: 'question-1', answers: ['A', null] }, - }, - ]); - }); - - test('lists rewind targets newest-first, one per prompted turn, including the latest', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'first question'); - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', ' first question\nmore detail'), - storedAssistantMessage('assistant-1', 'turn-1', 'first answer'), - storedUserMessage('user-2', 'turn-2', 'second question'), - storedAssistantMessage('assistant-2', 'turn-2', 'second answer'), - storedUserMessage('user-3', 'turn-3', 'third question'), - ]); - - const targets = await driver.listRewindTargets(); - - // Rewinding resets to *before* a turn, so the latest turn (turn-3) is itself a - // valid target (undo it, edit its prompt, resend). All prompted turns appear - // newest-first, label = first non-empty prompt line. - assert.deepEqual(targets, [ - { turnId: 'turn-3', label: 'third question' }, - { turnId: 'turn-2', label: 'second question' }, - { turnId: 'turn-1', label: 'first question' }, - ]); - }); - - test('surfaces the interrupted latest turn as a rewind target', async () => { - // Regression: interrupting a turn leaves its (aborted) turn_state as the last - // message, so the old head-exclusion dropped exactly the turn the user wanted - // to redo. Every prompted turn is now a target regardless of the trailing - // message. - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'first question'); - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'first question'), - storedAssistantMessage('assistant-1', 'turn-1', 'first answer'), - storedUserMessage('user-2', 'turn-2', 'interrupted question'), - storedTurnState('state-2', 'turn-2', 'aborted'), - ]); - - assert.deepEqual(await driver.listRewindTargets(), [ - { turnId: 'turn-2', label: 'interrupted question' }, - { turnId: 'turn-1', label: 'first question' }, - ]); - }); - - test('keeps all prompted turns as targets when the head is a non-prompt turn (e.g. compact)', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'first question'); - // A /compact turn has no user message, so it never becomes a target itself; - // the prompted turns around it stay listed unchanged. - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'first question'), - storedAssistantMessage('assistant-1', 'turn-1', 'first answer'), - storedUserMessage('user-2', 'turn-2', 'second question'), - storedAssistantMessage('assistant-2', 'turn-2', 'second answer'), - storedContextCompactedNote('note-1', 'turn-compact'), - ]); - - const targets = await driver.listRewindTargets(); - - assert.deepEqual(targets, [ - { turnId: 'turn-2', label: 'second question' }, - { turnId: 'turn-1', label: 'first question' }, - ]); - }); - - test('keeps the only prompted turn as a target after a compact', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'only question'); - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'only question'), - storedAssistantMessage('assistant-1', 'turn-1', 'only answer'), - storedContextCompactedNote('note-1', 'turn-compact'), - ]); - - assert.deepEqual(await driver.listRewindTargets(), [ - { turnId: 'turn-1', label: 'only question' }, - ]); - }); - - test('lists no rewind targets before a session starts, but the sole turn once one exists', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - assert.deepEqual(await driver.listRewindTargets(), []); - - await collectPrompt(driver, 'only question'); - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'only question'), - storedAssistantMessage('assistant-1', 'turn-1', 'only answer'), - ]); - // The single turn is now rewindable: reset to before it (an empty branch) and - // refill its prompt. - assert.deepEqual(await driver.listRewindTargets(), [ - { turnId: 'turn-1', label: 'only question' }, - ]); - }); - - test('rewinds by branching before the turn, switching onto the branch, and returning its prompt', async () => { - const repo = await mkdtemp(join(tmpdir(), 'maka-rewind-cwd-')); - try { - const runtime = new RecordingRuntime(); - runtime.sessionSummaries = [ - sessionSummary({ id: 'session-1', cwd: repo, orchestrationMode: 'swarm' }), - ]; - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'first question'), - storedAssistantMessage('assistant-1', 'turn-1', 'first answer'), - storedUserMessage('user-2', 'turn-2', 'second question\nwith detail'), - ]); - const driver = createMakaSessionDriver({ - runtime, - cwd: repo, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await driver.switchSession('session-1'); - - const result = await driver.rewindToTurn('turn-2'); - - // Branches *before* turn-2 (dropping it), and returns turn-2's full prompt - // — the whole text, not the one-line label — for the editor to refill. - assert.deepEqual(runtime.branchedBefore, [ - { sessionId: 'session-1', sourceTurnId: 'turn-2' }, - ]); - assert.deepEqual(runtime.branched, []); - assert.equal(result.summary.id, 'session-1-branch'); - assert.equal(result.prompt, 'second question\nwith detail'); - assert.equal(driver.getSessionId(), 'session-1-branch'); - assert.equal(driver.getOrchestrationMode?.(), 'swarm'); - } finally { - await rm(repo, { recursive: true, force: true }); - } - }); - - test('rejects rewind to a turn with no user prompt', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'first question'); - runtime.sessionMessages.set('session-1', [ - storedUserMessage('user-1', 'turn-1', 'first question'), - storedContextCompactedNote('note-1', 'turn-compact'), - ]); - - await assert.rejects(driver.rewindToTurn('turn-compact'), /no user prompt/); - assert.deepEqual(runtime.branchedBefore, []); - }); - - test('rejects rewind before a session starts', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await assert.rejects(driver.rewindToTurn('turn-1'), /before a session starts/); - assert.deepEqual(runtime.branchedBefore, []); - }); - - test('startNewSession makes the next prompt create a fresh session, keeping settings', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await driver.setModel('claude-opus-4-1'); - await collectPrompt(driver, 'first'); - assert.equal(driver.getSessionId(), 'session-1'); - - driver.startNewSession(); - assert.equal(driver.getSessionId(), null); - - await collectPrompt(driver, 'second'); - // A second createSession call — the prompt started a new session rather than - // reusing the old one — and it kept the current model. - assert.equal(runtime.created.length, 2); - assert.equal(runtime.created[1]?.model, 'claude-opus-4-1'); - assert.equal(runtime.created[1]?.name, 'New Chat'); - }); - - test('steer / queueMessage / takePendingFollowup / retractQueued delegate to the runtime', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - await collectPrompt(driver, 'run tests'); - - runtime.steerOutcome = { kind: 'queued' }; - assert.deepEqual(await driver.steer?.('x'), { kind: 'queued' }); - assert.deepEqual(runtime.steered, [{ sessionId: 'session-1', text: 'x' }]); - - runtime.queueOutcome = { kind: 'queued' }; - assert.deepEqual(await driver.queueMessage?.('y'), { kind: 'queued' }); - assert.deepEqual(runtime.queued, [{ sessionId: 'session-1', text: 'y' }]); - - runtime.followupText = 'a\n\nb'; - assert.equal(await driver.takePendingFollowup?.(), 'a\n\nb'); - assert.deepEqual(runtime.followupDrains, ['session-1']); - - runtime.retractText = 'x\n\ny'; - assert.equal(await driver.retractQueued?.(), 'x\n\ny'); - assert.deepEqual(runtime.retracted, ['session-1']); - }); - - test('steer / queueMessage fall back before any session exists', async () => { - const runtime = new RecordingRuntime(); - const driver = createMakaSessionDriver({ - runtime, - cwd: '/repo', - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - assert.deepEqual(await driver.steer?.('x'), { kind: 'fallback' }); - assert.deepEqual(await driver.queueMessage?.('y'), { kind: 'fallback' }); - assert.equal(await driver.takePendingFollowup?.(), null); - assert.equal(await driver.retractQueued?.(), ''); - assert.deepEqual(runtime.steered, []); - }); - - test('context diagnostics follow the active persisted session across switch and resume', async () => { - const runtime = new RecordingRuntime(); - const cwd = process.cwd(); - runtime.sessionSummaries = [sessionSummary({ id: 'session-2', cwd })]; - runtime.contextDiagnostics.set('session-2', { - status: 'available', - providerId: 'anthropic', - modelId: 'claude-test', - completedAt: 10, - inputTokens: 40, - contextWindow: 200, - segments: [], - }); - const driver = createMakaSessionDriver({ - runtime, - cwd, - llmConnectionSlug: 'anthropic', - model: 'claude-sonnet-4-5', - }); - - await driver.switchSession('session-2'); - const beforeResume = await driver.getContextDiagnostics?.(); - await collect(driver.resumeLatest!()); - const afterResume = await driver.getContextDiagnostics?.(); - - assert.deepEqual(afterResume, beforeResume); - assert.deepEqual(runtime.contextReads, ['session-2', 'session-2']); - }); -}); - -class RecordingRuntime { - readonly created: CreateSessionInput[] = []; - readonly sent: Array<{ sessionId: string; input: UserMessageInput }> = []; - readonly compacted: Array<{ sessionId: string; input: { turnId?: string } }> = []; - readonly resumePlanSessions: string[] = []; - readonly resumedContinuations: RuntimeContinuation[] = []; - readonly sandboxBoundaryResponses: Array<{ - sessionId: string; - response: import('@maka/core/sandbox-boundary').SandboxBoundaryResponse; - }> = []; - readonly userQuestionResponses: Array<{ sessionId: string; response: UserQuestionResponse }> = []; - readonly permissionModes: Array<{ sessionId: string; mode: PermissionMode }> = []; - readonly orchestrationModes: Array<{ - sessionId: string; - mode: import('@maka/core/orchestration').OrchestrationMode; - }> = []; - readonly sessionUpdates: Array<{ - sessionId: string; - patch: { - cwd?: string; - model?: string; - llmConnectionSlug?: string; - thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; - name?: string; - }; - }> = []; - readonly branched: Array<{ sessionId: string; sourceTurnId: string }> = []; - readonly branchedBefore: Array<{ sessionId: string; sourceTurnId: string }> = []; - readonly sessionMessages = new Map(); - readonly executionBoundaries = new Map(); - readonly contextDiagnostics = new Map(); - readonly contextReads: string[] = []; - sessionSummaries: SessionSummary[] = []; - updatedSessionName = 'New Chat'; - - async createSession(input: CreateSessionInput): Promise { - this.created.push(input); - return { - id: 'session-1', - name: input.name ?? 'New Chat', - isFlagged: false, - isArchived: false, - labels: [], - hasUnread: false, - status: input.status ?? 'active', - backend: input.backend, - llmConnectionSlug: input.llmConnectionSlug, - connectionLocked: false, - model: input.model ?? '', - permissionMode: input.permissionMode, - }; - } - - async *sendMessage(sessionId: string, input: UserMessageInput): AsyncIterable { - this.sent.push({ sessionId, input }); - yield { - type: 'text_delta', - id: 'event-1', - turnId: input.turnId, - ts: 1, - messageId: 'message-1', - text: 'ok', - }; - yield { - type: 'complete', - id: 'event-2', - turnId: input.turnId, - ts: 2, - stopReason: 'end_turn', - }; - } - - async *compactSession( - sessionId: string, - input: { turnId?: string } = {}, - ): AsyncIterable { - this.compacted.push({ sessionId, input }); - yield { - type: 'complete', - id: 'event-compact-complete', - turnId: input.turnId ?? 'turn-compact', - ts: 3, - stopReason: 'end_turn', - }; - } - - async planLatestAuthoritativeSafeBoundaryContinuation( - sessionId: string, - ): Promise { - this.resumePlanSessions.push(sessionId); - return { - disposition: 'continue', - rejectionReasons: [], - diagnostics: [], - continuation: { - sessionId, - runId: 'resume-run', - turnId: 'resume-turn', - } as RuntimeContinuation, - }; - } - - async *resumeSafeBoundaryContinuation( - continuation: RuntimeContinuation, - ): AsyncIterable { - this.resumedContinuations.push(continuation); - yield { - type: 'text_complete', - id: 'resume-text', - turnId: continuation.turnId, - ts: 4, - messageId: 'resume-message', - text: 'resumed', - }; - yield { - type: 'complete', - id: 'resume-complete', - turnId: continuation.turnId, - ts: 5, - stopReason: 'end_turn', - }; - } - - async stopSession(_sessionId: string): Promise {} - - readonly steered: Array<{ sessionId: string; text: string }> = []; - readonly queued: Array<{ sessionId: string; text: string }> = []; - readonly followupDrains: string[] = []; - readonly retracted: string[] = []; - steerOutcome: QueueEnqueueOutcome = { kind: 'queued' }; - queueOutcome: QueueEnqueueOutcome = { kind: 'queued' }; - followupText: string | null = null; - retractText = ''; - - steer(sessionId: string, text: string): QueueEnqueueOutcome { - this.steered.push({ sessionId, text }); - return this.steerOutcome; - } - - queueMessage(sessionId: string, text: string): QueueEnqueueOutcome { - this.queued.push({ sessionId, text }); - return this.queueOutcome; - } - - drainFollowup(sessionId: string): string | null { - this.followupDrains.push(sessionId); - return this.followupText; - } - - retractQueue(sessionId: string): string { - this.retracted.push(sessionId); - return this.retractText; - } - - async respondToSandboxBoundary( - sessionId: string, - response: import('@maka/core/sandbox-boundary').SandboxBoundaryResponse, - ): Promise { - this.sandboxBoundaryResponses.push({ sessionId, response }); - } - - async respondToUserQuestion(sessionId: string, response: UserQuestionResponse): Promise { - this.userQuestionResponses.push({ sessionId, response }); - } - - async setPermissionMode(sessionId: string, mode: PermissionMode): Promise { - this.permissionModes.push({ sessionId, mode }); - // The real runtime replaces the session's execution boundary when the mode - // changes; surfaces read that boundary, so the fake must move it too. - this.executionBoundaries.set(sessionId, createGenesisExecutionBoundary(mode)); - return { - id: sessionId, - name: 'New Chat', - isFlagged: false, - isArchived: false, - labels: [], - hasUnread: false, - status: 'active', - backend: 'ai-sdk', - llmConnectionSlug: 'anthropic', - connectionLocked: false, - model: 'claude-sonnet-4-5', - permissionMode: mode, - }; - } - - async setOrchestrationMode( - sessionId: string, - mode: import('@maka/core/orchestration').OrchestrationMode, - ): Promise { - this.orchestrationModes.push({ sessionId, mode }); - return { - ...sessionSummary({ id: sessionId }), - orchestrationMode: mode, - }; - } - - async updateSession( - sessionId: string, - patch: { - cwd?: string; - model?: string; - llmConnectionSlug?: string; - thinkingLevel?: import('@maka/core/model-thinking').ThinkingLevel | undefined; - name?: string; - }, - ): Promise { - this.sessionUpdates.push({ sessionId, patch }); - return { - id: sessionId, - cwd: patch.cwd ?? '/repo', - name: this.updatedSessionName, - isFlagged: false, - isArchived: false, - labels: [], - hasUnread: false, - status: 'active', - backend: 'ai-sdk', - llmConnectionSlug: patch.llmConnectionSlug ?? 'anthropic', - connectionLocked: false, - model: patch.model ?? 'claude-sonnet-4-5', - permissionMode: 'ask', - }; - } - - async listSessions(): Promise { - return this.sessionSummaries; - } - - async getMessages(sessionId: string): Promise { - return this.sessionMessages.get(sessionId) ?? []; - } - - async readExecutionBoundary(sessionId: string): Promise { - return ( - this.executionBoundaries.get(sessionId) ?? { - kind: 'managed', - profile: { - type: 'managed', - fileSystem: { kind: 'restricted', entries: [] }, - network: { kind: 'restricted' }, - }, - revision: 0, - } - ); - } - - async getContextDiagnostics(sessionId: string): Promise { - this.contextReads.push(sessionId); - return ( - this.contextDiagnostics.get(sessionId) ?? { - status: 'unavailable', - reason: 'no_completed_request', - } - ); - } - - async branchFromTurn( - sessionId: string, - input: { sourceTurnId: string; name?: string }, - ): Promise { - this.branched.push({ sessionId, sourceTurnId: input.sourceTurnId }); - return this.recordBranch(sessionId); - } - - async branchBeforeTurn( - sessionId: string, - input: { sourceTurnId: string; name?: string }, - ): Promise { - this.branchedBefore.push({ sessionId, sourceTurnId: input.sourceTurnId }); - return this.recordBranch(sessionId); - } - - private recordBranch(sessionId: string): SessionSummary { - // Model a branch by adding a new summary to the list switchSession reads. - const source = this.sessionSummaries.find((session) => session.id === sessionId); - const branch: SessionSummary = { - ...(source ?? sessionSummary({ id: sessionId })), - id: `${sessionId}-branch`, - }; - this.sessionSummaries = [...this.sessionSummaries, branch]; - this.sessionMessages.set(branch.id, this.sessionMessages.get(sessionId) ?? []); - return branch; - } -} - -function nextId(prefix: string): () => string { - let count = 0; - return () => `${prefix}-${++count}`; -} - -function fixedIds(...ids: string[]): () => string { - let index = 0; - return () => ids[index++] ?? ids[ids.length - 1] ?? 'id'; -} - -function sessionSummary(overrides: Partial): SessionSummary { - return { - id: 'session', - cwd: '/repo', - name: 'Existing chat', - isFlagged: false, - isArchived: false, - labels: [], - hasUnread: false, - status: 'active', - backend: 'ai-sdk', - llmConnectionSlug: 'anthropic', - connectionLocked: false, - model: 'claude-sonnet-4-5', - permissionMode: 'ask', - ...overrides, - }; -} - -function storedUserMessage(id: string, turnId: string, text: string): StoredMessage { - return { - type: 'user', - id, - turnId, - ts: 1, - text, - }; -} - -function storedAssistantMessage(id: string, turnId: string, text: string): StoredMessage { - return { - type: 'assistant', - id, - turnId, - ts: 2, - text, - modelId: 'claude-sonnet-4-5', - }; -} - -function storedContextCompactedNote(id: string, turnId: string): StoredMessage { - return { - type: 'system_note', - id, - turnId, - ts: 3, - kind: 'context_compacted', - }; -} - -function storedTurnState( - id: string, - turnId: string, - status: 'completed' | 'aborted' | 'failed', -): StoredMessage { - return { - type: 'turn_state', - id, - turnId, - ts: 4, - status, - partialOutputRetained: false, - }; -} - -function escapeRegExp(value: string): string { - return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); -} - -async function collect(iterable: AsyncIterable): Promise { - const out: T[] = []; - for await (const item of iterable) out.push(item); - return out; -} - -async function collectPrompt( - driver: ReturnType, - prompt: string, -): Promise { - return collect((await driver.preparePrompt(prompt)).events); -} diff --git a/packages/cli/src/activation-command.ts b/packages/cli/src/activation-command.ts index 3828828e6f..c8e9c1d6df 100644 --- a/packages/cli/src/activation-command.ts +++ b/packages/cli/src/activation-command.ts @@ -5,25 +5,15 @@ import type { SessionEvent } from '@maka/core/events'; import type { PermissionMode } from '@maka/core/permission'; import type { CreateSessionInput, UserMessageInput } from '@maka/core/runtime-inputs'; import type { SessionSummary } from '@maka/core/session'; -import type { - InvocationResult, - RuntimeContinuation, - SafeBoundaryContinuationPlan, -} from '@maka/runtime'; import type { RuntimeEvent } from '@maka/core/runtime-event'; import { redactSecrets } from '@maka/core/redaction'; -import { assertSessionBundleRootLayout, createSessionStore } from '@maka/storage'; -import { resolveStorageRoot } from '@maka/storage/root-authority'; -import { - createMakaCliRuntimeContext, - type CreateMakaCliRuntimeContextInput, - type MakaCliRuntimeContext, -} from './runtime-bootstrap.js'; -import { - invocationHasSandboxBoundaryFailure, - invocationRecoveredSandboxBoundaryFailure, - sessionEventSandboxBoundaryFailureReason, -} from './sandbox-boundary-failure.js'; +import { assertSessionBundleRootLayout } from '@maka/storage'; +import { readRuntimeHostSessions } from '@maka/runtime-host/client'; +import { connectRuntimeHostCli, resolveRuntimeHostCliTarget } from './runtime-host-cli-context.js'; +import { createRuntimeHostRunContext } from './runtime-host-run-command.js'; +import { runtimeHostSessionSummary } from './runtime-host-session-driver.js'; +import type { MakaRunOutcome } from './run-command-core.js'; +import { sessionEventSandboxBoundaryFailureReason } from './sandbox-boundary-failure.js'; const PROTOCOL = 'maka.activation' as const; const SCHEMA_VERSION = 1 as const; @@ -87,10 +77,7 @@ export interface MakaActivationContext { export interface MakaActivationRuntime { createSession(input: CreateSessionInput): Promise; listSessions?(): Promise; - planLatestAuthoritativeSafeBoundaryContinuation?( - sessionId: string, - ): Promise; - resumeSafeBoundaryContinuation?(continuation: RuntimeContinuation): AsyncIterable; + resumeLatest?(sessionId: string): Promise | null>; sendMessage(sessionId: string, input: UserMessageInput): AsyncIterable; respondToSandboxBoundary( sessionId: string, @@ -100,8 +87,8 @@ export interface MakaActivationRuntime { } export interface MakaActivationDeps { - createContext(input: CreateMakaCliRuntimeContextInput): Promise; - listSessions(workspaceRoot: string): Promise; + createContext(input: MakaActivationContextInput): Promise; + listSessions(stateRoot: string, configRoot: string): Promise; workspaceRoot(): string; processCwd(): string; stdinIsTTY(): boolean; @@ -116,6 +103,19 @@ export interface MakaActivationDeps { canonicalDirectory?(path: string): Promise; } +export interface MakaActivationContextInput { + readonly surface: 'activation'; + readonly workspaceRoot: string; + readonly stateRoot: string; + readonly configRoot: string; + readonly cwd: string; + readonly requestedConnectionSlug?: string; + readonly requestedModel?: string; + readonly sessionCwdOverride?: { readonly sessionId: string; readonly cwd: string }; + readonly maxSteps?: number; + readonly runOutcomeObserver?: (outcome: MakaRunOutcome) => void | Promise; +} + interface ActivationStartLine { protocol: typeof PROTOCOL; schemaVersion: typeof SCHEMA_VERSION; @@ -341,7 +341,7 @@ export async function runMakaActivationCli( let sessions: SessionSummary[] = []; let existing: SessionSummary | undefined; try { - sessions = await deps.listSessions(roots.stateRoot); + sessions = await deps.listSessions(roots.stateRoot, roots.configRoot); existing = request.makaSessionId ? sessions.find((session) => session.id === request.makaSessionId) : undefined; @@ -392,9 +392,8 @@ export async function runMakaActivationCli( let context: MakaActivationContext | undefined; let session: SessionSummary | undefined = existing; - let invocation: InvocationResult | undefined; + let invocation: MakaRunOutcome | undefined; let streamBoundaryFailure = false; - const boundaryFailureInvocationIds = new Set(); let timedOut = false; let interrupted = false; let streamFailed = false; @@ -442,18 +441,8 @@ export async function runMakaActivationCli( ? { sessionCwdOverride: { sessionId: existing.id, cwd: roots.workspaceRoot } } : {}), ...(options.maxSteps === undefined ? {} : { maxSteps: options.maxSteps }), - runtimeSource: 'gateway', - safeBoundaryResumeEnabled: true, - runtimeInvocationObserver: (result) => { - if (invocationHasSandboxBoundaryFailure(result)) { - if (invocationRecoveredSandboxBoundaryFailure(result)) { - boundaryFailureInvocationIds.delete(result.invocationId); - } else { - boundaryFailureInvocationIds.add(result.invocationId); - } - } + runOutcomeObserver: (result) => { invocation = result; - for (const event of result.events) writeRuntimeEvent(event); }, }); if (!session) { @@ -501,8 +490,8 @@ export async function runMakaActivationCli( const drain = (async () => { for await (const event of stream) { if (sessionEventSandboxBoundaryFailureReason(event)) streamBoundaryFailure = true; + writeRuntimeEvent(sessionEventToRuntimeEvent(event, session!.id)); if (event.type === 'sandbox_boundary_request') { - writeRuntimeEvent(sessionEventToRuntimeEvent(event, session!.id)); await context!.runtime.respondToSandboxBoundary(session!.id, { requestId: event.requestId, decision: 'deny', @@ -569,9 +558,12 @@ export async function runMakaActivationCli( if (interrupted) return finish('retryable_failure', 'interrupted'); if (timedOut) return finish('retryable_failure', 'timeout'); if (streamFailed) return finish('retryable_failure', 'runtime_error'); + if (invocation?.failure?.class === 'permission_denied') { + return finish('blocked', 'permission_denied', undefined, 'grant_permission'); + } if ( - (streamBoundaryFailure && !invocationRecoveredSandboxBoundaryFailure(invocation)) || - boundaryFailureInvocationIds.size > 0 + (streamBoundaryFailure && invocation?.sandboxBoundary !== 'recovered') || + invocation?.sandboxBoundary === 'unresolved' ) { return finish('blocked', 'permission_required', undefined, 'grant_permission'); } @@ -730,13 +722,9 @@ async function activationStream( input: UserMessageInput, allowSafeBoundaryResume: boolean, ): Promise> { - const planLatest = runtime.planLatestAuthoritativeSafeBoundaryContinuation; - const resume = runtime.resumeSafeBoundaryContinuation; - if (allowSafeBoundaryResume && planLatest && resume) { - const plan = await planLatest.call(runtime, sessionId); - if (plan.disposition === 'continue' && plan.continuation) { - return resume.call(runtime, plan.continuation); - } + if (allowSafeBoundaryResume && runtime.resumeLatest) { + const resumed = await runtime.resumeLatest(sessionId); + if (resumed) return resumed; } return runtime.sendMessage(sessionId, input); } @@ -795,8 +783,8 @@ function makaActivateHelpText(): string { function defaultMakaActivationDeps(): MakaActivationDeps { return { - createContext: createMakaCliRuntimeContext, - listSessions: (workspaceRoot) => createMakaCliRuntimeContextListSessions(workspaceRoot), + createContext: createRuntimeHostActivationContext, + listSessions: listRuntimeHostActivationSessions, workspaceRoot: () => resolve(process.cwd()), processCwd: () => process.cwd(), stdinIsTTY: () => process.stdin.isTTY === true, @@ -818,11 +806,69 @@ function defaultMakaActivationDeps(): MakaActivationDeps { }; } -async function createMakaCliRuntimeContextListSessions( - workspaceRoot: string, +async function createRuntimeHostActivationContext( + input: MakaActivationContextInput, +): Promise { + const connected = await connectRuntimeHostCli({ + rootPath: input.stateRoot, + surface: 'activation', + legacyConfigurationRoot: input.configRoot, + }); + try { + const target = resolveRuntimeHostCliTarget(connected.catalog, { + ...(input.requestedConnectionSlug ? { connectionSlug: input.requestedConnectionSlug } : {}), + ...(input.requestedModel ? { model: input.requestedModel } : {}), + }); + const runContext = createRuntimeHostRunContext(connected.connection, connected.catalog, { + surface: 'activation', + workspaceRoot: input.stateRoot, + cwd: input.cwd, + requestedConnectionSlug: target.connection.slug, + requestedModel: target.model, + ...(input.sessionCwdOverride ? { sessionCwdOverride: { ...input.sessionCwdOverride } } : {}), + ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}), + ...(input.runOutcomeObserver ? { runOutcomeObserver: input.runOutcomeObserver } : {}), + }); + return { + runtime: runContext.runtime, + target: { + connection: { + slug: target.connection.slug, + name: target.connection.name, + providerType: target.connection.providerType, + enabled: target.connection.enabled, + defaultModel: target.model, + }, + model: target.model, + }, + cwd: input.cwd, + close: async () => { + await runContext.close(); + await connected.close(); + }, + }; + } catch (error) { + await connected.close().catch(() => undefined); + throw error; + } +} + +async function listRuntimeHostActivationSessions( + stateRoot: string, + configRoot: string, ): Promise { - await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' }); - return createSessionStore(workspaceRoot).list(); + const connected = await connectRuntimeHostCli({ + rootPath: stateRoot, + surface: 'activation', + legacyConfigurationRoot: configRoot, + }); + try { + return (await readRuntimeHostSessions(connected.connection)).flatMap((session) => + 'kind' in session ? [] : [runtimeHostSessionSummary(session)], + ); + } finally { + await connected.close(); + } } async function readProcessStdin(): Promise { diff --git a/packages/cli/src/cli-goal-continuation.ts b/packages/cli/src/cli-goal-continuation.ts deleted file mode 100644 index 36809ac0e0..0000000000 --- a/packages/cli/src/cli-goal-continuation.ts +++ /dev/null @@ -1,125 +0,0 @@ -import type { SessionEvent } from '@maka/core'; -import { - GoalContinuationCoordinator, - SessionActivityRegistry, - drainGoalTurn, - type GoalContinuationDeps, - type GoalControlStanding, - type GoalState, - type GoalObservedTurnStart, - type GoalObservedTurnSettler, - type GoalTurnAdmission, - type GoalTurnOutcome, -} from '@maka/runtime'; - -export interface CliGoalTurnHost { - admitTurn: (sessionId: string, text: string) => GoalTurnAdmission; -} - -/** Owns the CLI's single coordinator and the activity boundary shared with Automation. */ -export class CliGoalContinuation { - readonly activities = new SessionActivityRegistry(); - private readonly coordinator: GoalContinuationCoordinator; - private host: CliGoalTurnHost | undefined; - private disposed = false; - - constructor(deps: Omit) { - this.coordinator = new GoalContinuationCoordinator({ - ...deps, - admitTurn: (sessionId, text) => { - const whenIdle = this.activities.whenIdle(sessionId); - if (whenIdle) return { kind: 'busy', whenIdle }; - return ( - this.host?.admitTurn(sessionId, text) ?? { - kind: 'unavailable', - reason: 'TUI Goal host is not available.', - } - ); - }, - }); - } - - bindHost(host: CliGoalTurnHost): () => void { - if (this.disposed) throw new Error('CLI Goal continuation is disposed.'); - if (this.host) throw new Error('CLI Goal continuation already has a bound host.'); - this.host = host; - return () => { - if (this.host === host) this.host = undefined; - }; - } - - beginObservedTurn(sessionId: string, turnId: string): GoalObservedTurnStart { - return this.coordinator.beginObservedTurn(sessionId, turnId); - } - - activateGoal( - sessionId: string, - turnId: string, - activate: () => GoalState, - ): GoalState | undefined { - return this.coordinator.activateGoal(sessionId, turnId, activate); - } - - mutateGoal(sessionId: string, turnId: string, mutate: () => GoalState): GoalState | undefined { - return this.coordinator.mutateGoal(sessionId, turnId, mutate); - } - - activationStanding(sessionId: string, turnId: string): GoalControlStanding { - return this.coordinator.activationStanding(sessionId, turnId); - } - - mutationStanding(sessionId: string, turnId: string): GoalControlStanding { - return this.coordinator.mutationStanding(sessionId, turnId); - } - - async runAutomationTurn(input: { - sessionId: string; - turnId: string; - start: () => AsyncIterable; - }): Promise { - const activity = await this.activities.acquire(input.sessionId); - if (this.disposed) { - activity.release(); - return { - kind: 'errored', - turnId: input.turnId, - reason: 'CLI Goal continuation is disposed.', - }; - } - const registration = this.beginObservedTurn(input.sessionId, input.turnId); - if (registration.kind !== 'registered') { - activity.release(); - return { kind: 'errored', turnId: input.turnId, reason: registration.reason }; - } - const settleExternalTurn: GoalObservedTurnSettler = registration.settle; - let events: AsyncIterable; - try { - events = input.start(); - } catch (error) { - activity.release(); - const reason = error instanceof Error ? error.message : String(error); - const outcome: GoalTurnOutcome = { - kind: 'errored', - turnId: input.turnId, - reason, - }; - void settleExternalTurn(outcome); - return outcome; - } - return drainGoalTurn({ - events, - turnId: input.turnId, - activity, - onSettled: (outcome) => { - void settleExternalTurn(outcome); - }, - }); - } - - dispose(): void { - if (this.disposed) return; - this.disposed = true; - this.host = undefined; - this.coordinator.dispose(); - } -} diff --git a/packages/cli/src/cli-runtime-owner.ts b/packages/cli/src/cli-runtime-owner.ts deleted file mode 100644 index f528e70189..0000000000 --- a/packages/cli/src/cli-runtime-owner.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const CLI_RUNTIME_OWNER_ENV = 'MAKA_CLI_RUNTIME_OWNER'; - -export type CliRuntimeOwner = 'embedded' | 'runtime-host'; - -export function resolveCliRuntimeOwner(value: string | undefined): CliRuntimeOwner { - if (value === undefined || value === '' || value === 'embedded') return 'embedded'; - if (value === 'runtime-host') return value; - throw new Error(`${CLI_RUNTIME_OWNER_ENV} must be "embedded" or "runtime-host"`); -} diff --git a/packages/cli/src/cli-system-prompt.ts b/packages/cli/src/cli-system-prompt.ts deleted file mode 100644 index c5989bb5a2..0000000000 --- a/packages/cli/src/cli-system-prompt.ts +++ /dev/null @@ -1,143 +0,0 @@ -import { redactSecrets, type PersonalizationSettings } from '@maka/core'; -import { - assembleMainSessionSystemPrompt, - buildPersonalizationPromptFragment, - buildSessionEnvironmentPromptFragment, - buildSkillsPromptFragmentWithReport, - buildWorkspaceInstructionsPromptFragment, - resolveProjectGitInfo, - resolveSkillDiscoveryPaths, - type AutomationManager, - type GoalManager, - type HostCapabilities, - type SkillSource, - type SkillSelectionReport, -} from '@maka/runtime'; - -/** - * CLI/TUI system-prompt assembly. - * - * The durable system prompt is built from the personalization fragment and the - * gated workspace-instructions fragment (AGENTS.md / CLAUDE.md / GEMINI.md from - * ~/.maka and the session cwd). The per-turn tail carries the session - * environment (cwd / git / platform / date), which must stay volatile to avoid - * churning the system prefix hash. - * - * The fragment builders themselves live in @maka/runtime and are shared with the - * desktop app. This module owns only the CLI's choice of which fragments to - * assemble; settings are read by the caller (runtime-bootstrap) and injected - * here so @maka/runtime does not need to depend on @maka/storage. - */ - -export interface BuildCliSystemPromptInput { - settings: { - personalization?: Partial; - workspaceInstructions: { enabled: boolean }; - }; - cwd: string; - /** - * Workspace root holding the shared `skills/` directory (distinct from the - * session `cwd` so the project directory is never scanned for skills). The - * skill catalog fragment is built from `{workspaceRoot}/skills/`. - */ - workspaceRoot: string; - /** - * Host capability surface for the skill-compatibility gate. When omitted, - * the catalog is built without gating (legacy behavior). The CLI host - * passes its registered tool names so skills whose `requiredTools` are not - * available (for example, a skill requiring a desktop-only tool) are hidden. - */ - host?: HostCapabilities; - /** Selected model context window used to bound the always-on skill catalog. */ - modelContextWindow?: number; - /** - * Home directory for user-level skill discovery (`~/.maka/skills/`, - * `~/.agents/skills/`). Defaults to `os.homedir()`. Tests pass a temp dir - * to avoid picking up real installed skills. - */ - homeDir?: string; - onSkillSelection?: (report: SkillSelectionReport) => void; -} - -export async function buildCliSystemPrompt( - input: BuildCliSystemPromptInput, -): Promise { - const personalization = buildPersonalizationPromptFragment(input.settings.personalization); - // personalization -> skills -> workspaceInstructions, matching the desktop app. - const skillSource = resolveSkillDiscoveryPaths(input.cwd, input.workspaceRoot, input.homeDir); - const skillPrompt = await buildSkillsPromptFragmentWithReport(skillSource, input.host, { - contextWindow: input.modelContextWindow, - }); - input.onSkillSelection?.(skillPrompt.report); - const skills = skillPrompt.text; - const workspaceInstructions = input.settings.workspaceInstructions.enabled - ? await buildWorkspaceInstructionsPromptFragment(input.cwd, { homeDir: input.homeDir }) - : undefined; - return assembleMainSessionSystemPrompt([personalization.text, skills, workspaceInstructions]); -} - -export async function buildCliTurnTailPrompt(input: { - cwd: string; - sessionId?: string; - automationManager?: AutomationManager; - goalManager?: GoalManager; -}): Promise { - const projectGit = await resolveProjectGitInfo(input.cwd); - const fragments = [buildSessionEnvironmentPromptFragment({ cwd: input.cwd, projectGit })]; - - if (input.sessionId && input.automationManager) { - const automationFragment = buildAutomationTailFragment( - input.sessionId, - input.automationManager, - ); - if (automationFragment) fragments.push(automationFragment); - } - if (input.sessionId && input.goalManager) { - const goalFragment = buildGoalTailFragment(input.sessionId, input.goalManager); - if (goalFragment) fragments.push(goalFragment); - } - - return fragments.join('\n\n'); -} - -function buildGoalTailFragment(sessionId: string, manager: GoalManager): string | undefined { - const goal = manager.get(sessionId); - if (!goal || (goal.status !== 'active' && goal.status !== 'waiting' && goal.status !== 'paused')) - return undefined; - const spent = Math.max(0, goal.tokensNow - goal.tokensAtStart); - const lines = [ - 'Active goal (autonomous execution; system evaluates progress each turn):', - '', - `condition="${redactSecrets(goal.condition)}"`, - `status=${goal.status} turns=${goal.iterations}/${goal.maxIterations} no_progress=${goal.consecutiveNoProgress}/${goal.blockCap}` + - `${goal.tokenBudget ? ` tokens=${spent}/${goal.tokenBudget}` : ''}`, - ...(goal.lastReason ? [`last_reason="${redactSecrets(goal.lastReason)}"`] : []), - '', - ]; - return lines.join('\n'); -} - -function buildAutomationTailFragment( - sessionId: string, - manager: AutomationManager, -): string | undefined { - const automations = manager - .listForSession(sessionId) - .filter((a) => a.status === 'active' || a.status === 'paused'); - if (automations.length === 0) return undefined; - const lines = [ - 'Active automations (use Automation tool with mode "list" for full details):', - '', - ...automations.map((a) => { - const schedule = - a.schedule.type === 'cron' - ? `cron "${a.schedule.expression}"` - : a.schedule.type === 'interval' - ? `every ${a.schedule.seconds}s` - : `once`; - return ` ${a.status} id="${a.id}" name="${a.name}" kind=${a.kind} schedule=${schedule} fires=${a.fireCount}`; - }), - '', - ]; - return lines.join('\n'); -} diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index 1b19057f14..4ca5a3dd5a 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -4,7 +4,6 @@ import { readFile } from 'node:fs/promises'; import { realpathSync } from 'node:fs'; import { fileURLToPath } from 'node:url'; import { resolveMakaWorkspaceRoot } from './workspace-root.js'; -import { resolveCliRuntimeOwner } from './cli-runtime-owner.js'; export type MakaCliCommand = | { kind: 'tui'; resumeSessionId?: string } @@ -107,13 +106,8 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis const command = parseMakaCliArgs(argv, version); switch (command.kind) { case 'run': { - const runtimeOwner = resolveCliRuntimeOwner(process.env.MAKA_CLI_RUNTIME_OWNER); - if (runtimeOwner === 'runtime-host') { - const { runRuntimeHostTextCli } = await import('./runtime-host-run-command.js'); - return runRuntimeHostTextCli(command.args); - } - const { runMakaTextCli } = await import('./run-command.js'); - return runMakaTextCli(command.args); + const { runRuntimeHostTextCli } = await import('./runtime-host-run-command.js'); + return runRuntimeHostTextCli(command.args); } case 'activate': { const { runMakaActivationCli } = await import('./activation-command.js'); @@ -138,18 +132,8 @@ export async function runMakaCli(argv: string[] = process.argv.slice(2)): Promis return command.exitCode; case 'tui': { const workspaceRoot = resolveMakaWorkspaceRoot(); - const runtimeOwner = resolveCliRuntimeOwner(process.env.MAKA_CLI_RUNTIME_OWNER); - if (runtimeOwner === 'runtime-host') { - const { runRuntimeHostTui } = await import('./runtime-host-tui-command.js'); - return runRuntimeHostTui({ - workspaceRoot, - cwd: process.cwd(), - onProcessExit: handleMakaCliProcessExit, - ...(command.resumeSessionId ? { resumeSessionId: command.resumeSessionId } : {}), - }); - } - const { runEmbeddedTui } = await import('./embedded-tui-command.js'); - return runEmbeddedTui({ + const { runRuntimeHostTui } = await import('./runtime-host-tui-command.js'); + return runRuntimeHostTui({ workspaceRoot, cwd: process.cwd(), onProcessExit: handleMakaCliProcessExit, diff --git a/packages/cli/src/connection-target.ts b/packages/cli/src/connection-target.ts deleted file mode 100644 index b23c9ec1b1..0000000000 --- a/packages/cli/src/connection-target.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { isConnectionReady, type ChatConfigurationReason } from '@maka/core/connection-readiness'; -import type { LlmConnection, ProviderType } from '@maka/core/llm-connections'; -import { connectionEnabledModelIds, PROVIDER_DEFAULTS } from '@maka/core/llm-connections'; -import { thinkingVariantsForConnection } from '@maka/core/model-thinking'; -import { - isOAuthSubscriptionProvider, - resolveOAuthSubscriptionTokens, - resolveSelectedModelContextWindow, - type OAuthSubscriptionTokens, -} from '@maka/runtime'; -import type { ConnectionStore, CredentialKind, CredentialStore } from '@maka/storage'; -import type { ModelChoice } from './pi-tui-contracts.js'; - -export interface ReadySessionTarget { - connection: LlmConnection; - apiKey: string; - model: string; - oauthTokens?: OAuthSubscriptionTokens; -} - -export function selectableModelIdsForTarget( - target: Pick, -): string[] { - // The picker mirrors the desktop's curated visibility: only the connection's - // enabled models are offered (legacy connections collapse to their default - // model, never the full discovered catalog). The session's current model - // stays selectable even when the user curated it out. - const candidates = [target.model, ...connectionEnabledModelIds(target.connection)]; - const ids: string[] = []; - const seen = new Set(); - for (const candidate of candidates) { - const id = candidate.trim(); - if (!id || seen.has(id)) continue; - seen.add(id); - ids.push(id); - } - return ids; -} - -export interface ResolveDefaultSessionTargetInput { - connectionStore: Pick; - credentialStore: Pick & Partial>; - requestedModel?: string; - now?: () => number; - fetchFn?: typeof fetch; -} - -export async function resolveDefaultSessionTarget( - input: ResolveDefaultSessionTargetInput, -): Promise { - return resolveSessionTargetForSlug(await input.connectionStore.getDefault(), input); -} - -/** - * Resolve a ready target for a specific connection slug — the per-session path - * the backend uses so the active session's connection (not the global default) - * decides which provider a turn runs on, mirroring the desktop app. - */ -export async function resolveSessionTargetForSlug( - slug: string | null | undefined, - input: ResolveDefaultSessionTargetInput, -): Promise { - if (!slug || slug === 'fake') throw noRealConnection('missing_default_connection'); - - const connection = await input.connectionStore.get(slug); - if (!connection) throw noRealConnection('connection_missing'); - - return resolveReadyTargetForConnection(connection, input); -} - -async function resolveReadyTargetForConnection( - connection: LlmConnection, - input: ResolveDefaultSessionTargetInput, -): Promise { - const oauthProviderType = isOAuthSubscriptionProvider(connection.providerType) - ? connection.providerType - : null; - const oauthTokens = oauthProviderType - ? await resolveOAuthSubscriptionTokens({ - providerType: oauthProviderType, - slug: connection.slug, - credentialStore: input.credentialStore, - now: input.now, - fetchFn: input.fetchFn, - }) - : undefined; - const credentialKind = credentialKindForConnection(connection); - const secret = - !oauthProviderType && credentialKind - ? await input.credentialStore.getSecret(connection.slug, credentialKind) - : ''; - const apiKey = oauthProviderType ? oauthTokens?.access_token : secret; - const verdict = isConnectionReady({ - connection, - hasSecret: typeof apiKey === 'string' && apiKey.length > 0, - requestedModel: input.requestedModel, - }); - if (!verdict.ready) throw noRealConnection(verdict.reason); - return { - connection: oauthTokens?.base_url - ? { ...connection, baseUrl: oauthTokens.base_url } - : connection, - apiKey: apiKey ?? '', - model: verdict.model, - ...(oauthTokens ? { oauthTokens } : {}), - }; -} - -/** - * Every selectable model across all ready connections, for the `/model` picker. - * Readiness here is cheap and side-effect free — a stored secret, no OAuth token - * refresh or network — since the backend does the real resolution at turn time; - * this only decides which connections' models are worth offering. - */ -export async function listReadyModelChoices(input: { - connectionStore: Pick; - credentialStore: Pick; -}): Promise { - const [connections, defaultSlug] = await Promise.all([ - input.connectionStore.list(), - input.connectionStore.getDefault(), - ]); - const choices: ModelChoice[] = []; - for (const connection of connections) { - if (connection.slug === 'fake') continue; - // Isolate each connection: reading one connection's secret can throw (a - // legacy or corrupt credentials.json), and this list is an optional - // convenience for the /model picker — it must never take down startup. A - // failing or not-ready connection is simply skipped, so a usable default - // (e.g. a keyless local model) still launches. - try { - const credentialKind = credentialKindForConnection(connection); - const secret = credentialKind - ? await input.credentialStore.getSecret(connection.slug, credentialKind) - : ''; - const hasSecret = - credentialKind === null || (typeof secret === 'string' && secret.length > 0); - const verdict = isConnectionReady({ connection, hasSecret }); - if (!verdict.ready) continue; - for (const model of selectableModelIdsForTarget({ connection, model: verdict.model })) { - choices.push({ - connectionSlug: connection.slug, - connectionName: connection.name, - providerType: connection.providerType, - model, - isDefaultConnection: connection.slug === defaultSlug, - contextWindow: resolveSelectedModelContextWindow(connection, model), - thinkingLevels: thinkingVariantsForConnection(connection, model), - }); - } - } catch { - // Unreadable credentials for this connection: skip it, keep the rest. - } - } - return choices; -} - -function credentialKindForConnection(connection: LlmConnection): CredentialKind | null { - const authKind = PROVIDER_DEFAULTS[connection.providerType]?.authKind; - switch (authKind) { - case 'api_key': - return 'api_key'; - case 'oauth_token': - return 'oauth_token'; - case 'none': - return null; - default: - return 'api_key'; - } -} - -function noRealConnection(reason: ChatConfigurationReason): Error { - return new Error(`NO_REAL_CONNECTION:${reason}`); -} diff --git a/packages/cli/src/embedded-tui-command.ts b/packages/cli/src/embedded-tui-command.ts deleted file mode 100644 index 4f7d869db3..0000000000 --- a/packages/cli/src/embedded-tui-command.ts +++ /dev/null @@ -1,194 +0,0 @@ -import { describeChatConfigurationReason, parseNoRealConnectionError } from '@maka/core'; -import { - fetchProviderModels, - resolveSelectedModelContextWindow, - SessionActivityRegistry, -} from '@maka/runtime'; -import { - createConnectionStore, - createFileCredentialStore, - createSessionStore, -} from '@maka/storage'; -import { selectableModelIdsForTarget } from './connection-target.js'; -import { createApiKeyOnboardingSurface } from './onboarding.js'; -import type { MakaPiTuiGoalLifecycle } from './pi-tui-contracts.js'; -import { runMakaPiTui } from './pi-tui-runner.js'; -import { createMakaCliRuntimeContext } from './runtime-bootstrap.js'; -import { createMakaSessionDriver, type MakaSessionDriver } from './session-driver.js'; - -export interface RunEmbeddedTuiInput { - readonly workspaceRoot: string; - readonly cwd: string; - readonly resumeSessionId?: string; - readonly onProcessExit: (exitCode: number, error?: Error) => void; -} - -/** The connection/model a resumed session's stored header requests. */ -export interface TuiResumeTarget { - requestedConnectionSlug: string; - requestedModel: string; -} - -export async function resolveTuiResumeTarget( - workspaceRoot: string, - sessionId: string, -): Promise { - const store = createSessionStore(workspaceRoot); - try { - const header = await store.readHeader(sessionId); - return { - requestedConnectionSlug: header.llmConnectionSlug, - requestedModel: header.model, - }; - } catch { - return undefined; - } -} - -export async function runEmbeddedTui(input: RunEmbeddedTuiInput): Promise { - let sessionTitleListener: ((sessionId: string) => void) | undefined; - const resumeTarget = input.resumeSessionId - ? await resolveTuiResumeTarget(input.workspaceRoot, input.resumeSessionId) - : undefined; - const contextInput = { - surface: 'tui' as const, - workspaceRoot: input.workspaceRoot, - cwd: input.cwd, - onSessionTitleChanged: (sessionId: string) => sessionTitleListener?.(sessionId), - ...(resumeTarget - ? { - requestedConnectionSlug: resumeTarget.requestedConnectionSlug, - requestedModel: resumeTarget.requestedModel, - } - : {}), - }; - let context; - try { - context = await createMakaCliRuntimeContext(contextInput); - } catch (error) { - const { matched, reason } = parseNoRealConnectionError(error); - const isFirstRun = matched && reason === 'missing_default_connection'; - if (!isFirstRun) return reportStartupError(error, input.workspaceRoot); - const configured = await runFirstRunOnboarding(input.workspaceRoot, input.cwd); - if (!configured) return reportStartupError(error, input.workspaceRoot); - try { - context = await createMakaCliRuntimeContext(contextInput); - } catch (retryError) { - return reportStartupError(retryError, input.workspaceRoot); - } - } - - try { - const driver = createMakaSessionDriver({ - runtime: context.runtime, - cwd: context.cwd, - llmConnectionSlug: context.target.connection.slug, - model: context.target.model, - permissionMode: 'ask', - }); - await runMakaPiTui({ - driver, - title: 'Maka', - cwd: context.cwd, - model: context.target.model, - models: selectableModelIdsForTarget(context.target), - modelChoices: context.modelChoices, - connectionSlug: context.target.connection.slug, - providerType: context.target.connection.providerType, - modelContextWindow: resolveSelectedModelContextWindow( - context.target.connection, - context.target.model, - ), - permissionMode: 'ask', - subscribeShellRunUpdates: context.subscribeShellRunUpdates, - subscribeSessionTitleChanges: (listener) => { - sessionTitleListener = listener; - return () => { - if (sessionTitleListener === listener) sessionTitleListener = undefined; - }; - }, - listShellRunUpdates: context.listShellRunUpdates, - skills: context.skills, - goalLifecycle: context.goalContinuation, - onboarding: context.onboarding, - recap: context.recap, - foreignSessions: context.foreignSessions, - onProcessExit: input.onProcessExit, - resumeSessionId: input.resumeSessionId, - }); - const sessionId = driver.getSessionId(); - if (sessionId) - process.stdout.write(`Resume this session with:\n maka --resume ${sessionId}\n`); - return 0; - } finally { - await context.close(); - } -} - -export function formatStartupConnectionError(error: unknown, workspaceRoot: string): string | null { - const { matched, reason } = parseNoRealConnectionError(error); - if (!matched) return null; - return [ - '无法启动 Maka：还没有可用的模型连接。', - '', - describeChatConfigurationReason(reason), - '', - 'Maka CLI 复用 Maka 桌面应用的配置。请打开 Maka 桌面应用，在 设置 · 模型', - '添加并启用一个模型连接（含 API key），然后重新运行 maka。', - `连接与凭据存储于：${workspaceRoot}`, - ].join('\n'); -} - -function reportStartupError(error: unknown, workspaceRoot: string): number { - const guidance = formatStartupConnectionError(error, workspaceRoot); - if (guidance === null) throw error; - process.stderr.write(`${guidance}\n`); - return 1; -} - -async function runFirstRunOnboarding(workspaceRoot: string, cwd: string): Promise { - const connectionStore = createConnectionStore(workspaceRoot); - const credentialStore = createFileCredentialStore(workspaceRoot); - await runMakaPiTui({ - driver: createFirstRunSessionDriver(), - title: 'Maka', - cwd, - model: '', - connectionSlug: '', - permissionMode: 'ask', - firstRun: true, - goalLifecycle: { - activities: new SessionActivityRegistry(), - beginObservedTurn: () => ({ kind: 'registered', settle: async () => {} }), - bindHost: () => () => {}, - } satisfies MakaPiTuiGoalLifecycle, - onboarding: createApiKeyOnboardingSurface({ - connectionStore, - credentialStore, - fetchModels: fetchProviderModels, - }), - }); - return (await connectionStore.getDefault()) !== null; -} - -function createFirstRunSessionDriver(): MakaSessionDriver { - const notReady = async (): Promise => { - throw new Error('first-run onboarding: no agent turn before a connection exists'); - }; - return { - getSessionId: () => null, - listSessions: async () => [], - preparePrompt: notReady, - compactSession: async function* () {}, - respondToSandboxBoundary: async () => {}, - setModel: async () => {}, - setThinkingLevel: async () => {}, - setPermissionMode: async () => {}, - renameSession: async () => {}, - switchSession: notReady, - listRewindTargets: async () => [], - rewindToTurn: notReady, - startNewSession: () => {}, - stop: async () => {}, - }; -} diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index ffcf04740e..c4ba18956e 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,8 +1,5 @@ export { - createMakaSessionDriver, type MakaSessionDriver, - type MakaSessionDriverInput, - type MakaSessionRuntime, type SessionResumeAvailability, } from './session-driver.js'; export { @@ -11,11 +8,14 @@ export { } from './cli.js'; export { parseMakaRunArgs, - runMakaTextCli, type MakaRunDeps, type MakaRunOptions, type ParseMakaRunArgsResult, -} from './run-command.js'; +} from './run-command-core.js'; +export { + runRuntimeHostTextCli, + runRuntimeHostTextCli as runMakaTextCli, +} from './runtime-host-run-command.js'; export { decodeActivationRequest, parseMakaActivateArgs, @@ -36,16 +36,6 @@ export { type MakaRunSessionSelectionDeps, type MakaRunSessionSelectionInput, } from './run-session-selection.js'; -export { - createMakaCliRuntimeContext, - type CreateMakaCliRuntimeContextInput, - type MakaCliRuntimeContext, -} from './runtime-bootstrap.js'; -export { - resolveDefaultSessionTarget, - type ReadySessionTarget, - type ResolveDefaultSessionTargetInput, -} from './connection-target.js'; export { resolveMakaWorkspaceRoot, type ResolveMakaWorkspaceRootInput, diff --git a/packages/cli/src/onboarding.ts b/packages/cli/src/onboarding.ts deleted file mode 100644 index 64346ddb82..0000000000 --- a/packages/cli/src/onboarding.ts +++ /dev/null @@ -1,287 +0,0 @@ -import { - PROVIDER_DEFAULTS, - connectionEnabledModelIds, - deriveConnectionSlug, - providerAuthSupportsApiKey, - type ConnectionLastTestStatus, - type LlmConnection, - type ModelDiscoverySource, - type ModelInfo, - type ProviderType, -} from '@maka/core/llm-connections'; -import type { ConnectionStore, CredentialStore } from '@maka/storage'; -import { listReadyModelChoices } from './connection-target.js'; -import { listApiKeyOnboardableProviders } from './onboarding-catalog.js'; -import type { - MakaOnboardingSurface, - ModelChoice, - OnboardingProviderEntry, - OnboardingSaveInput, - OnboardingSaveResult, - OnboardingVerifyInput, - OnboardingVerifyResult, -} from './pi-tui-contracts.js'; - -/** Build the onboarding surface the TUI wizard calls, owning the connection and - * credential stores plus the model probe so the first-run host (cli.ts) and - * the in-session host (runtime-bootstrap) share one write path. */ -export function createApiKeyOnboardingSurface(deps: { - connectionStore: Pick< - ConnectionStore, - 'list' | 'get' | 'create' | 'update' | 'remove' | 'getDefault' | 'setDefault' - >; - credentialStore: Pick; - fetchModels: (connection: LlmConnection, apiKey: string) => Promise; -}): MakaOnboardingSurface { - return { - listProviders: () => listOnboardingProviders({ connectionStore: deps.connectionStore }), - verify: (input) => - verifyApiKeyConnection({ - providerType: input.providerType, - apiKey: input.apiKey, - connectionStore: deps.connectionStore, - credentialStore: deps.credentialStore, - fetchModels: deps.fetchModels, - }), - save: (input) => - saveApiKeyConnection({ - providerType: input.providerType, - apiKey: input.apiKey, - enabledModelIds: input.enabledModelIds, - models: input.models, - connectionStore: deps.connectionStore, - credentialStore: deps.credentialStore, - fetchModelChoices: () => - listReadyModelChoices({ - connectionStore: deps.connectionStore, - credentialStore: deps.credentialStore, - }), - }), - }; -} - -/** Catalog API-key providers (phase 1) annotated with the host's existing - * connection state. The wizard calls this when it opens so `已设置` and the - * preserved enabled set reflect live storage, not a startup snapshot. */ -export async function listOnboardingProviders(input: { - connectionStore: Pick; -}): Promise { - const connections = await input.connectionStore.list(); - const bySlug = new Map(connections.map((connection) => [connection.slug, connection])); - return listApiKeyOnboardableProviders().map((provider) => { - const candidate = bySlug.get(deriveConnectionSlug(provider.providerType)); - const existing = candidate?.providerType === provider.providerType ? candidate : undefined; - return { - ...provider, - hasConnection: existing !== undefined, - enabledModelIds: existing ? connectionEnabledModelIds(existing) : [], - }; - }); -} - -export interface VerifyApiKeyConnectionInput extends OnboardingVerifyInput { - /** Supplied key. Blank for an existing connection reuses the stored secret; - * blank for a new required-key connection is rejected. Never returned to the - * wizard — verify is host-owned. */ - apiKey?: string; - connectionStore: Pick; - credentialStore: Pick; - fetchModels: (connection: LlmConnection, apiKey: string) => Promise; -} - -export type VerifyApiKeyConnectionResult = OnboardingVerifyResult; - -/** Probe a provider with a supplied or stored secret without persisting: the - * wizard's key step verifies the key works and discovers models, then defers - * all persistence to {@link saveApiKeyConnection}. An existing connection may - * leave the key blank to reuse the stored secret; a new required-key connection - * must supply one. Pure and dependency-injected so the TUI wizard drives the - * same seam the tests do. */ -export async function verifyApiKeyConnection( - input: VerifyApiKeyConnectionInput, -): Promise { - if (!providerAuthSupportsApiKey(input.providerType)) { - return { kind: 'error', text: `Provider "${input.providerType}" does not accept an API key` }; - } - const def = PROVIDER_DEFAULTS[input.providerType]; - const requiresKey = def?.authKind === 'api_key'; - const suppliedKey = input.apiKey?.trim() ?? ''; - const canonicalSlug = deriveConnectionSlug(input.providerType); - const candidate = await input.connectionStore.get(canonicalSlug); - if (candidate && candidate.providerType !== input.providerType) { - return { - kind: 'error', - text: `Connection slug "${canonicalSlug}" belongs to another provider`, - }; - } - const existing = candidate; - let connection: LlmConnection; - let secret: string; - if (existing) { - connection = existing; - if (suppliedKey) { - secret = suppliedKey; - } else { - const stored = (await input.credentialStore.getSecret(existing.slug, 'api_key')) ?? ''; - if (requiresKey && !stored) return { kind: 'error', text: 'API key is required' }; - secret = stored; - } - } else { - if (requiresKey && !suppliedKey) return { kind: 'error', text: 'API key is required' }; - secret = suppliedKey; - connection = transientOnboardingConnection(input.providerType); - } - try { - const models = await input.fetchModels(connection, secret); - return { kind: 'ok', models }; - } catch (error) { - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } -} - -/** Build a transient, in-memory connection from catalog defaults so a new - * provider's verify can probe without persisting a half-configured connection. */ -function transientOnboardingConnection(providerType: ProviderType): LlmConnection { - const def = PROVIDER_DEFAULTS[providerType]; - const now = Date.now(); - return { - slug: deriveConnectionSlug(providerType), - name: def.label, - providerType, - ...(def.baseUrl ? { baseUrl: def.baseUrl } : {}), - defaultModel: def.fallbackModels[0] ?? '', - enabled: true, - createdAt: now, - updatedAt: now, - }; -} - -export interface SaveApiKeyConnectionInput extends OnboardingSaveInput { - /** Supplied key. Blank for an existing connection leaves the stored secret - * untouched; a new connection must supply one (verify already enforced it). */ - apiKey?: string; - /** Curated enabled model ids — at least one is required before saving. */ - enabledModelIds: readonly string[]; - /** Discovered models from verify, cached on the connection. */ - models: readonly ModelInfo[]; - connectionStore: Pick< - ConnectionStore, - 'get' | 'create' | 'update' | 'remove' | 'getDefault' | 'setDefault' - >; - credentialStore: Pick; - /** Refreshed authoritative ready model choices for the running TUI. */ - fetchModelChoices: () => Promise; -} - -export type SaveApiKeyConnectionResult = OnboardingSaveResult; - -/** Persist the verified connection with the curated enabled-model set, caching - * discovered models and normalizing the required compatibility `defaultModel` - * (kept when still enabled, otherwise the first enabled model — never a user - * default choice). `setDefault` runs only when no default connection exists, so - * in-session setup never replaces an existing default. A new connection's - * secret-write failure rolls back the created connection; an existing - * connection's rotation failure leaves it untouched. Pure and DI so the TUI - * wizard drives the same seam the tests do. */ -export async function saveApiKeyConnection( - input: SaveApiKeyConnectionInput, -): Promise { - if (!providerAuthSupportsApiKey(input.providerType)) { - return { kind: 'error', text: `Provider "${input.providerType}" does not accept an API key` }; - } - const enabled = input.enabledModelIds.map((id) => id.trim()).filter(Boolean); - if (enabled.length === 0) { - return { kind: 'error', text: '至少选择一个模型再保存' }; - } - const def = PROVIDER_DEFAULTS[input.providerType]; - const suppliedKey = input.apiKey?.trim() ?? ''; - const canonicalSlug = deriveConnectionSlug(input.providerType); - const candidate = await input.connectionStore.get(canonicalSlug); - if (candidate && candidate.providerType !== input.providerType) { - return { - kind: 'error', - text: `Connection slug "${canonicalSlug}" belongs to another provider`, - }; - } - const existing = candidate; - const normalizedDefault = - existing && enabled.includes(existing.defaultModel) ? existing.defaultModel : enabled[0]!; - const testAt = new Date().toISOString(); - const modelPatch = { - enabled: true, - defaultModel: normalizedDefault, - enabledModelIds: enabled, - models: [...input.models], - modelSource: 'fetched' as ModelDiscoverySource, - modelsFetchedAt: Date.now(), - lastTestStatus: 'verified' as ConnectionLastTestStatus, - lastTestAt: testAt, - }; - let connectionSlug: string; - - if (existing) { - connectionSlug = existing.slug; - // Rotate the key first (if supplied): a rotation failure leaves the existing - // connection untouched (previous secret + previous curation stand). A failed - // curation write rolls the rotation back so the connection keeps its previous - // secret + curation — save stays atomic from the caller's view. - if (suppliedKey) { - const previousSecret = await input.credentialStore.getSecret(connectionSlug, 'api_key'); - try { - await input.credentialStore.setSecret(connectionSlug, 'api_key', suppliedKey); - } catch (error) { - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } - try { - await input.connectionStore.update(connectionSlug, modelPatch); - } catch (error) { - if (previousSecret !== null) { - await input.credentialStore.setSecret(connectionSlug, 'api_key', previousSecret); - } else { - await input.credentialStore.deleteSecret(connectionSlug, 'api_key'); - } - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } - } else { - try { - await input.connectionStore.update(connectionSlug, modelPatch); - } catch (error) { - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } - } - } else { - const created = await input.connectionStore.create({ - slug: canonicalSlug, - name: def.label, - providerType: input.providerType, - defaultModel: normalizedDefault, - }); - connectionSlug = created.slug; - try { - await input.credentialStore.setSecret(connectionSlug, 'api_key', suppliedKey); - } catch (error) { - // Atomicity: a newly-created connection is rolled back when the secret - // write fails, so no half-configured connection becomes the default. - await input.connectionStore.remove(connectionSlug); - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } - try { - await input.connectionStore.update(connectionSlug, modelPatch); - } catch (error) { - // Atomicity: a failed curation write rolls back the new connection + secret - // so no half-configured default connection is left behind for first-run. - await input.connectionStore.remove(connectionSlug); - await input.credentialStore.deleteSecret(connectionSlug, 'api_key'); - return { kind: 'error', text: error instanceof Error ? error.message : String(error) }; - } - } - - // setDefault only when no default connection exists (first run, or a host with - // no prior default). In-session setup never replaces an existing default. - if ((await input.connectionStore.getDefault()) === null) { - await input.connectionStore.setDefault(connectionSlug); - } - - const modelChoices = await input.fetchModelChoices(); - return { kind: 'ok', modelChoices }; -} diff --git a/packages/cli/src/pi-transcript-tools.ts b/packages/cli/src/pi-transcript-tools.ts index 00502d573b..7987525ddd 100644 --- a/packages/cli/src/pi-transcript-tools.ts +++ b/packages/cli/src/pi-transcript-tools.ts @@ -159,16 +159,23 @@ function renderExpandedToolBlock(entry: MakaPiToolEntry, width: number): string[ if (entry.progress.length > 0) { lines.push(...renderCappedResultText(entry.progress.values().join(''), width, ansi.dim)); } - if (entry.outputDeltas.droppedChars > 0) { - lines.push( - ...renderIndented( - ansi.dim(`⋯ ${entry.outputDeltas.droppedChars} earlier live-output chars truncated ⋯`), - width, - 2, - ), - ); + // A terminal snapshot is the authoritative accumulated stream. Rendering + // the deltas that preceded it as well would repeat every line once the Bash + // card settles. Compact results intentionally keep the live deltas because + // they may be the only output available. + const renderLiveOutput = !shellResultSupersedesLiveOutput(entry.result); + if (renderLiveOutput) { + if (entry.outputDeltas.droppedChars > 0) { + lines.push( + ...renderIndented( + ansi.dim(`⋯ ${entry.outputDeltas.droppedChars} earlier live-output chars truncated ⋯`), + width, + 2, + ), + ); + } + lines.push(...renderToolStreams(entry.outputDeltas.values(), width)); } - lines.push(...renderToolStreams(entry.outputDeltas.values(), width)); if (entry.result || entry.output) { lines.push(...renderToolResult(entry, width)); } @@ -182,6 +189,12 @@ function renderExpandedToolBlock(entry: MakaPiToolEntry, width: number): string[ return lines.map((line) => fitLine(line, width)); } +function shellResultSupersedesLiveOutput(result: ToolResultContent | undefined): boolean { + return ( + (result?.kind === 'terminal' || result?.kind === 'shell_run') && result.output !== undefined + ); +} + interface CompactToolSummary { text: string; /** Placeholder shown only when the annotation would otherwise be empty (`no output`). */ diff --git a/packages/cli/src/pi-tui-contracts.ts b/packages/cli/src/pi-tui-contracts.ts index a3252328d2..60b01c9828 100644 --- a/packages/cli/src/pi-tui-contracts.ts +++ b/packages/cli/src/pi-tui-contracts.ts @@ -1,8 +1,7 @@ import type { ForeignSessionDigest, ForeignSessionSummary } from '@maka/core/foreign-session'; import type { ModelInfo, ProviderType } from '@maka/core/llm-connections'; import type { ThinkingLevel } from '@maka/core/model-thinking'; -import type { GoalTurnAdmission, HostCapabilities, SkillSource } from '@maka/runtime'; -import type { MakaPiTuiTurnLifecycle } from './pi-tui-turn.js'; +import type { MakaPiTuiTurnActivity } from './pi-tui-turn.js'; export interface ModelChoice { connectionSlug: string; @@ -68,16 +67,9 @@ export interface SessionRecapGenerator { ): Promise<{ ok: true; text: string; raw: string } | { ok: false; error: string }>; } -export interface MakaCliSkillSurface { - source(cwd: string): SkillSource; - host: HostCapabilities; -} - export interface MakaForeignSessionReader { listSessions(options?: { cwd?: string }): Promise; readDigest(summary: ForeignSessionSummary): Promise; } -export interface MakaPiTuiGoalLifecycle extends MakaPiTuiTurnLifecycle { - bindHost(host: { admitTurn(sessionId: string, text: string): GoalTurnAdmission }): () => void; -} +export type MakaPiTuiTurnActivitySurface = MakaPiTuiTurnActivity; diff --git a/packages/cli/src/pi-tui-runner.ts b/packages/cli/src/pi-tui-runner.ts index 14d366bb72..370e9e80d2 100644 --- a/packages/cli/src/pi-tui-runner.ts +++ b/packages/cli/src/pi-tui-runner.ts @@ -21,6 +21,7 @@ import { } from '@maka/core/model-thinking'; import { type ModelInfo, type ProviderType } from '@maka/core/llm-connections'; import type { OrchestrationMode } from '@maka/core/orchestration'; +import type { SkillInvocationResult } from '@maka/core/skill-invocation'; import { projectRevisionLinkedSessionTree, type QueueEnqueueOutcome, @@ -36,22 +37,16 @@ import { import type { ContextDiagnostics, GoalTurnOutcome, SessionActivityLease } from '@maka/runtime'; import { listApiKeyOnboardableProviders } from './onboarding-catalog.js'; import type { - MakaCliSkillSurface, MakaForeignSessionReader, MakaOnboardingSurface, - MakaPiTuiGoalLifecycle, + MakaPiTuiTurnActivitySurface, ModelChoice, OnboardingProviderEntry, SessionRecapGenerator, } from './pi-tui-contracts.js'; import { AUTO_RECAP_DISPLAY_LIMIT_BYTES, shouldAutoRecap } from './session-recap.js'; -import { - listInvocableSkills, - prepareSkillInvocationMessage, - type InvocableSkillEntry, -} from '@maka/runtime'; +import type { InvocableSkillEntry } from '@maka/runtime'; import { MakaSkillHighlightEditor } from './skill-highlight-editor.js'; -import { parseSkillInvocationTokens } from './skill-token.js'; import { parseGraphCommand, parseSwarmCommand, @@ -155,17 +150,10 @@ export interface MakaPiTuiInput { subscribeSessionTitleChanges?: (listener: (sessionId: string) => void) => () => void; subscribeShellRunUpdates?: (listener: (update: ShellRunUpdate) => void) => () => void; listShellRunUpdates?: (sessionId: string) => Promise; - /** - * Explicit skill invocation surface (issue #1148). When present, `/skill:` - * tokens are highlighted in the editor, completed by autocomplete, listed by - * `/skill`, and resolved + injected by the CLI at submit time. Omitting it - * disables the whole feature (tests, minimal hosts). - */ - skills?: MakaCliSkillSurface; /** Host-owned invocable Skill catalog used for picker, completion, and token highlighting. */ listSkills?: (cwd: string) => Promise; - /** Mandatory turn ownership shared with CLI Automation and Goal continuation. */ - goalLifecycle: MakaPiTuiGoalLifecycle; + /** Serializes TUI turn and control activity for the attached Session. */ + turnActivity: MakaPiTuiTurnActivitySurface; /** API-key onboarding surface (#1098). When present, /setup runs the wizard, * whose listProviders/verify/save calls persist the connection + curated models * via the host-owned stores. */ @@ -267,7 +255,6 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { let lastTurnEscapeAt = 0; let lastIdleEscapeAt = 0; let lastIdleCtrlCAt = 0; - let unbindGoalHost: (() => void) | undefined; type AttachedTurnContext = | { readonly kind: 'adopted'; readonly turn: MakaPreparedSessionTurn } | { readonly kind: 'external'; readonly turn: MakaAttachedSessionTurn }; @@ -402,7 +389,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { const listSkillsCached = async ( forceRefresh = false, ): Promise => { - if (!input.skills && !input.listSkills) return []; + if (!input.listSkills) return []; if ( !forceRefresh && skillListCache && @@ -412,9 +399,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { return skillListCache.entries; } try { - const entries = input.skills - ? await listInvocableSkills(input.skills.source(cwd), input.skills.host) - : [...(await input.listSkills!(cwd))]; + const entries = [...(await input.listSkills(cwd))]; skillListCache = { cacheCwd: cwd, at: Date.now(), entries }; // The highlight validator must be sync and cheap (one lookup per token // per render): a flat Set over lowercase ids AND display names, since a @@ -445,47 +430,30 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { too_many_requests: '调用请求过多', }; - interface PreparedSkillPrompt { - disposition: 'passthrough' | 'ready' | 'blocked'; - sendText?: string; - loadedNames: string[]; - warnings: string[]; - } - - // Resolve `/skill:` tokens through the shared Runtime contract. Failed - // invocation tokens never reach the model; when all requests fail, Runtime - // returns a bounded receipt and the TUI does not create a provider turn. - const prepareSkillInvocation = async (prompt: string): Promise => { - if (!input.skills) { - return { disposition: 'passthrough', sendText: prompt, loadedNames: [], warnings: [] }; - } - const prepared = await prepareSkillInvocationMessage({ - text: prompt, - source: input.skills.source(cwd), - host: input.skills.host, - }); - const failed = prepared.skillInvocation.failed; + const showSkillInvocation = (skillInvocation: SkillInvocationResult): void => { + const failed = skillInvocation.failed; const failedLabels = failed.map((entry) => entry.reason === 'too_many_requests' ? `请求超过 ${entry.requestLimit} 个上限（${SKILL_INVOCATION_FAILURE_REASON_LABEL[entry.reason]}）` : `/skill:${entry.request}（${SKILL_INVOCATION_FAILURE_REASON_LABEL[entry.reason] ?? entry.reason}）`, ); - const warnings = - failed.length > 0 - ? [ - `未能加载技能 ${failedLabels.join('、')}；${ - prepared.disposition === 'blocked' - ? '未发起模型请求。' - : '失败的调用标记未发送给模型。' - }`, - ] - : []; - return { - disposition: prepared.disposition, - ...('sendText' in prepared ? { sendText: prepared.sendText } : {}), - loadedNames: prepared.skillInvocation.loaded.map((skill) => skill.name), - warnings, - }; + if (failed.length > 0) { + state.entries.push({ + kind: 'notice', + level: 'info', + text: `未能加载技能 ${failedLabels.join('、')}；${ + skillInvocation.loaded.length === 0 ? '未发起模型请求。' : '失败的调用标记未发送给模型。' + }`, + }); + } + if (skillInvocation.loaded.length > 0) { + state.entries.push({ + kind: 'notice', + level: 'info', + text: `已加载技能：${skillInvocation.loaded.map((skill) => skill.name).join('、')}`, + }); + } + requestRender(); }; // 1-second heartbeat that re-renders the activity strip's elapsed counter @@ -542,7 +510,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { let sessionActivity: SessionActivityLease | undefined; try { const sessionId = input.driver.getSessionId(); - if (sessionId) sessionActivity = await input.goalLifecycle.activities.acquire(sessionId); + if (sessionId) sessionActivity = await input.turnActivity.activities.acquire(sessionId); if (closed) return; await action(); } catch (error) { @@ -569,8 +537,6 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { const restoreTerminal = () => { removeProcessHandlers(); - unbindGoalHost?.(); - unbindGoalHost = undefined; unsubscribeSessionTitleChanges(); unsubscribeStartedTurns(); unsubscribeResolvedInteractions(); @@ -740,69 +706,11 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { // is the idle-return submission that triggers the recap below. promptSeq += 1; maybeTriggerAutoRecap(idleMs); - if (!input.skills || parseSkillInvocationTokens(prompt).length === 0) { - void runAgentTurn({ - kind: 'external', - prompt, - sessionId: input.driver.getSessionId(), - }); - return; - } - void submitPreparedUserPrompt(prompt); - }; - - // Resolve skill-invocation tokens, then open the turn. Hold both `busy` and - // `editor.disableSubmit` for the async prep window: pi-tui clears the draft - // before onSubmit, so a second Enter during prep must not be accepted (it - // would be dropped by the busy guard with the draft already gone). - // runAgentTurn re-asserts busy for the turn itself and re-enables submit so - // mid-turn Enter can still steer. - const submitPreparedUserPrompt = async (prompt: string) => { - busy = true; - const preparationActivity = beginActivity(); - editor.disableSubmit = true; - let handedOff = false; - try { - const prepared = await prepareSkillInvocation(prompt); - // Prep is async (skill scan). If the TUI closed mid-scan (double Ctrl-C / - // SIGTERM), do not open a turn after the shell is gone. - if (closed) return; - for (const warning of prepared.warnings) { - state.entries.push({ kind: 'notice', level: 'info', text: warning }); - } - if (prepared.loadedNames.length > 0) { - state.entries.push({ - kind: 'notice', - level: 'info', - text: `已加载技能：${prepared.loadedNames.join('、')}`, - }); - } - if (prepared.disposition === 'blocked') return; - // Hand off to the turn: runAgentTurn re-asserts busy and re-enables - // submit so mid-turn Enter can steer. Clearing disableSubmit only there - // keeps the prep window closed until the turn owns the flags. - void runAgentTurn({ - kind: 'external', - prompt, - sessionId: input.driver.getSessionId(), - ...(prepared.sendText !== undefined && prepared.sendText !== prompt - ? { sendText: prepared.sendText } - : {}), - }); - handedOff = true; - } catch (error) { - if (closed) return; - reportError(error); - } finally { - if (!handedOff) { - busy = false; - editor.disableSubmit = false; - requestRender(); - } - // A successful handoff already installed the turn's activity as current; - // releasing preparation now wakes observers into that new busy period. - preparationActivity.finish(); - } + void runAgentTurn({ + kind: 'external', + prompt, + sessionId: input.driver.getSessionId(), + }); }; // Fallback handoff owner. A `fallback` outcome while the turn is running @@ -1051,8 +959,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { submitPrompt(prompt); }; - // Runs one agent turn through the shared activity/drain lifecycle. Shared by - // user submits, queued follow-ups, and coordinator-owned goal injections. + // Runs one visible agent turn through the shared activity/drain lifecycle. function runAgentTurn( request: MakaPiTuiTurnRequest, authoritativeAttachedTurn?: MakaAttachedSessionTurn, @@ -1064,14 +971,13 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { startTurnElapsedTicker(); interruptRequested = false; lastTurnEscapeAt = 0; - // Re-enable submit after skill-prep's disableSubmit hold: Enter must steer - // a running turn (see editor.onSubmit) instead of being swallowed. editor.disableSubmit = false; terminal.setProgress(true); attention.promptTurnStarted(); requestRender(); let permissionAlerted = false; + let optimisticUserEntry: (typeof state.entries)[number] | undefined; const finishTurnUi = () => { turnRunning = false; turnStartedAt = undefined; @@ -1087,14 +993,17 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { return runMakaPiTuiTurn({ driver: input.driver, - lifecycle: input.goalLifecycle, + turnActivity: input.turnActivity, request, // A requested stop converges through the authoritative event stream. // Cutting the iterator short here would make the UI appear idle before // the runtime has emitted its terminal event and accepted the stop. shouldAbort: () => closed, onStart: () => { - if (request.kind !== 'attached') appendUserPrompt(state, request.prompt); + if (request.kind !== 'attached') { + appendUserPrompt(state, request.prompt); + optimisticUserEntry = state.entries.at(-1); + } requestRender(); }, onPrepared: async (turn) => { @@ -1111,6 +1020,18 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { } if (turn.summary) adoptSessionMetadata(turn.summary); }, + onSkillInvocation: (skillInvocation) => { + if ( + skillInvocation.loaded.length === 0 && + skillInvocation.failed.length > 0 && + optimisticUserEntry + ) { + const index = state.entries.indexOf(optimisticUserEntry); + if (index >= 0) state.entries.splice(index, 1); + optimisticUserEntry = undefined; + } + showSkillInvocation(skillInvocation); + }, onEvent: (event) => { if ( (event.type === 'sandbox_boundary_request' || event.type === 'user_question_request') && @@ -1286,41 +1207,6 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise { ); }; - try { - unbindGoalHost = input.goalLifecycle.bindHost({ - admitTurn: (sessionId, text) => { - if (input.driver.getSessionId() !== sessionId) { - return { kind: 'unavailable', reason: 'TUI is attached to a different session.' }; - } - if (busy) { - return { kind: 'busy', whenIdle: currentActivityCompletion! }; - } - const sessionActivity = input.goalLifecycle.activities.reserveIfIdle(sessionId)!; - const turnId = randomUUID(); - return { - kind: 'prepared', - turnId, - start: () => { - try { - return runAgentTurn({ - kind: 'coordinator', - prompt: text, - turnId, - activity: sessionActivity, - }); - } catch (error) { - sessionActivity.release(); - throw error; - } - }, - }; - }, - }); - } catch (error) { - beginClose(error instanceof Error ? error : new Error(String(error))); - return closedPromise; - } - const setModel = async (nextModel: string) => { await input.driver.setModel(nextModel); model = nextModel; diff --git a/packages/cli/src/pi-tui-turn.ts b/packages/cli/src/pi-tui-turn.ts index dec69844ee..01f5e5e40a 100644 --- a/packages/cli/src/pi-tui-turn.ts +++ b/packages/cli/src/pi-tui-turn.ts @@ -1,18 +1,20 @@ import type { SessionEvent } from '@maka/core'; +import type { SkillInvocationResult } from '@maka/core/skill-invocation'; import type { TurnOrchestration } from '@maka/core/runtime-inputs'; import { drainGoalTurn, - type GoalObservedTurnStart, - type GoalObservedTurnSettler, type GoalTurnOutcome, type SessionActivityLease, type SessionActivityRegistry, } from '@maka/runtime'; -import type { MakaPreparedSessionTurn, MakaSessionDriver } from './session-driver.js'; +import { + SkillInvocationBlockedError, + type MakaPreparedSessionTurn, + type MakaSessionDriver, +} from './session-driver.js'; -export interface MakaPiTuiTurnLifecycle { +export interface MakaPiTuiTurnActivity { activities: SessionActivityRegistry; - beginObservedTurn: (sessionId: string, turnId: string) => GoalObservedTurnStart; } export type MakaPiTuiTurnRequest = @@ -26,12 +28,6 @@ export type MakaPiTuiTurnRequest = /** Trusted one-turn orchestration override supplied by a host command. */ turnOrchestration?: TurnOrchestration; } - | { - kind: 'coordinator'; - prompt: string; - turnId: string; - activity: SessionActivityLease; - } | { /** A Turn that another Client or the Runtime Host already started. */ kind: 'attached'; @@ -40,40 +36,28 @@ export type MakaPiTuiTurnRequest = export interface RunMakaPiTuiTurnInput { driver: Pick; - lifecycle: MakaPiTuiTurnLifecycle; + turnActivity: MakaPiTuiTurnActivity; request: MakaPiTuiTurnRequest; shouldAbort: () => boolean; onStart?: () => void; onPrepared?: (turn: MakaPreparedSessionTurn) => void | Promise; + onSkillInvocation?: (result: SkillInvocationResult) => void | Promise; onEvent?: (event: SessionEvent) => void | Promise; onFailure?: (error: unknown) => void | Promise; } /** * Owns one visible TUI turn from activity reservation through full stream drain. - * External settlement always follows activity release; coordinator turns return - * their outcome directly to the admission completion capability. + * Goal continuation and Automation admission remain Runtime Host responsibilities. */ export async function runMakaPiTuiTurn(input: RunMakaPiTuiTurnInput): Promise { const { request } = input; - let activity = request.kind === 'coordinator' ? request.activity : undefined; - let preparedTurnId = - request.kind === 'coordinator' - ? request.turnId - : request.kind === 'attached' - ? request.turn.turnId - : undefined; - let settleExternalTurn: GoalObservedTurnSettler | undefined; - - const notifySettlement = (outcome: GoalTurnOutcome): void => { - if (!settleExternalTurn) return; - void settleExternalTurn(outcome); - }; + let activity: SessionActivityLease | undefined; + let preparedTurnId = request.kind === 'attached' ? request.turn.turnId : undefined; const finishBeforeDrain = (outcome: GoalTurnOutcome): GoalTurnOutcome => { activity?.release(); activity = undefined; - notifySettlement(outcome); return outcome; }; @@ -84,13 +68,9 @@ export async function runMakaPiTuiTurn(input: RunMakaPiTuiTurnInput): Promise; stopSession(sessionId: string, input?: { source?: 'stop_button' }): Promise; setExecutionBoundaryKind(sessionId: string, kind: 'managed' | 'bypass'): Promise; + resumeLatest?(sessionId: string): Promise | null>; } export interface MakaRunContext { @@ -62,7 +64,7 @@ export interface MakaRunOutcome { } export interface MakaRunContextInput { - surface: 'run'; + surface: 'run' | 'activation'; workspaceRoot: string; cwd: string; requestedConnectionSlug?: string; @@ -283,7 +285,7 @@ export async function runMakaTextCliCore( ? selection.session : await context.runtime.createSession({ cwd: selection.cwd, - name: firstLine(prompt).slice(0, 42) || 'Maka run', + name: makaRunSessionName(prompt), backend: 'ai-sdk', llmConnectionSlug: context.target.connection.slug, model: context.target.model, @@ -496,6 +498,11 @@ function firstLine(text: string): string { ); } +function makaRunSessionName(prompt: string): string { + const normalized = normalizeUserSessionName(firstLine(prompt).slice(0, 42)); + return normalized.ok ? normalized.value : 'Maka run'; +} + function withTrailingNewline(text: string): string { return text.endsWith('\n') ? text : `${text}\n`; } diff --git a/packages/cli/src/run-command.ts b/packages/cli/src/run-command.ts deleted file mode 100644 index a4e9483f1c..0000000000 --- a/packages/cli/src/run-command.ts +++ /dev/null @@ -1,59 +0,0 @@ -import type { InvocationResult } from '@maka/runtime'; -import { createSessionStore } from '@maka/storage'; -import { createMakaCliRuntimeContext } from './runtime-bootstrap.js'; -import { - invocationHasSandboxBoundaryFailure, - invocationRecoveredSandboxBoundaryFailure, -} from './sandbox-boundary-failure.js'; -import { - runMakaTextCliCore, - type MakaRunContextInput, - type MakaRunDeps, - type MakaRunOutcome, -} from './run-command-core.js'; - -export { - parseMakaRunArgs, - type MakaRunContext, - type MakaRunContextInput, - type MakaRunDeps, - type MakaRunOptions, - type MakaRunRuntime, - type ParseMakaRunArgsResult, -} from './run-command-core.js'; - -export function runMakaTextCli( - argv: readonly string[], - overrides: Partial = {}, -): Promise { - const { - createContext = createEmbeddedRunContext, - listSessions = (workspaceRoot: string) => createSessionStore(workspaceRoot).list(), - ...environmentOverrides - } = overrides; - return runMakaTextCliCore(argv, { createContext, listSessions }, environmentOverrides); -} - -async function createEmbeddedRunContext(input: MakaRunContextInput) { - const { runOutcomeObserver, ...runtimeInput } = input; - return createMakaCliRuntimeContext({ - ...runtimeInput, - ...(runOutcomeObserver - ? { - runtimeInvocationObserver: (result) => - runOutcomeObserver({ - outcomeId: result.invocationId, - status: result.status === 'completed' ? 'completed' : 'failed', - ...(result.finalOutput !== undefined ? { finalOutput: result.finalOutput } : {}), - ...(result.failure ? { failure: result.failure } : {}), - sandboxBoundary: sandboxBoundaryOutcome(result), - }), - } - : {}), - }); -} - -function sandboxBoundaryOutcome(result: InvocationResult): MakaRunOutcome['sandboxBoundary'] { - if (invocationRecoveredSandboxBoundaryFailure(result)) return 'recovered'; - return invocationHasSandboxBoundaryFailure(result) ? 'unresolved' : 'none'; -} diff --git a/packages/cli/src/runtime-bootstrap.ts b/packages/cli/src/runtime-bootstrap.ts deleted file mode 100644 index c9c8f5e7ca..0000000000 --- a/packages/cli/src/runtime-bootstrap.ts +++ /dev/null @@ -1,1184 +0,0 @@ -import { randomBytes, randomUUID } from 'node:crypto'; -import { chmod, mkdir, readFile, writeFile } from 'node:fs/promises'; -import { dirname, join } from 'node:path'; -import { - AiSdkBackend, - AgentGraphCoordinator, - AgentGraphSupervisorWakeCoordinator, - AutomationManager, - AutomationScheduler, - BackendRegistry, - GoalManager, - RuntimeReadModel, - SessionManager, - ShellRunProcessManager, - buildAutomationTool, - buildAskUserQuestionTool, - buildRequestSandboxBoundaryTool, - buildBuiltinTools, - buildSessionRecapMessages, - buildChildAgentTools, - createBuiltinSandboxManager, - isBuiltinFilesystemWorkerSandboxAvailable, - createSandboxDiagnosticsProvider, - createProviderRequestCaptureRecorder, - createFilesystemWorkerLaunchSpecProvider, - createLocalContinuationSafetyInspector, - createConfiguredSubagentCatalog, - drainGoalTurn, - FilesystemWorkerClient, - buildDefaultContextBudgetPolicy, - buildSkillAgentTool, - buildSkillSearchAgentTool, - SkillShadowSelectionTracker, - buildGoalTools, - buildParentAgentTools, - assertProductBindingCatalogClean, - AGENT_TOOL_GROUP_ID, - buildLlmHistorySummarizer, - buildNativeWebSearchTool, - cleanupLegacyHistoryCompactArtifacts, - buildProviderOptions, - buildSubscriptionModelFetch, - evaluateAutomationCanFire, - getAIModel, - generateSessionTitle as generateRuntimeSessionTitle, - loadHistoryCompactBlocksFromArtifacts, - listRunnableBuiltinAgentDefinitions, - replayPlanItemsToModelMessages, - recoverAgentGraphSupervisorContextOverflow, - renderAgentSwarmSupervisorWake, - resolveSkillDiscoveryPaths, - resolveSelectedModelContextWindow, - projectEffectiveProductToolSurface, - routeWebSearchTools, - shouldWakeAgentSwarmSupervisor, - type AutomationDefinition, - type EffectiveProductToolSurface, - type HostCapabilitiesResolver, - type MakaTool, - type InvocationResult, - type InvocationSource, - type ShellRunUpdate, - type ModelMessage, -} from '@maka/runtime'; -import { - createSqliteAgentRunStore, - createAttachmentByteReader, - createSqliteArtifactStore, - createAutomationStore, - createConnectionStore, - createFileCredentialStore, - openRuntimeEventPersistence, - createForeignSessionStore, - createGitWorktreeChildExecutor, - createReadImageSnapshotter, - createSessionStore, - isSessionNotFoundError, - createSettingsStore, - createSqliteShellRunStore, - assertSessionBundleRootLayout, - type ForeignSessionStore, - persistProviderRequestCaptureArtifact, -} from '@maka/storage'; -import { createAgentGraphControlStore } from '@maka/storage/agent-graph-control-store'; -import { resolveStorageRoot } from '@maka/storage/root-authority'; -import { resolveWorkspaceIdentity } from '@maka/storage/workspace-identity'; -import { fetchProviderModels } from '@maka/runtime'; -import { createApiKeyOnboardingSurface } from './onboarding.js'; -import { relayModelProfile, isActiveShellRunStatus, resolveModelVisionSupport } from '@maka/core'; -import type { ReadySessionTarget } from './connection-target.js'; -import { - listReadyModelChoices, - resolveDefaultSessionTarget, - resolveSessionTargetForSlug, -} from './connection-target.js'; -import { buildCliSystemPrompt, buildCliTurnTailPrompt } from './cli-system-prompt.js'; -import { CliGoalContinuation } from './cli-goal-continuation.js'; -import type { - MakaCliSkillSurface, - MakaOnboardingSurface, - ModelChoice, - SessionRecapGenerator, -} from './pi-tui-contracts.js'; -import { cleanRecapText } from './session-recap.js'; - -export interface MakaCliRuntimeContext { - /** Legacy shared-root input retained for callers that do not split roots. */ - workspaceRoot: string; - /** Durable session-owned state root used by the runtime stores. */ - stateRoot: string; - /** Host-injected configuration root used by connections, credentials, and settings. */ - configRoot: string; - cwd: string; - runtime: SessionManager; - target: ReadySessionTarget; - /** Selectable models across every ready connection, for the `/model` picker. */ - modelChoices: ModelChoice[]; - /** Tools passed to the backend, including TUI-only interactive and subagent tools. */ - tools: MakaTool[]; - /** - * Explicit skill invocation surface (issue #1148): the discovery source + - * host gate shared with the Skill tool and the system-prompt catalog, so - * `/skill:` autocomplete, highlight, and submit-time injection all - * resolve against exactly what the host can load. - */ - skills: MakaCliSkillSurface; - automationManager: AutomationManager; - automationScheduler: AutomationScheduler; - subscribeShellRunUpdates(listener: (update: ShellRunUpdate) => void): () => void; - listShellRunUpdates(sessionId: string): Promise; - goalManager: GoalManager; - goalContinuation: CliGoalContinuation; - /** One-sentence session recap generator (issue #1055), shared by `/recap` and idle-return auto-recap. */ - recap: SessionRecapGenerator; - /** Read-only scanner for other agents' sessions (Claude Code, Codex), for the resume picker (#1057). */ - foreignSessions: ForeignSessionStore; - /** Host-owned Graph runtime used by the TUI and `maka run --graph`. */ - agentGraph?: { - reserveActivity(sessionId: string): { release(): void }; - waitForCompletion(sessionId: string): Promise; - }; - close(): Promise; - /** API-key onboarding surface for the /setup wizard (#1098). */ - onboarding: MakaOnboardingSurface; -} - -export function resolveCliStreamConnectTimeoutMs( - env: NodeJS.ProcessEnv = process.env, -): number | undefined { - const raw = env.MAKA_STREAM_CONNECT_TIMEOUT_MS; - if (raw === undefined || raw.trim() === '') return undefined; - if (!/^[1-9]\d*$/.test(raw)) { - throw new Error('MAKA_STREAM_CONNECT_TIMEOUT_MS must be a positive integer'); - } - const timeoutMs = Number(raw); - if (!Number.isSafeInteger(timeoutMs)) { - throw new Error('MAKA_STREAM_CONNECT_TIMEOUT_MS must be a positive safe integer'); - } - return timeoutMs; -} - -/** - * Generates a one-sentence recap of a session so far, using a tool-free model - * call whose exchange is never written to the session's own history. Never - * throws — failures resolve to `{ ok: false }` so callers can surface them - * without a try/catch. - */ -export interface CreateMakaCliRuntimeContextInput { - surface: 'tui' | 'run' | 'activation'; - /** Legacy root; both new roots default to this path. */ - workspaceRoot: string; - /** Optional portable session-owned state root. */ - stateRoot?: string; - /** Optional host-injected configuration root. */ - configRoot?: string; - cwd: string; - requestedConnectionSlug?: string; - requestedModel?: string; - maxSteps?: number; - /** Compose the durable Graph control plane and Git-worktree child executor. */ - enableAgentGraph?: boolean; - /** Canonical cwd used for one resumed session without rewriting its stored header. */ - sessionCwdOverride?: { sessionId: string; cwd: string }; - runtimeInvocationObserver?: (result: InvocationResult) => void | Promise; - /** Invocation provenance used by hosted activation callers. */ - runtimeSource?: InvocationSource; - /** Enables authoritative safe-boundary continuation for hosted activation callers. */ - safeBoundaryResumeEnabled?: boolean; - onSessionTitleChanged?: (sessionId: string) => void; - /** - * Optional cron executor. When provided, the Automation tool advertises the - * cron kind and cron fires spawn a fresh session + run via this callback - * (reviewer G1: a host derives cron support from the executor it passes in). - * Omitted by the default CLI (no multi-session surface) — heartbeat only. - */ - automationCreateFreshRun?: ( - prompt: string, - automationId: string, - ) => Promise; -} - -export interface GetOrCreateCliClaudeDeviceIdDeps { - newId?: () => string; -} - -export function isMakaClaudeSubscriptionCloakEnabled( - env: { MAKA_CLAUDE_SUBSCRIPTION_CLOAK?: string } = process.env, -): boolean { - return env.MAKA_CLAUDE_SUBSCRIPTION_CLOAK !== '0'; -} - -export async function createMakaCliRuntimeContext( - input: CreateMakaCliRuntimeContextInput, -): Promise { - const stateRoot = input.stateRoot ?? input.workspaceRoot; - const configRoot = input.configRoot ?? input.workspaceRoot; - const agentGraphEnabled = input.surface === 'tui' || input.enableAgentGraph === true; - if (input.stateRoot !== undefined || input.configRoot !== undefined) { - await assertSessionBundleRootLayout({ - stateRoot, - configRoot, - allowShared: false, - }); - } - await resolveStorageRoot({ path: stateRoot, kind: 'interactive' }); - const store = createSessionStore(stateRoot); - const runStore = createSqliteAgentRunStore(stateRoot); - const runtimePersistence = await openRuntimeEventPersistence({ - workspaceRoot: stateRoot, - }); - const runtimeEventStore = runtimePersistence.runtimeEventStore; - const shellRunStore = createSqliteShellRunStore(stateRoot); - await Promise.all([runStore.ready?.(), shellRunStore.ready()]).catch(async (error) => { - await store.close?.().catch(() => {}); - runtimePersistence.close(); - runStore.close?.(); - shellRunStore.close(); - throw error; - }); - const artifactStore = createSqliteArtifactStore(stateRoot); - const agentGraphControlStore = agentGraphEnabled - ? createAgentGraphControlStore(stateRoot) - : undefined; - const worktreeChildExecutor = agentGraphEnabled - ? createGitWorktreeChildExecutor({ storageRoot: stateRoot }) - : undefined; - const agentGraphErrors = new Map(); - let agentGraphCoordinator: AgentGraphCoordinator | undefined; - let agentGraphSupervisorWakeCoordinator: AgentGraphSupervisorWakeCoordinator | undefined; - const connectionStore = createConnectionStore(configRoot); - const credentialStore = createFileCredentialStore(configRoot); - const settingsStore = createSettingsStore(configRoot); - const subagentCatalog = createConfiguredSubagentCatalog({ - getSettings: () => settingsStore.get(), - getConnection: (slug) => connectionStore.get(slug), - }); - // Read-only scanner over other agents' local session stores (~/.claude, - // ~/.codex). Independent of the Maka workspace — takes no workspaceRoot. - const foreignSessions = createForeignSessionStore(); - // Authoritative RuntimeEvent read model (issue #1055's session-recap - // generator projects through this instead of re-deriving its own lossy - // StoredMessage-based projection). Built once and shared — mirrors - // SessionManager's own construction in session-manager.ts's readModel(). - const runtimeReadModel = new RuntimeReadModel({ - runStore, - runtimeEventStore, - projectionCache: store, - }); - const targetInput = { - connectionStore, - credentialStore, - requestedModel: input.requestedModel, - }; - const target = input.requestedConnectionSlug - ? await resolveSessionTargetForSlug(input.requestedConnectionSlug, targetInput) - : await resolveDefaultSessionTarget(targetInput); - const modelChoices = await listReadyModelChoices({ connectionStore, credentialStore }); - const backends = new BackendRegistry(); - const shellRunListeners = new Set<(update: ShellRunUpdate) => void>(); - const shellRuns = new ShellRunProcessManager({ - store: shellRunStore, - newId: randomUUID, - now: Date.now, - onShellRunUpdate: (update) => { - for (const listener of shellRunListeners) { - try { - listener(update); - } catch { - // One UI observer must not suppress updates for the rest. - } - } - }, - }); - const sandboxManager = createBuiltinSandboxManager(); - const filesystemWorkerLaunchSpecProvider = - sandboxManager && isBuiltinFilesystemWorkerSandboxAvailable() - ? createFilesystemWorkerLaunchSpecProvider({ - runtime: 'node', - platform: process.platform, - resourceLocation: { kind: 'runtime' }, - }) - : undefined; - const filesystemWorker = - sandboxManager && filesystemWorkerLaunchSpecProvider - ? new FilesystemWorkerClient({ - sandboxManager, - getLaunchSpec: filesystemWorkerLaunchSpecProvider, - }) - : undefined; - const sandboxDiagnosticsProvider = createSandboxDiagnosticsProvider({ - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorkerLaunchSpecProvider - ? { getFilesystemWorkerLaunchSpec: filesystemWorkerLaunchSpecProvider } - : {}), - }); - const tools = buildBuiltinTools({ - shellRuns, - runtimeResources: shellRuns, - backgroundTasks: shellRuns, - ptyControls: shellRuns, - snapshotImage: createReadImageSnapshotter(artifactStore), - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorker - ? { - filesystemWorker, - } - : {}), - }); - // Child sessions get fresh catalog tools. Their Read tool cannot inspect - // parent runtime resources, and the SessionManager narrows this union to the - // selected profile after checking host capabilities (for example, a - // worktree executor for implementation children). Agent tools are excluded - // so children cannot recursively spawn from this surface. - const childAgentTools = agentGraphEnabled - ? buildChildAgentTools([ - ...buildBuiltinTools({ - snapshotImage: createReadImageSnapshotter(artifactStore), - ...(sandboxManager ? { sandboxManager } : {}), - ...(filesystemWorker - ? { - filesystemWorker, - } - : {}), - }), - buildNativeWebSearchTool(), - ]) - : []; - const automationManager = new AutomationManager({ - generateId: () => randomUUID(), - now: () => Date.now(), - }); - // A heartbeat-only CLI owns no durable Automations and must not reconcile the - // shared authority. A cron-enabled host persists through the same operational - // SQLite authority as Desktop. - const cronEnabled = input.automationCreateFreshRun !== undefined; - const automationStore = createAutomationStore(stateRoot); - // If the authority cannot be read, do not attempt a later replacement write. - let durableStoreReadable = true; - const syncAutomations = cronEnabled - ? (): void => { - if (!durableStoreReadable) return; - const durable = automationManager - .listAll() - .filter((a) => a.durable && (a.status === 'active' || a.status === 'paused')); - automationStore.sync(durable).catch((err) => { - console.warn('[runtime-bootstrap] failed to persist durable automations:', err); - }); - } - : (): void => { - /* heartbeat-only host owns no durable automations; never overwrite the shared store */ - }; - const automationTool = buildAutomationTool({ - automationManager, - onAutomationChange: syncAutomations, - cronEnabled, - }); - - // Load durable automations only on a host that can run them — a cron-disabled - // host must not adopt/reconcile crons it doesn't own (see above). - if (cronEnabled) { - try { - const saved = await automationStore.loadAll(); - automationManager.registerAll(saved); - } catch (err) { - durableStoreReadable = false; - console.error( - '[runtime-bootstrap] durable automation store unreadable; persistence disabled to avoid data loss:', - err, - ); - } - } - - const goalManager = new GoalManager({ generateId: () => randomUUID(), now: () => Date.now() }); - const goalTokenCache = new Map(); - let runtime!: SessionManager; - // Construct the lifecycle authority before exposing Goal tools. The runtime - // reference is only read after context creation, when a real turn settles. - const goalContinuation = new CliGoalContinuation({ - goalManager, - evaluator: { - async evaluate(prompt: string, sessionId: string): Promise { - const ai = (await import('ai')) as unknown as { - generateText(opts: Record): Promise<{ text: string }>; - }; - const header = await store.readHeader(sessionId); - const ready = await resolveSessionTargetForSlug(header.llmConnectionSlug, { - connectionStore, - credentialStore, - requestedModel: header.model, - }); - const modelFetch = buildSubscriptionModelFetch({ - connection: ready.connection, - sessionId: 'goal-evaluator', - modelId: ready.model, - ...(ready.connection.providerType === 'claude-subscription' - ? { - claude: { - cloakEnabled: isMakaClaudeSubscriptionCloakEnabled(), - deviceId: await getOrCreateCliClaudeDeviceId(configRoot), - accountUuid: ready.oauthTokens?.account_uuid ?? '', - }, - } - : {}), - }); - const result = await ai.generateText({ - model: getAIModel({ - connection: ready.connection, - apiKey: ready.apiKey ?? '', - modelId: ready.model, - fetch: modelFetch, - }), - prompt, - providerOptions: buildProviderOptions( - ready.connection, - ready.model, - header.thinkingLevel, - ), - maxOutputTokens: 1024, - }); - return result.text; - }, - }, - async getRecentContext(sessionId: string): Promise { - const messages = await runtime.getMessages(sessionId); - let total = 0; - for (const message of messages) { - if (message.type === 'token_usage') - total += message.total ?? message.input + message.output; - } - goalTokenCache.set(sessionId, total); - return messages - .slice(-10) - .filter((message) => message.type === 'user' || message.type === 'assistant') - .slice(-6) - .map( - (message) => - `[${message.type}]: ${(message.type === 'user' || message.type === 'assistant' ? message.text : '').slice(0, 500)}`, - ) - .join('\n'); - }, - getTokenCount: (sessionId: string) => goalTokenCache.get(sessionId) ?? 0, - }); - - // One-sentence session recap (issue #1055): a tool-free model call over the - // session's own history, never written back to it. Mirrors the goal - // evaluator's connection resolution + call shape above. - const recap: SessionRecapGenerator = { - async generate(sessionId, reason) { - let modelId = ''; - // The actual bounded request sent to the model (projection + budget trim - // + trailing instruction), persisted verbatim to the artifact below. - let requestMessages: ModelMessage[] = []; - let rawText = ''; - let cleaned = ''; - let errorMessage: string | undefined; - try { - // Authoritative RuntimeEvent projection (issue #1182 review): reuses - // the same read model, budget policy, and replay-plan projection the - // backend uses for its own history, instead of re-deriving a lossy - // StoredMessage-based one. - const view = await runtimeReadModel.getSessionView(sessionId); - const header = await store.readHeader(sessionId); - const ready = await resolveSessionTargetForSlug(header.llmConnectionSlug, { - connectionStore, - credentialStore, - requestedModel: header.model, - }); - modelId = ready.model; - const modelFetch = buildSubscriptionModelFetch({ - connection: ready.connection, - sessionId: 'session-recap', - modelId: ready.model, - ...(ready.connection.providerType === 'claude-subscription' - ? { - claude: { - cloakEnabled: isMakaClaudeSubscriptionCloakEnabled(), - deviceId: await getOrCreateCliClaudeDeviceId(configRoot), - accountUuid: ready.oauthTokens?.account_uuid ?? '', - }, - } - : {}), - }); - requestMessages = buildSessionRecapMessages({ - events: view.events, - connection: ready.connection, - modelId: ready.model, - }); - const ai = (await import('ai')) as unknown as { - generateText(opts: Record): Promise<{ text: string }>; - }; - const result = await ai.generateText({ - model: getAIModel({ - connection: ready.connection, - apiKey: ready.apiKey ?? '', - modelId: ready.model, - fetch: modelFetch, - }), - messages: requestMessages, - providerOptions: buildProviderOptions( - ready.connection, - ready.model, - header.thinkingLevel, - ), - maxOutputTokens: 1024, - }); - rawText = result.text; - cleaned = cleanRecapText(rawText); - return { ok: true as const, text: cleaned, raw: rawText }; - } catch (error) { - errorMessage = error instanceof Error ? error.message : String(error); - return { ok: false as const, error: errorMessage }; - } finally { - try { - await artifactStore.create({ - sessionId, - turnId: randomUUID(), - name: 'recap-request.json', - kind: 'file', - content: JSON.stringify( - { - reason, - model: modelId, - messageCount: requestMessages.length, - messages: requestMessages, - raw: rawText, - cleaned, - ...(errorMessage ? { error: errorMessage } : {}), - }, - null, - 2, - ), - ...(cleaned ? { summary: cleaned.slice(0, 100) } : {}), - }); - } catch { - // Best-effort persistence; recap must work even if the artifact store fails. - } - } - }, - }; - - const goalTools = - input.surface === 'tui' - ? buildGoalTools({ - goalManager, - goalContinuation, - getTokenCount: (sessionId: string) => goalTokenCache.get(sessionId) ?? 0, - }) - : []; - const subagentTools = agentGraphEnabled - ? buildParentAgentTools({ - definitions: listRunnableBuiltinAgentDefinitions({ - tools: childAgentTools.filter((tool) => tool.name !== 'WebSearch'), - worktreeChildExecutorAvailable: worktreeChildExecutor !== undefined, - }), - }) - : []; - const subagentToolNames = new Set(subagentTools.map((tool) => tool.name)); - const surfaceTools = - input.surface === 'tui' ? [buildAskUserQuestionTool(), buildRequestSandboxBoundaryTool()] : []; - let cliProductToolSurface: EffectiveProductToolSurface; - const resolveCliSkillHost: HostCapabilitiesResolver = () => - cliProductToolSurface.hostCapabilities; - const skillShadowTracker = new SkillShadowSelectionTracker(); - const skillTool = buildSkillAgentTool( - ({ cwd }) => resolveSkillDiscoveryPaths(cwd, configRoot), - resolveCliSkillHost, - { shadowTracker: skillShadowTracker }, - ); - const skillSearchTool = buildSkillSearchAgentTool( - ({ cwd }) => resolveSkillDiscoveryPaths(cwd, configRoot), - resolveCliSkillHost, - { shadowTracker: skillShadowTracker }, - ); - const boundTools = [ - ...tools, - automationTool, - ...goalTools, - skillTool, - skillSearchTool, - ...subagentTools, - ...surfaceTools, - ]; - assertProductBindingCatalogClean( - 'cli', - boundTools.map((tool) => tool.name), - ); - cliProductToolSurface = projectEffectiveProductToolSurface({ - host: 'cli', - tools: boundTools, - policy: { - economy: input.surface === 'tui' && !process.env.MAKA_DISABLE_DEFERRED_TOOLS, - }, - }); - const allTools = [...cliProductToolSurface.tools]; - - backends.register('ai-sdk', async (ctx) => { - const header = - input.sessionCwdOverride?.sessionId === ctx.sessionId - ? { ...ctx.header, cwd: input.sessionCwdOverride.cwd } - : ctx.header; - // Resolve the session's own connection — not the global default — so a - // /model switch that rebinds the session to another provider actually runs - // on that provider (the desktop app resolves the backend the same way). - const ready = await resolveSessionTargetForSlug(header.llmConnectionSlug, { - connectionStore, - credentialStore, - requestedModel: header.model, - }); - const modelFetch = buildSubscriptionModelFetch({ - connection: ready.connection, - sessionId: ctx.sessionId, - modelId: ready.model, - ...(ready.connection.providerType === 'claude-subscription' - ? { - claude: { - cloakEnabled: isMakaClaudeSubscriptionCloakEnabled(), - deviceId: await getOrCreateCliClaudeDeviceId(configRoot), - accountUuid: ready.oauthTokens?.account_uuid ?? '', - }, - } - : {}), - }); - const sandboxDiagnosticsSnapshot = await sandboxDiagnosticsProvider.resolve({ - mode: header.permissionMode, - cwd: header.cwd, - }); - const streamConnectTimeoutMs = resolveCliStreamConnectTimeoutMs(); - const agentGraphSupervisorTools = - !ctx.tools && agentGraphEnabled - ? await agentGraphCoordinator!.toolsForSession(ctx.sessionId) - : []; - const settings = await settingsStore.get(); - const routedChildTools = routeWebSearchTools({ - tools: - settings.webSearch.defaultProvider === 'model' - ? childAgentTools - : childAgentTools.filter((tool) => tool.name !== 'WebSearch'), - settings: settings.webSearch, - connection: ready.connection, - model: ready.model, - privacy: settings.privacy, - }); - const targetSubagentTools = - !ctx.tools && agentGraphEnabled - ? buildParentAgentTools({ - definitions: listRunnableBuiltinAgentDefinitions({ - tools: routedChildTools, - worktreeChildExecutorAvailable: worktreeChildExecutor !== undefined, - }), - }) - : []; - const routedTools = routeWebSearchTools({ - tools: ctx.tools - ? ctx.tools - : [ - ...allTools.filter((tool) => !subagentToolNames.has(tool.name)), - ...targetSubagentTools, - ...agentGraphSupervisorTools, - ], - settings: settings.webSearch, - connection: ready.connection, - model: ready.model, - privacy: settings.privacy, - allowAddNative: ctx.tools === undefined, - }); - const productToolSurface = projectEffectiveProductToolSurface({ - host: 'cli', - tools: routedTools, - policy: cliProductToolSurface.identity.policy, - }); - const backendTools = [...productToolSurface.tools]; - const admitsAgentChildren = productToolSurface.boundSurfaceIds.includes(AGENT_TOOL_GROUP_ID); - return new AiSdkBackend({ - sessionId: ctx.sessionId, - header: { ...header, model: ready.model }, - appendMessage: - ctx.appendMessage ?? ((message) => ctx.store.appendMessage(ctx.sessionId, message)), - readExecutionBoundary: () => ctx.store.readExecutionBoundary!(ctx.sessionId), - ...(input.surface === 'tui' - ? { - createSandboxBoundaryRequest: (request) => - ctx.store.createSandboxBoundaryRequest!(request), - settleSandboxBoundaryRequest: (request) => - ctx.store.settleSandboxBoundaryRequest!(request), - } - : {}), - connection: ready.connection, - apiKey: ready.apiKey, - modelId: ready.model, - modelFactory: (modelInput) => getAIModel({ ...modelInput, fetch: modelFetch }), - tools: backendTools, - sandboxDiagnosticsSnapshot, - toolAvailability: productToolSurface.toolAvailability, - ...(admitsAgentChildren - ? { - spawnChildAgent: (childInput) => runtime.spawnChildAgent(ctx.sessionId, childInput), - spawnChildSession: (childInput) => - runtime.spawnChildSession(ctx.sessionId, { - spawnedBy: { - parentRunId: childInput.parentRunId, - parentTurnId: childInput.parentTurnId, - toolCallId: childInput.toolCallId, - }, - agentProfile: childInput.agentProfile, - ...(childInput.subagentId ? { subagentId: childInput.subagentId } : {}), - prompt: childInput.prompt, - ...(childInput.swarm ? { swarm: childInput.swarm } : {}), - abortSignal: childInput.abortSignal, - ...(childInput.onReady ? { onReady: childInput.onReady } : {}), - ...(childInput.onEvent ? { onEvent: childInput.onEvent } : {}), - }), - prepareChildAgentResume: (sourceRunId) => - runtime.prepareChildAgentResume(ctx.sessionId, sourceRunId), - resumeChildAgent: (childInput) => runtime.resumeChildAgent(ctx.sessionId, childInput), - retryChildAgent: (childInput) => runtime.retryChildAgent(ctx.sessionId, childInput), - listChildAgents: () => runtime.listChildAgents(ctx.sessionId), - readChildAgentOutput: (childInput) => - runtime.readChildAgentOutput(ctx.sessionId, childInput), - } - : {}), - providerOptions: buildProviderOptions(ready.connection, ready.model, header.thinkingLevel), - ...(streamConnectTimeoutMs !== undefined ? { streamConnectTimeoutMs } : {}), - contextBudget: buildDefaultContextBudgetPolicy(ready.connection, { - name: 'cli-default-history-budget', - modelId: ready.model, - }), - supportsVision: resolveModelVisionSupport( - ready.connection.providerType, - ready.connection.models, - ready.model, - relayModelProfile(ready.connection, ready.model)?.vision, - ), - readAttachmentBytes: createAttachmentByteReader({ artifactStore, sessionId: ctx.sessionId }), - loadHistoryCompact: (event) => loadHistoryCompactBlocksFromArtifacts(artifactStore, event), - loadHistoryCompactCheckpoint: ctx.loadHistoryCompactCheckpoint, - summarizeHistoryCompact: buildLlmHistorySummarizer({ - // Reuse the same connection/model the session already drives, so the - // summary stays consistent with the model that will consume it. - resolveModel: () => - getAIModel({ - connection: ready.connection, - apiKey: ready.apiKey, - modelId: ready.model, - fetch: modelFetch, - }), - providerOptions: buildProviderOptions(ready.connection, ready.model, header.thinkingLevel), - }), - // The canonical metering sink (#1679). Without it this composition root - // produces diagnostics and no accounting at all — for `/compact` and for - // ordinary sends alike. - ...(ctx.recordModelCallAttempt ? { recordModelCallAttempt: ctx.recordModelCallAttempt } : {}), - recordHistoryCompactCheckpoint: ctx.recordHistoryCompactCheckpoint, - loadTurnRuntimeEvents: ctx.loadTurnRuntimeEvents, - allowMidTurnHistoryCompaction: ctx.allowMidTurnHistoryCompaction, - systemPrompt: - ctx.systemPrompt ?? - (async ({ cwd, emitSkillCatalogTrace }) => { - const settings = await settingsStore.get(); - return buildCliSystemPrompt({ - settings, - cwd, - workspaceRoot: configRoot, - host: productToolSurface.hostCapabilities, - modelContextWindow: resolveSelectedModelContextWindow(ready.connection, ready.model), - onSkillSelection: (report) => - emitSkillCatalogTrace?.('Skill catalog selection completed', { - policyVersion: report.policyVersion, - budgetChars: report.budgetChars, - usedChars: report.usedChars, - totalCount: report.totalCount, - eligibleCount: report.eligibleCount, - advertisedCount: report.advertisedCount, - omittedCount: report.omittedCount, - }), - }); - }), - turnTailPrompt: ({ cwd }) => - buildCliTurnTailPrompt({ cwd, sessionId: ctx.sessionId, automationManager, goalManager }), - shellRunContextSummary: ctx.shellRunContextSummary, - recordRunTrace: ctx.recordRunTrace, - ...(ctx.recordProviderRequestCapture - ? { - recordProviderRequestCapture: createProviderRequestCaptureRecorder({ - persistArtifact: async (capture) => { - const artifact = await persistProviderRequestCaptureArtifact(artifactStore, { - sessionId: ctx.sessionId, - turnId: capture.turnId, - captureId: capture.captureId, - step: capture.step, - serializedRequest: capture.serializedRequest, - now: Date.now(), - }); - return { artifactId: artifact.id }; - }, - recordLedger: ctx.recordProviderRequestCapture, - }), - recordProviderRequestAttempt: ctx.recordProviderRequestAttempt, - } - : {}), - newId: randomUUID, - now: Date.now, - ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}), - ...(runtimePersistence.runtimeCommitStore - ? { runtimeCommitSink: runtimePersistence.runtimeCommitStore } - : {}), - }); - }); - - const resolveChildTools = async (sessionId: string): Promise => { - const header = await store.readHeader(sessionId); - const ready = await resolveSessionTargetForSlug(header.llmConnectionSlug, { - connectionStore, - credentialStore, - requestedModel: header.model, - }); - const settings = await settingsStore.get(); - return routeWebSearchTools({ - tools: - settings.webSearch.defaultProvider === 'model' - ? childAgentTools - : childAgentTools.filter((tool) => tool.name !== 'WebSearch'), - settings: settings.webSearch, - connection: ready.connection, - model: ready.model, - privacy: settings.privacy, - }); - }; - - runtime = new SessionManager({ - store, - runStore, - runtimeEventStore, - ...(runtimePersistence.runtimeCommitStore - ? { - runtimeCommitSink: runtimePersistence.runtimeCommitStore, - toolBoundaryProtocol: runtimePersistence.runtimeCommitStore.toolBoundaryProtocol, - } - : {}), - shellRuns, - backends, - subagentCatalog, - runtimeSource: input.runtimeSource ?? (input.surface === 'activation' ? 'gateway' : undefined), - safeBoundaryResumeEnabled: - input.safeBoundaryResumeEnabled ?? - (input.surface === 'activation' || process.env.MAKA_RUNTIME_SAFE_BOUNDARY_RESUME === '1'), - onContinuationLifecycleEvent: (event) => { - const writeDiagnostic = input.surface === 'activation' ? console.error : console.info; - writeDiagnostic('[runtime-resume]', JSON.stringify(event)); - }, - inspectContinuationSafety: createLocalContinuationSafetyInspector({ - readSessionCwd: async (sessionId) => (await store.readHeader(sessionId)).cwd, - resolveWorkspaceIdentity: async (cwd) => resolveWorkspaceIdentity({ path: cwd }), - listAvailableToolNames: async () => allTools.map((tool) => tool.name), - hasPendingBackgroundOperations: async (sessionId) => { - const [shellUpdates, runs] = await Promise.all([ - shellRuns.listSessionUpdates(sessionId), - runStore.listSessionRuns(sessionId), - ]); - return ( - shellUpdates.some((update) => isActiveShellRunStatus(update.result.status)) || - runs.some( - (run) => - run.parentRunId !== undefined && - ['created', 'running', 'waiting_for_user'].includes(run.status), - ) - ); - }, - }), - ...(agentGraphEnabled - ? { childTools: childAgentTools, resolveChildTools, worktreeChildExecutor } - : {}), - runtimeInvocationObserver: input.runtimeInvocationObserver, - onSessionTitleChanged: input.onSessionTitleChanged, - ...(input.surface === 'tui' - ? { - generateSessionTitle: async ({ sessionId, header, sourceText }) => { - const ready = await resolveSessionTargetForSlug(header.llmConnectionSlug, { - connectionStore, - credentialStore, - requestedModel: header.model, - }); - const modelFetch = buildSubscriptionModelFetch({ - connection: ready.connection, - sessionId, - modelId: ready.model, - ...(ready.connection.providerType === 'claude-subscription' - ? { - claude: { - cloakEnabled: isMakaClaudeSubscriptionCloakEnabled(), - deviceId: await getOrCreateCliClaudeDeviceId(configRoot), - accountUuid: ready.oauthTokens?.account_uuid ?? '', - }, - } - : {}), - }); - return generateRuntimeSessionTitle({ - model: getAIModel({ - connection: ready.connection, - apiKey: ready.apiKey ?? '', - modelId: ready.model, - fetch: modelFetch, - }), - providerOptions: buildProviderOptions(ready.connection, ready.model), - sourceText, - }); - }, - } - : {}), - cleanupHistoryCompactArtifacts: async (cleanupInput) => { - await cleanupLegacyHistoryCompactArtifacts({ - ...cleanupInput, - artifactStore, - onDiagnostic: (diagnostic) => console.warn('[history-compact-cleanup]', diagnostic), - }); - }, - newId: randomUUID, - now: Date.now, - }); - if (agentGraphControlStore) { - agentGraphSupervisorWakeCoordinator = new AgentGraphSupervisorWakeCoordinator({ - activityRegistry: goalContinuation.activities, - wakeStore: agentGraphControlStore, - readSnapshot: (rootSessionId) => agentGraphCoordinator!.getSnapshot(rootSessionId), - startTurn: async (sessionId, message, activity, abortSignal, isCurrent) => { - if (!(await isCurrent())) { - return { - kind: 'superseded', - turnId: message.turnId, - reason: 'Agent graph supervisor checkpoint was superseded before execution.', - }; - } - let stopPromise: Promise | undefined; - const stop = (): void => { - stopPromise ??= runtime.stopSession(sessionId, { source: 'graph_supervisor' }); - }; - abortSignal.addEventListener('abort', stop, { once: true }); - if (abortSignal.aborted) stop(); - try { - return await drainGoalTurn({ - events: runtime.sendMessage(sessionId, message), - turnId: message.turnId, - activity, - }); - } finally { - abortSignal.removeEventListener('abort', stop); - await stopPromise; - } - }, - isSessionDeliverable: async (sessionId) => { - try { - const header = await store.readHeader(sessionId); - return !header.isArchived && header.status !== 'archived'; - } catch (error) { - if (isSessionNotFoundError(error)) return false; - throw error; - } - }, - inspectAttempt: async (rootSessionId, attemptId, turnId) => { - const runs = (await runStore.listSessionRuns(rootSessionId)).filter( - (run) => run.agentGraphWakeAttemptId === attemptId && run.turnId === turnId, - ); - if (runs.length > 1) { - throw new Error( - `Agent graph supervisor wake attempt ${attemptId} has multiple AgentRuns`, - ); - } - return runs[0]?.status ?? 'missing'; - }, - recoverContextOverflow: (rootSessionId, { abortSignal }) => - recoverAgentGraphSupervisorContextOverflow({ - rootSessionId, - compactTurnId: randomUUID(), - abortSignal, - compactSession: (sessionId, input) => runtime.compactSession(sessionId, input), - }), - shouldWake: shouldWakeAgentSwarmSupervisor, - renderWake: renderAgentSwarmSupervisorWake, - newId: randomUUID, - onDiagnostic: (diagnostic) => { - console.warn('[agent-graph-supervisor-wake]', JSON.stringify(diagnostic)); - }, - onError: (rootSessionId, error) => { - agentGraphErrors.set(rootSessionId, error); - }, - }); - agentGraphCoordinator = new AgentGraphCoordinator({ - sessionStore: store, - runStore, - runtimeEventStore, - controlStore: agentGraphControlStore, - runtime, - newId: randomUUID, - onReconciliation: (rootSessionId, result) => { - agentGraphSupervisorWakeCoordinator!.notify(rootSessionId, result); - }, - onCheckpoint: (rootSessionId) => { - agentGraphSupervisorWakeCoordinator!.notify(rootSessionId); - }, - onError: (rootSessionId, error) => { - agentGraphErrors.set(rootSessionId, error); - }, - }); - } - await runtime.recoverInterruptedSessions(); - - const automationScheduler = new AutomationScheduler({ - automationManager, - canFire: async (automation) => { - if ( - automation.kind === 'heartbeat' && - goalContinuation.activities.whenIdle(automation.sessionId) - ) { - return false; - } - return evaluateAutomationCanFire(automation, { - // The CLI has no incognito UI, but the setting is shared — honour it if set. - isIncognitoActive: async () => - (await settingsStore.get()).privacy?.incognitoActive === true, - readSessionHeader: (sessionId) => store.readHeader(sessionId), - // Default idle set {active, done, waiting_for_user} — a session parked - // waiting for the user IS the wakeup's home scenario (#639): the - // heartbeat starts a turn in place of the user. It still never fires - // into a 'running' (mid-turn) session. - // Cron is disabled here (createFreshRun omitted); the scheduler ignores it. - }); - }, - // Heartbeat: inject into the automation's session; resolve after the drain. - // The CLI has no multi-session UI, so cron (fresh-session) is disabled — - // createFreshRun is omitted, so the tool advertises heartbeat only. - injectTurn: async (sessionId, prompt, automationId) => { - const turnId = randomUUID(); - const outcome = await goalContinuation.runAutomationTurn({ - sessionId, - turnId, - start: () => - runtime.sendMessage(sessionId, { - turnId, - text: prompt, - origin: { kind: 'automation', automationId }, - }), - }); - const error = - outcome.kind === 'errored' || outcome.kind === 'suspended' - ? outcome.reason - : outcome.kind === 'aborted' - ? 'Automation turn was aborted.' - : undefined; - return { - runId: turnId, - ok: outcome.kind === 'completed', - ...(error ? { error } : {}), - }; - }, - createFreshRun: input.automationCreateFreshRun, - // unref() the tick timer: a background poll must never hold the CLI - // process open. Without this, any bootstrap consumer that exits without - // close() (a finished one-shot run, a test) hangs on the 5s tick forever. - setTimeout: (fn, ms) => { - const timer = setTimeout(fn, ms); - timer.unref?.(); - return timer; - }, - clearTimeout: (timer) => clearTimeout(timer as ReturnType), - onStateChange: syncAutomations, - }); - - automationScheduler.start(); - - return { - workspaceRoot: input.workspaceRoot, - stateRoot, - configRoot, - cwd: input.cwd, - runtime, - target, - modelChoices, - tools: allTools, - skills: { - source: (cwd) => resolveSkillDiscoveryPaths(cwd, configRoot), - host: cliProductToolSurface.hostCapabilities, - }, - automationManager, - automationScheduler, - subscribeShellRunUpdates: (listener) => { - shellRunListeners.add(listener); - return () => shellRunListeners.delete(listener); - }, - listShellRunUpdates: (sessionId) => runtime.listShellRunUpdates(sessionId), - goalManager, - goalContinuation, - onboarding: createApiKeyOnboardingSurface({ - connectionStore, - credentialStore, - fetchModels: fetchProviderModels, - }), - recap, - foreignSessions, - ...(agentGraphCoordinator && agentGraphSupervisorWakeCoordinator - ? { - agentGraph: { - reserveActivity: (sessionId: string) => goalContinuation.activities.reserve(sessionId), - waitForCompletion: async (sessionId: string) => { - for (;;) { - await agentGraphCoordinator!.waitForIdle(sessionId); - await agentGraphSupervisorWakeCoordinator!.waitForIdle(); - await agentGraphCoordinator!.waitForIdle(sessionId); - const error = agentGraphErrors.get(sessionId); - if (error !== undefined) throw error; - const snapshot = await agentGraphCoordinator!.getSnapshot(sessionId); - if (snapshot.closed || snapshot.scheduleRevision === 0) return; - await agentGraphSupervisorWakeCoordinator!.waitForIdle(); - await agentGraphCoordinator!.waitForIdle(sessionId); - const settled = await agentGraphCoordinator!.getSnapshot(sessionId); - if (settled.closed) return; - throw new Error( - `Agent graph became idle without finish (status=${settled.status}, revision=${settled.scheduleRevision}, snapshot=${settled.snapshotVersion})`, - ); - } - }, - }, - } - : {}), - close: async () => { - // Stop the automation scheduler's timer (else it keeps the process alive - // and ticks into a stopped session), then terminate background shell runs. - automationScheduler.dispose(); - goalContinuation.dispose(); - goalManager.dispose(); - await agentGraphSupervisorWakeCoordinator?.close(); - await agentGraphCoordinator?.close(); - agentGraphControlStore?.close(); - await shellRuns.terminateAll(); - shellRunListeners.clear(); - await store.close?.(); - runtimePersistence.close(); - runStore.close?.(); - shellRunStore.close(); - artifactStore.close?.(); - }, - }; -} - -export async function getOrCreateCliClaudeDeviceId( - workspaceRoot: string, - deps: GetOrCreateCliClaudeDeviceIdDeps = {}, -): Promise { - const deviceIdFilePath = join(workspaceRoot, '.maka_cli_claude_device_id'); - try { - const existing = (await readFile(deviceIdFilePath, 'utf8')).trim(); - if (/^[a-f0-9]{64}$/i.test(existing)) return existing.toLowerCase(); - } catch { - // fall through to create; device id persistence is best-effort metadata. - } - - const next = (deps.newId ?? (() => randomBytes(32).toString('hex')))().toLowerCase(); - try { - await mkdir(dirname(deviceIdFilePath), { recursive: true }); - await writeFile(deviceIdFilePath, next, { mode: 0o600 }); - await chmod(deviceIdFilePath, 0o600); - } catch { - // best-effort persistence; use the generated id for this process if disk fails. - } - return next; -} diff --git a/packages/cli/src/runtime-host-cli-context.ts b/packages/cli/src/runtime-host-cli-context.ts index a7d175686e..7001abed76 100644 --- a/packages/cli/src/runtime-host-cli-context.ts +++ b/packages/cli/src/runtime-host-cli-context.ts @@ -1,3 +1,4 @@ +import { NO_REAL_CONNECTION_CODE } from '@maka/core'; import type { ConnectionCatalogEntry, ConnectionCatalogSnapshot } from '@maka/core/runtime-policy'; import { connectOrSpawnRuntimeHost, @@ -27,6 +28,7 @@ export async function connectRuntimeHostCli( input: { readonly rootPath: string; readonly surface: ClientSurface; + readonly legacyConfigurationRoot?: string; }, overrides: Partial = {}, ): Promise { @@ -43,6 +45,9 @@ export async function connectRuntimeHostCli( surface: input.surface, protocol: { min: RUNTIME_HOST_PROTOCOL_VERSION, max: RUNTIME_HOST_PROTOCOL_VERSION }, candidateEntrypoint: deps.executionCandidateEntrypoint, + ...(input.legacyConfigurationRoot + ? { legacyConfigurationRoot: input.legacyConfigurationRoot } + : {}), }); if (connected.kind === 'incompatible') { throw new Error( @@ -80,7 +85,7 @@ export function resolveRuntimeHostCliTarget( throw new Error( input.connectionSlug ? `Runtime Host model connection is unavailable: ${input.connectionSlug}` - : 'Runtime Host has no default model connection', + : `${NO_REAL_CONNECTION_CODE}:missing_default_connection: Runtime Host has no default model connection`, ); } const model = diff --git a/packages/cli/src/runtime-host-onboarding.ts b/packages/cli/src/runtime-host-onboarding.ts new file mode 100644 index 0000000000..e829daf6a6 --- /dev/null +++ b/packages/cli/src/runtime-host-onboarding.ts @@ -0,0 +1,119 @@ +import { deriveConnectionSlug } from '@maka/core/llm-connections'; +import type { ConnectionCatalogSnapshot } from '@maka/core/runtime-policy'; +import { + readRuntimeHostConnectionCatalog, + type RuntimeHostConnection, +} from '@maka/runtime-host/client'; +import { listApiKeyOnboardableProviders } from './onboarding-catalog.js'; +import type { + MakaOnboardingSurface, + ModelChoice, + OnboardingProviderEntry, +} from './pi-tui-contracts.js'; + +/** Adapt the TUI onboarding workflow to Host-owned verification and persistence. */ +export function createRuntimeHostOnboardingSurface( + connection: RuntimeHostConnection, +): MakaOnboardingSurface { + return { + listProviders: async () => projectProviders(await readRuntimeHostConnectionCatalog(connection)), + verify: async (input) => { + try { + const result = await connection.request('connection.onboarding.verify', { + providerType: input.providerType, + apiKey: normalizedSecret(input.apiKey), + }); + return result.kind === 'verified' + ? { kind: 'ok', models: [...result.models] } + : { kind: 'error', text: onboardingFailureText(result) }; + } catch (error) { + return { kind: 'error', text: errorText(error) }; + } + }, + save: async (input) => { + try { + const result = await connection.request('connection.onboarding.save', { + providerType: input.providerType, + apiKey: normalizedSecret(input.apiKey), + enabledModelIds: [...input.enabledModelIds], + }); + if (result.kind !== 'saved') { + return { kind: 'error', text: onboardingFailureText(result) }; + } + return { + kind: 'ok', + modelChoices: projectRuntimeHostModelChoices( + await readRuntimeHostConnectionCatalog(connection), + ), + }; + } catch (error) { + return { kind: 'error', text: errorText(error) }; + } + }, + }; +} + +export function projectRuntimeHostModelChoices(catalog: ConnectionCatalogSnapshot): ModelChoice[] { + const choices: ModelChoice[] = []; + for (const connection of catalog.connections) { + if (!connection.enabled) continue; + const modelsById = new Map(connection.models.map((model) => [model.id, model])); + const ids = new Set(connection.enabledModelIds); + if (catalog.defaultTarget?.connectionId === connection.connectionId) { + ids.add(catalog.defaultTarget.modelId); + } + for (const model of ids) { + choices.push({ + connectionSlug: connection.slug, + connectionName: connection.name, + providerType: connection.providerType, + model, + isDefaultConnection: catalog.defaultTarget?.connectionId === connection.connectionId, + contextWindow: modelsById.get(model)?.contextWindow, + }); + } + } + return choices; +} + +function projectProviders(catalog: ConnectionCatalogSnapshot): OnboardingProviderEntry[] { + const bySlug = new Map(catalog.connections.map((connection) => [connection.slug, connection])); + return listApiKeyOnboardableProviders().map((provider) => { + const candidate = bySlug.get(deriveConnectionSlug(provider.providerType)); + const existing = candidate?.providerType === provider.providerType ? candidate : undefined; + return { + ...provider, + hasConnection: existing !== undefined, + enabledModelIds: existing ? [...existing.enabledModelIds] : [], + }; + }); +} + +function normalizedSecret(value: string | undefined): string | null { + const secret = value?.trim() ?? ''; + return secret.length === 0 ? null : secret; +} + +function onboardingFailureText(input: { + readonly kind: 'rejected' | 'failed'; + readonly reason?: string; + readonly errorClass?: string; +}): string { + if (input.kind === 'failed') return `Connection verification failed: ${input.errorClass}`; + switch (input.reason) { + case 'credential_not_configured': + return 'API key is required'; + case 'provider_unsupported': + return 'This provider does not support API-key onboarding'; + case 'slug_conflict': + return 'The provider connection name is already used by another provider'; + case 'model_unavailable': + return 'The selected model is no longer available'; + default: + return 'Connection onboarding was rejected'; + } +} + +function errorText(error: unknown): string { + return error instanceof Error ? error.message : String(error); +} diff --git a/packages/cli/src/runtime-host-run-command.ts b/packages/cli/src/runtime-host-run-command.ts index 710cf0e02b..3c831a57f7 100644 --- a/packages/cli/src/runtime-host-run-command.ts +++ b/packages/cli/src/runtime-host-run-command.ts @@ -92,9 +92,6 @@ export function createRuntimeHostRunContext( input: Parameters[0], overrides: Partial = {}, ): MakaRunContext { - if (input.maxSteps !== undefined) { - throw new Error('--max-steps is not available through the Runtime Host yet'); - } const target = resolveRuntimeHostCliTarget(catalog, { ...(input.requestedConnectionSlug ? { connectionSlug: input.requestedConnectionSlug } : {}), ...(input.requestedModel ? { model: input.requestedModel } : {}), @@ -116,6 +113,7 @@ export function createRuntimeHostRunContext( input.runOutcomeObserver, input.enableAgentGraph === true, input.sessionCwdOverride, + input.maxSteps, ); return { runtime, @@ -138,6 +136,7 @@ class RuntimeHostRunRuntime implements MakaRunRuntime { readonly #observer: ((outcome: MakaRunOutcome) => void | Promise) | undefined; readonly #graphEnabled: boolean; readonly #sessionCwdOverride: MakaRunContextInput['sessionCwdOverride']; + readonly #maxSteps: number | undefined; readonly #unsubscribeTranscriptReplacements: () => void; #sessionId: string | undefined; #activeTurn: { sessionId: string; turnId: string; runId: string } | undefined; @@ -161,12 +160,14 @@ class RuntimeHostRunRuntime implements MakaRunRuntime { observer: ((outcome: MakaRunOutcome) => void | Promise) | undefined, graphEnabled: boolean, sessionCwdOverride: MakaRunContextInput['sessionCwdOverride'], + maxSteps: number | undefined, ) { this.#connection = connection; this.#driver = driver; this.#observer = observer; this.#graphEnabled = graphEnabled; this.#sessionCwdOverride = sessionCwdOverride; + this.#maxSteps = maxSteps; this.#interactions = new NonInteractiveInteractionController(driver, (pending) => this.#stopForInteraction(pending), ); @@ -192,9 +193,11 @@ class RuntimeHostRunRuntime implements MakaRunRuntime { if (input.turnOrchestration?.mode === 'graph') { this.#graphAdmissionTurnIds = graphSupervisorTurnIds(await this.#driver.readMessages()); } + const maxSteps = input.maxSteps ?? this.#maxSteps; const turn = await this.#driver.preparePrompt(input.text, { turnId: input.turnId, ...(input.turnOrchestration ? { turnOrchestration: input.turnOrchestration } : {}), + ...(maxSteps !== undefined ? { maxSteps } : {}), }); if (!turn.runId) throw new Error('Runtime Host did not return a Run identity'); const activeTurn = { sessionId: turn.sessionId, turnId: turn.turnId, runId: turn.runId }; @@ -218,6 +221,12 @@ class RuntimeHostRunRuntime implements MakaRunRuntime { await this.#driver.respondToSandboxBoundary(response); } + async resumeLatest(sessionId: string): Promise | null> { + await this.#attach(sessionId); + const plan = await this.#connection.request('turn.resume.query', { sessionId }); + return plan.disposition === 'ready' ? this.#driver.resumeLatest() : null; + } + async stopSession(sessionId: string): Promise { this.#stopRequested = true; await this.#attach(sessionId); @@ -297,9 +306,12 @@ class RuntimeHostRunRuntime implements MakaRunRuntime { this.#sessionCwdOverride?.sessionId === sessionId && switched.summary.cwd !== this.#sessionCwdOverride.cwd ) { - throw new Error( - `Runtime Host cannot resume Session ${sessionId}: its stored working directory is not canonical`, - ); + const moved = await this.#driver.moveSession(this.#sessionCwdOverride.cwd); + if (moved.cwd !== this.#sessionCwdOverride.cwd) { + throw new Error( + `Runtime Host cannot resume Session ${sessionId}: its working directory could not be canonicalized`, + ); + } } this.#sessionId = sessionId; } diff --git a/packages/cli/src/runtime-host-session-channel.ts b/packages/cli/src/runtime-host-session-channel.ts index d0d221932f..aa5687dcb4 100644 --- a/packages/cli/src/runtime-host-session-channel.ts +++ b/packages/cli/src/runtime-host-session-channel.ts @@ -27,7 +27,7 @@ export interface RuntimeHostSessionChannelOpenResult { } export interface RuntimeHostSessionChannelOptions { - connection: RuntimeHostConnection; + connection: Pick; sessionId: string; now: () => number; onTurnStarted: (turn: MakaPreparedSessionTurn) => void; diff --git a/packages/cli/src/runtime-host-session-driver.ts b/packages/cli/src/runtime-host-session-driver.ts index 7ff75b9eaa..19966f0742 100644 --- a/packages/cli/src/runtime-host-session-driver.ts +++ b/packages/cli/src/runtime-host-session-driver.ts @@ -16,6 +16,7 @@ import type { CreateSessionInput } from '@maka/core/runtime-inputs'; import { executionBoundaryDisplayMode } from '@maka/core/sandbox-boundary'; import type { SandboxBoundaryResponse } from '@maka/core/sandbox-boundary'; import type { ThinkingLevel } from '@maka/core/model-thinking'; +import type { SkillInvocationResult } from '@maka/core/skill-invocation'; import type { UserQuestionResponse } from '@maka/core/user-question'; import type { ContextDiagnostics } from '@maka/runtime'; import { @@ -48,7 +49,7 @@ import type { RewindTarget, SessionResumeAvailability, } from './session-driver.js'; -import { inspectSessionResumeAvailability } from './session-driver.js'; +import { inspectSessionResumeAvailability, SkillInvocationBlockedError } from './session-driver.js'; import { cwdRank, firstLine, @@ -58,7 +59,7 @@ import { const MAX_CATALOG_ATTEMPTS = 3; export interface RuntimeHostMakaSessionDriverInput { - connection: RuntimeHostConnection; + connection: RuntimeHostSessionDriverConnection; cwd: string; llmConnectionSlug: string; model: string; @@ -69,9 +70,16 @@ export interface RuntimeHostMakaSessionDriverInput { inspectCwdChanges?: InspectCwdChanges; } +type RuntimeHostSessionDriverConnection = Pick< + RuntimeHostConnection, + 'hostEpoch' | 'openSessionSubscription' | 'request' | 'startTurn' +>; + export interface RuntimeHostMakaSessionDriver extends MakaSessionDriver { createSession(input: CreateSessionInput): Promise; + moveSession(cwd: string): Promise; readMessages(): Promise; + resumeLatest(): AsyncIterable; subscribePendingInteractions(listener: (pending: InteractionPendingSnapshot) => void): () => void; subscribeStartedTurns(listener: (turn: MakaAttachedSessionTurn) => void): () => void; subscribeResolvedInteractions( @@ -91,7 +99,7 @@ export function createRuntimeHostMakaSessionDriver( } class RuntimeHostMakaSessionDriverImpl implements RuntimeHostMakaSessionDriver { - readonly #connection: RuntimeHostConnection; + readonly #connection: RuntimeHostSessionDriverConnection; readonly #newId: () => string; readonly #now: () => number; readonly #inspectCwdChanges: InspectCwdChanges; @@ -180,7 +188,7 @@ class RuntimeHostMakaSessionDriverImpl implements RuntimeHostMakaSessionDriver { const events = channel.eventsForTurn(turnId); const modelText = options.modelText ?? prompt; try { - const started = await this.#request('turn.start', { + const startInput = { sessionId, turnId, content: { @@ -188,13 +196,24 @@ class RuntimeHostMakaSessionDriverImpl implements RuntimeHostMakaSessionDriver { ...(modelText === prompt ? {} : { displayText: prompt }), }, ...(options.turnOrchestration ? { turnOrchestration: options.turnOrchestration } : {}), - }); + ...(options.maxSteps !== undefined ? { maxSteps: options.maxSteps } : {}), + }; + const result = await this.#connection.startTurn(startInput); + if (result.kind === 'blocked') { + throw new SkillInvocationBlockedError(result.skillInvocation); + } + const started = result.turn; + const skillInvocation = + result.skillInvocation.loaded.length > 0 || result.skillInvocation.failed.length > 0 + ? result.skillInvocation + : undefined; return { sessionId, turnId, runId: started.runId, events, summary: runtimeHostSessionSummary(configuration.session), + ...(skillInvocation ? { skillInvocation } : {}), }; } catch (error) { channel.failTurn(turnId, error); @@ -852,7 +871,7 @@ interface LoadedSessionConfiguration { } async function getRuntimeHostSession( - connection: RuntimeHostConnection, + connection: RuntimeHostSessionDriverConnection, sessionId: string, ): Promise { const result = await connection.request('session.catalog.query', { kind: 'get', sessionId }); @@ -870,7 +889,7 @@ function requireSession(item: SessionCatalogItem): SessionCatalogProjection { } async function updateRuntimeHostSession( - connection: RuntimeHostConnection, + connection: RuntimeHostSessionDriverConnection, sessionId: string, update: (current: SessionCatalogProjection) => Promise, ): Promise { @@ -884,7 +903,7 @@ async function updateRuntimeHostSession( } async function loadCurrentMessages( - connection: RuntimeHostConnection, + connection: RuntimeHostSessionDriverConnection, sessionId: string, ): Promise { const subscription = await connection.openSessionSubscription({ sessionId }); diff --git a/packages/cli/src/runtime-host-tui-command.ts b/packages/cli/src/runtime-host-tui-command.ts index faa16ed2f8..5142f7619d 100644 --- a/packages/cli/src/runtime-host-tui-command.ts +++ b/packages/cli/src/runtime-host-tui-command.ts @@ -1,5 +1,13 @@ +import { parseNoRealConnectionError } from '@maka/core'; +import { SessionActivityRegistry } from '@maka/runtime'; +import { readRuntimeHostConnectionCatalog } from '@maka/runtime-host/client'; +import { createForeignSessionStore } from '@maka/storage'; +import { connectRuntimeHostCli } from './runtime-host-cli-context.js'; +import { createRuntimeHostOnboardingSurface } from './runtime-host-onboarding.js'; +import type { MakaPiTuiTurnActivitySurface } from './pi-tui-contracts.js'; import { runMakaPiTui } from './pi-tui-runner.js'; import { createRuntimeHostTuiContext } from './runtime-host-tui-context.js'; +import type { MakaSessionDriver } from './session-driver.js'; export interface RunRuntimeHostTuiInput { readonly workspaceRoot: string; @@ -9,11 +17,21 @@ export interface RunRuntimeHostTuiInput { } export async function runRuntimeHostTui(input: RunRuntimeHostTuiInput): Promise { - const context = await createRuntimeHostTuiContext({ + const foreignSessions = createForeignSessionStore(); + const contextInput = { rootPath: input.workspaceRoot, cwd: input.cwd, ...(input.resumeSessionId ? { resumeSessionId: input.resumeSessionId } : {}), - }); + }; + let context; + try { + context = await createRuntimeHostTuiContext(contextInput); + } catch (error) { + if (!isMissingDefaultConnection(error) || input.resumeSessionId) throw error; + const configured = await runFirstRunOnboarding(input.workspaceRoot, input.cwd); + if (!configured) throw error; + context = await createRuntimeHostTuiContext(contextInput); + } try { await runMakaPiTui({ driver: context.driver, @@ -28,9 +46,11 @@ export async function runRuntimeHostTui(input: RunRuntimeHostTuiInput): Promise< providerType: context.providerType, modelContextWindow: context.modelContextWindow, permissionMode: 'ask', - goalLifecycle: context.goalLifecycle, + turnActivity: context.turnActivity, listSkills: context.listSkills, + onboarding: context.onboarding, recap: context.recap, + foreignSessions, subscribeShellRunUpdates: (listener) => context.driver.subscribeShellRunUpdates(listener), listShellRunUpdates: (sessionId) => context.driver.listShellRunUpdates(sessionId), onProcessExit: input.onProcessExit, @@ -44,3 +64,52 @@ export async function runRuntimeHostTui(input: RunRuntimeHostTuiInput): Promise< await context.close(); } } + +async function runFirstRunOnboarding(rootPath: string, cwd: string): Promise { + const connected = await connectRuntimeHostCli({ rootPath, surface: 'tui' }); + try { + await runMakaPiTui({ + driver: createFirstRunSessionDriver(), + title: 'Maka', + cwd, + model: '', + connectionSlug: '', + permissionMode: 'ask', + firstRun: true, + turnActivity: { + activities: new SessionActivityRegistry(), + } satisfies MakaPiTuiTurnActivitySurface, + onboarding: createRuntimeHostOnboardingSurface(connected.connection), + }); + return (await readRuntimeHostConnectionCatalog(connected.connection)).defaultTarget !== null; + } finally { + await connected.close(); + } +} + +function createFirstRunSessionDriver(): MakaSessionDriver { + const unavailable = async (): Promise => { + throw new Error('First-run onboarding cannot start an agent turn'); + }; + return { + getSessionId: () => null, + listSessions: async () => [], + preparePrompt: unavailable, + compactSession: async function* () {}, + respondToSandboxBoundary: async () => {}, + setModel: async () => {}, + setThinkingLevel: async () => {}, + setPermissionMode: async () => {}, + renameSession: async () => {}, + switchSession: unavailable, + listRewindTargets: async () => [], + rewindToTurn: unavailable, + startNewSession: () => {}, + stop: async () => {}, + }; +} + +function isMissingDefaultConnection(error: unknown): boolean { + const parsed = parseNoRealConnectionError(error); + return parsed.matched && parsed.reason === 'missing_default_connection'; +} diff --git a/packages/cli/src/runtime-host-tui-context.ts b/packages/cli/src/runtime-host-tui-context.ts index ee092a8329..77ed93225b 100644 --- a/packages/cli/src/runtime-host-tui-context.ts +++ b/packages/cli/src/runtime-host-tui-context.ts @@ -1,10 +1,13 @@ import { randomUUID } from 'node:crypto'; import type { ConnectionCatalogEntry, ConnectionCatalogSnapshot } from '@maka/core/runtime-policy'; import { SessionActivityRegistry, type InvocableSkillEntry } from '@maka/runtime'; -import { readRuntimeHostSkillCatalog, type RuntimeHostConnection } from '@maka/runtime-host/client'; +import { + readRuntimeHostInvocableSkills, + type RuntimeHostConnection, +} from '@maka/runtime-host/client'; import { connectRuntimeHostCli, resolveRuntimeHostCliTarget } from './runtime-host-cli-context.js'; import type { - MakaPiTuiGoalLifecycle, + MakaPiTuiTurnActivitySurface, ModelChoice, SessionRecapGenerator, } from './pi-tui-contracts.js'; @@ -12,6 +15,10 @@ import { createRuntimeHostMakaSessionDriver, type RuntimeHostMakaSessionDriverInput, } from './runtime-host-session-driver.js'; +import { + createRuntimeHostOnboardingSurface, + projectRuntimeHostModelChoices, +} from './runtime-host-onboarding.js'; export interface RuntimeHostTuiContext { readonly connection: RuntimeHostConnection; @@ -23,9 +30,10 @@ export interface RuntimeHostTuiContext { readonly model: string; readonly modelContextWindow?: number; readonly modelChoices: readonly ModelChoice[]; - readonly goalLifecycle: MakaPiTuiGoalLifecycle; + readonly turnActivity: MakaPiTuiTurnActivitySurface; readonly listSkills: (cwd: string) => Promise; readonly recap: SessionRecapGenerator; + readonly onboarding: ReturnType; close(): Promise; } @@ -48,7 +56,7 @@ export async function createRuntimeHostTuiContext( const target = input.resumeSessionId ? await resolveResumeTarget(connection, catalog, input.resumeSessionId) : resolveTarget(catalog); - const modelChoices = projectModelChoices(catalog); + const modelChoices = projectRuntimeHostModelChoices(catalog); const driverInput: RuntimeHostMakaSessionDriverInput = { connection, cwd: input.cwd, @@ -68,9 +76,10 @@ export async function createRuntimeHostTuiContext( modelContextWindow: target.connection.models.find((model) => model.id === target.model) ?.contextWindow, modelChoices, - goalLifecycle: createHostOwnedGoalLifecycle(), + turnActivity: createHostOwnedTurnActivity(), listSkills: (cwd) => listStablePresentedSkills(connection, cwd), recap: createRuntimeHostRecapGenerator(connection), + onboarding: createRuntimeHostOnboardingSurface(connection), close: () => connected.close(), }; } catch (error) { @@ -102,15 +111,13 @@ async function listStablePresentedSkills( connection: RuntimeHostConnection, projectRoot: string, ): Promise { - const catalog = await readRuntimeHostSkillCatalog(connection, { projectRoot }, 'governance'); - return catalog.items.flatMap((item) => - item.kind === 'skill' && - item.enabled && - item.runtimeStatus === 'enabled' && - (item.contextStatus === 'advertised' || item.contextStatus === 'unknown') - ? [{ ref: item.ref, id: item.id, name: item.name, description: item.description }] - : [], - ); + return [ + ...(await readRuntimeHostInvocableSkills(connection, { + kind: 'new_session', + context: { projectRoot }, + collaborationMode: 'agent', + })), + ]; } function resolveTarget(catalog: ConnectionCatalogSnapshot): { @@ -136,35 +143,6 @@ async function resolveResumeTarget( return resolveTarget(catalog); } -function projectModelChoices(catalog: ConnectionCatalogSnapshot): ModelChoice[] { - const choices: ModelChoice[] = []; - for (const connection of catalog.connections) { - if (!connection.enabled) continue; - const modelsById = new Map(connection.models.map((model) => [model.id, model])); - const ids = new Set(connection.enabledModelIds); - if (catalog.defaultTarget?.connectionId === connection.connectionId) { - ids.add(catalog.defaultTarget.modelId); - } - for (const model of ids) { - choices.push({ - connectionSlug: connection.slug, - connectionName: connection.name, - providerType: connection.providerType, - model, - isDefaultConnection: catalog.defaultTarget?.connectionId === connection.connectionId, - contextWindow: modelsById.get(model)?.contextWindow, - }); - } - } - return choices; -} - -function createHostOwnedGoalLifecycle(): MakaPiTuiGoalLifecycle { - return { - activities: new SessionActivityRegistry(), - beginObservedTurn: () => ({ kind: 'registered', settle: async () => {} }), - // Goal continuation is a Runtime Host responsibility. Binding a local - // admission callback would create a second scheduler authority. - bindHost: () => () => {}, - }; +function createHostOwnedTurnActivity(): MakaPiTuiTurnActivitySurface { + return { activities: new SessionActivityRegistry() }; } diff --git a/packages/cli/src/session-driver.ts b/packages/cli/src/session-driver.ts index 008c53f55a..a8479bf9d3 100644 --- a/packages/cli/src/session-driver.ts +++ b/packages/cli/src/session-driver.ts @@ -1,33 +1,14 @@ -import { randomUUID } from 'node:crypto'; import { realpath } from 'node:fs/promises'; import type { QueueEnqueueOutcome, SessionEvent } from '@maka/core/events'; -import type { PermissionMode } from '@maka/core/permission'; -import type { ExecutionBoundary, SandboxBoundaryResponse } from '@maka/core/sandbox-boundary'; -import { executionBoundaryDisplayMode } from '@maka/core/sandbox-boundary'; -import type { UserQuestionResponse } from '@maka/core/user-question'; -import type { - BranchFromTurnInput, - CreateSessionInput, - TurnOrchestration, - UserMessageInput, -} from '@maka/core/runtime-inputs'; import type { OrchestrationMode } from '@maka/core/orchestration'; +import type { PermissionMode } from '@maka/core/permission'; +import type { SandboxBoundaryResponse } from '@maka/core/sandbox-boundary'; import type { SessionSummary, StoredMessage } from '@maka/core/session'; -import { userFacingText } from '@maka/core/session'; import type { ThinkingLevel } from '@maka/core/model-thinking'; -import type { - ContextDiagnostics, - RuntimeContinuation, - SafeBoundaryContinuationPlan, -} from '@maka/runtime'; -import { DEFAULT_SESSION_NAME } from '@maka/core'; - -import { - cwdRank, - firstLine, - inspectGitCwdChanges, - resolveMoveCwd, -} from './session-driver-policy.js'; +import type { TurnOrchestration } from '@maka/core/runtime-inputs'; +import type { UserQuestionResponse } from '@maka/core/user-question'; +import type { ContextDiagnostics } from '@maka/runtime'; +import type { SkillInvocationResult } from '@maka/core/skill-invocation'; export interface MakaSessionMoveResult { previousCwd: string; @@ -38,526 +19,102 @@ export interface MakaSessionMoveResult { export type InspectCwdChanges = (cwd: string) => Promise; -export interface MakaSessionRuntime { - createSession(input: CreateSessionInput): Promise; - listSessions(): Promise; - readExecutionBoundary(sessionId: string): Promise; - getMessages(sessionId: string): Promise; - getContextDiagnostics?(sessionId: string): Promise; - sendMessage(sessionId: string, input: UserMessageInput): AsyncIterable; - compactSession(sessionId: string, input?: { turnId?: string }): AsyncIterable; - planLatestAuthoritativeSafeBoundaryContinuation?( - sessionId: string, - ): Promise; - resumeSafeBoundaryContinuation?(continuation: RuntimeContinuation): AsyncIterable; - stopSession(sessionId: string, input?: { source?: 'stop_button' }): Promise; - steer(sessionId: string, text: string): QueueEnqueueOutcome; - queueMessage(sessionId: string, text: string): QueueEnqueueOutcome; - drainFollowup(sessionId: string): string | null; - retractQueue(sessionId: string): string; - respondToSandboxBoundary(sessionId: string, response: SandboxBoundaryResponse): Promise; - respondToUserQuestion?(sessionId: string, response: UserQuestionResponse): Promise; - setPermissionMode(sessionId: string, mode: PermissionMode): Promise; - setOrchestrationMode(sessionId: string, mode: OrchestrationMode): Promise; - updateSession( - sessionId: string, - patch: { - cwd?: string; - model?: string; - llmConnectionSlug?: string; - thinkingLevel?: ThinkingLevel | undefined; - name?: string; - }, - ): Promise; - // Rewind reuses the runtime's branch primitives: a non-destructive copy of the - // transcript + RuntimeEvent ledger at a turn boundary, so resume correctness is - // inherited and the original session's log is left intact. `branchBeforeTurn` - // is the exclusive dual — it keeps everything strictly before the turn. - branchFromTurn(sessionId: string, input: BranchFromTurnInput): Promise; - branchBeforeTurn(sessionId: string, input: BranchFromTurnInput): Promise; -} - -/** A turn the user can rewind to: its id plus a one-line label (its prompt). */ export interface RewindTarget { turnId: string; label: string; } -/** - * A rewind result: the branched session's summary + messages (as with a switch), - * plus the chosen turn's full prompt so the caller can refill the editor for the - * user to edit and resend. - */ -export interface MakaSessionRewindResult extends MakaSessionSwitchResult { - prompt: string; -} - -export interface MakaSessionDriverInput { - runtime: MakaSessionRuntime; - cwd: string; - llmConnectionSlug: string; - model: string; - permissionMode?: PermissionMode; - orchestrationMode?: OrchestrationMode; - newId?: () => string; - inspectCwdChanges?: InspectCwdChanges; -} - export interface MakaSessionSwitchResult { summary: SessionSummary; messages: StoredMessage[]; - /** A Host-owned Turn already running when this Client attached. */ activeTurn?: MakaPreparedSessionTurn; } +export interface MakaSessionRewindResult extends MakaSessionSwitchResult { + prompt: string; +} + export interface MakaPreparedSessionTurn { sessionId: string; turnId: string; - /** Host-owned Run identity when the adapter exposes exact Turn cancellation. */ runId?: string; events: AsyncIterable; - /** Authoritative Session metadata available when the Turn was attached. */ summary?: SessionSummary; + skillInvocation?: SkillInvocationResult; } -/** A live Turn discovered externally together with its atomic Session context. */ export interface MakaAttachedSessionTurn extends MakaPreparedSessionTurn { messages: StoredMessage[]; summary: SessionSummary; } export interface MakaPreparePromptOptions { - /** Caller-owned identity used when Goal admission reserves a turn synchronously. */ turnId?: string; - /** Model-facing text when it differs from the prompt shown to the user. */ modelText?: string; - /** Trusted per-turn orchestration override; never encoded into prompt text. */ turnOrchestration?: TurnOrchestration; + maxSteps?: number; +} + +export class SkillInvocationBlockedError extends Error { + constructor(readonly skillInvocation: SkillInvocationResult) { + super('Explicit Skill invocation could not be resolved'); + this.name = 'SkillInvocationBlockedError'; + } } export interface MakaSessionDriver { listSessions(): Promise; getSessionResumeAvailability?(session: SessionSummary): Promise; - /** - * Prepare a turn without consuming its event stream. `prompt` remains the - * human-facing text; a distinct `modelText` is persisted with `displayText`. - */ preparePrompt( prompt: string, options?: MakaPreparePromptOptions, ): Promise; compactSession(): AsyncIterable; resumeLatest?(): AsyncIterable; - /** - * Queue the text for mid-turn injection at the next step boundary. Returns - * `fallback` when there is no active run (the turn just ended); the caller - * should open a fresh turn with the text instead so it is never dropped. - * Optional so existing driver stubs need not implement the steering surface. - */ steer?(text: string): Promise; - /** Queue the text to open the turn after the current one finishes. */ queueMessage?(text: string): Promise; - /** Drain the followup queue into one `\n\n`-joined prompt, or null if empty. */ takePendingFollowup?(): Promise; - /** Take back every queued message as one `\n\n`-joined string (clears both queues). */ retractQueued?(): Promise; respondToSandboxBoundary(response: SandboxBoundaryResponse): Promise; respondToUserQuestion?(response: UserQuestionResponse): Promise; - /** - * Switch the active session's model, optionally rebinding it to another - * connection at the same time (cross-provider `/model`). The next turn builds - * a fresh backend on the new connection. - */ setModel(model: string, connectionSlug?: string): Promise; setThinkingLevel(level: ThinkingLevel | undefined): Promise; setPermissionMode(mode: PermissionMode): Promise; - /** Available on Runtime-backed drivers; optional for lightweight host adapters. */ setOrchestrationMode?(mode: OrchestrationMode): Promise; renameSession(name: string): Promise; moveSession?(cwd: string): Promise; switchSession(sessionId: string): Promise; - /** Every prompted turn the user can rewind to, newest first. */ listRewindTargets(): Promise; - /** - * Rewind to a turn: branch the session to the state just *before* that turn - * (discarding it and everything after), switch onto the branch, and return the - * turn's prompt so the caller can refill the editor for an edit-and-resend. - */ rewindToTurn(turnId: string): Promise; - /** Observe Turns started by another Client or by the Runtime Host scheduler. */ subscribeStartedTurns?(listener: (turn: MakaAttachedSessionTurn) => void): () => void; - /** Observe interactions resolved by another Client so local prompts can retire. */ subscribeResolvedInteractions?( listener: (sessionId: string, requestId: string) => void, ): () => void; - /** Reconcile durable messages after a Host Turn reaches a terminal state. */ subscribeTranscriptReplacements?( listener: (sessionId: string, turnId: string, messages: StoredMessage[]) => void, ): () => void; - /** Abandon the active session so the next prompt starts a fresh one. */ startNewSession(): void; stop(): Promise; getSessionId(): string | null; getContextDiagnostics?(): Promise; getOrchestrationMode?(): OrchestrationMode; - /** - * The permission mode the ACTIVE session should be presented as, derived - * from its authoritative execution boundary (#1611). Available on - * Runtime-backed drivers; hosts without a boundary to read fall back to the - * summary they already hand the caller. - */ getPermissionMode?(): PermissionMode; } export type SessionResumeAvailability = { available: true } | { available: false; reason: string }; -const MISSING_SESSION_CWD_REASON = 'Missing working directory'; -const DELETED_SESSION_CWD_REASON = 'Working directory no longer exists'; - export async function inspectSessionResumeAvailability( session: SessionSummary, ): Promise { - if (!session.cwd) return { available: false, reason: MISSING_SESSION_CWD_REASON }; + if (!session.cwd) return { available: false, reason: 'Missing working directory' }; try { await realpath(session.cwd); return { available: true }; } catch (error) { const code = (error as { code?: unknown }).code; if (code === 'ENOENT' || code === 'ENOTDIR') { - return { available: false, reason: DELETED_SESSION_CWD_REASON }; + return { available: false, reason: 'Working directory no longer exists' }; } throw error; } } - -export function createMakaSessionDriver(input: MakaSessionDriverInput): MakaSessionDriver { - return new RuntimeMakaSessionDriver(input); -} - -class RuntimeMakaSessionDriver implements MakaSessionDriver { - private sessionId: string | null = null; - private cwd: string; - private model: string; - // The connection the active/next session runs on. Mutable so a cross-provider - // /model switch can rebind it; new sessions are created on this connection. - private llmConnectionSlug: string; - private thinkingLevel: ThinkingLevel | undefined; - /** The mode the NEXT created session is given. */ - private permissionMode: PermissionMode; - /** - * How the ACTIVE session must be presented (#1611): derived from its - * execution boundary, which is the authority on what it may actually do. - * Kept apart from `permissionMode` on purpose — a resumed read-only session - * must read as read-only without making read-only the default for the next - * session started with `/new`. - */ - private activeBoundaryDisplayMode: PermissionMode | undefined; - private orchestrationMode: OrchestrationMode; - private readonly newId: () => string; - - constructor(private readonly input: MakaSessionDriverInput) { - this.newId = input.newId ?? randomUUID; - this.cwd = input.cwd; - this.model = input.model; - this.llmConnectionSlug = input.llmConnectionSlug; - this.permissionMode = input.permissionMode ?? 'ask'; - this.orchestrationMode = input.orchestrationMode ?? 'default'; - } - - async preparePrompt( - prompt: string, - options: MakaPreparePromptOptions = {}, - ): Promise { - const sessionId = await this.ensureSession(); - const turnId = options.turnId ?? this.newId(); - const modelText = options.modelText ?? prompt; - const events = this.input.runtime.sendMessage(sessionId, { - turnId, - text: modelText, - ...(modelText !== prompt ? { displayText: prompt } : {}), - ...(options.turnOrchestration ? { turnOrchestration: options.turnOrchestration } : {}), - }); - return { - sessionId, - turnId, - events, - }; - } - - async *compactSession(): AsyncIterable { - if (!this.sessionId) throw new Error('Cannot compact before a session starts.'); - yield* this.input.runtime.compactSession(this.sessionId, { turnId: this.newId() }); - } - - async getContextDiagnostics(): Promise { - if (!this.sessionId) return { status: 'unavailable', reason: 'no_completed_request' }; - const read = this.input.runtime.getContextDiagnostics; - return read - ? read.call(this.input.runtime, this.sessionId) - : { status: 'unavailable', reason: 'trace_unavailable' }; - } - - async *resumeLatest(): AsyncIterable { - if (!this.sessionId) throw new Error('Cannot resume before a session starts.'); - const planLatest = this.input.runtime.planLatestAuthoritativeSafeBoundaryContinuation; - const resume = this.input.runtime.resumeSafeBoundaryContinuation; - if (!planLatest || !resume) - throw new Error('Safe-boundary resume is unavailable on this runtime.'); - const plan = await planLatest.call(this.input.runtime, this.sessionId); - if (plan.disposition !== 'continue' || !plan.continuation) { - const detail = - plan.diagnostics.map((diagnostic) => diagnostic.message).join('; ') || - plan.rejectionReasons.join(', ') || - 'no safe continuation candidate exists'; - throw new Error(`Safe-boundary resume parked: ${detail}`); - } - yield* resume.call(this.input.runtime, plan.continuation); - } - - async listSessions(): Promise { - return (await this.input.runtime.listSessions()) - .map((session, index) => ({ session, index })) - .sort((left, right) => { - const cwdDelta = cwdRank(left.session, this.cwd) - cwdRank(right.session, this.cwd); - return cwdDelta !== 0 ? cwdDelta : left.index - right.index; - }) - .map(({ session }) => session); - } - - async getSessionResumeAvailability(session: SessionSummary): Promise { - return inspectSessionResumeAvailability(session); - } - - async stop(): Promise { - if (!this.sessionId) return; - await this.input.runtime.stopSession(this.sessionId, { source: 'stop_button' }); - } - - async steer(text: string): Promise { - if (!this.sessionId) return { kind: 'fallback' }; - return this.input.runtime.steer(this.sessionId, text); - } - - async queueMessage(text: string): Promise { - if (!this.sessionId) return { kind: 'fallback' }; - return this.input.runtime.queueMessage(this.sessionId, text); - } - - async takePendingFollowup(): Promise { - if (!this.sessionId) return null; - return this.input.runtime.drainFollowup(this.sessionId); - } - - async retractQueued(): Promise { - if (!this.sessionId) return ''; - return this.input.runtime.retractQueue(this.sessionId); - } - - async respondToSandboxBoundary(response: SandboxBoundaryResponse): Promise { - if (!this.sessionId) throw new Error('Cannot respond to permission before a session starts.'); - await this.input.runtime.respondToSandboxBoundary(this.sessionId, response); - } - - async respondToUserQuestion(response: UserQuestionResponse): Promise { - if (!this.sessionId) - throw new Error('Cannot respond to a user question before a session starts.'); - if (!this.input.runtime.respondToUserQuestion) - throw new Error('User questions are unavailable on this runtime.'); - await this.input.runtime.respondToUserQuestion(this.sessionId, response); - } - - async setModel(model: string, connectionSlug?: string): Promise { - // Only rebind the connection when a different one is asked for; a same-slug - // /model is a plain model change and must not churn the backend needlessly. - const nextConnection = - connectionSlug && connectionSlug !== this.llmConnectionSlug ? connectionSlug : undefined; - if (this.sessionId) { - // Switching model (or connection) clears the per-model thinking variant. - const summary = await this.input.runtime.updateSession(this.sessionId, { - model, - thinkingLevel: undefined, - ...(nextConnection ? { llmConnectionSlug: nextConnection } : {}), - }); - this.model = summary.model; - this.llmConnectionSlug = summary.llmConnectionSlug; - this.thinkingLevel = summary.thinkingLevel; - return; - } - this.model = model; - if (nextConnection) this.llmConnectionSlug = nextConnection; - this.thinkingLevel = undefined; - } - - async setThinkingLevel(level: ThinkingLevel | undefined): Promise { - if (this.sessionId) { - const summary = await this.input.runtime.updateSession(this.sessionId, { - thinkingLevel: level, - }); - this.thinkingLevel = summary.thinkingLevel; - return; - } - this.thinkingLevel = level; - } - - async setPermissionMode(mode: PermissionMode): Promise { - if (this.sessionId) { - const summary = await this.input.runtime.setPermissionMode(this.sessionId, mode); - this.permissionMode = summary.permissionMode; - // An explicit switch replaces the boundary, so re-derive rather than - // assume the requested mode landed exactly as asked. - this.activeBoundaryDisplayMode = executionBoundaryDisplayMode( - await this.input.runtime.readExecutionBoundary(this.sessionId), - ); - return; - } - this.permissionMode = mode; - } - - async setOrchestrationMode(mode: OrchestrationMode): Promise { - if (this.sessionId) { - const summary = await this.input.runtime.setOrchestrationMode(this.sessionId, mode); - this.orchestrationMode = summary.orchestrationMode ?? mode; - return; - } - this.orchestrationMode = mode; - } - - async renameSession(name: string): Promise { - if (!this.sessionId) throw new Error('Cannot rename before a session starts.'); - return (await this.input.runtime.updateSession(this.sessionId, { name })).name; - } - - async moveSession(rawCwd: string): Promise { - if (!this.sessionId) throw new Error('Cannot move before a session starts.'); - const nextCwd = await resolveMoveCwd(rawCwd, this.cwd); - const previousCwd = this.cwd; - if (nextCwd === previousCwd) { - return { previousCwd, cwd: nextCwd, changed: false, oldCwdDirty: false }; - } - const inspectCwdChanges = this.input.inspectCwdChanges ?? inspectGitCwdChanges; - const oldCwdDirty = await inspectCwdChanges(previousCwd).catch(() => undefined); - const summary = await this.input.runtime.updateSession(this.sessionId, { - cwd: nextCwd, - }); - this.cwd = summary.cwd ?? nextCwd; - return { previousCwd, cwd: this.cwd, changed: true, oldCwdDirty }; - } - - async switchSession(sessionId: string): Promise { - const summary = (await this.listSessions()).find((session) => session.id === sessionId); - if (!summary) throw new Error(`Session not found: ${sessionId}`); - const availability = await inspectSessionResumeAvailability(summary); - if (!availability.available) { - if (!summary.cwd) throw new Error('Session has no working directory and cannot be resumed.'); - throw new Error(`Session cwd no longer exists: ${summary.cwd}`); - } - const sessionCwd = summary.cwd!; - const boundary = await this.input.runtime.readExecutionBoundary(summary.id); - if (boundary.kind === 'external') { - throw new Error( - `Cannot resume externally isolated session ${summary.id} outside its owning harness.`, - ); - } - // #1611: the boundary — not the stored header mode — decides how this - // session is presented, and the summary is left exactly as the runtime - // returned it. Overwriting `summary.permissionMode` here used to label a - // read-only session "Auto", which the picker then marked as the current - // option; choosing that "current" option silently replaced the read-only - // boundary with a writable one. - const displayMode = executionBoundaryDisplayMode(boundary); - const messages = await this.input.runtime.getMessages(summary.id); - this.sessionId = summary.id; - this.cwd = sessionCwd; - this.model = summary.model; - this.llmConnectionSlug = summary.llmConnectionSlug; - this.thinkingLevel = summary.thinkingLevel; - this.activeBoundaryDisplayMode = displayMode; - // New sessions started after this one still default to a normal mode. - this.permissionMode = boundary.kind === 'bypass' ? 'bypass' : 'ask'; - this.orchestrationMode = summary.orchestrationMode ?? 'default'; - return { summary, messages }; - } - - async listRewindTargets(): Promise { - if (!this.sessionId) return []; - const messages = await this.input.runtime.getMessages(this.sessionId); - // One target per turn that has a user prompt, in send order. The prompt text - // is the label — it is what the user recognizes a turn by. Rewinding to a - // turn resets to just *before* it (see rewindToTurn), so the latest turn is - // itself a valid target (undo it, edit its prompt, resend) and no turn is - // excluded. Turns with no user prompt (e.g. a /compact turn) never appear. - const promptByTurn = new Map(); - const order: string[] = []; - for (const message of messages) { - if (message.type !== 'user' || promptByTurn.has(message.turnId)) continue; - promptByTurn.set(message.turnId, userFacingText(message)); - order.push(message.turnId); - } - return order - .reverse() - .map((turnId) => ({ turnId, label: firstLine(promptByTurn.get(turnId) ?? '') })); - } - - async rewindToTurn(turnId: string): Promise { - if (!this.sessionId) throw new Error('Cannot rewind before a session starts.'); - // Read the turn's prompt from the *original* session before branching — the - // branch drops this turn, so it must be captured first. The full text (not - // the one-line label) is refilled into the editor for an edit-and-resend. - const messages = await this.input.runtime.getMessages(this.sessionId); - const userMessage = messages.find( - (message): message is Extract => - message.type === 'user' && message.turnId === turnId, - ); - if (userMessage === undefined) - throw new Error(`Cannot rewind to turn ${turnId}: no user prompt.`); - const prompt = userFacingText(userMessage); - // Branch to the state just before the turn (copies transcript + ledger up to, - // but not including, it), then switch onto the branch. switchSession - // re-validates folder/connection and loads the branched messages, so the - // branch inherits the same resume guarantees as any resumed session and the - // original session — including the discarded turn — is left untouched. - const branch = await this.input.runtime.branchBeforeTurn(this.sessionId, { - sourceTurnId: turnId, - }); - return { ...(await this.switchSession(branch.id)), prompt }; - } - - startNewSession(): void { - // Drop the active session id only. The current model / thinking / permission - // stay put, so the next prompt lazily creates a fresh session that inherits - // them (via ensureSession). The old session is left intact on disk. - this.sessionId = null; - // The previous session's boundary says nothing about the next one. - this.activeBoundaryDisplayMode = undefined; - } - - getSessionId(): string | null { - return this.sessionId; - } - - getOrchestrationMode(): OrchestrationMode { - return this.orchestrationMode; - } - - getPermissionMode(): PermissionMode { - return this.activeBoundaryDisplayMode ?? this.permissionMode; - } - - private async ensureSession(): Promise { - if (this.sessionId) return this.sessionId; - const session = await this.input.runtime.createSession({ - cwd: this.cwd, - name: DEFAULT_SESSION_NAME, - backend: 'ai-sdk', - llmConnectionSlug: this.llmConnectionSlug, - model: this.model, - permissionMode: this.permissionMode, - ...(this.orchestrationMode !== 'default' - ? { orchestrationMode: this.orchestrationMode } - : {}), - ...(this.thinkingLevel !== undefined ? { thinkingLevel: this.thinkingLevel } : {}), - }); - this.sessionId = session.id; - return session.id; - } -} diff --git a/packages/core/package.json b/packages/core/package.json index 50383017be..d0f8992bf7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -53,6 +53,7 @@ "./attachments": "./dist/attachments.js", "./artifacts": "./dist/artifacts.js", "./pet": "./dist/pet.js", + "./skill-invocation": "./dist/skill-invocation.js", "./runtime-inputs": "./dist/runtime-inputs.js", "./e2e-fixture": "./dist/e2e-fixture.js", "./capabilities": "./dist/capabilities.js", diff --git a/packages/core/src/__tests__/bootstrap-connections.test.ts b/packages/core/src/__tests__/bootstrap-connections.test.ts deleted file mode 100644 index b60b240164..0000000000 --- a/packages/core/src/__tests__/bootstrap-connections.test.ts +++ /dev/null @@ -1,128 +0,0 @@ -/** - * resolveBootstrapConnections — zero-credential default seed decision. - * - * A fresh Maka install must be usable out of the box. The bootstrap seeds an - * `opencode-free` connection (no secret, anonymous OpenCode Zen free models) - * so a user with no provider keys can send a message immediately. Env-keyed - * providers (ANTHROPIC_API_KEY / OPENAI_API_KEY) layer on top and take the - * default, mirroring the pre-existing env-bootstrap behavior; opencode-free - * stays seeded as a fallback. - * - * Pure & sync — the caller (app-lifecycle) performs the connectionStore - * writes and emits the change event. This module only decides what to seed - * and which one is the default, so the decision is testable without Electron. - */ - -import assert from 'node:assert/strict'; -import { describe, it } from 'node:test'; -import { - OPENCODE_FREE_BOOTSTRAP_VERSION, - OPENCODE_FREE_DEFAULT_ENABLED_MODELS, - OPENCODE_FREE_DEFAULT_MODEL, - OPENCODE_FREE_LEGACY_DEFAULT_MODEL, - defaultEnabledModelIdsWhenOmitted, - resolveBootstrapConnections, - resolveOpenCodeFreeBootstrapMigration, -} from '../bootstrap-connections.js'; -import type { LlmConnection } from '../llm-connections.js'; - -describe('defaultEnabledModelIdsWhenOmitted', () => { - it('fills OpenCode Free with the default free inventory and leaves others unset', () => { - assert.deepEqual(defaultEnabledModelIdsWhenOmitted('opencode-free'), [ - ...OPENCODE_FREE_DEFAULT_ENABLED_MODELS, - ]); - assert.equal(defaultEnabledModelIdsWhenOmitted('openai'), undefined); - assert.equal(defaultEnabledModelIdsWhenOmitted('openrouter'), undefined); - }); -}); - -describe('resolveBootstrapConnections — zero-credential default seed', () => { - it('selects one default while keeping the credential-free fallback', () => { - const cases = [ - [{}, 'opencode-free', false], - [{ ANTHROPIC_API_KEY: 'sk-x' }, 'env-anthropic', false], - [{ OPENAI_API_KEY: 'sk-y' }, 'env-openai', false], - [{ ANTHROPIC_API_KEY: 'sk-x', OPENAI_API_KEY: 'sk-y' }, 'env-anthropic', true], - ] as const; - - for (const [env, defaultSlug, excludesOpenAi] of cases) { - const seeds = resolveBootstrapConnections(env); - const free = seeds.find((seed) => seed.slug === 'opencode-free'); - assert.equal(free?.defaultModel, OPENCODE_FREE_DEFAULT_MODEL); - assert.deepEqual(free?.enabledModelIds, [...OPENCODE_FREE_DEFAULT_ENABLED_MODELS]); - assert.deepEqual(free?.extras, { - makaBootstrap: { id: 'opencode-free', version: OPENCODE_FREE_BOOTSTRAP_VERSION }, - }); - assert.deepEqual( - seeds.filter((seed) => seed.isDefault).map((seed) => seed.slug), - [defaultSlug], - ); - assert.equal( - seeds.some((seed) => seed.slug === 'env-openai'), - !excludesOpenAi && 'OPENAI_API_KEY' in env, - ); - } - }); - - it('migrates only the untouched historical OpenCode Free seed shapes', () => { - const currentPatch = { - defaultModel: OPENCODE_FREE_DEFAULT_MODEL, - enabledModelIds: [...OPENCODE_FREE_DEFAULT_ENABLED_MODELS], - extras: { - makaBootstrap: { id: 'opencode-free', version: OPENCODE_FREE_BOOTSTRAP_VERSION }, - }, - }; - - const legacyV1: LlmConnection = { - slug: 'opencode-free', - name: 'OpenCode Free', - providerType: 'opencode-free', - defaultModel: OPENCODE_FREE_LEGACY_DEFAULT_MODEL, - enabledModelIds: [OPENCODE_FREE_LEGACY_DEFAULT_MODEL], - enabled: true, - createdAt: 1, - updatedAt: 1, - }; - assert.deepEqual(resolveOpenCodeFreeBootstrapMigration(legacyV1), currentPatch); - - const legacyV2: LlmConnection = { - slug: 'opencode-free', - name: 'OpenCode Free', - providerType: 'opencode-free', - defaultModel: OPENCODE_FREE_DEFAULT_MODEL, - enabledModelIds: [OPENCODE_FREE_DEFAULT_MODEL], - enabled: true, - extras: { makaBootstrap: { id: 'opencode-free', version: 2 } }, - createdAt: 1, - updatedAt: 1, - }; - assert.deepEqual(resolveOpenCodeFreeBootstrapMigration(legacyV2), currentPatch); - - // Already at the current bootstrap shape — no further migration. - assert.equal( - resolveOpenCodeFreeBootstrapMigration({ - ...legacyV2, - ...currentPatch, - }), - undefined, - ); - - for (const customized of [ - { ...legacyV1, name: 'My free connection' }, - { ...legacyV1, baseUrl: 'https://custom.example/v1' }, - { ...legacyV1, enabledModelIds: [OPENCODE_FREE_LEGACY_DEFAULT_MODEL, 'custom-free'] }, - { ...legacyV1, models: [{ id: OPENCODE_FREE_LEGACY_DEFAULT_MODEL }] }, - { ...legacyV1, extras: { owner: 'user' } }, - { - ...legacyV2, - enabledModelIds: [OPENCODE_FREE_DEFAULT_MODEL, 'mimo-v2.5-free'], - }, - { - ...legacyV2, - extras: { makaBootstrap: { id: 'opencode-free', version: 2 }, owner: 'user' }, - }, - ]) { - assert.equal(resolveOpenCodeFreeBootstrapMigration(customized), undefined); - } - }); -}); diff --git a/packages/core/src/__tests__/runtime-policy-codec.test.ts b/packages/core/src/__tests__/runtime-policy-codec.test.ts index 869bd6db2c..b5ebdf2fb9 100644 --- a/packages/core/src/__tests__/runtime-policy-codec.test.ts +++ b/packages/core/src/__tests__/runtime-policy-codec.test.ts @@ -42,6 +42,84 @@ test('normalizes policy input while canonical policy decode rejects producer dri ); }); +test('preserves a valid default thinking level and rejects unknown levels', () => { + const policy = { + ...createDefaultRuntimePolicy(), + chatDefaults: { permissionMode: 'ask' as const, thinkingLevel: 'high' as const }, + }; + assert.deepEqual(decodeCanonicalRuntimePolicy(policy).chatDefaults, policy.chatDefaults); + assert.throws( + () => + normalizeRuntimePolicyMutation({ + expectedRevision: 0, + operation: { + kind: 'set_chat_defaults', + value: { permissionMode: 'ask', thinkingLevel: 'unbounded' }, + }, + }), + RuntimePolicyDomainDecodeError, + ); +}); + +test('keeps user-approved subagent presets canonical in Runtime Policy', () => { + const preset = { + id: 'fast-reader', + name: 'Fast reader', + description: 'Cheap scans', + profile: 'local_read' as const, + connectionSlug: 'openrouter', + model: 'openrouter/free', + enabled: true, + }; + const policy = { ...createDefaultRuntimePolicy(), subagents: { presets: [preset] } }; + assert.deepEqual(decodeCanonicalRuntimePolicy(policy).subagents.presets, [preset]); + assert.deepEqual( + normalizeRuntimePolicyMutation({ + expectedRevision: 2, + operation: { kind: 'set_subagents', value: { presets: [preset] } }, + }), + { expectedRevision: 2, operation: { kind: 'set_subagents', value: { presets: [preset] } } }, + ); +}); + +test('normalizes only the bounded agent settings patch surface', () => { + assert.deepEqual( + normalizeRuntimePolicyMutation({ + expectedRevision: 4, + operation: { + kind: 'patch_agent_settings', + value: { + personalization: { assistantTone: 'Be direct.' }, + memory: { agentReadEnabled: true }, + webSearch: { enabled: true }, + }, + }, + }), + { + expectedRevision: 4, + operation: { + kind: 'patch_agent_settings', + value: { + personalization: { assistantTone: 'Be direct.' }, + memory: { agentReadEnabled: true }, + webSearch: { enabled: true }, + }, + }, + }, + ); + assert.throws( + () => + normalizeRuntimePolicyMutation({ + expectedRevision: 4, + operation: { + kind: 'patch_agent_settings', + value: { networkProxy: { enabled: false } }, + }, + }), + RuntimePolicyDomainDecodeError, + ); +}); + test('normalizes catalog inputs while canonical entries reject noncanonical endpoints', () => { const input = normalizeCreateCatalogConnectionInput({ expectedCatalogRevision: 0, diff --git a/packages/core/src/agent-run.ts b/packages/core/src/agent-run.ts index ee2d93a793..f4dea19228 100644 --- a/packages/core/src/agent-run.ts +++ b/packages/core/src/agent-run.ts @@ -53,6 +53,7 @@ export type RootExecutionDescriptor = | { kind: 'external_message'; inputDigest?: `sha256:${string}`; + maxSteps?: number; } | { kind: 'regenerate'; sourceTurnId: string } | { kind: 'context_compact' } diff --git a/packages/core/src/backend-types.ts b/packages/core/src/backend-types.ts index 428fb7a333..60f27f8a9a 100644 --- a/packages/core/src/backend-types.ts +++ b/packages/core/src/backend-types.ts @@ -39,6 +39,8 @@ export interface BackendSendInput { runId?: string; /** Caller-generated turn id shared by the persisted UserMessage and every emitted event. */ turnId: string; + /** Trusted per-turn cap on provider tool-call steps. */ + maxSteps?: number; /** Trusted effective orchestration snapshot for this run. */ orchestration?: EffectiveOrchestration; /** Trusted per-run tool protocol override. Direct remains the default. */ diff --git a/packages/core/src/bootstrap-connections.ts b/packages/core/src/bootstrap-connections.ts deleted file mode 100644 index f7b79bfe13..0000000000 --- a/packages/core/src/bootstrap-connections.ts +++ /dev/null @@ -1,176 +0,0 @@ -/** - * Bootstrap connection seed decision. - * - * Decides which provider connections a fresh Maka install seeds before the - * user configures anything, and which one is the default. Pure & sync — the - * caller owns the connectionStore writes and the change event. - * - * `opencode-free` is seeded unconditionally so Maka is usable out of the box - * with zero credentials: it is an anonymous OpenCode Zen free-tier provider - * (no API key; the runtime omits Authorization and the server treats the - * request as anonymous, matching the upstream OpenCode client). Env-keyed - * providers layer on top and take the default when present, preserving the - * prior env-bootstrap precedence (Anthropic before OpenAI). - */ - -import type { LlmConnection, ProviderType, UpdateConnectionInput } from './llm-connections.js'; - -export const OPENCODE_FREE_DEFAULT_MODEL = 'nemotron-3-ultra-free'; -/** Models enabled on a fresh OpenCode Free connection (default first). */ -export const OPENCODE_FREE_DEFAULT_ENABLED_MODELS = [ - OPENCODE_FREE_DEFAULT_MODEL, - 'mimo-v2.5-free', - 'deepseek-v4-flash-free', -] as const; -export const OPENCODE_FREE_LEGACY_DEFAULT_MODEL = 'big-pickle'; -/** v1: big-pickle only; v2: nemotron only; v3: three free models enabled. */ -export const OPENCODE_FREE_BOOTSTRAP_VERSION = 3; - -const OPENCODE_FREE_BOOTSTRAP_EXTRAS = { - makaBootstrap: { id: 'opencode-free', version: OPENCODE_FREE_BOOTSTRAP_VERSION }, -} as const; - -export interface BootstrapConnectionSeed { - readonly slug: string; - readonly name: string; - readonly providerType: ProviderType; - readonly defaultModel: string; - readonly enabledModelIds?: readonly string[]; - readonly isDefault: boolean; - readonly extras?: Record; -} - -export interface BootstrapEnv { - readonly ANTHROPIC_API_KEY?: string; - readonly OPENAI_API_KEY?: string; -} - -const OPENCODE_FREE_SEED: Omit = { - slug: 'opencode-free', - name: 'OpenCode Free', - providerType: 'opencode-free', - defaultModel: OPENCODE_FREE_DEFAULT_MODEL, - enabledModelIds: OPENCODE_FREE_DEFAULT_ENABLED_MODELS, - extras: OPENCODE_FREE_BOOTSTRAP_EXTRAS, -}; - -const ANTHROPIC_ENV_SEED: Omit = { - slug: 'env-anthropic', - name: 'Anthropic (env)', - providerType: 'anthropic', - defaultModel: 'claude-sonnet-4-5-20250929', -}; - -const OPENAI_ENV_SEED: Omit = { - slug: 'env-openai', - name: 'OpenAI (env)', - providerType: 'openai', - defaultModel: 'gpt-4o-mini', -}; - -/** - * Default `enabledModelIds` when a create call omits them. - * - * Most providers stay on the historical "only the default model" seed. OpenCode - * Free is the exception: #2431 made the free inventory the product default for - * both bootstrap and a user-driven "保存供应商" create, so omitting the field - * must not collapse back to a one-model connection. - * - * Returns `undefined` when create should keep the generic single-default rule. - * An explicit empty or partial list from the caller is still honored — this - * only fills a missing selection. - */ -export function defaultEnabledModelIdsWhenOmitted( - providerType: ProviderType, -): readonly string[] | undefined { - if (providerType === 'opencode-free') return OPENCODE_FREE_DEFAULT_ENABLED_MODELS; - return undefined; -} - -/** - * Resolve the bootstrap connection seeds for a fresh install. - * - * `opencode-free` is always seeded as the zero-credential fallback. When an - * env provider key is present that provider is added and takes the default - * (Anthropic wins over OpenAI, and OpenAI is not seeded when Anthropic is - * present — matching the original bootstrap's `return` after Anthropic). - */ -export function resolveBootstrapConnections(env: BootstrapEnv): readonly BootstrapConnectionSeed[] { - const seeds: BootstrapConnectionSeed[] = []; - - const freeDefault = !env.ANTHROPIC_API_KEY && !env.OPENAI_API_KEY; - seeds.push({ ...OPENCODE_FREE_SEED, isDefault: freeDefault }); - - if (env.ANTHROPIC_API_KEY) { - seeds.push({ ...ANTHROPIC_ENV_SEED, isDefault: true }); - return seeds; - } - if (env.OPENAI_API_KEY) { - seeds.push({ ...OPENAI_ENV_SEED, isDefault: true }); - } - return seeds; -} - -/** - * Migrate only the exact connection shape written by Maka's historical - * OpenCode Free bootstrap. Any user-visible customization makes ownership - * ambiguous and therefore fails closed. - * - * Recognized untouched shapes: - * - v1: `big-pickle` only, no extras - * - v2: `nemotron-3-ultra-free` only, bootstrap extras version 2 - */ -export function resolveOpenCodeFreeBootstrapMigration( - connection: LlmConnection, -): UpdateConnectionInput | undefined { - if (!isUntouchedOpenCodeFreeBootstrapBase(connection)) return undefined; - - const isLegacyV1 = - connection.defaultModel === OPENCODE_FREE_LEGACY_DEFAULT_MODEL && - sameStringList(connection.enabledModelIds, [OPENCODE_FREE_LEGACY_DEFAULT_MODEL]) && - connection.extras === undefined; - - const isV2 = - connection.defaultModel === OPENCODE_FREE_DEFAULT_MODEL && - sameStringList(connection.enabledModelIds, [OPENCODE_FREE_DEFAULT_MODEL]) && - bootstrapVersion(connection) === 2; - - if (!isLegacyV1 && !isV2) return undefined; - - return { - defaultModel: OPENCODE_FREE_DEFAULT_MODEL, - enabledModelIds: [...OPENCODE_FREE_DEFAULT_ENABLED_MODELS], - extras: OPENCODE_FREE_BOOTSTRAP_EXTRAS, - }; -} - -function isUntouchedOpenCodeFreeBootstrapBase(connection: LlmConnection): boolean { - return ( - connection.slug === 'opencode-free' && - connection.name === 'OpenCode Free' && - connection.providerType === 'opencode-free' && - connection.baseUrl === undefined && - connection.enabled === true && - connection.models === undefined - ); -} - -function bootstrapVersion(connection: LlmConnection): number | undefined { - const extras = connection.extras; - if (!extras || typeof extras !== 'object' || Array.isArray(extras)) return undefined; - const keys = Object.keys(extras); - if (keys.length !== 1 || keys[0] !== 'makaBootstrap') return undefined; - const bootstrap = extras.makaBootstrap; - if (!bootstrap || typeof bootstrap !== 'object' || Array.isArray(bootstrap)) return undefined; - const record = bootstrap as { id?: unknown; version?: unknown }; - if (record.id !== 'opencode-free' || typeof record.version !== 'number') return undefined; - if (Object.keys(record).length !== 2) return undefined; - return record.version; -} - -function sameStringList( - actual: readonly string[] | undefined, - expected: readonly string[], -): boolean { - return actual?.length === expected.length && actual.every((id, index) => id === expected[index]); -} diff --git a/packages/core/src/connection-error-copy.ts b/packages/core/src/connection-error-copy.ts index 69352dc97a..e776195dbc 100644 --- a/packages/core/src/connection-error-copy.ts +++ b/packages/core/src/connection-error-copy.ts @@ -15,6 +15,8 @@ import type { ChatConfigurationReason } from './connection-readiness.js'; +export const NO_REAL_CONNECTION_CODE = 'NO_REAL_CONNECTION'; + const GENERIC_FIX_COPY = '模型连接暂时无法用于发送，请到 设置 · 模型 检查后重试。'; /** diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 0782f61495..3aa42064ed 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -27,6 +27,7 @@ export * from './interaction.js'; export * from './project.js'; export * from './subagent-workspace.js'; export * from './pet.js'; +export * from './skill-invocation.js'; export * from './external-session.js'; // events.ts @@ -1389,6 +1390,7 @@ export type { } from './llm-connections.js'; export { CODEX_SUBSCRIPTION_UNSUPPORTED_CHATGPT_MODELS, + OPENCODE_FREE_DEFAULT_ENABLED_MODELS, PROVIDER_REGISTRY, PROVIDER_DEFAULTS, CATALOG_PROVIDER_TYPES, @@ -1396,6 +1398,7 @@ export { READY_PROVIDER_TYPES, backendKindOf, connectionEnabledModelIds, + defaultEnabledModelIdsWhenOmitted, deriveConnectionSlug, isWiredOAuthProvider, reconcileConnectionAfterEnabledModelsChange, @@ -1466,6 +1469,7 @@ export { // connection-error-copy.ts — shared not-ready-connection fix copy export { describeChatConfigurationReason, + NO_REAL_CONNECTION_CODE, parseNoRealConnectionError, } from './connection-error-copy.js'; export type { ParsedNoRealConnectionError } from './connection-error-copy.js'; @@ -1511,21 +1515,6 @@ export { sanitizeOnboardingMilestones, } from './onboarding.js'; -// bootstrap-connections.ts -export type { - BootstrapConnectionSeed, - BootstrapEnv, -} from './bootstrap-connections.js'; -export { - OPENCODE_FREE_BOOTSTRAP_VERSION, - OPENCODE_FREE_DEFAULT_ENABLED_MODELS, - OPENCODE_FREE_DEFAULT_MODEL, - OPENCODE_FREE_LEGACY_DEFAULT_MODEL, - defaultEnabledModelIdsWhenOmitted, - resolveBootstrapConnections, - resolveOpenCodeFreeBootstrapMigration, -} from './bootstrap-connections.js'; - // model-catalog.ts export type { BuildModelCatalogInput, diff --git a/packages/core/src/llm-connections.ts b/packages/core/src/llm-connections.ts index 255607c61f..1fbfd3fc6c 100644 --- a/packages/core/src/llm-connections.ts +++ b/packages/core/src/llm-connections.ts @@ -10,6 +10,8 @@ import type { RelayModelProfiles } from './model-thinking.js'; import { CODEX_SUBSCRIPTION_UNSUPPORTED_CHATGPT_MODELS } from './codex-model-compatibility.js'; import { CATALOG_PROVIDER_TYPES, + OPENCODE_FREE_DEFAULT_ENABLED_MODELS, + OPENCODE_FREE_DEFAULT_MODEL, PROVIDER_REGISTRY, READY_PROVIDER_TYPES, RECOMMENDED_PROVIDER_TYPES, @@ -26,6 +28,8 @@ export type { BackendKind } from './session.js'; export { CODEX_SUBSCRIPTION_UNSUPPORTED_CHATGPT_MODELS }; export { CATALOG_PROVIDER_TYPES, + OPENCODE_FREE_DEFAULT_ENABLED_MODELS, + OPENCODE_FREE_DEFAULT_MODEL, PROVIDER_REGISTRY, READY_PROVIDER_TYPES, RECOMMENDED_PROVIDER_TYPES, @@ -290,6 +294,12 @@ export interface ConnectionTestResult { export const PROVIDER_DEFAULTS = PROVIDER_REGISTRY; +export function defaultEnabledModelIdsWhenOmitted( + providerType: ProviderType, +): readonly string[] | undefined { + return PROVIDER_DEFAULTS[providerType].defaultEnabledModelIds; +} + export function providerAuthRequiresSecret(providerType: ProviderType): boolean { const authKind = PROVIDER_DEFAULTS[providerType]?.authKind; return authKind === 'api_key' || authKind === 'oauth_token'; diff --git a/packages/core/src/provider-registry.ts b/packages/core/src/provider-registry.ts index b25d39cc5d..6b912bd0ef 100644 --- a/packages/core/src/provider-registry.ts +++ b/packages/core/src/provider-registry.ts @@ -1,11 +1,17 @@ import type { BackendKind } from './session.js'; -import { OPENCODE_FREE_DEFAULT_MODEL } from './bootstrap-connections.js'; import { GENERATED_MODELS_DEV_METADATA, GENERATED_MODELS_DEV_MODEL_PROVIDER_OVERRIDES, GENERATED_MODELS_DEV_PROVIDER_FACTS, } from './model-metadata.generated.js'; +export const OPENCODE_FREE_DEFAULT_MODEL = 'nemotron-3-ultra-free'; +export const OPENCODE_FREE_DEFAULT_ENABLED_MODELS = [ + OPENCODE_FREE_DEFAULT_MODEL, + 'mimo-v2.5-free', + 'deepseek-v4-flash-free', +] as const; + export type ProviderCategory = 'oauth' | 'domestic' | 'overseas' | 'local' | 'custom'; export type ProviderCatalogGroup = 'recommended' | 'plans' | 'api' | 'aggregators' | 'local'; @@ -56,6 +62,7 @@ export interface ProviderDefaults { authKind: 'api_key' | 'optional_api_key' | 'oauth_token' | 'none'; backendKind: BackendKind; fallbackModels: string[]; + defaultEnabledModelIds?: readonly string[]; status: 'ready' | 'phase3-experimental'; protocol: 'anthropic' | 'openai' | 'google' | 'cohere'; runtimeAdapter: ProviderRuntimeAdapter; @@ -1238,6 +1245,7 @@ const providerRegistry = { authKind: 'none', backendKind: 'ai-sdk', fallbackModels: [...opencodeFreeModelIds], + defaultEnabledModelIds: OPENCODE_FREE_DEFAULT_ENABLED_MODELS, status: 'ready', protocol: 'openai', runtimeAdapter: { kind: 'openai-compatible', name: 'provider' }, diff --git a/packages/core/src/runtime-inputs.ts b/packages/core/src/runtime-inputs.ts index b0b34c0e73..d0a9bf921e 100644 --- a/packages/core/src/runtime-inputs.ts +++ b/packages/core/src/runtime-inputs.ts @@ -78,6 +78,8 @@ export interface UserMessageInput extends MessageContent { /** Caller-generated uuid. Same id used in the UserMessage.turnId and in * every event emitted by this turn. */ turnId: string; + /** Trusted per-turn cap on provider tool-call steps. */ + maxSteps?: number; /** Trusted host-supplied orchestration override for this turn only. */ turnOrchestration?: TurnOrchestration; /** Trusted host-supplied tool protocol override for this run only. */ diff --git a/packages/core/src/runtime-policy.ts b/packages/core/src/runtime-policy.ts index 8251dc18c6..c45bb0285f 100644 --- a/packages/core/src/runtime-policy.ts +++ b/packages/core/src/runtime-policy.ts @@ -4,9 +4,11 @@ import type { ModelDiscoveryResult, ModelInfo, } from './llm-connections.js'; +import type { ThinkingLevel } from './model-thinking.js'; import type { ProviderType } from './provider-registry.js'; import type { RelayModelProfile } from './model-thinking.js'; import type { ChatDefaultPermissionMode, ProxyProtocol } from './settings.js'; +import type { SubagentSettings } from './subagent-settings.js'; import { WEB_SEARCH_PROVIDERS, type WebSearchCredentialProvider, @@ -21,6 +23,7 @@ export { } from './runtime-policy/domain-codec.js'; export { decodeCanonicalRuntimePolicy, + decodeLegacyRuntimePolicyV1, normalizeRuntimePolicyMutation, } from './runtime-policy/policy-codec.js'; export { @@ -95,11 +98,13 @@ export interface RuntimePolicy { }; readonly chatDefaults: { readonly permissionMode: ChatDefaultPermissionMode; + readonly thinkingLevel?: ThinkingLevel; }; readonly webSearch: { readonly enabled: boolean; readonly defaultProvider: WebSearchProvider; }; + readonly subagents: SubagentSettings; } export interface RuntimePolicySnapshot { @@ -107,6 +112,14 @@ export interface RuntimePolicySnapshot { readonly policy: RuntimePolicy; } +export interface AgentRuntimeSettingsPatch { + readonly personalization?: Partial; + readonly memory?: Partial; + readonly workspaceInstructions?: Partial; + readonly privacy?: Partial; + readonly webSearch?: Pick, 'enabled'>; +} + export type RuntimePolicyMutation = | { readonly kind: 'set_network_proxy'; readonly value: RuntimePolicy['networkProxy'] } | { readonly kind: 'set_personalization'; readonly value: RuntimePolicy['personalization'] } @@ -117,7 +130,9 @@ export type RuntimePolicyMutation = } | { readonly kind: 'set_privacy'; readonly value: RuntimePolicy['privacy'] } | { readonly kind: 'set_chat_defaults'; readonly value: RuntimePolicy['chatDefaults'] } - | { readonly kind: 'set_web_search'; readonly value: RuntimePolicy['webSearch'] }; + | { readonly kind: 'set_web_search'; readonly value: RuntimePolicy['webSearch'] } + | { readonly kind: 'set_subagents'; readonly value: RuntimePolicy['subagents'] } + | { readonly kind: 'patch_agent_settings'; readonly value: AgentRuntimeSettingsPatch }; export interface MutateRuntimePolicyInput { readonly expectedRevision: Revision; @@ -146,6 +161,7 @@ export function createDefaultRuntimePolicy(): RuntimePolicy { privacy: { incognitoActive: false }, chatDefaults: { permissionMode: 'ask' }, webSearch: { enabled: false, defaultProvider: 'model' }, + subagents: { presets: [] }, }; } diff --git a/packages/core/src/runtime-policy/policy-codec.ts b/packages/core/src/runtime-policy/policy-codec.ts index d12223156c..f70e3a6303 100644 --- a/packages/core/src/runtime-policy/policy-codec.ts +++ b/packages/core/src/runtime-policy/policy-codec.ts @@ -1,5 +1,8 @@ +import { isThinkingLevel } from '../model-thinking.js'; import { CHAT_DEFAULT_PERMISSION_MODES } from '../settings.js'; +import { normalizeSubagentSettings } from '../subagent-settings.js'; import type { + AgentRuntimeSettingsPatch, MutateRuntimePolicyInput, RuntimePolicy, RuntimePolicyMutation, @@ -22,6 +25,21 @@ export function decodeCanonicalRuntimePolicy(value: unknown): RuntimePolicy { return decoded; } +export function decodeLegacyRuntimePolicyV1(value: unknown): RuntimePolicy { + const policy = exactRecord(value, 'legacy runtime policy', [ + 'networkProxy', + 'personalization', + 'memory', + 'workspaceInstructions', + 'privacy', + 'chatDefaults', + 'webSearch', + ]); + const decoded = normalizeRuntimePolicyFields(policy, { presets: [] }); + assertCanonicalValue(value, withoutSubagents(decoded), 'legacy runtime policy'); + return decoded; +} + export function normalizeRuntimePolicyMutation(value: unknown): MutateRuntimePolicyInput { const input = exactRecord(value, 'runtime policy mutation', ['expectedRevision', 'operation']); const operation = exactRecord(input.operation, 'runtime policy operation', ['kind', 'value']); @@ -40,7 +58,15 @@ function normalizeRuntimePolicy(value: unknown): RuntimePolicy { 'privacy', 'chatDefaults', 'webSearch', + 'subagents', ]); + return normalizeRuntimePolicyFields(policy, normalizeSubagentSettings(policy.subagents)); +} + +function normalizeRuntimePolicyFields( + policy: Record, + subagents: RuntimePolicy['subagents'], +): RuntimePolicy { return { networkProxy: normalizeNetworkProxy(policy.networkProxy), personalization: normalizePersonalization(policy.personalization), @@ -49,9 +75,15 @@ function normalizeRuntimePolicy(value: unknown): RuntimePolicy { privacy: normalizePrivacy(policy.privacy), chatDefaults: normalizeChatDefaults(policy.chatDefaults), webSearch: normalizeWebSearch(policy.webSearch), + subagents, }; } +function withoutSubagents(policy: RuntimePolicy): Omit { + const { subagents: _subagents, ...legacy } = policy; + return legacy; +} + function normalizeMutationOperation(operation: Record): RuntimePolicyMutation { switch (operation.kind) { case 'set_network_proxy': @@ -68,11 +100,90 @@ function normalizeMutationOperation(operation: Record): Runtime return { kind: operation.kind, value: normalizeChatDefaults(operation.value) }; case 'set_web_search': return { kind: operation.kind, value: normalizeWebSearch(operation.value) }; + case 'set_subagents': + return { kind: operation.kind, value: normalizeSubagentSettings(operation.value) }; + case 'patch_agent_settings': + return { kind: operation.kind, value: normalizeAgentRuntimeSettingsPatch(operation.value) }; default: throw domainError(`runtime policy operation '${String(operation.kind)}' is unknown`); } } +function normalizeAgentRuntimeSettingsPatch(value: unknown): AgentRuntimeSettingsPatch { + const patch = exactRecord( + value, + 'agent runtime settings patch', + ['personalization', 'memory', 'workspaceInstructions', 'privacy', 'webSearch'], + [], + ); + return { + ...(patch.personalization === undefined + ? {} + : { personalization: normalizePersonalizationPatch(patch.personalization) }), + ...(patch.memory === undefined ? {} : { memory: normalizeMemoryPatch(patch.memory) }), + ...(patch.workspaceInstructions === undefined + ? {} + : { + workspaceInstructions: normalizeEnabledPatch( + patch.workspaceInstructions, + 'workspace instructions patch', + ), + }), + ...(patch.privacy === undefined ? {} : { privacy: normalizePrivacyPatch(patch.privacy) }), + ...(patch.webSearch === undefined + ? {} + : { webSearch: normalizeEnabledPatch(patch.webSearch, 'web search patch') }), + }; +} + +function normalizePersonalizationPatch( + value: unknown, +): AgentRuntimeSettingsPatch['personalization'] { + const patch = exactRecord(value, 'personalization patch', ['displayName', 'assistantTone'], []); + return { + ...(patch.displayName === undefined + ? {} + : { displayName: stringValue(patch.displayName, 'personalization displayName', 256) }), + ...(patch.assistantTone === undefined + ? {} + : { + assistantTone: stringValue(patch.assistantTone, 'personalization assistantTone', 4_096), + }), + }; +} + +function normalizeMemoryPatch(value: unknown): AgentRuntimeSettingsPatch['memory'] { + const patch = exactRecord(value, 'memory patch', ['enabled', 'agentReadEnabled'], []); + return { + ...(patch.enabled === undefined + ? {} + : { enabled: booleanValue(patch.enabled, 'memory enabled') }), + ...(patch.agentReadEnabled === undefined + ? {} + : { + agentReadEnabled: booleanValue(patch.agentReadEnabled, 'memory agentReadEnabled'), + }), + }; +} + +function normalizePrivacyPatch(value: unknown): AgentRuntimeSettingsPatch['privacy'] { + const patch = exactRecord(value, 'privacy patch', ['incognitoActive'], []); + return { + ...(patch.incognitoActive === undefined + ? {} + : { incognitoActive: booleanValue(patch.incognitoActive, 'privacy incognitoActive') }), + }; +} + +function normalizeEnabledPatch(value: unknown, name: string): { readonly enabled?: boolean } { + const patch = exactRecord(value, name, ['enabled'], []); + return { + ...(patch.enabled === undefined + ? {} + : { enabled: booleanValue(patch.enabled, `${name} enabled`) }), + }; +} + function normalizeNetworkProxy(value: unknown): RuntimePolicy['networkProxy'] { const item = exactRecord(value, 'network proxy', [ 'enabled', @@ -139,11 +250,22 @@ function normalizePrivacy(value: unknown): RuntimePolicy['privacy'] { } function normalizeChatDefaults(value: unknown): RuntimePolicy['chatDefaults'] { - const item = exactRecord(value, 'chat defaults', ['permissionMode']); + const item = exactRecord( + value, + 'chat defaults', + ['permissionMode', 'thinkingLevel'], + ['permissionMode'], + ); if (!(CHAT_DEFAULT_PERMISSION_MODES as readonly unknown[]).includes(item.permissionMode)) { throw domainError('chat default permission mode is invalid'); } - return { permissionMode: item.permissionMode as RuntimePolicy['chatDefaults']['permissionMode'] }; + if (item.thinkingLevel !== undefined && !isThinkingLevel(item.thinkingLevel)) { + throw domainError('chat default thinking level is invalid'); + } + return { + permissionMode: item.permissionMode as RuntimePolicy['chatDefaults']['permissionMode'], + ...(item.thinkingLevel === undefined ? {} : { thinkingLevel: item.thinkingLevel }), + }; } function normalizeWebSearch(value: unknown): RuntimePolicy['webSearch'] { diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts index de5524904d..b01fbe50dd 100644 --- a/packages/core/src/session.ts +++ b/packages/core/src/session.ts @@ -662,6 +662,8 @@ export interface UserMessage extends MessageContent { id: string; turnId: string; ts: number; + /** Canonical RuntimeEvent that materialized this mid-Turn steering projection. */ + steeringEventId?: string; /** Non-user trigger source. Lets the chat mark turns the user did not * hand-type. Mirrors TurnOrigin in runtime-inputs. */ origin?: @@ -853,7 +855,7 @@ export interface SystemNoteMessage { const USER_MESSAGE_SHAPE = defineObjectShape()( ['type', 'id', 'turnId', 'ts', 'text'], - ['displayText', 'attachments', 'quotes', 'inlineReferences', 'origin'], + ['displayText', 'attachments', 'quotes', 'inlineReferences', 'steeringEventId', 'origin'], ); const ASSISTANT_MESSAGE_SHAPE = defineObjectShape()( ['type', 'id', 'turnId', 'ts', 'text', 'modelId'], diff --git a/packages/core/src/skill-invocation.ts b/packages/core/src/skill-invocation.ts new file mode 100644 index 0000000000..6eadbdbd21 --- /dev/null +++ b/packages/core/src/skill-invocation.ts @@ -0,0 +1,244 @@ +export type SkillInvocationMode = 'explicit' | 'model_tool'; + +export type SkillInvocationFailureReason = + | 'invalid_name' + | 'not_found' + | 'disabled' + | 'host_incompatible' + | 'resolution_failed' + | 'too_many_requests'; + +export type PerRequestSkillInvocationFailureReason = Exclude< + SkillInvocationFailureReason, + 'too_many_requests' +>; + +export type SkillInvocationReceipt = + | { + invocation: SkillInvocationMode; + request: string; + success: true; + ref: string; + id: string; + name: string; + scope: 'project' | 'workspace' | 'user' | 'custom'; + source: 'maka' | 'agents' | 'legacy' | 'custom'; + truncated: boolean; + } + | { + invocation: SkillInvocationMode; + request: string; + success: false; + reason: PerRequestSkillInvocationFailureReason; + } + | { + invocation: 'explicit'; + success: false; + reason: 'too_many_requests'; + requestLimit: number; + }; + +export type SkillInvocationFailure = + | { + request: string; + reason: PerRequestSkillInvocationFailureReason; + } + | { + reason: 'too_many_requests'; + requestLimit: number; + }; + +export interface SkillInvocationResult { + readonly loaded: readonly { readonly id: string; readonly name: string }[]; + readonly failed: readonly SkillInvocationFailure[]; + readonly receipts: readonly SkillInvocationReceipt[]; +} + +const SKILL_INVOCATION_MAX_ENTRIES = 50; +export const SKILL_INVOCATION_REQUEST_MAX_BYTES = 512; +export const SKILL_INVOCATION_REF_MAX_BYTES = 512; +export const SKILL_INVOCATION_ID_MAX_BYTES = 128; +export const SKILL_INVOCATION_NAME_MAX_BYTES = 256; +export const SKILL_INVOCATION_RESULT_MAX_BYTES = 72 * 1024; +const UTF8 = new TextEncoder(); +const SKILL_INVOCATION_FAILURE_REASONS = new Set([ + 'invalid_name', + 'not_found', + 'disabled', + 'host_incompatible', + 'resolution_failed', +]); +const SKILL_INVOCATION_SCOPES = new Set(['project', 'workspace', 'user', 'custom']); +const SKILL_INVOCATION_SOURCES = new Set(['maka', 'agents', 'legacy', 'custom']); + +export function decodeSkillInvocationResult(value: unknown): SkillInvocationResult { + requireEncodedByteLimit(value, SKILL_INVOCATION_RESULT_MAX_BYTES); + const record = requireRecord(value, ['loaded', 'failed', 'receipts']); + const loaded = requireBoundedArray(record.loaded, 'loaded').map((entry) => { + const item = requireRecord(entry, ['id', 'name']); + return Object.freeze({ + id: requireBoundedText(item.id, 'Skill id', SKILL_INVOCATION_ID_MAX_BYTES), + name: requireBoundedText(item.name, 'Skill name', SKILL_INVOCATION_NAME_MAX_BYTES), + }); + }); + const failed = requireBoundedArray(record.failed, 'failed').map(decodeFailure); + const receipts = requireBoundedArray(record.receipts, 'receipts').map(decodeReceipt); + return Object.freeze({ + loaded: Object.freeze(loaded), + failed: Object.freeze(failed), + receipts: Object.freeze(receipts), + }); +} + +function decodeFailure(value: unknown): SkillInvocationFailure { + const record = requireObject(value); + if (record.reason === 'too_many_requests') { + requireExactKeys(record, ['reason', 'requestLimit']); + return Object.freeze({ + reason: 'too_many_requests', + requestLimit: requireRequestLimit(record.requestLimit), + }); + } + requireExactKeys(record, ['request', 'reason']); + return Object.freeze({ + request: requireBoundedText( + record.request, + 'Skill invocation request', + SKILL_INVOCATION_REQUEST_MAX_BYTES, + ), + reason: requirePerRequestFailureReason(record.reason), + }); +} + +function decodeReceipt(value: unknown): SkillInvocationReceipt { + const record = requireObject(value); + if (record.success === true) { + requireExactKeys(record, [ + 'invocation', + 'request', + 'success', + 'ref', + 'id', + 'name', + 'scope', + 'source', + 'truncated', + ]); + if (!SKILL_INVOCATION_SCOPES.has(record.scope as string)) { + throw new Error('Invalid Skill invocation scope'); + } + if (!SKILL_INVOCATION_SOURCES.has(record.source as string)) { + throw new Error('Invalid Skill invocation source'); + } + if (typeof record.truncated !== 'boolean') { + throw new Error('Invalid Skill invocation truncation state'); + } + return Object.freeze({ + invocation: requireInvocationMode(record.invocation), + request: requireBoundedText( + record.request, + 'Skill invocation request', + SKILL_INVOCATION_REQUEST_MAX_BYTES, + ), + success: true, + ref: requireBoundedText(record.ref, 'Skill ref', SKILL_INVOCATION_REF_MAX_BYTES), + id: requireBoundedText(record.id, 'Skill id', SKILL_INVOCATION_ID_MAX_BYTES), + name: requireBoundedText(record.name, 'Skill name', SKILL_INVOCATION_NAME_MAX_BYTES), + scope: record.scope as Extract['scope'], + source: record.source as Extract['source'], + truncated: record.truncated, + }); + } + if (record.success !== false) throw new Error('Invalid Skill invocation receipt outcome'); + if (record.reason === 'too_many_requests') { + requireExactKeys(record, ['invocation', 'success', 'reason', 'requestLimit']); + if (record.invocation !== 'explicit') { + throw new Error('Invalid overflowing Skill invocation mode'); + } + return Object.freeze({ + invocation: 'explicit', + success: false, + reason: 'too_many_requests', + requestLimit: requireRequestLimit(record.requestLimit), + }); + } + requireExactKeys(record, ['invocation', 'request', 'success', 'reason']); + return Object.freeze({ + invocation: requireInvocationMode(record.invocation), + request: requireBoundedText( + record.request, + 'Skill invocation request', + SKILL_INVOCATION_REQUEST_MAX_BYTES, + ), + success: false, + reason: requirePerRequestFailureReason(record.reason), + }); +} + +function requireInvocationMode(value: unknown): SkillInvocationMode { + if (value !== 'explicit' && value !== 'model_tool') { + throw new Error('Invalid Skill invocation mode'); + } + return value; +} + +function requirePerRequestFailureReason(value: unknown): PerRequestSkillInvocationFailureReason { + if (!SKILL_INVOCATION_FAILURE_REASONS.has(value as PerRequestSkillInvocationFailureReason)) { + throw new Error('Invalid Skill invocation failure reason'); + } + return value as PerRequestSkillInvocationFailureReason; +} + +function requireRequestLimit(value: unknown): number { + if (!Number.isSafeInteger(value) || (value as number) < 1 || (value as number) > 50) { + throw new Error('Invalid Skill invocation request limit'); + } + return value as number; +} + +function requireBoundedArray(value: unknown, field: string): unknown[] { + if (!Array.isArray(value) || value.length > SKILL_INVOCATION_MAX_ENTRIES) { + throw new Error(`Invalid Skill invocation ${field}`); + } + return value; +} + +function requireBoundedText(value: unknown, field: string, maxBytes: number): string { + if (typeof value !== 'string' || value.length === 0 || UTF8.encode(value).byteLength > maxBytes) { + throw new Error(`Invalid ${field}`); + } + return value; +} + +function requireEncodedByteLimit(value: unknown, maxBytes: number): void { + let encoded: string | undefined; + try { + encoded = JSON.stringify(value); + } catch { + throw new Error('Invalid Skill invocation result'); + } + if (encoded === undefined || UTF8.encode(encoded).byteLength > maxBytes) { + throw new Error('Invalid Skill invocation result size'); + } +} + +function requireRecord(value: unknown, keys: readonly string[]): Record { + const record = requireObject(value); + requireExactKeys(record, keys); + return record; +} + +function requireObject(value: unknown): Record { + if (!value || typeof value !== 'object' || Array.isArray(value)) { + throw new Error('Invalid Skill invocation record'); + } + return value as Record; +} + +function requireExactKeys(record: Record, keys: readonly string[]): void { + const actual = Object.keys(record).sort(); + const expected = [...keys].sort(); + if (actual.length !== expected.length || actual.some((key, index) => key !== expected[index])) { + throw new Error('Invalid Skill invocation record fields'); + } +} diff --git a/packages/headless/src/__tests__/ahe-target-protocol.fixtures.ts b/packages/headless/src/__tests__/ahe-target-protocol.fixtures.ts index 1f45a43705..cfa0a8ac3c 100644 --- a/packages/headless/src/__tests__/ahe-target-protocol.fixtures.ts +++ b/packages/headless/src/__tests__/ahe-target-protocol.fixtures.ts @@ -54,7 +54,7 @@ export const INVALID_MAKA_AHE_COMPONENTS = [ label: 'duplicate one', description: 'bad category', editable: true, - sourceRefs: [{ path: 'apps/desktop/src/main/system-prompt-main.ts' }], + sourceRefs: [{ path: 'packages/runtime-host/src/server/execution-model-composition.ts' }], }, { id: 'maka-system-prompt', diff --git a/packages/headless/src/ahe-target-protocol.ts b/packages/headless/src/ahe-target-protocol.ts index 368a2e6f51..4cbc9114f6 100644 --- a/packages/headless/src/ahe-target-protocol.ts +++ b/packages/headless/src/ahe-target-protocol.ts @@ -318,12 +318,12 @@ export const MAKA_AHE_CURRENT_COMPONENTS: readonly MakaAheTargetComponent[] = [ { id: 'maka-system-prompt', category: 'system_prompt', - label: 'Maka desktop system prompt', + label: 'Maka Runtime Host system prompt', description: - 'Desktop main-process prompt and workspace context that shape every interactive Maka turn.', + 'Runtime Host prompt composition and workspace context that shape every interactive Maka turn.', editable: true, sourceRefs: [ - { path: 'apps/desktop/src/main/system-prompt-main.ts' }, + { path: 'packages/runtime-host/src/server/execution-model-composition.ts' }, { path: 'packages/runtime/src/system-prompt/session-environment-prompt.ts' }, { path: 'packages/runtime/src/system-prompt/workspace-instructions.ts' }, ], diff --git a/packages/runtime-host/package.json b/packages/runtime-host/package.json index 5cbf233cd2..8b1929e371 100644 --- a/packages/runtime-host/package.json +++ b/packages/runtime-host/package.json @@ -9,6 +9,7 @@ "./adapter": "./dist/adapter/index.js", "./protocol": "./dist/protocol/index.js", "./client": "./dist/client/index.js", + "./desktop-e2e-execution-candidate-main": "./dist/desktop-e2e-execution-candidate-main.js", "./execution-candidate-main": "./dist/execution-candidate-main.js", "./server": "./dist/server/index.js" }, @@ -22,7 +23,8 @@ "dependencies": { "@maka/core": "0.1.0", "@maka/runtime": "0.1.0", - "@maka/storage": "0.1.0" + "@maka/storage": "0.1.0", + "zod": "^4.4.3" }, "devDependencies": { "electron": "^43.2.0" diff --git a/packages/runtime-host/src/__tests__/bootstrap-runtime-policy.test.ts b/packages/runtime-host/src/__tests__/bootstrap-runtime-policy.test.ts new file mode 100644 index 0000000000..65f59c86fd --- /dev/null +++ b/packages/runtime-host/src/__tests__/bootstrap-runtime-policy.test.ts @@ -0,0 +1,158 @@ +import assert from 'node:assert/strict'; +import { mkdtemp, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { test } from 'node:test'; +import { + openInteractiveRuntimePolicyStoresForWrite, + type RuntimePolicyStoresWriter, +} from '@maka/storage/runtime-policy-stores'; +import { resolveStorageRoot, tryAcquireInteractiveRootOwner } from '@maka/storage/root-authority'; +import { ensureBootstrapRuntimePolicy } from '../server/bootstrap-runtime-policy.js'; + +test('a fresh Host starts with one anonymous runnable target', async () => { + await withFixture(async ({ root, stores }) => { + await ensureBootstrapRuntimePolicy({ workspaceRoot: root, stores, environment: {} }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections.length, 1); + const free = catalog.connections[0]; + assert.equal(free?.slug, 'opencode-free'); + assert.equal(free?.enabled, true); + assert.deepEqual(free?.enabledModelIds, [ + 'nemotron-3-ultra-free', + 'mimo-v2.5-free', + 'deepseek-v4-flash-free', + ]); + assert.deepEqual(catalog.defaultTarget, { + connectionId: free?.connectionId, + modelId: 'nemotron-3-ultra-free', + }); + assert.deepEqual( + catalog.connections.map(({ slug }) => slug), + ['opencode-free'], + ); + }); +}); + +test('bootstrap resumes after interruption and prefers the supported environment key', async () => { + await withFixture(async ({ root, stores }) => { + const created = await stores.connectionCatalog.create({ + expectedCatalogRevision: 0, + connection: { + slug: 'opencode-free', + name: 'OpenCode Free', + providerType: 'opencode-free', + enabled: true, + enabledModelIds: ['nemotron-3-ultra-free'], + }, + }); + assert.equal(created.kind, 'committed'); + await writeFile( + join(root, '.runtime-host-bootstrap.json'), + '{"version":1,"state":"initializing"}\n', + 'utf8', + ); + + await ensureBootstrapRuntimePolicy({ + workspaceRoot: root, + stores, + environment: { + ANTHROPIC_API_KEY: 'anthropic-secret', + OPENAI_API_KEY: 'openai-secret', + }, + }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.deepEqual( + catalog.connections.map(({ slug }) => slug), + ['opencode-free', 'env-anthropic'], + ); + const anthropic = catalog.connections[1]; + assert.deepEqual(catalog.defaultTarget, { + connectionId: anthropic?.connectionId, + modelId: 'claude-sonnet-4-5-20250929', + }); + const status = await stores.credentialVault.getStatus({ + scope: 'connection', + connectionId: anthropic!.connectionId, + kind: 'api_key', + }); + assert.equal(status.kind, 'status'); + if (status.kind === 'status') assert.equal(status.status.configured, true); + }); +}); + +test('bootstrap does not alter an existing user catalog', async () => { + await withFixture(async ({ root, stores }) => { + const created = await stores.connectionCatalog.create({ + expectedCatalogRevision: 0, + connection: { + slug: 'local', + name: 'Local', + providerType: 'ollama', + enabled: true, + enabledModelIds: ['local-model'], + }, + }); + assert.equal(created.kind, 'committed'); + const before = await stores.connectionCatalog.getSnapshot(); + + await ensureBootstrapRuntimePolicy({ + workspaceRoot: root, + stores, + environment: { OPENAI_API_KEY: 'must-not-be-imported' }, + }); + + assert.deepEqual(await stores.connectionCatalog.getSnapshot(), before); + assert.deepEqual((await stores.credentialVault.getSnapshot()).entries, []); + }); +}); + +test('an invalid optional environment credential does not keep bootstrap active', async () => { + await withFixture(async ({ root, stores }) => { + const errors: unknown[] = []; + await ensureBootstrapRuntimePolicy({ + workspaceRoot: root, + stores, + environment: { OPENAI_API_KEY: 'x'.repeat(64 * 1024 + 1) }, + onDeferredError: (error) => errors.push(error), + }); + + assert.equal(errors.length, 1); + const catalog = await stores.connectionCatalog.getSnapshot(); + const free = catalog.connections.find(({ slug }) => slug === 'opencode-free'); + assert.deepEqual(catalog.defaultTarget, { + connectionId: free?.connectionId, + modelId: 'nemotron-3-ultra-free', + }); + await ensureBootstrapRuntimePolicy({ + workspaceRoot: root, + stores, + environment: { OPENAI_API_KEY: 'x'.repeat(64 * 1024 + 1) }, + onDeferredError: (error) => errors.push(error), + }); + assert.equal(errors.length, 1); + }); +}); + +async function withFixture( + run: (fixture: { root: string; stores: RuntimePolicyStoresWriter }) => Promise, +): Promise { + const base = await mkdtemp(join(tmpdir(), 'maka-runtime-host-bootstrap-')); + const root = join(base, 'interactive'); + const capability = await resolveStorageRoot({ path: root, kind: 'interactive' }); + const owner = await tryAcquireInteractiveRootOwner(capability); + assert.ok(owner); + if (!owner) return; + try { + const stores = await openInteractiveRuntimePolicyStoresForWrite(owner.lease); + await run({ root, stores }); + } finally { + try { + await owner.close(); + } finally { + await rm(base, { recursive: true, force: true }); + } + } +} diff --git a/packages/runtime-host/src/__tests__/candidate-cli.test.ts b/packages/runtime-host/src/__tests__/candidate-cli.test.ts new file mode 100644 index 0000000000..d11c262d05 --- /dev/null +++ b/packages/runtime-host/src/__tests__/candidate-cli.test.ts @@ -0,0 +1,35 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { parseRuntimeHostCandidateArguments } from '../candidate-cli.js'; + +test('accepts an absolute legacy configuration root for the elected Candidate', () => { + assert.deepEqual( + parseRuntimeHostCandidateArguments([ + '--root', + '/runtime-host-root', + '--expected-root-id', + 'a'.repeat(64), + '--legacy-configuration-root', + '/legacy-configuration', + ]), + { + rootPath: '/runtime-host-root', + expectedRootId: 'a'.repeat(64), + legacyConfigurationRoot: '/legacy-configuration', + idleGraceMs: undefined, + handshakeTimeoutMs: undefined, + }, + ); + assert.throws( + () => + parseRuntimeHostCandidateArguments([ + '--root', + '/runtime-host-root', + '--expected-root-id', + 'a'.repeat(64), + '--legacy-configuration-root', + 'relative/configuration', + ]), + /Invalid --legacy-configuration-root/, + ); +}); diff --git a/packages/runtime-host/src/__tests__/catalog-reader.test.ts b/packages/runtime-host/src/__tests__/catalog-reader.test.ts index 0f4b54a2d1..09b544d885 100644 --- a/packages/runtime-host/src/__tests__/catalog-reader.test.ts +++ b/packages/runtime-host/src/__tests__/catalog-reader.test.ts @@ -8,36 +8,37 @@ import { readRuntimeHostSkillCatalog, } from '../client/catalog-reader.js'; -test('restarts a Session catalog read when its revision changes between pages', async () => { +test('waits out a burst of Session catalog revisions', async () => { let starts = 0; const connection = fakeConnection(async (operation, input) => { assert.equal(operation, 'session.catalog.query'); if (input.kind === 'list_start') { starts += 1; - return starts === 1 - ? { - kind: 'page', - revision: 'sha256:first', - sessions: [], - nextCursor: 'next', - } - : { - kind: 'page', - revision: 'sha256:second', - sessions: [], - nextCursor: null, - }; + return { + kind: 'page', + revision: `sha256:${starts}`, + sessions: [], + nextCursor: 'next', + }; } assert.equal(input.kind, 'list_continue'); + if (starts <= 3) { + return { + kind: 'revision_changed', + expectedRevision: `sha256:${starts}`, + actualRevision: `sha256:${starts + 1}`, + }; + } return { - kind: 'revision_changed', - expectedRevision: 'sha256:first', - actualRevision: 'sha256:second', + kind: 'page', + revision: `sha256:${starts}`, + sessions: [], + nextCursor: null, }; }); assert.deepEqual(await readRuntimeHostSessions(connection), []); - assert.equal(starts, 2); + assert.equal(starts, 4); }); test('rejects a repeated Skill catalog cursor instead of looping forever', async () => { diff --git a/packages/runtime-host/src/__tests__/connection-effect-coordinator.test.ts b/packages/runtime-host/src/__tests__/connection-effect-coordinator.test.ts index e81c9a62b7..d7b537dcca 100644 --- a/packages/runtime-host/src/__tests__/connection-effect-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/connection-effect-coordinator.test.ts @@ -1,8 +1,8 @@ import assert from 'node:assert/strict'; -import { mkdtemp, rm } from 'node:fs/promises'; +import { mkdtemp, open, rm, writeFile } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; -import { test } from 'node:test'; +import { mock, test } from 'node:test'; import type { ConnectionCatalogEntry, ConnectionCatalogEntryDraft, @@ -31,6 +31,311 @@ const context: ConnectionContext = { acquireResidency: () => ({ release: () => undefined }), }; +test('verifies a first-run API key without persisting a connection or credential', async () => { + await withFixture(async ({ stores }) => { + let observed: { slug: string; secret: string } | undefined; + const coordinator = new HostConnectionEffectCoordinator({ + stores, + activation: new RuntimePolicyActivationGate(), + oauthCredentials: new HostOAuthExecutionAuthority(stores), + createTransport: () => recordingTransport(() => undefined), + runModelDiscovery: async (connection, secret) => { + observed = { slug: connection.slug, secret }; + return { ok: true, models: [{ id: 'verified-model' }] }; + }, + }); + + const result = await coordinator.handlers['connection.onboarding.verify']( + { providerType: 'openai', apiKey: 'first-run-secret' }, + context, + ); + + assert.deepEqual(result, { + ok: true, + result: { kind: 'verified', models: [{ id: 'verified-model' }] }, + }); + assert.deepEqual(observed, { slug: 'openai', secret: 'first-run-secret' }); + assert.deepEqual((await stores.connectionCatalog.getSnapshot()).connections, []); + assert.deepEqual((await stores.credentialVault.getSnapshot()).entries, []); + }); +}); + +test('saves a verified first-run target through the canonical Host authorities', async () => { + await withFixture(async ({ stores }) => { + const coordinator = new HostConnectionEffectCoordinator({ + stores, + activation: new RuntimePolicyActivationGate(), + oauthCredentials: new HostOAuthExecutionAuthority(stores), + now: () => 123, + createTransport: () => recordingTransport(() => undefined), + runModelDiscovery: async () => ({ + ok: true, + models: [{ id: 'first-model' }, { id: 'second-model' }], + }), + }); + + const result = await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: 'first-run-secret', + enabledModelIds: ['second-model'], + }, + context, + ); + + assert.deepEqual(result, { ok: true, result: { kind: 'saved' } }); + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections.length, 1); + assert.deepEqual(catalog.connections[0]?.models, [ + { id: 'first-model' }, + { id: 'second-model' }, + ]); + assert.deepEqual(catalog.connections[0]?.enabledModelIds, ['second-model']); + assert.deepEqual(catalog.defaultTarget, { + connectionId: catalog.connections[0]?.connectionId, + modelId: 'second-model', + }); + const credential = (await stores.credentialVault.getSnapshot()).entries[0]; + assert.equal(credential?.configured, true); + assert.doesNotMatch(JSON.stringify(credential), /first-run-secret/u); + }); +}); + +test('re-enables an existing connection without replacing another default target', async () => { + await withFixture(async ({ stores }) => { + const defaultConnection = await createConnection( + stores, + 0, + connectionDraft('existing-default', 'ollama'), + ); + const defaulted = await stores.connectionCatalog.setDefaultTarget({ + expectedCatalogRevision: 1, + target: { connectionId: defaultConnection.connectionId, modelId: 'gpt-5' }, + }); + assert.equal(defaulted.kind, 'committed'); + const disabledConnection = await createConnection(stores, 2, { + slug: 'openai', + name: 'OpenAI', + providerType: 'openai', + enabled: false, + enabledModelIds: [], + }); + await setConnectionCredential(stores, disabledConnection, 'stored-secret'); + const coordinator = new HostConnectionEffectCoordinator({ + stores, + activation: new RuntimePolicyActivationGate(), + oauthCredentials: new HostOAuthExecutionAuthority(stores), + now: () => 456, + createTransport: () => recordingTransport(() => undefined), + runModelDiscovery: async (connection, secret) => { + assert.equal(connection.enabled, false); + assert.equal(secret, 'stored-secret'); + return { ok: true, models: [{ id: 'restored-model' }] }; + }, + }); + + const result = await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: null, + enabledModelIds: ['restored-model'], + }, + context, + ); + + assert.deepEqual(result, { ok: true, result: { kind: 'saved' } }); + const catalog = await stores.connectionCatalog.getSnapshot(); + const restored = catalog.connections.find( + ({ connectionId }) => connectionId === disabledConnection.connectionId, + ); + assert.equal(restored?.enabled, true); + assert.deepEqual(restored?.enabledModelIds, ['restored-model']); + assert.deepEqual(catalog.defaultTarget, { + connectionId: defaultConnection.connectionId, + modelId: 'gpt-5', + }); + }); +}); + +test('leaves canonical onboarding state unchanged when the durable intent cannot be published', { + skip: process.platform === 'win32', +}, async () => { + await withFixture(async ({ root, stores }) => { + const connection = await createConnection(stores, 0, connectionDraft('openai', 'openai')); + await setConnectionCredential(stores, connection, 'old-secret'); + await recordVerifiedConnection(stores, connection); + let invalidations = 0; + const coordinator = onboardingCoordinator(stores, () => { + invalidations += 1; + }); + const syncMock = await failFileHandleSync(root, 1); + try { + assert.deepEqual( + await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: 'new-secret', + enabledModelIds: ['new-model'], + }, + context, + ), + { + ok: false, + error: { + code: 'persistence_failed', + message: 'Connection effect persistence failed', + }, + }, + ); + } finally { + syncMock.mock.restore(); + } + + const catalog = await stores.connectionCatalog.getSnapshot(); + const unchanged = catalog.connections.find( + ({ connectionId }) => connectionId === connection.connectionId, + ); + assert.equal(unchanged?.lastTest?.status, 'verified'); + assert.deepEqual(unchanged?.enabledModelIds, ['gpt-5']); + assert.equal( + (await stores.operations.exportCredentialMaterial(connectionCredential(connection)))?.secret, + 'old-secret', + ); + assert.equal(invalidations, 0); + }); +}); + +test('recovers a durable onboarding intent instead of rolling back a partial publication', { + skip: process.platform === 'win32', +}, async () => { + await withFixture(async ({ root, stores }) => { + const connection = await createConnection(stores, 0, connectionDraft('openai', 'openai')); + await setConnectionCredential(stores, connection, 'old-secret'); + await recordVerifiedConnection(stores, connection); + let invalidations = 0; + const coordinator = onboardingCoordinator(stores, () => { + invalidations += 1; + }); + const syncMock = await failFileHandleSync(root, 5); + try { + assert.deepEqual( + await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: 'new-secret', + enabledModelIds: ['new-model'], + }, + context, + ), + { + ok: false, + error: { + code: 'commit_outcome_unknown', + message: 'Connection effect commit outcome is unknown', + }, + }, + ); + } finally { + syncMock.mock.restore(); + } + + const catalog = await stores.connectionCatalog.getSnapshot(); + const recovered = catalog.connections.find( + ({ connectionId }) => connectionId === connection.connectionId, + ); + assert.equal(recovered?.lastTest, undefined); + assert.deepEqual(recovered?.enabledModelIds, ['new-model']); + assert.deepEqual(recovered?.models, [{ id: 'new-model' }]); + assert.equal( + (await stores.operations.exportCredentialMaterial(connectionCredential(connection)))?.secret, + 'new-secret', + ); + assert.equal(invalidations, 1); + }); +}); + +test('invalidates a verified result when onboarding rotates only the credential', async () => { + await withFixture(async ({ stores }) => { + const connection = await createConnection(stores, 0, connectionDraft('openai', 'openai')); + await setConnectionCredential(stores, connection, 'old-secret'); + await recordFetchedModel(stores, connection, 'gpt-5'); + await recordVerifiedConnection(stores, connection); + const coordinator = onboardingCoordinator(stores, () => undefined, 'gpt-5'); + + assert.deepEqual( + await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: 'new-secret', + enabledModelIds: ['gpt-5'], + }, + context, + ), + { ok: true, result: { kind: 'saved' } }, + ); + + const updated = (await stores.connectionCatalog.getSnapshot()).connections.find( + ({ connectionId }) => connectionId === connection.connectionId, + ); + assert.equal(updated?.lastTest, undefined); + assert.equal( + (await stores.operations.exportCredentialMaterial(connectionCredential(connection)))?.secret, + 'new-secret', + ); + }); +}); + +test('rejects an oversized final catalog before publishing a recovery intent', async () => { + await withFixture(async ({ root, stores }) => { + const existing = { + schemaVersion: 1, + revision: 1, + defaultTarget: null, + connections: [ + largeCatalogConnection('00000000-0000-4000-8000-000000000001', 'bulk-a', 2_048), + largeCatalogConnection('00000000-0000-4000-8000-000000000002', 'bulk-b', 1_400), + ], + }; + const bytes = `${JSON.stringify(existing, null, 2)}\n`; + assert.ok(Buffer.byteLength(bytes) < 4 * 1024 * 1024); + await writeFile(join(root, 'connection-catalog.json'), bytes, { mode: 0o600 }); + assert.equal((await stores.connectionCatalog.getSnapshot()).connections.length, 2); + + const discovered = largeCatalogModels('onboarding', 512); + const coordinator = new HostConnectionEffectCoordinator({ + stores, + activation: new RuntimePolicyActivationGate(), + oauthCredentials: new HostOAuthExecutionAuthority(stores), + createTransport: () => recordingTransport(() => undefined), + runModelDiscovery: async () => ({ ok: true, models: discovered }), + }); + assert.deepEqual( + await coordinator.handlers['connection.onboarding.save']( + { + providerType: 'openai', + apiKey: 'capacity-secret', + enabledModelIds: [discovered[0]!.id], + }, + context, + ), + { + ok: false, + error: { + code: 'invalid_request', + message: 'Connection effect request is invalid', + }, + }, + ); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections.length, 2); + assert.equal( + catalog.connections.some(({ slug }) => slug === 'openai'), + false, + ); + }); +}); + test('serializes one connection, runs different connections concurrently, and continues after provider failure', async () => { await withFixture(async ({ stores }) => { const first = await createConnection(stores, 0, connectionDraft('queue-first', 'ollama')); @@ -467,6 +772,87 @@ async function connectionCredentialStatus( return result.status; } +function onboardingCoordinator( + stores: Writer, + onCommittedMutation: () => void, + modelId = 'new-model', +) { + return new HostConnectionEffectCoordinator({ + stores, + activation: new RuntimePolicyActivationGate(), + oauthCredentials: new HostOAuthExecutionAuthority(stores), + now: () => 789, + onCommittedMutation, + createTransport: () => recordingTransport(() => undefined), + runModelDiscovery: async () => ({ ok: true, models: [{ id: modelId }] }), + }); +} + +async function recordFetchedModel( + stores: Writer, + connection: ConnectionCatalogEntry, + modelId: string, +): Promise { + const prepared = await stores.operations.beginModelFetch(connection.connectionId); + assert.equal(prepared.kind, 'ready'); + if (prepared.kind !== 'ready') throw new Error('model fetch did not start'); + const completed = await stores.operations.completeModelFetch(prepared.ticket, { + models: [{ id: modelId }], + source: 'fetched', + fetchedAt: 1, + }); + assert.equal(completed.kind, 'committed'); +} + +async function recordVerifiedConnection( + stores: Writer, + connection: ConnectionCatalogEntry, +): Promise { + const prepared = await stores.operations.beginConnectionTest(connection.connectionId, 'gpt-5'); + assert.equal(prepared.kind, 'ready'); + if (prepared.kind !== 'ready') throw new Error('connection test did not start'); + const completed = await stores.operations.completeConnectionTest(prepared.ticket, { + status: 'verified', + checkedAt: '2026-08-07T00:00:00.000Z', + }); + assert.equal(completed.kind, 'committed'); +} + +async function failFileHandleSync(root: string, targetCall: number) { + const probe = await open(root, 'r'); + const fileHandlePrototype = Object.getPrototypeOf(probe) as { sync: typeof probe.sync }; + const originalSync = fileHandlePrototype.sync; + await probe.close(); + let syncCalls = 0; + return mock.method(fileHandlePrototype, 'sync', async function (this: typeof probe) { + syncCalls += 1; + if (syncCalls === targetCall) throw new Error('injected onboarding persistence failure'); + return originalSync.call(this); + }); +} + +function largeCatalogConnection(connectionId: string, slug: string, modelCount: number) { + return { + connectionId, + revision: 1, + slug, + name: slug, + providerType: 'ollama' as const, + enabled: false, + enabledModelIds: [], + models: largeCatalogModels(slug, modelCount), + modelSource: 'fetched' as const, + modelsFetchedAt: 1, + }; +} + +function largeCatalogModels(prefix: string, count: number) { + return Array.from({ length: count }, (_value, index) => ({ + id: `${prefix}-${index}-`.padEnd(512, 'x'), + displayName: 'd'.repeat(512), + })); +} + function recordingTransport(onClose: () => void): ConnectionEffectFetchTransport { return { fetch: globalThis.fetch, diff --git a/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts b/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts index f0b7f72090..82713c9751 100644 --- a/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts +++ b/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts @@ -13,7 +13,13 @@ const EXPECTED = { }; describe('Runtime Host connection effects protocol', () => { - test('declares two ready commands with bounded mutation errors', () => { + test('declares ready commands with bounded mutation errors', () => { + assert.deepEqual(Object.keys(CONNECTION_EFFECT_OPERATION_SPECS).sort(), [ + 'connection.models.fetch', + 'connection.onboarding.save', + 'connection.onboarding.verify', + 'connection.test.run', + ]); for (const operation of Object.keys(CONNECTION_EFFECT_OPERATION_SPECS) as Array< keyof typeof CONNECTION_EFFECT_OPERATION_SPECS >) { @@ -40,6 +46,50 @@ describe('Runtime Host connection effects protocol', () => { } }); + test('bounds transient onboarding secrets, models, and save selections', () => { + const verify = request('connection.onboarding.verify', { + providerType: 'openrouter', + apiKey: 'transient-secret', + }); + const save = request('connection.onboarding.save', { + providerType: 'openrouter', + apiKey: 'transient-secret', + enabledModelIds: ['openrouter/free'], + }); + assert.deepEqual(decodeClientFrame(verify), verify); + assert.deepEqual(decodeClientFrame(save), save); + assert.deepEqual( + decodeHostFrame( + response('connection.onboarding.verify', { + kind: 'verified', + models: [{ id: 'openrouter/free', contextWindow: 128_000 }], + }), + ), + response('connection.onboarding.verify', { + kind: 'verified', + models: [{ id: 'openrouter/free', contextWindow: 128_000 }], + }), + ); + assert.deepEqual( + decodeHostFrame(response('connection.onboarding.save', { kind: 'saved' })), + response('connection.onboarding.save', { kind: 'saved' }), + ); + assertInvalidRequest('connection.onboarding.save', { + providerType: 'openrouter', + apiKey: null, + enabledModelIds: [], + }); + assertInvalidResponse('connection.onboarding.verify', { + kind: 'verified', + models: [], + }); + assertInvalidResponse('connection.onboarding.save', { + kind: 'failed', + errorClass: 'auth', + secret: 'forbidden', + }); + }); + test('requires a stable connection identity and an explicit nullable test model', () => { const fetch = request('connection.models.fetch', { connectionId: EXPECTED.connectionId }); const connectionTest = request('connection.test.run', { diff --git a/packages/runtime-host/src/__tests__/connection-session.test.ts b/packages/runtime-host/src/__tests__/connection-session.test.ts index 611ed865fc..d7e810341c 100644 --- a/packages/runtime-host/src/__tests__/connection-session.test.ts +++ b/packages/runtime-host/src/__tests__/connection-session.test.ts @@ -994,7 +994,11 @@ function createHandlers(queryTurn: TurnQueryHandler): RuntimeHostComposition['ha ...createUnavailableDomainOperationHandlers(), 'turn.start': async (input) => ({ ok: true, - result: runningSnapshot(input.sessionId, input.turnId), + result: { + kind: 'started', + turn: runningSnapshot(input.sessionId, input.turnId), + skillInvocation: { loaded: [], failed: [], receipts: [] }, + }, }), 'turn.query': queryTurn, 'turn.stop': async (input) => ({ diff --git a/packages/runtime-host/src/__tests__/daily-review-two-client-uds.test.ts b/packages/runtime-host/src/__tests__/daily-review-two-client-uds.test.ts index 4e2a36d25e..f9053713df 100644 --- a/packages/runtime-host/src/__tests__/daily-review-two-client-uds.test.ts +++ b/packages/runtime-host/src/__tests__/daily-review-two-client-uds.test.ts @@ -108,6 +108,7 @@ test('two Clients share Daily Review config, generation, and restart recovery', const noModel = await desktop.mutateDailyReview({ ...run, offsetDays: 0, + modelKeyOverride: 'missing-provider::missing-model', }); assert.equal(noModel.kind, 'archive'); if (noModel.kind !== 'archive') return; @@ -117,7 +118,11 @@ test('two Clients share Daily Review config, generation, and restart recovery', const enabled = await desktop.mutateDailyReview({ kind: 'update_config', expectedRevision: 1, - config: { enabled: true, executeTime: '00:00', modelKey: '' }, + config: { + enabled: true, + executeTime: '00:00', + modelKey: 'missing-provider::missing-model', + }, }); assert.equal(enabled.kind, 'config_committed'); const scheduled = await waitForScheduledArchive(desktop); diff --git a/packages/runtime-host/src/__tests__/execution-composition.test.ts b/packages/runtime-host/src/__tests__/execution-composition.test.ts index 44d08f78d8..b843713217 100644 --- a/packages/runtime-host/src/__tests__/execution-composition.test.ts +++ b/packages/runtime-host/src/__tests__/execution-composition.test.ts @@ -216,6 +216,47 @@ test('production composition orphans ownerless ShellRuns before serving Resource }); }); +test('production Skill catalog resolves a Graph child durable tool surface', async () => { + await withCompositionRoot(async ({ root, owner }) => { + const stores = await openInteractiveExecutionStoresForWrite(owner.lease); + const parent = await stores.sessionStore.create({ + cwd: root, + backend: 'fake', + llmConnectionSlug: 'fake', + model: 'fake-model', + permissionMode: 'ask', + }); + const child = await createClaimedGraphChild({ + root, + parentSessionId: parent.id, + suffix: 'c', + stores, + prompt: 'inspect the child Skill catalog', + }); + const composition = await createExecutionRuntimeHostComposition(compositionContext(owner)); + try { + await composition.recover(); + const outcome = await composition.handlers['skill.catalog.invocable.query']( + { + kind: 'start', + target: { kind: 'session', sessionId: child.request.targetSessionId }, + }, + { + hostEpoch: 'execution-composition-test', + connectionId: 'graph-child-skill-client', + surface: 'desktop', + principal: 'local_os_user', + acquireResidency: () => ({ release() {} }), + }, + ); + assert.equal(outcome.ok, true); + if (outcome.ok) assert.equal(outcome.result.kind, 'page'); + } finally { + await composition.close(); + } + }); +}); + test('production execution composition owns claimed graph activation retry and exact abort', async () => { await withCompositionRoot(async ({ root, owner }) => { const stores = await openInteractiveExecutionStoresForWrite(owner.lease); @@ -454,7 +495,7 @@ async function createClaimedGraphChild(input: { agentName: LOCAL_READ_AGENT_DEFINITION.name, profile: LOCAL_READ_AGENT_DEFINITION.profile, systemPrompt: LOCAL_READ_AGENT_DEFINITION.systemPrompt, - toolNames: [], + toolNames: [...LOCAL_READ_AGENT_DEFINITION.tools], categoryPolicy: {}, permissionCeiling: 'ask', }, diff --git a/packages/runtime-host/src/__tests__/execution-host-continuation.test.ts b/packages/runtime-host/src/__tests__/execution-host-continuation.test.ts index 51cee83db3..ac22be551e 100644 --- a/packages/runtime-host/src/__tests__/execution-host-continuation.test.ts +++ b/packages/runtime-host/src/__tests__/execution-host-continuation.test.ts @@ -4,6 +4,7 @@ import { mcpProxyToolName } from '@maka/runtime'; import { type ClientCapabilityProvider, RuntimeHostOperationError } from '../client/index.js'; import { connectClient, + requireStartedTurn, waitForTerminalTurn, withExecutionRoot, } from './fixtures/execution-host-suite.js'; @@ -47,7 +48,8 @@ test('two Clients idempotently start one Host-owned safe-boundary continuation', const retry = await second.startTurnResume(input); assert.deepEqual(retry, { kind: 'started', turn: terminal }); - assert.deepEqual(await first.queryTurnResume({ sessionId: fixture.sessionId }), { + const settledPlan = await first.queryTurnResume({ sessionId: fixture.sessionId }); + assert.deepEqual(settledPlan, { sessionId: fixture.sessionId, disposition: 'parked', reason: 'continuation_already_exists', @@ -231,11 +233,13 @@ test('startup parks a provider-indeterminate continuation without blocking the H (error) => error instanceof RuntimeHostOperationError && error.code === 'session_busy', ); - const sibling = await client.startTurn({ - sessionId: siblingSessionId, - turnId: 'turn-unrelated-to-indeterminate-continuation', - content: { text: 'Continue normally.' }, - }); + const sibling = requireStartedTurn( + await client.startTurn({ + sessionId: siblingSessionId, + turnId: 'turn-unrelated-to-indeterminate-continuation', + content: { text: 'Continue normally.' }, + }), + ); assert.equal(sibling.sessionId, siblingSessionId); } finally { await client.close(); @@ -271,11 +275,13 @@ test('startup parks a provider-indeterminate continuation when resume is disable reason: 'continuation_unavailable', }, ); - const sibling = await client.startTurn({ - sessionId: siblingSessionId, - turnId: 'turn-unrelated-to-disabled-indeterminate-continuation', - content: { text: 'Continue normally.' }, - }); + const sibling = requireStartedTurn( + await client.startTurn({ + sessionId: siblingSessionId, + turnId: 'turn-unrelated-to-disabled-indeterminate-continuation', + content: { text: 'Continue normally.' }, + }), + ); assert.equal(sibling.sessionId, siblingSessionId); } finally { await client.close(); diff --git a/packages/runtime-host/src/__tests__/execution-host-message.test.ts b/packages/runtime-host/src/__tests__/execution-host-message.test.ts index 66729c79d0..355d9cbed3 100644 --- a/packages/runtime-host/src/__tests__/execution-host-message.test.ts +++ b/packages/runtime-host/src/__tests__/execution-host-message.test.ts @@ -78,6 +78,7 @@ import { assertJsonLines, attachment, connectClient, + requireStartedTurn, operationError, quotedContent, quoteRefs, @@ -227,11 +228,13 @@ test('explicit retract is durable across connections and prevents successor admi const first = await connectClient(fixture.root, 'desktop'); const second = await connectClient(fixture.root, 'tui'); const turnId = randomUUID(); - const started = await first.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await first.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); const messageId = randomUUID(); const submitted = await first.request('turn.message.submit', { originHostEpoch: host.hostEpoch, @@ -281,11 +284,13 @@ test('interrupt atomically retracts queued followup, stops the exact run, and is const first = await connectClient(fixture.root, 'desktop'); const second = await connectClient(fixture.root, 'tui'); const turnId = randomUUID(); - const started = await first.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await first.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); const followupId = randomUUID(); const followupContent = { text: 'must be withdrawn', diff --git a/packages/runtime-host/src/__tests__/execution-host-queue.test.ts b/packages/runtime-host/src/__tests__/execution-host-queue.test.ts index 327237f510..fd1bd6e6cd 100644 --- a/packages/runtime-host/src/__tests__/execution-host-queue.test.ts +++ b/packages/runtime-host/src/__tests__/execution-host-queue.test.ts @@ -66,6 +66,7 @@ import { type TaskLedgerRevision, type TurnMessageSubmitInput, type TurnSnapshot, + type TurnStartResult, } from '../protocol/index.js'; import { SessionAdmissionGate } from '../server/session-admission-gate.js'; import { HostTaskLedgerCoordinator } from '../server/task-ledger-coordinator.js'; @@ -78,6 +79,7 @@ import { assertJsonLines, attachment, connectClient, + requireStartedTurn, operationError, quotedContent, sendStartWithoutReadingResponse, @@ -111,11 +113,13 @@ test('subscribed Clients share one canonical queue and ordered root handoff', as } const firstTurnId = randomUUID(); - const started = await desktop.startTurn({ - sessionId: fixture.sessionId, - turnId: firstTurnId, - content: { text: `continuity root ${'x'.repeat(540)}` }, - }); + const started = requireStartedTurn( + await desktop.startTurn({ + sessionId: fixture.sessionId, + turnId: firstTurnId, + content: { text: `continuity root ${'x'.repeat(540)}` }, + }), + ); for (const probe of [desktopProbe, tuiProbe]) { const liveDelta = await probe.waitFor( (frame) => @@ -207,7 +211,8 @@ test('concurrent root admission for one Session has a single winner', async () = }), ]); const winners = outcomes.filter( - (outcome): outcome is PromiseFulfilledResult => outcome.status === 'fulfilled', + (outcome): outcome is PromiseFulfilledResult => + outcome.status === 'fulfilled', ); const rejected = outcomes.filter( (outcome): outcome is PromiseRejectedResult => outcome.status === 'rejected', @@ -217,8 +222,9 @@ test('concurrent root admission for one Session has a single winner', async () = assert.ok(rejected[0]?.reason instanceof RuntimeHostOperationError); assert.equal(rejected[0]?.reason.code, 'session_busy'); - const winner = winners[0]?.value; - assert.ok(winner); + const winnerResult = winners[0]?.value; + assert.ok(winnerResult); + const winner = requireStartedTurn(winnerResult); await first.stopTurn({ sessionId: fixture.sessionId, turnId: winner.turnId, @@ -272,11 +278,13 @@ test('a killed Host is recovered exactly once before its successor becomes ready }); const firstProbe = new SubscriptionProbe(firstSubscription); const turnId = randomUUID(); - const started = await first.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await first.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); await firstProbe.waitFor( (frame) => frame.kind === 'subscription.session_projection' && @@ -369,11 +377,13 @@ test('graceful Host shutdown stops and drains an active Turn before releasing ow const host = await fixture.startHost(); const client = await connectClient(fixture.root, 'desktop'); const turnId = randomUUID(); - const started = await client.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await client.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); const exit = await fixture.stopHost(host); assert.deepEqual(exit, { code: 0, signal: null }); diff --git a/packages/runtime-host/src/__tests__/execution-host-recovery.test.ts b/packages/runtime-host/src/__tests__/execution-host-recovery.test.ts index 50cce19335..c0f7e5883c 100644 --- a/packages/runtime-host/src/__tests__/execution-host-recovery.test.ts +++ b/packages/runtime-host/src/__tests__/execution-host-recovery.test.ts @@ -69,6 +69,7 @@ import { assertJsonLines, attachment, connectClient, + requireStartedTurn, operationError, quotedContent, sendStartWithoutReadingResponse, @@ -105,11 +106,13 @@ test('retry after a discarded turn.start response reuses the durable semantic ad const committed = await waitForTurn(observer, fixture.sessionId, turnId); dropped.destroy(); - const retried = await observer.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text }, - }); + const retried = requireStartedTurn( + await observer.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text }, + }), + ); assert.equal(retried.runId, committed.runId); await assert.rejects( () => @@ -128,11 +131,13 @@ test('retry after a discarded turn.start response reuses the durable semantic ad const successorHost = await fixture.startHost(); const successorClient = await connectClient(fixture.root, 'run'); assert.deepEqual( - await successorClient.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text }, - }), + requireStartedTurn( + await successorClient.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text }, + }), + ), terminal, ); const successorTurnId = randomUUID(); diff --git a/packages/runtime-host/src/__tests__/execution-host.test.ts b/packages/runtime-host/src/__tests__/execution-host.test.ts index 897c5466e3..ccf41e32af 100644 --- a/packages/runtime-host/src/__tests__/execution-host.test.ts +++ b/packages/runtime-host/src/__tests__/execution-host.test.ts @@ -81,6 +81,7 @@ import { assertJsonLines, attachment, connectClient, + requireStartedTurn, operationError, quotedContent, sendStartWithoutReadingResponse, @@ -575,13 +576,15 @@ test('two Clients share one execution after the starting Client disconnects', as const second = await connectClient(fixture.root, 'tui'); const turnId = randomUUID(); - const started = await first.startTurn( - { - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }, - PROCESS_TIMEOUT_MS, + const started = requireStartedTurn( + await first.startTurn( + { + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }, + PROCESS_TIMEOUT_MS, + ), ); assert.equal(started.turnId, turnId); const secondSubscription = await second.openSessionSubscription({ @@ -663,23 +666,27 @@ test('two Clients share one execution after the starting Client disconnects', as ); const nextTurnId = randomUUID(); - const next = await second.startTurn( - { - sessionId: fixture.sessionId, - turnId: nextTurnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }, - PROCESS_TIMEOUT_MS, - ); - assert.deepEqual( + const next = requireStartedTurn( await second.startTurn( { sessionId: fixture.sessionId, - turnId, + turnId: nextTurnId, content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, }, PROCESS_TIMEOUT_MS, ), + ); + assert.deepEqual( + requireStartedTurn( + await second.startTurn( + { + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }, + PROCESS_TIMEOUT_MS, + ), + ), stopped, ); assert.deepEqual( @@ -844,11 +851,13 @@ test('context actions share root admission and expose backend capability honestl status: 'unavailable', reason: 'no_completed_request', }); - const started = await first.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await first.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); await waitForRunningTurn(second, fixture.sessionId, turnId); await assert.rejects( second.compactContext({ @@ -890,11 +899,13 @@ test('a disconnected Client leaves a durable Interaction that another Client can const firstHost = await fixture.startHost(); const first = await connectClient(fixture.root, 'desktop'); const turnId = randomUUID(); - const started = await first.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, - }); + const started = requireStartedTurn( + await first.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_USER_QUESTION_PROMPT }, + }), + ); await first.close(); const second = await connectClient(fixture.root, 'tui'); @@ -995,11 +1006,13 @@ test('two UDS Clients settle one hosted sandbox boundary and resume its exact Ru const subscription = await first.openSessionSubscription({ sessionId: fixture.sessionId }); const probe = new SubscriptionProbe(subscription); const turnId = randomUUID(); - const started = await starter.startTurn({ - sessionId: fixture.sessionId, - turnId, - content: { text: FAKE_ASK_SANDBOX_BOUNDARY_PROMPT }, - }); + const started = requireStartedTurn( + await starter.startTurn({ + sessionId: fixture.sessionId, + turnId, + content: { text: FAKE_ASK_SANDBOX_BOUNDARY_PROMPT }, + }), + ); await starter.close(); const pending = await waitForPendingInteraction(subscription, probe, started.runId); diff --git a/packages/runtime-host/src/__tests__/execution-inspect-coordinator.test.ts b/packages/runtime-host/src/__tests__/execution-inspect-coordinator.test.ts index 89ce5a5d2b..d727b19617 100644 --- a/packages/runtime-host/src/__tests__/execution-inspect-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/execution-inspect-coordinator.test.ts @@ -171,6 +171,36 @@ describe('HostExecutionInspectCoordinator', () => { }); }); + test('does not charge unrelated AgentRun diagnostics to the Session trace budget', async () => { + await withCoordinator(async ({ stores, coordinator }) => { + const session = await stores.sessionStore.create(sessionInput('Trace evidence')); + await stores.agentRunStore.createRun(runHeader(session.id, 'trace-run', 1)); + await stores.agentRunStore.appendEvent(session.id, 'trace-run', { + type: 'run_started', + id: 'large-unrelated-event', + sessionId: session.id, + runId: 'trace-run', + turnId: 'turn-trace-run', + ts: 1, + data: { payload: 'x'.repeat(EXECUTION_INSPECT_EVIDENCE_MAX_BYTES) }, + }); + await stores.runtimeEventStore.appendRuntimeEvent( + session.id, + 'trace-run', + runtimeEvent(session.id, 'trace-run', 2), + ); + + const result = await coordinator.handlers['execution.inspect.query']( + { kind: 'session_trace_start', sessionId: session.id }, + connectionContext(), + ); + + assert.equal(result.ok, true); + if (!result.ok || result.result.kind !== 'session_trace_page') return; + assert.equal(result.result.turns.length, 1); + }); + }); + test('accepts evidence that exactly consumes the shared byte budget before an empty ledger', async () => { await withCoordinator(async ({ stores, coordinator }) => { const session = await stores.sessionStore.create(sessionInput('Exact evidence budget')); diff --git a/packages/runtime-host/src/__tests__/execution-model-composition.test.ts b/packages/runtime-host/src/__tests__/execution-model-composition.test.ts index 37a9b6fbcf..2365efe7f4 100644 --- a/packages/runtime-host/src/__tests__/execution-model-composition.test.ts +++ b/packages/runtime-host/src/__tests__/execution-model-composition.test.ts @@ -574,6 +574,7 @@ test('production backend preserves coordinator Client Capability semantics acros test('production Host executes a canonical ai-sdk Session against a real provider wire', async () => { const base = await mkdtemp(join(tmpdir(), 'maka-host-real-model-')); const root = join(base, 'interactive'); + const home = join(base, 'home'); const provider = await startProvider(); const capability = await resolveStorageRoot({ path: root, kind: 'interactive' }); const owner = await tryAcquireInteractiveRootOwner(capability); @@ -590,6 +591,7 @@ test('production Host executes a canonical ai-sdk Session against a real provide let drainRequests = 0; let composition: Awaited> | undefined; try { + await mkdir(home, { recursive: true }); await mkdir(join(root, '.agents', 'skills', 'hosted-skill'), { recursive: true, }); @@ -677,15 +679,18 @@ test('production Host executes a canonical ai-sdk Session against a real provide const taskLedger = await openInteractiveTaskLedgerStoreForWrite(owner.lease); await taskLedger.create(session.id, [{ subject: 'HOSTED_TASK_LEDGER_SENTINEL' }]); - composition = await createExecutionRuntimeHostComposition({ - owner, - hostEpoch: connectionContext.hostEpoch, - acquireResidency: connectionContext.acquireResidency, - retainUntilProcessExit: () => undefined, - requestDrain: () => { - drainRequests += 1; + composition = await createExecutionRuntimeHostComposition( + { + owner, + hostEpoch: connectionContext.hostEpoch, + acquireResidency: connectionContext.acquireResidency, + retainUntilProcessExit: () => undefined, + requestDrain: () => { + drainRequests += 1; + }, }, - }); + { skillHomeDirectory: home }, + ); await composition.recover(); const memoryState = await composition.handlers['memory.query']( { kind: 'state' }, @@ -760,6 +765,7 @@ test('production Host executes a canonical ai-sdk Session against a real provide 'Automation', 'Bash', 'Edit', + 'ExploreAgent', 'FormatJson', 'Glob', 'GoalClear', @@ -768,6 +774,8 @@ test('production Host executes a canonical ai-sdk Session against a real provide 'GoalSet', 'GoalStatus', 'Grep', + 'MakaSettingsGet', + 'MakaSettingsUpdate', 'Read', 'Skill', 'SkillSearch', @@ -779,6 +787,7 @@ test('production Host executes a canonical ai-sdk Session against a real provide 'load_tools', 'memory_extract', 'memory_remember', + 'request_sandbox_boundary', 'task_create', 'task_get', 'task_list', @@ -981,13 +990,15 @@ test('production Host executes and durably supervises an Agent Graph over a real ); assert.equal(started.ok, true); if (!started.ok) return; + assert.equal(started.result.kind, 'started'); + if (started.result.kind !== 'started') return; let initialTerminal: TurnSnapshot; try { initialTerminal = await waitForTerminal( composition, session.id, turnId, - started.result, + started.result.turn, context, ); } catch (error) { @@ -2150,6 +2161,38 @@ test('Client Capability tools join the existing load_tools catalog without a par ); }); +test('Side conversations end the Host-owned system prompt with an isolation boundary', async () => { + const composition = createHostExecutionModelComposition({ + policy: { + getSnapshot: async () => ({ revision: 0, policy: createDefaultRuntimePolicy() }), + }, + skills: { + readCanonicalModelInventory: async () => ({ inventory: [] }), + } as unknown as HostSkillCatalogCoordinator, + memory: { + readPromptProjection: async () => ({ + policy: { revision: 0, policy: createDefaultRuntimePolicy() }, + }), + } as unknown as HostMemoryCoordinator, + taskLedger: { list: async () => [] } as unknown as TaskLedgerStore, + sideConversation: true, + }); + + const prompt = + (await composition.systemPrompt({ + sessionId: 'side-session', + turnId: 'turn-1', + cwd: '/workspace', + workspaceRoot: '/workspace', + })) ?? ''; + assert.match(prompt, /Side conversation boundary/); + assert.match(prompt, /inherited parent history is reference context only/i); + assert.equal( + prompt.trimEnd().endsWith('Workspace changes may be visible to both conversations.'), + true, + ); +}); + test('Deep Research composition keeps one read-only research surface and prompt', async () => { const tool = (name: string, categoryHint?: MakaTool['categoryHint']): MakaTool => ({ name, @@ -2194,6 +2237,7 @@ test('Deep Research composition keeps one read-only research surface and prompt' assert.deepEqual(composition.tools.map((candidate) => candidate.name).sort(), [ 'AskUserQuestion', + 'ExploreAgent', 'Read', 'WebSearch', 'deep_research_status', @@ -2203,7 +2247,7 @@ test('Deep Research composition keeps one read-only research surface and prompt' assert.equal(composition.tools.includes(unsafeDeepResearchTool), false); assert.equal( composition.tools.some((candidate) => candidate.categoryHint === 'subagent'), - false, + true, ); assert.equal( composition.toolAvailability.groups?.find((group) => group.id === 'client_fixture'), @@ -2217,7 +2261,7 @@ test('Deep Research composition keeps one read-only research surface and prompt' workspaceRoot: process.cwd(), })) ?? ''; assert.match(prompt, /Deep research mode is active/); - assert.doesNotMatch(prompt, /ExploreAgent/); + assert.match(prompt, /ExploreAgent/); // The Deep Research contract is a trailing assertion that constrains the // fragments before it; it must be the last non-empty fragment. With no skills // or workspace instructions in this fixture, the contract follows identity. @@ -2481,11 +2525,12 @@ async function startTurn( context: ConnectionContext, ): Promise { for (let attempt = 0; attempt < 200; attempt += 1) { - const started = await composition.handlers['turn.start']( - { sessionId, turnId, content: { text } }, - context, - ); - if (started.ok) return started.result; + const input = { sessionId, turnId, content: { text } }; + const started = await composition.handlers['turn.start'](input, context); + if (started.ok) { + if (started.result.kind === 'started') return started.result.turn; + throw new Error(`Hosted real-model Skill invocation was blocked: ${JSON.stringify(started)}`); + } if (started.error.code !== 'session_busy') { throw new Error(`Hosted real-model Turn start failed: ${JSON.stringify(started.error)}`); } diff --git a/packages/runtime-host/src/__tests__/fixtures/execution-host-suite.ts b/packages/runtime-host/src/__tests__/fixtures/execution-host-suite.ts index 8b6f4400d4..eaaa34a772 100644 --- a/packages/runtime-host/src/__tests__/fixtures/execution-host-suite.ts +++ b/packages/runtime-host/src/__tests__/fixtures/execution-host-suite.ts @@ -71,6 +71,7 @@ import { type TaskLedgerRevision, type TurnMessageSubmitInput, type TurnSnapshot, + type TurnStartResult, } from '../../protocol/index.js'; import { SessionAdmissionGate } from '../../server/session-admission-gate.js'; import { HostTaskLedgerCoordinator } from '../../server/task-ledger-coordinator.js'; @@ -1248,21 +1249,35 @@ export async function waitForTerminalTurn( sessionId: string, turnId: string, ): Promise { - const deadline = Date.now() + PROCESS_TIMEOUT_MS; - while (true) { - const snapshot = await connection.queryTurn({ sessionId, turnId }); - if ( - snapshot.status === 'completed' || - snapshot.status === 'failed' || - snapshot.status === 'cancelled' - ) { - return snapshot; - } - if (Date.now() >= deadline) throw new Error('Turn did not reach a terminal fact'); - await sleep(20); + const subscription = await connection.openSessionSubscription({ sessionId }, PROCESS_TIMEOUT_MS); + try { + return await withTimeout( + (async () => { + const current = await connection.queryTurn({ sessionId, turnId }); + if (isTerminalTurnSnapshot(current)) return current; + for await (const frame of subscription) { + if (frame.kind !== 'subscription.session_projection') continue; + const projected = frame.snapshot.rootTurn; + if (projected?.turnId === turnId && isTerminalTurnSnapshot(projected)) return projected; + } + throw new Error('Session subscription closed before the Turn reached a terminal fact'); + })(), + PROCESS_TIMEOUT_MS, + `Turn ${turnId} in Session ${sessionId} did not reach a terminal fact`, + ); + } finally { + await subscription.close(); } } +function isTerminalTurnSnapshot(snapshot: TurnSnapshot): boolean { + return ( + snapshot.status === 'completed' || + snapshot.status === 'failed' || + snapshot.status === 'cancelled' + ); +} + export async function waitForRunningTurn( connection: RuntimeHostConnection, sessionId: string, @@ -1336,6 +1351,12 @@ export function quotedContent(text: string): MessageContent { return { text, quotes: quoteRefs(text.replaceAll(' ', '-')) }; } +export function requireStartedTurn(result: TurnStartResult): TurnSnapshot { + assert.equal(result.kind, 'started', JSON.stringify(result)); + if (result.kind !== 'started') assert.fail('Expected a started Turn'); + return result.turn; +} + export function userRuntimeContent( events: readonly RuntimeEvent[], ): Extract, { kind: 'text' }> | undefined { diff --git a/packages/runtime-host/src/__tests__/host-kernel.test.ts b/packages/runtime-host/src/__tests__/host-kernel.test.ts index d9d34062f9..3dbcff2d33 100644 --- a/packages/runtime-host/src/__tests__/host-kernel.test.ts +++ b/packages/runtime-host/src/__tests__/host-kernel.test.ts @@ -19,7 +19,11 @@ import { tmpdir } from 'node:os'; import { dirname, join } from 'node:path'; import { describe, test } from 'node:test'; import { promisify } from 'node:util'; -import { connectOrSpawnRuntimeHost, connectRuntimeHost } from '../client/index.js'; +import { + connectOrSpawnRuntimeHost, + connectRuntimeHost, + type RuntimeHostConnection, +} from '../client/index.js'; import { connectOrSpawnRuntimeHostWithDependencies } from '../client/connect-or-spawn.js'; import { launchDetachedRuntimeHostCandidate, @@ -47,6 +51,8 @@ import { type RuntimeHostCompositionContext, } from '../server/index.js'; import { createUnavailableDomainOperationHandlers } from '../server/operation-dispatcher.js'; +import { HostConfigurationChangeService } from '../server/configuration-change-service.js'; +import { HostSessionCatalogChangeService } from '../server/session-catalog-change-service.js'; import { FramedTransport, RuntimeHostTransportError } from '../transport/framed-transport.js'; import { prepareStorageRootControlDirectory, @@ -641,26 +647,35 @@ describe('non-serving Runtime Host kernel', () => { test('a detached Host survives the launcher process that created it', async () => { await withHostPaths(async (paths) => { - const capability = await resolveStorageRoot({ path: paths.root, kind: 'interactive' }); - const launcher = paths.resources.trackChild( - fork( - new URL('./fixtures/detached-launcher.js', import.meta.url), - [paths.root, capability.rootId], - { stdio: ['ignore', 'ignore', 'inherit', 'ipc'] }, - ), - ); - const launchedPid = await waitForLaunch(launcher); - paths.resources.trackPid(launchedPid); - await waitForExit(launcher); + const callerCwd = await mkdtemp(join(tmpdir(), 'maka-runtime-host-launcher-cwd-')); + try { + const capability = await resolveStorageRoot({ path: paths.root, kind: 'interactive' }); + const launcher = paths.resources.trackChild( + fork( + new URL('./fixtures/detached-launcher.js', import.meta.url), + [paths.root, capability.rootId], + { cwd: callerCwd, stdio: ['ignore', 'ignore', 'inherit', 'ipc'] }, + ), + ); + const launchedPid = await waitForLaunch(launcher); + paths.resources.trackPid(launchedPid); + await waitForExit(launcher); - const connected = await retryConnect(paths, CURRENT_PROTOCOL); - assert.equal(connected.kind, 'connected'); - if (connected.kind !== 'connected') return; - assert.equal(connected.registration.pid, launchedPid); - process.kill(launchedPid, 'SIGKILL'); - await connected.connection.closed; - await waitForProcessExit(launchedPid); - paths.resources.forgetPid(launchedPid); + // The detached Host must not retain a caller directory that may be a + // package verifier, updater, or project-owned temporary workspace. + await rm(callerCwd, { recursive: true, force: true }); + + const connected = await retryConnect(paths, CURRENT_PROTOCOL); + assert.equal(connected.kind, 'connected'); + if (connected.kind !== 'connected') return; + assert.equal(connected.registration.pid, launchedPid); + process.kill(launchedPid, 'SIGKILL'); + await connected.connection.closed; + await waitForProcessExit(launchedPid); + paths.resources.forgetPid(launchedPid); + } finally { + await rm(callerCwd, { recursive: true, force: true }); + } }); }); @@ -1179,6 +1194,82 @@ describe('non-serving Runtime Host kernel', () => { }); }); + test('delivers canonical authority changes to a Client admitted during recovery', async () => { + await withHostPaths(async (paths) => { + const capability = await resolveStorageRoot({ path: paths.root, kind: 'interactive' }); + const owner = await tryAcquireInteractiveRootOwner(capability); + assert.ok(owner); + if (!owner) return; + const configurationChanges = new HostConfigurationChangeService(); + const sessionCatalogChanges = new HostSessionCatalogChangeService(); + let releaseFactory!: () => void; + let markFactoryEntered!: () => void; + const factoryEntered = new Promise((resolve) => { + markFactoryEntered = resolve; + }); + const factoryReleased = new Promise((resolve) => { + releaseFactory = resolve; + }); + const hostTask = RuntimeHostKernel.start({ + owner, + idleGraceMs: 10_000, + compositionFactory: async () => { + markFactoryEntered(); + await factoryReleased; + return { + handlers: createUnavailableDomainOperationHandlers(), + configurationChanges, + sessionCatalogChanges, + beginDrain() {}, + async recover() {}, + async close() {}, + }; + }, + }); + let host: RuntimeHostKernel | undefined; + let connection: RuntimeHostConnection | undefined; + try { + await withTimeout(factoryEntered, 1_000, 'Runtime Host did not enter composition'); + const connected = await connectRuntimeHost({ + rootPath: paths.root, + surface: 'desktop', + protocol: CURRENT_PROTOCOL, + }); + assert.equal(connected.kind, 'connected'); + if (connected.kind !== 'connected') return; + const activeConnection = connected.connection; + connection = activeConnection; + const observed = new Promise((resolve) => { + activeConnection.subscribeConfigurationChanges(resolve); + }); + const observedCatalog = new Promise((resolve) => { + activeConnection.subscribeSessionCatalogChanges(({ sessionId }) => resolve(sessionId)); + }); + releaseFactory(); + host = await hostTask; + configurationChanges.publish(); + sessionCatalogChanges.publish('session-1'); + assert.equal( + await withTimeout(observed, 1_000, 'Client did not receive configuration change'), + 1, + ); + assert.equal( + await withTimeout( + observedCatalog, + 1_000, + 'Client did not receive Session catalog change', + ), + 'session-1', + ); + } finally { + releaseFactory(); + await connection?.close(); + host ??= await hostTask.catch(() => undefined); + await host?.close().catch(() => undefined); + } + }); + }); + test('shutdown releases ownership after bounded handling of accepted and incomplete Clients', async () => { await withHostPaths(async (paths) => { const candidate = await startTestRuntimeHostCandidate(paths, { diff --git a/packages/runtime-host/src/__tests__/legacy-runtime-policy-migration.test.ts b/packages/runtime-host/src/__tests__/legacy-runtime-policy-migration.test.ts new file mode 100644 index 0000000000..7a7b7b634e --- /dev/null +++ b/packages/runtime-host/src/__tests__/legacy-runtime-policy-migration.test.ts @@ -0,0 +1,346 @@ +import assert from 'node:assert/strict'; +import { access, mkdtemp, rm, writeFile } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { test } from 'node:test'; +import { createDefaultRuntimePolicy } from '@maka/core/runtime-policy'; +import { + createConnectionStore, + createFileCredentialStore, + createSettingsStore, +} from '@maka/storage'; +import { openInteractiveRuntimePolicyStoresForWrite } from '@maka/storage/runtime-policy-stores'; +import { resolveStorageRoot, tryAcquireInteractiveRootOwner } from '@maka/storage/root-authority'; +import { migrateLegacyRuntimePolicy } from '../server/legacy-runtime-policy-migration.js'; + +const JOURNAL_FILE = '.runtime-host-m5-migration.json'; + +test('imports legacy execution policy from its configuration root', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const legacy = createConnectionStore(legacyConfigurationRoot); + await legacy.create({ + slug: 'legacy-openai', + name: 'Legacy OpenAI', + providerType: 'openai', + defaultModel: 'gpt-4.1', + }); + await legacy.update('legacy-openai', { + models: [{ id: 'gpt-4.1' }, { id: 'gpt-4.1-mini' }], + modelSource: 'fetched', + modelsFetchedAt: 1_800_000_000_000, + lastTestStatus: 'verified', + lastTestAt: '2027-01-15T08:00:01.000Z', + }); + await legacy.setDefault('legacy-openai'); + await createFileCredentialStore(legacyConfigurationRoot).setSecret( + 'legacy-openai', + 'api_key', + 'legacy-api-key', + ); + await createSettingsStore(legacyConfigurationRoot).update({ + personalization: { displayName: 'Legacy User', assistantTone: 'precise' }, + network: { + proxy: { + enabled: true, + protocol: 'http', + host: '127.0.0.1', + port: 8080, + authEnabled: true, + username: 'legacy-user', + password: 'legacy-proxy-password', + }, + }, + webSearch: { + enabled: true, + defaultProvider: 'tavily', + providers: { tavily: { apiKey: 'legacy-tavily-key' } }, + }, + subagents: { + presets: [ + { + id: 'legacy-reader', + name: 'Legacy reader', + description: 'Read through the migrated route', + profile: 'local_read', + connectionSlug: 'legacy-openai', + model: 'gpt-4.1', + enabled: true, + }, + ], + }, + }); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections.length, 1); + const connection = catalog.connections[0]!; + assert.equal(connection.slug, 'legacy-openai'); + assert.deepEqual(connection.models, [{ id: 'gpt-4.1' }, { id: 'gpt-4.1-mini' }]); + assert.equal(connection.lastTest?.status, 'verified'); + assert.deepEqual(catalog.defaultTarget, { + connectionId: connection.connectionId, + modelId: 'gpt-4.1', + }); + + const execution = await stores.operations.resolveExecutionConnection('legacy-openai'); + assert.equal(execution.kind, 'ready'); + if (execution.kind === 'ready') { + assert.equal(execution.secretMaterial.connection?.secret, 'legacy-api-key'); + } + const webSearch = await stores.operations.resolveWebSearchExecution(); + assert.equal(webSearch.kind, 'ready'); + if (webSearch.kind === 'ready') { + assert.equal(webSearch.secretMaterial.webSearch.secret, 'legacy-tavily-key'); + assert.equal(webSearch.secretMaterial.networkProxy?.secret, 'legacy-proxy-password'); + } + const policy = await stores.runtimePolicy.getSnapshot(); + assert.deepEqual(policy.policy.personalization, { + displayName: 'Legacy User', + assistantTone: 'precise', + }); + assert.equal(policy.policy.networkProxy.host, '127.0.0.1'); + assert.equal(policy.policy.webSearch.defaultProvider, 'tavily'); + assert.deepEqual(policy.policy.subagents.presets, [ + { + id: 'legacy-reader', + name: 'Legacy reader', + description: 'Read through the migrated route', + profile: 'local_read', + connectionSlug: 'legacy-openai', + model: 'gpt-4.1', + enabled: true, + }, + ]); + await assertJournalRemoved(root); + }); +}); + +test('keeps an established Runtime Host policy authoritative over legacy files', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + await createConnectionStore(legacyConfigurationRoot).create({ + slug: 'legacy-openai', + name: 'Legacy OpenAI', + providerType: 'openai', + defaultModel: 'gpt-4.1', + }); + const created = await stores.connectionCatalog.create({ + expectedCatalogRevision: 0, + connection: { + slug: 'canonical-deepseek', + name: 'Canonical DeepSeek', + providerType: 'deepseek', + enabled: true, + enabledModelIds: ['deepseek-chat'], + }, + }); + assert.equal(created.kind, 'committed'); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.deepEqual( + catalog.connections.map(({ slug }) => slug), + ['canonical-deepseek'], + ); + await assertJournalRemoved(root); + }); +}); + +test('moves M4 subagent presets into an established Runtime Host policy', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const { subagents: _subagents, ...versionOnePolicy } = createDefaultRuntimePolicy(); + await writeFile( + join(root, 'runtime-policy.json'), + `${JSON.stringify({ schemaVersion: 1, revision: 3, policy: versionOnePolicy })}\n`, + 'utf8', + ); + await createSettingsStore(legacyConfigurationRoot).update({ + subagents: { + presets: [ + { + id: 'm4-reader', + name: 'M4 reader', + description: 'Preserve the configured subagent across the M5 cutover', + profile: 'local_read', + connectionSlug: 'openrouter', + model: 'openrouter/free', + enabled: true, + }, + ], + }, + }); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const policy = await stores.runtimePolicy.getSnapshot(); + assert.equal(policy.revision, 4); + assert.deepEqual( + policy.policy.subagents.presets.map(({ id }) => id), + ['m4-reader'], + ); + }); +}); + +test('resumes a journaled migration without duplicating committed Connections', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const legacy = createConnectionStore(legacyConfigurationRoot); + await legacy.create({ + slug: 'legacy-openai', + name: 'Legacy OpenAI', + providerType: 'openai', + defaultModel: 'gpt-4.1', + }); + await legacy.setDefault('legacy-openai'); + await createFileCredentialStore(legacyConfigurationRoot).setSecret( + 'legacy-openai', + 'api_key', + 'legacy-api-key', + ); + const partiallyImported = await stores.connectionCatalog.create({ + expectedCatalogRevision: 0, + connection: { + slug: 'legacy-openai', + name: 'Legacy OpenAI', + providerType: 'openai', + enabled: true, + enabledModelIds: ['gpt-4.1'], + }, + }); + assert.equal(partiallyImported.kind, 'committed'); + await writeFile( + join(root, JOURNAL_FILE), + `${JSON.stringify({ version: 1, state: 'importing' })}\n`, + 'utf8', + ); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections.length, 1); + assert.equal(catalog.connections[0]?.slug, 'legacy-openai'); + assert.deepEqual(catalog.connections[0]?.models, [{ id: 'gpt-4.1' }]); + assert.equal(catalog.connections[0]?.modelSource, 'fallback'); + assert.equal(catalog.defaultTarget?.modelId, 'gpt-4.1'); + const execution = await stores.operations.resolveExecutionConnection('legacy-openai'); + assert.equal(execution.kind, 'ready'); + if (execution.kind === 'ready') { + assert.equal(execution.secretMaterial.connection?.secret, 'legacy-api-key'); + } + await assertJournalRemoved(root); + }); +}); + +test('drops credential-dependent legacy effects when their credential is unavailable', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const legacy = createConnectionStore(legacyConfigurationRoot); + await legacy.create({ + slug: 'codex-subscription', + name: 'OpenAI Codex', + providerType: 'openai-codex', + defaultModel: 'gpt-5.5', + }); + await legacy.update('codex-subscription', { + models: [{ id: 'gpt-5.5' }], + modelSource: 'fetched', + modelsFetchedAt: 1_800_000_000_000, + lastTestStatus: 'needs_reauth', + lastTestAt: '2027-01-15T08:00:01.000Z', + }); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.equal(catalog.connections[0]?.slug, 'codex-subscription'); + assert.deepEqual(catalog.connections[0]?.models, []); + assert.equal(catalog.connections[0]?.lastTest, undefined); + await assertJournalRemoved(root); + }); +}); + +test('imports legacy interactive OAuth credentials through migration authority', async () => { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const legacy = createConnectionStore(legacyConfigurationRoot); + await legacy.create({ + slug: 'codex-subscription', + name: 'OpenAI Codex', + providerType: 'openai-codex', + defaultModel: 'gpt-5.6-luna', + }); + await createFileCredentialStore(legacyConfigurationRoot).setSecret( + 'codex-subscription', + 'oauth_token', + 'legacy-oauth-token', + ); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const execution = await stores.operations.resolveExecutionConnection('codex-subscription'); + assert.equal(execution.kind, 'ready'); + if (execution.kind === 'ready') { + assert.equal(execution.secretMaterial.connection?.secret, 'legacy-oauth-token'); + } + await assertJournalRemoved(root); + }); +}); + +test('upgrades only the untouched historical free bootstrap during import', async () => { + for (const seed of [ + { + defaultModel: 'big-pickle', + enabledModelIds: ['big-pickle'], + }, + { + defaultModel: 'nemotron-3-ultra-free', + enabledModelIds: ['nemotron-3-ultra-free'], + extras: { makaBootstrap: { id: 'opencode-free', version: 2 } }, + }, + ]) { + await withMigrationRoot(async ({ root, legacyConfigurationRoot, stores }) => { + const legacy = createConnectionStore(legacyConfigurationRoot); + await legacy.create({ + slug: 'opencode-free', + name: 'OpenCode Free', + providerType: 'opencode-free', + ...seed, + }); + await legacy.setDefault('opencode-free'); + + await migrateLegacyRuntimePolicy({ workspaceRoot: root, legacyConfigurationRoot, stores }); + + const catalog = await stores.connectionCatalog.getSnapshot(); + assert.deepEqual(catalog.connections[0]?.enabledModelIds, [ + 'nemotron-3-ultra-free', + 'mimo-v2.5-free', + 'deepseek-v4-flash-free', + ]); + assert.equal(catalog.defaultTarget?.modelId, 'nemotron-3-ultra-free'); + }); + } +}); + +async function withMigrationRoot( + run: (input: { + root: string; + legacyConfigurationRoot: string; + stores: Awaited>; + }) => Promise, +): Promise { + const base = await mkdtemp(join(tmpdir(), 'maka-runtime-policy-migration-')); + const root = join(base, 'workspace'); + const legacyConfigurationRoot = join(base, 'configuration'); + const capability = await resolveStorageRoot({ path: root, kind: 'interactive' }); + const owner = await tryAcquireInteractiveRootOwner(capability); + assert.ok(owner); + try { + const stores = await openInteractiveRuntimePolicyStoresForWrite(owner.lease); + await run({ root, legacyConfigurationRoot, stores }); + } finally { + await owner.close(); + await rm(base, { recursive: true, force: true }); + } +} + +async function assertJournalRemoved(root: string): Promise { + await assert.rejects(access(join(root, JOURNAL_FILE)), { code: 'ENOENT' }); +} diff --git a/packages/runtime-host/src/__tests__/protocol.test.ts b/packages/runtime-host/src/__tests__/protocol.test.ts index f266d755be..7870134a95 100644 --- a/packages/runtime-host/src/__tests__/protocol.test.ts +++ b/packages/runtime-host/src/__tests__/protocol.test.ts @@ -47,6 +47,7 @@ describe('Runtime Host bootstrap protocol', () => { test('keeps the experimental protocol at v0 with the declared authority operations', () => { assert.equal(RUNTIME_HOST_PROTOCOL_VERSION, 0); + assert.equal(RUNTIME_HOST_COMPATIBILITY_EPOCH, 7); assert.deepEqual(Object.keys(HOST_OPERATION_SPECS).sort(), [ 'agent.graph.operator.query', 'agent.graph.query', @@ -65,6 +66,8 @@ describe('Runtime Host bootstrap protocol', () => { 'connection.catalog.set-default-target', 'connection.catalog.update', 'connection.models.fetch', + 'connection.onboarding.save', + 'connection.onboarding.verify', 'connection.test.run', 'context.compact', 'context.diagnostics.query', @@ -100,6 +103,7 @@ describe('Runtime Host bootstrap protocol', () => { 'runtime.resource.controller.control', 'runtime.resource.controller.release', 'runtime.resource.query', + 'runtime.resource.start', 'runtime.resource.stop', 'session.branch.create', 'session.catalog.query', @@ -115,6 +119,7 @@ describe('Runtime Host bootstrap protocol', () => { 'session.revision.abandon', 'session.revision.create', 'session.transcript.query', + 'skill.catalog.invocable.query', 'skill.catalog.mutate', 'skill.catalog.preview-update', 'skill.catalog.query', @@ -678,6 +683,24 @@ describe('Runtime Host bootstrap protocol', () => { }); test('accepts protocol v0 in handshakes and Host registration while rejecting negatives', () => { + assert.deepEqual( + decodeClientFrame({ + kind: 'hello', + clientInstanceId: 'activation-client', + surface: 'activation', + protocolMin: RUNTIME_HOST_PROTOCOL_VERSION, + protocolMax: RUNTIME_HOST_PROTOCOL_VERSION, + compatibilityEpoch: RUNTIME_HOST_COMPATIBILITY_EPOCH, + }), + { + kind: 'hello', + clientInstanceId: 'activation-client', + surface: 'activation', + protocolMin: RUNTIME_HOST_PROTOCOL_VERSION, + protocolMax: RUNTIME_HOST_PROTOCOL_VERSION, + compatibilityEpoch: RUNTIME_HOST_COMPATIBILITY_EPOCH, + }, + ); const accepted = { kind: 'accepted' as const, hostEpoch: 'epoch-1', @@ -958,6 +981,7 @@ describe('Runtime Host bootstrap protocol', () => { quotes, }, turnOrchestration: { mode: 'swarm', source: 'host_api' } as const, + maxSteps: 4, }, }; const start = decodeClientFrame(JSON.parse(encodeProtocolFrame(startWire).toString('utf8'))); @@ -969,6 +993,7 @@ describe('Runtime Host bootstrap protocol', () => { turnId: 'turn-1', content: { text: 'model text', attachments: [attachment], quotes }, turnOrchestration: { mode: 'swarm', source: 'host_api' }, + maxSteps: 4, }, }); assert.notEqual(start.input.content.quotes, quotes); @@ -997,6 +1022,16 @@ describe('Runtime Host bootstrap protocol', () => { }), isInvalidFrame, ); + for (const maxSteps of [0, 1.5]) { + assert.throws( + () => + decodeClientFrame({ + ...startWire, + input: { ...startWire.input, maxSteps }, + }), + isInvalidFrame, + ); + } assert.throws( () => decodeClientFrame({ @@ -1035,7 +1070,7 @@ describe('Runtime Host bootstrap protocol', () => { ); }); - test('accepts bounded explicit Skill identities only on turn.start', () => { + test('accepts bounded explicit Skill identities on turn.start', () => { const start = (skillIds: unknown, text = '') => decodeClientFrame({ requestId: 'skill-start', @@ -1069,7 +1104,15 @@ describe('Runtime Host bootstrap protocol', () => { ]) { assert.throws(() => start(skillIds), isInvalidFrame); } - assert.throws(() => start(undefined), isInvalidFrame); + assert.deepEqual(start(undefined, 'plain'), { + requestId: 'skill-start', + operation: 'turn.start', + input: { + sessionId: 'session-1', + turnId: 'turn-skill-1', + content: { text: 'plain' }, + }, + }); assert.deepEqual(start([], 'plain'), { requestId: 'skill-start', operation: 'turn.start', @@ -1081,6 +1124,63 @@ describe('Runtime Host bootstrap protocol', () => { }); }); + test('bounds turn.start feedback as one transport-safe result', () => { + const receipt = { + invocation: 'explicit' as const, + request: 'writer', + success: true as const, + ref: 'workspace:legacy:writer', + id: 'writer', + name: 'Writer', + scope: 'workspace' as const, + source: 'legacy' as const, + truncated: false, + }; + const response = { + requestId: 'skill-start-response', + operation: 'turn.start' as const, + ok: true as const, + result: { + kind: 'started' as const, + turn: { + sessionId: 'session-1', + turnId: 'turn-skill-1', + runId: 'run-skill-1', + status: 'running' as const, + }, + skillInvocation: { + loaded: [{ id: receipt.id, name: receipt.name }], + failed: [], + receipts: [receipt], + }, + }, + }; + assert.deepEqual(decodeHostFrame(response), response); + assert.ok(encodeProtocolFrame(response).byteLength < RUNTIME_HOST_MAX_FRAME_BYTES); + + const request = 'r'.repeat(TURN_SKILL_ID_MAX_LENGTH); + const id = 'i'.repeat(81); + const name = '"'.repeat(256); + const oversized = { + ...response, + result: { + ...response.result, + skillInvocation: { + loaded: Array.from({ length: TURN_SKILL_ID_MAX_COUNT }, () => ({ id, name })), + failed: [], + receipts: Array.from({ length: TURN_SKILL_ID_MAX_COUNT }, () => ({ + ...receipt, + request, + ref: `workspace:legacy:${id}`, + id, + name, + })), + }, + }, + }; + assert.throws(() => decodeHostFrame(oversized), isInvalidFrame); + }); + test('decodes a closed regenerate identity without accepting replacement content', () => { assert.deepEqual( decodeClientFrame({ diff --git a/packages/runtime-host/src/__tests__/root-turn-coordinator.test.ts b/packages/runtime-host/src/__tests__/root-turn-coordinator.test.ts index 45dd9d4a7c..aa110ce40e 100644 --- a/packages/runtime-host/src/__tests__/root-turn-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/root-turn-coordinator.test.ts @@ -40,7 +40,7 @@ import { } from '@maka/storage/execution-stores'; import { openInteractiveArtifactStoreForWrite } from '@maka/storage/artifact-stores'; import { resolveStorageRoot, tryAcquireInteractiveRootOwner } from '@maka/storage/root-authority'; -import type { SubscriptionFrame } from '../protocol/index.js'; +import type { SubscriptionFrame, TurnSnapshot } from '../protocol/index.js'; import { HostArtifactCoordinator } from '../server/artifact-coordinator.js'; import { HostCanonicalPermissionOutcomeReader } from '../server/canonical-permission-outcome-reader.js'; import { CanonicalSessionProjectionReader } from '../server/canonical-session-projection.js'; @@ -53,6 +53,7 @@ import { continuationSafetyDigest, type HostGoalRootAuthority, RootTurnCoordinator, + type TurnStartOutcome, } from '../server/root-turn-coordinator.js'; import { SessionAdmissionGate, @@ -61,6 +62,7 @@ import { import { SessionContinuityCoordinator } from '../server/session-continuity-coordinator.js'; import type { SessionContinuityFrameSink } from '../server/session-continuity-service.js'; import { RuntimePolicyActivationGate } from '../server/runtime-policy-activation-gate.js'; +import { PROCESS_TIMEOUT_MS, withTimeout } from './fixtures/execution-host-suite.js'; const HOLD_EXTERNAL_PROMPT = 'hold external root before follow-up'; const HOLD_CONTEXT_RECOVERY_FOLLOWUP_PROMPT = 'hold follow-up before context recovery'; @@ -72,12 +74,29 @@ const NO_GOAL_ROOT_AUTHORITY: HostGoalRootAuthority = { matchesActive: () => false, }; +type StartedTurnOutcome = { + ok: true; + result: { + kind: 'started'; + turn: TurnSnapshot; + skillInvocation: Extract['result']['skillInvocation']; + }; +}; + +function assertStartedTurn(outcome: TurnStartOutcome): asserts outcome is StartedTurnOutcome { + assert.equal(outcome.ok, true, JSON.stringify(outcome)); + if (!outcome.ok || outcome.result.kind !== 'started') { + assert.fail('Expected a started Turn outcome'); + } +} + test('startup recovery replays one admitted safe-boundary continuation without a UserMessage', async () => { const workspaceIdentity = 'workspace-safe-boundary-recovery'; const fixture = await createFailureFixture({ registerBackend: (backends) => backends.register('fake', (context) => new FakeBackend(context)), continuationSafety: { workspaceIdentity, availableToolNames: [] }, }); + let observer: ReturnType | undefined; try { await fixture.coordinator.close(); const pending = await seedPendingSafeBoundaryContinuation( @@ -88,20 +107,46 @@ test('startup recovery replays one admitted safe-boundary continuation without a const recovery = fixture.createRecoveryCoordinator(); await recovery.prepareRecovery(); + const terminal = deferred(); + const observeTerminal = (snapshot: { rootTurn: TurnSnapshot | null }): void => { + const turn = snapshot.rootTurn; + if ( + turn?.turnId === pending.targetTurnId && + turn.runId === pending.targetRunId && + ['completed', 'failed', 'cancelled'].includes(turn.status) + ) { + terminal.resolve(turn); + } + }; + const connectionId = 'safe-boundary-recovery-observer'; + const continuity = fixture.currentContinuity(); + observer = continuity.attachConnection(connectionId, { + send: async (frame) => { + if (frame.kind === 'subscription.session_projection') { + observeTerminal(frame.snapshot); + } + }, + }); + const opened = await continuity.handlers['subscription.open']( + { sessionId: fixture.sessionId }, + operationContext(fixture.hostEpoch, fixture.acquireResidency, connectionId), + ); + assert.equal(opened.ok, true, JSON.stringify(opened)); + if (!opened.ok) assert.fail('Unable to observe the recovered Session'); + observeTerminal(opened.result.snapshot); + observer.activate(opened.result.subscriptionId); + await recovery.recover(); - let recovered = await recovery.handlers['turn.query']( - { sessionId: fixture.sessionId, turnId: pending.targetTurnId }, - operationContext(fixture.hostEpoch, fixture.acquireResidency), + assert.equal( + ( + await withTimeout( + terminal.promise, + PROCESS_TIMEOUT_MS, + 'Recovered safe-boundary continuation did not publish a terminal fact', + ) + ).status, + 'completed', ); - await waitUntil(async () => { - recovered = await recovery.handlers['turn.query']( - { sessionId: fixture.sessionId, turnId: pending.targetTurnId }, - operationContext(fixture.hostEpoch, fixture.acquireResidency), - ); - return recovered.ok && recovered.result.status !== 'running'; - }); - assert.equal(recovered.ok, true); - if (recovered.ok) assert.equal(recovered.result.status, 'completed'); assert.equal( (await fixture.stores.sessionStore.readMessages(fixture.sessionId)).some( (message) => message.type === 'user' && message.turnId === pending.targetTurnId, @@ -110,6 +155,7 @@ test('startup recovery replays one admitted safe-boundary continuation without a ); await recovery.close(); } finally { + observer?.close(); await fixture.dispose(); } }); @@ -337,8 +383,12 @@ test('turn.start durably applies one exact per-Turn orchestration override', asy ); assert.equal(started.ok, true, JSON.stringify(started)); if (!started.ok) return; + assertStartedTurn(started); - const run = await fixture.stores.agentRunStore.readRun(fixture.sessionId, started.result.runId); + const run = await fixture.stores.agentRunStore.readRun( + fixture.sessionId, + started.result.turn.runId, + ); assert.equal(run.orchestrationMode, 'swarm'); assert.equal(run.orchestrationSource, 'turn_override'); assert.equal(run.agentSwarmAuthorization, 'turn_override'); @@ -438,6 +488,10 @@ test('turn.start resolves explicit Skills once before durable admission and repl const context = operationContext(fixture.hostEpoch, fixture.acquireResidency, 'skill-provider'); const started = await fixture.coordinator.handlers['turn.start'](input, context); assert.equal(started.ok, true); + if (!started.ok) return; + assert.equal(started.result.kind, 'started'); + if (started.result.kind !== 'started') return; + assert.deepEqual(started.result.skillInvocation.loaded, [{ id: 'writer', name: 'Writer' }]); assert.equal(preparationCount, 1); assert.equal(observedCapabilityPreview, true); const admission = await fixture.stores.agentRunStore.readRootTurnAdmission( @@ -460,6 +514,7 @@ test('turn.start resolves explicit Skills once before durable admission and repl blocked = true; const exactRetry = await fixture.coordinator.handlers['turn.start'](input, context); assert.equal(exactRetry.ok, true); + if (exactRetry.ok) assert.deepEqual(exactRetry.result, started.result); assert.equal(preparationCount, 1, 'durable replay must not resolve a mutable Skill catalog'); const conflictingRetry = await fixture.coordinator.handlers['turn.start']( @@ -475,6 +530,52 @@ test('turn.start resolves explicit Skills once before durable admission and repl } }); +test('turn.start durably replays an all-failed invocation without creating a Turn', async () => { + let preparationCount = 0; + const skillInvocation = { + loaded: [], + failed: [{ request: 'missing', reason: 'not_found' as const }], + receipts: [ + { + invocation: 'explicit' as const, + request: 'missing', + success: false as const, + reason: 'not_found' as const, + }, + ], + }; + const fixture = await createFailureFixture({ + registerBackend: (backends) => backends.register('fake', (context) => new FakeBackend(context)), + prepareSkillInvocation: async (): Promise => { + preparationCount += 1; + return { disposition: 'blocked', skillInvocation }; + }, + }); + const input = { + sessionId: fixture.sessionId, + turnId: 'turn-blocked-skill', + content: { text: '/skill:missing' }, + } as const; + try { + const context = operationContext(fixture.hostEpoch, fixture.acquireResidency); + const first = await fixture.coordinator.handlers['turn.start'](input, context); + assert.deepEqual(first, { + ok: true, + result: { kind: 'blocked', skillInvocation }, + }); + assert.equal( + await fixture.stores.agentRunStore.readRootTurnAdmission(fixture.sessionId, input.turnId), + undefined, + ); + + const retry = await fixture.coordinator.handlers['turn.start'](input, context); + assert.deepEqual(retry, first); + assert.equal(preparationCount, 1); + } finally { + await fixture.dispose(); + } +}); + test('idle turn.message.submit applies hosted Skill preparation before durable admission', async () => { let preparationCount = 0; const fixture = await createFailureFixture({ @@ -539,9 +640,9 @@ test('idle turn.message.submit applies hosted Skill preparation before durable a } }); -test('turn.start rejects oversized Skill preparation before admission and preserves not-found semantics', async () => { +test('turn.start rejects oversized preparation before admission and preserves not-found semantics', async () => { let preparationCount = 0; - let preparation: 'blocked' | 'oversized' = 'blocked'; + let preparation: 'blocked' | 'oversized_content' | 'oversized_feedback' = 'blocked'; const fixture = await createFailureFixture({ registerBackend: (backends) => backends.register('fake', (context) => new FakeBackend(context)), prepareSkillInvocation: async () => { @@ -556,13 +657,36 @@ test('turn.start rejects oversized Skill preparation before admission and preser }, }; } + if (preparation === 'oversized_content') + return { + disposition: 'ready', + sendText: 'x'.repeat(70 * 1024), + skillInvocation: { + loaded: [{ id: 'writer', name: 'Writer' }], + failed: [], + receipts: [], + }, + }; + const request = 'r'.repeat(512); + const id = 'i'.repeat(81); + const name = '"'.repeat(256); return { disposition: 'ready', - sendText: 'x'.repeat(70 * 1024), + sendText: 'Run the selected Skills.', skillInvocation: { - loaded: [{ id: 'writer', name: 'Writer' }], + loaded: Array.from({ length: 50 }, () => ({ id, name })), failed: [], - receipts: [], + receipts: Array.from({ length: 50 }, () => ({ + invocation: 'explicit' as const, + request, + success: true as const, + ref: `workspace:legacy:${id}`, + id, + name, + scope: 'workspace' as const, + source: 'legacy' as const, + truncated: false, + })), }, }; }, @@ -577,8 +701,8 @@ test('turn.start rejects oversized Skill preparation before admission and preser }, context, ); - assert.equal(blocked.ok, false); - if (!blocked.ok) assert.equal(blocked.error.code, 'operation_conflict'); + assert.equal(blocked.ok, true); + if (blocked.ok) assert.equal(blocked.result.kind, 'blocked'); assert.equal( await fixture.stores.agentRunStore.readRootTurnAdmission( fixture.sessionId, @@ -587,7 +711,7 @@ test('turn.start rejects oversized Skill preparation before admission and preser undefined, ); - preparation = 'oversized'; + preparation = 'oversized_content'; const oversized = await fixture.coordinator.handlers['turn.start']( { sessionId: fixture.sessionId, @@ -607,6 +731,26 @@ test('turn.start rejects oversized Skill preparation before admission and preser undefined, ); + preparation = 'oversized_feedback'; + const oversizedFeedback = await fixture.coordinator.handlers['turn.start']( + { + sessionId: fixture.sessionId, + turnId: 'turn-hosted-skill-oversized-feedback', + content: { text: '/skill:writer Draft this.' }, + }, + context, + ); + assert.equal(oversizedFeedback.ok, false); + if (!oversizedFeedback.ok) assert.equal(oversizedFeedback.error.code, 'operation_conflict'); + assert.equal(fixture.drainRequested(), false); + assert.equal( + await fixture.stores.agentRunStore.readRootTurnAdmission( + fixture.sessionId, + 'turn-hosted-skill-oversized-feedback', + ), + undefined, + ); + const missingSession = await fixture.coordinator.handlers['turn.start']( { sessionId: 'missing-session', @@ -617,7 +761,7 @@ test('turn.start rejects oversized Skill preparation before admission and preser ); assert.equal(missingSession.ok, false); if (!missingSession.ok) assert.equal(missingSession.error.code, 'not_found'); - assert.equal(preparationCount, 2, 'missing Sessions must not resolve Skills'); + assert.equal(preparationCount, 3, 'missing Sessions must not resolve Skills'); } finally { await fixture.dispose(); } @@ -1900,6 +2044,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut ); assert.equal(parentStarted.ok, true); if (!parentStarted.ok) return; + assertStartedTurn(parentStarted); const waitingFrame = await waitForContinuityFrame( parentSink, (frame) => @@ -1930,7 +2075,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let closeChildContinuity: (() => void) | undefined; const child = await manager.spawnChildSession(parent.id, { spawnedBy: { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, parentTurnId, toolCallId: 'linked-initial', }, @@ -2020,7 +2165,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let abortedResumeReady = 0; await assert.rejects( manager.resumeChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: child.runId, prompt: 'must not start', abortSignal: resumeAbort.signal, @@ -2040,7 +2185,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let resumeReadyRunId: string | undefined; let resumeEventCount = 0; const resumed = await manager.resumeChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: child.runId, prompt: 'rate limit this resumed child', onReady: (ready) => { @@ -2059,7 +2204,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let retryReadyRunId: string | undefined; let retryEventCount = 0; const retried = await manager.retryChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: resumed.runId!, execution: { kind: 'child_session', @@ -2135,7 +2280,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut | undefined; const callbackStopped = await manager.spawnChildSession(parent.id, { spawnedBy: { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, parentTurnId, toolCallId: 'linked-ready-stop', }, @@ -2180,18 +2325,18 @@ test('hosted linked child roots share admission, message, terminal, and stop aut operationContext(hostEpoch, acquireResidency), ); assert.equal(queuedFollowup.ok && queuedFollowup.result.disposition, 'followup'); - linkedBackends.get(child.childSessionId)?.release(); - await waitUntil(() => { - const state = requireCoordinator(coordinator).readRootState(child.childSessionId); - return state.kind === 'active' && state.turnId !== externalTurnId; - }); + const queuedBackend = linkedBackends.get(child.childSessionId); + assert.ok(queuedBackend); + if (!queuedBackend) return; + queuedBackend.release(); + await queuedBackend.questionStarted.promise; const followupState = coordinator.readRootState(child.childSessionId); assert.equal(followupState.kind, 'active'); if (followupState.kind !== 'active') return; await assert.rejects( manager.resumeChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: retried.runId!, prompt: 'internal resume racing the external follow-up', }), @@ -2212,7 +2357,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut }); const failedResume = await manager.resumeChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: retried.runId!, prompt: 'rate limit one more linked child', }); @@ -2226,7 +2371,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let abortedRetryReady = 0; await assert.rejects( manager.retryChildAgent(parent.id, { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, sourceRunId: failedResume.runId!, abortSignal: retryAbort.signal, onReady: () => { @@ -2247,7 +2392,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut let joinedInitial: Promise | undefined; const interrupted = await manager.spawnChildSession(parent.id, { spawnedBy: { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, parentTurnId, toolCallId: 'linked-interrupt', }, @@ -2257,7 +2402,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut onReady: () => { joinedInitial = manager.spawnChildSession(parent.id, { spawnedBy: { - parentRunId: parentStarted.result.runId, + parentRunId: parentStarted.result.turn.runId, parentTurnId, toolCallId: 'linked-interrupt', }, @@ -2304,7 +2449,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut frame.kind === 'subscription.session_projection' && frame.snapshot.projectionRevision > waitingFrame.snapshot.projectionRevision && frame.snapshot.session.status === 'running' && - frame.snapshot.rootTurn?.runId === parentStarted.result.runId && + frame.snapshot.rootTurn?.runId === parentStarted.result.turn.runId && frame.snapshot.rootTurn.status === 'running' && frame.snapshot.interactions.pending.length === 0, 'resumed question projection', @@ -2313,7 +2458,7 @@ test('hosted linked child roots share admission, message, terminal, and stop aut await coordinator.stopRoot({ sessionId: parent.id, turnId: parentTurnId, - runId: parentStarted.result.runId, + runId: parentStarted.result.turn.runId, }); await coordinator.close(); await messages.close(); @@ -2464,6 +2609,7 @@ test('successor admission failure retains the terminal transition and its confir ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); const submitted = await fixture.messages.handlers['turn.message.submit']( { @@ -2484,7 +2630,7 @@ test('successor admission failure retains the terminal transition and its confir kind: 'active' as const, sessionId: fixture.sessionId, turnId, - runId: started.result.runId, + runId: started.result.turn.runId, }; assert.deepEqual(fixture.coordinator.readRootState(fixture.sessionId), expectedOwner); assert.deepEqual( @@ -2773,6 +2919,7 @@ test('an exact active retry preserves the Client Capability admission binding', operationContext(fixture.hostEpoch, fixture.acquireResidency, 'provider-a'), ); assert.equal(started.ok, true); + assertStartedTurn(started); const retried = await fixture.coordinator.handlers['turn.start']( input, operationContext(fixture.hostEpoch, fixture.acquireResidency, 'provider-b'), @@ -2783,13 +2930,11 @@ test('an exact active retry preserves the Client Capability admission binding', assert.deepEqual(snapshot?.registrationIds, ['registration-a']); snapshot?.release(); - if (started.ok) { - await fixture.coordinator.stopRoot({ - sessionId: fixture.sessionId, - turnId: input.turnId, - runId: started.result.runId, - }); - } + await fixture.coordinator.stopRoot({ + sessionId: fixture.sessionId, + turnId: input.turnId, + runId: started.result.turn.runId, + }); } finally { backend?.release(); first.close(); @@ -3169,7 +3314,8 @@ test('an exact terminal retry does not require a live Client Capability binding' ); assert.equal(started.ok, true); if (!started.ok) return; - let terminal = started.result; + assertStartedTurn(started); + let terminal = started.result.turn; for ( let attempt = 0; attempt < 200 && @@ -3194,7 +3340,14 @@ test('an exact terminal retry does not require a live Client Capability binding' input, operationContext(fixture.hostEpoch, fixture.acquireResidency, 'observer'), ); - assert.deepEqual(retried, { ok: true, result: terminal }); + assert.deepEqual(retried, { + ok: true, + result: { + kind: 'started', + turn: terminal, + skillInvocation: { loaded: [], failed: [], receipts: [] }, + }, + }); } finally { provider.close(); await clientCapabilities.close(); @@ -3202,6 +3355,63 @@ test('an exact terminal retry does not require a live Client Capability binding' } }); +test('turn.start returns a published fast terminal before backend iterator cleanup', { + timeout: 20_000, +}, async () => { + let backend: TerminalThenCleanupBackend | undefined; + const fixture = await createFailureFixture({ + registerBackend: (backends) => { + backends.register('fake', (context) => { + backend = new TerminalThenCleanupBackend(context.sessionId); + return backend; + }); + }, + }); + + try { + const started = await completesWithin( + fixture.coordinator.handlers['turn.start']( + { + sessionId: fixture.sessionId, + turnId: 'turn-fast-terminal', + content: { text: 'finish immediately' }, + }, + operationContext(fixture.hostEpoch, fixture.acquireResidency), + ), + 2_000, + 'fast terminal start acknowledgement', + ); + assert.equal(started.ok, true); + if (!started.ok) return; + assertStartedTurn(started); + assert.equal(started.result.turn.status, 'completed'); + assert.ok(backend); + assert.equal(backend.cleanupReleased, false); + + const followup = fixture.coordinator.handlers['turn.start']( + { + sessionId: fixture.sessionId, + turnId: 'turn-after-fast-terminal', + content: { text: 'wait for prior cleanup' }, + }, + operationContext(fixture.hostEpoch, fixture.acquireResidency), + ); + let followupSettled = false; + void followup.finally(() => { + followupSettled = true; + }); + await new Promise((resolve) => setTimeout(resolve, 25)); + assert.equal(followupSettled, false); + + backend.releaseCleanup(); + const followupResult = await completesWithin(followup, 2_000, 'follow-up after cleanup'); + assert.equal(followupResult.ok, true); + } finally { + backend?.releaseCleanup(); + await fixture.dispose(); + } +}); + test('public turn.stop rejects an admission queued behind its exact-Run closure without poisoning', { timeout: 20_000, }, async () => { @@ -3228,6 +3438,7 @@ test('public turn.stop rejects an admission queued behind its exact-Run closure ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); assert.ok(backend); assert.ok(fixture.interactions); await backend.readyForAdmission.promise; @@ -3245,7 +3456,7 @@ test('public turn.stop rejects an admission queued behind its exact-Run closure { sessionId: fixture.sessionId, turnId, - runId: started.result.runId, + runId: started.result.turn.runId, }, operationContext(fixture.hostEpoch, fixture.acquireResidency), ); @@ -3302,6 +3513,7 @@ test('public turn.interrupt contains a question admission rejected by its own st ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); assert.ok(backend); await backend.ready.promise; @@ -3311,7 +3523,7 @@ test('public turn.interrupt contains a question admission rejected by its own st interruptId: 'interrupt-stop-released-admission', sessionId: fixture.sessionId, turnId, - runId: started.result.runId, + runId: started.result.turn.runId, }, operationContext(fixture.hostEpoch, fixture.acquireResidency), ); @@ -3390,7 +3602,12 @@ test('public turn.interrupt releases the Session lane while a queried Run is sti completesWithin(interrupting, 2_000, 'public interrupt during backend creation'), ]); assert.equal(startOutcome.ok, true); - if (startOutcome.ok) assert.equal(startOutcome.result.status, 'cancelled'); + if (startOutcome.ok) { + assert.equal(startOutcome.result.kind, 'started'); + if (startOutcome.result.kind === 'started') { + assert.equal(startOutcome.result.turn.status, 'cancelled'); + } + } assert.equal(interruptOutcome.ok, true); if (interruptOutcome.ok) { assert.equal(interruptOutcome.result.turn.runId, queried.result.runId); @@ -3509,6 +3726,7 @@ test('post-start backend failure closes its owner without draining an unrelated ); assert.equal(unrelatedStarted.ok, true); if (!unrelatedStarted.ok) return; + assertStartedTurn(unrelatedStarted); assert.ok(unrelatedBackend); const turnId = 'turn-admission-before-backend-failure'; @@ -3533,6 +3751,7 @@ test('post-start backend failure closes its owner without draining an unrelated const started = await completesWithin(starting, 2_000, 'turn start before backend failure'); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); activeBackend.releaseFailure(); await waitUntil(() => fixture.coordinator.readRootState(fixture.sessionId).kind === 'idle'); @@ -3545,13 +3764,16 @@ test('post-start backend failure closes its owner without draining an unrelated kind: 'active', sessionId: unrelatedSession.id, turnId: unrelatedTurnId, - runId: unrelatedStarted.result.runId, + runId: unrelatedStarted.result.turn.runId, }); assert.equal(unrelatedBackend.stopCount, 0); - const run = await fixture.stores.agentRunStore.readRun(fixture.sessionId, started.result.runId); + const run = await fixture.stores.agentRunStore.readRun( + fixture.sessionId, + started.result.turn.runId, + ); const events = await fixture.stores.runtimeEventStore.readImmutableRuntimeEvents( fixture.sessionId, - started.result.runId, + started.result.turn.runId, ); const terminal = classifyTerminalRuntimeLedger(run, events); assert.equal(terminal.kind, 'fact'); @@ -3560,7 +3782,7 @@ test('post-start backend failure closes its owner without draining an unrelated await fixture.coordinator.stopRoot({ sessionId: unrelatedSession.id, turnId: unrelatedTurnId, - runId: unrelatedStarted.result.runId, + runId: unrelatedStarted.result.turn.runId, }); await fixture.coordinator.close(); await fixture.messages.close(); @@ -3717,15 +3939,19 @@ test('post-start backend AggregateError is contained after its failed terminal t ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); backend!.releaseFailure(); await waitUntil(() => fixture.coordinator.readRootState(fixture.sessionId).kind === 'idle'); assert.equal(fixture.drainRequested(), false); - const run = await fixture.stores.agentRunStore.readRun(fixture.sessionId, started.result.runId); + const run = await fixture.stores.agentRunStore.readRun( + fixture.sessionId, + started.result.turn.runId, + ); const events = await fixture.stores.runtimeEventStore.readImmutableRuntimeEvents( fixture.sessionId, - started.result.runId, + started.result.turn.runId, ); const terminal = classifyTerminalRuntimeLedger(run, events); assert.equal(terminal.kind, 'fact'); @@ -3781,13 +4007,17 @@ test('post-start message owner cleanup failure drains after its failed terminal ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); await waitUntil(() => fixture.drainRequested()); await waitUntil(() => fixture.coordinator.readRootState(fixture.sessionId).kind === 'idle'); - const run = await fixture.stores.agentRunStore.readRun(fixture.sessionId, started.result.runId); + const run = await fixture.stores.agentRunStore.readRun( + fixture.sessionId, + started.result.turn.runId, + ); const events = await fixture.stores.runtimeEventStore.readImmutableRuntimeEvents( fixture.sessionId, - started.result.runId, + started.result.turn.runId, ); const terminal = classifyTerminalRuntimeLedger(run, events); assert.equal(terminal.kind, 'fact'); @@ -3827,6 +4057,7 @@ test('public turn.stop wins the Session lane before a wire answer for the same R ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); assert.ok(backend); assert.ok(fixture.interactions); const requestId = await backend.pendingRequest.promise; @@ -3844,7 +4075,7 @@ test('public turn.stop wins the Session lane before a wire answer for the same R { sessionId: fixture.sessionId, turnId, - runId: started.result.runId, + runId: started.result.turn.runId, }, operationContext(fixture.hostEpoch, fixture.acquireResidency), ); @@ -3907,6 +4138,7 @@ test('public turn.stop takes over an earlier closure claim queued behind its lea ); assert.equal(started.ok, true); if (!started.ok) return; + assertStartedTurn(started); assert.ok(backend); assert.ok(fixture.interactions); await backend.sendStarted.promise; @@ -3924,7 +4156,7 @@ test('public turn.stop takes over an earlier closure claim queued behind its lea { sessionId: fixture.sessionId, turnId, - runId: started.result.runId, + runId: started.result.turn.runId, }, operationContext(fixture.hostEpoch, fixture.acquireResidency), ); @@ -4344,7 +4576,7 @@ async function createFailureFixture(options: { hostEpoch, messages, coordinator, - continuity, + currentContinuity: () => requireContinuity(continuity), manager, interactions, artifacts, @@ -4459,6 +4691,7 @@ async function waitUntil( class LinkedChildAuthorityBackend implements AgentBackend { readonly kind = 'fake' as const; readonly externalHoldStarted = deferred(); + readonly questionStarted = deferred(); sendCount = 0; stopCount = 0; private stopped = false; @@ -4476,6 +4709,7 @@ class LinkedChildAuthorityBackend implements AgentBackend { }); } if (input.text === FAKE_ASK_USER_QUESTION_PROMPT) { + this.questionStarted.resolve(); await new Promise((resolve) => { this.releaseWait = resolve; if (this.stopped) resolve(); @@ -4973,6 +5207,38 @@ class AdmissionThenFailureBackend implements AgentBackend { } } +class TerminalThenCleanupBackend implements AgentBackend { + readonly kind = 'fake' as const; + cleanupReleased = false; + private readonly cleanup = deferred(); + + constructor(readonly sessionId: string) {} + + releaseCleanup(): void { + this.cleanupReleased = true; + this.cleanup.resolve(); + } + + async *send(input: BackendSendInput): AsyncIterable { + yield { + type: 'complete', + id: randomUUID(), + turnId: input.turnId, + ts: Date.now(), + stopReason: 'end_turn', + }; + await this.cleanup.promise; + } + + async stop(): Promise {} + + async respondToSandboxBoundary(): Promise {} + + async dispose(): Promise { + this.releaseCleanup(); + } +} + class PendingQuestionBackend implements AgentBackend { readonly kind = 'fake' as const; readonly pendingRequest = deferred(); diff --git a/packages/runtime-host/src/__tests__/runtime-policy-coordinator.test.ts b/packages/runtime-host/src/__tests__/runtime-policy-coordinator.test.ts index 213d07e075..6264c76ef4 100644 --- a/packages/runtime-host/src/__tests__/runtime-policy-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/runtime-policy-coordinator.test.ts @@ -9,7 +9,7 @@ import type { ConnectionCatalogSnapshot, CredentialLocator, } from '@maka/core/runtime-policy'; -import { FAKE_ASK_USER_QUESTION_PROMPT, FakeBackend } from '@maka/runtime'; +import { FAKE_ASK_USER_QUESTION_PROMPT, FakeBackend, type MakaToolContext } from '@maka/runtime'; import { openInteractiveExecutionStoresForWrite } from '@maka/storage/execution-stores'; import { openInteractiveRuntimePolicyStoresForWrite } from '@maka/storage/runtime-policy-stores'; import { resolveStorageRoot, tryAcquireInteractiveRootOwner } from '@maka/storage/root-authority'; @@ -31,6 +31,46 @@ const context: ConnectionContext = { acquireResidency: () => ({ release: () => undefined }), }; +test('model settings tool confirms and atomically updates canonical Runtime Policy', async () => { + await withCoordinator(async ({ coordinator, stores }) => { + const tool = coordinator.modelTools.find(({ name }) => name === 'MakaSettingsUpdate'); + assert.ok(tool); + if (!tool) return; + const questions: string[] = []; + const toolContext: MakaToolContext = { + sessionId: 'session-1', + turnId: 'turn-1', + cwd: '/workspace', + toolCallId: 'call-1', + abortSignal: new AbortController().signal, + emitOutput() {}, + askUserQuestion: async (input) => { + questions.push(...input.map(({ question }) => question)); + return { + answers: input.map(({ question }) => ({ question, answer: 'Apply changes' })), + }; + }, + }; + + const result = await tool.impl( + { + personalization: { assistantTone: 'Be direct.' }, + memory: { agentReadEnabled: true }, + webSearch: { enabled: true }, + }, + toolContext, + ); + + assert.equal((result as { applied?: boolean }).applied, true); + assert.equal(questions.length, 1); + const snapshot = await stores.runtimePolicy.getSnapshot(); + assert.equal(snapshot.revision, 1); + assert.equal(snapshot.policy.personalization.assistantTone, 'Be direct.'); + assert.equal(snapshot.policy.memory.agentReadEnabled, true); + assert.equal(snapshot.policy.webSearch.enabled, true); + }); +}); + test('production composition shares one gate across mutation and backend activation', async () => { const base = await mkdtemp(join(tmpdir(), 'maka-runtime-policy-composition-')); const root = join(base, 'interactive'); @@ -107,9 +147,9 @@ test('production composition shares one gate across mutation and backend activat assert.ok(mutationGates.length >= 2); assert.equal(backendActivationGates.length, 1); assert.ok(mutationGates.every((gate) => gate === backendActivationGates[0])); - if (started.ok) { + if (started.ok && started.result.kind === 'started') { await composition.handlers['turn.stop']( - { sessionId: session.id, turnId, runId: started.result.runId }, + { sessionId: session.id, turnId, runId: started.result.turn.runId }, context, ); } @@ -214,9 +254,9 @@ test('production mutation releases the gate before active-turn backend disposal const started = await start; assert.equal(started.ok, true); - if (started.ok) { + if (started.ok && started.result.kind === 'started') { await composition.handlers['turn.stop']( - { sessionId: session.id, turnId, runId: started.result.runId }, + { sessionId: session.id, turnId, runId: started.result.turn.runId }, context, ); } @@ -287,7 +327,9 @@ test('production policy mutation drains and poisons activation when cached backe ); assert.equal(started.ok, true); if (!started.ok) return; - let snapshot = started.result; + assert.equal(started.result.kind, 'started'); + if (started.result.kind !== 'started') return; + let snapshot = started.result.turn; for (let attempt = 0; attempt < 100 && !isTerminalTurnStatus(snapshot.status); attempt += 1) { await new Promise((resolve) => setTimeout(resolve, 20)); const queried = await composition.handlers['turn.query']( diff --git a/packages/runtime-host/src/__tests__/runtime-resource-coordinator.test.ts b/packages/runtime-host/src/__tests__/runtime-resource-coordinator.test.ts index ba5554ba26..47c86efc91 100644 --- a/packages/runtime-host/src/__tests__/runtime-resource-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/runtime-resource-coordinator.test.ts @@ -246,6 +246,35 @@ describe('Host Runtime Resource coordinator', () => { assert.equal(harness.writeCount, 2); }); + test('starts an interactive login shell inside the canonical Session workspace', async () => { + const harness = createHarness(); + const started = await harness.coordinator.handlers['runtime.resource.start']( + { sessionId: SESSION_ID, launchId: 'desktop-launch-1' }, + connection('connection-1'), + ); + + assert.equal(started.ok, true); + assert.equal(started.ok && started.result.resource.mode, 'pty'); + assert.deepEqual( + harness.lastBackgroundInput && { + sessionId: harness.lastBackgroundInput.sessionId, + sourceTurnId: harness.lastBackgroundInput.sourceTurnId, + sourceToolCallId: harness.lastBackgroundInput.sourceToolCallId, + cwd: harness.lastBackgroundInput.cwd, + pty: harness.lastBackgroundInput.pty, + }, + { + sessionId: SESSION_ID, + sourceTurnId: 'desktop-launch-1', + sourceToolCallId: 'desktop-launch-1', + cwd: '/workspace', + pty: true, + }, + ); + harness.finishBackground({ successful: true }); + assert.equal(harness.activeResidencies, 0); + }); + test('lets stop bypass the controller, releases terminal ownership, and keeps control replay safe', async () => { const harness = createHarness(); const firstConnection = connection('connection-1'); @@ -330,6 +359,39 @@ describe('Host Runtime Resource coordinator', () => { assert.equal(harness.terminateCount, 1); }); + test('releases Session admission while a foreground process holds Host residency', async () => { + const harness = createHarness(); + let announceStart!: () => void; + const started = new Promise((resolve) => { + announceStart = resolve; + }); + let finishForeground!: (result: ReturnType) => void; + const completion = new Promise>((resolve) => { + finishForeground = resolve; + }); + harness.foregroundRun = () => { + announceStart(); + return completion; + }; + + const foreground = harness.coordinator.runForegroundBash(backgroundInput()); + await started; + assert.equal(harness.activeResidencies, 1); + + let eventAdmitted = false; + const event = harness.sessionAdmission.run(SESSION_ID, () => { + eventAdmitted = true; + }); + await new Promise((resolve) => setImmediate(resolve)); + try { + assert.equal(eventAdmitted, true); + } finally { + finishForeground(foregroundResult()); + await Promise.all([foreground, event]); + } + assert.equal(harness.activeResidencies, 0); + }); + test('reports archived and missing Sessions without touching a Runtime Resource', async () => { const harness = createHarness(); harness.sessionState = 'archived'; @@ -365,18 +427,21 @@ function createHarness() { pointReadCount: 0, stateReadFailure: undefined as Error | undefined, activeResidencies: 0, + lastBackgroundInput: undefined as ShellRunBashInput | undefined, + foregroundRun: undefined as + | HostRuntimeResourceCoordinatorInput['manager']['runForegroundBash'] + | undefined, }; const manager: HostRuntimeResourceCoordinatorInput['manager'] = { - runForegroundBash: async () => ({ - kind: 'terminal', - cwd: '/workspace', - cmd: 'true', - status: 'completed', - exitCode: 0, - output: pipeOutput(''), - }), + runForegroundBash: (input) => + state.foregroundRun?.(input) ?? Promise.resolve(foregroundResult()), runBackgroundBash: async (input) => { + state.lastBackgroundInput = input; backgroundCompletion = input.onCompletion; + if (input.pty) { + const { output: _output, ...snapshot } = currentSnapshot; + return snapshot; + } return compactState(0); }, readRuntimeResource: async () => currentSnapshot, @@ -426,10 +491,18 @@ function createHarness() { }; }, inspectResource: async () => structuredClone(currentSnapshot), + getLivePtySnapshot: (sessionId, ref) => ({ + sessionId, + ref, + sequence: 0, + buffer: '', + size: { cols: currentSnapshot.output.cols, rows: currentSnapshot.output.rows }, + }), terminateAll: async () => { state.terminateCount += 1; }, }; + const sessionAdmission = new SessionAdmissionGate(); const coordinator = new HostRuntimeResourceCoordinator({ manager, sessions: { @@ -448,12 +521,13 @@ function createHarness() { readHeader: async (sessionId) => { if (state.sessionState === 'missing') throw new SessionNotFoundError(sessionId); return { + cwd: '/workspace', status: state.sessionState === 'archived' ? 'archived' : 'idle', isArchived: state.sessionState === 'archived', }; }, }, - sessionAdmission: new SessionAdmissionGate(), + sessionAdmission, acquireResidency: () => { state.activeResidencies += 1; let active = true; @@ -471,10 +545,22 @@ function createHarness() { }); return Object.assign(state, { coordinator, + sessionAdmission, finishBackground: (outcome: { successful: boolean }) => backgroundCompletion?.(outcome), }); } +function foregroundResult() { + return { + kind: 'terminal' as const, + cwd: '/workspace', + cmd: 'true', + status: 'completed' as const, + exitCode: 0, + output: pipeOutput(''), + }; +} + function connection(connectionId: string): ConnectionContext { return { hostEpoch: 'host-1', diff --git a/packages/runtime-host/src/__tests__/runtime-resource-process.test.ts b/packages/runtime-host/src/__tests__/runtime-resource-process.test.ts index 7e75daa075..eabc7448e7 100644 --- a/packages/runtime-host/src/__tests__/runtime-resource-process.test.ts +++ b/packages/runtime-host/src/__tests__/runtime-resource-process.test.ts @@ -56,7 +56,7 @@ describe('real Host Runtime Resource process lifecycle', { manager.getSessionUpdate(sessionId, ref).then((update) => update ?? null), }, sessionHeaders: { - readHeader: async () => ({ status: 'idle', isArchived: false }), + readHeader: async () => ({ cwd: base, status: 'idle', isArchived: false }), }, sessionAdmission: new SessionAdmissionGate(), acquireResidency: () => { diff --git a/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts b/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts index da0d9b46b0..fdf01728b6 100644 --- a/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts +++ b/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts @@ -19,6 +19,8 @@ import { decodeRuntimeResourceControllerReleaseResult, decodeRuntimeResourceQueryInput, decodeRuntimeResourceQueryResult, + decodeRuntimeResourceStartInput, + decodeRuntimeResourceStartResult, decodeRuntimeResourceStopInput, decodeRuntimeResourceStopResult, RUNTIME_RESOURCE_CONTROL_INPUT_MAX_BYTES, @@ -39,7 +41,8 @@ describe('Runtime Resource protocol', () => { assert.equal(RUNTIME_RESOURCE_OPERATION_SPECS['runtime.resource.query'].mode, 'query'); for (const [key, spec] of Object.entries(RUNTIME_RESOURCE_OPERATION_SPECS)) { assert.equal(spec.availability, 'ready', key); - if (key !== 'runtime.resource.query') assert.equal(spec.mode, 'control', key); + if (key === 'runtime.resource.start') assert.equal(spec.mode, 'command', key); + else if (key !== 'runtime.resource.query') assert.equal(spec.mode, 'control', key); } }); @@ -78,10 +81,17 @@ describe('Runtime Resource protocol', () => { decodeRuntimeResourceControllerAcquireResult({ controllerId: 'client-1', nextSequence: 1, - resource: snapshot(), + pty: ptySnapshot(), }), - { controllerId: 'client-1', nextSequence: 1, resource: snapshot() }, + { controllerId: 'client-1', nextSequence: 1, pty: ptySnapshot() }, ); + assert.deepEqual( + decodeRuntimeResourceStartInput({ sessionId: 'session-1', launchId: 'launch-1' }), + { sessionId: 'session-1', launchId: 'launch-1' }, + ); + assert.deepEqual(decodeRuntimeResourceStartResult({ resource: snapshot() }), { + resource: snapshot(), + }); for (const control of [ { kind: 'input', input: 'hello' }, @@ -231,6 +241,16 @@ describe('Runtime Resource protocol', () => { }); }); +function ptySnapshot() { + return { + sessionId: 'session-1', + ref: runtimeRef, + sequence: 2, + buffer: '\u001b[2Jready', + size: { cols: 80, rows: 24 }, + }; +} + test('Runtime Resource invalidations batch lightweight unique identities', () => { const resources = Array.from({ length: SESSION_RUNTIME_RESOURCE_CHANGES_MAX }, (_, index) => ({ sourceSessionId: 'source-session', @@ -269,6 +289,21 @@ test('Runtime Resource invalidations batch lightweight unique identities', () => ); }); +test('Runtime Resource PTY data remains an ordered Session subscription frame', () => { + const frame = { + kind: 'subscription.runtime_resource_pty_data' as const, + hostEpoch: 'host-1', + subscriptionId: 'subscription-1', + sequence: 4, + sessionId: 'session-1', + ref: runtimeRef, + ptySequence: 9, + data: '\u001b[2Jready', + }; + assert.deepEqual(decodeSubscriptionFrame(frame), frame); + assertInvalid(() => decodeSubscriptionFrame({ ...frame, ptySequence: 0 })); +}); + function resourceUpdate(overrides: Partial = {}): ShellRunUpdate { return { sessionId: 'session-1', diff --git a/packages/runtime-host/src/__tests__/runtime-resource-two-client-uds.test.ts b/packages/runtime-host/src/__tests__/runtime-resource-two-client-uds.test.ts index a10d1f9f7c..855f13d78f 100644 --- a/packages/runtime-host/src/__tests__/runtime-resource-two-client-uds.test.ts +++ b/packages/runtime-host/src/__tests__/runtime-resource-two-client-uds.test.ts @@ -65,7 +65,7 @@ test('a Host-owned PTY survives Desktop disconnect and transfers control to TUI' manager.getSessionUpdate(sessionId, ref).then((update) => update ?? null), }, sessionHeaders: { - readHeader: async () => ({ status: 'idle', isArchived: false }), + readHeader: async () => ({ cwd: base, status: 'idle', isArchived: false }), }, sessionAdmission: new SessionAdmissionGate(), acquireResidency: context.acquireResidency, diff --git a/packages/runtime-host/src/__tests__/session-catalog-protocol.test.ts b/packages/runtime-host/src/__tests__/session-catalog-protocol.test.ts index add9b24bf9..b659939ef7 100644 --- a/packages/runtime-host/src/__tests__/session-catalog-protocol.test.ts +++ b/packages/runtime-host/src/__tests__/session-catalog-protocol.test.ts @@ -45,6 +45,17 @@ describe('Session catalog protocol', () => { ); }); + test('decodes exact Session catalog invalidations', () => { + const frame = { + kind: 'session.catalog.changed' as const, + revision: 1, + sessionId: 'session-1', + }; + assert.deepEqual(decodeHostFrame(frame), frame); + assert.throws(() => decodeHostFrame({ ...frame, revision: -1 }), isProtocolError); + assert.throws(() => decodeHostFrame({ ...frame, extra: true }), isProtocolError); + }); + test('decodes only bounded execution boundary summaries', () => { assert.deepEqual( decodeClientFrame({ diff --git a/packages/runtime-host/src/__tests__/session-catalog-two-client-uds.test.ts b/packages/runtime-host/src/__tests__/session-catalog-two-client-uds.test.ts index 1d887f68a3..73b35508e5 100644 --- a/packages/runtime-host/src/__tests__/session-catalog-two-client-uds.test.ts +++ b/packages/runtime-host/src/__tests__/session-catalog-two-client-uds.test.ts @@ -63,6 +63,9 @@ test('two Clients share stable Session creation, CAS configuration, and catalog const desktop = await connectClient(root, 'desktop'); const tui = await connectClient(root, 'tui'); try { + const catalogChanged = new Promise((resolve) => { + tui.subscribeSessionCatalogChanges(({ sessionId }) => resolve(sessionId)); + }); const createInput: SessionCreateInput = { sessionId: 'stable-session', cwd: root, @@ -73,6 +76,10 @@ test('two Clients share stable Session creation, CAS configuration, and catalog const created = requireSessionProjection( await desktop.request('session.create', createInput), ); + assert.equal( + await withTimeout(catalogChanged, PROCESS_TIMEOUT_MS, 'Session catalog change timed out'), + createInput.sessionId, + ); assert.equal(created.id, createInput.sessionId); assert.equal(created.permissionMode, 'ask'); assert.equal(created.labelsTruncated, false); diff --git a/packages/runtime-host/src/__tests__/session-continuity-coordinator.test.ts b/packages/runtime-host/src/__tests__/session-continuity-coordinator.test.ts index 1a48dd0d60..9d37b123bd 100644 --- a/packages/runtime-host/src/__tests__/session-continuity-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/session-continuity-coordinator.test.ts @@ -408,6 +408,36 @@ test('fans one bounded Runtime Resource burst out to an inherited Session view', coordinator.close(); }); +test('publishes live PTY bytes on the source Session continuity sequence', async () => { + const coordinator = new SessionContinuityCoordinator( + HOST_EPOCH, + async () => canonical(), + new SessionAdmissionGate(), + ); + const sink = new RecordingSink(); + const connection = coordinator.attachConnection('connection-1', sink); + const opened = await open(coordinator, 'connection-1'); + connection.activate(opened.subscriptionId); + + await coordinator.enqueueRuntimeResourcePtyData({ + sessionId: SESSION_ID, + ref: 'maka://runtime/background-tasks/shell-1', + sequence: 5, + data: 'ready', + }); + assert.deepEqual(sink.frames[0], { + kind: 'subscription.runtime_resource_pty_data', + hostEpoch: HOST_EPOCH, + subscriptionId: opened.subscriptionId, + sequence: 1, + sessionId: SESSION_ID, + ref: 'maka://runtime/background-tasks/shell-1', + ptySequence: 5, + data: 'ready', + }); + coordinator.close(); +}); + test('slow subscriber receives a terminal eviction without delaying another subscriber', async () => { const coordinator = new SessionContinuityCoordinator( HOST_EPOCH, diff --git a/packages/runtime-host/src/__tests__/session-subscription-client.test.ts b/packages/runtime-host/src/__tests__/session-subscription-client.test.ts index e4605654b5..d252670c39 100644 --- a/packages/runtime-host/src/__tests__/session-subscription-client.test.ts +++ b/packages/runtime-host/src/__tests__/session-subscription-client.test.ts @@ -65,6 +65,54 @@ test('registers a subscription before receiving a coalesced first frame', async ); }); +test('delivers Runtime Resource PTY frames without closing the connection', async () => { + await withProtocolPeer( + async (transport, hostEpoch) => { + const request = await acceptConnectionAndReadOpen(transport, hostEpoch); + const opened = openResult(hostEpoch, 'subscription-pty'); + const frame = { + kind: 'subscription.runtime_resource_pty_data' as const, + hostEpoch, + subscriptionId: opened.subscriptionId, + sequence: 1, + sessionId: 'session-1', + ref: 'maka://runtime/background-tasks/shell-1', + ptySequence: 7, + data: 'ready', + }; + await transport.writeEncoded( + Buffer.concat([ + encodeProtocolFrame({ + requestId: request.requestId, + operation: 'subscription.open', + ok: true, + result: opened, + }), + encodeProtocolFrame(frame), + ]), + ); + await answerClose(transport, opened.subscriptionId); + }, + async (connection) => { + const subscription = await connection.openSessionSubscription({ sessionId: 'session-1' }); + assert.deepEqual(await subscription[Symbol.asyncIterator]().next(), { + done: false, + value: { + kind: 'subscription.runtime_resource_pty_data', + hostEpoch: connection.hostEpoch, + subscriptionId: subscription.subscriptionId, + sequence: 1, + sessionId: 'session-1', + ref: 'maka://runtime/background-tasks/shell-1', + ptySequence: 7, + data: 'ready', + }, + }); + await subscription.close(); + }, + ); +}); + test('isolates a sequence gap and continues requests on the same connection', async () => { await withProtocolPeer( async (transport, hostEpoch) => { diff --git a/packages/runtime-host/src/__tests__/skill-catalog-coordinator.test.ts b/packages/runtime-host/src/__tests__/skill-catalog-coordinator.test.ts index b4d5a6cfbb..0138abf097 100644 --- a/packages/runtime-host/src/__tests__/skill-catalog-coordinator.test.ts +++ b/packages/runtime-host/src/__tests__/skill-catalog-coordinator.test.ts @@ -1,5 +1,5 @@ import assert from 'node:assert/strict'; -import { mkdir, mkdtemp, rm } from 'node:fs/promises'; +import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { afterEach, test } from 'node:test'; @@ -8,6 +8,7 @@ import { SkillCatalogRepository, SkillCatalogRepositoryError, } from '../server/skill-catalog-repository.js'; +import type { ConnectionContext } from '../server/operation-dispatcher.js'; const roots = new Set(); @@ -183,3 +184,81 @@ test('canonical model inventory uses the same revision and is deeply immutable', assert.equal(Object.isFrozen(model.inventory), true); assert.equal(Object.isFrozen(model.diagnostics), true); }); + +test('invocable pages use the authoritative Host tool surface and invalidate on capability change', async () => { + const base = await mkdtemp(join(tmpdir(), 'maka-skill-invocable-')); + roots.add(base); + const root = join(base, 'data'); + const project = join(base, 'project'); + const home = join(base, 'home'); + const plain = join(project, '.agents', 'skills', 'plain'); + const gated = join(project, '.agents', 'skills', 'gated'); + await Promise.all([ + mkdir(root, { recursive: true }), + mkdir(home, { recursive: true }), + mkdir(plain, { recursive: true }), + mkdir(gated, { recursive: true }), + ]); + await Promise.all([ + writeFile( + join(plain, 'SKILL.md'), + '---\nname: Plain\ndescription: Always available.\n---\n# Plain\n', + ), + writeFile( + join(gated, 'SKILL.md'), + '---\nname: Gated\ndescription: Needs a Host tool.\nrequired-tools: [ImaginaryTool]\n---\n# Gated\n', + ), + ]); + let toolNames = new Set(['Read']); + const coordinator = new HostSkillCatalogCoordinator( + new SkillCatalogRepository({ + homeDirectory: home, + managedSourcesRoot: join(home, '.maka', 'skill-sources'), + runWithRoot: async (operation) => operation(root), + }), + async () => ({ projectRoot: project, host: { toolNames } }), + ); + const context: ConnectionContext = { + hostEpoch: 'epoch-1', + connectionId: 'desktop-1', + surface: 'desktop', + principal: 'local_os_user', + acquireResidency: () => ({ release() {} }), + }; + + const first = await coordinator.queryInvocable( + { + kind: 'start', + target: { + kind: 'new_session', + context: { projectRoot: project }, + collaborationMode: 'agent', + }, + }, + context, + ); + assert.equal(first.ok, true); + if (!first.ok || first.result.kind !== 'page') throw new Error('Expected invocable page'); + assert.deepEqual( + first.result.items.map((item) => item.id), + ['plain'], + ); + + toolNames = new Set(['Read', 'ImaginaryTool']); + const changed = await coordinator.queryInvocable( + { + kind: 'continue', + target: { + kind: 'new_session', + context: { projectRoot: project }, + collaborationMode: 'agent', + }, + revision: first.result.revision, + cursor: 'stale-cursor', + }, + context, + ); + assert.equal(changed.ok, true); + if (!changed.ok) throw new Error('Expected invocable revision change'); + assert.equal(changed.result.kind, 'revision_changed'); +}); diff --git a/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts b/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts index 7049024b3c..ff20104e4d 100644 --- a/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts +++ b/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts @@ -56,7 +56,13 @@ export type SkillCatalogManagedUpdateMutationTypeContract = [ ]; describe('Runtime Host Skill catalog protocol', () => { - test('declares only the three frozen ready operations and their error sets', () => { + test('declares the four frozen ready operations and their error sets', () => { + assert.deepEqual(Object.keys(SKILL_CATALOG_OPERATION_SPECS).sort(), [ + 'skill.catalog.invocable.query', + 'skill.catalog.mutate', + 'skill.catalog.preview-update', + 'skill.catalog.query', + ]); const queryErrors = [ 'host_not_ready', 'host_draining', @@ -65,6 +71,14 @@ describe('Runtime Host Skill catalog protocol', () => { 'persistence_failed', 'internal_failure', ]; + assert.deepEqual( + { + mode: SKILL_CATALOG_OPERATION_SPECS['skill.catalog.invocable.query'].mode, + availability: SKILL_CATALOG_OPERATION_SPECS['skill.catalog.invocable.query'].availability, + errors: SKILL_CATALOG_OPERATION_SPECS['skill.catalog.invocable.query'].errors, + }, + { mode: 'query', availability: 'ready', errors: queryErrors }, + ); assert.deepEqual( { mode: SKILL_CATALOG_OPERATION_SPECS['skill.catalog.query'].mode, @@ -95,6 +109,57 @@ describe('Runtime Host Skill catalog protocol', () => { ); }); + test('decodes bounded Session and new-Session invocable queries and pages', () => { + for (const input of [ + { kind: 'start', target: { kind: 'session', sessionId: 'session-1' } }, + { + kind: 'start', + target: { kind: 'new_session', context: CONTEXT, collaborationMode: 'plan' }, + }, + { + kind: 'continue', + target: { kind: 'session', sessionId: 'session-1' }, + revision: REVISION, + cursor: 'next', + }, + ]) { + assert.deepEqual( + decodeClientFrame({ + requestId: 'request-1', + operation: 'skill.catalog.invocable.query', + input, + }), + { + requestId: 'request-1', + operation: 'skill.catalog.invocable.query', + input, + }, + ); + } + const result = { + kind: 'page', + revision: REVISION, + items: [ + { ref: 'project:maka:review', id: 'review', name: 'Review', description: 'Review code' }, + ], + nextCursor: null, + }; + assert.deepEqual( + decodeHostFrame({ + requestId: 'request-1', + operation: 'skill.catalog.invocable.query', + ok: true, + result, + }), + { + requestId: 'request-1', + operation: 'skill.catalog.invocable.query', + ok: true, + result, + }, + ); + }); + test('decodes start and continuation queries with bounded typed local context', () => { for (const input of [ { kind: 'start', context: CONTEXT, view: 'governance' }, diff --git a/packages/runtime-host/src/candidate-cli.ts b/packages/runtime-host/src/candidate-cli.ts index 7f0bb45e9b..1cc0b7bb27 100644 --- a/packages/runtime-host/src/candidate-cli.ts +++ b/packages/runtime-host/src/candidate-cli.ts @@ -1,4 +1,5 @@ import type { RuntimeHostCandidateOptions } from './server/candidate.js'; +import { isAbsolute } from 'node:path'; export function parseRuntimeHostCandidateArguments( args: readonly string[], @@ -8,6 +9,7 @@ export function parseRuntimeHostCandidateArguments( 'expected-root-id', 'idle-grace-ms', 'handshake-timeout-ms', + 'legacy-configuration-root', ]); const values = new Map(); for (let index = 0; index < args.length; index += 2) { @@ -31,11 +33,23 @@ export function parseRuntimeHostCandidateArguments( return { rootPath, expectedRootId, + ...(values.has('legacy-configuration-root') + ? { + legacyConfigurationRoot: readOptionalAbsolutePath(values, 'legacy-configuration-root'), + } + : {}), idleGraceMs: readOptionalInteger(values, 'idle-grace-ms'), handshakeTimeoutMs: readOptionalInteger(values, 'handshake-timeout-ms'), }; } +function readOptionalAbsolutePath(values: Map, key: string): string | undefined { + const value = values.get(key); + if (value === undefined) return undefined; + if (!isAbsolute(value)) throw new Error(`Invalid --${key}`); + return value; +} + function readOptionalInteger(values: Map, key: string): number | undefined { const raw = values.get(key); if (raw === undefined) return undefined; diff --git a/packages/runtime-host/src/client/catalog-reader.ts b/packages/runtime-host/src/client/catalog-reader.ts index 5bf9b283d1..eca125c61f 100644 --- a/packages/runtime-host/src/client/catalog-reader.ts +++ b/packages/runtime-host/src/client/catalog-reader.ts @@ -7,6 +7,8 @@ import type { SessionCatalogFilter, SessionCatalogItem, SkillCatalogLocalContext, + SkillCatalogInvocableItem, + SkillCatalogInvocableTarget, SkillCatalogPageItem, SkillCatalogRevision, SkillCatalogView, @@ -14,7 +16,10 @@ import type { } from '../protocol/index.js'; import type { RuntimeHostConnection } from './connection.js'; -const MAX_STABLE_READ_ATTEMPTS = 3; +const MAX_STABLE_READ_ATTEMPTS = 8; +const STABLE_READ_RETRY_BASE_DELAY_MS = 8; +const STABLE_READ_RETRY_MAX_DELAY_MS = 64; +type RuntimeHostCatalogConnection = Pick; export interface RuntimeHostSkillCatalogSnapshot { readonly revision: SkillCatalogRevision; @@ -48,7 +53,7 @@ export class RuntimeHostCatalogReadError extends Error { } export async function readRuntimeHostConnectionCatalog( - connection: RuntimeHostConnection, + connection: RuntimeHostCatalogConnection, ): Promise { const { first, pages } = await collectStablePages( 'connection', @@ -72,7 +77,7 @@ export async function readRuntimeHostConnectionCatalog( } export async function readRuntimeHostSkillCatalog( - connection: RuntimeHostConnection, + connection: RuntimeHostCatalogConnection, context: SkillCatalogLocalContext, view: SkillCatalogView, ): Promise { @@ -100,8 +105,34 @@ export async function readRuntimeHostSkillCatalog( return { revision: first.revision, view, items: pages.flatMap((page) => page.items) }; } +export async function readRuntimeHostInvocableSkills( + connection: RuntimeHostCatalogConnection, + target: SkillCatalogInvocableTarget, +): Promise { + const { pages } = await collectStablePages( + 'skill', + async () => { + const result = await connection.request('skill.catalog.invocable.query', { + kind: 'start', + target, + }); + return result.kind === 'page' ? result : null; + }, + async (revision, cursor) => { + const result = await connection.request('skill.catalog.invocable.query', { + kind: 'continue', + target, + revision, + cursor, + }); + return result.kind === 'page' ? result : null; + }, + ); + return pages.flatMap((page) => page.items); +} + export async function readRuntimeHostSessions( - connection: RuntimeHostConnection, + connection: RuntimeHostCatalogConnection, filter?: SessionCatalogFilter, ): Promise { const { pages } = await collectStablePages( @@ -127,7 +158,7 @@ export async function readRuntimeHostSessions( } export async function readRuntimeHostResources( - connection: RuntimeHostConnection, + connection: RuntimeHostCatalogConnection, sessionId: string, ): Promise< Extract, { kind: 'page' }>['resources'][number][] @@ -185,6 +216,14 @@ async function collectStablePages( page = next; } if (!retry) return { first, pages }; + if (attempt + 1 < MAX_STABLE_READ_ATTEMPTS) { + await new Promise((resolve) => + setTimeout( + resolve, + Math.min(STABLE_READ_RETRY_BASE_DELAY_MS * 2 ** attempt, STABLE_READ_RETRY_MAX_DELAY_MS), + ), + ); + } } throw new RuntimeHostCatalogReadError(catalog, 'unstable'); } diff --git a/packages/runtime-host/src/client/connect-or-spawn.ts b/packages/runtime-host/src/client/connect-or-spawn.ts index c2f0b145c2..a9c6a1ff67 100644 --- a/packages/runtime-host/src/client/connect-or-spawn.ts +++ b/packages/runtime-host/src/client/connect-or-spawn.ts @@ -32,6 +32,7 @@ export interface ConnectOrSpawnRuntimeHostInput { connectTimeoutMs?: number; handshakeTimeoutMs?: number; candidateEntrypoint?: string | URL; + legacyConfigurationRoot?: string; } interface ConnectOrSpawnRuntimeHostDependencies { @@ -110,6 +111,9 @@ export async function connectOrSpawnRuntimeHostWithDependencies( ...(input.candidateEntrypoint === undefined ? {} : { entrypoint: input.candidateEntrypoint }), + ...(input.legacyConfigurationRoot === undefined + ? {} + : { legacyConfigurationRoot: input.legacyConfigurationRoot }), }); await settleBeforeDeadline(launch.spawned, deadline); } catch { diff --git a/packages/runtime-host/src/client/connection.ts b/packages/runtime-host/src/client/connection.ts index 00e70ca5c6..d09ba6815b 100644 --- a/packages/runtime-host/src/client/connection.ts +++ b/packages/runtime-host/src/client/connection.ts @@ -16,6 +16,7 @@ import { type ClientCapabilityReplaceResult, type ClientCapabilityUnregisterResult, type ClientSurface, + type ConfigurationChangedFrame, type ContextCompactInput, type ContextCompactResult, type ContextDiagnosticsQueryInput, @@ -44,6 +45,7 @@ import { type ProtocolRange, type RequestFrame, type ResponseFrame, + type SessionCatalogChangedFrame, type SubscriptionFrame, type SubscriptionOpenInput, type SessionCwdRelocateInput, @@ -58,6 +60,7 @@ import { type TurnResumeStartResult, type TurnSnapshot, type TurnStartInput, + type TurnStartResult, type TurnStopInput, requireClientInstanceId, validateProtocolRange, @@ -159,7 +162,7 @@ export interface RuntimeHostConnection { timeoutMs?: number, ): Promise>; status(timeoutMs?: number): Promise; - startTurn(input: TurnStartInput, timeoutMs?: number): Promise; + startTurn(input: TurnStartInput, timeoutMs?: number): Promise; queryTurn(input: TurnQueryInput, timeoutMs?: number): Promise; stopTurn(input: TurnStopInput, timeoutMs?: number): Promise; regenerateTurn(input: TurnRegenerateInput, timeoutMs?: number): Promise; @@ -203,6 +206,8 @@ export interface RuntimeHostConnection { timeoutMs?: number, ): Promise; unregisterClientCapabilities(timeoutMs?: number): Promise; + subscribeConfigurationChanges(listener: (revision: number) => void): () => void; + subscribeSessionCatalogChanges(listener: (frame: SessionCatalogChangedFrame) => void): () => void; } export type DirectRequestOperationKey = Exclude< @@ -245,6 +250,8 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { readonly #subscriptions = new Map(); readonly #retiredSubscriptionIds = new Set(); readonly #clientCapabilities: ClientCapabilityChannel; + readonly #configurationChangeListeners = new Set<(revision: number) => void>(); + readonly #sessionCatalogChangeListeners = new Set<(frame: SessionCatalogChangedFrame) => void>(); #livenessTimer: NodeJS.Timeout | undefined; #livenessProbePending = false; #terminalError: Error | undefined; @@ -377,7 +384,7 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { return status; } - startTurn(input: TurnStartInput, timeoutMs?: number): Promise { + startTurn(input: TurnStartInput, timeoutMs?: number): Promise { return this.request('turn.start', input, timeoutMs); } @@ -518,6 +525,18 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { return this.#clientCapabilities.unregister(timeoutMs); } + subscribeConfigurationChanges(listener: (revision: number) => void): () => void { + this.#configurationChangeListeners.add(listener); + return () => this.#configurationChangeListeners.delete(listener); + } + + subscribeSessionCatalogChanges( + listener: (frame: SessionCatalogChangedFrame) => void, + ): () => void { + this.#sessionCatalogChangeListeners.add(listener); + return () => this.#sessionCatalogChangeListeners.delete(listener); + } + async #readResponses(): Promise { try { while (true) { @@ -529,10 +548,17 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { continue; } switch (frame.kind) { + case 'configuration.changed': + this.#acceptConfigurationChanged(frame); + continue; + case 'session.catalog.changed': + this.#acceptSessionCatalogChanged(frame); + continue; case 'subscription.session_projection': case 'subscription.session_delta': case 'subscription.session_event': case 'subscription.session_domain_changed': + case 'subscription.runtime_resource_pty_data': case 'subscription.agent_graph_changed': case 'subscription.closed': this.#acceptSubscriptionFrame(frame); @@ -582,6 +608,26 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { ); } + #acceptConfigurationChanged(frame: ConfigurationChangedFrame): void { + for (const listener of this.#configurationChangeListeners) { + try { + listener(frame.revision); + } catch { + // A presentation listener cannot invalidate the Host connection. + } + } + } + + #acceptSessionCatalogChanged(frame: SessionCatalogChangedFrame): void { + for (const listener of this.#sessionCatalogChangeListeners) { + try { + listener(frame); + } catch { + // A presentation listener cannot invalidate the Host connection. + } + } + } + #retireRequest(requestId: string, error: Error): void { const pending = this.#pendingRequests.get(requestId); if (!pending) return; @@ -733,6 +779,8 @@ class RuntimeHostConnectionImpl implements RuntimeHostConnection { this.#subscriptions.clear(); this.#retiredSubscriptionIds.clear(); this.#clientCapabilities.close(error); + this.#configurationChangeListeners.clear(); + this.#sessionCatalogChangeListeners.clear(); this.#transport.destroy(); } } diff --git a/packages/runtime-host/src/client/index.ts b/packages/runtime-host/src/client/index.ts index a96c68c7f7..4983a0f3db 100644 --- a/packages/runtime-host/src/client/index.ts +++ b/packages/runtime-host/src/client/index.ts @@ -16,6 +16,7 @@ export { export { RuntimeHostCatalogReadError, readRuntimeHostConnectionCatalog, + readRuntimeHostInvocableSkills, readRuntimeHostResources, readRuntimeHostSessions, readRuntimeHostSkillCatalog, diff --git a/packages/runtime-host/src/client/launcher.ts b/packages/runtime-host/src/client/launcher.ts index a9a0fa8fa8..2e676eabb9 100644 --- a/packages/runtime-host/src/client/launcher.ts +++ b/packages/runtime-host/src/client/launcher.ts @@ -1,9 +1,11 @@ import { spawn } from 'node:child_process'; +import { dirname, isAbsolute } from 'node:path'; import { fileURLToPath } from 'node:url'; export interface DetachedCandidateInput { rootPath: string; expectedRootId: string; + legacyConfigurationRoot?: string; idleGraceMs?: number; handshakeTimeoutMs?: number; executable?: string; @@ -35,9 +37,11 @@ export function launchDetachedRuntimeHostCandidate( ]; appendArgument(args, '--idle-grace-ms', input.idleGraceMs); appendArgument(args, '--handshake-timeout-ms', input.handshakeTimeoutMs); + appendArgument(args, '--legacy-configuration-root', input.legacyConfigurationRoot); // spawn() commits the side effect synchronously; spawned only reports that commit's outcome. const child = spawn(executable, args, { + cwd: dirname(isAbsolute(executable) ? executable : process.execPath), detached: true, stdio: 'ignore', windowsHide: true, diff --git a/packages/runtime-host/src/client/session-subscription.ts b/packages/runtime-host/src/client/session-subscription.ts index 45db2199a4..0b2edd5dd2 100644 --- a/packages/runtime-host/src/client/session-subscription.ts +++ b/packages/runtime-host/src/client/session-subscription.ts @@ -250,7 +250,8 @@ export class ClientSessionSubscription } else if ( (frame.kind === 'subscription.session_delta' || frame.kind === 'subscription.session_event' || - frame.kind === 'subscription.session_domain_changed') && + frame.kind === 'subscription.session_domain_changed' || + frame.kind === 'subscription.runtime_resource_pty_data') && frame.sessionId !== this.#expectedSessionId ) { throw new RuntimeHostSubscriptionError( diff --git a/packages/runtime-host/src/desktop-e2e-execution-candidate-main.ts b/packages/runtime-host/src/desktop-e2e-execution-candidate-main.ts new file mode 100644 index 0000000000..7eb9bdd8d3 --- /dev/null +++ b/packages/runtime-host/src/desktop-e2e-execution-candidate-main.ts @@ -0,0 +1,76 @@ +#!/usr/bin/env node +import { FakeBackend } from '@maka/runtime'; +import { parseRuntimeHostCandidateArguments } from './candidate-cli.js'; +import { startExecutionRuntimeHostCandidate } from './server/execution-candidate.js'; +import { createExecutionRuntimeHostComposition } from './server/execution-composition.js'; +import { runRuntimeHostProcessLifecycle } from './server/process-lifecycle.js'; + +const options = parseRuntimeHostCandidateArguments(process.argv.slice(2)); +const result = await startExecutionRuntimeHostCandidate( + { + ...options, + // Every desktop E2E fixture owns a fresh workspace and can never reconnect + // to this candidate. Preserve enough time for the election retry, then let + // teardown converge without production's multi-client restart grace. + idleGraceMs: 500, + }, + { + createComposition: (context, compositionOptions) => + createExecutionRuntimeHostComposition( + context, + { + ...compositionOptions, + bootstrapRuntimePolicy: false, + }, + { + primaryBackendFactory: (backendContext) => new FakeBackend(backendContext), + oauthAuthorization: { + startCodexAuthorization: async () => ({ + deviceAuthId: 'desktop-e2e-device-authorization', + userCode: 'MAKA-E2E', + verificationUrl: 'https://auth.openai.com/codex/device', + expiresAt: Date.now() + 60_000, + intervalMs: 1, + }), + pollCodexAuthorization: async () => ({ + authorizationCode: 'desktop-e2e-authorization-code', + codeVerifier: 'desktop-e2e-code-verifier', + }), + exchangeCodexCode: async () => ({ + access_token: 'desktop-e2e-access-token', + refresh_token: 'desktop-e2e-refresh-token', + expires_at: Date.now() + 3_600_000, + }), + }, + }, + ), + }, +); +if (result.kind === 'loser') process.exit(2); + +const desktopParentPid = process.ppid; +const parentWatch = setInterval(() => { + if (process.ppid === desktopParentPid && isProcessAlive(desktopParentPid)) return; + clearInterval(parentWatch); + void result.host.close().catch(() => { + process.exitCode = 1; + }); +}, 100); +parentWatch.unref(); + +try { + await runRuntimeHostProcessLifecycle(result.host); +} catch { + process.exitCode = 1; +} finally { + clearInterval(parentWatch); +} + +function isProcessAlive(pid: number): boolean { + try { + process.kill(pid, 0); + return true; + } catch { + return false; + } +} diff --git a/packages/runtime-host/src/protocol/client-capability.ts b/packages/runtime-host/src/protocol/client-capability.ts index f13f625300..37f99e993b 100644 --- a/packages/runtime-host/src/protocol/client-capability.ts +++ b/packages/runtime-host/src/protocol/client-capability.ts @@ -640,6 +640,7 @@ const CLIENT_CAPABILITY_SCHEMA_KEYWORDS = new Set([ 'multipleOf', 'oneOf', 'pattern', + 'propertyNames', 'properties', 'required', 'title', @@ -726,6 +727,9 @@ function validateToolInputSchema(root: Record): void { ) { visit(schema.additionalProperties); } + if (schema.propertyNames !== undefined) { + visit(schema.propertyNames); + } if (schema.items !== undefined) { if (Array.isArray(schema.items)) { if (schema.items.length === 0) { diff --git a/packages/runtime-host/src/protocol/configuration-change.ts b/packages/runtime-host/src/protocol/configuration-change.ts new file mode 100644 index 0000000000..3cd007a940 --- /dev/null +++ b/packages/runtime-host/src/protocol/configuration-change.ts @@ -0,0 +1,14 @@ +import { requireCount, requireExactRecord } from './codec.js'; + +export interface ConfigurationChangedFrame { + readonly kind: 'configuration.changed'; + readonly revision: number; +} + +export function decodeConfigurationChangedFrame(value: unknown): ConfigurationChangedFrame { + const frame = requireExactRecord(value, 'configuration changed frame', ['kind', 'revision']); + return { + kind: 'configuration.changed', + revision: requireCount(frame.revision, 'configuration revision'), + }; +} diff --git a/packages/runtime-host/src/protocol/connection-effects.ts b/packages/runtime-host/src/protocol/connection-effects.ts index 0e359fc64c..a588d71be8 100644 --- a/packages/runtime-host/src/protocol/connection-effects.ts +++ b/packages/runtime-host/src/protocol/connection-effects.ts @@ -1,13 +1,22 @@ import { CONNECTION_CATALOG_MAX_MODELS_PER_CONNECTION, decodeConnectionModelId, + decodeConnectionModel, + decodeProviderType, decodeConnectionTestSummary, decodeConnectionVersionBasis, RuntimePolicyDomainDecodeError, type ConnectionVersionBasis, type ModelDiscoverySource, } from '@maka/core/runtime-policy'; -import { requireCount, requireEntityId, requireExactRecord, requireRecord } from './codec.js'; +import type { ModelInfo, ProviderType } from '@maka/core/llm-connections'; +import { + requireCount, + requireEntityId, + requireExactRecord, + requireRecord, + requireString, +} from './codec.js'; import { invalidProtocolFrame } from './errors.js'; import { defineOperation } from './operation-spec.js'; @@ -55,6 +64,35 @@ export interface ConnectionTestRunInput { readonly modelId: string | null; } +export interface ConnectionOnboardingVerifyInput { + readonly providerType: ProviderType; + readonly apiKey: string | null; +} + +export interface ConnectionOnboardingSaveInput extends ConnectionOnboardingVerifyInput { + readonly enabledModelIds: readonly string[]; +} + +export type ConnectionOnboardingVerifyResult = + | { readonly kind: 'verified'; readonly models: readonly ModelInfo[] } + | { + readonly kind: 'rejected'; + readonly reason: 'provider_unsupported' | 'credential_not_configured' | 'slug_conflict'; + } + | { readonly kind: 'failed'; readonly errorClass: ConnectionEffectFailureClass }; + +export type ConnectionOnboardingSaveResult = + | { readonly kind: 'saved' } + | { + readonly kind: 'rejected'; + readonly reason: + | 'provider_unsupported' + | 'credential_not_configured' + | 'slug_conflict' + | 'model_unavailable'; + } + | { readonly kind: 'failed'; readonly errorClass: ConnectionEffectFailureClass }; + interface ConnectionEffectCommitted { readonly kind: 'committed'; readonly catalogRevision: number; @@ -110,6 +148,28 @@ export type ConnectionTestRunResult = | ConnectionEffectSuperseded; export const CONNECTION_EFFECT_OPERATION_SPECS = { + 'connection.onboarding.save': defineOperation< + ConnectionOnboardingSaveInput, + ConnectionOnboardingSaveResult, + (typeof EFFECT_ERRORS)[number] + >({ + mode: 'command', + availability: 'ready', + errors: EFFECT_ERRORS, + decodeInput: decodeConnectionOnboardingSaveInput, + decodeOutput: decodeConnectionOnboardingSaveResult, + }), + 'connection.onboarding.verify': defineOperation< + ConnectionOnboardingVerifyInput, + ConnectionOnboardingVerifyResult, + (typeof EFFECT_ERRORS)[number] + >({ + mode: 'command', + availability: 'ready', + errors: EFFECT_ERRORS, + decodeInput: decodeConnectionOnboardingVerifyInput, + decodeOutput: decodeConnectionOnboardingVerifyResult, + }), 'connection.models.fetch': defineOperation< ConnectionModelFetchInput, ConnectionModelFetchResult, @@ -134,6 +194,118 @@ export const CONNECTION_EFFECT_OPERATION_SPECS = { }), } as const; +export function decodeConnectionOnboardingSaveInput(value: unknown): ConnectionOnboardingSaveInput { + const input = requireExactRecord(value, 'connection onboarding save input', [ + 'providerType', + 'apiKey', + 'enabledModelIds', + ]); + const verified = decodeConnectionOnboardingVerifyInput({ + providerType: input.providerType, + apiKey: input.apiKey, + }); + if ( + !Array.isArray(input.enabledModelIds) || + input.enabledModelIds.length === 0 || + input.enabledModelIds.length > CONNECTION_CATALOG_MAX_MODELS_PER_CONNECTION + ) { + throw invalidProtocolFrame('Connection onboarding requires at least one enabled model'); + } + const enabledModelIds = input.enabledModelIds.map((modelId) => + decodeDomain(() => decodeConnectionModelId(modelId)), + ); + if (new Set(enabledModelIds).size !== enabledModelIds.length) { + throw invalidProtocolFrame('Connection onboarding enabled models must be unique'); + } + return { ...verified, enabledModelIds }; +} + +export function decodeConnectionOnboardingSaveResult( + value: unknown, +): ConnectionOnboardingSaveResult { + const result = requireRecord(value, 'connection onboarding save result'); + if (result.kind === 'saved') { + requireExactRecord(result, 'saved connection onboarding result', ['kind']); + return { kind: 'saved' }; + } + if (result.kind === 'failed') { + const failed = requireExactRecord(result, 'failed connection onboarding save result', [ + 'kind', + 'errorClass', + ]); + return { kind: 'failed', errorClass: effectFailureClass(failed.errorClass) }; + } + const rejected = requireExactRecord(result, 'rejected connection onboarding save result', [ + 'kind', + 'reason', + ]); + if ( + rejected.kind !== 'rejected' || + (rejected.reason !== 'provider_unsupported' && + rejected.reason !== 'credential_not_configured' && + rejected.reason !== 'slug_conflict' && + rejected.reason !== 'model_unavailable') + ) { + throw invalidProtocolFrame('Invalid connection onboarding save rejection'); + } + return { kind: 'rejected', reason: rejected.reason }; +} + +export function decodeConnectionOnboardingVerifyInput( + value: unknown, +): ConnectionOnboardingVerifyInput { + const input = requireExactRecord(value, 'connection onboarding verification input', [ + 'providerType', + 'apiKey', + ]); + return { + providerType: decodeDomain(() => decodeProviderType(input.providerType)), + apiKey: + input.apiKey === null + ? null + : requireString(input.apiKey, 'connection onboarding API key', 64 * 1024), + }; +} + +export function decodeConnectionOnboardingVerifyResult( + value: unknown, +): ConnectionOnboardingVerifyResult { + const result = requireRecord(value, 'connection onboarding verification result'); + if (result.kind === 'verified') { + const verified = requireExactRecord(result, 'verified connection onboarding result', [ + 'kind', + 'models', + ]); + if (!Array.isArray(verified.models) || verified.models.length === 0) { + throw invalidProtocolFrame('Connection onboarding models must be a non-empty array'); + } + return { + kind: 'verified', + models: verified.models.map((model) => decodeDomain(() => decodeConnectionModel(model))), + }; + } + if (result.kind === 'failed') { + const failed = requireExactRecord(result, 'failed connection onboarding result', [ + 'kind', + 'errorClass', + ]); + return { kind: 'failed', errorClass: effectFailureClass(failed.errorClass) }; + } + const rejected = requireExactRecord(result, 'rejected connection onboarding result', [ + 'kind', + 'reason', + ]); + if ( + rejected.kind !== 'rejected' || + (rejected.reason !== 'provider_unsupported' && + rejected.reason !== 'credential_not_configured' && + rejected.reason !== 'slug_conflict') + ) { + throw invalidProtocolFrame('Invalid connection onboarding rejection'); + } + return { kind: 'rejected', reason: rejected.reason }; +} + export function decodeConnectionModelFetchInput(value: unknown): ConnectionModelFetchInput { const input = requireExactRecord(value, 'connection model fetch input', ['connectionId']); return { connectionId: requireEntityId(input.connectionId, 'connectionId') }; diff --git a/packages/runtime-host/src/protocol/index.ts b/packages/runtime-host/src/protocol/index.ts index 65d057c53d..56cb1a0588 100644 --- a/packages/runtime-host/src/protocol/index.ts +++ b/packages/runtime-host/src/protocol/index.ts @@ -15,6 +15,14 @@ import { type ClientCapabilityClientFrame, type ClientCapabilityHostFrame, } from './client-capability.js'; +import { + decodeConfigurationChangedFrame, + type ConfigurationChangedFrame, +} from './configuration-change.js'; +import { + decodeSessionCatalogChangedFrame, + type SessionCatalogChangedFrame, +} from './session-catalog-change.js'; import { decodeRequestFrame, decodeResponseFrame, @@ -29,6 +37,7 @@ export * from './interaction.js'; export * from './automation.js'; export * from './daily-review.js'; export * from './client-capability.js'; +export * from './configuration-change.js'; export * from './goal.js'; export * from './plan.js'; export * from './execution-inspect.js'; @@ -36,6 +45,7 @@ export * from './message.js'; export * from './operations.js'; export * from './runtime-resource.js'; export * from './session-continuity.js'; +export * from './session-catalog-change.js'; export * from './session-retirement.js'; export * from './session-transcript.js'; export * from './task-ledger.js'; @@ -45,17 +55,14 @@ export const RUNTIME_HOST_PROTOCOL_VERSION = 0 as const; // The wire version remains v0 before the first release. This independent epoch // lets a new Client retire a stale same-version Host whose closed schema is no // longer safe to use. -// 5: relay capability declarations moved off the connection header onto -// each enabled_model_id item (`relayProfile`) — header items are atomic to -// the paginator, so a per-model table there could make an entry unreadable. -export const RUNTIME_HOST_COMPATIBILITY_EPOCH = 5 as const; +export const RUNTIME_HOST_COMPATIBILITY_EPOCH = 7 as const; // A legal sandbox-boundary expansion can consume 64 KiB before its Interaction // envelope and independently bounded justification are added. Keep transport // capacity large enough to represent that domain value; narrower surfaces such // as Session continuity retain their own limits. export const RUNTIME_HOST_MAX_FRAME_BYTES = 96 * 1024; -export type ClientSurface = 'desktop' | 'tui' | 'run' | 'bot' | 'inspect'; +export type ClientSurface = 'desktop' | 'tui' | 'run' | 'activation' | 'bot' | 'inspect'; export interface ProtocolRange { min: number; @@ -105,7 +112,9 @@ export type HostFrame = | HostHandshakeResult | ResponseFrame | SubscriptionFrame - | ClientCapabilityHostFrame; + | ClientCapabilityHostFrame + | ConfigurationChangedFrame + | SessionCatalogChangedFrame; export interface HostRegistration { kind: 'maka-runtime-host'; @@ -201,6 +210,8 @@ export function decodeHostFrame(value: unknown): HostFrame { if (isClientCapabilityHostFrameKind(frame.kind)) { return decodeClientCapabilityHostFrame(frame); } + if (frame.kind === 'configuration.changed') return decodeConfigurationChangedFrame(frame); + if (frame.kind === 'session.catalog.changed') return decodeSessionCatalogChangedFrame(frame); return decodeResponseFrame(frame); } @@ -328,6 +339,7 @@ function requireSurface(value: unknown): ClientSurface { value === 'desktop' || value === 'tui' || value === 'run' || + value === 'activation' || value === 'bot' || value === 'inspect' ) diff --git a/packages/runtime-host/src/protocol/operations.ts b/packages/runtime-host/src/protocol/operations.ts index b61874c209..a06a6baeb2 100644 --- a/packages/runtime-host/src/protocol/operations.ts +++ b/packages/runtime-host/src/protocol/operations.ts @@ -110,6 +110,7 @@ export type { TurnRunStatus, TurnSnapshot, TurnStartInput, + TurnStartResult, TurnStopInput, } from './turn.js'; export * from './connection-effects.js'; diff --git a/packages/runtime-host/src/protocol/runtime-resource.ts b/packages/runtime-host/src/protocol/runtime-resource.ts index 6ee95f6bee..a8a88c341d 100644 --- a/packages/runtime-host/src/protocol/runtime-resource.ts +++ b/packages/runtime-host/src/protocol/runtime-resource.ts @@ -18,6 +18,7 @@ import { invalidProtocolFrame } from './errors.js'; import { defineOperation } from './operation-spec.js'; export const RUNTIME_RESOURCE_RESULT_MAX_BYTES = 52 * 1024; +export const RUNTIME_RESOURCE_CONTROLLER_ACQUIRE_RESULT_MAX_BYTES = 90 * 1024; export const RUNTIME_RESOURCE_PAGE_MAX_ITEMS = 64; export const RUNTIME_RESOURCE_CURSOR_MAX_BYTES = 32; export const RUNTIME_RESOURCE_REF_MAX_BYTES = 256; @@ -88,7 +89,15 @@ export interface RuntimeResourceControllerAcquireInput { export interface RuntimeResourceControllerAcquireResult { readonly controllerId: string; readonly nextSequence: number; - readonly resource: ShellRunSnapshotResult; + readonly pty: RuntimeResourcePtySnapshot; +} + +export interface RuntimeResourcePtySnapshot { + readonly sessionId: string; + readonly ref: string; + readonly sequence: number; + readonly buffer: string; + readonly size: { readonly cols: number; readonly rows: number }; } export type RuntimeResourcePtyControl = @@ -131,6 +140,15 @@ export interface RuntimeResourceStopInput { readonly ref: string; } +export interface RuntimeResourceStartInput { + readonly sessionId: string; + readonly launchId: string; +} + +export interface RuntimeResourceStartResult { + readonly resource: ShellRunSnapshotResult; +} + export interface RuntimeResourceStopResult { readonly resource: ShellRunSnapshotResult; } @@ -147,6 +165,17 @@ export const RUNTIME_RESOURCE_OPERATION_SPECS = { decodeInput: decodeRuntimeResourceQueryInput, decodeOutput: decodeRuntimeResourceQueryResult, }), + 'runtime.resource.start': defineOperation< + RuntimeResourceStartInput, + RuntimeResourceStartResult, + (typeof MUTATION_ERRORS)[number] + >({ + mode: 'command', + availability: 'ready', + errors: MUTATION_ERRORS, + decodeInput: decodeRuntimeResourceStartInput, + decodeOutput: decodeRuntimeResourceStartResult, + }), 'runtime.resource.controller.acquire': defineOperation< RuntimeResourceControllerAcquireInput, RuntimeResourceControllerAcquireResult, @@ -193,6 +222,28 @@ export const RUNTIME_RESOURCE_OPERATION_SPECS = { }), } as const; +export function decodeRuntimeResourceStartInput(value: unknown): RuntimeResourceStartInput { + const input = requireExactRecord(value, 'Runtime Resource start input', [ + 'sessionId', + 'launchId', + ]); + return { + sessionId: requireEntityId(input.sessionId, 'sessionId'), + launchId: requireId(input.launchId, 'launchId'), + }; +} + +export function decodeRuntimeResourceStartResult(value: unknown): RuntimeResourceStartResult { + const result = requireExactRecord(value, 'Runtime Resource start result', ['resource']); + const decoded = { resource: decodeRuntimeResourceSnapshot(result.resource) }; + requireEncodedByteLimit( + decoded, + 'Runtime Resource start result', + RUNTIME_RESOURCE_RESULT_MAX_BYTES, + ); + return decoded; +} + export function decodeRuntimeResourceQueryInput(value: unknown): RuntimeResourceQueryInput { const record = requireRecord(value, 'Runtime Resource query input'); if (record.kind === 'list_start') { @@ -301,21 +352,47 @@ export function decodeRuntimeResourceControllerAcquireResult( const result = requireExactRecord(value, 'Runtime Resource controller acquire result', [ 'controllerId', 'nextSequence', - 'resource', + 'pty', ]); const decoded = { controllerId: requireEntityId(result.controllerId, 'controllerId'), nextSequence: positiveCount(result.nextSequence, 'nextSequence'), - resource: decodeRuntimeResourceSnapshot(result.resource), + pty: decodeRuntimeResourcePtySnapshot(result.pty), }; requireEncodedByteLimit( decoded, 'Runtime Resource controller acquire result', - RUNTIME_RESOURCE_RESULT_MAX_BYTES, + RUNTIME_RESOURCE_CONTROLLER_ACQUIRE_RESULT_MAX_BYTES, ); return decoded; } +function decodeRuntimeResourcePtySnapshot(value: unknown): RuntimeResourcePtySnapshot { + const snapshot = requireExactRecord(value, 'Runtime Resource PTY snapshot', [ + 'sessionId', + 'ref', + 'sequence', + 'buffer', + 'size', + ]); + const size = requireExactRecord(snapshot.size, 'Runtime Resource PTY size', ['cols', 'rows']); + const decodedSize = decodeSize(size.cols, size.rows); + return { + sessionId: requireEntityId(snapshot.sessionId, 'sessionId'), + ref: decodeRuntimeResourceRef(snapshot.ref), + sequence: requireCount(snapshot.sequence, 'PTY sequence'), + buffer: ptyBuffer(snapshot.buffer), + size: decodedSize, + }; +} + +function ptyBuffer(value: unknown): string { + if (typeof value !== 'string' || Buffer.byteLength(value, 'utf8') > 80 * 1024) { + throw invalidProtocolFrame('Invalid PTY buffer'); + } + return value; +} + export function decodeRuntimeResourceControllerControlInput( value: unknown, ): RuntimeResourceControllerControlInput { diff --git a/packages/runtime-host/src/protocol/session-catalog-change.ts b/packages/runtime-host/src/protocol/session-catalog-change.ts new file mode 100644 index 0000000000..5a8ba7c192 --- /dev/null +++ b/packages/runtime-host/src/protocol/session-catalog-change.ts @@ -0,0 +1,20 @@ +import { requireCount, requireExactRecord, requireId } from './codec.js'; + +export interface SessionCatalogChangedFrame { + readonly kind: 'session.catalog.changed'; + readonly revision: number; + readonly sessionId: string; +} + +export function decodeSessionCatalogChangedFrame(value: unknown): SessionCatalogChangedFrame { + const frame = requireExactRecord(value, 'Session catalog changed frame', [ + 'kind', + 'revision', + 'sessionId', + ]); + return { + kind: 'session.catalog.changed', + revision: requireCount(frame.revision, 'Session catalog change revision'), + sessionId: requireId(frame.sessionId, 'sessionId'), + }; +} diff --git a/packages/runtime-host/src/protocol/session-continuity.ts b/packages/runtime-host/src/protocol/session-continuity.ts index 912e46e564..7b959bea3e 100644 --- a/packages/runtime-host/src/protocol/session-continuity.ts +++ b/packages/runtime-host/src/protocol/session-continuity.ts @@ -32,6 +32,7 @@ export const SESSION_LIVE_DELTA_MAX_BYTES = 16 * 1024; export const SESSION_TOOL_OUTPUT_DELTA_MAX_BYTES = 3 * TOOL_OUTPUT_DELTA_MAX_CHARS; export const SESSION_TOOL_NAME_MAX_BYTES = 256; export const SESSION_SUBSCRIPTION_FRAME_MAX_BYTES = 64 * 1024 - 1; +export const SESSION_RUNTIME_RESOURCE_PTY_DATA_MAX_BYTES = 48 * 1024; export type SessionLifecycleStatus = | 'active' @@ -183,6 +184,14 @@ export type SessionDomainChangedFrame = SubscriptionEnvelope & kind: 'subscription.session_domain_changed'; }; +export interface SessionRuntimeResourcePtyDataFrame extends SubscriptionEnvelope { + kind: 'subscription.runtime_resource_pty_data'; + sessionId: string; + ref: string; + ptySequence: number; + data: string; +} + export type AgentGraphChangedReason = 'observation' | 'runtime_activity' | 'reconciled' | 'stopped'; export interface AgentGraphChangedFrame extends SubscriptionEnvelope { @@ -202,6 +211,7 @@ export type SubscriptionFrame = | SessionDeltaFrame | SessionEventFrame | SessionDomainChangedFrame + | SessionRuntimeResourcePtyDataFrame | AgentGraphChangedFrame | SubscriptionClosedFrame; @@ -326,6 +336,29 @@ export function decodeSubscriptionFrame(value: unknown): SubscriptionFrame { resources: decodeSessionRuntimeResourceChanges(record.resources), } : { kind: record.kind, ...envelope, sessionId, domain }; + } else if (record.kind === 'subscription.runtime_resource_pty_data') { + assertExactKeys(record, 'Runtime Resource PTY data frame', [ + 'kind', + 'hostEpoch', + 'subscriptionId', + 'sequence', + 'sessionId', + 'ref', + 'ptySequence', + 'data', + ]); + frame = { + kind: record.kind, + ...envelope, + sessionId: requireEntityId(record.sessionId, 'sessionId'), + ref: decodeRuntimeResourceRef(record.ref), + ptySequence: requirePositiveCount(record.ptySequence, 'PTY sequence'), + data: requireUtf8BoundedString( + record.data, + 'Runtime Resource PTY data', + SESSION_RUNTIME_RESOURCE_PTY_DATA_MAX_BYTES, + ), + }; } else if (record.kind === 'subscription.closed') { assertExactKeys(record, 'subscription closed frame', [ 'kind', @@ -377,6 +410,7 @@ export function isSubscriptionFrameKind(value: unknown): value is SubscriptionFr value === 'subscription.session_delta' || value === 'subscription.session_event' || value === 'subscription.session_domain_changed' || + value === 'subscription.runtime_resource_pty_data' || value === 'subscription.agent_graph_changed' || value === 'subscription.closed' ); diff --git a/packages/runtime-host/src/protocol/skill-catalog.ts b/packages/runtime-host/src/protocol/skill-catalog.ts index 317f8271b3..83674a4a3e 100644 --- a/packages/runtime-host/src/protocol/skill-catalog.ts +++ b/packages/runtime-host/src/protocol/skill-catalog.ts @@ -1,4 +1,4 @@ -import { requireCount, requireExactRecord, requireRecord } from './codec.js'; +import { requireCount, requireEntityId, requireExactRecord, requireRecord } from './codec.js'; import { invalidProtocolFrame } from './errors.js'; import { defineOperation } from './operation-spec.js'; @@ -89,6 +89,21 @@ export interface SkillCatalogLocalContext { readonly projectRoot: string; } +export type SkillCatalogInvocableTarget = + | { readonly kind: 'session'; readonly sessionId: string } + | { + readonly kind: 'new_session'; + readonly context: SkillCatalogLocalContext; + readonly collaborationMode: 'agent' | 'plan'; + }; + +export interface SkillCatalogInvocableItem { + readonly ref: string; + readonly id: string; + readonly name: string; + readonly description: string; +} + export interface SkillCatalogGovernanceItem { readonly kind: SkillCatalogEntryKind; readonly ref: string; @@ -169,6 +184,31 @@ export type SkillCatalogQueryResult = readonly actualRevision: SkillCatalogRevision; }; +export type SkillCatalogInvocableQueryInput = + | { + readonly kind: 'start'; + readonly target: SkillCatalogInvocableTarget; + } + | { + readonly kind: 'continue'; + readonly target: SkillCatalogInvocableTarget; + readonly revision: SkillCatalogRevision; + readonly cursor: string; + }; + +export type SkillCatalogInvocableQueryResult = + | { + readonly kind: 'page'; + readonly revision: SkillCatalogRevision; + readonly items: readonly SkillCatalogInvocableItem[]; + readonly nextCursor: string | null; + } + | { + readonly kind: 'revision_changed'; + readonly expectedRevision: SkillCatalogRevision; + readonly actualRevision: SkillCatalogRevision; + }; + export type SkillCatalogMutation = | { readonly kind: 'create_starter' } | { @@ -279,6 +319,17 @@ export const SKILL_CATALOG_OPERATION_SPECS = { decodeInput: decodeQueryInput, decodeOutput: decodeQueryResult, }), + 'skill.catalog.invocable.query': defineOperation< + SkillCatalogInvocableQueryInput, + SkillCatalogInvocableQueryResult, + (typeof QUERY_ERRORS)[number] + >({ + mode: 'query', + availability: 'ready', + errors: QUERY_ERRORS, + decodeInput: decodeInvocableQueryInput, + decodeOutput: decodeInvocableQueryResult, + }), 'skill.catalog.mutate': defineOperation< SkillCatalogMutateInput, SkillCatalogMutateResult, @@ -303,6 +354,60 @@ export const SKILL_CATALOG_OPERATION_SPECS = { }), } as const; +function decodeInvocableQueryInput(value: unknown): SkillCatalogInvocableQueryInput { + const record = requireRecord(value, 'invocable skill catalog query input'); + if (record.kind === 'start') { + const start = requireExactRecord(record, 'invocable skill catalog start query', [ + 'kind', + 'target', + ]); + return { kind: 'start', target: invocableTarget(start.target) }; + } + if (record.kind === 'continue') { + const continuation = requireExactRecord(record, 'invocable skill catalog continuation query', [ + 'kind', + 'target', + 'revision', + 'cursor', + ]); + return { + kind: 'continue', + target: invocableTarget(continuation.target), + revision: sha256(continuation.revision, 'invocable skill catalog revision'), + cursor: utf8String(continuation.cursor, 'invocable skill catalog cursor', CURSOR_MAX_BYTES), + }; + } + throw invalidProtocolFrame('Invalid invocable skill catalog query kind'); +} + +function decodeInvocableQueryResult(value: unknown): SkillCatalogInvocableQueryResult { + const record = requireRecord(value, 'invocable skill catalog query result'); + if (record.kind === 'revision_changed') return revisionChanged(record); + const page = requireExactRecord(record, 'invocable skill catalog page result', [ + 'kind', + 'revision', + 'items', + 'nextCursor', + ]); + if (page.kind !== 'page' || !Array.isArray(page.items)) { + throw invalidProtocolFrame('Invalid invocable skill catalog page result'); + } + if (page.items.length > SKILL_CATALOG_PAGE_MAX_ITEMS) { + throw invalidProtocolFrame('Invocable skill catalog page exceeds item limit'); + } + const decoded: SkillCatalogInvocableQueryResult = { + kind: 'page', + revision: sha256(page.revision, 'invocable skill catalog revision'), + items: page.items.map(invocableItem), + nextCursor: + page.nextCursor === null + ? null + : utf8String(page.nextCursor, 'invocable skill catalog next cursor', CURSOR_MAX_BYTES), + }; + assertJsonByteLimit(decoded, SKILL_CATALOG_PAGE_MAX_BYTES, 'Invocable skill catalog page'); + return decoded; +} + function decodeQueryInput(value: unknown): SkillCatalogQueryInput { const record = requireRecord(value, 'skill catalog query input'); if (record.kind === 'start') { @@ -699,6 +804,52 @@ function localContext(value: unknown): SkillCatalogLocalContext { }; } +function invocableTarget(value: unknown): SkillCatalogInvocableTarget { + const record = requireRecord(value, 'invocable skill catalog target'); + if (record.kind === 'session') { + const session = requireExactRecord(record, 'invocable Session target', ['kind', 'sessionId']); + return { + kind: 'session', + sessionId: requireEntityId(session.sessionId, 'invocable Skill Session id'), + }; + } + if (record.kind === 'new_session') { + const fresh = requireExactRecord(record, 'invocable new Session target', [ + 'kind', + 'context', + 'collaborationMode', + ]); + if (fresh.collaborationMode !== 'agent' && fresh.collaborationMode !== 'plan') { + throw invalidProtocolFrame('Invalid invocable Skill collaboration mode'); + } + return { + kind: 'new_session', + context: localContext(fresh.context), + collaborationMode: fresh.collaborationMode, + }; + } + throw invalidProtocolFrame('Invalid invocable skill catalog target'); +} + +function invocableItem(value: unknown): SkillCatalogInvocableItem { + const record = requireExactRecord(value, 'invocable skill catalog item', [ + 'ref', + 'id', + 'name', + 'description', + ]); + return { + ref: utf8String(record.ref, 'invocable skill ref', SKILL_CATALOG_REF_MAX_BYTES), + id: utf8String(record.id, 'invocable skill id', SKILL_CATALOG_DISPLAY_ID_MAX_BYTES), + name: utf8String(record.name, 'invocable skill name', SKILL_CATALOG_NAME_MAX_BYTES), + description: utf8String( + record.description, + 'invocable skill description', + SKILL_CATALOG_DESCRIPTION_MAX_BYTES, + ), + }; +} + export function isSkillCatalogProjectRootLexicallyAbsolute( value: string, platform: NodeJS.Platform = process.platform, diff --git a/packages/runtime-host/src/protocol/turn.ts b/packages/runtime-host/src/protocol/turn.ts index e6e0f37bdf..31d9efad8d 100644 --- a/packages/runtime-host/src/protocol/turn.ts +++ b/packages/runtime-host/src/protocol/turn.ts @@ -9,6 +9,10 @@ import { isTurnOrchestrationSource, type TurnOrchestration, } from '@maka/core/orchestration'; +import { + decodeSkillInvocationResult, + type SkillInvocationResult, +} from '@maka/core/skill-invocation'; import { invalidProtocolFrame } from './errors.js'; import { assertExactKeys, @@ -28,8 +32,20 @@ export interface TurnStartInput { content: MessageContent; skillIds?: string[]; turnOrchestration?: TurnOrchestration; + maxSteps?: number; } +export type TurnStartResult = + | { + kind: 'started'; + turn: TurnSnapshot; + skillInvocation: SkillInvocationResult; + } + | { + kind: 'blocked'; + skillInvocation: SkillInvocationResult; + }; + export type { MessageContent }; export const TURN_MESSAGE_TEXT_MAX_BYTES = 48 * 1024; @@ -153,7 +169,15 @@ export const TURN_OPERATION_SPECS = { 'internal_failure', ] as const, decodeInput: decodeTurnStartInput, - decodeOutput: decodeTurnSnapshot, + decodeOutput: decodeTurnStartResult, + assertOutputForInput: (input, output) => { + if ( + output.kind === 'started' && + (input.sessionId !== output.turn.sessionId || input.turnId !== output.turn.turnId) + ) { + throw invalidProtocolFrame('Turn start changed operation identity'); + } + }, }), 'turn.query': defineOperation({ mode: 'query', @@ -268,7 +292,7 @@ function decodeTurnStartInput(value: unknown): TurnStartInput { value, 'turn.start input', ['sessionId', 'turnId', 'content'], - ['skillIds', 'turnOrchestration'], + ['skillIds', 'turnOrchestration', 'maxSteps'], ); const skillIds = decodeSkillIds(record.skillIds); return { @@ -279,9 +303,18 @@ function decodeTurnStartInput(value: unknown): TurnStartInput { ...(record.turnOrchestration !== undefined ? { turnOrchestration: decodeTurnOrchestration(record.turnOrchestration) } : {}), + ...(record.maxSteps !== undefined + ? { maxSteps: requirePositiveSafeInteger(record.maxSteps, 'maxSteps') } + : {}), }; } +function requirePositiveSafeInteger(value: unknown, label: string): number { + const decoded = requireCount(value, label); + if (decoded === 0) throw invalidProtocolFrame(`Invalid ${label}`); + return decoded; +} + function decodeSkillIds(value: unknown): string[] { if (value === undefined) return []; if ( @@ -520,6 +553,28 @@ export function decodeTurnResumeStartResult(value: unknown): TurnResumeStartResu throw invalidProtocolFrame('Invalid Turn resume start result'); } +export function decodeTurnStartResult(value: unknown): TurnStartResult { + const record = requireRecord(value, 'Turn start result'); + let skillInvocation: SkillInvocationResult; + try { + skillInvocation = decodeSkillInvocationResult(record.skillInvocation); + } catch { + throw invalidProtocolFrame('Invalid Turn start Skill invocation result'); + } + if (record.kind === 'started') { + assertExactKeys(record, 'started Turn result', ['kind', 'turn', 'skillInvocation']); + return { kind: 'started', turn: decodeTurnSnapshot(record.turn), skillInvocation }; + } + if (record.kind === 'blocked') { + assertExactKeys(record, 'blocked Turn result', ['kind', 'skillInvocation']); + if (skillInvocation.loaded.length !== 0 || skillInvocation.failed.length === 0) { + throw invalidProtocolFrame('Blocked Turn requires only failed Skill invocations'); + } + return { kind: 'blocked', skillInvocation }; + } + throw invalidProtocolFrame('Invalid Turn start result'); +} + function requirePositiveCount(value: unknown, label: string): number { const count = requireCount(value, label); if (count === 0) throw invalidProtocolFrame(`Invalid ${label}`); diff --git a/packages/runtime-host/src/server/agent-settings-tools.ts b/packages/runtime-host/src/server/agent-settings-tools.ts new file mode 100644 index 0000000000..77cdf56ac0 --- /dev/null +++ b/packages/runtime-host/src/server/agent-settings-tools.ts @@ -0,0 +1,221 @@ +import type { + AgentRuntimeSettingsPatch, + MutateRuntimePolicyInput, + RuntimePolicy, + RuntimePolicySnapshot, +} from '@maka/core/runtime-policy'; +import type { MakaTool } from '@maka/runtime'; +import { z } from 'zod'; + +const personalizationPatchSchema = z + .object({ + displayName: z.string().max(256).optional(), + assistantTone: z.string().max(4_096).optional(), + }) + .strict(); +const memoryPatchSchema = z + .object({ enabled: z.boolean().optional(), agentReadEnabled: z.boolean().optional() }) + .strict(); +const enabledPatchSchema = z.object({ enabled: z.boolean().optional() }).strict(); +const privacyPatchSchema = z.object({ incognitoActive: z.boolean().optional() }).strict(); + +const agentSettingsPatchSchema = z + .object({ + personalization: personalizationPatchSchema.optional(), + memory: memoryPatchSchema.optional(), + workspaceInstructions: enabledPatchSchema.optional(), + privacy: privacyPatchSchema.optional(), + webSearch: enabledPatchSchema.optional(), + }) + .strict(); + +type AgentSettingsPatch = z.infer; + +export interface HostAgentSettingsToolAuthority { + read(): Promise; + mutate(input: MutateRuntimePolicyInput): Promise< + | { readonly kind: 'committed'; readonly revision: number } + | { + readonly kind: 'revision_conflict'; + readonly expectedRevision: number; + readonly actualRevision: number; + } + >; +} + +export interface AgentSettingsSnapshot { + readonly personalization: RuntimePolicy['personalization']; + readonly memory: RuntimePolicy['memory']; + readonly workspaceInstructions: RuntimePolicy['workspaceInstructions']; + readonly privacy: RuntimePolicy['privacy']; + readonly webSearch: Pick; +} + +type AgentSettingsUpdateResult = + | { + readonly kind: 'maka_settings_update'; + readonly ok: true; + readonly applied: boolean; + readonly reason?: 'cancelled'; + readonly changes?: readonly string[]; + readonly message: string; + readonly settings: AgentSettingsSnapshot; + } + | { + readonly kind: 'maka_settings_update'; + readonly ok: false; + readonly applied: false; + readonly reason: 'confirmation_unavailable'; + readonly message: string; + readonly settings: AgentSettingsSnapshot; + }; + +/** Build the model-visible settings surface over the Host's canonical Runtime Policy. */ +export function buildHostAgentSettingsTools( + authority: HostAgentSettingsToolAuthority, +): readonly MakaTool[] { + const getTool: MakaTool, AgentSettingsSnapshot> = { + name: 'MakaSettingsGet', + displayName: 'Read Maka settings', + description: + 'Read the safe, non-secret Runtime settings that Maka may help configure. ' + + 'This never returns credentials, network proxy details, native client settings, or Bot settings.', + parameters: z.object({}).strict(), + categoryHint: 'read', + recoveryMode: 'replay_safe', + impl: async () => projectSettings((await authority.read()).policy), + }; + const updateTool: MakaTool = { + name: 'MakaSettingsUpdate', + displayName: 'Update Maka settings', + description: + 'Update the safe, non-secret Runtime settings owned by the Runtime Host. ' + + 'Use only when the user explicitly asks to change Maka itself. Every effective change requires confirmation.', + parameters: agentSettingsPatchSchema, + categoryHint: 'custom_tool', + recoveryMode: 'never_auto_retry', + executionSemantics: 'exclusive_step', + impl: async (patch, context) => { + const initial = await authority.read(); + const changes = describeChanges(initial.policy, patch); + if (changes.length === 0) return unchanged(initial.policy); + if (!context.askUserQuestion) { + return { + kind: 'maka_settings_update', + ok: false, + applied: false, + reason: 'confirmation_unavailable', + message: 'Maka settings were not changed because confirmation is unavailable.', + settings: projectSettings(initial.policy), + }; + } + const answer = await context.askUserQuestion([ + { + question: `Apply these Maka setting changes?\n${changes.map((change) => `• ${change}`).join('\n')}`, + options: [ + { label: 'Apply changes', description: 'Persist the listed Maka settings now.' }, + { label: 'Cancel', description: 'Leave every setting unchanged.' }, + ], + }, + ]); + if (answer.answers[0]?.answer !== 'Apply changes') { + const current = await authority.read(); + return { + kind: 'maka_settings_update', + ok: true, + applied: false, + reason: 'cancelled', + message: 'Maka settings were not changed.', + settings: projectSettings(current.policy), + }; + } + for (let attempt = 0; attempt < 3; attempt += 1) { + const current = attempt === 0 ? initial : await authority.read(); + if (describeChanges(current.policy, patch).length === 0) return unchanged(current.policy); + const result = await authority.mutate({ + expectedRevision: current.revision, + operation: { kind: 'patch_agent_settings', value: patch }, + }); + if (result.kind !== 'committed') continue; + const updated = await authority.read(); + return { + kind: 'maka_settings_update', + ok: true, + applied: true, + changes, + message: `Updated ${changes.length} Maka setting${changes.length === 1 ? '' : 's'}.`, + settings: projectSettings(updated.policy), + }; + } + throw new Error('Runtime Policy kept changing while Maka settings were updated'); + }, + }; + return [getTool, updateTool]; +} + +function unchanged(policy: RuntimePolicy): AgentSettingsUpdateResult { + return { + kind: 'maka_settings_update', + ok: true, + applied: false, + message: 'The requested Maka settings already have those values.', + settings: projectSettings(policy), + }; +} + +function projectSettings(policy: RuntimePolicy): AgentSettingsSnapshot { + return { + personalization: { ...policy.personalization }, + memory: { ...policy.memory }, + workspaceInstructions: { ...policy.workspaceInstructions }, + privacy: { ...policy.privacy }, + webSearch: { enabled: policy.webSearch.enabled }, + }; +} + +function describeChanges(policy: RuntimePolicy, patch: AgentRuntimeSettingsPatch): string[] { + const changes: string[] = []; + compare( + changes, + 'Display name', + policy.personalization.displayName, + patch.personalization?.displayName, + ); + compare( + changes, + 'Assistant tone', + policy.personalization.assistantTone, + patch.personalization?.assistantTone, + ); + compare(changes, 'Memory', policy.memory.enabled, patch.memory?.enabled); + compare( + changes, + 'Agent memory access', + policy.memory.agentReadEnabled, + patch.memory?.agentReadEnabled, + ); + compare( + changes, + 'Workspace instructions', + policy.workspaceInstructions.enabled, + patch.workspaceInstructions?.enabled, + ); + compare( + changes, + 'Incognito mode', + policy.privacy.incognitoActive, + patch.privacy?.incognitoActive, + ); + compare(changes, 'Web search', policy.webSearch.enabled, patch.webSearch?.enabled); + return changes; +} + +function compare( + changes: string[], + label: string, + current: string | boolean, + next: string | boolean | undefined, +): void { + if (next !== undefined && next !== current) + changes.push(`${label}: ${String(current)} → ${String(next)}`); +} diff --git a/packages/runtime-host/src/server/bootstrap-runtime-policy.ts b/packages/runtime-host/src/server/bootstrap-runtime-policy.ts new file mode 100644 index 0000000000..5b7d7f2648 --- /dev/null +++ b/packages/runtime-host/src/server/bootstrap-runtime-policy.ts @@ -0,0 +1,239 @@ +import { randomUUID } from 'node:crypto'; +import { readFile, rename, rm, writeFile } from 'node:fs/promises'; +import { join } from 'node:path'; +import { + OPENCODE_FREE_DEFAULT_ENABLED_MODELS, + OPENCODE_FREE_DEFAULT_MODEL, + type ProviderType, +} from '@maka/core/llm-connections'; +import type { ConnectionCatalogEntry } from '@maka/core/runtime-policy'; +import type { RuntimePolicyStoresWriter } from '@maka/storage/runtime-policy-stores'; + +const JOURNAL_FILE = '.runtime-host-bootstrap.json'; +interface BootstrapEnvironment { + readonly ANTHROPIC_API_KEY?: string; + readonly OPENAI_API_KEY?: string; +} + +interface BootstrapSeed { + readonly slug: string; + readonly name: string; + readonly providerType: ProviderType; + readonly enabledModelIds: readonly string[]; + readonly secret?: string; +} + +interface BootstrapJournal { + readonly version: 1; + readonly state: 'initializing'; +} + +/** Establishes a usable first target before Runtime Host accepts clients. */ +export async function ensureBootstrapRuntimePolicy(input: { + readonly workspaceRoot: string; + readonly stores: RuntimePolicyStoresWriter; + readonly environment?: BootstrapEnvironment; + readonly onDeferredError?: (error: unknown) => void; +}): Promise { + const journalPath = join(input.workspaceRoot, JOURNAL_FILE); + const resuming = await readJournal(journalPath); + const initialCatalog = await input.stores.connectionCatalog.getSnapshot(); + if (!resuming) { + if (initialCatalog.connections.length > 0) return; + await writeJournal(journalPath); + } + + const seeds = bootstrapSeeds(input.environment ?? process.env); + const { connection: free } = await ensureConnection(input.stores, seeds[0]!); + await setDefaultIfMissing(input.stores, free); + await rm(journalPath, { force: true }); + + try { + let preferred = free; + for (const seed of seeds.slice(1)) { + const ensured = await ensureConnection(input.stores, seed); + const connection = ensured.connection; + if (seed.secret) { + try { + await ensureCredential(input.stores, connection, seed.secret); + } catch (error) { + if (ensured.created) await removeFailedBootstrapConnection(input.stores, connection); + throw error; + } + } + preferred = connection; + } + await replaceBootstrapDefault(input.stores, free, preferred); + } catch (error) { + input.onDeferredError?.(error); + } +} + +function bootstrapSeeds(environment: BootstrapEnvironment): readonly BootstrapSeed[] { + const seeds: BootstrapSeed[] = [ + { + slug: 'opencode-free', + name: 'OpenCode Free', + providerType: 'opencode-free', + enabledModelIds: OPENCODE_FREE_DEFAULT_ENABLED_MODELS, + }, + ]; + const anthropic = environment.ANTHROPIC_API_KEY?.trim(); + const openai = environment.OPENAI_API_KEY?.trim(); + if (anthropic) { + seeds.push({ + slug: 'env-anthropic', + name: 'Anthropic (env)', + providerType: 'anthropic', + enabledModelIds: ['claude-sonnet-4-5-20250929'], + secret: anthropic, + }); + } else if (openai) { + seeds.push({ + slug: 'env-openai', + name: 'OpenAI (env)', + providerType: 'openai', + enabledModelIds: ['gpt-4o-mini'], + secret: openai, + }); + } + return seeds; +} + +async function ensureConnection( + stores: RuntimePolicyStoresWriter, + seed: BootstrapSeed, +): Promise<{ readonly connection: ConnectionCatalogEntry; readonly created: boolean }> { + for (let attempt = 0; attempt < 3; attempt += 1) { + const catalog = await stores.connectionCatalog.getSnapshot(); + const existing = catalog.connections.find(({ slug }) => slug === seed.slug); + if (existing) { + if (existing.providerType !== seed.providerType) { + throw new Error(`Bootstrap Connection slug conflict: ${seed.slug}`); + } + return { connection: existing, created: false }; + } + const created = await stores.connectionCatalog.create({ + expectedCatalogRevision: catalog.revision, + connection: { + slug: seed.slug, + name: seed.name, + providerType: seed.providerType, + enabled: true, + enabledModelIds: seed.enabledModelIds, + }, + }); + if (created.kind === 'committed') { + const connection = created.snapshot.connections.find(({ slug }) => slug === seed.slug); + if (!connection) throw new Error('Bootstrap commit omitted its Connection'); + return { connection, created: true }; + } + } + throw new Error(`Bootstrap Connection could not be created: ${seed.slug}`); +} + +async function removeFailedBootstrapConnection( + stores: RuntimePolicyStoresWriter, + connection: ConnectionCatalogEntry, +): Promise { + const removed = await stores.connectionCatalog.remove({ + expected: { connectionId: connection.connectionId, revision: connection.revision }, + }); + if (removed.kind !== 'committed') { + throw new Error(`Failed Bootstrap Connection could not be removed: ${removed.kind}`); + } +} + +async function ensureCredential( + stores: RuntimePolicyStoresWriter, + connection: ConnectionCatalogEntry, + secret: string, +): Promise { + const locator = { + scope: 'connection' as const, + connectionId: connection.connectionId, + kind: 'api_key' as const, + }; + const current = await stores.credentialVault.getStatus(locator); + if (current.kind === 'connection_not_found') { + throw new Error('Bootstrap credential refers to a missing Connection'); + } + if (current.status.configured) return; + const committed = await stores.credentialVault.set({ locator, expected: null, secret }); + if (committed.kind !== 'committed') { + throw new Error(`Bootstrap credential could not be stored: ${committed.kind}`); + } +} + +async function setDefaultIfMissing( + stores: RuntimePolicyStoresWriter, + connection: ConnectionCatalogEntry, +): Promise { + const catalog = await stores.connectionCatalog.getSnapshot(); + if (catalog.defaultTarget !== null) return; + const committed = await stores.connectionCatalog.setDefaultTarget({ + expectedCatalogRevision: catalog.revision, + target: { + connectionId: connection.connectionId, + modelId: OPENCODE_FREE_DEFAULT_MODEL, + }, + }); + if (committed.kind !== 'committed') { + throw new Error(`Bootstrap default target could not be stored: ${committed.kind}`); + } +} + +async function replaceBootstrapDefault( + stores: RuntimePolicyStoresWriter, + free: ConnectionCatalogEntry, + preferred: ConnectionCatalogEntry, +): Promise { + if (preferred.connectionId === free.connectionId || !preferred.enabled) return; + const catalog = await stores.connectionCatalog.getSnapshot(); + const current = catalog.defaultTarget; + if ( + current !== null && + (current.connectionId !== free.connectionId || current.modelId !== OPENCODE_FREE_DEFAULT_MODEL) + ) { + return; + } + const modelId = preferred.enabledModelIds[0]; + if (!modelId) return; + const committed = await stores.connectionCatalog.setDefaultTarget({ + expectedCatalogRevision: catalog.revision, + target: { connectionId: preferred.connectionId, modelId }, + }); + if (committed.kind !== 'committed') { + throw new Error(`Bootstrap preferred target could not be stored: ${committed.kind}`); + } +} + +async function readJournal(path: string): Promise { + let contents: string; + try { + contents = await readFile(path, 'utf8'); + } catch (error) { + if ((error as { code?: string }).code === 'ENOENT') return null; + throw error; + } + const value = JSON.parse(contents) as Partial; + if (value.version !== 1 || value.state !== 'initializing') { + throw new Error('Invalid Runtime Host bootstrap journal'); + } + return { version: 1, state: 'initializing' }; +} + +async function writeJournal(path: string): Promise { + const temporaryPath = `${path}.${randomUUID()}.tmp`; + try { + await writeFile( + temporaryPath, + `${JSON.stringify({ version: 1, state: 'initializing' } satisfies BootstrapJournal)}\n`, + { encoding: 'utf8', flag: 'wx' }, + ); + await rename(temporaryPath, path); + } catch (error) { + await rm(temporaryPath, { force: true }); + throw error; + } +} diff --git a/packages/runtime-host/src/server/candidate.ts b/packages/runtime-host/src/server/candidate.ts index 12493025b4..05e03686b7 100644 --- a/packages/runtime-host/src/server/candidate.ts +++ b/packages/runtime-host/src/server/candidate.ts @@ -7,6 +7,7 @@ import { RuntimeHostKernel } from './host-kernel.js'; export interface RuntimeHostCandidateOptions { rootPath: string; expectedRootId: string; + legacyConfigurationRoot?: string; idleGraceMs?: number; handshakeTimeoutMs?: number; } diff --git a/packages/runtime-host/src/server/configuration-change-service.ts b/packages/runtime-host/src/server/configuration-change-service.ts new file mode 100644 index 0000000000..a989ef0e5c --- /dev/null +++ b/packages/runtime-host/src/server/configuration-change-service.ts @@ -0,0 +1,39 @@ +import type { ConfigurationChangedFrame } from '../protocol/index.js'; + +export interface ConfigurationChangeConnection { + close(): void; +} + +interface ConfigurationChangeSink { + send(frame: ConfigurationChangedFrame): Promise; +} + +export class HostConfigurationChangeService { + readonly #connections = new Map(); + #revision = 0; + + attachConnection( + connectionId: string, + sink: ConfigurationChangeSink, + ): ConfigurationChangeConnection { + this.#connections.set(connectionId, sink); + return { + close: () => { + if (this.#connections.get(connectionId) === sink) this.#connections.delete(connectionId); + }, + }; + } + + publish(): void { + this.#revision += 1; + const frame: ConfigurationChangedFrame = { + kind: 'configuration.changed', + revision: this.#revision, + }; + for (const [connectionId, sink] of this.#connections) { + void sink.send(frame).catch(() => { + if (this.#connections.get(connectionId) === sink) this.#connections.delete(connectionId); + }); + } + } +} diff --git a/packages/runtime-host/src/server/connection-effect-coordinator.ts b/packages/runtime-host/src/server/connection-effect-coordinator.ts index 994d425106..d3eec86abe 100644 --- a/packages/runtime-host/src/server/connection-effect-coordinator.ts +++ b/packages/runtime-host/src/server/connection-effect-coordinator.ts @@ -4,6 +4,11 @@ import type { ConnectionTestErrorClass, ConnectionTestSummary, } from '@maka/core/runtime-policy'; +import { + PROVIDER_DEFAULTS, + deriveConnectionSlug, + providerAuthSupportsApiKey, +} from '@maka/core/llm-connections'; import { createConnectionEffectFetchTransport, isOAuthSubscriptionProvider, @@ -30,6 +35,9 @@ import type { ConnectionEffectRejectionReason, ConnectionModelFetchInput, ConnectionModelFetchResult, + ConnectionOnboardingVerifyInput, + ConnectionOnboardingSaveInput, + ConnectionOnboardingSaveResult, ConnectionTestProjection, ConnectionTestRunInput, ConnectionTestRunResult, @@ -69,6 +77,8 @@ export interface HostConnectionEffectCoordinatorOptions { /** Runs provider I/O outside Storage lanes and conditionally commits canonical results. */ export class HostConnectionEffectCoordinator { readonly handlers: ConnectionEffectOperationHandlerMap = { + 'connection.onboarding.save': (input) => this.#saveOnboarding(input), + 'connection.onboarding.verify': (input) => this.#verifyOnboarding(input), 'connection.models.fetch': (input) => this.#fetchModels(input), 'connection.test.run': (input) => this.#testConnection(input), }; @@ -150,6 +160,108 @@ export class HostConnectionEffectCoordinator { }); } + #verifyOnboarding( + input: ConnectionOnboardingVerifyInput, + ): Promise> { + const slug = deriveConnectionSlug(input.providerType); + return this.#admit(slug, 'connection.onboarding.verify', async () => { + const prepared = await this.#discoverOnboarding(input); + return prepared.kind === 'ready' ? { kind: 'verified', models: prepared.models } : prepared; + }); + } + + #saveOnboarding( + input: ConnectionOnboardingSaveInput, + ): Promise> { + const slug = deriveConnectionSlug(input.providerType); + return this.#admit(slug, 'connection.onboarding.save', async () => { + const prepared = await this.#discoverOnboarding(input); + if (prepared.kind !== 'ready') return prepared; + const available = new Set(prepared.models.map(({ id }) => id)); + if (input.enabledModelIds.some((modelId) => !available.has(modelId))) { + return { kind: 'rejected', reason: 'model_unavailable' }; + } + return this.#activation.runMutation(async () => this.#commitOnboarding(input, prepared)); + }); + } + + async #discoverOnboarding(input: ConnectionOnboardingVerifyInput): Promise { + if (!providerAuthSupportsApiKey(input.providerType)) { + return { kind: 'rejected', reason: 'provider_unsupported' }; + } + const slug = deriveConnectionSlug(input.providerType); + const catalog = await this.#stores.connectionCatalog.getSnapshot(); + const candidate = catalog.connections.find((connection) => connection.slug === slug); + if (candidate && candidate.providerType !== input.providerType) { + return { kind: 'rejected', reason: 'slug_conflict' }; + } + const supplied = input.apiKey?.trim() ?? ''; + const stored = candidate + ? await this.#stores.operations.exportCredentialMaterial({ + scope: 'connection', + connectionId: candidate.connectionId, + kind: 'api_key', + }) + : null; + const secret = supplied || stored?.secret || ''; + if (PROVIDER_DEFAULTS[input.providerType].authKind === 'api_key' && secret.length === 0) { + return { kind: 'rejected', reason: 'credential_not_configured' }; + } + const proxy = await this.#stores.operations.resolveNetworkProxyExecution(); + if (proxy.kind !== 'ready') return { kind: 'failed', errorClass: 'network' }; + const transport = this.#createTransport( + toRuntimePolicyProxy(proxy.networkProxy, proxy.secretMaterial.networkProxy?.secret), + ); + try { + const effect = await this.#runModelDiscovery( + candidate ?? transientConnection(input.providerType), + secret, + { fetch: transport.fetch }, + ); + if (!effect.ok || effect.models.length === 0) { + return { + kind: 'failed', + errorClass: effect.ok ? 'invalid_response' : effect.error.kind, + }; + } + return { + kind: 'ready', + suppliedSecret: supplied, + models: effect.models, + }; + } finally { + await transport.close(); + } + } + + async #commitOnboarding( + input: ConnectionOnboardingSaveInput, + prepared: Extract, + ): Promise { + try { + const committed = await this.#stores.operations.commitConnectionOnboarding({ + providerType: input.providerType, + suppliedSecret: prepared.suppliedSecret || null, + enabledModelIds: input.enabledModelIds, + discovery: { + models: prepared.models, + source: 'fetched', + fetchedAt: this.#now(), + }, + }); + if (committed.kind === 'slug_conflict') { + return { kind: 'rejected', reason: 'slug_conflict' }; + } + if (committed.changed) this.#onCommittedMutation(); + return { kind: 'saved' }; + } catch (error) { + if (error instanceof RuntimePolicyStoreError && error.code === 'commit_outcome_unknown') { + this.#onCommittedMutation(); + } + throw error; + } + } + #testConnection(input: ConnectionTestRunInput): Promise> { return this.#admit(input.connectionId, 'connection.test.run', async () => { const prepared = await this.#stores.operations.beginConnectionTest( @@ -187,7 +299,13 @@ export class HostConnectionEffectCoordinator { }); } - #admit( + #admit< + K extends + | 'connection.models.fetch' + | 'connection.test.run' + | 'connection.onboarding.verify' + | 'connection.onboarding.save', + >( connectionId: string, operation: K, run: () => Promise, { ok: true }>['result']>, @@ -281,6 +399,18 @@ export class HostConnectionEffectCoordinator { type BeginModelFetchReady = Extract; type BeginConnectionTestReady = Extract; +type OnboardingDiscovery = + | { + readonly kind: 'ready'; + readonly suppliedSecret: string; + readonly models: ConnectionModelDiscoveryResult['models']; + } + | { + readonly kind: 'rejected'; + readonly reason: 'provider_unsupported' | 'credential_not_configured' | 'slug_conflict'; + } + | { readonly kind: 'failed'; readonly errorClass: ConnectionEffectFailureClass }; + function preparationResult( prepared: Exclude, ): Extract; @@ -352,9 +482,13 @@ function committedConnectionBasis( return { connectionId, revision: connection.revision }; } -function storeFailure( - error: unknown, -): OperationOutcome { +function storeFailure< + K extends + | 'connection.models.fetch' + | 'connection.test.run' + | 'connection.onboarding.verify' + | 'connection.onboarding.save', +>(error: unknown): OperationOutcome { if (!(error instanceof RuntimePolicyStoreError)) throw error; switch (error.code) { case 'commit_outcome_unknown': @@ -373,9 +507,35 @@ function storeFailure( +function operationFailure< + K extends + | 'connection.models.fetch' + | 'connection.test.run' + | 'connection.onboarding.verify' + | 'connection.onboarding.save', +>( code: 'commit_outcome_unknown' | 'persistence_failed' | 'invalid_request', message: string, ): OperationOutcome { return { ok: false, error: { code, message } } as OperationOutcome; } + +function transientConnection( + providerType: ConnectionOnboardingVerifyInput['providerType'], +): ConnectionCatalogEntry { + const definition = PROVIDER_DEFAULTS[providerType]; + const models = definition.fallbackModels.map((id) => ({ id })); + return { + connectionId: '00000000-0000-4000-8000-000000000000', + revision: 0, + slug: deriveConnectionSlug(providerType), + name: definition.label, + providerType, + ...(definition.baseUrl ? { baseUrl: definition.baseUrl } : {}), + enabled: true, + enabledModelIds: models.map(({ id }) => id), + models, + modelSource: 'fallback', + modelsFetchedAt: 0, + }; +} diff --git a/packages/runtime-host/src/server/connection-session.ts b/packages/runtime-host/src/server/connection-session.ts index df8108084d..e5935ff35f 100644 --- a/packages/runtime-host/src/server/connection-session.ts +++ b/packages/runtime-host/src/server/connection-session.ts @@ -23,6 +23,14 @@ import type { ClientCapabilityConnection, ClientCapabilityService, } from './client-capability-service.js'; +import type { + ConfigurationChangeConnection, + HostConfigurationChangeService, +} from './configuration-change-service.js'; +import type { + HostSessionCatalogChangeService, + SessionCatalogChangeConnection, +} from './session-catalog-change-service.js'; const MAX_IN_FLIGHT_REQUESTS = 64; @@ -40,6 +48,8 @@ export interface RuntimeHostConnectionSessionOptions { resolveHandlers(): OperationHandlerMap; resolveContinuity(): SessionContinuityService | undefined; resolveClientCapabilities?(): ClientCapabilityService | undefined; + resolveConfigurationChanges?(): HostConfigurationChangeService | undefined; + resolveSessionCatalogChanges?(): HostSessionCatalogChangeService | undefined; beginOperation(frame: RequestFrame): Promise; onTeardown(): void; } @@ -53,6 +63,8 @@ export class RuntimeHostConnectionSession { #continuity: SessionContinuityConnection | undefined; #clientCapabilityService: ClientCapabilityService | undefined; #clientCapabilities: ClientCapabilityConnection | undefined; + #configurationChanges: ConfigurationChangeConnection | undefined; + #sessionCatalogChanges: SessionCatalogChangeConnection | undefined; #inputClosed = false; #closed = false; @@ -62,6 +74,7 @@ export class RuntimeHostConnectionSession { } async run(): Promise { + this.attachGlobalChanges(); try { try { await this.#pumpInbound(); @@ -82,6 +95,8 @@ export class RuntimeHostConnectionSession { this.#inputClosed = true; this.#detachContinuity(); this.#detachClientCapabilities(); + this.#detachConfigurationChanges(); + this.#detachSessionCatalogChanges(); const outcome = await Promise.race([ Promise.allSettled([...this.#requests.values()]).then(() => 'drained' as const), this.#options.transport.closed.then(() => 'closed' as const), @@ -242,12 +257,58 @@ export class RuntimeHostConnectionSession { this.#clientCapabilityService = undefined; } + #attachConfigurationChanges(): void { + const service = this.#options.resolveConfigurationChanges?.(); + if (!service || this.#configurationChanges) return; + this.#configurationChanges = service.attachConnection(this.#options.connection.connectionId, { + send: (frame) => { + try { + return this.#writer.enqueue(frame).flushed; + } catch (error) { + return Promise.reject(error); + } + }, + }); + } + + attachGlobalChanges(): void { + if (this.#closed || this.#inputClosed) return; + this.#attachConfigurationChanges(); + this.#attachSessionCatalogChanges(); + } + + #detachConfigurationChanges(): void { + this.#configurationChanges?.close(); + this.#configurationChanges = undefined; + } + + #attachSessionCatalogChanges(): void { + const service = this.#options.resolveSessionCatalogChanges?.(); + if (!service || this.#sessionCatalogChanges) return; + this.#sessionCatalogChanges = service.attachConnection(this.#options.connection.connectionId, { + send: (frame) => { + try { + return this.#writer.enqueue(frame).flushed; + } catch (error) { + return Promise.reject(error); + } + }, + }); + } + + #detachSessionCatalogChanges(): void { + this.#sessionCatalogChanges?.close(); + this.#sessionCatalogChanges = undefined; + } + #teardown(): void { if (this.#closed) return; this.#closed = true; this.#inputClosed = true; this.#detachContinuity(); this.#detachClientCapabilities(); + this.#detachConfigurationChanges(); + this.#detachSessionCatalogChanges(); this.#writer.close(); this.#options.transport.destroy(); this.#options.onTeardown(); diff --git a/packages/runtime-host/src/server/execution-candidate.ts b/packages/runtime-host/src/server/execution-candidate.ts index 8b709cc7aa..1f9e41d222 100644 --- a/packages/runtime-host/src/server/execution-candidate.ts +++ b/packages/runtime-host/src/server/execution-candidate.ts @@ -5,7 +5,12 @@ import { import type { RuntimeHostCandidateOptions } from './candidate.js'; import type { VerifiedGitRuntimeInput } from '@maka/storage/managed-workspace-owner'; import { resolveBundledGitRuntime } from './bundled-git-runtime.js'; -import { createExecutionRuntimeHostComposition } from './execution-composition.js'; +import { + createExecutionRuntimeHostComposition, + type CreateExecutionRuntimeHostCompositionOptions, + type ExecutionRuntimeHostComposition, +} from './execution-composition.js'; +import type { RuntimeHostCompositionContext } from './host-kernel.js'; import { RuntimeHostKernel } from './host-kernel.js'; export type ExecutionRuntimeHostCandidateResult = @@ -18,8 +23,16 @@ export interface ExecutionRuntimeHostCandidateOptions extends RuntimeHostCandida readonly bundledGitResourcesRoot?: string; } +export interface ExecutionRuntimeHostCandidateDependencies { + readonly createComposition?: ( + context: RuntimeHostCompositionContext, + options: CreateExecutionRuntimeHostCompositionOptions, + ) => Promise; +} + export async function startExecutionRuntimeHostCandidate( options: ExecutionRuntimeHostCandidateOptions, + dependencies: ExecutionRuntimeHostCandidateDependencies = {}, ): Promise { if (options.managedWorkspaceGitRuntime && options.bundledGitResourcesRoot) { throw new Error('Managed workspace Git runtime must have exactly one authority'); @@ -39,8 +52,11 @@ export async function startExecutionRuntimeHostCandidate( idleGraceMs: options.idleGraceMs, handshakeTimeoutMs: options.handshakeTimeoutMs, compositionFactory: (context) => - createExecutionRuntimeHostComposition(context, { + (dependencies.createComposition ?? createExecutionRuntimeHostComposition)(context, { ...(managedWorkspaceGitRuntime ? { managedWorkspaceGitRuntime } : {}), + ...(options.legacyConfigurationRoot + ? { legacyConfigurationRoot: options.legacyConfigurationRoot } + : {}), }), }); return { kind: 'winner', host }; diff --git a/packages/runtime-host/src/server/execution-composition.ts b/packages/runtime-host/src/server/execution-composition.ts index f2e733f0f7..8b7baa1517 100644 --- a/packages/runtime-host/src/server/execution-composition.ts +++ b/packages/runtime-host/src/server/execution-composition.ts @@ -1,4 +1,6 @@ import { createHash, randomUUID } from 'node:crypto'; +import { generalizedErrorMessage } from '@maka/core/redaction'; +import { emptyPlanSessionState } from '@maka/core/plan'; import { isDeepResearchSession } from '@maka/core/session'; import { filterModelVisibleTaskLedgerTasks } from '@maka/core/task-ledger'; import { @@ -6,8 +8,10 @@ import { AgentGraphSupervisorWakeCoordinator, agentGraphIdForRootSession, BackendRegistry, + buildToolsForAgentDefinition, buildHostCapabilitiesFromBinding, createLocalContinuationSafetyInspector, + createConfiguredSubagentCatalog, createBuiltinSandboxManager, createFilesystemWorkerLaunchSpecProvider, FakeBackend, @@ -23,6 +27,7 @@ import { shouldWakeAgentSwarmSupervisor, SessionActivityRegistry, ShellRunProcessManager, + type BackendFactory, type MakaTool, type RuntimeHostedRootAuthority, } from '@maka/runtime'; @@ -69,6 +74,8 @@ import { HostAgentGraphCoordinator } from './agent-graph-coordinator.js'; import { HostAutomationCoordinator } from './automation-coordinator.js'; import { recoverClientCapabilityOutcomes } from './client-capability-recovery.js'; import { HostConnectionEffectCoordinator } from './connection-effect-coordinator.js'; +import { HostConfigurationChangeService } from './configuration-change-service.js'; +import { HostSessionCatalogChangeService } from './session-catalog-change-service.js'; import { HostConfigurationCoordinator } from './configuration-coordinator.js'; import { HostClientCapabilityCoordinator } from './client-capability-coordinator.js'; import { HostDeepResearchCoordinator } from './deep-research-coordinator.js'; @@ -87,13 +94,15 @@ import { HostExecutionInspectCoordinator } from './execution-inspect-coordinator import { HostGoalCoordinator } from './goal-coordinator.js'; import type { RuntimeHostComposition, RuntimeHostCompositionContext } from './host-kernel.js'; import { HostInteractionCoordinator } from './interaction-coordinator.js'; +import { migrateLegacyRuntimePolicy } from './legacy-runtime-policy-migration.js'; +import { ensureBootstrapRuntimePolicy } from './bootstrap-runtime-policy.js'; import { HostMemoryCoordinator } from './memory-coordinator.js'; import { HostMemoryExtractionCoordinator } from './memory-extraction-coordinator.js'; import { MemoryExtractionSessionLane } from './memory-extraction-session-lane.js'; import { type HostMessageRootPort, HostMessageCoordinator } from './message-coordinator.js'; import { HostNetworkProxyCoordinator } from './network-proxy-coordinator.js'; import { HostOAuthExecutionAuthority } from './oauth-execution-authority.js'; -import { HostOAuthCoordinator } from './oauth-coordinator.js'; +import { HostOAuthCoordinator, type HostOAuthCoordinatorInput } from './oauth-coordinator.js'; import { HostPlanCoordinator } from './plan-coordinator.js'; import type { DomainOperationHandlerMap } from './operation-dispatcher.js'; import { RootAdmissionOwner } from './root-admission-owner.js'; @@ -132,6 +141,17 @@ export interface ExecutionRuntimeHostComposition extends RuntimeHostComposition export interface CreateExecutionRuntimeHostCompositionOptions { readonly managedWorkspaceGitRuntime?: VerifiedGitRuntimeInput; + readonly legacyConfigurationRoot?: string; + readonly bootstrapRuntimePolicy?: boolean; + readonly skillHomeDirectory?: string; +} + +export interface ExecutionRuntimeHostCompositionDependencies { + readonly primaryBackendFactory?: BackendFactory; + readonly oauthAuthorization?: Pick< + HostOAuthCoordinatorInput, + 'startCodexAuthorization' | 'pollCodexAuthorization' | 'exchangeCodexCode' + >; } export function runtimeHostFilesystemWorkerRuntime(versions: { @@ -143,6 +163,7 @@ export function runtimeHostFilesystemWorkerRuntime(versions: { export async function createExecutionRuntimeHostComposition( context: RuntimeHostCompositionContext, options: CreateExecutionRuntimeHostCompositionOptions = {}, + dependencies: ExecutionRuntimeHostCompositionDependencies = {}, ): Promise { const stores = await openInteractiveExecutionStoresForWrite(context.owner.lease); let graphControlStore: ReturnType | undefined; @@ -173,6 +194,23 @@ export async function createExecutionRuntimeHostComposition( const runtimePolicyStores = await openInteractiveRuntimePolicyStoresForWrite( context.owner.lease, ); + await migrateLegacyRuntimePolicy({ + workspaceRoot: context.owner.capability.canonicalPath, + ...(options.legacyConfigurationRoot + ? { legacyConfigurationRoot: options.legacyConfigurationRoot } + : {}), + stores: runtimePolicyStores, + }); + if (options.bootstrapRuntimePolicy !== false) { + await ensureBootstrapRuntimePolicy({ + workspaceRoot: context.owner.capability.canonicalPath, + stores: runtimePolicyStores, + onDeferredError: (error) => + console.error( + `[runtime-host] optional bootstrap target could not be configured: ${generalizedErrorMessage(error)}`, + ), + }); + } const oauthCredentials = new HostOAuthExecutionAuthority(runtimePolicyStores); const openedAutomationStore = await openInteractiveAutomationAuthorityForWrite( context.owner.lease, @@ -204,9 +242,15 @@ export async function createExecutionRuntimeHostComposition( const backends = new BackendRegistry(); backends.register('fake', (backendContext) => new FakeBackend(backendContext)); const runtimePolicyActivation = new RuntimePolicyActivationGate(); + const runtimePolicy = new HostRuntimePolicyCoordinator( + runtimePolicyStores, + runtimePolicyActivation, + applyRuntimePolicyMutationEffects, + ); const sessionAdmission = new SessionAdmissionGate(); const memoryExtractionLane = new MemoryExtractionSessionLane(); let runtimeResources: HostRuntimeResourceCoordinator | undefined; + let continuity: SessionContinuityCoordinator | undefined; let manager: SessionManager | undefined; let graphCoordinator: AgentGraphCoordinator | undefined; let graphSupervisorWake: AgentGraphSupervisorWakeCoordinator | undefined; @@ -216,6 +260,9 @@ export async function createExecutionRuntimeHostComposition( newId: randomUUID, now: Date.now, onShellRunUpdate: (update) => runtimeResources?.observeShellRunUpdate(update), + onPtyData: (event) => { + void continuity?.enqueueRuntimeResourcePtyData(event); + }, }); const sandboxManager = createBuiltinSandboxManager(); const filesystemWorkerLaunchSpecProvider = @@ -300,6 +347,7 @@ export async function createExecutionRuntimeHostComposition( const hostTools = [ createHostWebSearchToolFromService(webSearchService), createHostWebFetchToolFromService(webFetchService), + ...runtimePolicy.modelTools, ]; const childAgentTools = createHostChildAgentToolComposition({ taskLedger, @@ -311,14 +359,51 @@ export async function createExecutionRuntimeHostComposition( context.owner.capability.canonicalPath, ); graphControlStore = openedGraphControlStore; + let resolveAvailableToolNames: ((sessionId: string) => Promise) | undefined; + let resolveNewSessionToolNames: + | (( + previewSessionId: string, + collaborationMode: 'agent' | 'plan', + initiatingConnectionId: string, + ) => Promise) + | undefined; const skills = new HostSkillCatalogCoordinator( new SkillCatalogRepository({ runWithRoot: (operation) => runWithStorageRootLease(context.owner.lease, 'interactive', 'write', operation), + ...(options.skillHomeDirectory ? { homeDirectory: options.skillHomeDirectory } : {}), }), + async (input, connection) => { + if (input.target.kind === 'session') { + const sessionId = input.target.sessionId; + const header = await stores.sessionStore.readHeaderSnapshot(sessionId); + const preview = await requireClientCapabilities( + clientCapabilities, + ).runWithSessionBindingPreview(sessionId, connection.connectionId, () => + requireToolNameResolver(resolveAvailableToolNames)(sessionId), + ); + if (!preview.ok) throw new Error(preview.message); + return { + projectRoot: header.cwd, + host: buildHostCapabilitiesFromBinding(preview.value), + }; + } + const previewSessionId = `skill-catalog-preview:${connection.connectionId}`; + return { + projectRoot: input.target.context.projectRoot, + host: buildHostCapabilitiesFromBinding( + await requireNewSessionToolNameResolver(resolveNewSessionToolNames)( + previewSessionId, + input.target.collaborationMode, + connection.connectionId, + ), + ), + }; + }, ); + const configurationChanges = new HostConfigurationChangeService(); + const sessionCatalogChanges = new HostSessionCatalogChangeService(); let rootCoordinator: RootTurnCoordinator | undefined; - let continuity: SessionContinuityCoordinator | undefined; let canonicalProjection: CanonicalSessionProjectionReader | undefined; let memory: HostMemoryCoordinator | undefined; let clientCapabilities: HostClientCapabilityCoordinator | undefined; @@ -375,6 +460,7 @@ export async function createExecutionRuntimeHostComposition( sessionAdmission, context.requestDrain, createSessionTranscriptReader({ stores, canonicalPermissionOutcomes }), + (sessionId) => sessionCatalogChanges.publish(sessionId), ); const continuityCoordinator = continuity; unsubscribeTaskLedger = taskLedger.subscribe(({ sessionId }) => @@ -482,40 +568,43 @@ export async function createExecutionRuntimeHostComposition( lane: memoryExtractionLane, acquireResidency: context.acquireResidency, }); - backends.register('ai-sdk', (backendContext) => - createHostAiSdkBackend({ - context: backendContext, - runtimePolicy: runtimePolicyStores, - oauthCredentials, - claudeDeviceId: context.owner.capability.rootId, - skills, - memory: requireMemory(memory), - memoryExtraction, - taskLedger, - artifacts: openedArtifactStore, - executionArtifacts, - usage: openedUsageStores, - clientCapabilities: requireClientCapabilities(clientCapabilities), - automationTool: requireAutomationCoordinator(automations).modelTool, - planStore: openedPlanStore, - deepResearchTools: requireDeepResearch(deepResearch).toolsForSession( - backendContext.sessionId, - ), - goalTools: requireGoal(goal).tools, - builtinTools, - hostTools, - resolveRootTools: (sessionId) => - requireGraphCoordinator(graphCoordinator).toolsForSession(sessionId), - parentAgentTools: childAgentTools.parentTools, - childTools: childAgentTools.childTools, - worktreePatchWriteBackAvailable: true, - childAgents: bindHostChildAgentBackend( - requireSessionManager(manager), - backendContext.sessionId, - ), - runtimeCommitSink: stores.runtimeEventStore, - requestDrain: context.requestDrain, - }), + backends.register( + 'ai-sdk', + dependencies.primaryBackendFactory ?? + ((backendContext) => + createHostAiSdkBackend({ + context: backendContext, + runtimePolicy: runtimePolicyStores, + oauthCredentials, + claudeDeviceId: context.owner.capability.rootId, + skills, + memory: requireMemory(memory), + memoryExtraction, + taskLedger, + artifacts: openedArtifactStore, + executionArtifacts, + usage: openedUsageStores, + clientCapabilities: requireClientCapabilities(clientCapabilities), + automationTool: requireAutomationCoordinator(automations).modelTool, + planStore: openedPlanStore, + deepResearchTools: requireDeepResearch(deepResearch).toolsForSession( + backendContext.sessionId, + ), + goalTools: requireGoal(goal).tools, + builtinTools, + hostTools, + resolveRootTools: (sessionId) => + requireGraphCoordinator(graphCoordinator).toolsForSession(sessionId), + parentAgentTools: childAgentTools.parentTools, + childTools: childAgentTools.childTools, + worktreePatchWriteBackAvailable: true, + childAgents: bindHostChildAgentBackend( + requireSessionManager(manager), + backendContext.sessionId, + ), + runtimeCommitSink: stores.runtimeEventStore, + requestDrain: context.requestDrain, + })), ); const runtimeAuthority: RuntimeHostedRootAuthority = { bindRun: (identity) => messages.bindRun(identity), @@ -525,16 +614,31 @@ export async function createExecutionRuntimeHostComposition( stopSession: (sessionId, input) => requireRootCoordinator(rootCoordinator).stopSession(sessionId, input), }; - const resolveAvailableToolNames = async (sessionId: string): Promise => { + resolveAvailableToolNames = async (sessionId: string): Promise => { + const header = await stores.sessionStore.readHeaderSnapshot(sessionId); + if (header.subagentRuntime) { + if (!header.subagentParent) { + throw new Error('Subagent runtime snapshot requires a linked child session'); + } + const tools = buildToolsForAgentDefinition(childAgentTools.childTools, { + id: header.subagentRuntime.agentId, + permissionMode: header.permissionMode, + tools: header.subagentRuntime.toolNames, + }); + if (tools.length !== header.subagentRuntime.toolNames.length) { + throw new Error('Subagent runtime tool snapshot is unavailable'); + } + return tools.map((tool) => tool.name); + } + if (header.subagentParent) { + throw new Error('Linked child session is missing its durable runtime snapshot'); + } const capabilitySnapshot = requireClientCapabilities(clientCapabilities).snapshotForSession(sessionId); try { const graphTools = await requireGraphCoordinator(graphCoordinator).toolsForSession(sessionId); - const [header, planState] = await Promise.all([ - stores.sessionStore.readHeaderSnapshot(sessionId), - openedPlanStore.readState(sessionId), - ]); + const planState = await openedPlanStore.readState(sessionId); return createHostExecutionModelComposition({ policy: runtimePolicyStores.runtimePolicy, skills, @@ -563,6 +667,41 @@ export async function createExecutionRuntimeHostComposition( capabilitySnapshot?.release(); } }; + resolveNewSessionToolNames = async ( + previewSessionId, + collaborationMode, + initiatingConnectionId, + ) => { + const preview = await requireClientCapabilities( + clientCapabilities, + ).runWithSessionBindingPreview(previewSessionId, initiatingConnectionId, async () => { + const capabilitySnapshot = + requireClientCapabilities(clientCapabilities).snapshotForSession(previewSessionId); + try { + return createHostExecutionModelComposition({ + policy: runtimePolicyStores.runtimePolicy, + skills, + memory: requireMemory(memory), + taskLedger, + ...(capabilitySnapshot ? { clientCapabilities: capabilitySnapshot } : {}), + builtinTools, + hostTools, + automationTool: requireAutomationCoordinator(automations).modelTool, + goalTools: requireGoal(goal).tools, + parentAgentTools: childAgentTools.parentTools, + plan: { + store: openedPlanStore, + state: emptyPlanSessionState(previewSessionId), + mode: collaborationMode, + }, + }).tools.map((tool) => tool.name); + } finally { + capabilitySnapshot?.release(); + } + }); + if (!preview.ok) throw new Error(preview.message); + return preview.value; + }; const sessionEffectCoordinator = new HostSessionEffectCoordinator({ model: createHostSessionEffectModel({ runtimePolicy: runtimePolicyStores, @@ -607,12 +746,21 @@ export async function createExecutionRuntimeHostComposition( privacy: snapshot.policy.privacy, }); }; + const subagentCatalog = createConfiguredSubagentCatalog({ + getPresets: async () => + (await runtimePolicyStores.runtimePolicy.getSnapshot()).policy.subagents.presets, + getConnection: async (slug) => + (await runtimePolicyStores.connectionCatalog.getSnapshot()).connections.find( + (connection) => connection.slug === slug, + ) ?? null, + }); manager = new SessionManager({ store: stores.sessionStore, runStore: stores.agentRunStore, runtimeEventStore: stores.runtimeEventStore, toolBoundaryProtocol: stores.runtimeEventStore.toolBoundaryProtocol, backends, + subagentCatalog, newId: randomUUID, now: Date.now, safeBoundaryResumeEnabled: process.env.MAKA_RUNTIME_SAFE_BOUNDARY_RESUME === '1', @@ -715,6 +863,10 @@ export async function createExecutionRuntimeHostComposition( const registerBackendInvalidation = (): void => { observeBackendInvalidation(manager.refreshIdleBackends()); }; + const registerConfigurationMutation = (): void => { + configurationChanges.publish(); + registerBackendInvalidation(); + }; clientCapabilities = new HostClientCapabilityCoordinator({ activation: runtimePolicyActivation, onModelToolsChanged: registerBackendInvalidation, @@ -726,7 +878,10 @@ export async function createExecutionRuntimeHostComposition( clientCapabilities, isProviderEnabled: isOAuthEnrollmentProviderEnabled, acquireResidency: context.acquireResidency, - invalidateBackends: () => manager.refreshIdleBackends(), + invalidateBackends: () => { + configurationChanges.publish(); + return manager.refreshIdleBackends(); + }, onFatal: (error) => { if (poisonFailure) return; poisonFailure = error; @@ -735,6 +890,7 @@ export async function createExecutionRuntimeHostComposition( beginDrain(); context.requestDrain(); }, + ...dependencies.oauthAuthorization, }); const usagePricing = new HostUsagePricingCoordinator( openedUsageStores, @@ -859,24 +1015,20 @@ export async function createExecutionRuntimeHostComposition( acquireResidency: context.acquireResidency, onProjectionChanged: (sessionId) => continuityCoordinator.enqueueCanonicalRefresh(sessionId), }); - const runtimePolicy = new HostRuntimePolicyCoordinator( - runtimePolicyStores, - runtimePolicyActivation, - async () => { - try { - await requireMemory(memory).refreshAfterPolicyMutation(); - } catch (error) { - context.requestDrain(); - throw error; - } - registerBackendInvalidation(); - }, - ); + async function applyRuntimePolicyMutationEffects(): Promise { + try { + await requireMemory(memory).refreshAfterPolicyMutation(); + } catch (error) { + context.requestDrain(); + throw error; + } + registerConfigurationMutation(); + } const connectionEffects = new HostConnectionEffectCoordinator({ stores: runtimePolicyStores, activation: runtimePolicyActivation, oauthCredentials, - onCommittedMutation: registerBackendInvalidation, + onCommittedMutation: registerConfigurationMutation, }); const sessionCatalog = new HostSessionCatalogCoordinator({ stores: stores.sessionStore, @@ -1201,6 +1353,8 @@ export async function createExecutionRuntimeHostComposition( workspaceExecution: requireWorkspaceExecution(workspaceExecution), continuity: continuityCoordinator, clientCapabilities, + configurationChanges, + sessionCatalogChanges, releaseConnection: (connectionId: string) => { artifacts.releaseConnection(connectionId); requireMemory(memory).releaseConnection(connectionId); @@ -1366,6 +1520,30 @@ function requireClientCapabilities( return coordinator; } +function requireToolNameResolver( + resolver: ((sessionId: string) => Promise) | undefined, +): (sessionId: string) => Promise { + if (!resolver) throw new Error('Runtime Host Session tool resolver is not composed'); + return resolver; +} + +function requireNewSessionToolNameResolver( + resolver: + | (( + previewSessionId: string, + collaborationMode: 'agent' | 'plan', + initiatingConnectionId: string, + ) => Promise) + | undefined, +): ( + previewSessionId: string, + collaborationMode: 'agent' | 'plan', + initiatingConnectionId: string, +) => Promise { + if (!resolver) throw new Error('Runtime Host new Session tool resolver is not composed'); + return resolver; +} + function requireAutomationCoordinator( coordinator: HostAutomationCoordinator | undefined, ): HostAutomationCoordinator { diff --git a/packages/runtime-host/src/server/execution-inspect-coordinator.ts b/packages/runtime-host/src/server/execution-inspect-coordinator.ts index 279cc40827..c51a51a16f 100644 --- a/packages/runtime-host/src/server/execution-inspect-coordinator.ts +++ b/packages/runtime-host/src/server/execution-inspect-coordinator.ts @@ -40,7 +40,11 @@ interface InspectStores { readonly sessionStore: Pick; readonly agentRunStore: Pick< ExecutionAgentRunReader, - 'readRun' | 'findRunsById' | 'listSessionRunsBounded' | 'readEventsBounded' + | 'readRun' + | 'findRunsById' + | 'listSessionRunsBounded' + | 'readEventsBounded' + | 'readEventsByTypeBounded' >; readonly runtimeEventStore: Pick; } @@ -265,7 +269,12 @@ export class HostExecutionInspectCoordinator { for (const run of runPage.runs) { const runEvents = await budget .read((remaining) => - this.#stores.agentRunStore.readEventsBounded(sessionId, run.runId, remaining), + this.#stores.agentRunStore.readEventsByTypeBounded( + sessionId, + run.runId, + MODEL_CALL_ATTEMPT_EVENT_TYPE, + remaining, + ), ) .catch((error) => { if (isInspectQueryTooLargeError(error)) throw error; diff --git a/packages/runtime-host/src/server/execution-model-composition.ts b/packages/runtime-host/src/server/execution-model-composition.ts index 3ecd1ea312..2411f87176 100644 --- a/packages/runtime-host/src/server/execution-model-composition.ts +++ b/packages/runtime-host/src/server/execution-model-composition.ts @@ -1,4 +1,5 @@ import { randomUUID } from 'node:crypto'; +import { buildSideConversationSystemPromptFragment, isSideConversationSession } from '@maka/core'; import { buildDeepResearchSystemPromptFragment, isDeepResearchSession, @@ -17,6 +18,7 @@ import { AiSdkBackend, buildAskUserQuestionTool, buildBuiltinTools, + buildExploreAgentTool, buildDefaultContextBudgetPolicy, buildHostCapabilitiesFromBinding, buildLlmHistorySummarizer, @@ -25,6 +27,7 @@ import { buildCancelPlanTool, buildParentAgentTools, buildPricingLookup, + buildRequestSandboxBoundaryTool, buildProviderOptions, buildSubmitPlanTool, buildSessionEnvironmentPromptFragment, @@ -115,6 +118,7 @@ export interface HostExecutionModelCompositionInput { readonly memory: HostMemoryCoordinator; readonly taskLedger: TaskLedgerStore; readonly childInstruction?: string; + readonly sideConversation?: boolean; readonly boundTools?: readonly MakaTool[]; readonly skillBudget?: SkillCatalogBudgetOptions; readonly platform?: NodeJS.Platform; @@ -236,6 +240,7 @@ export function createHostExecutionModelComposition( exploreAgentAvailable: tools.some(({ name }) => name === 'ExploreAgent'), }) : undefined, + input.sideConversation ? buildSideConversationSystemPromptFragment() : undefined, ]); }, turnTailPrompt: async (context: HostModelPromptContext) => { @@ -402,6 +407,7 @@ export async function createHostAiSdkBackend(input: HostAiSdkBackendInput): Prom memory: input.memory, taskLedger: input.taskLedger, ...(input.context.systemPrompt ? { childInstruction: input.context.systemPrompt } : {}), + ...(isSideConversationSession(input.context.header.labels) ? { sideConversation: true } : {}), ...(boundTools ? { boundTools } : {}), ...(clientCapabilities ? { clientCapabilities } : {}), ...(input.builtinTools ? { builtinTools: input.builtinTools } : {}), @@ -708,6 +714,8 @@ function buildDefaultHostTools( ): MakaTool[] { const builtins = builtinOptions ? buildBuiltinTools(builtinOptions) : []; const question = buildAskUserQuestionTool(); + const sandboxBoundary = buildRequestSandboxBoundaryTool(); + const exploreAgent = buildExploreAgentTool(); const taskTools = buildTaskLedgerTools({ store: taskLedger }); const activeExecution = plan ? activePlanExecution(plan.state) : undefined; const interruptedExecution = plan @@ -727,6 +735,8 @@ function buildDefaultHostTools( ...builtins.map((tool) => tool.name), ...hostTools.map((tool) => tool.name), question.name, + sandboxBoundary.name, + exploreAgent.name, 'Skill', 'SkillSearch', ...taskTools.map((tool) => tool.name), @@ -742,6 +752,8 @@ function buildDefaultHostTools( ...builtins, ...hostTools, question, + sandboxBoundary, + exploreAgent, buildSkillAgentToolFromInventory(inventoryFor, skillHost, { shadowTracker, }), diff --git a/packages/runtime-host/src/server/host-kernel.ts b/packages/runtime-host/src/server/host-kernel.ts index 7d830a37b3..138a5ed3b8 100644 --- a/packages/runtime-host/src/server/host-kernel.ts +++ b/packages/runtime-host/src/server/host-kernel.ts @@ -35,6 +35,8 @@ import { } from './operation-dispatcher.js'; import type { SessionContinuityService } from './session-continuity-service.js'; import type { ClientCapabilityService } from './client-capability-service.js'; +import type { HostConfigurationChangeService } from './configuration-change-service.js'; +import type { HostSessionCatalogChangeService } from './session-catalog-change-service.js'; const DEFAULT_IDLE_GRACE_MS = 30_000; const DEFAULT_HANDSHAKE_TIMEOUT_MS = 5_000; @@ -70,6 +72,8 @@ export interface RuntimeHostComposition { readonly handlers: DomainOperationHandlerMap; readonly continuity?: SessionContinuityService; readonly clientCapabilities?: ClientCapabilityService; + readonly configurationChanges?: HostConfigurationChangeService; + readonly sessionCatalogChanges?: HostSessionCatalogChangeService; releaseConnection?(connectionId: string): void; beginDrain(): void; recover(): Promise; @@ -96,6 +100,7 @@ export class RuntimeHostKernel { readonly #server: Server; readonly #handshakingTransports = new Set(); readonly #acceptedTransports = new Set(); + readonly #connectionSessions = new Set(); readonly #operationDrainWaiters = new Set<() => void>(); readonly #residencyDrainWaiters = new Set<() => void>(); readonly #idleGraceMs: number; @@ -227,6 +232,7 @@ export class RuntimeHostKernel { retainUntilProcessExit: () => this.#retainUntilProcessExit(), requestDrain: () => this.#requestDrain(), }); + for (const session of this.#connectionSessions) session.attachGlobalChanges(); if (this.#shutdownRequested) this.#beginCompositionDrain(); this.#operationHandlers = this.#createOperationHandlers(this.#composition.handlers); await this.#composition.recover(); @@ -284,10 +290,17 @@ export class RuntimeHostKernel { resolveHandlers: () => this.#operationHandlers, resolveContinuity: () => this.#composition?.continuity, resolveClientCapabilities: () => this.#composition?.clientCapabilities, + resolveConfigurationChanges: () => this.#composition?.configurationChanges, + resolveSessionCatalogChanges: () => this.#composition?.sessionCatalogChanges, beginOperation: (request) => this.#beginOperation(request), onTeardown: releaseTransport, }); - await session.run(); + this.#connectionSessions.add(session); + try { + await session.run(); + } finally { + this.#connectionSessions.delete(session); + } } catch { transport.destroy(); } finally { diff --git a/packages/runtime-host/src/server/legacy-runtime-policy-migration.ts b/packages/runtime-host/src/server/legacy-runtime-policy-migration.ts new file mode 100644 index 0000000000..5385591578 --- /dev/null +++ b/packages/runtime-host/src/server/legacy-runtime-policy-migration.ts @@ -0,0 +1,448 @@ +import { randomUUID } from 'node:crypto'; +import { access, readFile, rename, rm, writeFile } from 'node:fs/promises'; +import { join } from 'node:path'; +import { + connectionEnabledModelIds, + OPENCODE_FREE_DEFAULT_ENABLED_MODELS, + OPENCODE_FREE_DEFAULT_MODEL, + PROVIDER_DEFAULTS, + providerSupportsModelDiscovery, + type LlmConnection, +} from '@maka/core/llm-connections'; +import type { + ConnectionCatalogEntry, + ConnectionModelDiscoveryResult, + ConnectionTestSummary, + CredentialLocator, + RuntimePolicy, +} from '@maka/core/runtime-policy'; +import type { AppSettings } from '@maka/core/settings'; +import { createConnectionStore } from '@maka/storage/connection-store'; +import { createFileCredentialStore } from '@maka/storage/credential-store'; +import type { RuntimePolicyStoresWriter } from '@maka/storage/runtime-policy-stores'; +import { createSettingsStore } from '@maka/storage/settings-store'; +const JOURNAL_FILE = '.runtime-host-m5-migration.json'; +const LEGACY_FILES = ['llm-connections.json', 'credentials.json', 'settings.json'] as const; + +interface MigrationJournal { + readonly version: 1; + readonly state: 'importing'; +} + +export async function migrateLegacyRuntimePolicy(input: { + readonly workspaceRoot: string; + readonly legacyConfigurationRoot?: string; + readonly stores: RuntimePolicyStoresWriter; +}): Promise { + const journalPath = join(input.workspaceRoot, JOURNAL_FILE); + const legacyRoot = input.legacyConfigurationRoot ?? input.workspaceRoot; + const journal = await readJournal(journalPath); + const [catalog, vault, policy] = await Promise.all([ + input.stores.connectionCatalog.getSnapshot(), + input.stores.credentialVault.getSnapshot(), + input.stores.runtimePolicy.getSnapshot(), + ]); + const establishedHostState = + catalog.revision !== 0 || + catalog.connections.length !== 0 || + vault.revision !== 0 || + vault.entries.length !== 0 || + policy.revision !== 0; + const legacySettingsPath = join(legacyRoot, 'settings.json'); + const settings = (await fileExists(legacySettingsPath)) + ? await createSettingsStore(legacyRoot).get() + : undefined; + if (await isVersionOnePolicy(join(input.workspaceRoot, 'runtime-policy.json'))) { + await importSubagents(input.stores, settings?.subagents ?? { presets: [] }); + } + if (!journal) { + if (establishedHostState) return; + if (!(await hasLegacyState(legacyRoot))) return; + await writeJournal(journalPath); + } + + const connectionStore = createConnectionStore(legacyRoot); + const credentialStore = createFileCredentialStore(legacyRoot); + const legacyConnections = (await connectionStore.list()).map(normalizeLegacyConnection); + const imported = await importConnections(input.stores, legacyConnections); + await importConnectionCredentials(input.stores, credentialStore, legacyConnections, imported); + if (settings) { + await importRuntimePolicy(input.stores, settings); + await importSettingsCredentials(input.stores, settings); + } + await importConnectionEffects(input.stores, legacyConnections, imported); + await importDefaultTarget( + input.stores, + imported, + legacyConnections, + await connectionStore.getDefault(), + ); + await rm(journalPath, { force: true }); +} + +async function importSubagents( + stores: RuntimePolicyStoresWriter, + subagents: RuntimePolicy['subagents'], +): Promise { + const current = await stores.runtimePolicy.getSnapshot(); + const result = await stores.runtimePolicy.mutate({ + expectedRevision: current.revision, + operation: { kind: 'set_subagents', value: subagents }, + }); + if (result.kind !== 'committed') { + throw new Error('Legacy subagent migration lost its exclusive revision'); + } +} + +async function importConnections( + stores: RuntimePolicyStoresWriter, + legacyConnections: readonly LlmConnection[], +): Promise> { + let catalog = await stores.connectionCatalog.getSnapshot(); + for (const legacy of legacyConnections) { + if (catalog.connections.some(({ slug }) => slug === legacy.slug)) continue; + const result = await stores.connectionCatalog.create({ + expectedCatalogRevision: catalog.revision, + connection: { + slug: legacy.slug, + name: legacy.name, + providerType: legacy.providerType, + ...(legacy.baseUrl ? { baseUrl: legacy.baseUrl } : {}), + enabled: legacy.enabled, + enabledModelIds: connectionEnabledModelIds(legacy), + }, + }); + if (result.kind !== 'committed') { + throw new Error(`Legacy Connection migration failed: ${result.kind}`); + } + catalog = result.snapshot; + } + return new Map(catalog.connections.map((connection) => [connection.slug, connection])); +} + +async function importConnectionCredentials( + stores: RuntimePolicyStoresWriter, + credentialStore: ReturnType, + legacyConnections: readonly LlmConnection[], + imported: ReadonlyMap, +): Promise { + for (const legacy of legacyConnections) { + const connection = imported.get(legacy.slug); + if (!connection) throw new Error(`Imported Connection is missing: ${legacy.slug}`); + const authKind = PROVIDER_DEFAULTS[legacy.providerType].authKind; + const credentialKind: 'api_key' | 'oauth_token' | null = + authKind === 'oauth_token' ? 'oauth_token' : authKind === 'none' ? null : 'api_key'; + if (!credentialKind) continue; + const secret = await credentialStore.getSecret(legacy.slug, credentialKind); + if (!secret) continue; + await setCredential( + stores, + { + scope: 'connection', + connectionId: connection.connectionId, + kind: credentialKind, + }, + secret, + 'migration', + ); + } +} + +async function importConnectionEffects( + stores: RuntimePolicyStoresWriter, + legacyConnections: readonly LlmConnection[], + imported: ReadonlyMap, +): Promise { + for (const legacy of legacyConnections) { + const connection = imported.get(legacy.slug); + if (!connection) continue; + if (!(await canImportConnectionEffects(stores, legacy, connection))) continue; + const modelResult = legacyModelResult(legacy); + if (modelResult) { + const prepared = await stores.operations.beginModelFetch(connection.connectionId); + if (prepared.kind !== 'ready') { + throw new Error(`Legacy Connection model inventory migration failed: ${prepared.kind}`); + } + const completed = await stores.operations.completeModelFetch(prepared.ticket, modelResult); + if (completed.kind !== 'committed') { + throw new Error('Legacy Connection model inventory was superseded during migration'); + } + } + const test = legacyTestSummary(legacy); + if (!test) continue; + const prepared = await stores.operations.beginConnectionTest( + connection.connectionId, + legacy.defaultModel || null, + ); + if (prepared.kind !== 'ready') { + throw new Error(`Legacy Connection health migration failed: ${prepared.kind}`); + } + const completed = await stores.operations.completeConnectionTest(prepared.ticket, test); + if (completed.kind !== 'committed') { + throw new Error('Legacy Connection health was superseded during migration'); + } + } +} + +async function canImportConnectionEffects( + stores: RuntimePolicyStoresWriter, + legacy: LlmConnection, + connection: ConnectionCatalogEntry, +): Promise { + if (!providerSupportsModelDiscovery(legacy.providerType)) return false; + const authKind = PROVIDER_DEFAULTS[legacy.providerType].authKind; + if (authKind === 'none') return true; + const result = await stores.credentialVault.getStatus({ + scope: 'connection', + connectionId: connection.connectionId, + kind: authKind === 'oauth_token' ? 'oauth_token' : 'api_key', + }); + return result.kind === 'status' && result.status.configured; +} + +async function importDefaultTarget( + stores: RuntimePolicyStoresWriter, + imported: ReadonlyMap, + legacyConnections: readonly LlmConnection[], + defaultSlug: string | null, +): Promise { + if (!defaultSlug) return; + const connection = imported.get(defaultSlug); + const legacy = legacyConnections.find(({ slug }) => slug === defaultSlug); + const modelId = legacy?.defaultModel || connection?.enabledModelIds[0]; + if (!connection || !modelId || !connection.enabledModelIds.includes(modelId)) return; + const catalog = await stores.connectionCatalog.getSnapshot(); + const result = await stores.connectionCatalog.setDefaultTarget({ + expectedCatalogRevision: catalog.revision, + target: { connectionId: connection.connectionId, modelId }, + }); + if (result.kind !== 'committed') { + throw new Error(`Legacy default Connection migration failed: ${result.kind}`); + } +} + +async function importRuntimePolicy( + stores: RuntimePolicyStoresWriter, + settings: AppSettings, +): Promise { + const proxy = settings.network.proxy; + const values: RuntimePolicy = { + networkProxy: { + enabled: proxy.enabled, + protocol: proxy.protocol, + host: proxy.host, + port: proxy.port, + authEnabled: proxy.authEnabled, + username: proxy.username, + bypassList: [...proxy.bypassList], + autoBypassDomains: [...proxy.autoBypassDomains], + }, + personalization: { + displayName: settings.personalization.displayName, + assistantTone: settings.personalization.assistantTone, + }, + memory: settings.localMemory, + workspaceInstructions: settings.workspaceInstructions, + privacy: settings.privacy, + chatDefaults: settings.chatDefaults, + webSearch: { + enabled: settings.webSearch.enabled, + defaultProvider: settings.webSearch.defaultProvider, + }, + subagents: settings.subagents, + }; + const operations = [ + { kind: 'set_network_proxy' as const, value: values.networkProxy }, + { kind: 'set_personalization' as const, value: values.personalization }, + { kind: 'set_memory' as const, value: values.memory }, + { kind: 'set_workspace_instructions' as const, value: values.workspaceInstructions }, + { kind: 'set_privacy' as const, value: values.privacy }, + { kind: 'set_chat_defaults' as const, value: values.chatDefaults }, + { kind: 'set_web_search' as const, value: values.webSearch }, + { kind: 'set_subagents' as const, value: values.subagents }, + ]; + for (const operation of operations) { + const current = await stores.runtimePolicy.getSnapshot(); + const result = await stores.runtimePolicy.mutate({ + expectedRevision: current.revision, + operation, + }); + if (result.kind !== 'committed') { + throw new Error('Legacy Runtime policy migration lost its exclusive revision'); + } + } +} + +async function importSettingsCredentials( + stores: RuntimePolicyStoresWriter, + settings: AppSettings, +): Promise { + const proxyPassword = settings.network.proxy.password; + if (proxyPassword) { + await setCredential(stores, { scope: 'network_proxy', kind: 'password' }, proxyPassword); + } + const tavilyApiKey = settings.webSearch.providers.tavily.apiKey; + if (tavilyApiKey) { + await setCredential( + stores, + { scope: 'web_search', provider: 'tavily', kind: 'api_key' }, + tavilyApiKey, + ); + } +} + +async function setCredential( + stores: RuntimePolicyStoresWriter, + locator: CredentialLocator, + secret: string, + authority: 'client' | 'migration' = 'client', +): Promise { + const current = await stores.credentialVault.getStatus(locator); + if (current.kind === 'connection_not_found') { + throw new Error('Legacy credential refers to a missing Connection'); + } + if (current.status.configured) return; + const input = { locator, expected: null, secret }; + const result = + authority === 'migration' + ? await stores.operations.importConnectionCredential(input) + : await stores.credentialVault.set(input); + if (result.kind !== 'committed') { + throw new Error(`Legacy credential migration failed: ${result.kind}`); + } +} + +function legacyModelResult(connection: LlmConnection): ConnectionModelDiscoveryResult | null { + if ( + connection.models?.length && + connection.modelSource && + connection.modelsFetchedAt !== undefined + ) { + return { + models: connection.models, + source: connection.modelSource, + fetchedAt: connection.modelsFetchedAt, + }; + } + const enabledModelIds = connectionEnabledModelIds(connection); + return enabledModelIds.length > 0 + ? { + models: enabledModelIds.map((id) => ({ id })), + source: 'fallback', + fetchedAt: connection.updatedAt, + } + : null; +} + +function legacyTestSummary(connection: LlmConnection): ConnectionTestSummary | null { + if (!connection.lastTestStatus || !connection.lastTestAt) return null; + return { + status: connection.lastTestStatus, + checkedAt: connection.lastTestAt, + ...(connection.lastTestStatus === 'needs_reauth' + ? { errorClass: 'auth' as const } + : connection.lastTestStatus === 'error' + ? { errorClass: 'unknown' as const } + : {}), + }; +} + +function normalizeLegacyConnection(connection: LlmConnection): LlmConnection { + const isBootstrapBase = + connection.slug === 'opencode-free' && + connection.name === 'OpenCode Free' && + connection.providerType === 'opencode-free' && + connection.baseUrl === undefined && + connection.enabled === true && + connection.models === undefined; + if (!isBootstrapBase) return connection; + const legacyV1 = + connection.defaultModel === 'big-pickle' && + sameStringList(connection.enabledModelIds, ['big-pickle']) && + connection.extras === undefined; + const legacyV2 = + connection.defaultModel === OPENCODE_FREE_DEFAULT_MODEL && + sameStringList(connection.enabledModelIds, [OPENCODE_FREE_DEFAULT_MODEL]) && + bootstrapVersion(connection) === 2; + if (!legacyV1 && !legacyV2) return connection; + return { + ...connection, + defaultModel: OPENCODE_FREE_DEFAULT_MODEL, + enabledModelIds: [...OPENCODE_FREE_DEFAULT_ENABLED_MODELS], + }; +} + +function bootstrapVersion(connection: LlmConnection): number | undefined { + const extras = connection.extras; + if (!extras || typeof extras !== 'object' || Array.isArray(extras)) return undefined; + if (Object.keys(extras).length !== 1) return undefined; + const bootstrap = extras.makaBootstrap; + if (!bootstrap || typeof bootstrap !== 'object' || Array.isArray(bootstrap)) return undefined; + const record = bootstrap as { id?: unknown; version?: unknown }; + if (Object.keys(record).length !== 2 || record.id !== 'opencode-free') return undefined; + return typeof record.version === 'number' ? record.version : undefined; +} + +function sameStringList( + actual: readonly string[] | undefined, + expected: readonly string[], +): boolean { + return actual?.length === expected.length && actual.every((id, index) => id === expected[index]); +} + +async function hasLegacyState(workspaceRoot: string): Promise { + const results = await Promise.all( + LEGACY_FILES.map((file) => fileExists(join(workspaceRoot, file))), + ); + return results.some(Boolean); +} + +async function readJournal(path: string): Promise { + let contents: string; + try { + contents = await readFile(path, 'utf8'); + } catch (error) { + if ((error as { code?: string }).code === 'ENOENT') return null; + throw error; + } + const value = JSON.parse(contents) as Partial; + if (value.version !== 1 || value.state !== 'importing') { + throw new Error('Invalid Runtime Host M5 migration journal'); + } + return { version: 1, state: 'importing' }; +} + +async function writeJournal(path: string): Promise { + const temporaryPath = `${path}.${randomUUID()}.tmp`; + try { + await writeFile( + temporaryPath, + `${JSON.stringify({ version: 1, state: 'importing' } satisfies MigrationJournal)}\n`, + { encoding: 'utf8', flag: 'wx' }, + ); + await rename(temporaryPath, path); + } catch (error) { + await rm(temporaryPath, { force: true }); + throw error; + } +} + +async function fileExists(path: string): Promise { + try { + await access(path); + return true; + } catch (error) { + if ((error as { code?: string }).code === 'ENOENT') return false; + throw error; + } +} + +async function isVersionOnePolicy(path: string): Promise { + try { + const value = JSON.parse(await readFile(path, 'utf8')) as { schemaVersion?: unknown }; + return value.schemaVersion === 1; + } catch (error) { + if ((error as NodeJS.ErrnoException).code === 'ENOENT') return false; + throw error; + } +} diff --git a/packages/runtime-host/src/server/operation-dispatcher.ts b/packages/runtime-host/src/server/operation-dispatcher.ts index 2fa8fb8576..2b44633725 100644 --- a/packages/runtime-host/src/server/operation-dispatcher.ts +++ b/packages/runtime-host/src/server/operation-dispatcher.ts @@ -50,7 +50,10 @@ export type RuntimePolicyOperationKey = Extract< >; export type ConnectionEffectOperationKey = Extract< OperationKey, - 'connection.models.fetch' | 'connection.test.run' + | 'connection.models.fetch' + | 'connection.test.run' + | 'connection.onboarding.verify' + | 'connection.onboarding.save' >; export type MessageOperationKey = Extract< OperationKey, diff --git a/packages/runtime-host/src/server/root-admission-owner.ts b/packages/runtime-host/src/server/root-admission-owner.ts index 6330c054d7..c7c3ae316f 100644 --- a/packages/runtime-host/src/server/root-admission-owner.ts +++ b/packages/runtime-host/src/server/root-admission-owner.ts @@ -100,6 +100,7 @@ function sameRootAdmission(left: RootTurnAdmission, right: RootTurnAdmission): b left.userMessageId === right.userMessageId && isDeepStrictEqual(left.execution, right.execution) && isDeepStrictEqual(left.turnOrchestration, right.turnOrchestration) && + isDeepStrictEqual(left.skillInvocation, right.skillInvocation) && left.previousRootTurnId === right.previousRootTurnId && (left.normalizedInput === null || right.normalizedInput === null ? left.normalizedInput === right.normalizedInput diff --git a/packages/runtime-host/src/server/root-turn-coordinator.ts b/packages/runtime-host/src/server/root-turn-coordinator.ts index 9188ea0d1e..03d7825e0a 100644 --- a/packages/runtime-host/src/server/root-turn-coordinator.ts +++ b/packages/runtime-host/src/server/root-turn-coordinator.ts @@ -16,6 +16,10 @@ import { } from '@maka/core/events'; import type { SessionHeader, StoredMessage } from '@maka/core/session'; import type { UserMessageInput } from '@maka/core/runtime-inputs'; +import { + decodeSkillInvocationResult, + type SkillInvocationResult, +} from '@maka/core/skill-invocation'; import { agentGraphIdForRootSession, classifyTerminalRuntimeLedger, @@ -124,6 +128,15 @@ interface ActiveRootTurn { } export type TurnStartOutcome = OperationOutcome<'turn.start'>; +type RootMessageStartOutcome = + | { ok: true; result: TurnSnapshot } + | Extract; + +const EMPTY_SKILL_INVOCATION: SkillInvocationResult = { + loaded: [], + failed: [], + receipts: [], +}; type RootMessageExecution = Extract< RootExecutionDescriptor, @@ -160,11 +173,16 @@ export type RootMessageContentPreparation = | { readonly kind: 'ready'; readonly content: MessageContent; + readonly skillInvocation?: SkillInvocationResult; readonly commitCapabilityBinding?: () => Promise< { readonly ok: true } | { readonly ok: false; readonly message: string } >; } - | { readonly kind: 'rejected'; readonly outcome: TurnStartOutcome }; + | { + readonly kind: 'rejected'; + readonly outcome: RootMessageStartOutcome; + readonly skillInvocation?: SkillInvocationResult; + }; export interface HostedExternalTurnTransitionInput { readonly sessionId: string; @@ -200,7 +218,7 @@ type ReconstructedContinuation = }; type TurnStartDisposition = - | { kind: 'complete'; outcome: TurnStartOutcome } + | { kind: 'complete'; outcome: RootMessageStartOutcome } | { kind: 'await_start'; active: ActiveRootTurn }; type TurnStopOutcome = OperationOutcome<'turn.stop'>; @@ -367,7 +385,9 @@ export class RootTurnCoordinator { const pendingRecoveryClosures: RootTurnAdmission[] = []; for (const admission of admissions) { const run = runsById.get(admission.runId); - const userMessages = messageIndex.userMessagesByTurnId.get(admission.turnId) ?? []; + const rootUserMessages = ( + messageIndex.userMessagesByTurnId.get(admission.turnId) ?? [] + ).filter((message) => message.steeringEventId === undefined); const messageIdOwners = admission.userMessageId ? (messageIndex.messagesById.get(admission.userMessageId) ?? []) : []; @@ -395,7 +415,7 @@ export class RootTurnCoordinator { ); } if (admission.userMessageId === null) { - if (userMessages.length > 0) { + if (rootUserMessages.length > 0) { throw new Error(`Admitted Turn ${admission.turnId} must not record a UserMessage`); } if (!run) { @@ -420,10 +440,10 @@ export class RootTurnCoordinator { } const messageIdOwner = messageIdOwners[0]; if (!run && executionContract.pendingWithoutRun === 'host_recovery_closure') { - if (userMessages.length > 1) { + if (rootUserMessages.length > 1) { throw new Error(`Admitted Turn ${admission.turnId} has multiple UserMessages`); } - const userMessage = userMessages[0]; + const userMessage = rootUserMessages[0]; if (userMessage) { if ( messageIdOwner !== userMessage || @@ -448,17 +468,17 @@ export class RootTurnCoordinator { continue; } if (!run) { - if (userMessages.length > 0 || messageIdOwner) { + if (rootUserMessages.length > 0 || messageIdOwner) { throw new Error(`Admitted Turn ${admission.turnId} has a UserMessage but no Run`); } pending.push(admission); continue; } await this.assertRunMatchesDurableExecution(run, admission.turnId, admission.execution); - if (userMessages.length > 1) { + if (rootUserMessages.length > 1) { throw new Error(`Admitted Turn ${admission.turnId} has multiple UserMessages`); } - const userMessage = userMessages[0]; + const userMessage = rootUserMessages[0]; if (userMessage) { if ( messageIdOwner !== userMessage || @@ -653,7 +673,7 @@ export class RootTurnCoordinator { startHostedExternalTransition( input: HostedExternalTurnTransitionInput, context: ConnectionContext, - ): Promise { + ): Promise { return this.startRootMessage( { sessionId: input.sessionId, @@ -1654,46 +1674,141 @@ export class RootTurnCoordinator { })); } - private startTurn(input: TurnStartInput, context: ConnectionContext): Promise { + private async startTurn( + input: TurnStartInput, + context: ConnectionContext, + ): Promise { const content = normalizeMessageContent(input.content); const skillIds = input.skillIds ?? []; - const hasSkillInvocation = - skillIds.length > 0 || parseSkillInvocationTokens(content.text).length > 0; - if (hasSkillInvocation) { - const execution = { - kind: 'external_message' as const, - inputDigest: hostedExternalInputDigest(content, skillIds), - }; - return this.startRootMessage( + if (skillIds.length > 0 || parseSkillInvocationTokens(content.text).length > 0) { + return this.runSkillInvocationStart( + input, + content, + skillIds, { - sessionId: input.sessionId, - turnId: input.turnId, - execution, - ...(input.turnOrchestration ? { turnOrchestration: { ...input.turnOrchestration } } : {}), - archivedMessage: 'Cannot start a new Turn in an archived Session', - prepareFreshContent: async () => - this.prepareHostedSkillInvocationContent( - input.sessionId, - input.turnId, - content, - skillIds, - context.connectionId, - ), + kind: 'external_message', + inputDigest: hostedExternalInputDigest(content, skillIds), + ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}), }, context, ); } - return this.startRootMessage( + const outcome = await this.startRootMessage( { sessionId: input.sessionId, turnId: input.turnId, - execution: { kind: 'external_message' }, + execution: { + kind: 'external_message', + ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}), + }, ...(input.turnOrchestration ? { turnOrchestration: { ...input.turnOrchestration } } : {}), archivedMessage: 'Cannot start a new Turn in an archived Session', content, }, context, ); + return outcome.ok + ? { + ok: true, + result: { + kind: 'started', + turn: outcome.result, + skillInvocation: EMPTY_SKILL_INVOCATION, + }, + } + : outcome; + } + + private async runSkillInvocationStart( + input: TurnStartInput, + content: MessageContent, + skillIds: readonly string[], + execution: Extract, + context: ConnectionContext, + ): Promise { + const outcome = await this.startRootMessage( + { + sessionId: input.sessionId, + turnId: input.turnId, + execution, + ...(input.turnOrchestration ? { turnOrchestration: { ...input.turnOrchestration } } : {}), + archivedMessage: 'Cannot start a new Turn in an archived Session', + prepareFreshContent: async () => { + const existing = await this.stores.agentRunStore.readRootTurnStartRejection( + input.sessionId, + input.turnId, + ); + if (existing) { + if (!isDeepStrictEqual(existing.execution, execution)) { + return { + kind: 'rejected', + outcome: operationConflict( + 'Turn identity belongs to a different rejected execution payload', + ), + }; + } + return { + kind: 'rejected', + outcome: operationConflict('Explicit Skill invocation was durably rejected'), + skillInvocation: existing.skillInvocation, + }; + } + const prepared = await this.prepareHostedSkillInvocationContent( + input.sessionId, + input.turnId, + content, + skillIds, + context.connectionId, + ); + if (prepared.kind === 'ready' || !prepared.skillInvocation) return prepared; + const committed = await this.stores.agentRunStore.commitRootTurnStartRejection({ + sessionId: input.sessionId, + turnId: input.turnId, + execution, + skillInvocation: prepared.skillInvocation, + rejectedAt: Date.now(), + }); + if (committed.kind === 'conflict') { + return { + kind: 'rejected', + outcome: operationConflict( + 'Turn identity belongs to a different rejected Skill invocation', + ), + }; + } + return prepared; + }, + }, + context, + ); + const rejection = await this.stores.agentRunStore.readRootTurnStartRejection( + input.sessionId, + input.turnId, + ); + if (rejection && isDeepStrictEqual(rejection.execution, execution)) { + return { + ok: true, + result: { kind: 'blocked', skillInvocation: rejection.skillInvocation }, + }; + } + if (!outcome.ok) return outcome; + const admission = await this.stores.agentRunStore.readRootTurnAdmission( + input.sessionId, + input.turnId, + ); + if (!admission) { + throw new RuntimeMessageAuthorityInvariantError( + 'Started Skill invocation is missing its durable root Turn admission', + ); + } + return { + ok: true, + result: { + kind: 'started', + turn: outcome.result, + skillInvocation: admission.skillInvocation ?? EMPTY_SKILL_INVOCATION, + }, + }; } private async prepareHostedSkillInvocationContent( @@ -1713,11 +1828,13 @@ export class RootTurnCoordinator { return { kind: 'rejected', outcome: operationConflict(preview.value.error), + skillInvocation: preview.value.skillInvocation, }; } return { kind: 'ready', content: preview.value.content, + skillInvocation: preview.value.skillInvocation, commitCapabilityBinding: preview.commit, }; } @@ -1728,8 +1845,16 @@ export class RootTurnCoordinator { content: MessageContent, skillIds: readonly string[], ): Promise< - | { readonly kind: 'ready'; readonly content: MessageContent } - | { readonly kind: 'rejected'; readonly error: string } + | { + readonly kind: 'ready'; + readonly content: MessageContent; + readonly skillInvocation: SkillInvocationResult; + } + | { + readonly kind: 'rejected'; + readonly error: string; + readonly skillInvocation?: SkillInvocationResult; + } > { if (!this.prepareSkillInvocation) { return { kind: 'rejected', error: 'Hosted Skill invocation authority is unavailable' }; @@ -1740,9 +1865,23 @@ export class RootTurnCoordinator { text: content.text, skillIds, }); + let skillInvocation: SkillInvocationResult; + try { + skillInvocation = decodeSkillInvocationResult(prepared.skillInvocation); + } catch { + return { kind: 'rejected', error: 'Hosted Skill invocation feedback is invalid' }; + } return prepared.disposition === 'blocked' - ? { kind: 'rejected', error: 'Explicit Skill invocation could not be resolved' } - : { kind: 'ready', content: composeHostedSkillInvocationContent(content, prepared) }; + ? { + kind: 'rejected', + error: 'Explicit Skill invocation could not be resolved', + skillInvocation, + } + : { + kind: 'ready', + content: composeHostedSkillInvocationContent(content, { ...prepared, skillInvocation }), + skillInvocation, + }; } private regenerateTurn( @@ -1770,7 +1909,7 @@ export class RootTurnCoordinator { private startRootMessage( request: RootMessageStartRequest, context: ConnectionContext, - ): Promise { + ): Promise { return this.runCommand(async () => { await this.awaitTerminalRootCleanup(request.sessionId); const activeAtEntry = this.#activeBySession.has(request.sessionId); @@ -1896,6 +2035,7 @@ export class RootTurnCoordinator { execution: request.execution, normalizedInput: canonicalContent.content, ...(request.turnOrchestration ? { turnOrchestration: request.turnOrchestration } : {}), + ...(prepared.skillInvocation ? { skillInvocation: prepared.skillInvocation } : {}), sourceMessages: [], admittedAt: Date.now(), }); @@ -2590,22 +2730,14 @@ export class RootTurnCoordinator { private async resolveStartDisposition( input: Pick, disposition: TurnStartDisposition, - ): Promise { + ): Promise { if (disposition.kind === 'complete') return disposition.outcome; await disposition.active.startSettled.promise; - let result = await this.readCanonicalSnapshot( + const result = await this.readCanonicalSnapshot( input.sessionId, input.turnId, disposition.active.runId, ); - if (isTerminalSnapshot(result)) { - await disposition.active.done; - result = await this.readCanonicalSnapshot( - input.sessionId, - input.turnId, - disposition.active.runId, - ); - } return { ok: true, result, @@ -2661,6 +2793,10 @@ export class RootTurnCoordinator { ...(input.turnOrchestration ? { turnOrchestration: input.turnOrchestration } : {}), + ...(active.descriptor.kind === 'external_message' && + active.descriptor.maxSteps !== undefined + ? { maxSteps: active.descriptor.maxSteps } + : {}), ...(messageOrigin ? { origin: messageOrigin } : {}), }, { @@ -3141,7 +3277,7 @@ function preflightRootMessageContent( content: MessageContent, ): | { readonly ok: true; readonly content: MessageContent } - | { readonly ok: false; readonly outcome: TurnStartOutcome } { + | { readonly ok: false; readonly outcome: RootMessageStartOutcome } { try { return { ok: true, @@ -3388,6 +3524,10 @@ function activationInputForAdmission(admission: RootTurnAdmission): RootTurnActi ...(admission.turnOrchestration ? { turnOrchestration: { ...admission.turnOrchestration } } : {}), + ...(admission.execution.kind === 'external_message' && + admission.execution.maxSteps !== undefined + ? { maxSteps: admission.execution.maxSteps } + : {}), }; } @@ -3670,7 +3810,7 @@ function isInteractionAnswerAck(event: SessionEvent): boolean { return event.type === 'user_question_answer_ack'; } -function completedStart(outcome: TurnStartOutcome): TurnStartDisposition { +function completedStart(outcome: RootMessageStartOutcome): TurnStartDisposition { return { kind: 'complete', outcome }; } diff --git a/packages/runtime-host/src/server/runtime-policy-coordinator.ts b/packages/runtime-host/src/server/runtime-policy-coordinator.ts index 368c46b90c..9e03d84877 100644 --- a/packages/runtime-host/src/server/runtime-policy-coordinator.ts +++ b/packages/runtime-host/src/server/runtime-policy-coordinator.ts @@ -5,7 +5,9 @@ import type { CredentialLocator, CredentialStatus, MutateRuntimePolicyResult, + RuntimePolicySnapshot, } from '@maka/core/runtime-policy'; +import type { MakaTool } from '@maka/runtime'; import { authenticateRuntimePolicyStoresWriter, RuntimePolicyStoreError, @@ -29,6 +31,7 @@ import { type RuntimePolicyMutateInput, } from '../protocol/index.js'; import type { RuntimePolicyOperationHandlerMap } from './operation-dispatcher.js'; +import { buildHostAgentSettingsTools } from './agent-settings-tools.js'; import { RuntimePolicyActivationGate } from './runtime-policy-activation-gate.js'; type StoreQueryOutcome = @@ -63,6 +66,7 @@ type StoreMutationOutcome = /** Runtime Host control-plane projection over the authentic interactive policy stores. */ export class HostRuntimePolicyCoordinator { + readonly modelTools: readonly MakaTool[]; readonly handlers: RuntimePolicyOperationHandlerMap = { 'runtime.policy.query': () => this.#queryPolicy(), 'runtime.policy.mutate': (input) => this.#mutatePolicy(input), @@ -84,6 +88,10 @@ export class HostRuntimePolicyCoordinator { private readonly onCommittedMutation: () => Promise = async () => {}, ) { this.#stores = authenticateRuntimePolicyStoresWriter(stores); + this.modelTools = buildHostAgentSettingsTools({ + read: async () => requirePolicyQuery(await this.#queryPolicy()), + mutate: async (input) => requirePolicyMutation(await this.#mutatePolicy(input)), + }); } async #queryPolicy(): Promise> { @@ -338,6 +346,20 @@ function projectPolicyMutation(result: MutateRuntimePolicyResult) { : result; } +function requirePolicyQuery( + outcome: OperationOutcome<'runtime.policy.query'>, +): RuntimePolicySnapshot { + if (outcome.ok) return outcome.result; + throw new Error(`Runtime Policy query failed: ${outcome.error.message}`); +} + +function requirePolicyMutation( + outcome: OperationOutcome<'runtime.policy.mutate'>, +): Extract, { readonly ok: true }>['result'] { + if (outcome.ok) return outcome.result; + throw new Error(`Runtime Policy mutation failed: ${outcome.error.message}`); +} + function committedCatalogRevision(snapshot: ConnectionCatalogSnapshot) { return { kind: 'committed' as const, catalogRevision: snapshot.revision }; } diff --git a/packages/runtime-host/src/server/runtime-resource-coordinator.ts b/packages/runtime-host/src/server/runtime-resource-coordinator.ts index f5fad77885..bb1cfacf8f 100644 --- a/packages/runtime-host/src/server/runtime-resource-coordinator.ts +++ b/packages/runtime-host/src/server/runtime-resource-coordinator.ts @@ -1,4 +1,5 @@ import { createHash } from 'node:crypto'; +import { userInfo } from 'node:os'; import type { ShellRunSnapshotResult, ShellRunUpdate, ToolResultContent } from '@maka/core/events'; import { isActiveShellRunStatus } from '@maka/core/shell-run'; import { @@ -7,8 +8,10 @@ import { type RuntimeResourceReader, type ShellRunBashInput, type ShellRunLauncher, + type ShellRunPtySnapshot, type ShellRunWriteInput, ShellRunPtyControlClosedError, + defaultShellPlan, isShellRunResourceRef, } from '@maka/runtime'; import { isSessionNotFoundError } from '@maka/storage/execution-stores'; @@ -17,6 +20,8 @@ import { decodeRuntimeResourceControllerControlResult, decodeRuntimeResourceQueryResult, decodeRuntimeResourceStopResult, + decodeRuntimeResourceStartResult, + RUNTIME_RESOURCE_CONTROLLER_ACQUIRE_RESULT_MAX_BYTES, RUNTIME_RESOURCE_MAX_CONTROL_SEQUENCE, type OperationOutcome, type RuntimeResourceControllerAcquireInput, @@ -28,6 +33,7 @@ import { type RuntimeResourceQueryResult, type RuntimeResourceRevision, type RuntimeResourceStopInput, + type RuntimeResourceStartInput, } from '../protocol/index.js'; import type { RuntimeHostResidency } from './host-kernel.js'; import type { @@ -51,7 +57,11 @@ interface RuntimeResourceSessionReader { } interface RuntimeResourceHeaderReader { - readHeader(sessionId: string): Promise<{ readonly status: string; readonly isArchived: boolean }>; + readHeader(sessionId: string): Promise<{ + readonly cwd: string; + readonly status: string; + readonly isArchived: boolean; + }>; } interface RuntimeResourceManager @@ -60,6 +70,7 @@ interface RuntimeResourceManager BackgroundTaskStopper, PtyControlWriter { inspectResource(sessionId: string, ref: string): Promise; + getLivePtySnapshot(sessionId: string, ref: string): ShellRunPtySnapshot | null; terminateAll(): Promise; } @@ -94,6 +105,7 @@ export class HostRuntimeResourceCoordinator { readonly handlers: RuntimeResourceOperationHandlerMap = { 'runtime.resource.query': (input) => this.#query(input), + 'runtime.resource.start': (input) => this.#start(input), 'runtime.resource.controller.acquire': (input, context) => this.#acquire(input, context), 'runtime.resource.controller.control': (input, context) => this.#control(input, context), 'runtime.resource.controller.release': (input, context) => this.#release(input, context), @@ -124,11 +136,22 @@ export class HostRuntimeResourceCoordinator this.#onProjectionChanged = input.onProjectionChanged ?? (() => undefined); } - runForegroundBash(input: ShellRunBashInput): ReturnType { - return this.#sessionAdmission.run(input.sessionId, async () => { - await this.#assertActiveSession(input.sessionId); - return this.#manager.runForegroundBash(input); - }); + async runForegroundBash( + input: ShellRunBashInput, + ): Promise>> { + if (this.#draining) throw new Error('Runtime resources are draining'); + const residency = this.#acquireResidency(); + try { + const { execution } = await this.#sessionAdmission.run(input.sessionId, async () => { + if (this.#draining) throw new Error('Runtime resources are draining'); + await this.#assertActiveSession(input.sessionId); + if (this.#draining) throw new Error('Runtime resources are draining'); + return { execution: this.#manager.runForegroundBash(input) }; + }); + return await execution; + } finally { + residency.release(); + } } async runBackgroundBash( @@ -298,6 +321,51 @@ export class HostRuntimeResourceCoordinator }); } + async #start( + input: RuntimeResourceStartInput, + ): Promise> { + const unavailable = await this.#mutableSessionFailure(input.sessionId); + if (unavailable) return mutationFailure('runtime.resource.start', unavailable); + try { + const header = await this.#sessionHeaders.readHeader(input.sessionId); + const shell = defaultShellPlan(); + const env = { ...process.env }; + let command: string; + if (shell.kind === 'posix') { + env.SHELL ||= userInfo().shell || (process.platform === 'darwin' ? '/bin/zsh' : '/bin/sh'); + env.DISABLE_AUTO_UPDATE = 'true'; + env.DISABLE_UPDATE_PROMPT = 'true'; + command = 'exec "$SHELL" -l'; + } else if (shell.kind === 'cmd') { + command = '%ComSpec% /d /q'; + } else { + const executable = (shell.exe ?? shell.displayName).replace(/'/g, "''"); + command = `& '${executable}' -NoLogo`; + } + const launched = await this.runBackgroundBash({ + sessionId: input.sessionId, + sourceTurnId: input.launchId, + sourceToolCallId: input.launchId, + cwd: header.cwd, + command, + env, + pty: true, + emitOutput: () => undefined, + shell, + }); + return { + ok: true, + result: decodeRuntimeResourceStartResult({ + resource: boundedRuntimeResourceSnapshot( + await this.#manager.inspectResource(input.sessionId, launched.ref), + ), + }), + }; + } catch (error) { + return this.#resourceFailure('runtime.resource.start', error); + } + } + #acquire( input: RuntimeResourceControllerAcquireInput, context: ConnectionContext, @@ -350,13 +418,21 @@ export class HostRuntimeResourceCoordinator }; this.#controllers.set(key, controller); this.#controllerResources.set(identity, key); + const pty = this.#manager.getLivePtySnapshot(input.sessionId, input.ref); + if (!pty) { + this.#releaseController(key); + return mutationFailure('runtime.resource.controller.acquire', { + code: 'operation_conflict', + message: 'Runtime Resource PTY is no longer available', + }); + } return { ok: true, - result: decodeRuntimeResourceControllerAcquireResult({ - controllerId: controller.controllerId, - nextSequence: controller.nextSequence, - resource: boundedRuntimeResourceSnapshot(snapshot), - }), + result: boundedControllerAcquireResult( + controller.controllerId, + controller.nextSequence, + pty, + ), }; } catch (error) { return this.#resourceFailure('runtime.resource.controller.acquire', error); @@ -598,6 +674,27 @@ function controlWrite( } } +function boundedControllerAcquireResult( + controllerId: string, + nextSequence: number, + snapshot: ShellRunPtySnapshot, +): ReturnType { + const pty = structuredClone(snapshot); + let result = { controllerId, nextSequence, pty }; + while ( + Buffer.byteLength(JSON.stringify(result), 'utf8') > + RUNTIME_RESOURCE_CONTROLLER_ACQUIRE_RESULT_MAX_BYTES + ) { + const codePoints = Array.from(pty.buffer); + if (codePoints.length === 0) { + throw new Error('Runtime Resource PTY metadata exceeds the wire limit'); + } + pty.buffer = codePoints.slice(Math.ceil(codePoints.length / 2)).join(''); + result = { controllerId, nextSequence, pty }; + } + return decodeRuntimeResourceControllerAcquireResult(result); +} + function decodeCursor(cursor: string): number | undefined { if (!/^(?:0|[1-9]\d*)$/.test(cursor)) return undefined; const offset = Number(cursor); diff --git a/packages/runtime-host/src/server/session-catalog-change-service.ts b/packages/runtime-host/src/server/session-catalog-change-service.ts new file mode 100644 index 0000000000..3ba571eb8a --- /dev/null +++ b/packages/runtime-host/src/server/session-catalog-change-service.ts @@ -0,0 +1,40 @@ +import type { SessionCatalogChangedFrame } from '../protocol/index.js'; + +export interface SessionCatalogChangeConnection { + close(): void; +} + +interface SessionCatalogChangeSink { + send(frame: SessionCatalogChangedFrame): Promise; +} + +export class HostSessionCatalogChangeService { + readonly #connections = new Map(); + #revision = 0; + + attachConnection( + connectionId: string, + sink: SessionCatalogChangeSink, + ): SessionCatalogChangeConnection { + this.#connections.set(connectionId, sink); + return { + close: () => { + if (this.#connections.get(connectionId) === sink) this.#connections.delete(connectionId); + }, + }; + } + + publish(sessionId: string): void { + this.#revision += 1; + const frame: SessionCatalogChangedFrame = { + kind: 'session.catalog.changed', + revision: this.#revision, + sessionId, + }; + for (const [connectionId, sink] of this.#connections) { + void sink.send(frame).catch(() => { + if (this.#connections.get(connectionId) === sink) this.#connections.delete(connectionId); + }); + } + } +} diff --git a/packages/runtime-host/src/server/session-continuity-coordinator.ts b/packages/runtime-host/src/server/session-continuity-coordinator.ts index 79fc73023c..3729455157 100644 --- a/packages/runtime-host/src/server/session-continuity-coordinator.ts +++ b/packages/runtime-host/src/server/session-continuity-coordinator.ts @@ -6,7 +6,9 @@ import { encodeProtocolFrame, RUNTIME_HOST_MAX_FRAME_BYTES, SESSION_LIVE_DELTA_MAX_BYTES, + SESSION_RUNTIME_RESOURCE_PTY_DATA_MAX_BYTES, SESSION_RUNTIME_RESOURCE_CHANGES_MAX, + SESSION_SUBSCRIPTION_FRAME_MAX_BYTES, SESSION_TOOL_NAME_MAX_BYTES, type AgentGraphChangedFrame, type AgentGraphChangedReason, @@ -16,6 +18,7 @@ import { type SessionDomainChange, type SessionDomainChangedFrame, type SessionEventFrame, + type SessionRuntimeResourcePtyDataFrame, type SessionToolEvent, type SessionTranscriptQueryInput, type OperationOutcome, @@ -179,6 +182,7 @@ export class SessionContinuityCoordinator implements SessionContinuityService { private readonly sessionAdmission: SessionAdmissionGate, private readonly onPublicationFailure: (error: unknown) => void = () => undefined, readTranscript?: ReadSessionTranscript, + private readonly onCatalogChanged: (sessionId: string) => void = () => undefined, ) { this.#hostEpoch = hostEpoch; this.#readCanonical = readCanonical; @@ -215,6 +219,7 @@ export class SessionContinuityCoordinator implements SessionContinuityService { } async refreshCanonical(sessionId: string, admission?: SessionAdmissionLease): Promise { + this.onCatalogChanged(sessionId); await this.#runInSessionLane( sessionId, async () => { @@ -336,6 +341,47 @@ export class SessionContinuityCoordinator implements SessionContinuityService { } } + /** Publish live PTY bytes on the same ordered Session subscription as its durable projection. */ + async enqueueRuntimeResourcePtyData(event: { + sessionId: string; + ref: string; + sequence: number; + data: string; + }): Promise { + if ( + this.#closed || + Buffer.byteLength(event.data, 'utf8') > SESSION_RUNTIME_RESOURCE_PTY_DATA_MAX_BYTES + ) { + return; + } + try { + await this.sessionAdmission.enqueueDetached(event.sessionId, () => { + if (this.#closed) return; + const state = this.#sessions.get(event.sessionId); + if (!state) return; + for (const subscriber of state.subscribers.values()) { + const frame: SessionRuntimeResourcePtyDataFrame = { + kind: 'subscription.runtime_resource_pty_data', + hostEpoch: this.#hostEpoch, + subscriptionId: subscriber.subscriptionId, + sequence: subscriber.nextSequence, + sessionId: event.sessionId, + ref: event.ref, + ptySequence: event.sequence, + data: event.data, + }; + if ( + Buffer.byteLength(JSON.stringify(frame), 'utf8') <= SESSION_SUBSCRIPTION_FRAME_MAX_BYTES + ) { + this.#enqueue(subscriber, frame); + } + } + }); + } catch (error) { + this.onPublicationFailure(error); + } + } + #scheduleSessionDomainChanges(sessionId: string, changes: PendingSessionDomainChanges): void { void this.sessionAdmission .enqueueDetached(sessionId, () => { diff --git a/packages/runtime-host/src/server/skill-catalog-coordinator.ts b/packages/runtime-host/src/server/skill-catalog-coordinator.ts index 55ff46cb8c..228fa403d6 100644 --- a/packages/runtime-host/src/server/skill-catalog-coordinator.ts +++ b/packages/runtime-host/src/server/skill-catalog-coordinator.ts @@ -1,11 +1,13 @@ import type { OperationOutcome, + SkillCatalogInvocableQueryInput, SkillCatalogLocalContext, SkillCatalogMutateInput, SkillCatalogPreviewUpdateInput, SkillCatalogQueryInput, } from '../protocol/index.js'; -import type { SkillCatalogOperationHandlerMap } from './operation-dispatcher.js'; +import type { ConnectionContext, SkillCatalogOperationHandlerMap } from './operation-dispatcher.js'; +import type { HostCapabilities } from '@maka/runtime'; import { SkillCatalogRepository, SkillCatalogRepositoryError, @@ -14,24 +16,41 @@ import { type CatalogOperation = | 'skill.catalog.query' + | 'skill.catalog.invocable.query' | 'skill.catalog.mutate' | 'skill.catalog.preview-update'; +export interface SkillCatalogInvocableContext { + readonly projectRoot: string; + readonly host: HostCapabilities; +} + +export type SkillCatalogInvocableContextResolver = ( + input: SkillCatalogInvocableQueryInput, + context: ConnectionContext, +) => Promise; + /** Serialized single authority lane for catalog recovery, reads, and mutations. */ export class HostSkillCatalogCoordinator { readonly handlers: SkillCatalogOperationHandlerMap = { 'skill.catalog.query': (input) => this.query(input), + 'skill.catalog.invocable.query': (input, context) => this.queryInvocable(input, context), 'skill.catalog.mutate': (input) => this.mutate(input), 'skill.catalog.preview-update': (input) => this.previewUpdate(input), }; readonly #repository: SkillCatalogRepository; + readonly #resolveInvocableContext: SkillCatalogInvocableContextResolver | undefined; #accepting = true; #tail: Promise = Promise.resolve(); #closePromise: Promise | undefined; - constructor(repository: SkillCatalogRepository) { + constructor( + repository: SkillCatalogRepository, + resolveInvocableContext?: SkillCatalogInvocableContextResolver, + ) { this.#repository = repository; + this.#resolveInvocableContext = resolveInvocableContext; } recover(): Promise { @@ -42,6 +61,29 @@ export class HostSkillCatalogCoordinator { return this.#admitProtocolOperation('skill.catalog.query', () => this.#repository.query(input)); } + queryInvocable( + input: SkillCatalogInvocableQueryInput, + context: ConnectionContext, + ): Promise> { + if (!this.#resolveInvocableContext) { + return Promise.resolve({ + ok: false, + error: { + code: 'operation_unavailable', + message: 'Invocable Skill catalog context is unavailable', + }, + }); + } + return this.#admitProtocolOperation('skill.catalog.invocable.query', async () => { + const resolved = await this.#resolveInvocableContext!(input, context); + return this.#repository.queryInvocable( + input, + { projectRoot: resolved.projectRoot }, + resolved.host, + ); + }); + } + mutate(input: SkillCatalogMutateInput): Promise> { return this.#admitProtocolOperation('skill.catalog.mutate', () => this.#repository.mutate(input), diff --git a/packages/runtime-host/src/server/skill-catalog-repository.ts b/packages/runtime-host/src/server/skill-catalog-repository.ts index b142202b09..05665747b2 100644 --- a/packages/runtime-host/src/server/skill-catalog-repository.ts +++ b/packages/runtime-host/src/server/skill-catalog-repository.ts @@ -1,6 +1,6 @@ import { createHash, randomUUID } from 'node:crypto'; -import { lstat, mkdir, open, readdir, realpath, rename, stat, unlink } from 'node:fs/promises'; -import { isAbsolute, join, resolve } from 'node:path'; +import { lstat, mkdir, open, readdir, realpath, rename, rm, stat, unlink } from 'node:fs/promises'; +import { dirname, isAbsolute, join, resolve } from 'node:path'; import { BUNDLED_SKILL_CATALOG, buildStarterSkillTemplate, @@ -10,6 +10,7 @@ import { encodeSkillRuntimePreferences, getSkillRuntimePreference, getBundledSkillSource, + gateSkillsByHostCapabilities, invalidSkillLockStatus, isPathInside, isSafeSkillId, @@ -30,6 +31,7 @@ import { validateSkillMetadata, type BundledSkillSource, type ManagedSkillSourceRecord, + type HostCapabilities, type ScannedSkill, type SkillDiscoveryDiagnostic, type SkillGovernanceStatus, @@ -53,6 +55,9 @@ import { isSkillCatalogProjectRootLexicallyAbsolute, type SkillCatalogBundledItem, type SkillCatalogGovernanceItem, + type SkillCatalogInvocableItem, + type SkillCatalogInvocableQueryInput, + type SkillCatalogInvocableQueryResult, type SkillCatalogLocalContext, type SkillCatalogManagedSourceItem, type SkillCatalogMutateInput, @@ -142,14 +147,25 @@ interface RepositorySnapshot { interface PublicationNamespace { readonly status: 'available' | 'missing' | 'blocked_path' | 'read_failed'; readonly occupiedIds: readonly string[]; - readonly deletionFacts: ReadonlyMap; + readonly deletionFacts: ReadonlyMap; } -interface DeletionFact { +interface WorkspaceDeletionFact { + readonly kind: 'workspace'; readonly skillId: string; readonly manifest: SkillDeletionManifest; } +interface UserDeletionFact { + readonly kind: 'user'; + readonly skillId: string; + readonly path: string; + readonly discoveryDirectory: string; + readonly containmentRoot: string; +} + +type DeletionFact = WorkspaceDeletionFact | UserDeletionFact; + interface InstalledFact { readonly skill: ScannedSkill; readonly governance: SkillGovernanceStatus; @@ -222,6 +238,39 @@ export class SkillCatalogRepository { return createPage(snapshot.revision, input.view, items, offset); } + async queryInvocable( + input: SkillCatalogInvocableQueryInput, + context: SkillCatalogLocalContext, + host: HostCapabilities, + ): Promise { + const snapshot = await this.#freshSnapshot(context); + const revision = invocableRevision(snapshot.revision, host); + if (input.kind === 'continue' && input.revision !== revision) { + return { + kind: 'revision_changed', + expectedRevision: input.revision, + actualRevision: revision, + }; + } + const items = gateSkillsByHostCapabilities( + snapshot.model.inventory.filter((skill) => skill.enabled), + host, + ).flatMap((skill): SkillCatalogInvocableItem[] => + skill.eligible + ? [{ ref: skill.ref, id: skill.id, name: skill.name, description: skill.description }] + : [], + ); + const offset = input.kind === 'start' ? 0 : decodeInvocableCursor(input.cursor); + if ( + offset === null || + offset > items.length || + (input.kind === 'continue' && offset === items.length) + ) { + throw invalidRequest('Invocable Skill catalog cursor is invalid'); + } + return createInvocablePage(revision, items, offset); + } + async mutate(input: SkillCatalogMutateInput): Promise { const current = await this.#freshSnapshot(input.context); if (current.revision !== input.expectedRevision) { @@ -586,7 +635,12 @@ export class SkillCatalogRepository { item.scope === 'workspace' && item.source === 'legacy' ? 'blocked_path' : 'blocked_scope', }; } - await this.#transactions.deleteWorkspaceSkill(deletion.skillId, deletion.manifest); + if (deletion.kind === 'workspace') { + await this.#transactions.deleteWorkspaceSkill(deletion.skillId, deletion.manifest); + } else { + const rejected = await deleteUserSkill(deletion); + if (rejected) return { ok: false, reason: rejected }; + } return { ok: true, execution: { changed: true, ref: null } }; } @@ -649,6 +703,7 @@ async function buildSnapshot(input: { ); } const managedById = new Map(managedSources.map((source) => [source.id, source])); + const deletionFacts = collectDeletionFacts(input.scan, input.publicationNamespace.deletionFacts); const diagnosticsByPath = new Map(input.scan.diagnostics.map((entry) => [entry.path, entry])); const installedFacts = new Map(); const governance: SkillCatalogGovernanceItem[] = []; @@ -725,13 +780,11 @@ async function buildSnapshot(input: { effectiveMigration === null ? false : isSkillPreferenceReviewPending(effectiveMigration, skill.id), - manageable: input.publicationNamespace.deletionFacts.has(skill.ref), + manageable: deletionFacts.has(skill.ref), }), ); } - governance.push( - ...rejectedGovernance(input.scan, input.publicationNamespace.deletionFacts, effectiveMigration), - ); + governance.push(...rejectedGovernance(input.scan, deletionFacts, effectiveMigration)); const representedRefs = new Set(governance.map((item) => item.ref)); for (const [ref, fact] of input.publicationNamespace.deletionFacts) { if (representedRefs.has(ref)) continue; @@ -812,10 +865,77 @@ async function buildSnapshot(input: { installedFacts, managedSourceHashes: new Map(managedSources.map((source) => [source.id, source.contentSha256])), publicationNamespace: input.publicationNamespace, - deletionFacts: input.publicationNamespace.deletionFacts, + deletionFacts, }); } +function collectDeletionFacts( + scan: SkillScanResult, + workspaceFacts: ReadonlyMap, +): ReadonlyMap { + const facts = new Map(workspaceFacts); + for (const skill of [...scan.inventory, ...scan.rejected]) { + const fact = userDeletionFact(skill); + if (fact) facts.set(skill.ref, fact); + } + return facts; +} + +function userDeletionFact( + skill: Pick, +): UserDeletionFact | undefined { + if ( + skill.scope !== 'user' || + (skill.source !== 'maka' && skill.source !== 'agents') || + !isSafeSkillId(skill.id) + ) { + return undefined; + } + const containmentRoot = resolve(skill.discoveryRoot); + const discoveryDirectory = join(containmentRoot, `.${skill.source}`, 'skills'); + const path = join(discoveryDirectory, skill.id); + if (resolve(skill.path) !== path) return undefined; + return { kind: 'user', skillId: skill.id, path, discoveryDirectory, containmentRoot }; +} + +async function deleteUserSkill( + fact: UserDeletionFact, +): Promise<'not_found' | 'blocked_path' | undefined> { + try { + const [directoryStat, skillStat] = await Promise.all([ + lstat(fact.discoveryDirectory), + lstat(fact.path), + ]); + if ( + !directoryStat.isDirectory() || + directoryStat.isSymbolicLink() || + !skillStat.isDirectory() || + skillStat.isSymbolicLink() + ) { + return 'blocked_path'; + } + const [rootReal, directoryReal, skillReal] = await Promise.all([ + realpath(fact.containmentRoot), + realpath(fact.discoveryDirectory), + realpath(fact.path), + ]); + if ( + !isPathInside(rootReal, directoryReal) || + dirname(skillReal) !== directoryReal || + skillReal !== join(directoryReal, fact.skillId) + ) { + return 'blocked_path'; + } + await rm(fact.path, { recursive: true }); + return undefined; + } catch (error) { + if ((error as NodeJS.ErrnoException).code === 'ENOENT') return 'not_found'; + throw new SkillCatalogRepositoryError('persistence_failed', 'User Skill could not be deleted', { + cause: error, + }); + } +} + function governanceContextStatus( skill: ScannedSkill, enabled: boolean, @@ -1294,6 +1414,86 @@ function decodeCursor(cursor: string, view: SkillCatalogView): number | null { } } +function invocableRevision( + catalogRevision: SkillCatalogRevision, + host: HostCapabilities, +): SkillCatalogRevision { + const digest = createHash('sha256') + .update( + JSON.stringify({ + catalogRevision, + toolNames: [...host.toolNames].sort(), + capabilities: [...(host.capabilities ?? [])].sort(), + }), + ) + .digest('hex'); + return `sha256:${digest}`; +} + +function createInvocablePage( + revision: SkillCatalogRevision, + items: readonly SkillCatalogInvocableItem[], + offset: number, +): SkillCatalogInvocableQueryResult { + const pageItems: SkillCatalogInvocableItem[] = []; + let cursor = offset; + while (cursor < items.length && pageItems.length < SKILL_CATALOG_PAGE_MAX_ITEMS) { + const candidate = [...pageItems, items[cursor]]; + const hasMore = cursor + 1 < items.length; + const result = { + kind: 'page' as const, + revision, + items: candidate, + nextCursor: hasMore ? encodeInvocableCursor(cursor + 1) : null, + }; + if (jsonBytes(result) > SKILL_CATALOG_PAGE_MAX_BYTES) { + if (pageItems.length === 0) { + throw new SkillCatalogRepositoryError( + 'persistence_failed', + 'An invocable Skill metadata item exceeds the page projection bound', + ); + } + break; + } + pageItems.push(items[cursor]); + cursor += 1; + } + return { + kind: 'page', + revision, + items: Object.freeze(pageItems), + nextCursor: cursor < items.length ? encodeInvocableCursor(cursor) : null, + }; +} + +function encodeInvocableCursor(offset: number): string { + return Buffer.from(JSON.stringify({ v: 1, kind: 'invocable', offset }), 'utf8').toString( + 'base64url', + ); +} + +function decodeInvocableCursor(cursor: string): number | null { + try { + const decoded = JSON.parse(Buffer.from(cursor, 'base64url').toString('utf8')) as unknown; + if ( + typeof decoded !== 'object' || + decoded === null || + !('v' in decoded) || + decoded.v !== 1 || + !('kind' in decoded) || + decoded.kind !== 'invocable' || + !('offset' in decoded) || + !Number.isSafeInteger(decoded.offset) || + (decoded.offset as number) < 0 + ) { + return null; + } + return decoded.offset as number; + } catch { + return null; + } +} + async function canonicalProjectRoot(value: string): Promise { if (!isSkillCatalogProjectRootLexicallyAbsolute(value)) { throw new Error('Project root must be absolute'); @@ -1336,12 +1536,13 @@ async function readPublicationNamespace(root: string): Promise publicationId(entry.name)).sort(); - const deletionFacts = new Map(); + const deletionFacts = new Map(); for (const entry of entries) { if (!entry.isDirectory() || entry.isSymbolicLink() || !isSafeSkillId(entry.name)) continue; try { const manifest = await snapshotWorkspaceSkillTree(root, entry.name); deletionFacts.set(`workspace:legacy:${entry.name}`, { + kind: 'workspace', skillId: entry.name, manifest, }); diff --git a/apps/desktop/resources/bundled-skills/brand-guidelines/SKILL.md b/packages/runtime/resources/bundled-skills/brand-guidelines/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/brand-guidelines/SKILL.md rename to packages/runtime/resources/bundled-skills/brand-guidelines/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/changelog-generator/SKILL.md b/packages/runtime/resources/bundled-skills/changelog-generator/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/changelog-generator/SKILL.md rename to packages/runtime/resources/bundled-skills/changelog-generator/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/competitive-ads-extractor/SKILL.md b/packages/runtime/resources/bundled-skills/competitive-ads-extractor/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/competitive-ads-extractor/SKILL.md rename to packages/runtime/resources/bundled-skills/competitive-ads-extractor/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/computer-use/SKILL.md b/packages/runtime/resources/bundled-skills/computer-use/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/computer-use/SKILL.md rename to packages/runtime/resources/bundled-skills/computer-use/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/content-research-writer/SKILL.md b/packages/runtime/resources/bundled-skills/content-research-writer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/content-research-writer/SKILL.md rename to packages/runtime/resources/bundled-skills/content-research-writer/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/copywriting/SKILL.md b/packages/runtime/resources/bundled-skills/copywriting/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/copywriting/SKILL.md rename to packages/runtime/resources/bundled-skills/copywriting/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/create-plan/SKILL.md b/packages/runtime/resources/bundled-skills/create-plan/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/create-plan/SKILL.md rename to packages/runtime/resources/bundled-skills/create-plan/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/data-analysis/SKILL.md b/packages/runtime/resources/bundled-skills/data-analysis/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/data-analysis/SKILL.md rename to packages/runtime/resources/bundled-skills/data-analysis/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/deep-research/SKILL.md b/packages/runtime/resources/bundled-skills/deep-research/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/deep-research/SKILL.md rename to packages/runtime/resources/bundled-skills/deep-research/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/domain-name-brainstormer/SKILL.md b/packages/runtime/resources/bundled-skills/domain-name-brainstormer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/domain-name-brainstormer/SKILL.md rename to packages/runtime/resources/bundled-skills/domain-name-brainstormer/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/drafter-diagram/SKILL.md b/packages/runtime/resources/bundled-skills/drafter-diagram/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/drafter-diagram/SKILL.md rename to packages/runtime/resources/bundled-skills/drafter-diagram/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/file-organizer/SKILL.md b/packages/runtime/resources/bundled-skills/file-organizer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/file-organizer/SKILL.md rename to packages/runtime/resources/bundled-skills/file-organizer/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/frontend-design/SKILL.md b/packages/runtime/resources/bundled-skills/frontend-design/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/frontend-design/SKILL.md rename to packages/runtime/resources/bundled-skills/frontend-design/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/html-poster/SKILL.md b/packages/runtime/resources/bundled-skills/html-poster/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/html-poster/SKILL.md rename to packages/runtime/resources/bundled-skills/html-poster/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/html-slides/SKILL.md b/packages/runtime/resources/bundled-skills/html-slides/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/html-slides/SKILL.md rename to packages/runtime/resources/bundled-skills/html-slides/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/internal-comms/SKILL.md b/packages/runtime/resources/bundled-skills/internal-comms/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/internal-comms/SKILL.md rename to packages/runtime/resources/bundled-skills/internal-comms/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/invoice-organizer/SKILL.md b/packages/runtime/resources/bundled-skills/invoice-organizer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/invoice-organizer/SKILL.md rename to packages/runtime/resources/bundled-skills/invoice-organizer/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/lead-research-assistant/SKILL.md b/packages/runtime/resources/bundled-skills/lead-research-assistant/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/lead-research-assistant/SKILL.md rename to packages/runtime/resources/bundled-skills/lead-research-assistant/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/maka-skill-creator/SKILL.md b/packages/runtime/resources/bundled-skills/maka-skill-creator/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/maka-skill-creator/SKILL.md rename to packages/runtime/resources/bundled-skills/maka-skill-creator/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/manim-composer/SKILL.md b/packages/runtime/resources/bundled-skills/manim-composer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/manim-composer/SKILL.md rename to packages/runtime/resources/bundled-skills/manim-composer/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/market-research-reports/SKILL.md b/packages/runtime/resources/bundled-skills/market-research-reports/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/market-research-reports/SKILL.md rename to packages/runtime/resources/bundled-skills/market-research-reports/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/notion-infographic/SKILL.md b/packages/runtime/resources/bundled-skills/notion-infographic/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/notion-infographic/SKILL.md rename to packages/runtime/resources/bundled-skills/notion-infographic/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/pdf-toolkit/SKILL.md b/packages/runtime/resources/bundled-skills/pdf-toolkit/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/pdf-toolkit/SKILL.md rename to packages/runtime/resources/bundled-skills/pdf-toolkit/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/responsive-design/SKILL.md b/packages/runtime/resources/bundled-skills/responsive-design/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/responsive-design/SKILL.md rename to packages/runtime/resources/bundled-skills/responsive-design/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/seo-audit/SKILL.md b/packages/runtime/resources/bundled-skills/seo-audit/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/seo-audit/SKILL.md rename to packages/runtime/resources/bundled-skills/seo-audit/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/static-site-deploy/SKILL.md b/packages/runtime/resources/bundled-skills/static-site-deploy/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/static-site-deploy/SKILL.md rename to packages/runtime/resources/bundled-skills/static-site-deploy/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/summarization/SKILL.md b/packages/runtime/resources/bundled-skills/summarization/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/summarization/SKILL.md rename to packages/runtime/resources/bundled-skills/summarization/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/tailored-resume-generator/SKILL.md b/packages/runtime/resources/bundled-skills/tailored-resume-generator/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/tailored-resume-generator/SKILL.md rename to packages/runtime/resources/bundled-skills/tailored-resume-generator/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/theme-factory/SKILL.md b/packages/runtime/resources/bundled-skills/theme-factory/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/theme-factory/SKILL.md rename to packages/runtime/resources/bundled-skills/theme-factory/SKILL.md diff --git a/apps/desktop/resources/bundled-skills/xhs-card-designer/SKILL.md b/packages/runtime/resources/bundled-skills/xhs-card-designer/SKILL.md similarity index 100% rename from apps/desktop/resources/bundled-skills/xhs-card-designer/SKILL.md rename to packages/runtime/resources/bundled-skills/xhs-card-designer/SKILL.md diff --git a/packages/runtime/src/__tests__/agent-run-steering-recovery.test.ts b/packages/runtime/src/__tests__/agent-run-steering-recovery.test.ts index 023eb57d5f..69450deb58 100644 --- a/packages/runtime/src/__tests__/agent-run-steering-recovery.test.ts +++ b/packages/runtime/src/__tests__/agent-run-steering-recovery.test.ts @@ -11,6 +11,7 @@ import { createWorkspaceRuntimeStore, } from '@maka/storage'; import { AgentRun } from '../agent-run.js'; +import { RuntimeLedgerRepair } from '../runtime-ledger-repair.js'; import { buildStatusPatch } from '../session-projection-helpers.js'; test('rejects an invalid tool mode before a durable AgentRun can be created', async () => { @@ -210,6 +211,175 @@ test('acks a steering event whose canonical append preceded proof publication fa } }); +test('materializes a durable steering event into the transcript exactly once', async () => { + const root = await mkdtemp(join(tmpdir(), 'maka-agent-run-steering-transcript-')); + try { + const store = createSessionStore(root); + const session = await store.create({ + cwd: '/tmp/cwd', + backend: 'fake', + llmConnectionSlug: 'fake', + model: 'fake-model', + permissionMode: 'ask', + }); + const runtimeEventStore = createWorkspaceRuntimeStore(root); + const turnId = 'turn-steering-transcript'; + const sessionEvent: SessionEvent = { + type: 'steering_message', + id: 'runtime-steering-transcript', + turnId, + ts: 2, + messageId: 'message-steering-transcript', + content: { text: 'persist this interjection' }, + }; + const run = new AgentRun({ + sessionId: session.id, + header: session, + userInput: { turnId, text: 'start' }, + runId: 'run-steering-transcript', + store, + runtimeEventStore, + newId: () => 'unused-id', + now: () => 10, + hooks: { + reserveRun: async () => { + throw new Error('reserveRun should not be called'); + }, + unregisterRun: () => {}, + updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch), + updateStatus: async () => {}, + appendTurnState: async () => {}, + }, + }); + const runtimeEvent: RuntimeEvent = { + id: sessionEvent.id, + invocationId: run.invocationId, + runId: 'run-steering-transcript', + sessionId: session.id, + turnId, + ts: sessionEvent.ts, + partial: false, + role: 'user', + author: 'user', + content: { + kind: 'text', + text: sessionEvent.content.text, + displayText: '/skill:writer persist this interjection', + inlineReferences: [{ kind: 'skill', value: '/skill:writer', label: 'Writer', start: 0 }], + steering: true, + }, + refs: { providerEventId: sessionEvent.messageId }, + }; + + await run.acceptMappedEvent(sessionEvent, runtimeEvent); + await run.acceptMappedEvent(sessionEvent, runtimeEvent); + + assert.deepEqual(await store.readMessages(session.id), [ + { + type: 'user', + id: sessionEvent.messageId, + turnId, + ts: sessionEvent.ts, + text: sessionEvent.content.text, + displayText: '/skill:writer persist this interjection', + inlineReferences: [{ kind: 'skill', value: '/skill:writer', label: 'Writer', start: 0 }], + steeringEventId: sessionEvent.id, + }, + ]); + } finally { + await rm(root, { recursive: true, force: true }); + } +}); + +test('recovers a steering transcript message from the committed RuntimeEvent ledger', async () => { + const root = await mkdtemp(join(tmpdir(), 'maka-agent-run-steering-crash-cut-')); + try { + const store = createSessionStore(root); + const session = await store.create({ + cwd: '/tmp/cwd', + backend: 'fake', + llmConnectionSlug: 'fake', + model: 'fake-model', + permissionMode: 'ask', + }); + const runId = 'run-steering-crash-cut'; + const turnId = 'turn-steering-crash-cut'; + const runStore = createSqliteAgentRunStore(root); + const runtimeEventStore = createWorkspaceRuntimeStore(root); + await runStore.createRun(makeRunHeader(session.id, runId, turnId)); + const steeringContent = { + kind: 'text' as const, + text: 'canonical steering envelope', + displayText: '/skill:writer recover this interjection', + attachments: [ + { + kind: 'pdf' as const, + name: 'evidence.pdf', + mimeType: 'application/pdf', + bytes: 2048, + ref: { + kind: 'session_file' as const, + sessionId: session.id, + relativePath: 'attachments/evidence.pdf', + }, + }, + ], + quotes: [{ text: 'quoted evidence', label: 'Assistant', sourceTurnId: 'turn-source' }], + inlineReferences: [ + { kind: 'skill' as const, value: '/skill:writer', label: 'Writer', start: 0 }, + ], + steering: true as const, + }; + const runtimeEvent: RuntimeEvent = { + id: 'runtime-steering-crash-cut', + invocationId: 'invocation-steering-crash-cut', + runId, + sessionId: session.id, + turnId, + ts: 2, + partial: false, + role: 'user', + author: 'user', + content: steeringContent, + refs: { providerEventId: 'message-steering-crash-cut' }, + }; + await runtimeEventStore.appendRuntimeEvent(session.id, runId, runtimeEvent); + assert.deepEqual(await store.readMessages(session.id), []); + + const recoveredStore = createSessionStore(root); + const recoveredRunStore = createSqliteAgentRunStore(root); + const recoveredRuntimeEventStore = createWorkspaceRuntimeStore(root); + const repair = new RuntimeLedgerRepair({ + runStore: recoveredRunStore, + runtimeEventStore: recoveredRuntimeEventStore, + readMessages: (sessionId) => recoveredStore.readMessages(sessionId), + appendMessage: (sessionId, message) => recoveredStore.appendMessage(sessionId, message), + appendTurnState: async () => {}, + newId: () => 'unused-id', + now: () => 10, + }); + + assert.equal(await repair.repairSteeringMessagesOnce(session.id), 1); + assert.equal(await repair.repairSteeringMessagesOnce(session.id), 0); + assert.deepEqual(await recoveredStore.readMessages(session.id), [ + { + type: 'user', + id: 'message-steering-crash-cut', + turnId, + ts: 2, + text: 'canonical steering envelope', + displayText: '/skill:writer recover this interjection', + attachments: steeringContent.attachments, + quotes: steeringContent.quotes, + inlineReferences: steeringContent.inlineReferences, + steeringEventId: runtimeEvent.id, + }, + ]); + } finally { + await rm(root, { recursive: true, force: true }); + } +}); + test('awaits canonical Run status persistence before accepting an interaction resume', async () => { const root = await mkdtemp(join(tmpdir(), 'maka-agent-run-status-barrier-')); try { diff --git a/packages/runtime/src/__tests__/ai-sdk-backend.test.ts b/packages/runtime/src/__tests__/ai-sdk-backend.test.ts index 8b58e40ed2..e235879971 100644 --- a/packages/runtime/src/__tests__/ai-sdk-backend.test.ts +++ b/packages/runtime/src/__tests__/ai-sdk-backend.test.ts @@ -7661,7 +7661,7 @@ describe('AiSdkBackend usage telemetry', () => { assert.ok(events.some((event) => event.type === 'error')); }); - test('keeps an explicitly configured step limit', async () => { + test('lets a trusted turn override the configured step limit', async () => { const loop = countingToolLoopModel(); const durable = durableTurnHarness('turn-1', 'hi'); const backend = createTestAiSdkBackend({ @@ -7679,9 +7679,9 @@ describe('AiSdkBackend usage telemetry', () => { now: monotonicClock(), }); - await drainDurably(backend.send(durable.input()), durable); + await drainDurably(backend.send({ ...durable.input(), maxSteps: 1 }), durable); - assert.equal(loop.callCount(), 3); + assert.equal(loop.callCount(), 1); }); test('reserves the final child-agent step for a tool-free evidence summary', async () => { diff --git a/packages/runtime/src/__tests__/automation-integration.test.ts b/packages/runtime/src/__tests__/automation-integration.test.ts deleted file mode 100644 index 9d722b20bd..0000000000 --- a/packages/runtime/src/__tests__/automation-integration.test.ts +++ /dev/null @@ -1,625 +0,0 @@ -import { describe, test } from 'node:test'; -import assert from 'node:assert/strict'; -import { AutomationManager } from '../automation-state.js'; -import type { AutomationDefinition } from '../automation-state.js'; -import { AutomationScheduler } from '../automation-scheduler.js'; -import { buildAutomationTool, buildAutomationAuthorityTool } from '../automation-tools.js'; -import type { AutomationToolAuthority } from '../automation-tools.js'; -import type { MakaToolContext } from '../tool-runtime.js'; - -const SESSION_ID = 'integration-sess-1'; - -function createContext(sessionId = SESSION_ID): MakaToolContext { - return { - sessionId, - turnId: 'turn-1', - cwd: '/tmp/test', - toolCallId: 'tc-1', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; -} - -function createIntegrationSetup() { - let idCounter = 0; - let time = 1700000000000; - const timers: Array<{ fn: () => void; id: number }> = []; - let timerId = 0; - const injectedTurns: Array<{ sessionId: string; prompt: string; automationId: string }> = []; - const freshRuns: Array<{ prompt: string; automationId: string }> = []; - let canFireResult = true; - const changes: number[] = []; - - const manager = new AutomationManager({ - generateId: () => `auto-${++idCounter}`, - now: () => time, - random: () => 0, // deterministic: no schedule jitter in timing tests - }); - - const scheduler = new AutomationScheduler({ - automationManager: manager, - canFire: async () => canFireResult, - injectTurn: async (sessionId, prompt, automationId) => { - injectedTurns.push({ sessionId, prompt, automationId }); - return { runId: `run-${automationId}`, ok: true }; - }, - createFreshRun: async (prompt, automationId) => { - freshRuns.push({ prompt, automationId }); - return { runId: `fresh-${automationId}`, ok: true }; - }, - setTimeout: (fn, ms) => { - const id = ++timerId; - timers.push({ fn, id }); - return id; - }, - clearTimeout: (timer) => { - const idx = timers.findIndex((t) => t.id === timer); - if (idx >= 0) timers.splice(idx, 1); - }, - now: () => time, - onStateChange: () => { - changes.push(time); - }, - }); - - const tool = buildAutomationTool({ - automationManager: manager, - onAutomationChange: () => { - changes.push(time); - }, - cronEnabled: true, - }); - - function advanceTime(ms: number) { - time += ms; - } - async function runTick() { - const timer = timers.shift(); - if (timer) timer.fn(); - for (let i = 0; i < 5; i++) await Promise.resolve(); - await new Promise((r) => setTimeout(r, 0)); - } - - return { - manager, - scheduler, - tool, - injectedTurns, - freshRuns, - timers, - changes, - advanceTime, - runTick, - setCanFire: (v: boolean) => { - canFireResult = v; - }, - ctx: createContext, - }; -} - -describe('Automation integration: heartbeat fires on schedule', () => { - test('create heartbeat via tool, scheduler fires it', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - // Create via tool - const result = (await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'deploy check', - prompt: 'check deploy status', - schedule: { type: 'interval', seconds: 30 }, - }, - ctx, - )) as string; - - assert.ok(result.includes('Automation created')); - assert.ok(result.includes('deploy check')); - - // Advance past fire time - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - - // Should have injected a turn - assert.equal(t.injectedTurns.length, 1); - assert.ok(t.injectedTurns[0].prompt.includes('check deploy status')); - assert.ok(t.injectedTurns[0].prompt.includes('[Automation: deploy check]')); - }); -}); - -describe('Automation integration: durable flag', () => { - test('cron is durable; a durable heartbeat is coerced to session-bound', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - // Cron is durable by default (app-global, survives restart). - const cron = (await t.tool.impl( - { - mode: 'create', - kind: 'cron', - name: 'persistent check', - prompt: 'check it', - schedule: { type: 'cron', expression: '*/5 * * * *' }, - }, - ctx, - )) as string; - assert.ok(cron.includes('durable')); - assert.equal( - t.manager.listForSession(SESSION_ID).find((a) => a.name === 'persistent check')?.durable, - true, - ); - - // durable is a cron-only concept: a heartbeat stays session-bound even when - // durable:true is requested (a durable heartbeat would be a post-restart zombie). - (await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'session poll', - prompt: 'poll', - schedule: { type: 'interval', seconds: 60 }, - durable: true, - }, - ctx, - )) as string; - assert.ok( - !t.manager.listForSession(SESSION_ID).find((a) => a.name === 'session poll')?.durable, - ); - }); - - test('onAutomationChange fires on create/delete', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'a', - prompt: 'p', - schedule: { type: 'interval', seconds: 60 }, - }, - ctx, - ); - assert.equal(t.changes.length, 1); - - const automations = t.manager.listForSession(SESSION_ID); - await t.tool.impl({ mode: 'delete', id: automations[0].id }, ctx); - assert.equal(t.changes.length, 2); - }); -}); - -describe('Automation integration: pause/resume/delete via tool', () => { - test('full lifecycle: create → pause → resume → delete', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - // Create - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'lifecycle test', - prompt: 'p', - schedule: { type: 'interval', seconds: 60 }, - }, - ctx, - ); - - const auto = t.manager.listForSession(SESSION_ID)[0]; - assert.equal(auto.status, 'active'); - - // Pause - const pauseResult = (await t.tool.impl({ mode: 'pause', id: auto.id }, ctx)) as string; - assert.ok(pauseResult.includes('paused')); - assert.equal(t.manager.get(auto.id)?.status, 'paused'); - - // Paused automation should not fire - t.advanceTime(61000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.injectedTurns.length, 0); - - // Resume - const resumeResult = (await t.tool.impl({ mode: 'resume', id: auto.id }, ctx)) as string; - assert.ok(resumeResult.includes('resumed')); - assert.equal(t.manager.get(auto.id)?.status, 'active'); - - // Delete - const deleteResult = (await t.tool.impl({ mode: 'delete', id: auto.id }, ctx)) as string; - assert.ok(deleteResult.includes('deleted')); - assert.equal(t.manager.get(auto.id), undefined); - }); -}); - -describe('Automation integration: turn-tail shows active automations', () => { - test('list mode returns active automations', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'monitor deploy', - prompt: 'check', - schedule: { type: 'interval', seconds: 30 }, - }, - ctx, - ); - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'monitor ci', - prompt: 'check ci', - schedule: { type: 'cron', expression: '*/5 * * * *' }, - }, - ctx, - ); - - const listResult = (await t.tool.impl({ mode: 'list' }, ctx)) as string; - assert.ok(listResult.includes('monitor deploy')); - assert.ok(listResult.includes('monitor ci')); - assert.ok(listResult.includes('ACTIVE')); - }); - - test('list mode bounds app-global durable Automation output', async () => { - const t = createIntegrationSetup(); - t.manager.hydrate( - Array.from({ length: 101 }, (_, index) => ({ - id: `durable-${index}`, - kind: 'cron' as const, - name: `durable automation ${index}`, - status: 'paused' as const, - prompt: 'check', - sessionId: `other-session-${index}`, - schedule: { type: 'interval' as const, seconds: 60 }, - createdAt: index, - updatedAt: index, - nextFireAt: null, - lastFireAt: null, - lastRunId: null, - fireCount: 0, - maxFires: null, - expiresAt: null, - lastError: null, - consecutiveFailures: 0, - durable: true, - })), - ); - - const result = (await t.tool.impl({ mode: 'list' }, t.ctx())) as string; - assert.match(result, /durable automation 99/); - assert.doesNotMatch(result, /durable automation 100/); - assert.match(result, /1 additional automations omitted\./); - }); -}); - -describe('Automation integration: expired automations do not fire', () => { - test('automation past expiresAt is swept and does not fire', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'short-lived', - prompt: 'p', - schedule: { type: 'interval', seconds: 3600 }, - }, - ctx, - ); - - const auto = t.manager.listForSession(SESSION_ID)[0]; - // Manually set expiry to 10s from now for testing - auto.expiresAt = 1700000000000 + 10000; - - // Advance past expiry but before next fire - t.advanceTime(11000); - t.scheduler.start(); - await t.runTick(); - - assert.equal(t.injectedTurns.length, 0); - assert.equal(t.manager.get(auto.id)?.status, 'expired'); - }); -}); - -describe('Automation integration: max_fires cap', () => { - test('automation completes after reaching max_fires', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'limited', - prompt: 'p', - schedule: { type: 'interval', seconds: 10 }, - max_fires: 3, - }, - ctx, - ); - - const auto = t.manager.listForSession(SESSION_ID)[0]; - t.scheduler.start(); - - // Fire 1 - t.advanceTime(11000); - await t.runTick(); - assert.equal(t.injectedTurns.length, 1); - - // Fire 2 - t.advanceTime(11000); - await t.runTick(); - assert.equal(t.injectedTurns.length, 2); - - // Fire 3 (should complete) - t.advanceTime(11000); - await t.runTick(); - assert.equal(t.injectedTurns.length, 3); - assert.equal(t.manager.get(auto.id)?.status, 'completed'); - - // Fire 4 should NOT happen - t.advanceTime(11000); - await t.runTick(); - assert.equal(t.injectedTurns.length, 3); - }); -}); - -describe('Automation integration: consecutive failure auto-pause', () => { - test('5 consecutive failures pauses the automation', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'heartbeat', - name: 'fragile', - prompt: 'p', - schedule: { type: 'interval', seconds: 10 }, - }, - ctx, - ); - - const auto = t.manager.listForSession(SESSION_ID)[0]; - - // Simulate 5 failed fires (started then failed). - for (let i = 0; i < 5; i++) { - t.manager.attemptStarted(auto.id); - t.manager.attemptFailed(auto.id, `error ${i + 1}`); - } - - assert.equal(t.manager.get(auto.id)?.status, 'paused'); - assert.equal(t.manager.get(auto.id)?.consecutiveFailures, 5); - assert.equal(t.manager.get(auto.id)?.lastError, 'error 5'); - - // Paused automation should not fire via scheduler - t.advanceTime(11000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.injectedTurns.length, 0); - }); -}); - -describe('Automation integration: cron kind fires via createFreshRun', () => { - test('cron automation calls createFreshRun, not injectTurn', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - - await t.tool.impl( - { - mode: 'create', - kind: 'cron', - name: 'daily review', - prompt: 'review PRs', - schedule: { type: 'interval', seconds: 30 }, - }, - ctx, - ); - - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - - assert.equal(t.injectedTurns.length, 0); - assert.equal(t.freshRuns.length, 1); - assert.equal(t.freshRuns[0].prompt, 'review PRs'); - }); - - test('cron fire records lastRunId and stays active for a recurring schedule', async () => { - const t = createIntegrationSetup(); - const ctx = t.ctx(); - await t.tool.impl( - { - mode: 'create', - kind: 'cron', - name: 'hourly', - prompt: 'audit', - schedule: { type: 'interval', seconds: 30 }, - }, - ctx, - ); - const auto = t.manager.listForSession(SESSION_ID)[0]; - - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - - // createFreshRun mock returns { runId: `fresh-`, ok: true }. - assert.equal(t.manager.get(auto.id)?.lastRunId, `fresh-${auto.id}`); - assert.equal(t.manager.get(auto.id)?.status, 'active'); // recurring, keeps going - assert.equal(t.manager.get(auto.id)?.consecutiveFailures, 0); - }); -}); - -describe('Automation integration: cron gating by host capability', () => { - test('cronEnabled:false rejects the cron kind at the schema', () => { - const mgr = new AutomationManager({ generateId: () => 'g', now: () => 1 }); - const heartbeatOnly = buildAutomationTool({ automationManager: mgr, cronEnabled: false }); - const parsed = ( - heartbeatOnly.parameters as { safeParse: (v: unknown) => { success: boolean } } - ).safeParse({ - mode: 'create', - kind: 'cron', - name: 'x', - prompt: 'p', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.equal(parsed.success, false); // cron not offered on this host - }); - - test('cronEnabled:true accepts the cron kind', () => { - const mgr = new AutomationManager({ generateId: () => 'g', now: () => 1 }); - const withCron = buildAutomationTool({ automationManager: mgr, cronEnabled: true }); - const parsed = ( - withCron.parameters as { safeParse: (v: unknown) => { success: boolean } } - ).safeParse({ - mode: 'create', - kind: 'cron', - name: 'x', - prompt: 'p', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.equal(parsed.success, true); - }); - - test('heartbeat is accepted regardless of cronEnabled', () => { - const mgr = new AutomationManager({ generateId: () => 'g', now: () => 1 }); - const heartbeatOnly = buildAutomationTool({ automationManager: mgr, cronEnabled: false }); - const parsed = ( - heartbeatOnly.parameters as { safeParse: (v: unknown) => { success: boolean } } - ).safeParse({ - mode: 'create', - kind: 'heartbeat', - name: 'x', - prompt: 'p', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.equal(parsed.success, true); - }); - - test('model schema accepts the legacy Unicode boundary and rejects larger text', () => { - const mgr = new AutomationManager({ generateId: () => 'g', now: () => 1 }); - const tool = buildAutomationTool({ automationManager: mgr, cronEnabled: true }); - const schema = tool.parameters as { safeParse: (value: unknown) => { success: boolean } }; - const input = { - mode: 'create', - kind: 'heartbeat', - name: '名'.repeat(100), - prompt: '提'.repeat(2_000), - schedule: { type: 'interval', seconds: 30 }, - }; - assert.equal(schema.safeParse(input).success, true); - assert.equal(schema.safeParse({ ...input, name: '名'.repeat(101) }).success, false); - assert.equal(schema.safeParse({ ...input, prompt: '提'.repeat(2_001) }).success, false); - }); -}); - -describe('Automation integration: a refused pause/resume says which cause stopped it', () => { - function createFor(t: ReturnType, sessionId: string): string { - const created = t.manager.create({ - kind: 'heartbeat', - name: 'poller', - prompt: 'poll', - sessionId, - schedule: { type: 'interval', seconds: 30 }, - }); - if ('error' in created) throw new Error(created.error); - return created.id; - } - - test('an unknown id says so, and points at the mode that lists the real ones', async () => { - for (const mode of ['pause', 'resume'] as const) { - const t = createIntegrationSetup(); - const text = (await t.tool.impl({ mode, id: 'auto-404' }, t.ctx())) as string; - assert.match(text, /has no automation with that id/); - assert.match(text, /mode "list"/); - // The old sentence offered three causes and a next step for none of them. - assert.doesNotMatch(text, /not found, not owned/); - } - }); - - test("another session's automation reads the same way, because the recovery is the same", async () => { - const t = createIntegrationSetup(); - const id = createFor(t, 'some-other-session'); - const text = (await t.tool.impl({ mode: 'pause', id }, t.ctx())) as string; - assert.match(text, /has no automation with that id/); - assert.match(text, /mode "list"/); - }); - - test('a wrong-status automation reports the status it actually has', async () => { - const t = createIntegrationSetup(); - const id = createFor(t, SESSION_ID); - - // It is active, so resume is the wrong verb for it. - const resumed = (await t.tool.impl({ mode: 'resume', id }, t.ctx())) as string; - assert.match(resumed, /it is active/); - assert.match(resumed, /only a paused automation can be resumed/); - assert.doesNotMatch(resumed, /not found, not owned/); - - // Once paused, pause becomes the wrong verb instead. - await t.tool.impl({ mode: 'pause', id }, t.ctx()); - const paused = (await t.tool.impl({ mode: 'pause', id }, t.ctx())) as string; - assert.match(paused, /it is paused/); - assert.match(paused, /only an active automation can be paused/); - }); - - test('an authority that refuses a status it accepts is not blamed on the status', async () => { - // The host coordinator collapses a retiring or archived Session into the - // same empty result a wrong status produces, while its get() still reports - // an automation whose status admits the verb. Blaming the status there - // states a verdict nothing checked, and sending the model to create runs it - // into the same Session gate a second time. - const definition: AutomationDefinition = { - id: 'auto-7', - kind: 'cron', - name: 'nightly digest', - prompt: 'digest', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 60 }, - status: 'active', - createdAt: 0, - updatedAt: 0, - nextFireAt: 60_000, - lastFireAt: null, - lastRunId: null, - fireCount: 0, - maxFires: null, - expiresAt: null, - durable: true, - consecutiveFailures: 0, - lastError: null, - }; - const authority: AutomationToolAuthority = { - create: async () => ({ error: 'Session lifecycle is changing' }), - delete: async () => false, - // Every mutation is refused the way the host refuses one for a Session - // that can no longer mutate: an empty result carrying no cause. - pause: async () => undefined, - resume: async () => undefined, - get: async () => definition, - listVisibleForSession: async () => [definition], - }; - const tool = buildAutomationAuthorityTool({ authority, cronEnabled: true }); - - const paused = (await tool.impl({ mode: 'pause', id: 'auto-7' }, createContext())) as string; - assert.match(paused, /it is active/); - assert.doesNotMatch(paused, /only an active automation can be paused/); - assert.match(paused, /mode "list"/); - - definition.status = 'paused'; - const resumed = (await tool.impl({ mode: 'resume', id: 'auto-7' }, createContext())) as string; - assert.match(resumed, /it is paused/); - // Both halves of the old sentence were false here, and the next step it - // named goes through the same Session gate that just refused. - assert.doesNotMatch(resumed, /can no longer fire/); - assert.doesNotMatch(resumed, /Create a new automation instead/); - assert.match(resumed, /mode "list"/); - }); -}); diff --git a/packages/runtime/src/__tests__/automation-mutation-verify.test.ts b/packages/runtime/src/__tests__/automation-mutation-verify.test.ts deleted file mode 100644 index 48a94e723f..0000000000 --- a/packages/runtime/src/__tests__/automation-mutation-verify.test.ts +++ /dev/null @@ -1,212 +0,0 @@ -/** - * Mutation verification — proves each integration test would FAIL - * if the corresponding behavior were removed. - * - * Each test creates a setup where the behavior is intentionally broken - * (e.g. scheduler doesn't call injectTurn, manager doesn't enforce maxFires) - * and asserts the OPPOSITE of what the real tests expect. - * - * If these "broken" tests pass → the real tests are meaningful. - * If these "broken" tests also pass when inverted → the real tests are vacuous. - */ -import { describe, test } from 'node:test'; -import assert from 'node:assert/strict'; -import { AutomationManager } from '../automation-state.js'; -import { AutomationScheduler } from '../automation-scheduler.js'; -import { buildAutomationTool } from '../automation-tools.js'; -import type { MakaToolContext } from '../tool-runtime.js'; - -const SESSION_ID = 'mutation-sess'; - -function ctx(): MakaToolContext { - return { - sessionId: SESSION_ID, - turnId: 't', - cwd: '/', - toolCallId: 'tc', - abortSignal: new AbortController().signal, - emitOutput: () => {}, - }; -} - -describe('Mutation verification: tests catch broken behavior', () => { - test('heartbeat test fails if injectTurn is a no-op', async () => { - let time = 1700000000000; - let idCounter = 0; - const injected: string[] = []; - const timers: Array<{ fn: () => void }> = []; - - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => time, - random: () => 0, - }); - // Broken scheduler: injectTurn does nothing - const brokenScheduler = new AutomationScheduler({ - automationManager: manager, - canFire: async () => true, - injectTurn: async () => { - /* INTENTIONALLY BROKEN: no-op */ return { ok: true }; - }, - setTimeout: (fn) => { - timers.push({ fn }); - return timers.length; - }, - clearTimeout: () => {}, - now: () => time, - }); - - manager.create({ - kind: 'heartbeat', - name: 'x', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 10 }, - }); - time += 11000; - brokenScheduler.start(); - timers.shift()?.fn(); - await new Promise((r) => setTimeout(r, 0)); - - // With broken injectTurn, nothing was actually injected - assert.equal( - injected.length, - 0, - 'Broken scheduler should produce 0 injections — test would catch this', - ); - }); - - test('max_fires test fails if manager ignores the cap', async () => { - let time = 1700000000000; - let idCounter = 0; - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => time, - random: () => 0, - }); - - const auto = manager.create({ - kind: 'heartbeat', - name: 'limited', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 10 }, - maxFires: 2, - }); - assert.ok(!('error' in auto)); - - // Fire twice successfully → completed at maxFires=2. - manager.attemptStarted(auto.id); - manager.attemptSucceeded(auto.id); - manager.attemptStarted(auto.id); - manager.attemptSucceeded(auto.id); - // A 3rd start is refused (no longer active) — the cap is enforced. - const third = manager.attemptStarted(auto.id); - assert.equal( - third, - undefined, - 'Manager correctly refuses fire #3 — test catches unlimited firing', - ); - }); - - test('expiry test fails if markFired does not check expiresAt', async () => { - let time = 1700000000000; - let idCounter = 0; - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => time, - random: () => 0, - }); - - const auto = manager.create({ - kind: 'heartbeat', - name: 'expiring', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 3600 }, - expiresAt: time + 5000, - }); - assert.ok(!('error' in auto)); - - // Advance past expiry - time += 6000; - const fired = manager.attemptStarted(auto.id); - - // attemptStarted checks expiry FIRST — returns undefined for expired - assert.equal(fired, undefined, 'Manager correctly refuses to fire expired automation'); - assert.equal(manager.get(auto.id)?.status, 'expired'); - }); - - test('pause test fails if pause does not change status', async () => { - let idCounter = 0; - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => Date.now(), - random: () => 0, - }); - - const auto = manager.create({ - kind: 'heartbeat', - name: 'x', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 60 }, - }); - assert.ok(!('error' in auto)); - - manager.pause(auto.id, SESSION_ID); - assert.equal( - manager.get(auto.id)?.status, - 'paused', - 'Pause must change status — test catches no-op pause', - ); - - // Paused automation refuses to fire - const fired = manager.attemptStarted(auto.id); - assert.equal(fired, undefined, 'Paused automation must not fire — test catches this'); - }); - - test('consecutive failure test fails if manager does not auto-pause', async () => { - let idCounter = 0; - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => Date.now(), - random: () => 0, - }); - - const auto = manager.create({ - kind: 'heartbeat', - name: 'fragile', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'interval', seconds: 60 }, - }); - assert.ok(!('error' in auto)); - - for (let i = 0; i < 5; i++) manager.attemptFailed(auto.id, 'err'); - assert.equal( - manager.get(auto.id)?.status, - 'paused', - 'Manager must auto-pause after 5 failures — test catches missing guard', - ); - }); - - test('durable test fails if create does not store durable flag', async () => { - let idCounter = 0; - const manager = new AutomationManager({ - generateId: () => `m-${++idCounter}`, - now: () => Date.now(), - random: () => 0, - }); - - const auto = manager.create({ - kind: 'cron', - name: 'persist', - prompt: 'p', - sessionId: SESSION_ID, - schedule: { type: 'cron', expression: '0 9 * * *' }, - }); - assert.ok(!('error' in auto)); - assert.equal(auto.durable, true, 'Create must store durable flag — test catches missing field'); - }); -}); diff --git a/packages/runtime/src/__tests__/automation-scheduler.test.ts b/packages/runtime/src/__tests__/automation-scheduler.test.ts deleted file mode 100644 index 55127f3a31..0000000000 --- a/packages/runtime/src/__tests__/automation-scheduler.test.ts +++ /dev/null @@ -1,589 +0,0 @@ -import { describe, test } from 'node:test'; -import assert from 'node:assert/strict'; -import { AutomationManager } from '../automation-state.js'; -import { - AutomationScheduler, - DEFER_WINDOW_MS, - type AutomationFireResult, -} from '../automation-scheduler.js'; - -function createTestSetup() { - let idCounter = 0; - let time = 1700000000000; - const timers: Array<{ fn: () => void; ms: number; id: number }> = []; - let timerId = 0; - const fired: Array<{ sessionId: string; prompt: string; automationId: string }> = []; - let canFireResult = true; - let canFireThrows = false; - let injectResult: AutomationFireResult = { runId: 'run-x', ok: true }; - let injectRejects = false; - let injectTurnFn: - | ((sessionId: string, prompt: string, automationId: string) => Promise) - | undefined; - let createFreshRunFn: - | ((prompt: string, automationId: string) => Promise) - | undefined; - - const manager = new AutomationManager({ - generateId: () => `auto-${++idCounter}`, - now: () => time, - // Deterministic: no schedule jitter in scheduler timing tests. - random: () => 0, - }); - - const scheduler = new AutomationScheduler({ - automationManager: manager, - canFire: async () => { - if (canFireThrows) throw new Error('canFire error'); - return canFireResult; - }, - injectTurn: async (sessionId, prompt, automationId) => { - fired.push({ sessionId, prompt, automationId }); - if (injectTurnFn) return injectTurnFn(sessionId, prompt, automationId); - if (injectRejects) throw new Error('injectTurn error'); - return injectResult; - }, - get createFreshRun() { - return createFreshRunFn; - }, - setTimeout: (fn, ms) => { - const id = ++timerId; - timers.push({ fn, ms, id }); - return id; - }, - clearTimeout: (timer) => { - const idx = timers.findIndex((t) => t.id === timer); - if (idx >= 0) timers.splice(idx, 1); - }, - now: () => time, - }); - - function advanceTime(ms: number) { - time += ms; - } - function fireNextTimer() { - const timer = timers.shift(); - if (timer) timer.fn(); - } - // Fire the pending tick, then flush enough microtask cycles for the async - // fire dispatch (.then/.catch → attemptSucceeded/attemptFailed) to settle. - async function runTick() { - fireNextTimer(); - for (let i = 0; i < 5; i++) await Promise.resolve(); - await new Promise((r) => setTimeout(r, 0)); - } - - return { - manager, - scheduler, - fired, - timers, - advanceTime, - fireNextTimer, - runTick, - setCanFire: (v: boolean) => { - canFireResult = v; - }, - setCanFireThrows: (v: boolean) => { - canFireThrows = v; - }, - setInjectRejects: (v: boolean) => { - injectRejects = v; - }, - setInjectResult: (r: AutomationFireResult) => { - injectResult = r; - }, - setInjectTurn: ( - fn: - | (( - sessionId: string, - prompt: string, - automationId: string, - ) => Promise) - | undefined, - ) => { - injectTurnFn = fn; - }, - setCreateFreshRun: ( - fn: ((prompt: string, automationId: string) => Promise) | undefined, - ) => { - createFreshRunFn = fn; - }, - getTime: () => time, - }; -} - -describe('AutomationScheduler', () => { - test('fires a heartbeat when time arrives and session is idle', async () => { - const t = createTestSetup(); - t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'check it', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 1); - assert.equal(t.fired[0].prompt, '[Automation: test]\n\ncheck it'); - }); - - test('does not fire when session is busy', async () => { - const t = createTestSetup(); - t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - t.advanceTime(31000); - t.setCanFire(false); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 0); - }); - - test('keeps deferring inside the busy window — a minutes-long turn does NOT skip the fire', async () => { - // Review fix (F1): the old ~120s budget silently dropped any fire landing - // mid-turn; agent turns routinely run for many minutes. The defer window - // mirrors the old wakeup-scheduler's 5s→5min exponential-backoff budget. - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 60 }, - }); - assert.ok(!('error' in auto)); - const originalNextFire = auto.nextFireAt; - t.advanceTime(61000); - t.setCanFire(false); - t.scheduler.start(); - // 10 minutes of busy session (5s ticks) — way past the old 120s budget. - for (let i = 0; i < 120; i++) { - await t.runTick(); - t.advanceTime(5000); - } - const deferred = t.manager.get(auto.id); - assert.equal(deferred?.status, 'active'); - assert.equal( - deferred?.nextFireAt, - originalNextFire, - 'still pending the SAME fire — not skipped', - ); - assert.ok( - (deferred?.deferredFireCount ?? 0) >= 120, - 'deferred attempts are recorded for observability', - ); - assert.equal(t.fired.length, 0); - // Session finally goes idle → the deferred fire executes (never dropped). - t.setCanFire(true); - await t.runTick(); - assert.equal(t.fired.length, 1); - }); - - test('skips fire and advances schedule only when the defer window is exhausted', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 60 }, - }); - assert.ok(!('error' in auto)); - const originalNextFire = auto.nextFireAt; - t.advanceTime(61000); - t.setCanFire(false); - t.scheduler.start(); - await t.runTick(); // opens the defer window - t.advanceTime(DEFER_WINDOW_MS + 1000); - await t.runTick(); // window exhausted → skipFire advances the schedule - const updated = t.manager.get(auto.id); - assert.ok(updated!.nextFireAt! > originalNextFire!); - assert.equal(updated?.status, 'active', 'a recurring automation stays active after a skip'); - assert.equal(t.fired.length, 0); - }); - - test('a transient busy window does NOT terminally expire a once automation', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'remind', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'once', delaySeconds: 10 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(11000); - t.setCanFire(false); - t.scheduler.start(); - // Busy for ~5 minutes of ticks — well past the old 120s budget. - for (let i = 0; i < 60; i++) { - await t.runTick(); - t.advanceTime(5000); - } - assert.equal(t.manager.get(auto.id)?.status, 'active', 'once must keep deferring, not expire'); - // Turn ends → the once fires and completes normally. - t.setCanFire(true); - await t.runTick(); - assert.equal(t.fired.length, 1); - assert.equal(t.manager.get(auto.id)?.status, 'completed'); - }); - - test('a once automation expires only when the defer window is exhausted', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'remind', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'once', delaySeconds: 10 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(11000); - t.setCanFire(false); - t.scheduler.start(); - await t.runTick(); // opens the defer window - t.advanceTime(DEFER_WINDOW_MS + 1000); - await t.runTick(); // exhausted → the once settles terminally - assert.equal(t.fired.length, 0); - assert.equal(t.manager.get(auto.id)?.status, 'expired'); - }); - - test('canFire throwing does not crash the scheduler', async () => { - const t = createTestSetup(); - t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - t.advanceTime(31000); - t.setCanFireThrows(true); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 0); - assert.ok(t.timers.length > 0); - }); - - test('a rejected fire marks the automation failed (outcome after stream)', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.setInjectRejects(true); - t.scheduler.start(); - await t.runTick(); - const updated = t.manager.get(auto.id); - assert.equal(updated?.consecutiveFailures, 1); - assert.equal(updated?.lastError, 'injectTurn error'); - }); - - test('a fire that resolves ok:false marks failed, not success', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.setInjectResult({ runId: 'run-1', ok: false, error: 'turn errored' }); - t.scheduler.start(); - await t.runTick(); - const updated = t.manager.get(auto.id); - assert.equal(updated?.consecutiveFailures, 1); - assert.equal(updated?.lastError, 'turn errored'); - }); - - test('a successful fire records the runId', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.setInjectResult({ runId: 'run-42', ok: true }); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.manager.get(auto.id)?.lastRunId, 'run-42'); - }); - - test('dispose stops the tick loop', async () => { - const t = createTestSetup(); - t.scheduler.start(); - assert.ok(t.timers.length > 0); - t.scheduler.dispose(); - assert.equal(t.timers.length, 0); - }); - - test('reports activity until an in-flight fire settles', async () => { - const t = createTestSetup(); - const automation = t.manager.create({ - kind: 'heartbeat', - name: 'test', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in automation)); - let settle!: (result: AutomationFireResult) => void; - t.setInjectTurn( - () => - new Promise((resolve) => { - settle = resolve; - }), - ); - t.advanceTime(31_000); - t.scheduler.start(); - await t.runTick(); - - assert.equal(t.scheduler.hasInFlight(), true); - settle({ runId: 'run-1', ok: true }); - await new Promise((resolve) => setTimeout(resolve, 0)); - assert.equal(t.scheduler.hasInFlight(), false); - }); - - test('does not fire expired automations', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'expiring', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - expiresAt: t.getTime() + 20000, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 0); - assert.equal(t.manager.get(auto.id)?.status, 'expired'); - }); - - test('one-shot fires once then completes (on success)', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'once', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'once', delaySeconds: 10 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(11000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 1); - assert.equal(t.manager.get(auto.id)?.status, 'completed'); - // Next tick should not fire again - t.advanceTime(11000); - await t.runTick(); - assert.equal(t.fired.length, 1); - }); - - test('cron fires via createFreshRun, not injectTurn', async () => { - const t = createTestSetup(); - const freshRuns: Array<{ prompt: string; id: string }> = []; - t.setCreateFreshRun(async (prompt, automationId) => { - freshRuns.push({ prompt, id: automationId }); - return { runId: 'fresh-1', ok: true }; - }); - const auto = t.manager.create({ - kind: 'cron', - name: 'daily', - prompt: 'review PRs', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - assert.equal(freshRuns.length, 1); - assert.equal(freshRuns[0].prompt, 'review PRs'); - assert.equal(freshRuns[0].id, auto.id); - assert.equal(t.fired.length, 0); - assert.equal(t.manager.get(auto.id)?.lastRunId, 'fresh-1'); - }); - - test('cron is silently ignored when createFreshRun is not provided (no state corruption)', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'cron', - name: 'daily', - prompt: 'review PRs', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - }); - assert.ok(!('error' in auto)); - const originalFireCount = auto.fireCount; - const originalNextFireAt = auto.nextFireAt; - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - await t.runTick(); - assert.equal(t.fired.length, 0); - const updated = t.manager.get(auto.id); - // A host without a cron executor must leave the cron COMPLETELY untouched — - // no failure, no pause, no advance — because the durable store may be shared - // with a host that CAN run it (heartbeat-only CLI + desktop share a store). - assert.equal(updated?.status, 'active'); - assert.equal(updated?.consecutiveFailures, 0); - assert.equal(updated?.lastError, null); - assert.equal(updated?.fireCount, originalFireCount); - assert.equal(updated?.nextFireAt, originalNextFireAt); - }); - - test('expired automations are swept even before nextFireAt', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'expiring', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 3600 }, - expiresAt: t.getTime() + 30000, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - assert.equal(t.fired.length, 0); - assert.equal(t.manager.get(auto.id)?.status, 'expired'); - }); - - test('the expiry sweep leaves an expired CRON untouched when createFreshRun is absent', async () => { - // A host that cannot run cron must not mutate/persist crons at all — the - // durable store may be shared with (and owned by) a host that can, and this - // host's copy may be stale. Sweeping the cron here could clobber that store. - const t = createTestSetup(); // createFreshRun undefined → cron disabled - const cron = t.manager.create({ - kind: 'cron', - name: 'daily', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 3600 }, - expiresAt: t.getTime() + 30000, - }); - assert.ok(!('error' in cron)); - // A heartbeat with the same expiry IS swept (control). - const beat = t.manager.create({ - kind: 'heartbeat', - name: 'poll', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 3600 }, - expiresAt: t.getTime() + 30000, - }); - assert.ok(!('error' in beat)); - t.advanceTime(31000); - t.scheduler.start(); - await t.runTick(); - assert.equal( - t.manager.get(cron.id)?.status, - 'active', - 'expired cron must be left untouched on a cron-disabled host', - ); - assert.equal(t.manager.get(beat.id)?.status, 'expired', 'heartbeat is still swept'); - }); - - test('a failed maxFires=1 fire ends failed/paused, never completed', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'limited', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 30 }, - maxFires: 1, - }); - assert.ok(!('error' in auto)); - t.advanceTime(31000); - t.setInjectRejects(true); - t.scheduler.start(); - await t.runTick(); - const updated = t.manager.get(auto.id); - assert.notEqual(updated?.status, 'completed'); - }); - - test('in-flight guard: a slow cron does not re-fire concurrently', async () => { - const t = createTestSetup(); - let dispatches = 0; - let release!: (r: AutomationFireResult) => void; - // A createFreshRun that hangs until we release it — models a run slower than - // the cadence (the exact concurrency window). - t.setCreateFreshRun((_p, _id) => { - dispatches++; - return new Promise((res) => { - release = (r) => res(r); - }); - }); - const auto = t.manager.create({ - kind: 'cron', - name: 'slow', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 10 }, - }); - assert.ok(!('error' in auto)); - t.scheduler.start(); - // Fire is due; run it multiple times while the first dispatch is still pending. - t.advanceTime(11000); - await t.runTick(); // dispatch #1 (hangs) - t.advanceTime(11000); - await t.runTick(); // due again — must be skipped (in-flight) - t.advanceTime(11000); - await t.runTick(); // still in-flight — skipped - assert.equal(dispatches, 1, 'only one fire dispatched while the run is in flight'); - // Release the run → next due tick may fire again. - release({ runId: 'r1', ok: true }); - for (let i = 0; i < 5; i++) await Promise.resolve(); - t.advanceTime(11000); - await t.runTick(); - assert.equal(dispatches, 2, 're-fires only after the prior run resolves'); - }); - - test('maxFires bounds fire ATTEMPTS even when every run fails', async () => { - const t = createTestSetup(); - const auto = t.manager.create({ - kind: 'heartbeat', - name: 'flaky', - prompt: 'p', - sessionId: 'sess-1', - schedule: { type: 'interval', seconds: 10 }, - maxFires: 2, - }); - assert.ok(!('error' in auto)); - t.setInjectRejects(true); // every fire fails - t.scheduler.start(); - // Tick well past 2 fire windows. - for (let i = 0; i < 6; i++) { - t.advanceTime(11000); - await t.runTick(); - } - const updated = t.manager.get(auto.id); - // Fired at most maxFires times (2), NOT up to the consecutive-failure cap (5). - assert.ok(updated!.fireCount <= 2, `fireCount=${updated!.fireCount} should be <= maxFires(2)`); - assert.equal(updated!.nextFireAt, null, 'no further fires scheduled past maxFires'); - }); -}); diff --git a/packages/runtime/src/__tests__/builtin-tools.test.ts b/packages/runtime/src/__tests__/builtin-tools.test.ts index 0692f4334e..810ab28e15 100644 --- a/packages/runtime/src/__tests__/builtin-tools.test.ts +++ b/packages/runtime/src/__tests__/builtin-tools.test.ts @@ -1328,6 +1328,43 @@ describe('builtin Bash streaming output', () => { assert.equal((await parameters.validate({ ref: ' ' })).success, false); }); + test('Read ignores provider defaults beside a non-empty runtime ref', async () => { + const read = buildBuiltinTools({ + runtimeResources: { + readRuntimeResource: async () => ({ kind: 'text', text: 'unused' }), + }, + }).find((tool) => tool.name === 'Read'); + if (!read) throw new Error('Read tool missing'); + const parameters = read.parameters as { + validate(value: unknown): PromiseLike<{ + success: boolean; + value?: unknown; + }>; + }; + const ref = 'maka://runtime/background-tasks/shell-run-1'; + + const normalized = await parameters.validate({ + path: '', + offset: 0, + limit: 1, + ref, + }); + assert.equal(normalized.success, true); + if (normalized.success) assert.deepEqual(normalized.value, { ref }); + + assert.equal( + ( + await parameters.validate({ + path: 'README.md', + offset: 0, + limit: 1, + ref, + }) + ).success, + false, + ); + }); + test('StopBackgroundTask stops a runtime ref in the current session', async () => { const calls: unknown[] = []; const backgroundTasks = { diff --git a/packages/runtime/src/__tests__/configured-subagent-catalog.test.ts b/packages/runtime/src/__tests__/configured-subagent-catalog.test.ts index b51d8caa2c..a243098462 100644 --- a/packages/runtime/src/__tests__/configured-subagent-catalog.test.ts +++ b/packages/runtime/src/__tests__/configured-subagent-catalog.test.ts @@ -39,7 +39,7 @@ describe('configured subagent catalog', () => { }, ]; const catalog = createConfiguredSubagentCatalog({ - getSettings: async () => settings, + getPresets: async () => settings.subagents.presets, getConnection: async (slug) => (slug === connection.slug ? connection : null), }); diff --git a/apps/desktop/src/main/__tests__/explore-agent-tool.test.ts b/packages/runtime/src/__tests__/explore-agent-tool.test.ts similarity index 76% rename from apps/desktop/src/main/__tests__/explore-agent-tool.test.ts rename to packages/runtime/src/__tests__/explore-agent-tool.test.ts index 1018571ab6..bb356806e1 100644 --- a/apps/desktop/src/main/__tests__/explore-agent-tool.test.ts +++ b/packages/runtime/src/__tests__/explore-agent-tool.test.ts @@ -14,18 +14,17 @@ describe('ExploreAgent read-only worker', () => { assert.match(tool.description, /never writes/); assert.match(tool.description, /Do not use it for one known file/); assert.match(tool.description, /1-3 obvious files/); - assert.ok('ignorePaths' in ((tool.parameters as { shape: Record }).shape)); - assert.ok('stoppingCondition' in ((tool.parameters as { shape: Record }).shape)); + assert.ok('ignorePaths' in (tool.parameters as { shape: Record }).shape); + assert.ok('stoppingCondition' in (tool.parameters as { shape: Record }).shape); }); it('returns source-grounded matches without absolute paths', async () => { await withWorkspace(async (workspaceRoot) => { await mkdir(join(workspaceRoot, 'src'), { recursive: true }); - await writeFile(join(workspaceRoot, 'src', 'permission.ts'), [ - 'export const policy = {', - " explore: 'read-only subagent',", - '};', - ].join('\n')); + await writeFile( + join(workspaceRoot, 'src', 'permission.ts'), + ['export const policy = {', " explore: 'read-only subagent',", '};'].join('\n'), + ); await writeFile(join(workspaceRoot, 'README.md'), '# Demo\npermission model overview'); const result = await runReadOnlyExplore({ @@ -52,14 +51,37 @@ describe('ExploreAgent read-only worker', () => { assert.ok(result.durationMs >= 0); assert.ok(result.filesInspected >= 2); assert.ok(result.filesDiscovered >= result.filesInspected); - assert.ok(result.matches.some((match) => match.path === 'src/permission.ts' && match.query === 'subagent')); + assert.ok( + result.matches.some( + (match) => match.path === 'src/permission.ts' && match.query === 'subagent', + ), + ); assert.ok(result.candidateFiles.some((file) => file.path === 'src/permission.ts')); assert.equal(result.sensitiveFilesSkipped, 0); - assert.ok(result.evidence.some((item) => item.type === 'match' && item.path === 'src/permission.ts' && item.line === 2)); - assert.match(result.summary, /发现 \d+ 个候选 · 读取 \d+ 个文件 · 命中 \d+ 处 · 证据 \d+ 个 · 候选 \d+ 个 · 耗时 /); - assert.ok(result.recentEvents.some((event) => event.type === 'started' && /准备范围/.test(event.message))); - assert.ok(result.recentEvents.some((event) => event.type === 'completed' && /完成/.test(event.message))); - assert.ok(result.recentEvents.every((event) => typeof event.at === 'number' && !JSON.stringify(event).includes(workspaceRoot))); + assert.ok( + result.evidence.some( + (item) => item.type === 'match' && item.path === 'src/permission.ts' && item.line === 2, + ), + ); + assert.match( + result.summary, + /发现 \d+ 个候选 · 读取 \d+ 个文件 · 命中 \d+ 处 · 证据 \d+ 个 · 候选 \d+ 个 · 耗时 /, + ); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'started' && /准备范围/.test(event.message), + ), + ); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'completed' && /完成/.test(event.message), + ), + ); + assert.ok( + result.recentEvents.every( + (event) => typeof event.at === 'number' && !JSON.stringify(event).includes(workspaceRoot), + ), + ); assert.match(result.report, /目标：study permission policy/); assert.match(result.report, /状态：完成，已找到可交接证据。/); assert.match(result.report, /发现\/读取：\d+ \/ \d+ 个文件/); @@ -69,7 +91,10 @@ describe('ExploreAgent read-only worker', () => { assert.match(result.report, /耗时 \d+(?:\.\d)?(?: ms|s|m \d+s)/); assert.equal(JSON.stringify(result).includes(workspaceRoot), false); assert.ok(result.notes.some((note) => /不写文件、不联网、不启动进程/.test(note))); - assert.equal(result.notes.some((note) => /Read-only worker|Search budget/.test(note)), false); + assert.equal( + result.notes.some((note) => /Read-only worker|Search budget/.test(note)), + false, + ); }); }); @@ -105,7 +130,10 @@ describe('ExploreAgent read-only worker', () => { }); it('returns a structured failure when the session cwd is unreadable', async () => { - const missingRoot = join(tmpdir(), `maka-explore-missing-${Date.now()}-${Math.random().toString(16).slice(2)}`); + const missingRoot = join( + tmpdir(), + `maka-explore-missing-${Date.now()}-${Math.random().toString(16).slice(2)}`, + ); const result = await runReadOnlyExplore({ cwd: missingRoot, objective: 'inspect missing workspace', @@ -119,7 +147,11 @@ describe('ExploreAgent read-only worker', () => { assert.equal(result.filesDiscovered, 0); assert.equal(result.message, '会话工作目录不可读取。'); assert.equal(result.summary, '未完成：会话工作目录不可读取。'); - assert.ok(result.recentEvents.some((event) => event.type === 'failed' && /工作目录不可读取/.test(event.message))); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'failed' && /工作目录不可读取/.test(event.message), + ), + ); assert.equal(result.filesInspected, 0); assert.equal(result.matches.length, 0); assert.equal(JSON.stringify(result).includes(missingRoot), false); @@ -131,8 +163,14 @@ describe('ExploreAgent read-only worker', () => { await mkdir(join(workspaceRoot, 'src'), { recursive: true }); await writeFile(join(workspaceRoot, '.env'), 'ANTHROPIC_API_KEY=sk-ant-secret'); await writeFile(join(workspaceRoot, '.npmrc'), '//registry.example/:_authToken=npm_secret'); - await writeFile(join(workspaceRoot, 'credentials.json'), '{"refresh_token":"secret-refresh"}'); - await writeFile(join(workspaceRoot, 'src', 'config.ts'), 'export const secretBoundary = "redacted in docs";'); + await writeFile( + join(workspaceRoot, 'credentials.json'), + '{"refresh_token":"secret-refresh"}', + ); + await writeFile( + join(workspaceRoot, 'src', 'config.ts'), + 'export const secretBoundary = "redacted in docs";', + ); const result = await runReadOnlyExplore({ cwd: workspaceRoot, @@ -151,8 +189,20 @@ describe('ExploreAgent read-only worker', () => { assert.equal(JSON.stringify(result).includes('sk-ant-secret'), false); assert.equal(JSON.stringify(result).includes('npm_secret'), false); assert.equal(JSON.stringify(result).includes('secret-refresh'), false); - assert.equal(result.candidateFiles.some((file) => file.path === '.env' || file.path === '.npmrc' || file.path === 'credentials.json'), false); - assert.equal(result.evidence.some((item) => item.path === '.env' || item.path === '.npmrc' || item.path === 'credentials.json'), false); + assert.equal( + result.candidateFiles.some( + (file) => + file.path === '.env' || file.path === '.npmrc' || file.path === 'credentials.json', + ), + false, + ); + assert.equal( + result.evidence.some( + (item) => + item.path === '.env' || item.path === '.npmrc' || item.path === 'credentials.json', + ), + false, + ); }); }); @@ -163,7 +213,10 @@ describe('ExploreAgent read-only worker', () => { await mkdir(join(workspaceRoot, 'generated', 'nested'), { recursive: true }); await writeFile(join(workspaceRoot, 'src', 'alpha.ts'), 'export const alpha = "source";'); await writeFile(join(workspaceRoot, 'vendor', 'alpha.ts'), 'export const alpha = "vendor";'); - await writeFile(join(workspaceRoot, 'generated', 'nested', 'alpha.ts'), 'export const alpha = "generated";'); + await writeFile( + join(workspaceRoot, 'generated', 'nested', 'alpha.ts'), + 'export const alpha = "generated";', + ); const result = await runReadOnlyExplore({ cwd: workspaceRoot, @@ -178,9 +231,20 @@ describe('ExploreAgent read-only worker', () => { assert.equal(result.ok, true); assert.deepEqual(result.ignoredPaths, ['vendor', 'generated']); assert.ok(result.matches.some((match) => match.path === 'src/alpha.ts')); - assert.equal(result.matches.some((match) => match.path.startsWith('vendor/')), false); - assert.equal(result.matches.some((match) => match.path.startsWith('generated/')), false); - assert.equal(result.candidateFiles.some((file) => file.path.startsWith('vendor/') || file.path.startsWith('generated/')), false); + assert.equal( + result.matches.some((match) => match.path.startsWith('vendor/')), + false, + ); + assert.equal( + result.matches.some((match) => match.path.startsWith('generated/')), + false, + ); + assert.equal( + result.candidateFiles.some( + (file) => file.path.startsWith('vendor/') || file.path.startsWith('generated/'), + ), + false, + ); assert.ok(result.notes.some((note) => /已按请求忽略：vendor, generated/.test(note))); assert.equal(JSON.stringify(result).includes(workspaceRoot), false); }); @@ -202,9 +266,19 @@ describe('ExploreAgent read-only worker', () => { }); assert.equal(result.ok, true); - assert.equal(result.stoppingCondition, 'stop after finding the implementation entry and one evidence line'); - assert.match(result.report, /停止条件：stop after finding the implementation entry and one evidence line/); - assert.ok(result.notes.some((note) => /停止条件：stop after finding the implementation entry and one evidence line/.test(note))); + assert.equal( + result.stoppingCondition, + 'stop after finding the implementation entry and one evidence line', + ); + assert.match( + result.report, + /停止条件：stop after finding the implementation entry and one evidence line/, + ); + assert.ok( + result.notes.some((note) => + /停止条件：stop after finding the implementation entry and one evidence line/.test(note), + ), + ); assert.equal(JSON.stringify(result).includes(workspaceRoot), false); }); }); @@ -279,7 +353,11 @@ describe('ExploreAgent read-only worker', () => { assert.equal(result.terminalStatus, 'canceled'); assert.equal(result.filesDiscovered, 0); assert.equal(result.message, '只读探索已取消。'); - assert.ok(result.recentEvents.some((event) => event.type === 'aborted' && /已取消/.test(event.message))); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'aborted' && /已取消/.test(event.message), + ), + ); assert.equal(result.filesInspected, 0); assert.equal(result.partial, false); assert.deepEqual(result.matches, []); @@ -322,7 +400,11 @@ describe('ExploreAgent read-only worker', () => { assert.match(result.report, /状态：已取消，以下为取消前部分结果。/); assert.match(result.report, /命中片段：/); assert.ok(result.notes.some((note) => /取消前已读取的部分结果/.test(note))); - assert.ok(result.recentEvents.some((event) => event.type === 'aborted' && /部分结果/.test(event.message))); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'aborted' && /部分结果/.test(event.message), + ), + ); assert.equal(JSON.stringify(result).includes(workspaceRoot), false); }); }); @@ -373,7 +455,11 @@ describe('ExploreAgent read-only worker', () => { assert.deepEqual(result.progress, progress); assert.ok(result.recentEvents.length >= result.progress.length); assert.ok(result.recentEvents.length <= 20); - assert.ok(result.recentEvents.some((event) => event.type === 'checkpoint' && /已读取 10 个文件/.test(event.message))); + assert.ok( + result.recentEvents.some( + (event) => event.type === 'checkpoint' && /已读取 10 个文件/.test(event.message), + ), + ); assert.ok(progress.length >= 5); assert.ok(progress.length <= 12); assert.ok(progress.some((message) => /已读取 10 个文件/.test(message))); @@ -392,7 +478,10 @@ describe('ExploreAgent read-only worker', () => { await writeFile(join(workspaceRoot, 'package.json'), '{"scripts":{"test":"node --test"}}'); await writeFile(join(workspaceRoot, 'README.md'), '# Landmark project'); await writeFile(join(workspaceRoot, 'src', 'main.ts'), 'export function boot() {}'); - await writeFile(join(workspaceRoot, 'tests', 'boot.test.ts'), 'test("boot", () => undefined)'); + await writeFile( + join(workspaceRoot, 'tests', 'boot.test.ts'), + 'test("boot", () => undefined)', + ); const result = await runReadOnlyExplore({ cwd: workspaceRoot, @@ -404,12 +493,41 @@ describe('ExploreAgent read-only worker', () => { }); assert.equal(result.ok, true); - assert.ok(result.candidateFiles.some((file) => file.path === 'package.json' && file.reasons.includes('project manifest'))); - assert.ok(result.candidateFiles.some((file) => file.path === 'README.md' && file.reasons.includes('project documentation'))); - assert.ok(result.candidateFiles.some((file) => file.path === 'src/main.ts' && file.reasons.includes('project entrypoint'))); - assert.ok(result.candidateFiles.some((file) => file.path === 'tests/boot.test.ts' && file.reasons.includes('project test surface'))); - assert.ok(result.evidence.some((item) => item.type === 'candidate' && item.path === 'package.json' && item.label === '项目配置锚点')); - assert.ok(result.evidence.some((item) => item.type === 'candidate' && item.path === 'README.md' && item.label === '项目文档锚点')); + assert.ok( + result.candidateFiles.some( + (file) => file.path === 'package.json' && file.reasons.includes('project manifest'), + ), + ); + assert.ok( + result.candidateFiles.some( + (file) => file.path === 'README.md' && file.reasons.includes('project documentation'), + ), + ); + assert.ok( + result.candidateFiles.some( + (file) => file.path === 'src/main.ts' && file.reasons.includes('project entrypoint'), + ), + ); + assert.ok( + result.candidateFiles.some( + (file) => + file.path === 'tests/boot.test.ts' && file.reasons.includes('project test surface'), + ), + ); + assert.ok( + result.evidence.some( + (item) => + item.type === 'candidate' && + item.path === 'package.json' && + item.label === '项目配置锚点', + ), + ); + assert.ok( + result.evidence.some( + (item) => + item.type === 'candidate' && item.path === 'README.md' && item.label === '项目文档锚点', + ), + ); assert.ok(result.notes.some((note) => /优先读取项目配置、文档、入口和测试线索/.test(note))); assert.ok(result.notes.some((note) => /按查询命中和项目结构分/.test(note))); assert.equal(JSON.stringify(result).includes(workspaceRoot), false); @@ -434,7 +552,11 @@ describe('ExploreAgent read-only worker', () => { assert.ok(result.notes.some((note) => /没有找到内容命中/.test(note))); assert.match(result.report, /状态：完成，但没有找到可交接证据。/); assert.equal( - result.notes.some((note) => /Read-only worker|Search budget|No content matches|Candidate discovery|Project landmark|Total byte budget|Scope /.test(note)), + result.notes.some((note) => + /Read-only worker|Search budget|No content matches|Candidate discovery|Project landmark|Total byte budget|Scope /.test( + note, + ), + ), false, ); @@ -444,14 +566,20 @@ describe('ExploreAgent read-only worker', () => { }); assert.equal(failed.ok, false); assert.ok(failed.notes.some((note) => /不写文件、不联网、不启动进程/.test(note))); - assert.equal(failed.notes.some((note) => /Read-only worker/.test(note)), false); + assert.equal( + failed.notes.some((note) => /Read-only worker/.test(note)), + false, + ); }); }); it('keeps the generated research report bounded and source-grounded', async () => { await withWorkspace(async (workspaceRoot) => { for (let index = 0; index < 20; index++) { - await writeFile(join(workspaceRoot, `report-${index}.md`), `alpha line ${index}\nalpha detail ${index}`); + await writeFile( + join(workspaceRoot, `report-${index}.md`), + `alpha line ${index}\nalpha detail ${index}`, + ); } const result = await runReadOnlyExplore({ @@ -470,7 +598,6 @@ describe('ExploreAgent read-only worker', () => { assert.equal(result.report.includes(workspaceRoot), false); }); }); - }); async function withWorkspace(fn: (workspaceRoot: string) => Promise): Promise { diff --git a/packages/runtime/src/__tests__/shell-run-manager.test.ts b/packages/runtime/src/__tests__/shell-run-manager.test.ts index cf83cf8bf7..b453a80483 100644 --- a/packages/runtime/src/__tests__/shell-run-manager.test.ts +++ b/packages/runtime/src/__tests__/shell-run-manager.test.ts @@ -1447,7 +1447,10 @@ describe('ShellRunProcessManager', () => { const bytes = events.reduce((total, event) => total + Buffer.byteLength(event.data, 'utf8'), 0); assert.equal(bytes, 1024 * 1024); - assert.ok(events.length <= 32, `expected bounded PTY IPC batches, got ${events.length}`); + assert.equal( + events.every((event) => Buffer.byteLength(JSON.stringify(event.data), 'utf8') <= 40 * 1024), + true, + ); for (let index = 1; index < events.length; index += 1) { assert.ok(events[index]!.sequence > events[index - 1]!.sequence); } @@ -2041,7 +2044,6 @@ describe('ShellRunProcessManager', () => { const manager = await createTestManager(undefined, { pipeOutputDrainMs: 100 }); let childPid: number | undefined; try { - const startedAt = Date.now(); const result = await manager.runForegroundBash( shellInput({ cwd, @@ -2054,7 +2056,6 @@ describe('ShellRunProcessManager', () => { }), ); childPid = Number.parseInt(await readFile(childPidPath, 'utf8'), 10); - assert.ok(Date.now() - startedAt < 2_000); assert.equal(result.status, 'failed'); assert.equal(result.output.mode, 'pipes'); if (result.output.mode !== 'pipes') throw new Error('expected pipes output'); diff --git a/packages/runtime/src/__tests__/skill-invocation.test.ts b/packages/runtime/src/__tests__/skill-invocation.test.ts index 16f06e5094..0997c2be78 100644 --- a/packages/runtime/src/__tests__/skill-invocation.test.ts +++ b/packages/runtime/src/__tests__/skill-invocation.test.ts @@ -16,6 +16,7 @@ import { type HostCapabilities, type LoadedSkillInstructions, } from '../skills.js'; +import { SKILL_INVOCATION_NAME_MAX_BYTES } from '@maka/core/skill-invocation'; import { skillInvocationInlineReferences } from '../skill-invocation-receipt.js'; describe('skill invocation', () => { @@ -389,6 +390,31 @@ Alpha body.`, }); }); + it('projects long Skill metadata into a transport-bounded receipt', async () => { + await withWorkspace(async (workspaceRoot, homeDir) => { + const name = '😀'.repeat(100); + await writeSkill( + workspaceRoot, + 'long-name', + `---\nname: ${name}\ndescription: Long display metadata.\n---\n# Long name`, + ); + const prepared = await prepareSkillInvocationMessage({ + text: '/skill:long-name run', + source: resolveSkillDiscoveryPaths(workspaceRoot, workspaceRoot, homeDir), + }); + + assert.equal(prepared.disposition, 'ready'); + assert.equal( + new TextEncoder().encode(prepared.skillInvocation.loaded[0]?.name).byteLength, + SKILL_INVOCATION_NAME_MAX_BYTES, + ); + const receipt = prepared.skillInvocation.receipts[0]; + assert.ok(receipt?.success); + assert.equal(receipt.name, prepared.skillInvocation.loaded[0]?.name); + assert.match(prepared.sendText, new RegExp(name)); + }); + }); + it('reads the current state at send time and blocks when every invocation fails', async () => { await withWorkspace(async (workspaceRoot, homeDir) => { await writeSkill( diff --git a/packages/runtime/src/agent-flow.ts b/packages/runtime/src/agent-flow.ts index ae6082e445..6d355263e7 100644 --- a/packages/runtime/src/agent-flow.ts +++ b/packages/runtime/src/agent-flow.ts @@ -62,6 +62,8 @@ export interface FlowInput { orchestration?: EffectiveOrchestration; /** Trusted effective tool protocol snapshot for this invocation. */ toolMode?: ToolMode; + /** Trusted per-turn cap on provider tool-call steps. */ + maxSteps?: number; /** User turn text. */ text: string; /** Optional attachments bound to the user message. */ diff --git a/packages/runtime/src/agent-run.ts b/packages/runtime/src/agent-run.ts index 7d7f1ad966..f987d72fb1 100644 --- a/packages/runtime/src/agent-run.ts +++ b/packages/runtime/src/agent-run.ts @@ -66,6 +66,7 @@ import type { ProviderRequestAttemptRecord, ProviderRequestCaptureLedgerRecord, } from './provider-request-telemetry.js'; +import { materializeRuntimeEventTranscriptProjection } from './runtime-ledger-repair.js'; export interface AgentRunActiveSession { sessionId: string; @@ -571,6 +572,9 @@ export class AgentRun { turnId: this.turnId, orchestration: this.effectiveOrchestration, toolMode: this.toolMode, + ...(this.input.userInput.maxSteps !== undefined + ? { maxSteps: this.input.userInput.maxSteps } + : {}), text: this.input.userInput.text, ...(this.input.userInput.attachments ? { attachments: this.input.userInput.attachments } @@ -612,6 +616,9 @@ export class AgentRun { ...(begin.backendInput.toolMode !== undefined ? { toolMode: begin.backendInput.toolMode } : {}), + ...(begin.backendInput.maxSteps !== undefined + ? { maxSteps: begin.backendInput.maxSteps } + : {}), ...(begin.backendInput.attachments ? { attachments: begin.backendInput.attachments } : {}), ...(begin.backendInput.quotes ? { quotes: begin.backendInput.quotes } : {}), context: begin.backendInput.context, @@ -672,6 +679,13 @@ export class AgentRun { const steering = runtimeEvent.content?.kind === 'text' && runtimeEvent.content.steering === true; await this.recordRuntimeEvents([runtimeEvent], steering ? { requireDurableWrite: true } : {}); + if (this.recordsSessionMessages()) { + await materializeRuntimeEventTranscriptProjection( + this.input.store, + this.sessionId, + runtimeEvent, + ); + } } } @@ -736,6 +750,9 @@ export class AgentRun { turnId: this.turnId, orchestration: this.effectiveOrchestration, toolMode: this.toolMode, + ...(this.input.userInput.maxSteps !== undefined + ? { maxSteps: this.input.userInput.maxSteps } + : {}), text: this.input.userInput.text, ...(this.input.userInput.attachments ? { attachments: this.input.userInput.attachments } diff --git a/packages/runtime/src/ai-sdk-backend.ts b/packages/runtime/src/ai-sdk-backend.ts index d502f5217e..b0c24eb687 100644 --- a/packages/runtime/src/ai-sdk-backend.ts +++ b/packages/runtime/src/ai-sdk-backend.ts @@ -1238,6 +1238,7 @@ export class AiSdkBackend implements AgentBackend { input: BackendSendInput, ): AsyncIterable { const turnId = input.turnId; + const maxSteps = input.maxSteps ?? this.maxSteps; const toolRuntime = scope.toolRuntime; const turnAbortController = scope.abortController; @@ -1919,9 +1920,9 @@ export class AiSdkBackend implements AgentBackend { const projectedMessages = shaped?.messages ?? requestMessages; const finalChildSummaryStep = this.input.header.collaborationMode === 'agent' && - this.maxSteps !== undefined && - this.maxSteps > 1 && - runtimeSteps === this.maxSteps - 1 && + maxSteps !== undefined && + maxSteps > 1 && + runtimeSteps === maxSteps - 1 && completedProviderSteps.length > 0; const activeToolsForRequest = finalChildSummaryStep ? [] @@ -2160,7 +2161,7 @@ export class AiSdkBackend implements AgentBackend { // A retry is a fresh provider request that would run at least one // more step; with the send-level budget already spent there is // nothing left to grant it, so the error is terminal. - const stepBudgetRemains = this.maxSteps === undefined || runtimeSteps < this.maxSteps; + const stepBudgetRemains = maxSteps === undefined || runtimeSteps < maxSteps; const recovered = stepBudgetRemains && attemptHasNoObservableOutput() ? await this.compaction.recoverFromOverflowError({ @@ -2280,8 +2281,7 @@ export class AiSdkBackend implements AgentBackend { await queue.waitUntilConsumedThroughCurrent(); if (returnedToolCalls.length > 0) { - const continuationBudgetRemains = - this.maxSteps === undefined || runtimeSteps < this.maxSteps; + const continuationBudgetRemains = maxSteps === undefined || runtimeSteps < maxSteps; if (continuationBudgetRemains && !this.input.loadTurnRuntimeEvents) { throw new Error('durable current-run reader is required for tool continuation'); } @@ -2362,7 +2362,7 @@ export class AiSdkBackend implements AgentBackend { } const continuationWillRun = - (this.maxSteps === undefined || runtimeSteps < this.maxSteps) && + (maxSteps === undefined || runtimeSteps < maxSteps) && !scope.loopStopRequested && !scope.aborted; if ( @@ -2387,7 +2387,7 @@ export class AiSdkBackend implements AgentBackend { toolCalls: returnedToolCalls, ...(providerStepUsage ? { usage: providerStepUsage } : {}), }); - const stepLimitReached = this.maxSteps !== undefined && runtimeSteps >= this.maxSteps; + const stepLimitReached = maxSteps !== undefined && runtimeSteps >= maxSteps; if ( returnedToolCalls.length > 0 && !stepLimitReached && @@ -2545,7 +2545,7 @@ export class AiSdkBackend implements AgentBackend { if (scope.aborted) throw Object.assign(new Error('aborted'), { name: 'AbortError' }); const stopReason = scope.loopStopReason ?? - (this.maxSteps !== undefined && finishReason === 'tool-calls' + (maxSteps !== undefined && finishReason === 'tool-calls' ? 'step_limit' : this.mapFinishReason(finishReason)); if (stopReason === 'error') { diff --git a/packages/runtime/src/ai-sdk-flow.ts b/packages/runtime/src/ai-sdk-flow.ts index bd6c047544..05f627e4a9 100644 --- a/packages/runtime/src/ai-sdk-flow.ts +++ b/packages/runtime/src/ai-sdk-flow.ts @@ -742,6 +742,7 @@ export class AiSdkFlow implements AgentFlow, AgentFlowControl { turnId: ctx.turnId, ...(input.orchestration !== undefined ? { orchestration: input.orchestration } : {}), ...(input.toolMode !== undefined ? { toolMode: input.toolMode } : {}), + ...(input.maxSteps !== undefined ? { maxSteps: input.maxSteps } : {}), // The persisted head anchor: mid-turn capacity compaction keeps this // event verbatim and needs its exact ledger identity for coverage. ...(ctx.request.initialRuntimeEvent !== undefined diff --git a/packages/runtime/src/automation-schedule-policy.ts b/packages/runtime/src/automation-schedule-policy.ts new file mode 100644 index 0000000000..93e441d8dc --- /dev/null +++ b/packages/runtime/src/automation-schedule-policy.ts @@ -0,0 +1,5 @@ +/** Polling interval for the durable Automation authority. */ +export const FIRE_CHECK_INTERVAL_MS = 5_000; + +/** Maximum time a due fire may wait for its target Session to become idle. */ +export const DEFER_WINDOW_MS = 45 * 60 * 1_000; diff --git a/packages/runtime/src/automation-scheduler.ts b/packages/runtime/src/automation-scheduler.ts deleted file mode 100644 index 7f972b2914..0000000000 --- a/packages/runtime/src/automation-scheduler.ts +++ /dev/null @@ -1,267 +0,0 @@ -/** - * Automation scheduler — manages a tick loop that fires active automations. - * - * Fixes applied from adversarial review: - * - canFire errors are caught per-automation (don't abort the whole tick) - * - injectTurn/createFreshRun failures properly mark the automation as failed - * - A busy session defers the fire inside a ~45min retry window (equivalent to - * the old wakeup-scheduler's 5s→5min exponential backoff budget); only when - * the window is exhausted does skipFire() advance/settle the schedule - * - Defer bookkeeping is pruned when automations disappear - * - dispose() sets flag checked in async paths to prevent post-dispose execution - * - Uses deps.now() consistently (injectable for testing) - */ - -import type { AutomationDefinition, AutomationManager } from './automation-state.js'; - -/** Outcome of a dispatched fire, decided only after the run's stream finishes. */ -export interface AutomationFireResult { - /** The run/turn id the fire produced (for attribution / lastRunId). */ - runId?: string; - /** Whether the run completed successfully (no error / abort). */ - ok: boolean; - /** Failure reason when !ok. */ - error?: string; -} - -export interface AutomationSchedulerDeps { - automationManager: AutomationManager; - /** - * Whether this automation may fire right now. Receives the whole automation - * so the host can gate kind-appropriately: a heartbeat injects into its own - * session (gate on that session's existence/idleness), while a cron spawns a - * FRESH session (its creator session is irrelevant — gate only on global - * concerns like privacy mode). Global gates (e.g. incognito) apply to both. - */ - canFire: (automation: AutomationDefinition) => Promise; - /** - * Inject a turn into the automation's own session (heartbeat kind). - * Resolves with the run outcome AFTER the turn's stream finishes. - */ - injectTurn: ( - sessionId: string, - prompt: string, - automationId: string, - ) => Promise; - /** - * Spawn a fresh session and run the prompt there (cron kind). - * Resolves with the run outcome AFTER the run's stream finishes. - * When absent, the host does not support cron and cron fires fail. - */ - createFreshRun?: (prompt: string, automationId: string) => Promise; - setTimeout: (fn: () => void, ms: number) => unknown; - clearTimeout: (timer: unknown) => void; - now?: () => number; - onStateChange?: () => void; -} - -const FIRE_CHECK_INTERVAL_MS = 5000; // 5s tick (must be < minimum interval of 10s) - -/** - * Defer window for a fire that lands on a busy session. - * - * Review fix (#639 semantics restored): the whole point of a heartbeat is to - * fire after long-running work — agent turns routinely run for many minutes, - * so a ~120s retry budget silently dropped (and for `once` terminally expired) - * any fire that landed mid-turn. The old wakeup-scheduler retried with - * exponential backoff, 5s doubling to a 5min cap, waiting ~45 minutes in - * total before giving up. This - * scheduler is tick-driven (a fixed 5s cadence), so the equivalent retry - * budget is expressed as a wall-clock window: keep deferring for - * DEFER_WINDOW_MS from the first deferred attempt, and only then skip the - * fire (skipFire advances a recurring schedule; a `once` automation expires - * ONLY when this window is exhausted — never on a transient busy blip). - */ -const DEFER_WINDOW_MS = 45 * 60 * 1000; - -/** Per-automation defer bookkeeping for the current pending fire. */ -interface DeferState { - firstDeferredAt: number; - count: number; -} - -export class AutomationScheduler { - private tickTimer: unknown = null; - private disposed = false; - private deferStates = new Map(); - /** Automation ids whose fire is currently executing (prevents concurrent re-fire). */ - private inFlight = new Set(); - private readonly now: () => number; - - constructor(private readonly deps: AutomationSchedulerDeps) { - this.now = deps.now ?? (() => Date.now()); - } - - start(): void { - if (this.disposed) return; - this.scheduleTick(); - } - - stop(): void { - if (this.tickTimer !== null) { - this.deps.clearTimeout(this.tickTimer); - this.tickTimer = null; - } - } - - dispose(): void { - this.disposed = true; - this.stop(); - this.deferStates.clear(); - this.inFlight.clear(); - } - - /** Whether an Automation fire has started but not fully settled. */ - hasInFlight(): boolean { - return this.inFlight.size > 0; - } - - private scheduleTick(): void { - if (this.disposed) return; - this.tickTimer = this.deps.setTimeout(() => { - if (this.disposed) return; - this.checkAndFire() - .catch(() => {}) - .finally(() => { - if (!this.disposed) this.scheduleTick(); - }); - }, FIRE_CHECK_INTERVAL_MS); - } - - private async checkAndFire(): Promise { - const now = this.now(); - const active = this.deps.automationManager.listActive(); - - // Prune defer bookkeeping for automations that no longer exist. - const activeIds = new Set(active.map((a) => a.id)); - for (const id of this.deferStates.keys()) { - if (!activeIds.has(id)) this.deferStates.delete(id); - } - - // Eager expiry sweep: expire automations whose expiresAt has passed, - // regardless of nextFireAt. Prevents zombie-active entries. - let sweptAny = false; - for (const automation of active) { - // Same invariant as attemptFire: a host without a cron executor must not - // mutate/persist crons at all — the durable store may be shared with a - // host that CAN run them, and this host's in-memory copy may be stale - // (no reload after startup), so expiring a cron here could clobber the - // owning host's edits on disk. Leave crons entirely to that host. - if (automation.kind === 'cron' && !this.deps.createFreshRun) continue; - if (automation.expiresAt && now >= automation.expiresAt) { - if (this.deps.automationManager.sweepExpired(automation.id)) sweptAny = true; - } - } - if (sweptAny) this.deps.onStateChange?.(); - - // Re-fetch active list after expiry sweep. - const stillActive = this.deps.automationManager.listActive(); - for (const automation of stillActive) { - if (this.disposed) return; - if (!automation.nextFireAt || automation.nextFireAt > now) continue; - await this.attemptFire(automation); - } - } - - private async attemptFire(automation: AutomationDefinition): Promise { - if (this.disposed) return; - - // A host without a cron executor cannot run cron automations. Leave them - // COMPLETELY untouched — do not fail, pause, or advance them, and emit no - // state change. The durable store may be shared with a host that CAN run - // them (e.g. the desktop shares its workspace with the `maka` CLI), so - // marking a cron failed/paused here would corrupt that shared durable state - // (a heartbeat-only CLI would otherwise pause the desktop's crons on disk). - if (automation.kind === 'cron' && !this.deps.createFreshRun) return; - - // In-flight guard: a fire whose run is still executing must not be started - // again. canFire protects heartbeat (its run occupies the automation's own - // session), but NOT cron (createFreshRun spawns a separate session, leaving - // the creator session idle), so a cron whose run outlasts its cadence would - // otherwise re-fire every tick — spawning duplicate sessions, blowing past - // maxFires, and committing outcomes out of order. This guard closes that - // window for every kind, independent of canFire. - if (this.inFlight.has(automation.id)) return; - - let canFire: boolean; - try { - canFire = await this.deps.canFire(automation); - } catch { - // canFire failure: skip this automation this tick, don't crash the loop. - return; - } - - if (this.disposed) return; - // Re-check the guard after the async canFire (another tick may have started). - if (this.inFlight.has(automation.id)) return; - - if (!canFire) { - const now = this.now(); - // Observability: surface deferred attempts in the model-facing list - // (mirrors the old CronList's fire_attempts/deferred_fires). - this.deps.automationManager.recordDeferredFire(automation.id); - const state = this.deferStates.get(automation.id); - if (!state) { - // First deferral for this pending fire — open the retry window. - this.deferStates.set(automation.id, { firstDeferredAt: now, count: 1 }); - return; - } - if (now - state.firstDeferredAt >= DEFER_WINDOW_MS) { - // Retry window exhausted — skip this fire entirely: a recurring - // schedule advances to its next slot; a `once` automation settles - // terminally (its window has genuinely passed, not a transient blip). - this.deferStates.delete(automation.id); - this.deps.automationManager.skipFire(automation.id); - this.deps.onStateChange?.(); - return; - } - state.count++; - return; - } - - this.deferStates.delete(automation.id); - - const started = this.deps.automationManager.attemptStarted(automation.id); - if (!started) { - this.deps.onStateChange?.(); - return; - } - // Persist the started state (fireCount/nextFireAt advanced) immediately. - this.deps.onStateChange?.(); - - const id = automation.id; - this.inFlight.add(id); - // Dispatch WITHOUT awaiting the tick — the run resolves its outcome later. - // The outcome (success/failure) is committed only after the stream finishes, - // so a failed or aborted fire is never recorded as a success. - const dispatch = - automation.kind === 'heartbeat' - ? this.deps.injectTurn( - automation.sessionId, - `[Automation: ${automation.name}]\n\n${automation.prompt}`, - id, - ) - : this.deps.createFreshRun!(automation.prompt, id); - - void dispatch - .then((result) => { - this.inFlight.delete(id); - if (this.disposed) return; - if (result.ok) { - this.deps.automationManager.attemptSucceeded(id, result.runId); - } else { - this.deps.automationManager.attemptFailed(id, result.error ?? 'Automation run failed'); - } - this.deps.onStateChange?.(); - }) - .catch((err) => { - this.inFlight.delete(id); - if (this.disposed) return; - const message = err instanceof Error ? err.message : String(err); - this.deps.automationManager.attemptFailed(id, message); - this.deps.onStateChange?.(); - }); - } -} - -export { FIRE_CHECK_INTERVAL_MS, DEFER_WINDOW_MS }; diff --git a/packages/runtime/src/automation-tools.ts b/packages/runtime/src/automation-tools.ts index 1d9ba9fb01..079941e27f 100644 --- a/packages/runtime/src/automation-tools.ts +++ b/packages/runtime/src/automation-tools.ts @@ -19,19 +19,11 @@ import { } from '@maka/core/automation'; import type { AutomationStatus } from '@maka/core/automation'; import type { MakaTool } from './tool-runtime.js'; -import type { AutomationManager, AutomationDefinition } from './automation-state.js'; +import type { AutomationDefinition } from './automation-state.js'; export const AUTOMATION_TOOL_NAME = 'Automation'; export const AUTOMATION_MODEL_LIST_MAX_ITEMS = 100; -export interface AutomationToolDeps { - automationManager: AutomationManager; - onAutomationChange?: () => void; - /** Whether the host can run cron (fresh-session) automations. When false, the - * cron kind is not advertised and is rejected at creation. */ - cronEnabled?: boolean; -} - export interface AutomationToolAuthority { create(input: { kind: AutomationDefinition['kind']; @@ -41,12 +33,23 @@ export interface AutomationToolAuthority { schedule: AutomationDefinition['schedule']; maxFires?: number; durable?: boolean; - }): Promise; - delete(id: string, sessionId: string): Promise; - pause(id: string, sessionId: string): Promise; - resume(id: string, sessionId: string): Promise; - get(id: string, sessionId: string): Promise; - listVisibleForSession(sessionId: string): Promise; + }): AutomationDefinition | { error: string } | Promise; + delete(id: string, sessionId: string): boolean | Promise; + pause( + id: string, + sessionId: string, + ): AutomationDefinition | undefined | Promise; + resume( + id: string, + sessionId: string, + ): AutomationDefinition | undefined | Promise; + get( + id: string, + sessionId: string, + ): AutomationDefinition | undefined | Promise; + listVisibleForSession( + sessionId: string, + ): readonly AutomationDefinition[] | Promise; } export interface AutomationAuthorityToolDeps { @@ -164,30 +167,6 @@ const AUTOMATION_SCHEMA_HEARTBEAT_ONLY = makeAutomationSchema( // Type from the broadest (cron-enabled) schema so kind can be 'heartbeat'|'cron'. type AutomationInput = z.infer; -export function buildAutomationTool(deps: AutomationToolDeps): MakaTool { - const changed = (value: T): T => { - deps.onAutomationChange?.(); - return value; - }; - return buildAutomationAuthorityTool({ - cronEnabled: deps.cronEnabled, - authority: { - create: async (input) => changed(deps.automationManager.create(input)), - delete: async (id, sessionId) => changed(deps.automationManager.delete(id, sessionId)), - pause: async (id, sessionId) => changed(deps.automationManager.pause(id, sessionId)), - resume: async (id, sessionId) => changed(deps.automationManager.resume(id, sessionId)), - get: async (id, sessionId) => { - const automation = deps.automationManager.get(id); - return automation && (automation.sessionId === sessionId || automation.durable === true) - ? automation - : undefined; - }, - listVisibleForSession: async (sessionId) => - deps.automationManager.listVisibleForSession(sessionId), - }, - }); -} - export function buildAutomationAuthorityTool( deps: AutomationAuthorityToolDeps, ): MakaTool { diff --git a/packages/runtime/src/builtin-tools.ts b/packages/runtime/src/builtin-tools.ts index 3b509b840e..266c6f033b 100644 --- a/packages/runtime/src/builtin-tools.ts +++ b/packages/runtime/src/builtin-tools.ts @@ -205,21 +205,27 @@ export function buildBuiltinTools(options: BuildBuiltinToolsOptions = {}): MakaT ref: refField, }) .strict(); - // Some providers serialize unused optional fields as empty strings, so a - // model may send `ref: ""` on an ordinary file read. A blank ref means "no - // ref provided": drop the key before the strict union judges it, keeping the - // canonical input a pure file-or-ref union — `{path, ref: ""}` reads the - // file, while a lone `{ref: ""}` fails validation (no readable target). - const dropEmptyRef = (value: unknown): unknown => { - if (typeof value !== 'object' || value === null || !('ref' in value)) return value; - const ref = (value as { ref?: unknown }).ref; + // Some providers serialize every optional field with a default. Normalize + // only empty fields that cannot carry intent, then let the strict union keep + // rejecting genuinely ambiguous file-and-resource requests. + const normalizeProviderReadInput = (value: unknown): unknown => { + if (typeof value !== 'object' || value === null || Array.isArray(value)) return value; + const input = value as Record; + const ref = input.ref; + const path = input.path; + if (typeof ref === 'string' && ref.trim() !== '') { + if (typeof path !== 'string' || path.trim() !== '') return value; + return Object.fromEntries( + Object.entries(input).filter( + ([key]) => key !== 'path' && key !== 'offset' && key !== 'limit', + ), + ); + } if (typeof ref !== 'string' || ref.trim() !== '') return value; - return Object.fromEntries( - Object.entries(value as Record).filter(([key]) => key !== 'ref'), - ); + return Object.fromEntries(Object.entries(input).filter(([key]) => key !== 'ref')); }; const strictReadParameters = z.preprocess( - dropEmptyRef, + normalizeProviderReadInput, z .union([fileReadParameters, runtimeResourceReadParameters]) .describe('Read a file with path, or a whole runtime resource with ref; provide exactly one'), diff --git a/packages/runtime/src/bundled-skill-catalog.generated.ts b/packages/runtime/src/bundled-skill-catalog.generated.ts index 27f06b1fe0..44d545826b 100644 --- a/packages/runtime/src/bundled-skill-catalog.generated.ts +++ b/packages/runtime/src/bundled-skill-catalog.generated.ts @@ -1,6 +1,6 @@ // @generated by scripts/gen-bundled-skill-catalog.mjs — do not edit by hand. -// Source of truth: resources/bundled-skills//SKILL.md -// Regenerate: node scripts/gen-bundled-skill-catalog.mjs +// Source of truth: packages/runtime/resources/bundled-skills//SKILL.md +// Regenerate: npm run generate:bundled-skills export interface BundledSkillSource { id: string; diff --git a/packages/runtime/src/configured-subagent-catalog.ts b/packages/runtime/src/configured-subagent-catalog.ts index 456a2ff6f9..8ea58faeb1 100644 --- a/packages/runtime/src/configured-subagent-catalog.ts +++ b/packages/runtime/src/configured-subagent-catalog.ts @@ -1,9 +1,4 @@ -import { - connectionEnabledModelIds, - type AppSettings, - type LlmConnection, - type SubagentPreset, -} from '@maka/core'; +import { connectionEnabledModelIds, type SubagentPreset } from '@maka/core'; import type { SubagentPresetListItem } from './agent-catalog.js'; export interface ConfiguredSubagentCatalog { @@ -12,8 +7,12 @@ export interface ConfiguredSubagentCatalog { } export function createConfiguredSubagentCatalog(deps: { - getSettings(): Promise; - getConnection(slug: string): Promise; + getPresets(): Promise; + getConnection(slug: string): Promise<{ + readonly enabled: boolean; + readonly defaultModel?: string; + readonly enabledModelIds?: readonly string[]; + } | null>; }): ConfiguredSubagentCatalog { const inspect = async (preset: SubagentPreset): Promise => { if (!preset.enabled) @@ -45,12 +44,10 @@ export function createConfiguredSubagentCatalog(deps: { return { async list() { - const settings = await deps.getSettings(); - return await Promise.all(settings.subagents.presets.map(inspect)); + return await Promise.all((await deps.getPresets()).map(inspect)); }, async resolve(id) { - const settings = await deps.getSettings(); - const preset = settings.subagents.presets.find((candidate) => candidate.id === id); + const preset = (await deps.getPresets()).find((candidate) => candidate.id === id); if (!preset) throw new Error(`Unknown subagent_id "${id}". Call agent_list before spawning.`); const inspected = await inspect(preset); if (inspected.availability.status !== 'available') { diff --git a/apps/desktop/src/main/explore-agent-tool.ts b/packages/runtime/src/explore-agent-tool.ts similarity index 83% rename from apps/desktop/src/main/explore-agent-tool.ts rename to packages/runtime/src/explore-agent-tool.ts index 96c1c0e696..7cf2211f3b 100644 --- a/apps/desktop/src/main/explore-agent-tool.ts +++ b/packages/runtime/src/explore-agent-tool.ts @@ -1,7 +1,8 @@ import { lstat, readdir, readFile, realpath, stat } from 'node:fs/promises'; import { basename, extname, join, resolve } from 'node:path'; import { z } from 'zod'; -import { isPathInside, toRelative, type MakaTool } from '@maka/runtime'; +import { isPathInside, toRelative } from './path-containment.js'; +import type { MakaTool } from './tool-runtime.js'; export const EXPLORE_AGENT_TOOL_NAME = 'ExploreAgent'; @@ -147,7 +148,13 @@ export interface ExploreAgentResult { durationMs: number; progress: string[]; recentEvents: ExploreAgentEvent[]; - evidence: Array<{ type: 'match' | 'candidate'; path: string; line?: number; label: string; score?: number }>; + evidence: Array<{ + type: 'match' | 'candidate'; + path: string; + line?: number; + label: string; + score?: number; + }>; summary: string; report: string; candidateFiles: Array<{ path: string; score: number; reasons: string[] }>; @@ -157,11 +164,25 @@ export interface ExploreAgentResult { message?: string; } -type ExploreAgentTerminalStatus = 'completed' | 'completed_empty' | 'failed' | 'canceled' | 'canceled_partial'; +type ExploreAgentTerminalStatus = + | 'completed' + | 'completed_empty' + | 'failed' + | 'canceled' + | 'canceled_partial'; type ExploreAgentLimitReason = 'candidate_budget' | 'file_budget' | 'match_budget' | 'byte_budget'; export interface ExploreAgentEvent { - type: 'started' | 'scope_resolved' | 'scan' | 'read' | 'checkpoint' | 'completed' | 'failed' | 'aborted' | 'progress'; + type: + | 'started' + | 'scope_resolved' + | 'scan' + | 'read' + | 'checkpoint' + | 'completed' + | 'failed' + | 'aborted' + | 'progress'; at: number; message: string; } @@ -192,20 +213,44 @@ export function buildExploreAgentTool(): MakaTool< 'and never writes files, starts services, installs packages, or uses the network. Use it when a separate investigation saves main-thread work. ' + 'Do not use it for one known file, a specific symbol, package scripts, test setup, config, or 1-3 obvious files; inspect those directly.', parameters: z.object({ - objective: z.string().min(4).max(600).describe('Specific research objective for the read-only worker.'), - roots: z.array(z.string().min(1).max(240)).max(MAX_ROOTS).optional() + objective: z + .string() + .min(4) + .max(600) + .describe('Specific research objective for the read-only worker.'), + roots: z + .array(z.string().min(1).max(240)) + .max(MAX_ROOTS) + .optional() .describe('Optional relative roots under the session cwd. Defaults to the session cwd.'), - queries: z.array(z.string().min(1).max(120)).max(MAX_QUERIES).optional() + queries: z + .array(z.string().min(1).max(120)) + .max(MAX_QUERIES) + .optional() .describe('Optional search terms. If omitted, terms are derived from the objective.'), - ignorePaths: z.array(z.string().min(1).max(240)).max(MAX_IGNORE_PATHS).optional() - .describe('Optional relative files or directories to skip, such as generated output, vendors, or build artifacts.'), - stoppingCondition: z.string().min(1).max(240).optional() - .describe('Optional plain-language condition that tells the worker when this investigation is sufficiently answered.'), + ignorePaths: z + .array(z.string().min(1).max(240)) + .max(MAX_IGNORE_PATHS) + .optional() + .describe( + 'Optional relative files or directories to skip, such as generated output, vendors, or build artifacts.', + ), + stoppingCondition: z + .string() + .min(1) + .max(240) + .optional() + .describe( + 'Optional plain-language condition that tells the worker when this investigation is sufficiently answered.', + ), maxFiles: z.number().int().min(1).max(80).optional(), maxMatches: z.number().int().min(1).max(120).optional(), }), categoryHint: 'subagent', - impl: async ({ objective, roots, queries, ignorePaths, stoppingCondition, maxFiles, maxMatches }, { cwd, abortSignal, emitOutput }) => { + impl: async ( + { objective, roots, queries, ignorePaths, stoppingCondition, maxFiles, maxMatches }, + { cwd, abortSignal, emitOutput }, + ) => { return runReadOnlyExplore({ cwd, objective, @@ -237,7 +282,17 @@ export async function runReadOnlyExplore(input: { const startedAt = Date.now(); const objective = normalizeText(input.objective).slice(0, 600); if (objective.length < 4) { - return failure('invalid_objective', objective, [], [], [], '', '只读探索需要一个明确的研究目标。', [], startedAt); + return failure( + 'invalid_objective', + objective, + [], + [], + [], + '', + '只读探索需要一个明确的研究目标。', + [], + startedAt, + ); } const roots = normalizeRoots(input.roots); @@ -248,30 +303,79 @@ export async function runReadOnlyExplore(input: { try { workspaceRoot = await realpath(input.cwd); } catch { - return failure('invalid_root', objective, roots, queryTerms, ignoredPaths, stoppingCondition, '会话工作目录不可读取。', [], startedAt); + return failure( + 'invalid_root', + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + '会话工作目录不可读取。', + [], + startedAt, + ); } const maxFiles = clampInteger(input.maxFiles, 1, 80, DEFAULT_MAX_FILES); const maxMatches = clampInteger(input.maxMatches, 1, 120, DEFAULT_MAX_MATCHES); const discoveryBudget = Math.min(MAX_DISCOVERED_FILES, Math.max(maxFiles * 4, maxFiles)); const progress = createProgressReporter(input.onProgress); if (input.abortSignal?.aborted) { - return abortFailure(objective, roots, queryTerms, ignoredPaths, stoppingCondition, progress, startedAt); + return abortFailure( + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + progress, + startedAt, + ); } - progress.report('started', `只读探索：准备范围（${roots.length} 个 root，${queryTerms.length} 个查询词）`); + progress.report( + 'started', + `只读探索：准备范围（${roots.length} 个 root，${queryTerms.length} 个查询词）`, + ); const resolvedRoots: Array<{ abs: string; rel: string }> = []; for (const root of roots) { if (input.abortSignal?.aborted) { - return abortFailure(objective, roots, queryTerms, ignoredPaths, stoppingCondition, progress, startedAt); + return abortFailure( + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + progress, + startedAt, + ); } const resolved = resolve(workspaceRoot, root); if (!isPathInside(workspaceRoot, resolved)) { - return failure('invalid_root', objective, roots, queryTerms, ignoredPaths, stoppingCondition, `root 必须位于会话工作目录内：${root}`, progress, startedAt); + return failure( + 'invalid_root', + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + `root 必须位于会话工作目录内：${root}`, + progress, + startedAt, + ); } try { const actual = await realpath(resolved); if (!isPathInside(workspaceRoot, actual)) { - return failure('invalid_root', objective, roots, queryTerms, ignoredPaths, stoppingCondition, `root 不能穿过符号链接离开工作目录：${root}`, progress, startedAt); + return failure( + 'invalid_root', + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + `root 不能穿过符号链接离开工作目录：${root}`, + progress, + startedAt, + ); } const rootStat = await stat(actual); if (!rootStat.isDirectory() && !rootStat.isFile()) continue; @@ -281,9 +385,22 @@ export async function runReadOnlyExplore(input: { } } if (resolvedRoots.length === 0) { - return failure('no_readable_roots', objective, roots, queryTerms, ignoredPaths, stoppingCondition, '没有可读取的研究范围。', progress, startedAt); + return failure( + 'no_readable_roots', + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + '没有可读取的研究范围。', + progress, + startedAt, + ); } - progress.report('scope_resolved', `只读探索：确认 ${resolvedRoots.length} 个可读范围：${resolvedRoots.map((root) => root.rel).join(', ')}`); + progress.report( + 'scope_resolved', + `只读探索：确认 ${resolvedRoots.length} 个可读范围：${resolvedRoots.map((root) => root.rel).join(', ')}`, + ); const files: string[] = []; const notes: string[] = [ @@ -301,14 +418,36 @@ export async function runReadOnlyExplore(input: { const limitReasons: ExploreAgentLimitReason[] = []; for (const root of resolvedRoots) { if (input.abortSignal?.aborted) { - return abortFailure(objective, roots, queryTerms, ignoredPaths, stoppingCondition, progress, startedAt); + return abortFailure( + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + progress, + startedAt, + ); } const before = files.length; const skippedBefore = filesSkipped; const sensitiveBefore = sensitiveFilesSkipped; - const listed = await listTextFiles(root.abs, workspaceRoot, discoveryBudget - files.length, ignoredPaths, input.abortSignal); + const listed = await listTextFiles( + root.abs, + workspaceRoot, + discoveryBudget - files.length, + ignoredPaths, + input.abortSignal, + ); if (listed.aborted) { - return abortFailure(objective, roots, queryTerms, ignoredPaths, stoppingCondition, progress, startedAt); + return abortFailure( + objective, + roots, + queryTerms, + ignoredPaths, + stoppingCondition, + progress, + startedAt, + ); } files.push(...listed.files); filesSkipped += listed.skipped; @@ -321,7 +460,10 @@ export async function runReadOnlyExplore(input: { const found = files.length - before; const skipped = filesSkipped - skippedBefore; const sensitive = sensitiveFilesSkipped - sensitiveBefore; - progress.report('scan', `只读探索：扫描 ${root.rel}，找到 ${found} 个文本候选，跳过 ${skipped} 项${sensitive > 0 ? `（含 ${sensitive} 个敏感文件）` : ''}`); + progress.report( + 'scan', + `只读探索：扫描 ${root.rel}，找到 ${found} 个文本候选，跳过 ${skipped} 项${sensitive > 0 ? `（含 ${sensitive} 个敏感文件）` : ''}`, + ); if (files.length >= discoveryBudget) break; } files.sort((left, right) => { @@ -331,13 +473,21 @@ export async function runReadOnlyExplore(input: { const rightScore = scorePath(rightRel, queryTerms).score; return rightScore - leftScore || leftRel.localeCompare(rightRel); }); - if (files.some((file) => scorePath(toRelative(workspaceRoot, file), queryTerms).reasons.some((reason) => reason.startsWith('project ')))) { + if ( + files.some((file) => + scorePath(toRelative(workspaceRoot, file), queryTerms).reasons.some((reason) => + reason.startsWith('project '), + ), + ) + ) { notes.push('广泛研究会优先读取项目配置、文档、入口和测试线索。'); } const filesToInspect = files.slice(0, maxFiles); if (files.length > filesToInspect.length) { addLimitReason(limitReasons, 'file_budget'); - notes.push(`已发现 ${files.length} 个文本候选；按查询命中和项目结构分读取前 ${filesToInspect.length} 个。`); + notes.push( + `已发现 ${files.length} 个文本候选；按查询命中和项目结构分读取前 ${filesToInspect.length} 个。`, + ); } const candidates = new Map }>(); @@ -431,7 +581,10 @@ export async function runReadOnlyExplore(input: { } if (matches.length >= maxMatches || bytesRead >= MAX_TOTAL_BYTES) break; if (inspected > 0 && inspected % 10 === 0) { - progress.report('checkpoint', `只读探索：已读取 ${inspected} 个文件，命中 ${matches.length} 处`); + progress.report( + 'checkpoint', + `只读探索：已读取 ${inspected} 个文件，命中 ${matches.length} 处`, + ); } } @@ -445,9 +598,11 @@ export async function runReadOnlyExplore(input: { .slice(0, 20); const evidence = buildEvidenceAnchors(matches, candidateFiles); - const terminalStatus: ExploreAgentTerminalStatus = evidence.length > 0 ? 'completed' : 'completed_empty'; + const terminalStatus: ExploreAgentTerminalStatus = + evidence.length > 0 ? 'completed' : 'completed_empty'; if (matches.length === 0) notes.push('没有找到内容命中；候选文件可作为下一步阅读清单。'); - if (sensitiveFilesSkipped > 0) notes.push(`已跳过 ${sensitiveFilesSkipped} 个疑似本地凭据/密钥文件，只报告数量不读取内容。`); + if (sensitiveFilesSkipped > 0) + notes.push(`已跳过 ${sensitiveFilesSkipped} 个疑似本地凭据/密钥文件，只报告数量不读取内容。`); if (matches.length >= maxMatches) { addLimitReason(limitReasons, 'match_budget'); notes.push(`命中预算已用尽；只返回前 ${maxMatches} 处内容命中。`); @@ -456,7 +611,10 @@ export async function runReadOnlyExplore(input: { addLimitReason(limitReasons, 'byte_budget'); notes.push('总读取预算已用尽，部分候选文件未继续读取。'); } - progress.report('completed', `只读探索：完成，读取 ${inspected} 个文件，命中 ${matches.length} 处，候选 ${candidateFiles.length} 个`); + progress.report( + 'completed', + `只读探索：完成，读取 ${inspected} 个文件，命中 ${matches.length} 处，候选 ${candidateFiles.length} 个`, + ); const completedAt = Date.now(); const durationMs = Math.max(0, completedAt - startedAt); const summary = buildResultSummary({ @@ -665,10 +823,16 @@ function normalizeQueries(queries: string[] | undefined, objective: string): str function normalizeIgnorePaths(paths: string[] | undefined): string[] { const normalized: string[] = []; for (const raw of paths ?? []) { - const value = raw.trim().replace(/\\/g, '/').replace(/^\.\/+/, '').replace(/\/+$/g, ''); - if (!value || value === '.' || value === '..' || value.startsWith('/') || value.includes('\0')) continue; + const value = raw + .trim() + .replace(/\\/g, '/') + .replace(/^\.\/+/, '') + .replace(/\/+$/g, ''); + if (!value || value === '.' || value === '..' || value.startsWith('/') || value.includes('\0')) + continue; const segments = value.split('/').filter(Boolean); - if (segments.length === 0 || segments.some((segment) => segment === '.' || segment === '..')) continue; + if (segments.length === 0 || segments.some((segment) => segment === '.' || segment === '..')) + continue; normalized.push(segments.join('/').slice(0, 160)); if (normalized.length >= MAX_IGNORE_PATHS) break; } @@ -744,7 +908,10 @@ function scorePath(path: string, queries: string[]): { score: number; reasons: s score += 8; reasons.push('project entrypoint'); } - if (/\b(__tests__|tests?|specs?|e2e)\b/i.test(path) || /\.(test|spec)\.[cm]?[jt]sx?$/i.test(path)) { + if ( + /\b(__tests__|tests?|specs?|e2e)\b/i.test(path) || + /\.(test|spec)\.[cm]?[jt]sx?$/i.test(path) + ) { score += 6; reasons.push('project test surface'); } @@ -762,7 +929,12 @@ function scorePath(path: string, queries: string[]): { score: number; reasons: s return { score, reasons }; } -function findMatches(path: string, text: string, queries: string[], remaining: number): ExploreAgentResult['matches'] { +function findMatches( + path: string, + text: string, + queries: string[], + remaining: number, +): ExploreAgentResult['matches'] { if (remaining <= 0) return []; const matches: ExploreAgentResult['matches'] = []; const lines = text.split(/\r?\n/); @@ -841,14 +1013,18 @@ function buildResearchReport(input: { `范围：${input.roots.length > 0 ? input.roots.join(', ') : '.'}`, `查询：${input.queryTerms.length > 0 ? input.queryTerms.join(', ') : '未指定'}`, ...(input.stoppingCondition ? [`停止条件：${input.stoppingCondition}`] : []), - ...(input.limitReasons.length > 0 ? [`预算边界：${input.limitReasons.map(presentExploreAgentLimitReason).join('、')}`] : []), + ...(input.limitReasons.length > 0 + ? [`预算边界：${input.limitReasons.map(presentExploreAgentLimitReason).join('、')}`] + : []), `发现/读取：${input.filesDiscovered} / ${input.filesInspected} 个文件，跳过 ${input.filesSkipped} 个${input.sensitiveFilesSkipped > 0 ? `（含敏感 ${input.sensitiveFilesSkipped} 个）` : ''}，${formatReportBytes(input.bytesRead)}，耗时 ${formatReportDuration(input.durationMs)}`, ]; if (input.evidence.length > 0) { lines.push('', '证据锚点：'); for (const item of input.evidence.slice(0, 8)) { - lines.push(`- ${item.path}${typeof item.line === 'number' ? `:${item.line}` : ''} — ${item.label}`); + lines.push( + `- ${item.path}${typeof item.line === 'number' ? `:${item.line}` : ''} — ${item.label}`, + ); } } @@ -1028,7 +1204,15 @@ function partialAbortFailure(input: { startedAt: number; }): ExploreAgentResult { if (input.filesInspected <= 0 && input.matches.length === 0 && input.candidates.size === 0) { - return abortFailure(input.objective, input.roots, input.queryTerms, input.ignoredPaths, input.stoppingCondition, input.progress, input.startedAt); + return abortFailure( + input.objective, + input.roots, + input.queryTerms, + input.ignoredPaths, + input.stoppingCondition, + input.progress, + input.startedAt, + ); } const completedAt = Date.now(); appendExploreEvent(input.progress.recentEvents, { @@ -1047,10 +1231,7 @@ function partialAbortFailure(input: { const evidence = buildEvidenceAnchors(input.matches, candidateFiles); const terminalStatus: ExploreAgentTerminalStatus = 'canceled_partial'; const durationMs = Math.max(0, completedAt - input.startedAt); - const notes = [ - ...input.notes, - '只读探索已取消；以下为取消前已读取的部分结果，不代表完整结论。', - ]; + const notes = [...input.notes, '只读探索已取消；以下为取消前已读取的部分结果，不代表完整结论。']; const summary = `已取消：${buildResultSummary({ filesDiscovered: input.filesDiscovered, filesInspected: input.filesInspected, @@ -1119,10 +1300,23 @@ function abortFailure( progress: string[] | ProgressState = [], startedAt = Date.now(), ): ExploreAgentResult { - return failure('aborted', objective, roots, queries, ignoredPaths, stoppingCondition, '只读探索已取消。', progress, startedAt); + return failure( + 'aborted', + objective, + roots, + queries, + ignoredPaths, + stoppingCondition, + '只读探索已取消。', + progress, + startedAt, + ); } -function normalizeProgressState(progress: string[] | ProgressState, startedAt: number): ProgressState { +function normalizeProgressState( + progress: string[] | ProgressState, + startedAt: number, +): ProgressState { if (!Array.isArray(progress)) { return { messages: [...progress.messages], diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts index a96a249f31..5e1703c717 100644 --- a/packages/runtime/src/index.ts +++ b/packages/runtime/src/index.ts @@ -388,6 +388,12 @@ export type { } from './mcp-tools.js'; export { buildAskUserQuestionTool } from './ask-user-question-tool.js'; export { buildRequestSandboxBoundaryTool } from './sandbox-boundary-tool.js'; +export { + buildExploreAgentTool, + runReadOnlyExplore, + EXPLORE_AGENT_TOOL_NAME, +} from './explore-agent-tool.js'; +export type { ExploreAgentEvent, ExploreAgentResult } from './explore-agent-tool.js'; export { buildSubmitPlanTool, buildUpdatePlanTool, buildCancelPlanTool } from './plan-tools.js'; export type { PlanToolResult } from './plan-tools.js'; export { @@ -1541,22 +1547,15 @@ export type { AutomationStatus, AutomationManagerDeps, } from './automation-state.js'; -export { - AutomationScheduler, - FIRE_CHECK_INTERVAL_MS, - DEFER_WINDOW_MS, -} from './automation-scheduler.js'; -export type { AutomationSchedulerDeps, AutomationFireResult } from './automation-scheduler.js'; +export { FIRE_CHECK_INTERVAL_MS, DEFER_WINDOW_MS } from './automation-schedule-policy.js'; export { buildAutomationAuthorityTool, - buildAutomationTool, AUTOMATION_TOOL_NAME, AUTOMATION_MODEL_LIST_MAX_ITEMS, } from './automation-tools.js'; export type { AutomationAuthorityToolDeps, AutomationToolAuthority, - AutomationToolDeps, } from './automation-tools.js'; export { evaluateAutomationCanFire, HEARTBEAT_IDLE_STATUSES } from './automation-can-fire.js'; export type { CanFireSessionHeader, EvaluateAutomationCanFireDeps } from './automation-can-fire.js'; diff --git a/packages/runtime/src/invocation-context.ts b/packages/runtime/src/invocation-context.ts index ae83354d22..bb664e399a 100644 --- a/packages/runtime/src/invocation-context.ts +++ b/packages/runtime/src/invocation-context.ts @@ -82,6 +82,8 @@ export interface InvocationRequest { orchestration?: EffectiveOrchestration; /** Trusted effective tool protocol snapshot for this invocation. */ toolMode?: ToolMode; + /** Trusted per-turn cap on provider tool-call steps. */ + maxSteps?: number; text: string; /** Optional attachments bound to this user turn. */ attachments?: AttachmentRef[]; diff --git a/packages/runtime/src/runtime-event-read-model.ts b/packages/runtime/src/runtime-event-read-model.ts index e809950d26..d5cacf8c48 100644 --- a/packages/runtime/src/runtime-event-read-model.ts +++ b/packages/runtime/src/runtime-event-read-model.ts @@ -14,6 +14,7 @@ import { isPartialRuntimeEvent, isTerminalRuntimeEvent, isTerminalRuntimeEventStatus, + normalizeMessageContent, normalizeToolResultContentForRead, validateSandboxBoundaryExpansion, } from '@maka/core'; @@ -585,26 +586,9 @@ function projectText( ): boolean { if (event.content?.kind !== 'text') return false; if (event.role === 'user') { - messages.push({ - type: 'user', - id: stableMessageId(event, state, 'user'), - turnId: event.turnId, - ts: event.ts, - text: event.content.text, - ...(event.content.displayText !== undefined - ? { displayText: event.content.displayText } - : {}), - ...(event.content.origin !== undefined ? { origin: event.content.origin } : {}), - ...(event.content.attachments !== undefined && event.content.attachments.length > 0 - ? { attachments: event.content.attachments } - : {}), - ...(event.content.quotes !== undefined && event.content.quotes.length > 0 - ? { quotes: event.content.quotes } - : {}), - ...(event.content.inlineReferences !== undefined - ? { inlineReferences: event.content.inlineReferences } - : {}), - }); + const message = projectRuntimeEventUserMessage(event, stableMessageId(event, state, 'user')); + if (!message) return false; + messages.push(message); return true; } @@ -646,6 +630,22 @@ function projectText( return false; } +export function projectRuntimeEventUserMessage( + event: RuntimeEvent, + messageId: string, +): Extract | undefined { + if (event.role !== 'user' || event.content?.kind !== 'text') return undefined; + return { + type: 'user', + id: messageId, + turnId: event.turnId, + ts: event.ts, + ...normalizeMessageContent(event.content), + ...(event.content.origin !== undefined ? { origin: event.content.origin } : {}), + ...(event.content.steering === true ? { steeringEventId: event.id } : {}), + }; +} + function nonCanonicalContentOrder( order: readonly AssistantStepContentKind[] | undefined, ): AssistantStepContentKind[] | undefined { diff --git a/packages/runtime/src/runtime-ledger-repair.ts b/packages/runtime/src/runtime-ledger-repair.ts index 4b4c8754f7..0d2cb1199f 100644 --- a/packages/runtime/src/runtime-ledger-repair.ts +++ b/packages/runtime/src/runtime-ledger-repair.ts @@ -3,6 +3,7 @@ import type { AgentRunHeader, AgentRunStore, RuntimeEvent, RuntimeEventStore } f import type { StoredMessage, TurnRecord } from '@maka/core/session'; import type { AgentRunLineage } from './agent-run.js'; import { backfillRuntimeEventsFromStoredMessages } from './runtime-event-backfill.js'; +import { projectRuntimeEventUserMessage } from './runtime-event-read-model.js'; import { buildRecoveredTerminalRuntimeEvent, commitTerminalRunWithRuntimeFact, @@ -12,6 +13,7 @@ export interface RuntimeLedgerRepairDeps { runStore: AgentRunStore; runtimeEventStore: RuntimeEventStore; readMessages(sessionId: string): Promise; + appendMessage(sessionId: string, message: StoredMessage): Promise; appendTurnState( sessionId: string, turnId: string, @@ -23,6 +25,27 @@ export interface RuntimeLedgerRepairDeps { now: () => number; } +interface RuntimeEventTranscriptProjectionDeps { + readMessages(sessionId: string): Promise; + appendMessage(sessionId: string, message: StoredMessage): Promise; +} + +export async function materializeRuntimeEventTranscriptProjection( + deps: RuntimeEventTranscriptProjectionDeps, + sessionId: string, + event: RuntimeEvent, + knownMessageIds?: Set, +): Promise { + const message = steeringMessageFromRuntimeEvent(event); + if (!message) return false; + const messageIds = + knownMessageIds ?? new Set((await deps.readMessages(sessionId)).map((item) => item.id)); + if (messageIds.has(message.id)) return false; + await deps.appendMessage(sessionId, message); + messageIds.add(message.id); + return true; +} + export class RuntimeLedgerRepair { private readonly queues = new Map>(); @@ -34,6 +57,28 @@ export class RuntimeLedgerRepair { return this.repairRunTerminalFact(sessionId, run); } + async repairSteeringMessagesOnce(sessionId: string): Promise { + return this.withRepairQueue(sessionId, 'steering-transcript', async () => { + const messages = await this.deps.readMessages(sessionId); + const messageIds = new Set(messages.map((message) => message.id)); + const inlineRunIds = new Set( + (await this.deps.runStore.listSessionRuns(sessionId)) + .filter(isSessionInlineRun) + .map((run) => run.runId), + ); + let repaired = 0; + for (const event of await this.deps.runtimeEventStore.readSessionRuntimeEvents(sessionId)) { + if (!inlineRunIds.has(event.runId)) continue; + if ( + await materializeRuntimeEventTranscriptProjection(this.deps, sessionId, event, messageIds) + ) { + repaired += 1; + } + } + return repaired; + }); + } + private async repairRunTerminalFact( sessionId: string, staleRun: AgentRunHeader, @@ -303,6 +348,20 @@ function isTerminalRunStatus(status: AgentRunHeader['status']): boolean { return status === 'completed' || status === 'failed' || status === 'cancelled'; } +function steeringMessageFromRuntimeEvent(event: RuntimeEvent): StoredMessage | undefined { + const messageId = event.refs?.providerEventId; + if ( + event.role !== 'user' || + event.content?.kind !== 'text' || + event.content.steering !== true || + typeof messageId !== 'string' || + messageId.length === 0 + ) { + return undefined; + } + return projectRuntimeEventUserMessage(event, messageId); +} + function isTerminalTurnStatus(status: TurnRecord['status']): boolean { return status === 'completed' || status === 'failed' || status === 'aborted'; } diff --git a/packages/runtime/src/runtime-runner.ts b/packages/runtime/src/runtime-runner.ts index dc684cdab9..867a0c6251 100644 --- a/packages/runtime/src/runtime-runner.ts +++ b/packages/runtime/src/runtime-runner.ts @@ -587,6 +587,7 @@ function snapshotInvocationRequest( ? { orchestration: cloneAndFreezeSnapshotValue(request.orchestration) } : {}), ...(request.toolMode !== undefined ? { toolMode: request.toolMode } : {}), + ...(request.maxSteps !== undefined ? { maxSteps: request.maxSteps } : {}), ...(request.attachments !== undefined ? { attachments: cloneAndFreezeSnapshotValue(request.attachments) } : {}), @@ -780,6 +781,7 @@ function buildFlowInput(request: InvocationRequest): FlowInput { ...(request.lineage?.parentRunId ? { parentRunId: request.lineage.parentRunId } : {}), ...(request.orchestration !== undefined ? { orchestration: request.orchestration } : {}), ...(request.toolMode !== undefined ? { toolMode: request.toolMode } : {}), + ...(request.maxSteps !== undefined ? { maxSteps: request.maxSteps } : {}), text: request.text, context: request.context ?? [], ...(request.runtimeContext !== undefined ? { runtimeContext: request.runtimeContext } : {}), diff --git a/packages/runtime/src/session-manager.ts b/packages/runtime/src/session-manager.ts index ee59bd182c..1e00f502ae 100644 --- a/packages/runtime/src/session-manager.ts +++ b/packages/runtime/src/session-manager.ts @@ -920,6 +920,7 @@ export class SessionManager { runStore: deps.runStore, runtimeEventStore: deps.runtimeEventStore, readMessages: (sessionId) => deps.store.readMessages(sessionId), + appendMessage: (sessionId, message) => deps.store.appendMessage(sessionId, message), appendTurnState: (sessionId, turnId, status, lineage, options) => this.appendTurnState(sessionId, turnId, status, lineage, options), newId: deps.newId, @@ -1403,6 +1404,13 @@ export class SessionManager { ); const recovered = new Set(); for (const session of interrupted) { + if (this.runtimeLedgerRepair) { + await recoverOr( + policy, + () => this.runtimeLedgerRepair!.repairSteeringMessagesOnce(session.id), + 0, + ); + } if (this.runtimeKernel.hasActiveRuns(session.id)) continue; // Fail-closed: a request whose live owner died can never be answered, so // it settles as `deny` with a durable `host_restarted` reason. The run diff --git a/packages/runtime/src/shell-run-manager.ts b/packages/runtime/src/shell-run-manager.ts index ca4b2bf5de..38647f0a3c 100644 --- a/packages/runtime/src/shell-run-manager.ts +++ b/packages/runtime/src/shell-run-manager.ts @@ -74,7 +74,9 @@ import { closeChildFdSources } from './child-fd-input.js'; type LifecycleCause = 'timeout' | 'cancel' | 'shutdown'; const PTY_RAW_REPLAY_CHARS = 16_000; const PTY_RAW_PUBLISH_INTERVAL_MS = 16; -const PTY_RAW_PUBLISH_BYTES = 64 * 1024; +const PTY_RAW_INPUT_CHUNK_CODE_POINTS = 4_096; +const PTY_RAW_PUBLISH_TARGET_BYTES = 32 * 1024; +const PTY_RAW_PUBLISH_MAX_BYTES = 40 * 1024; /** * Shown whenever a `ref` argument does not parse. Echoing the rejected string @@ -949,14 +951,20 @@ export class ShellRunProcessManager private onPtyData(live: LivePtyShellRun, data: string): void { if (live.driverExit || live.finalizeOnce) return; - live.rawSequence += 1; live.rawBuffer = `${live.rawBuffer}${data}`.slice(-PTY_RAW_REPLAY_CHARS); live.collector.accept(data); - live.pendingRawData += data; - if (Buffer.byteLength(live.pendingRawData, 'utf8') >= PTY_RAW_PUBLISH_BYTES) { - this.publishPtyData(live); - return; + for (const chunk of splitPtyData(data)) { + const combined = `${live.pendingRawData}${chunk}`; + if (live.pendingRawData && encodedPtyDataBytes(combined) > PTY_RAW_PUBLISH_MAX_BYTES) { + this.publishPtyData(live); + } + live.rawSequence += 1; + live.pendingRawData += chunk; + if (encodedPtyDataBytes(live.pendingRawData) >= PTY_RAW_PUBLISH_TARGET_BYTES) { + this.publishPtyData(live); + } } + if (!live.pendingRawData) return; live.rawPublishTimer ??= setTimeout(() => { live.rawPublishTimer = undefined; this.publishPtyData(live); @@ -2008,6 +2016,19 @@ function normalizeBackgroundTimeoutMs(value: number | undefined): number | undef return value; } +function splitPtyData(data: string): string[] { + const codePoints = Array.from(data); + const chunks: string[] = []; + for (let offset = 0; offset < codePoints.length; offset += PTY_RAW_INPUT_CHUNK_CODE_POINTS) { + chunks.push(codePoints.slice(offset, offset + PTY_RAW_INPUT_CHUNK_CODE_POINTS).join('')); + } + return chunks; +} + +function encodedPtyDataBytes(data: string): number { + return Buffer.byteLength(JSON.stringify(data), 'utf8'); +} + function validateSourceToolCallId(value: string): void { if (!isShellRunSourceToolCallId(value)) { throw new Error( diff --git a/packages/runtime/src/skill-invocation-receipt.ts b/packages/runtime/src/skill-invocation-receipt.ts index 50c772dcbe..a2707904e5 100644 --- a/packages/runtime/src/skill-invocation-receipt.ts +++ b/packages/runtime/src/skill-invocation-receipt.ts @@ -1,52 +1,24 @@ import { INLINE_REFERENCE_LABEL_MAX_LENGTH, INLINE_REFERENCE_MAX_COUNT, + SKILL_INVOCATION_ID_MAX_BYTES, + SKILL_INVOCATION_NAME_MAX_BYTES, + SKILL_INVOCATION_REF_MAX_BYTES, + SKILL_INVOCATION_REQUEST_MAX_BYTES, SKILL_INVOCATION_TOKEN_SOURCE, type InlineReference, + type PerRequestSkillInvocationFailureReason, + type SkillInvocationMode, + type SkillInvocationReceipt, } from '@maka/core'; -import type { LoadedSkillInstructions, LoadSkillInstructionsResult } from './skills.js'; +import type { LoadedSkillInstructions } from './skills.js'; -export type SkillInvocationMode = 'explicit' | 'model_tool'; -export type SkillInvocationFailureReason = - | Exclude['reason'] - | 'resolution_failed' - | 'too_many_requests'; - -export type PerRequestSkillInvocationFailureReason = Exclude< +export type { + PerRequestSkillInvocationFailureReason, SkillInvocationFailureReason, - 'too_many_requests' ->; - -/** - * Bounded, instruction-free record of one Skill load attempt. - * - * The receipt is safe to return to clients and project into run traces: it - * never contains the user prompt, search query, or SKILL.md body. - */ -export type SkillInvocationReceipt = - | { - invocation: SkillInvocationMode; - request: string; - success: true; - ref: string; - id: string; - name: string; - scope: LoadedSkillInstructions['scope']; - source: LoadedSkillInstructions['source']; - truncated: boolean; - } - | { - invocation: SkillInvocationMode; - request: string; - success: false; - reason: PerRequestSkillInvocationFailureReason; - } - | { - invocation: 'explicit'; - success: false; - reason: 'too_many_requests'; - requestLimit: number; - }; + SkillInvocationMode, + SkillInvocationReceipt, +} from '@maka/core'; export function loadedSkillInvocationReceipt( invocation: SkillInvocationMode, @@ -57,15 +29,25 @@ export function loadedSkillInvocationReceipt( invocation, request: boundSkillInvocationRequest(request), success: true, - ref: skill.ref, - id: skill.id, - name: skill.name, + ref: truncateUtf8(skill.ref, SKILL_INVOCATION_REF_MAX_BYTES), + id: truncateUtf8(skill.id, SKILL_INVOCATION_ID_MAX_BYTES), + name: truncateUtf8(skill.name, SKILL_INVOCATION_NAME_MAX_BYTES), scope: skill.scope, source: skill.source, truncated: skill.truncated, }; } +export function skillInvocationLoadedEntry(skill: Pick): { + readonly id: string; + readonly name: string; +} { + return { + id: truncateUtf8(skill.id, SKILL_INVOCATION_ID_MAX_BYTES), + name: truncateUtf8(skill.name, SKILL_INVOCATION_NAME_MAX_BYTES), + }; +} + /** Freeze successful user-authored Skill tokens for transcript rendering. */ export function skillInvocationInlineReferences( receipts: readonly SkillInvocationReceipt[], @@ -157,5 +139,20 @@ export function boundSkillInvocationRequest(request: string): string { // strip controls so diagnostics cannot become an unbounded/log-injection // channel when an older client bypasses the normal IPC validator. // eslint-disable-next-line no-control-regex - return request.replace(/[\u0000-\u001F\u007F]/g, '').slice(0, 512); + const cleaned = request.replace(/[\u0000-\u001F\u007F]/g, ''); + return truncateUtf8(cleaned || '[invalid]', SKILL_INVOCATION_REQUEST_MAX_BYTES); +} + +function truncateUtf8(value: string, maxBytes: number): string { + const encoder = new TextEncoder(); + if (encoder.encode(value).byteLength <= maxBytes) return value; + let result = ''; + let bytes = 0; + for (const character of value) { + const characterBytes = encoder.encode(character).byteLength; + if (bytes + characterBytes > maxBytes) break; + result += character; + bytes += characterBytes; + } + return result; } diff --git a/packages/runtime/src/skill-invocation.ts b/packages/runtime/src/skill-invocation.ts index 511e7a540c..dfc093757e 100644 --- a/packages/runtime/src/skill-invocation.ts +++ b/packages/runtime/src/skill-invocation.ts @@ -1,4 +1,9 @@ -import { SKILL_INVOCATION_TOKEN_SOURCE } from '@maka/core'; +import { + SKILL_INVOCATION_TOKEN_SOURCE, + decodeSkillInvocationResult, + type SkillInvocationFailure, + type SkillInvocationResult, +} from '@maka/core'; import { gateSkillsByHostCapabilities, loadSkillInstructionsFromScan, @@ -12,6 +17,7 @@ import { failedSkillInvocationReceipt, loadedSkillInvocationReceipt, overflowSkillInvocationReceipt, + skillInvocationLoadedEntry, type PerRequestSkillInvocationFailureReason, type SkillInvocationReceipt, } from './skill-invocation-receipt.js'; @@ -54,22 +60,7 @@ export interface SkillInvocationToken { end: number; } -export type SkillInvocationFailure = - | { - request: string; - reason: PerRequestSkillInvocationFailureReason; - } - | { - reason: 'too_many_requests'; - requestLimit: number; - }; - -export interface SkillInvocationResult { - loaded: Array<{ id: string; name: string }>; - failed: SkillInvocationFailure[]; - /** One bounded outcome per distinct request, including all-failed sends. */ - receipts: SkillInvocationReceipt[]; -} +export type { SkillInvocationFailure, SkillInvocationResult } from '@maka/core'; export type PreparedSkillInvocationMessage = | { @@ -256,7 +247,7 @@ async function prepareSkillInvocation(input: { const passthrough: PreparedSkillInvocationMessage = { disposition: 'passthrough', sendText: input.text, - skillInvocation: { loaded: [], failed: [], receipts: [] }, + skillInvocation: validatedSkillInvocationResult({ loaded: [], failed: [], receipts: [] }), }; const tokens = parseSkillInvocationTokens(input.text); const requestSet = distinctInvocationRequests([ @@ -266,11 +257,11 @@ async function prepareSkillInvocation(input: { if (requestSet.overflow) { return { disposition: 'blocked', - skillInvocation: { + skillInvocation: validatedSkillInvocationResult({ loaded: [], failed: [{ reason: 'too_many_requests', requestLimit: MAX_SKILL_INVOCATION_REQUESTS }], receipts: [overflowSkillInvocationReceipt(MAX_SKILL_INVOCATION_REQUESTS)], - }, + }), }; } const requests = requestSet.requests; @@ -301,11 +292,11 @@ async function prepareSkillInvocation(input: { receipts.push(failedSkillInvocationReceipt('explicit', entry.request, entry.result.reason)); } } - const skillInvocation: SkillInvocationResult = { - loaded: loaded.map((skill) => ({ id: skill.id, name: skill.name })), + const skillInvocation = validatedSkillInvocationResult({ + loaded: loaded.map(skillInvocationLoadedEntry), failed: failures, receipts, - }; + }); if (loaded.length === 0) return { disposition: 'blocked', skillInvocation }; return { disposition: 'ready', @@ -315,7 +306,7 @@ async function prepareSkillInvocation(input: { } catch { return { disposition: 'blocked', - skillInvocation: { + skillInvocation: validatedSkillInvocationResult({ loaded: [], failed: requests.map((request) => ({ request: boundSkillInvocationRequest(request), @@ -324,11 +315,15 @@ async function prepareSkillInvocation(input: { receipts: requests.map((request) => failedSkillInvocationReceipt('explicit', request, 'resolution_failed'), ), - }, + }), }; } } +function validatedSkillInvocationResult(value: SkillInvocationResult): SkillInvocationResult { + return decodeSkillInvocationResult(value); +} + type DistinctInvocationRequests = { overflow: false; requests: string[] } | { overflow: true }; function distinctInvocationRequests(requests: readonly string[]): DistinctInvocationRequests { diff --git a/packages/runtime/src/subagent-tools.ts b/packages/runtime/src/subagent-tools.ts index 50dc42285c..2ee1c7719d 100644 --- a/packages/runtime/src/subagent-tools.ts +++ b/packages/runtime/src/subagent-tools.ts @@ -395,12 +395,9 @@ export function buildSubagentListTool(): MakaTool< categoryHint: 'read', nesting: 'direct_only', impl: async (input, ctx) => { - // Not reachable from the desktop app or the CLI: both pass - // `listChildAgents` to ToolRuntime unconditionally - // (`session-stream.ts`, `runtime-bootstrap.ts`), and ToolRuntime hands - // it straight to the tool context. `harbor-cell.ts` passes it only when - // its own context carries one, so a headless embedder can still land - // here — which is why this stays a sentence rather than being deleted. + // Runtime Host supplies this capability to production clients. + // A headless embedder can still construct ToolRuntime without it, so + // keep the failure explicit at the embedding boundary. if (!ctx.listChildAgents) { throw new Error( 'agent_list is not available in this session, so no agent catalog could be read. ' + diff --git a/packages/runtime/src/tool-runtime.ts b/packages/runtime/src/tool-runtime.ts index f79aef29ba..c55e58cc3f 100644 --- a/packages/runtime/src/tool-runtime.ts +++ b/packages/runtime/src/tool-runtime.ts @@ -2197,10 +2197,9 @@ export class ToolRuntime { // unconditionally a few lines above, so that guard answers only an // embedder that builds its own context — never a production tool call. // - // This one does fire in production. The desktop app supplies both store - // callbacks unconditionally (`session-stream.ts`), but the CLI supplies - // them only on the `tui` surface (`runtime-bootstrap.ts`), so every - // non-TUI CLI surface reaches here for any call that is not a hosted run. + // This remains part of the embedding API. Runtime Host supplies the + // interaction capability for production clients, while an embedder can + // still construct ToolRuntime without one. throw new Error(SANDBOX_BOUNDARY_UNAVAILABLE); } const normalized = await racePromiseWithAbort( diff --git a/packages/storage/package.json b/packages/storage/package.json index e03e8af687..ba0dae6ba9 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -8,6 +8,8 @@ "types": "./dist/index.d.ts", "exports": { ".": "./dist/index.js", + "./connection-store": "./dist/connection-store.js", + "./credential-store": "./dist/credential-store.js", "./artifact-stores": "./dist/artifact-stores.js", "./automation-authority": "./dist/automation-authority.js", "./daily-review-authority": "./dist/daily-review-authority.js", @@ -23,6 +25,7 @@ "./pet-pack-store": "./dist/pet-pack-store.js", "./root-authority": "./dist/root-authority.js", "./runtime-policy-stores": "./dist/runtime-policy-stores.js", + "./settings-store": "./dist/settings-store.js", "./shell-run-authority": "./dist/shell-run-authority.js", "./task-ledger-authority": "./dist/task-ledger-authority.js", "./model-call-ledger": "./dist/model-call-ledger.js", diff --git a/packages/storage/src/__tests__/runtime-policy-stores.test.ts b/packages/storage/src/__tests__/runtime-policy-stores.test.ts index 17647f46e8..38ddb5484c 100644 --- a/packages/storage/src/__tests__/runtime-policy-stores.test.ts +++ b/packages/storage/src/__tests__/runtime-policy-stores.test.ts @@ -15,15 +15,16 @@ import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { promisify } from 'node:util'; import { describe, mock, test } from 'node:test'; -import type { - ConnectionCatalogEntry, - ConnectionCatalogEntryDraft, - ConnectionVersionBasis, - CredentialLocator, - CredentialStatus, - CredentialVersionBasis, - MutateRuntimePolicyInput, - RuntimePolicy, +import { + createDefaultRuntimePolicy, + type ConnectionCatalogEntry, + type ConnectionCatalogEntryDraft, + type ConnectionVersionBasis, + type CredentialLocator, + type CredentialStatus, + type CredentialVersionBasis, + type MutateRuntimePolicyInput, + type RuntimePolicy, } from '@maka/core/runtime-policy'; import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections'; import { @@ -45,6 +46,63 @@ import { const execFileAsync = promisify(execFile); describe('runtime policy stores', () => { + test('upgrades a version-one policy with an empty canonical subagent catalog', async () => { + await withInteractiveOwner(async ({ root, stores }) => { + const { subagents: _subagents, ...legacyPolicy } = createDefaultRuntimePolicy(); + await writeFile( + join(root, 'runtime-policy.json'), + `${JSON.stringify({ schemaVersion: 1, revision: 3, policy: legacyPolicy })}\n`, + ); + + const snapshot = await stores.runtimePolicy.getSnapshot(); + assert.equal(snapshot.revision, 3); + assert.deepEqual(snapshot.policy.subagents, { presets: [] }); + const committed = await stores.runtimePolicy.mutate({ + expectedRevision: 3, + operation: { kind: 'set_subagents', value: { presets: [] } }, + }); + assert.equal(committed.kind, 'committed'); + const persisted = JSON.parse(await readFile(join(root, 'runtime-policy.json'), 'utf8')) as { + schemaVersion: number; + }; + assert.equal(persisted.schemaVersion, 2); + }); + }); + + test('commits an agent settings patch as one canonical policy revision', async () => { + await withInteractiveOwner(async ({ stores }) => { + const result = await stores.runtimePolicy.mutate({ + expectedRevision: 0, + operation: { + kind: 'patch_agent_settings', + value: { + personalization: { displayName: 'Maka' }, + memory: { agentReadEnabled: true }, + privacy: { incognitoActive: true }, + webSearch: { enabled: true }, + }, + }, + }); + + assert.equal(result.kind, 'committed'); + if (result.kind !== 'committed') return; + assert.equal(result.snapshot.revision, 1); + assert.deepEqual(result.snapshot.policy.personalization, { + displayName: 'Maka', + assistantTone: '', + }); + assert.deepEqual(result.snapshot.policy.memory, { + enabled: true, + agentReadEnabled: true, + }); + assert.equal(result.snapshot.policy.privacy.incognitoActive, true); + assert.deepEqual(result.snapshot.policy.webSearch, { + enabled: true, + defaultProvider: 'model', + }); + }); + }); + test('seeds the canonical inventory for fallback-only providers', async () => { await withInteractiveOwner(async ({ stores }) => { const connection = await createConnection(stores, 0, { diff --git a/packages/storage/src/__tests__/session-store.test.ts b/packages/storage/src/__tests__/session-store.test.ts index b500730d7d..45506f8592 100644 --- a/packages/storage/src/__tests__/session-store.test.ts +++ b/packages/storage/src/__tests__/session-store.test.ts @@ -92,6 +92,34 @@ describe('SQLite SessionStore', () => { } }); + test('clears unread when the current read marker is already the latest visible message', async () => { + const root = await mkdtemp(join(tmpdir(), 'maka-session-read-marker-')); + const store = createSessionStore(root); + try { + const session = await store.create(makeInput()); + await store.appendMessage(session.id, { + type: 'assistant', + id: 'message-1', + turnId: 'turn-1', + ts: 20, + text: 'already read', + modelId: 'fake-model', + }); + await store.updateHeader(session.id, { + lastReadMessageId: 'message-1', + hasUnread: true, + }); + + const updated = await store.markSessionReadThroughMessage(session.id, 'message-1'); + + assert.equal(updated.header.lastReadMessageId, 'message-1'); + assert.equal(updated.header.hasUnread, false); + } finally { + await store.close?.(); + await rm(root, { recursive: true, force: true }); + } + }); + test('deletes metadata and messages through the same transaction boundary', async () => { const root = await mkdtemp(join(tmpdir(), 'maka-session-delete-')); const store = createSessionStore(root); diff --git a/packages/storage/src/agent-run-store.ts b/packages/storage/src/agent-run-store.ts index 4b193580df..4b148ba62a 100644 --- a/packages/storage/src/agent-run-store.ts +++ b/packages/storage/src/agent-run-store.ts @@ -20,6 +20,7 @@ import { type EvidenceReadBudget, } from './bounded-evidence.js'; import { + decodeSkillInvocationResult, DurableStoreWriteError, aggregateMessageContents, decodeAgentGraphIntentClaim, @@ -39,6 +40,7 @@ import { type RootExecutionDescriptor, type RuntimeEvent, type RuntimeEventStore, + type SkillInvocationResult, } from '@maka/core'; import { encodeCanonicalRuntimeEvent } from '@maka/core/canonical-runtime-event'; import { @@ -78,10 +80,20 @@ export interface RootTurnAdmission { previousRootTurnId: string | null; normalizedInput: MessageContent | null; turnOrchestration?: TurnOrchestration; + skillInvocation?: SkillInvocationResult; sourceMessages: readonly RootTurnSourceMessage[]; admittedAt: number; } +export interface RootTurnStartRejection { + schemaVersion: 1; + sessionId: string; + turnId: string; + execution: RootExecutionDescriptor; + skillInvocation: SkillInvocationResult; + rejectedAt: number; +} + export interface AdmitRootTurnInput { sessionId: string; turnId: string; @@ -91,10 +103,24 @@ export interface AdmitRootTurnInput { previousRootTurnId: string | null; normalizedInput: MessageContent | null; turnOrchestration?: TurnOrchestration; + skillInvocation?: SkillInvocationResult; sourceMessages: readonly RootTurnSourceMessage[]; admittedAt: number; } +export interface CommitRootTurnStartRejectionInput { + sessionId: string; + turnId: string; + execution: RootExecutionDescriptor; + skillInvocation: SkillInvocationResult; + rejectedAt: number; +} + +export type CommitRootTurnStartRejectionResult = + | { kind: 'committed'; rejection: RootTurnStartRejection } + | { kind: 'existing'; rejection: RootTurnStartRejection } + | { kind: 'conflict'; rejection: RootTurnStartRejection }; + export interface RootTurnSourceMessageReceipt { admission: RootTurnAdmission; sourceMessage: RootTurnSourceMessage; @@ -119,7 +145,20 @@ export interface RootTurnAdmissionStore { listRootTurnAdmissionsForRecovery(sessionId: string): Promise; } -export interface DurableAgentRunStore extends AgentRunStore, RootTurnAdmissionStore { +export interface RootTurnStartRejectionStore { + readRootTurnStartRejection( + sessionId: string, + turnId: string, + ): Promise; + commitRootTurnStartRejection( + input: CommitRootTurnStartRejectionInput, + ): Promise; +} + +export interface DurableAgentRunStore + extends AgentRunStore, + RootTurnAdmissionStore, + RootTurnStartRejectionStore { findRunsById(runId: string, limit: number): Promise; listSessionRunsBounded(sessionId: string, limit: number): Promise; readEventsBounded( @@ -127,6 +166,12 @@ export interface DurableAgentRunStore extends AgentRunStore, RootTurnAdmissionSt runId: string, budget: EvidenceReadBudget, ): Promise>; + readEventsByTypeBounded( + sessionId: string, + runId: string, + type: AgentRunEventType, + budget: EvidenceReadBudget, + ): Promise>; listSessionRunsForRecovery(sessionId: string): Promise; readEventsForRecovery(sessionId: string, runId: string): Promise; readEventsForEvidence(sessionId: string, runId: string): Promise; @@ -393,26 +438,19 @@ class SqliteAgentRunStore implements DurableAgentRunStore { assertSafeId(sessionId, 'Invalid session id'); assertSafeId(runId, 'Invalid run id'); assertEvidenceReadBudget(budget); - const rows = this.#lease.database - .prepare(` - SELECT length(CAST(record_json AS BLOB)) AS stored_bytes - FROM core_agent_run_events - WHERE session_id = ? AND run_id = ? - ORDER BY sequence - LIMIT ? - `) - .all(sessionId, runId, budget.maxRecords + 1) as Array<{ stored_bytes?: unknown }>; - const measurement = measureEvidenceRows( - rows, - budget, - 'Invalid SQLite AgentRun evidence measurement row', - ); - if (!measurement) return { status: 'limit_exceeded' }; - return { - status: 'complete', - records: readSqliteAgentRunEventsForEvidence(this.#lease.database, sessionId, runId), - ...measurement, - }; + return readBoundedSqliteAgentRunEvents(this.#lease.database, sessionId, runId, budget); + } + + async readEventsByTypeBounded( + sessionId: string, + runId: string, + type: AgentRunEventType, + budget: EvidenceReadBudget, + ): Promise> { + assertSafeId(sessionId, 'Invalid session id'); + assertSafeId(runId, 'Invalid run id'); + assertEvidenceReadBudget(budget); + return readBoundedSqliteAgentRunEvents(this.#lease.database, sessionId, runId, budget, type); } async readEventsForRecovery(sessionId: string, runId: string): Promise { @@ -471,6 +509,15 @@ class SqliteAgentRunStore implements DurableAgentRunStore { ? { kind: 'existing', admission: existing } : { kind: 'conflict', admission: existing }; } + if ( + readSqliteRootTurnStartRejection( + this.#lease.database, + admission.sessionId, + admission.turnId, + ) + ) { + throw new Error('Root Turn identity is already rejected'); + } for (const source of admission.sourceMessages) { const proof = this.#lease.database .prepare(` @@ -518,6 +565,55 @@ class SqliteAgentRunStore implements DurableAgentRunStore { return readSqliteRootTurnAdmission(this.#lease.database, sessionId, turnId); } + async readRootTurnStartRejection( + sessionId: string, + turnId: string, + ): Promise { + assertSafeId(sessionId, 'Invalid session id'); + assertSafeId(turnId, 'Invalid turn id'); + return readSqliteRootTurnStartRejection(this.#lease.database, sessionId, turnId); + } + + async commitRootTurnStartRejection( + input: CommitRootTurnStartRejectionInput, + ): Promise { + const rejection = normalizeRootTurnStartRejection(input); + return this.#lease.transaction('write', () => { + const admission = readSqliteRootTurnAdmission( + this.#lease.database, + rejection.sessionId, + rejection.turnId, + ); + if (admission) { + throw new Error('Root Turn identity is already admitted'); + } + const existing = readSqliteRootTurnStartRejection( + this.#lease.database, + rejection.sessionId, + rejection.turnId, + ); + if (existing) { + return isDeepStrictEqual(existing.execution, rejection.execution) && + isDeepStrictEqual(existing.skillInvocation, rejection.skillInvocation) + ? { kind: 'existing', rejection: existing } + : { kind: 'conflict', rejection: existing }; + } + this.#lease.database + .prepare(` + INSERT INTO core_root_turn_start_rejections( + session_id, turn_id, rejected_at, record_json + ) VALUES (?, ?, ?, ?) + `) + .run( + rejection.sessionId, + rejection.turnId, + rejection.rejectedAt, + JSON.stringify(rejection), + ); + return { kind: 'committed', rejection }; + }); + } + async readRootTurnSourceMessageReceipt( sessionId: string, sourceMessageId: string, @@ -629,15 +725,27 @@ function readSqliteAgentRunEventsForEvidence( db: DatabaseSync, sessionId: string, runId: string, + type?: AgentRunEventType, ): AgentRunEvent[] { - const rows = db - .prepare(` - SELECT sequence, record_json - FROM core_agent_run_events - WHERE session_id = ? AND run_id = ? - ORDER BY sequence - `) - .all(sessionId, runId) as Array<{ sequence?: unknown; record_json?: unknown }>; + const rows = ( + type === undefined + ? db + .prepare(` + SELECT sequence, record_json + FROM core_agent_run_events + WHERE session_id = ? AND run_id = ? + ORDER BY sequence + `) + .all(sessionId, runId) + : db + .prepare(` + SELECT sequence, record_json + FROM core_agent_run_events + WHERE session_id = ? AND run_id = ? AND event_type = ? + ORDER BY sequence + `) + .all(sessionId, runId, type) + ) as Array<{ sequence?: unknown; record_json?: unknown }>; if (rows.length === 0) return []; const header = readSqliteAgentRun(db, sessionId, runId); return rows.map((row) => { @@ -667,6 +775,47 @@ function readSqliteAgentRunEventsForEvidence( }); } +function readBoundedSqliteAgentRunEvents( + db: DatabaseSync, + sessionId: string, + runId: string, + budget: EvidenceReadBudget, + type?: AgentRunEventType, +): BoundedEvidenceReadResult { + const rows = ( + type === undefined + ? db + .prepare(` + SELECT length(CAST(record_json AS BLOB)) AS stored_bytes + FROM core_agent_run_events + WHERE session_id = ? AND run_id = ? + ORDER BY sequence + LIMIT ? + `) + .all(sessionId, runId, budget.maxRecords + 1) + : db + .prepare(` + SELECT length(CAST(record_json AS BLOB)) AS stored_bytes + FROM core_agent_run_events + WHERE session_id = ? AND run_id = ? AND event_type = ? + ORDER BY sequence + LIMIT ? + `) + .all(sessionId, runId, type, budget.maxRecords + 1) + ) as Array<{ stored_bytes?: unknown }>; + const measurement = measureEvidenceRows( + rows, + budget, + 'Invalid SQLite AgentRun evidence measurement row', + ); + if (!measurement) return { status: 'limit_exceeded' }; + return { + status: 'complete', + records: readSqliteAgentRunEventsForEvidence(db, sessionId, runId, type), + ...measurement, + }; +} + function insertAgentRunEvent(db: DatabaseSync, event: AgentRunEvent): void { const row = db .prepare(` @@ -747,6 +896,88 @@ function readSqliteRootTurnAdmission( return normalizeRootTurnAdmission(JSON.parse(row.record_json), sessionId, turnId); } +function readSqliteRootTurnStartRejection( + db: DatabaseSync, + sessionId: string, + turnId: string, +): RootTurnStartRejection | undefined { + const row = db + .prepare(` + SELECT record_json + FROM core_root_turn_start_rejections + WHERE session_id = ? AND turn_id = ? + `) + .get(sessionId, turnId) as { record_json?: unknown } | undefined; + if (!row) return undefined; + if (typeof row.record_json !== 'string') { + throw new Error('Invalid root Turn start rejection row'); + } + return normalizeStoredRootTurnStartRejection(JSON.parse(row.record_json), sessionId, turnId); +} + +function normalizeRootTurnStartRejection( + input: CommitRootTurnStartRejectionInput, +): RootTurnStartRejection { + return normalizeStoredRootTurnStartRejection( + { + schemaVersion: 1, + sessionId: input.sessionId, + turnId: input.turnId, + execution: input.execution, + skillInvocation: input.skillInvocation, + rejectedAt: input.rejectedAt, + }, + input.sessionId, + input.turnId, + ); +} + +function normalizeStoredRootTurnStartRejection( + value: unknown, + sessionId: string, + turnId: string, +): RootTurnStartRejection { + assertSafeId(sessionId, 'Invalid session id'); + assertSafeId(turnId, 'Invalid turn id'); + if ( + !isPlainRecord(value) || + !hasExactKeys(value, [ + 'schemaVersion', + 'sessionId', + 'turnId', + 'execution', + 'skillInvocation', + 'rejectedAt', + ]) || + value.schemaVersion !== 1 || + value.sessionId !== sessionId || + value.turnId !== turnId || + !Number.isSafeInteger(value.rejectedAt) || + (value.rejectedAt as number) < 0 + ) { + throw new Error(`Invalid root Turn start rejection for turn ${turnId}`); + } + const execution = normalizeRootExecutionDescriptor(value.execution); + if (execution.kind !== 'external_message') { + throw new Error('Root Turn start rejection requires external message execution'); + } + const skillInvocation = decodeSkillInvocationResult(value.skillInvocation); + if (skillInvocation.loaded.length !== 0 || skillInvocation.failed.length === 0) { + throw new Error('Root Turn start rejection requires only failed Skill invocations'); + } + const rejection = { + schemaVersion: 1 as const, + sessionId, + turnId, + execution, + skillInvocation, + rejectedAt: value.rejectedAt as number, + }; + assertRootTurnAdmissionSerializedSize(`${JSON.stringify(rejection)}\n`); + Object.freeze(rejection.execution); + return Object.freeze(rejection); +} + function normalizeAdmitRootTurnInput(input: AdmitRootTurnInput): RootTurnAdmission { assertSafeId(input.sessionId, 'Invalid session id'); assertSafeId(input.turnId, 'Invalid turn id'); @@ -768,6 +999,10 @@ function normalizeAdmitRootTurnInput(input: AdmitRootTurnInput): RootTurnAdmissi input.sourceMessages, ); const turnOrchestration = normalizeTurnOrchestration(input.turnOrchestration); + const skillInvocation = + input.skillInvocation === undefined + ? undefined + : decodeSkillInvocationResult(input.skillInvocation); const admission: RootTurnAdmission = { schemaVersion: ROOT_TURN_ADMISSION_SCHEMA_VERSION, sessionId: input.sessionId, @@ -778,6 +1013,7 @@ function normalizeAdmitRootTurnInput(input: AdmitRootTurnInput): RootTurnAdmissi previousRootTurnId: input.previousRootTurnId, normalizedInput, ...(turnOrchestration ? { turnOrchestration } : {}), + ...(skillInvocation ? { skillInvocation } : {}), sourceMessages, admittedAt: input.admittedAt, }; @@ -961,6 +1197,10 @@ function normalizeRootTurnAdmission( record.sourceMessages, ); const turnOrchestration = normalizeTurnOrchestration(record.turnOrchestration); + const skillInvocation = + record.skillInvocation === undefined + ? undefined + : decodeSkillInvocationResult(record.skillInvocation); const admission: RootTurnAdmission = { schemaVersion: ROOT_TURN_ADMISSION_SCHEMA_VERSION, sessionId, @@ -971,6 +1211,7 @@ function normalizeRootTurnAdmission( previousRootTurnId: record.previousRootTurnId as string | null, normalizedInput, ...(turnOrchestration ? { turnOrchestration } : {}), + ...(skillInvocation ? { skillInvocation } : {}), sourceMessages, admittedAt: record.admittedAt as number, }; @@ -1205,6 +1446,7 @@ function rootTurnAdmissionPayloadsEqual( return ( isDeepStrictEqual(left.execution, right.execution) && isDeepStrictEqual(left.turnOrchestration, right.turnOrchestration) && + isDeepStrictEqual(left.skillInvocation, right.skillInvocation) && (left.normalizedInput === null || right.normalizedInput === null ? left.normalizedInput === right.normalizedInput : messageContentsEqual(left.normalizedInput, right.normalizedInput)) && @@ -1268,6 +1510,11 @@ function assertRootTurnAdmissionContract(admission: RootTurnAdmission): void { 'Invalid root turn admission contract: host-authored execution cannot have source messages', ); } + if (admission.skillInvocation && execution.kind !== 'external_message') { + throw new Error( + 'Invalid root turn admission contract: Skill invocation requires external message execution', + ); + } if (execution.kind === 'claimed_agent_graph_intent') { if ( execution.claim.targetSessionId !== admission.sessionId || @@ -1328,6 +1575,7 @@ function deepFreezeRootTurnAdmission(admission: RootTurnAdmission): RootTurnAdmi } Object.freeze(admission.execution); if (admission.turnOrchestration) Object.freeze(admission.turnOrchestration); + if (admission.skillInvocation) Object.freeze(admission.skillInvocation); if (admission.normalizedInput) deepFreezeRootTurnMessageContent(admission.normalizedInput); for (const sourceMessage of admission.sourceMessages) { deepFreezeRootTurnMessageContent(sourceMessage.content); @@ -1363,7 +1611,10 @@ function hasRootTurnAdmissionKeys(record: Record): boolean { 'sourceMessages', 'admittedAt', ]; - return hasExactKeys(record, keys) || hasExactKeys(record, [...keys, 'turnOrchestration']); + const optionalKeys = ['turnOrchestration', 'skillInvocation'].filter((key) => + Object.hasOwn(record, key), + ); + return hasExactKeys(record, [...keys, ...optionalKeys]); } function normalizeRootExecutionDescriptor(value: unknown): RootExecutionDescriptor { @@ -1371,16 +1622,25 @@ function normalizeRootExecutionDescriptor(value: unknown): RootExecutionDescript throw new Error('Invalid root execution descriptor'); } if (value.kind === 'external_message') { - const allowedKeys = ['kind', 'inputDigest']; + const allowedKeys = ['kind', 'inputDigest', 'maxSteps']; if (!Object.keys(value).every((key) => allowedKeys.includes(key))) { throw new Error('Invalid root execution descriptor'); } if (value.inputDigest !== undefined && !isSha256Digest(value.inputDigest)) { throw new Error('Invalid root execution descriptor'); } + if ( + value.maxSteps !== undefined && + (typeof value.maxSteps !== 'number' || + !Number.isSafeInteger(value.maxSteps) || + value.maxSteps <= 0) + ) { + throw new Error('Invalid root execution descriptor'); + } return Object.freeze({ kind: 'external_message', ...(value.inputDigest !== undefined ? { inputDigest: value.inputDigest } : {}), + ...(value.maxSteps !== undefined ? { maxSteps: value.maxSteps } : {}), }); } if (value.kind === 'regenerate') { diff --git a/packages/storage/src/conversation-operational-state.ts b/packages/storage/src/conversation-operational-state.ts index 62d663bb1c..8fb9be6cbf 100644 --- a/packages/storage/src/conversation-operational-state.ts +++ b/packages/storage/src/conversation-operational-state.ts @@ -59,6 +59,9 @@ class SqliteConversationOperationalStateStore implements ConversationOperational .prepare('DELETE FROM core_agent_run_projections WHERE session_id = ?') .run(sessionId); database.prepare('DELETE FROM core_root_turn_admissions WHERE session_id = ?').run(sessionId); + database + .prepare('DELETE FROM core_root_turn_start_rejections WHERE session_id = ?') + .run(sessionId); database.prepare('DELETE FROM core_agent_runs WHERE session_id = ?').run(sessionId); }); } diff --git a/packages/storage/src/execution-stores.ts b/packages/storage/src/execution-stores.ts index b43bf33c35..d23b379d47 100644 --- a/packages/storage/src/execution-stores.ts +++ b/packages/storage/src/execution-stores.ts @@ -16,6 +16,7 @@ import { type AgentRunIdentitySearchResult, type AdmitRootTurnInput, type AdmitRootTurnResult, + type CommitRootTurnStartRejectionInput, type BoundedEvidenceReadResult, type DurableAgentRunStore, type DurableRuntimeEventStore, @@ -79,13 +80,17 @@ export type { AgentRunIdentitySearchResult, AdmitRootTurnInput, AdmitRootTurnResult, + CommitRootTurnStartRejectionInput, + CommitRootTurnStartRejectionResult, BoundedEvidenceReadResult, EvidenceReadBudget, ImmutableSteeringMessageProof, RootTurnAdmission, RootTurnAdmissionStore, + RootTurnStartRejectionStore, RootTurnSourceMessage, RootTurnSourceMessageReceipt, + RootTurnStartRejection, } from './agent-run-store.js'; export type { MessageOperationReceipt, @@ -159,6 +164,12 @@ export interface ExecutionAgentRunReader { runId: string, budget: EvidenceReadBudget, ): Promise>; + readEventsByTypeBounded( + sessionId: string, + runId: string, + type: AgentRunEventType, + budget: EvidenceReadBudget, + ): Promise>; readEventProjection( sessionId: string, type: AgentRunEventType, @@ -420,6 +431,8 @@ async function createExecutionStoresForWrite run(() => agentRunStore.readEvents(sessionId, runId)), readEventsBounded: (sessionId, runId, budget) => run(() => agentRunStore.readEventsBounded(sessionId, runId, budget)), + readEventsByTypeBounded: (sessionId, runId, type, budget) => + run(() => agentRunStore.readEventsByTypeBounded(sessionId, runId, type, budget)), readEventsForRecovery: (sessionId, runId) => run(() => agentRunStore.readEventsForRecovery(sessionId, runId)), readEventsForEvidence: (sessionId, runId) => @@ -432,6 +445,10 @@ async function createExecutionStoresForWrite agentRunStore.admitRootTurn(input)), readRootTurnAdmission: (sessionId, turnId) => run(() => agentRunStore.readRootTurnAdmission(sessionId, turnId)), + readRootTurnStartRejection: (sessionId, turnId) => + run(() => agentRunStore.readRootTurnStartRejection(sessionId, turnId)), + commitRootTurnStartRejection: (input: CommitRootTurnStartRejectionInput) => + run(() => agentRunStore.commitRootTurnStartRejection(input)), readRootTurnSourceMessageReceipt: (sessionId, sourceMessageId) => run(() => agentRunStore.readRootTurnSourceMessageReceipt(sessionId, sourceMessageId)), listRootTurnAdmissionsForRecovery: (sessionId) => @@ -566,6 +583,8 @@ async function openExecutionStoresForRead run(() => agentRunStore.readEvents(sessionId, runId)), readEventsBounded: (sessionId, runId, budget) => run(() => agentRunStore.readEventsBounded(sessionId, runId, budget)), + readEventsByTypeBounded: (sessionId, runId, type, budget) => + run(() => agentRunStore.readEventsByTypeBounded(sessionId, runId, type, budget)), readEventProjection: (sessionId, type) => run(() => agentRunStore.readEventProjection(sessionId, type)), readRootTurnAdmission: (sessionId, turnId) => diff --git a/packages/storage/src/operational-state-backup.ts b/packages/storage/src/operational-state-backup.ts index daf51a64bf..fd95d9d95d 100644 --- a/packages/storage/src/operational-state-backup.ts +++ b/packages/storage/src/operational-state-backup.ts @@ -402,6 +402,7 @@ function validateSqlite(path: string, files: readonly OperationalBackupFile[]): 'core_agent_run_events', 'core_agent_run_projections', 'core_root_turn_admissions', + 'core_root_turn_start_rejections', 'core_root_source_message_proofs', 'core_interaction_requests', 'core_interaction_outcomes', diff --git a/packages/storage/src/runtime-policy-stores.ts b/packages/storage/src/runtime-policy-stores.ts index c96f353fc8..467961e856 100644 --- a/packages/storage/src/runtime-policy-stores.ts +++ b/packages/storage/src/runtime-policy-stores.ts @@ -38,6 +38,8 @@ export type { CompareAndSetOAuthCredentialResult, ConnectionEffectChangedDomain, ConnectionEffectCompletionResult, + CommitConnectionOnboardingInput, + CommitConnectionOnboardingResult, ConnectionEffectPreparationFailure, ConnectionTestTicket, InteractiveOAuthLoginCompletionResult, @@ -212,12 +214,14 @@ function createWriterFacade(coordinator: RuntimePolicyCoordinator): RuntimePolic resolveWebFetchExecution: () => coordinator.resolveWebFetchExecution(), resolveNetworkProxyExecution: (input) => coordinator.resolveNetworkProxyExecution(input), compareAndSetOAuthCredential: (input) => coordinator.compareAndSetOAuthCredential(input), + importConnectionCredential: (input) => coordinator.importConnectionCredential(input), beginInteractiveOAuthLogin: (connectionId) => coordinator.beginInteractiveOAuthLogin(connectionId), completeInteractiveOAuthLogin: (ticket, secret) => coordinator.completeInteractiveOAuthLogin(ticket, secret), beginModelFetch: (connectionId) => coordinator.beginModelFetch(connectionId), completeModelFetch: (ticket, result) => coordinator.completeModelFetch(ticket, result), + commitConnectionOnboarding: (input) => coordinator.commitConnectionOnboarding(input), beginConnectionTest: (connectionId, modelId) => coordinator.beginConnectionTest(connectionId, modelId), completeConnectionTest: (ticket, result) => diff --git a/packages/storage/src/runtime-policy/connection-catalog-document.ts b/packages/storage/src/runtime-policy/connection-catalog-document.ts index c20cafbbbc..8d946f5c03 100644 --- a/packages/storage/src/runtime-policy/connection-catalog-document.ts +++ b/packages/storage/src/runtime-policy/connection-catalog-document.ts @@ -1,10 +1,13 @@ import { randomUUID } from 'node:crypto'; +import { isDeepStrictEqual } from 'node:util'; import { CONNECTION_CATALOG_MAX_CONNECTIONS, decodeCanonicalConnectionCatalogEntry, decodeConnectionTarget, decodeConnectionTestSummary, decodeConnectionVersionBasis, + decodeProviderType, + decodeRuntimePolicyEntityId, normalizeConnectionCatalogEntryUpdateForProvider, normalizeConnectionModelDiscoveryResult, normalizeCreateCatalogConnectionInput, @@ -23,7 +26,11 @@ import { type SetDefaultConnectionTargetInput, type UpdateCatalogConnectionInput, } from '@maka/core/runtime-policy'; -import { PROVIDER_DEFAULTS, reconcileConnectionAfterModelFetch } from '@maka/core/llm-connections'; +import { + deriveConnectionSlug, + PROVIDER_DEFAULTS, + reconcileConnectionAfterModelFetch, +} from '@maka/core/llm-connections'; import { pruneRelayModelProfiles } from '@maka/core/model-thinking'; import { deepFreeze, nextRevision, record, revision, unique } from './codec.js'; import { @@ -58,6 +65,12 @@ export interface ConnectionTestModelBasis { }[]; } +interface PreparedOnboardingResult { + readonly kind: 'ready'; + readonly document: ConnectionCatalogDocument; + readonly changed: boolean; +} + export class ConnectionCatalogDocumentOwner { async read(root: string): Promise { const value = await readBoundedJsonDocument(root, FILE, CATALOG_DOCUMENT_MAX_BYTES); @@ -336,6 +349,127 @@ export class ConnectionCatalogDocumentOwner { ); } + prepareOnboardingUpsert( + current: ConnectionCatalogDocument, + rawConnectionId: string, + rawProviderType: unknown, + rawEnabledModelIds: readonly string[], + rawResult: ConnectionModelDiscoveryResult, + invalidateLastTest: boolean, + ): PreparedOnboardingResult | { readonly kind: 'slug_conflict' } { + const connectionId = decodeConnectionInput(() => decodeRuntimePolicyEntityId(rawConnectionId)); + const providerType = decodeConnectionInput(() => decodeProviderType(rawProviderType)); + const definition = PROVIDER_DEFAULTS[providerType]; + const slug = deriveConnectionSlug(providerType); + const index = current.connections.findIndex((connection) => connection.slug === slug); + const previous = current.connections[index]; + if (previous && previous.providerType !== providerType) { + return { kind: 'slug_conflict' }; + } + if (previous && previous.connectionId !== connectionId) { + throw codecError('invalid_document', 'Onboarding intent conflicts with the connection id'); + } + if (!previous && current.connections.length >= CONNECTION_CATALOG_MAX_CONNECTIONS) { + throw codecError( + 'invalid_connection_input', + `Connection catalog cannot exceed ${CONNECTION_CATALOG_MAX_CONNECTIONS} entries`, + ); + } + const result = decodeConnectionInput(() => normalizeConnectionModelDiscoveryResult(rawResult)); + if (result.source !== 'fetched' || result.models.length === 0) { + throw codecError( + 'invalid_connection_input', + 'Onboarding requires a non-empty fetched model inventory', + ); + } + const changes = decodeConnectionInput(() => + normalizeConnectionCatalogEntryUpdateForProvider( + { + name: previous?.name ?? definition.label, + ...((previous?.baseUrl ?? definition.baseUrl) + ? { baseUrl: previous?.baseUrl ?? definition.baseUrl } + : {}), + enabled: true, + enabledModelIds: rawEnabledModelIds, + }, + providerType, + ), + ); + const available = new Set(result.models.map(({ id }) => id)); + if ( + changes.enabledModelIds.length === 0 || + changes.enabledModelIds.some((modelId) => !available.has(modelId)) + ) { + throw codecError( + 'invalid_connection_input', + 'Onboarding enabled models must come from the fetched inventory', + ); + } + const finalized: ConnectionCatalogEntry = { + ...(previous ?? { + connectionId, + revision: 0, + slug, + name: definition.label, + providerType, + enabled: false, + enabledModelIds: [], + models: [], + }), + revision: previous ? nextRevision(previous.revision) : 1, + enabled: true, + enabledModelIds: changes.enabledModelIds, + models: result.models, + modelSource: result.source, + modelsFetchedAt: result.fetchedAt, + }; + const defaultTarget = + current.defaultTarget === null + ? { connectionId, modelId: changes.enabledModelIds[0]! } + : current.defaultTarget.connectionId === connectionId && + !changes.enabledModelIds.includes(current.defaultTarget.modelId) + ? { connectionId, modelId: changes.enabledModelIds[0]! } + : current.defaultTarget; + if ( + previous?.enabled && + sameStringArray(previous.enabledModelIds, changes.enabledModelIds) && + isDeepStrictEqual(previous.models, result.models) && + previous.modelSource === result.source && + previous.modelsFetchedAt === result.fetchedAt && + isDeepStrictEqual(current.defaultTarget, defaultTarget) && + (!invalidateLastTest || previous.lastTest === undefined) + ) { + return { kind: 'ready', document: current, changed: false }; + } + const testBasisChanged = previous + ? !sameConnectionTestModelBasis( + connectionTestModelBasis(previous), + connectionTestModelBasis(finalized), + ) + : true; + const { lastTest: _lastTest, ...finalizedWithoutLastTest } = finalized; + const connections = [...current.connections]; + const entry = testBasisChanged || invalidateLastTest ? finalizedWithoutLastTest : finalized; + if (previous) connections[index] = entry; + else connections.push(entry); + const next = { + ...current, + revision: nextRevision(current.revision), + defaultTarget, + connections, + }; + this.assertDocumentSize(next); + return { kind: 'ready', document: next, changed: true }; + } + + async commitPreparedOnboarding( + root: string, + prepared: PreparedOnboardingResult, + ): Promise { + if (prepared.changed) await this.write(root, prepared.document); + return catalogSnapshot(prepared.document); + } + async writeConnectionTestResult( root: string, current: ConnectionCatalogDocument, @@ -418,13 +552,17 @@ export class ConnectionCatalogDocumentOwner { } private async write(root: string, document: ConnectionCatalogDocument): Promise { + this.assertDocumentSize(document); + await writeJsonDocument(root, FILE, document, CATALOG_DOCUMENT_MAX_BYTES); + } + + private assertDocumentSize(document: ConnectionCatalogDocument): void { if (serializeJsonDocument(document).length > CATALOG_DOCUMENT_MAX_BYTES) { throw new RuntimePolicyStoreError( 'invalid_connection_input', `connection catalog exceeds its ${CATALOG_DOCUMENT_MAX_BYTES} byte limit`, ); } - await writeJsonDocument(root, FILE, document, CATALOG_DOCUMENT_MAX_BYTES); } } diff --git a/packages/storage/src/runtime-policy/coordinator.ts b/packages/storage/src/runtime-policy/coordinator.ts index 84c2482d84..41ae31e405 100644 --- a/packages/storage/src/runtime-policy/coordinator.ts +++ b/packages/storage/src/runtime-policy/coordinator.ts @@ -1,3 +1,4 @@ +import { randomUUID } from 'node:crypto'; import { decodeConnectionModelId, decodeConnectionSlug, @@ -8,6 +9,7 @@ import { normalizeSetCredentialInput, normalizeCredentialSecret, type ConnectionCatalogEntry, + type ConnectionCatalogSnapshot, type ConnectionVersionBasis, type ConnectionModelDiscoveryResult, type ConnectionTestSummary, @@ -24,7 +26,12 @@ import { type UpdateCatalogConnectionInput, } from '@maka/core/runtime-policy'; import { deriveProviderAuthContract, type ProviderAuthAction } from '@maka/core/provider-auth'; -import { effectiveBaseUrl, PROVIDER_DEFAULTS, type ProviderType } from '@maka/core/llm-connections'; +import { + deriveConnectionSlug, + effectiveBaseUrl, + PROVIDER_DEFAULTS, + type ProviderType, +} from '@maka/core/llm-connections'; import { deepFreeze } from './codec.js'; import { catalogSnapshot, @@ -51,6 +58,7 @@ import { commitOutcomeUnknown, decodeConnectionInput, decodeCredentialInput, + RuntimePolicyStoreError, } from './errors.js'; import { connectionCredentialLocator, @@ -61,6 +69,8 @@ import { type CompareAndSetOAuthCredentialInput, type ConnectionEffectChangedDomain, type ConnectionEffectCompletionResult, + type CommitConnectionOnboardingInput, + type CommitConnectionOnboardingResult, type ConnectionTestTicket, type InteractiveOAuthLoginCompletionResult, type InteractiveOAuthLoginProvider, @@ -75,6 +85,13 @@ import { type ResolveWebSearchExecutionInput, type ResolveWebSearchExecutionResult, } from './operations.js'; +import { + clearConnectionOnboardingIntent, + prepareConnectionOnboardingIntent, + readConnectionOnboardingIntent, + writeConnectionOnboardingIntent, + type ConnectionOnboardingIntent, +} from './onboarding-transaction.js'; import { policySnapshot, RuntimePolicyDocumentOwner } from './policy-document.js'; import { SerializedOperationLane } from '../serialized-operation-lane.js'; @@ -147,14 +164,16 @@ export class RuntimePolicyCoordinator { private readonly catalog = new ConnectionCatalogDocumentOwner(); private readonly vault = new CredentialVaultDocumentOwner(); private readonly tickets = new WeakMap(); + private onboardingRecoveryRequired = false; constructor(private readonly execute: RootExecutor) { this.lane = new SerializedOperationLane(execute); } recoverForWrite(): Promise { - return this.inLane(async (root) => { + return this.lane.run(async (root) => { await cleanupRuntimePolicyDocumentTemps(root); + await this.recoverConnectionOnboarding(root); const catalog = await this.catalog.read(root); const vault = await this.vault.read(root); await this.vault.deleteOrphanedConnectionCredentials( @@ -166,15 +185,15 @@ export class RuntimePolicyCoordinator { } getPolicySnapshot() { - return this.execute(async (root) => policySnapshot(await this.policy.read(root))); + return this.inLane(async (root) => policySnapshot(await this.policy.read(root))); } getCatalogSnapshot() { - return this.execute(async (root) => catalogSnapshot(await this.catalog.read(root))); + return this.inLane(async (root) => catalogSnapshot(await this.catalog.read(root))); } getVaultSnapshot() { - return this.execute(async (root) => vaultSnapshot(await this.vault.read(root))); + return this.inLane(async (root) => vaultSnapshot(await this.vault.read(root))); } getCredentialStatus(rawLocator: CredentialLocator): Promise { @@ -265,9 +284,26 @@ export class RuntimePolicyCoordinator { } setCredential(rawInput: SetCredentialInput) { + return this.setCredentialWithAuthority(rawInput, 'client'); + } + + importConnectionCredential(rawInput: SetCredentialInput) { + return this.setCredentialWithAuthority(rawInput, 'migration'); + } + + private setCredentialWithAuthority( + rawInput: SetCredentialInput, + authority: 'client' | 'migration', + ) { return this.inLane(async (root) => { const input = decodeCredentialInput(() => normalizeSetCredentialInput(rawInput)); const { locator } = input; + if (authority === 'migration' && locator.scope !== 'connection') { + throw codecError( + 'invalid_credential_input', + 'Connection credential import requires a Connection credential locator', + ); + } let catalog: ConnectionCatalogDocument | null = null; if (locator.scope === 'connection') { catalog = await this.catalog.read(root); @@ -285,7 +321,11 @@ export class RuntimePolicyCoordinator { 'Connection credential kind does not match the provider auth contract', ); } - if (locator.kind === 'oauth_token' && connection.providerType !== 'github-copilot') { + if ( + authority === 'client' && + locator.kind === 'oauth_token' && + connection.providerType !== 'github-copilot' + ) { throw codecError( 'invalid_credential_input', 'Client-supplied OAuth credentials are only accepted for GitHub Copilot', @@ -734,6 +774,81 @@ export class RuntimePolicyCoordinator { ); } + commitConnectionOnboarding( + input: CommitConnectionOnboardingInput, + ): Promise { + return this.inLane(async (root) => { + const catalog = await this.catalog.read(root); + const slug = deriveConnectionSlug(input.providerType); + const existing = catalog.connections.find((connection) => connection.slug === slug); + if (existing && existing.providerType !== input.providerType) { + return deepFreeze({ kind: 'slug_conflict' as const }); + } + const connectionId = existing?.connectionId ?? randomUUID(); + let invalidateLastTest = false; + if (input.suppliedSecret !== null) { + const locator = { + scope: 'connection', + connectionId, + kind: 'api_key', + } as const; + const vault = await this.vault.read(root); + const credential = findCredential(vault, locator); + if (credential?.secret !== input.suppliedSecret) { + invalidateLastTest = true; + const prepared = this.vault.prepareSet(vault, { + locator, + expected: credential + ? { credentialId: credential.credentialId, revision: credential.revision } + : null, + secret: input.suppliedSecret, + }); + if (prepared.kind !== 'ready') { + throw codecError( + 'invalid_document', + `Onboarding credential preflight returned ${prepared.kind}`, + ); + } + } + } + const intent = prepareConnectionOnboardingIntent({ + ...input, + connectionId, + invalidateLastTest, + }); + const catalogPreflight = this.catalog.prepareOnboardingUpsert( + catalog, + intent.connectionId, + intent.providerType, + intent.enabledModelIds, + intent.discovery, + intent.invalidateLastTest, + ); + if (catalogPreflight.kind === 'slug_conflict') { + return deepFreeze({ kind: 'slug_conflict' as const }); + } + try { + await writeConnectionOnboardingIntent(root, intent); + } catch (error) { + if (isCommitOutcomeUnknown(error)) this.onboardingRecoveryRequired = true; + throw error; + } + try { + const result = await this.applyConnectionOnboarding(root, intent); + await clearConnectionOnboardingIntent(root); + this.onboardingRecoveryRequired = false; + return deepFreeze({ kind: 'committed' as const, ...result }); + } catch (error) { + this.onboardingRecoveryRequired = true; + if (isCommitOutcomeUnknown(error)) throw error; + throw commitOutcomeUnknown( + 'Connection onboarding has a durable intent and must recover before retrying', + error, + ); + } + }); + } + beginConnectionTest( rawConnectionId: string, rawModelId: string | null, @@ -1028,11 +1143,83 @@ export class RuntimePolicyCoordinator { } } + private async recoverConnectionOnboarding(root: string): Promise { + const intent = await readConnectionOnboardingIntent(root); + if (!intent) { + this.onboardingRecoveryRequired = false; + return; + } + this.onboardingRecoveryRequired = true; + try { + await this.applyConnectionOnboarding(root, intent); + await clearConnectionOnboardingIntent(root); + this.onboardingRecoveryRequired = false; + } catch (error) { + if (isCommitOutcomeUnknown(error)) throw error; + throw commitOutcomeUnknown('Connection onboarding recovery did not converge', error); + } + } + + private async applyConnectionOnboarding( + root: string, + intent: ConnectionOnboardingIntent, + ): Promise<{ readonly snapshot: ConnectionCatalogSnapshot; readonly changed: boolean }> { + let changed = false; + if (intent.suppliedSecret !== null) { + const locator = { + scope: 'connection', + connectionId: intent.connectionId, + kind: 'api_key', + } as const; + const vault = await this.vault.read(root); + const existing = findCredential(vault, locator); + if (existing?.secret !== intent.suppliedSecret) { + const prepared = this.vault.prepareSet(vault, { + locator, + expected: existing + ? { credentialId: existing.credentialId, revision: existing.revision } + : null, + secret: intent.suppliedSecret, + }); + if (prepared.kind !== 'ready') { + throw codecError( + 'invalid_document', + `Onboarding credential write returned ${prepared.kind}`, + ); + } + await this.vault.commitSet(root, prepared); + changed = true; + } + } + + const catalog = await this.catalog.read(root); + const prepared = this.catalog.prepareOnboardingUpsert( + catalog, + intent.connectionId, + intent.providerType, + intent.enabledModelIds, + intent.discovery, + intent.invalidateLastTest, + ); + if (prepared.kind === 'slug_conflict') { + throw codecError('invalid_document', 'Onboarding intent conflicts with the connection slug'); + } + const snapshot = await this.catalog.commitPreparedOnboarding(root, prepared); + return { snapshot, changed: changed || prepared.changed }; + } + private inLane(operation: (root: string) => Promise): Promise { - return this.lane.run(operation); + return this.lane.run(async (root) => { + if (this.onboardingRecoveryRequired) await this.recoverConnectionOnboarding(root); + return operation(root); + }); } } +function isCommitOutcomeUnknown(error: unknown): error is RuntimePolicyStoreError { + return error instanceof RuntimePolicyStoreError && error.code === 'commit_outcome_unknown'; +} + function commonSemanticConnectionBasis( prepared: PreparedConnectionMaterial, ): CommonSemanticConnectionBasis { diff --git a/packages/storage/src/runtime-policy/document-io.ts b/packages/storage/src/runtime-policy/document-io.ts index 5df1cd3ad6..5632836253 100644 --- a/packages/storage/src/runtime-policy/document-io.ts +++ b/packages/storage/src/runtime-policy/document-io.ts @@ -16,7 +16,7 @@ export const VAULT_DOCUMENT_MAX_BYTES = 2 * 1024 * 1024; const READ_CHUNK_BYTES = 64 * 1024; const RUNTIME_POLICY_TEMP_PATTERN = - /^(?:runtime-policy|connection-catalog|credential-vault)\.json\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.tmp$/; + /^(?:runtime-policy|connection-catalog|credential-vault|runtime-policy-onboarding)\.json\.[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\.tmp$/; export async function cleanupRuntimePolicyDocumentTemps(root: string): Promise { let failure: unknown; diff --git a/packages/storage/src/runtime-policy/onboarding-transaction.ts b/packages/storage/src/runtime-policy/onboarding-transaction.ts new file mode 100644 index 0000000000..e5efbb30ca --- /dev/null +++ b/packages/storage/src/runtime-policy/onboarding-transaction.ts @@ -0,0 +1,163 @@ +import { unlink } from 'node:fs/promises'; +import { join } from 'node:path'; +import { + decodeProviderType, + decodeRuntimePolicyEntityId, + normalizeConnectionCatalogEntryUpdateForProvider, + normalizeConnectionModelDiscoveryResult, + normalizeCredentialSecret, + type ConnectionModelDiscoveryResult, +} from '@maka/core/runtime-policy'; +import { + PROVIDER_DEFAULTS, + providerAuthSupportsApiKey, + type ProviderType, +} from '@maka/core/llm-connections'; +import { syncDirectory } from '../stable-storage.js'; +import { record } from './codec.js'; +import { + codecError, + commitOutcomeUnknown, + decodeConnectionInput, + decodeCredentialInput, + decodePersistedDomain, + ioFailed, +} from './errors.js'; +import { readBoundedJsonDocument, writeJsonDocument } from './document-io.js'; +const FILE = 'runtime-policy-onboarding.json'; +const SCHEMA_VERSION = 1 as const; +const MAX_BYTES = 5 * 1024 * 1024; + +export interface ConnectionOnboardingTransactionInput { + readonly connectionId: unknown; + readonly providerType: unknown; + readonly suppliedSecret: unknown; + readonly enabledModelIds: unknown; + readonly discovery: unknown; + readonly invalidateLastTest: unknown; +} + +export interface ConnectionOnboardingIntent { + readonly schemaVersion: typeof SCHEMA_VERSION; + readonly connectionId: string; + readonly providerType: ProviderType; + readonly suppliedSecret: string | null; + readonly enabledModelIds: readonly string[]; + readonly discovery: ConnectionModelDiscoveryResult; + readonly invalidateLastTest: boolean; +} + +export function prepareConnectionOnboardingIntent( + input: ConnectionOnboardingTransactionInput, + source: 'input' | 'persisted' = 'input', +): ConnectionOnboardingIntent { + const decode = source === 'persisted' ? decodePersistedDomain : decodeConnectionInput; + const providerType = decode(() => decodeProviderType(input.providerType)); + if (!providerAuthSupportsApiKey(providerType)) { + throw codecError( + source === 'persisted' ? 'invalid_document' : 'invalid_connection_input', + 'Onboarding requires an API-key provider', + ); + } + const definition = PROVIDER_DEFAULTS[providerType]; + const discovery = decode(() => normalizeConnectionModelDiscoveryResult(input.discovery)); + if (discovery.source !== 'fetched' || discovery.models.length === 0) { + throw codecError( + source === 'persisted' ? 'invalid_document' : 'invalid_connection_input', + 'Onboarding requires a non-empty fetched model inventory', + ); + } + const normalized = decode(() => + normalizeConnectionCatalogEntryUpdateForProvider( + { + name: definition.label, + ...(definition.baseUrl ? { baseUrl: definition.baseUrl } : {}), + enabled: true, + enabledModelIds: input.enabledModelIds, + }, + providerType, + ), + ); + const available = new Set(discovery.models.map(({ id }) => id)); + if ( + normalized.enabledModelIds.length === 0 || + normalized.enabledModelIds.some((modelId) => !available.has(modelId)) + ) { + throw codecError( + source === 'persisted' ? 'invalid_document' : 'invalid_connection_input', + 'Onboarding enabled models must come from the fetched inventory', + ); + } + const suppliedSecret = + input.suppliedSecret === null + ? null + : source === 'persisted' + ? decodePersistedDomain(() => normalizeCredentialSecret(input.suppliedSecret)) + : decodeCredentialInput(() => normalizeCredentialSecret(input.suppliedSecret)); + if (typeof input.invalidateLastTest !== 'boolean') { + throw codecError( + source === 'persisted' ? 'invalid_document' : 'invalid_connection_input', + 'Onboarding last-test invalidation must be a boolean', + ); + } + return { + schemaVersion: SCHEMA_VERSION, + connectionId: decode(() => decodeRuntimePolicyEntityId(input.connectionId)), + providerType, + suppliedSecret, + enabledModelIds: normalized.enabledModelIds, + discovery, + invalidateLastTest: input.invalidateLastTest, + }; +} + +export async function readConnectionOnboardingIntent( + root: string, +): Promise { + const value = await readBoundedJsonDocument(root, FILE, MAX_BYTES); + if (value === undefined) return undefined; + const raw = record(value, FILE, 'invalid_document', [ + 'schemaVersion', + 'connectionId', + 'providerType', + 'suppliedSecret', + 'enabledModelIds', + 'discovery', + 'invalidateLastTest', + ]); + if (raw.schemaVersion !== SCHEMA_VERSION) { + throw codecError('invalid_document', `${FILE} has an unsupported schema version`); + } + return prepareConnectionOnboardingIntent( + { + providerType: raw.providerType, + connectionId: raw.connectionId, + suppliedSecret: raw.suppliedSecret, + enabledModelIds: raw.enabledModelIds, + discovery: raw.discovery, + invalidateLastTest: raw.invalidateLastTest, + }, + 'persisted', + ); +} + +export function writeConnectionOnboardingIntent( + root: string, + intent: ConnectionOnboardingIntent, +): Promise { + return writeJsonDocument(root, FILE, intent, MAX_BYTES); +} + +export async function clearConnectionOnboardingIntent(root: string): Promise { + try { + await unlink(join(root, FILE)); + } catch (error) { + if ((error as NodeJS.ErrnoException).code === 'ENOENT') return; + throw ioFailed(`${FILE} could not be removed`, error); + } + try { + await syncDirectory(root); + } catch (error) { + throw commitOutcomeUnknown(`${FILE} removal outcome is unknown`, error); + } +} diff --git a/packages/storage/src/runtime-policy/operations.ts b/packages/storage/src/runtime-policy/operations.ts index fa1e7c5693..58e900c920 100644 --- a/packages/storage/src/runtime-policy/operations.ts +++ b/packages/storage/src/runtime-policy/operations.ts @@ -3,7 +3,9 @@ import type { ConnectionCatalogSnapshot, ConnectionModelDiscoveryResult, ConnectionTestSummary, + CredentialMutationResult, CredentialLocator, + SetCredentialInput, CredentialStatus, CredentialVersionBasis, RuntimePolicy, @@ -189,6 +191,21 @@ export type ConnectionEffectCompletionResult = readonly changed: readonly ConnectionEffectChangedDomain[]; }; +export interface CommitConnectionOnboardingInput { + readonly providerType: ConnectionCatalogEntry['providerType']; + readonly suppliedSecret: string | null; + readonly enabledModelIds: readonly string[]; + readonly discovery: ConnectionModelDiscoveryResult; +} + +export type CommitConnectionOnboardingResult = + | { + readonly kind: 'committed'; + readonly snapshot: ConnectionCatalogSnapshot; + readonly changed: boolean; + } + | { readonly kind: 'slug_conflict' }; + export type ResolveExecutionConnectionResult = | { readonly kind: 'not_found' } | { readonly kind: 'disabled' } @@ -215,6 +232,7 @@ export interface RuntimePolicyOperationCoordinator { compareAndSetOAuthCredential( input: CompareAndSetOAuthCredentialInput, ): Promise; + importConnectionCredential(input: SetCredentialInput): Promise; beginInteractiveOAuthLogin(connectionId: string): Promise; completeInteractiveOAuthLogin( ticket: InteractiveOAuthLoginTicket, @@ -225,6 +243,9 @@ export interface RuntimePolicyOperationCoordinator { ticket: ModelFetchTicket, result: ConnectionModelDiscoveryResult, ): Promise; + commitConnectionOnboarding( + input: CommitConnectionOnboardingInput, + ): Promise; beginConnectionTest( connectionId: string, modelId: string | null, diff --git a/packages/storage/src/runtime-policy/policy-document.ts b/packages/storage/src/runtime-policy/policy-document.ts index a7b033f85c..fee5c25eb1 100644 --- a/packages/storage/src/runtime-policy/policy-document.ts +++ b/packages/storage/src/runtime-policy/policy-document.ts @@ -1,6 +1,7 @@ import { createDefaultRuntimePolicy, decodeCanonicalRuntimePolicy, + decodeLegacyRuntimePolicyV1, normalizeRuntimePolicyMutation, type MutateRuntimePolicyInput, type MutateRuntimePolicyResult, @@ -23,7 +24,7 @@ import { } from './document-io.js'; const FILE = 'runtime-policy.json'; -const SCHEMA_VERSION = 1 as const; +const SCHEMA_VERSION = 2 as const; export interface RuntimePolicyDocument { readonly schemaVersion: typeof SCHEMA_VERSION; @@ -48,13 +49,17 @@ export class RuntimePolicyDocumentOwner { 'revision', 'policy', ]); - if (document.schemaVersion !== SCHEMA_VERSION) { + if (document.schemaVersion !== 1 && document.schemaVersion !== SCHEMA_VERSION) { throw codecError('invalid_document', `${FILE} has an unsupported schema version`); } return { schemaVersion: SCHEMA_VERSION, revision: revision(document.revision, `${FILE}.revision`, 'invalid_document'), - policy: decodePersistedDomain(() => decodeCanonicalRuntimePolicy(document.policy)), + policy: decodePersistedDomain(() => + document.schemaVersion === 1 + ? decodeLegacyRuntimePolicyV1(document.policy) + : decodeCanonicalRuntimePolicy(document.policy), + ), }; } @@ -125,5 +130,31 @@ function applyMutation(policy: RuntimePolicy, operation: RuntimePolicyMutation): return { ...policy, chatDefaults: operation.value }; case 'set_web_search': return { ...policy, webSearch: operation.value }; + case 'set_subagents': + return { ...policy, subagents: operation.value }; + case 'patch_agent_settings': + return { + ...policy, + ...(operation.value.personalization + ? { personalization: { ...policy.personalization, ...operation.value.personalization } } + : {}), + ...(operation.value.memory + ? { memory: { ...policy.memory, ...operation.value.memory } } + : {}), + ...(operation.value.workspaceInstructions + ? { + workspaceInstructions: { + ...policy.workspaceInstructions, + ...operation.value.workspaceInstructions, + }, + } + : {}), + ...(operation.value.privacy + ? { privacy: { ...policy.privacy, ...operation.value.privacy } } + : {}), + ...(operation.value.webSearch + ? { webSearch: { ...policy.webSearch, ...operation.value.webSearch } } + : {}), + }; } } diff --git a/packages/storage/src/session-store.ts b/packages/storage/src/session-store.ts index 1795d00948..8801b47e69 100644 --- a/packages/storage/src/session-store.ts +++ b/packages/storage/src/session-store.ts @@ -745,8 +745,13 @@ class SqliteSessionStore implements SessionAuthorityStore { record.header.lastReadMessageId === undefined ? -1 : visibleMessages.findIndex((message) => message.id === record.header.lastReadMessageId); - if (targetIndex <= currentIndex) return record; const hasUnread = targetIndex < visibleMessages.length - 1; + if ( + targetIndex < currentIndex || + (targetIndex === currentIndex && record.header.hasUnread === hasUnread) + ) { + return record; + } try { return await this.updateHeaderVersioned( sessionId, diff --git a/packages/storage/src/sqlite-core-execution-schema.ts b/packages/storage/src/sqlite-core-execution-schema.ts index 2523bfc61b..73d51bfaca 100644 --- a/packages/storage/src/sqlite-core-execution-schema.ts +++ b/packages/storage/src/sqlite-core-execution-schema.ts @@ -1,6 +1,6 @@ import type { DatabaseSync } from 'node:sqlite'; -export const SQLITE_CORE_EXECUTION_SCHEMA_VERSION = 1; +export const SQLITE_CORE_EXECUTION_SCHEMA_VERSION = 2; export function migrateSqliteCoreExecutionDatabase(db: DatabaseSync): void { db.exec(` @@ -53,6 +53,14 @@ export function migrateSqliteCoreExecutionDatabase(db: DatabaseSync): void { CREATE INDEX IF NOT EXISTS core_root_turn_admissions_order ON core_root_turn_admissions(session_id, admitted_at, turn_id); + CREATE TABLE IF NOT EXISTS core_root_turn_start_rejections ( + session_id TEXT NOT NULL, + turn_id TEXT NOT NULL, + rejected_at INTEGER NOT NULL, + record_json TEXT NOT NULL, + PRIMARY KEY (session_id, turn_id) + ); + CREATE TABLE IF NOT EXISTS core_root_source_message_proofs ( session_id TEXT NOT NULL, message_id TEXT NOT NULL, diff --git a/packages/storage/src/sqlite-workflow-schema.ts b/packages/storage/src/sqlite-workflow-schema.ts index 9f768f2754..994448123b 100644 --- a/packages/storage/src/sqlite-workflow-schema.ts +++ b/packages/storage/src/sqlite-workflow-schema.ts @@ -1,6 +1,6 @@ import type { DatabaseSync } from 'node:sqlite'; -export const SQLITE_WORKFLOW_SCHEMA_VERSION = 3; +export const SQLITE_WORKFLOW_SCHEMA_VERSION = 4; export function migrateSqliteWorkflowDatabase(db: DatabaseSync): void { db.exec(` @@ -56,7 +56,8 @@ export function migrateSqliteWorkflowDatabase(db: DatabaseSync): void { CREATE TABLE IF NOT EXISTS workflow_quote_companion_cleanup ( session_id TEXT PRIMARY KEY, - tracked_at INTEGER NOT NULL + tracked_at INTEGER NOT NULL, + record_json TEXT NOT NULL ); CREATE TABLE IF NOT EXISTS workflow_daily_review_state ( @@ -79,4 +80,26 @@ export function migrateSqliteWorkflowDatabase(db: DatabaseSync): void { CREATE INDEX IF NOT EXISTS workflow_daily_review_archives_order ON workflow_daily_review_archives(generated_at DESC, day_from_ms DESC, archive_id); `); + + const cleanupColumns = new Set( + ( + db.prepare('PRAGMA table_info(workflow_quote_companion_cleanup)').all() as Array<{ + name: string; + }> + ).map(({ name }) => name), + ); + if (!cleanupColumns.has('record_json')) { + db.exec('ALTER TABLE workflow_quote_companion_cleanup ADD COLUMN record_json TEXT'); + db.prepare(` + UPDATE workflow_quote_companion_cleanup + SET record_json = json_object( + 'version', 1, + 'sessionId', session_id, + 'trackedAt', tracked_at, + 'phase', 'cleanup', + 'cancelRequested', json('true') + ) + WHERE record_json IS NULL + `).run(); + } } diff --git a/packages/ui/src/tool-output-stream.ts b/packages/ui/src/tool-output-stream.ts index 10f30c6697..5fbf95a355 100644 --- a/packages/ui/src/tool-output-stream.ts +++ b/packages/ui/src/tool-output-stream.ts @@ -53,6 +53,7 @@ * - `truncated: false` when no cap hit */ +import { TOOL_OUTPUT_DELTA_MAX_CHARS } from '@maka/core/events'; import type { ToolOutputChunk } from './materialize.js'; import { redactSecrets } from './redact.js'; import type { UiLocale } from '@maka/core'; @@ -66,14 +67,14 @@ import { getSharedUiCopy } from './shared-ui-copy.js'; * - 200 chunks: enough headroom that streamed line-by-line * output of a 100-line script never hits the cap, while still * bounding state churn for runaway tools. - * - 4 KB per chunk: matches runtime's + * - Runtime event limit per chunk: matches * `TOOL_OUTPUT_DELTA_MAX_CHARS` so renderer cap is consistent * with main-side truncation; a chunk that arrives larger than * this is a contract violation and we tail-truncate defensively. */ export const TOOL_STREAM_MAX_CHUNKS = 200; export const TOOL_STREAM_MAX_TOTAL_CHARS = 16 * 1024; -export const TOOL_STREAM_MAX_CHUNK_CHARS = 4 * 1024; +export const TOOL_STREAM_MAX_CHUNK_CHARS = TOOL_OUTPUT_DELTA_MAX_CHARS; export interface ApplyToolOutputChunkOptions { maxChunks?: number; diff --git a/packages/ui/src/use-message-selection-quote.ts b/packages/ui/src/use-message-selection-quote.ts index 45cc732da5..1079f825ff 100644 --- a/packages/ui/src/use-message-selection-quote.ts +++ b/packages/ui/src/use-message-selection-quote.ts @@ -1,4 +1,5 @@ import { useCallback, useEffect, useState, type RefObject } from 'react'; +import { flushSync } from 'react-dom'; import { resolveQuoteTarget, type QuoteScopeNode, @@ -102,7 +103,9 @@ export function useMessageSelectionQuote( function onSelectionChange(): void { // Hide first, re-show only once the selection settles: a layer anchored // to the previous selection is wrong the moment that selection changes. - setQuote(null); + // This listener is outside React's event system, so concurrent rendering + // may otherwise leave the stale layer painted for another frame. + flushSync(() => setQuote(null)); window.clearTimeout(settleTimer); settleTimer = window.setTimeout(settle, SELECTION_SETTLE_MS); } diff --git a/scripts/bundled-skill-catalog.test.mjs b/scripts/bundled-skill-catalog.test.mjs new file mode 100644 index 0000000000..e595eaca35 --- /dev/null +++ b/scripts/bundled-skill-catalog.test.mjs @@ -0,0 +1,9 @@ +import { execFile } from 'node:child_process'; +import { promisify } from 'node:util'; +import test from 'node:test'; + +const execFileAsync = promisify(execFile); + +test('the generated Runtime Skill catalog matches its reviewable sources', async () => { + await execFileAsync(process.execPath, ['scripts/gen-bundled-skill-catalog.mjs', '--check']); +}); diff --git a/scripts/check-console.mjs b/scripts/check-console.mjs index 8be71c75e3..9e84da7a5e 100644 --- a/scripts/check-console.mjs +++ b/scripts/check-console.mjs @@ -38,13 +38,9 @@ const ALLOW = new Map([ 'apps/desktop/src/main/main.ts', 'thin ESM entry; pre-ready config, [startup] ready/fatal diagnostics (moved from boot, PR1880).', ], - [ - 'apps/desktop/src/main/boot.ts', - 'startup chain diagnostics (e2e-fixture fatal/scenario, window create failure, repair/cleanup paths); no secrets (moved from main.ts, PR1880).', - ], [ 'apps/desktop/src/main/runtime-host-boot.ts', - 'opt-in Runtime Host startup, reconnect projection, and bounded shutdown diagnostics; no credentials or provider payloads.', + 'Runtime Host startup, reconnect projection, and bounded shutdown diagnostics; no credentials or provider payloads.', ], [ 'apps/desktop/src/main/runtime-host-desktop-owner.ts', @@ -54,18 +50,6 @@ const ALLOW = new Map([ 'apps/desktop/src/main/startup-step.ts', 'names a startup step that has not come back, before any window exists to show it in; a step name and no secrets.', ], - [ - 'apps/desktop/src/main/app-lifecycle.ts', - 'startup/shutdown diagnostics (dock icon, credential migration, e2e-fixture marker, cleanup failures); no secrets (moved from main.ts, arch R6).', - ], - [ - 'apps/desktop/src/main/settings-runtime-effects.ts', - 'external-settings apply failure is a main-process diagnostic, no secrets (moved from main.ts, arch R5).', - ], - [ - 'apps/desktop/src/main/daily-review-main.ts', - 'scheduler failures are main-process diagnostics and do not expose secrets.', - ], [ 'apps/desktop/src/main/main-window.ts', 'real-window smoke diagnostics are dev/test gated and stdout-parsed by capture tooling.', @@ -74,14 +58,6 @@ const ALLOW = new Map([ 'apps/desktop/src/main/permission-overlay/permission-overlay-main.ts', '#1515 drag-grant diagnostics (locale fallback, missing .app bundle, controller log sink); main-process only, paths not secrets.', ], - [ - 'apps/desktop/src/main/oauth-model-connections-main.ts', - 'OAuth model sync logs provider-level failure reason only; no tokens or raw provider bodies.', - ], - [ - 'apps/desktop/src/main/subscription-ipc-main.ts', - 'best-effort post-OAuth model discovery diagnostic; main-process only and never logs credentials.', - ], [ 'apps/desktop/src/main/onboarding-service.ts', 'PR110b: credential lookup failure logs error class only (no message / secret bytes); never reaches renderer.', @@ -110,10 +86,6 @@ const ALLOW = new Map([ 'packages/headless/src/harbor-cli.ts', 'Harbor CLI subcommand prints usage and command failures to stderr by design.', ], - [ - 'apps/desktop/src/main/config-file-watcher.ts', - 'Watcher startup failure and runtime error diagnostics; non-fatal, no secrets.', - ], [ 'apps/desktop/src/main/shell-env.ts', 'login-shell PATH resolution diagnostics at startup (PATH-entry count and sanitized failure reason); non-fatal, no shell-controlled output.', @@ -123,10 +95,6 @@ const ALLOW = new Map([ 'apps/desktop/src/main/computer-use/pip-electron.ts', 'picture-in-picture load failure: the one state that is otherwise silent and invisible; logs the overlay asset path and the Chromium error code only.', ], - [ - 'apps/desktop/src/main/automation-wiring.ts', - 'best-effort sync warning when durable automation persistence fails.', - ], [ 'packages/storage/src/automation-store.ts', 'best-effort warning when automation store read/write fails.', @@ -135,10 +103,6 @@ const ALLOW = new Map([ 'packages/storage/src/session-store.ts', 'one-time legacy JSONL session import diagnostics (imported/failed counts + per-file reasons); no credentials or provider payloads.', ], - [ - 'packages/cli/src/runtime-bootstrap.ts', - 'best-effort warning when CLI durable automation persistence fails.', - ], [ 'packages/core/src/shell-run-result.ts', 'ShellRun reconciliation invariant diagnostics contain only runtime refs and revisions, never command or output data.', @@ -147,6 +111,10 @@ const ALLOW = new Map([ 'packages/runtime-host/src/server/host-kernel.ts', 'Host shutdown failure diagnostics print the full nested AggregateError chain (Node truncates it to [errors]: [Array] by default); error metadata only, no secrets (PR1760).', ], + [ + 'packages/runtime-host/src/server/execution-composition.ts', + 'optional environment-backed bootstrap failure is generalized before startup logging; no credential or provider payloads.', + ], ]); async function walk(root) { diff --git a/scripts/ci-test-plan.mjs b/scripts/ci-test-plan.mjs index 2114bbae39..44ff0746ed 100644 --- a/scripts/ci-test-plan.mjs +++ b/scripts/ci-test-plan.mjs @@ -231,7 +231,7 @@ export function planTests(changedFiles, options = {}) { directWorkspaces.has('packages/ui') || files.some((path) => E2E_DRIVING_SCRIPTS.has(path)), full: false, - // packages/cli/src/__tests__/runtime-bootstrap.test.ts executes real sandboxed + // packages/cli/src/__tests__/runtime-host-session-driver.test.ts executes real sandboxed // shell tools, so the bubblewrap + user-namespace setup is required whenever // the cli workspace runs in the dependency closure, not only for direct // cli/runtime edits (e.g. a storage-only change still selects cli via runtime). diff --git a/scripts/ci-test-plan.test.mjs b/scripts/ci-test-plan.test.mjs index b24c54b256..271e9cfb9a 100644 --- a/scripts/ci-test-plan.test.mjs +++ b/scripts/ci-test-plan.test.mjs @@ -109,11 +109,10 @@ test('release tooling and the release config select the checks that cover them', }); test('sandbox is flagged whenever the cli workspace runs in the closure', () => { - // packages/cli/src/__tests__/runtime-bootstrap.test.ts executes real sandboxed - // shell tools, so any change whose dependency closure selects packages/cli must - // provision the sandbox — not only direct cli/runtime edits. + // The Runtime Host CLI controls sandboxed shell resources, so any change whose + // dependency closure selects packages/cli must provision the sandbox. for (const path of [ - 'packages/cli/src/__tests__/runtime-bootstrap.test.ts', + 'packages/cli/src/__tests__/runtime-host-session-driver.test.ts', 'packages/runtime/src/shell-tools.ts', 'packages/storage/src/session-store.ts', 'packages/headless/src/cell-output.ts', diff --git a/scripts/electron-lifecycle.mjs b/scripts/electron-lifecycle.mjs index 5e05eb8ebb..30a9af0b96 100644 --- a/scripts/electron-lifecycle.mjs +++ b/scripts/electron-lifecycle.mjs @@ -63,7 +63,21 @@ export async function closeElectronApplication( graceMs, terminateTree = terminateElectronProcessTree, ) { - const child = app.process(); + let child; + try { + child = app.process(); + } catch { + // Playwright invalidates the process channel after Electron exits. There + // is no live process tree left to terminate, so teardown is already done. + await settlesWithin( + app.close().then( + () => true, + () => true, + ), + graceMs, + ); + return; + } const gracefulClose = app.close().then( () => true, () => false, diff --git a/scripts/electron-lifecycle.test.mjs b/scripts/electron-lifecycle.test.mjs index bd9a9ef642..8e31ddfd54 100644 --- a/scripts/electron-lifecycle.test.mjs +++ b/scripts/electron-lifecycle.test.mjs @@ -32,6 +32,23 @@ function wedgedApp(child) { } describe('closeElectronApplication', () => { + it('treats an already-disconnected Electron application as closed', async () => { + let closeCalled = false; + await closeElectronApplication( + { + close: async () => { + closeCalled = true; + }, + process: () => { + throw new TypeError('application process channel is closed'); + }, + }, + 10, + ); + + assert.equal(closeCalled, true); + }); + it('force-kills Electron when graceful teardown does not settle', async () => { const child = new FakeElectronProcess(); let terminatedTree = false; diff --git a/apps/desktop/scripts/gen-bundled-skill-catalog.mjs b/scripts/gen-bundled-skill-catalog.mjs similarity index 66% rename from apps/desktop/scripts/gen-bundled-skill-catalog.mjs rename to scripts/gen-bundled-skill-catalog.mjs index 12a89b7673..0cab155c9c 100644 --- a/apps/desktop/scripts/gen-bundled-skill-catalog.mjs +++ b/scripts/gen-bundled-skill-catalog.mjs @@ -1,26 +1,14 @@ -// Generates packages/runtime/src/bundled-skill-catalog.generated.ts from the reviewable -// SKILL.md sources under resources/bundled-skills/. The generated module embeds -// each body as a string literal so consumers have no runtime dependency on the -// Desktop resources directory. -// -// Run after editing any resources/bundled-skills/*/SKILL.md: -// node scripts/gen-bundled-skill-catalog.mjs -// -// A drift test (bundled-skill-catalog.test.ts) fails if the checked-in generated -// module does not match a fresh regeneration, so this never silently goes stale. +#!/usr/bin/env node import { createHash } from 'node:crypto'; import { readdirSync, readFileSync, writeFileSync } from 'node:fs'; import { dirname, join } from 'node:path'; import { fileURLToPath } from 'node:url'; -const here = dirname(fileURLToPath(import.meta.url)); -const sourcesDir = join(here, '..', 'resources', 'bundled-skills'); +const repositoryRoot = dirname(dirname(fileURLToPath(import.meta.url))); +const sourcesDir = join(repositoryRoot, 'packages', 'runtime', 'resources', 'bundled-skills'); const outFile = join( - here, - '..', - '..', - '..', + repositoryRoot, 'packages', 'runtime', 'src', @@ -33,9 +21,7 @@ const LEGACY_CONTENT_SHA256_BY_ID = { 'sha256:419088b2f8a0b12061b4811323abc381869ebe8fccbfc8f2bdfc96ff37a1e45b', 'sha256:8e4404349be4e5493fcf13981624ed55198c0670a794fbf88e2bad81ddb79f6c', ], - 'drafter-diagram': [ - 'sha256:4b93ebada2f061f1dfc3d99a21bc93a9d3d640f326af6230d15813bac6a5efcf', - ], + 'drafter-diagram': ['sha256:4b93ebada2f061f1dfc3d99a21bc93a9d3d640f326af6230d15813bac6a5efcf'], }; export function readBundledSkillSources(dir = sourcesDir) { @@ -68,8 +54,8 @@ export function renderGeneratedModule(skills) { ) .join('\n'); return `// @generated by scripts/gen-bundled-skill-catalog.mjs — do not edit by hand. -// Source of truth: resources/bundled-skills//SKILL.md -// Regenerate: node scripts/gen-bundled-skill-catalog.mjs +// Source of truth: packages/runtime/resources/bundled-skills//SKILL.md +// Regenerate: npm run generate:bundled-skills export interface BundledSkillSource { id: string; @@ -87,12 +73,21 @@ ${entries} `; } -function main() { - const skills = readBundledSkillSources(); - writeFileSync(outFile, renderGeneratedModule(skills), 'utf8'); - console.log(`[gen] wrote ${skills.length} bundled skills -> ${outFile}`); +export function expectedBundledSkillCatalog() { + return renderGeneratedModule(readBundledSkillSources()); } -if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) { - main(); +function main() { + const expected = expectedBundledSkillCatalog(); + if (process.argv.includes('--check')) { + if (readFileSync(outFile, 'utf8') !== expected) { + throw new Error('Bundled Skill catalog is stale; run npm run generate:bundled-skills'); + } + console.log('[gen] bundled Skill catalog is current'); + return; + } + writeFileSync(outFile, expected, 'utf8'); + console.log(`[gen] wrote ${readBundledSkillSources().length} bundled skills -> ${outFile}`); } + +if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) main(); diff --git a/scripts/verify-windows-x64.mjs b/scripts/verify-windows-x64.mjs index b41939fc93..f0cfaa6ba5 100644 --- a/scripts/verify-windows-x64.mjs +++ b/scripts/verify-windows-x64.mjs @@ -16,6 +16,8 @@ const repoRoot = dirname(dirname(fileURLToPath(import.meta.url))); const desktopRoot = join(repoRoot, 'apps', 'desktop'); const executableName = 'Maka.exe'; const amd64Machine = 0x8664; +const temporaryCleanupRetries = 20; +const temporaryCleanupRetryDelayMs = 250; // conpty echoes the command and terminates lines with CRLF, so the probe keeps // matching on a substring rather than the whole output. const ptyProbe = makePtyProbe(process.env.ComSpec || 'cmd.exe', ['/c', 'echo', 'maka-node-pty-ok']); @@ -177,7 +179,17 @@ export async function verifyWindowsX64Release( } return { exePath, zipPath, unpackedDirectory, checksums }; } finally { - await rm(temporaryDirectory, { recursive: true, force: true }); + // The Runtime Host intentionally outlives its last Desktop client for its + // idle grace period. On Windows, SQLite keeps the temporary workspace files + // locked until that Host exits. fs.rm retries only the transient filesystem + // errors for recursive removal, so cleanup follows the actual lock lifetime + // without changing the production continuity policy. + await rm(temporaryDirectory, { + recursive: true, + force: true, + maxRetries: temporaryCleanupRetries, + retryDelay: temporaryCleanupRetryDelayMs, + }); } }