From 6910cd6e9cb3576255b277fdeadc9f1373a8c5ac Mon Sep 17 00:00:00 2001 From: gengruilin Date: Thu, 15 Oct 2026 16:19:07 +0800 Subject: [PATCH 1/9] fix(ui-skill): refresh the slash menu after plugin manager changes The browser skill source cached each Session's catalog until a preset switch or connection reset, so an open Session kept listing the skills of a plugin switched off on the Plugins page and missed those of a plugin switched on. Clear every cached catalog on the forwarded plugin-manager/changed event, which the Host emits after the operation's reload. Fixes #6268 --- .../web/tests/skill-menu-plugin-change.e2e.ts | 98 +++++++++++++++++++ apps/web/tsconfig.json | 1 + packages/client/ui-skill/README.i18n.yaml | 12 +-- packages/client/ui-skill/README.md | 7 +- packages/client/ui-skill/README.zh.md | 7 +- packages/client/ui-skill/package.json | 1 + packages/client/ui-skill/src/client/index.ts | 18 ++-- .../tests/browser-plugin.client.spec.ts | 19 +++- packages/client/ui-skill/tsconfig.json | 3 + pnpm-lock.yaml | 3 + tsconfig.host.json | 1 + 11 files changed, 150 insertions(+), 20 deletions(-) create mode 100644 apps/web/tests/skill-menu-plugin-change.e2e.ts diff --git a/apps/web/tests/skill-menu-plugin-change.e2e.ts b/apps/web/tests/skill-menu-plugin-change.e2e.ts new file mode 100644 index 0000000000..4d64c14b0b --- /dev/null +++ b/apps/web/tests/skill-menu-plugin-change.e2e.ts @@ -0,0 +1,98 @@ +// Web e2e scenario: switching a plugin on the Plugins page updates the `/` +// menu of a Session that is already open. One chromium page holds a blank +// Session while a second page switches the official badge skill bundle; a +// global skill seeded in the harness home stays listed throughout. No model +// call is issued, so a stray stream fails loud on the open LLM seam. +import { mkdir, writeFile } from 'node:fs/promises' +import { join } from 'node:path' +import { fileURLToPath } from 'node:url' +import { chromium, type Browser, type Locator, type Page } from 'playwright' +import { afterAll, beforeAll, describe, expect, it, onTestFailed } from 'vitest' +import { launchWebScaffold, watchConsole, type WebScaffold } from './scaffold.ts' +import { connectFreshWorkspace, newEnglishPage, PLUGIN_TOGGLE_SETTLE_MS, saveFailureShot, writeComposerDraft } from './support.ts' + +const BUNDLE_DIR = fileURLToPath(new URL('../../../packages/experimental/badge-skill-bundle', import.meta.url)) +const BUNDLE = '@deepseek-ai/dsh-experimental-badge-skill-bundle' +const GLOBAL_SKILL = 'dsh-global-skill' + +describe('web e2e: the slash menu follows plugin switches', () => { + let scaffold: WebScaffold + let browser: Browser + let page: Page + let plugins: Page + let toggle: Locator + let tripwire: ReturnType + + beforeAll(async () => { + scaffold = await launchWebScaffold({ profile: { packages: [{ dir: BUNDLE_DIR }] } }) + // The scaffold pins the skill-filesystem harness home inside its temporary world. + const directory = join(scaffold.workspaceCwd, '.dsh-home', 'skills', GLOBAL_SKILL) + await mkdir(directory, { recursive: true }) + await writeFile(join(directory, 'SKILL.md'), [ + '---', + `name: ${GLOBAL_SKILL}`, + 'description: Listed whichever plugins are switched on', + '---', + '', + `# ${GLOBAL_SKILL}`, + '', + ].join('\n')) + browser = await chromium.launch() + page = await newEnglishPage(browser) + plugins = await newEnglishPage(browser) + tripwire = watchConsole(page) + await page.goto(scaffold.authenticatedUrl, { waitUntil: 'load' }) + await page.waitForSelector('[class*="frame"]', { timeout: 30_000 }) + await connectFreshWorkspace(page, scaffold.workspaceCwd) + await plugins.goto(scaffold.authenticatedUrl, { waitUntil: 'load' }) + await plugins.getByRole('navigation', { name: 'Global panels' }).getByRole('button', { name: 'Plugins', exact: true }).click() + const panel = plugins.locator('[data-plugin-panel]') + await panel.getByRole('button', { name: 'More', exact: true }).click() + toggle = panel.locator(`[data-plugin-package="${BUNDLE}"]`).getByRole('switch') + await toggle.waitFor({ timeout: 10_000 }) + }, 120_000) + + afterAll(async () => { + await browser?.close() + await scaffold?.close() + }) + + /** + * Retype the query in the open Session and read whether the badge skill is listed. + * @returns whether the menu lists `dsh-badge` beside the global skill. + */ + async function badgeListed(): Promise { + await writeComposerDraft(page, page.locator('[data-composer-input]').first(), '/dsh-') + const menu = page.getByRole('listbox', { name: 'Trigger suggestions' }) + // The skill source answers with one list, so the global entry marks a settled skill group. + await menu.getByRole('option', { name: new RegExp(`^${GLOBAL_SKILL} `) }).waitFor({ timeout: 10_000 }) + return await menu.getByRole('option', { name: /^dsh-badge / }).count() === 1 + } + + /** + * Switch the badge bundle on the second page and wait for the switch to settle. + * @param enabled - the requested bundle state. + */ + async function switchBundle(enabled: boolean): Promise { + expect(await toggle.getAttribute('aria-checked')).toBe(String(!enabled)) + await toggle.click() + await expect.poll(() => toggle.getAttribute('aria-checked'), { timeout: PLUGIN_TOGGLE_SETTLE_MS }).toBe(String(enabled)) + } + + it('lists a switched bundle\'s skill only while the bundle is on, keeping the global skill', async () => { + onTestFailed(async () => { + await saveFailureShot(page, 'web-e2e-skill-menu-plugin-change') + await saveFailureShot(plugins, 'web-e2e-skill-menu-plugin-change-plugins') + }) + // The open Session cached its catalog while the bundle was off. + expect(await badgeListed()).toBe(false) + + // Each switch re-reads the catalog of the Session that stayed open. + for (const enabled of [true, false, true]) { + await switchBundle(enabled) + await expect.poll(badgeListed, { timeout: 10_000 }).toBe(enabled) + } + expect(tripwire.pageErrors).toEqual([]) + expect(tripwire.warnings).toEqual([]) + }) +}) diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index ff56fc9485..cc40149d20 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -171,6 +171,7 @@ "tests/queue-image.e2e.ts", "tests/skill-invocation-policy.e2e.ts", "tests/skill-user-invoke.e2e.ts", + "tests/skill-menu-plugin-change.e2e.ts", "tests/permission-policy-context.e2e.ts", "tests/access-confirmation.e2e.ts", "tests/agent-preset-selection.e2e.ts", diff --git a/packages/client/ui-skill/README.i18n.yaml b/packages/client/ui-skill/README.i18n.yaml index 8d82e8e675..88c72545c3 100644 --- a/packages/client/ui-skill/README.i18n.yaml +++ b/packages/client/ui-skill/README.i18n.yaml @@ -21,14 +21,14 @@ en: 2ba1a6158c85b46e zh: 9ab58ceef8743849 /deepseek-ai-dsh-client-ui-skill/use-this-package/the-skill-tool-row: - en: 975c6cd80af3684a - zh: 395c10e51c6a15f6 + en: 270bc37a226ed247 + zh: 15a1c4c82c3a1f00 /deepseek-ai-dsh-client-ui-skill/understand-the-implementation: en: df2a0ee9d2638f41 zh: 3b4af7e505e990ca /deepseek-ai-dsh-client-ui-skill/understand-the-implementation/candidate-flow: - en: 1a02a85859f851c7 - zh: 03bd48b83c4a287c + en: e8921ef18728794c + zh: dabc89ee5186d8c6 /deepseek-ai-dsh-client-ui-skill/understand-the-implementation/registration: en: 4b06a66c56d19ff9 zh: d9c8d118f73d89bb @@ -51,8 +51,8 @@ en: da53c649077dad7e zh: 845f77793f8e10a2 /deepseek-ai-dsh-client-ui-skill/known-limitations-and-deferred-work: - en: aed53b17a91d4b02 - zh: fac571e9228e69c5 + en: cf53f93101c7ef11 + zh: e27ec720dad7b75d /deepseek-ai-dsh-client-ui-skill/known-limitations-and-deferred-work/dev-note: en: e67f633dc6fe7773 zh: 3bb0c20c93f16f98 diff --git a/packages/client/ui-skill/README.md b/packages/client/ui-skill/README.md index 4340f3f78e..94ef9a1465 100644 --- a/packages/client/ui-skill/README.md +++ b/packages/client/ui-skill/README.md @@ -37,7 +37,7 @@ The `preparing` stage shows only the skill icon and title, with no requested ski A collapsed row renders the skill glyph, `Skill` title, and requested skill name on the same secondary font-size axis, line height, row height, and glyph scaling as ordinary Tool rows. Every lifecycle state retains the ordinary skill glyph; running calls carry one left-to-right highlight across the title, separator, and skill name, while failures replace the name with the first error line and interruptions retain their explicit status text. A settled row expands into a bounded `Instructions` card containing the exact durable tool output, with the standard trajectory `Inspect` affordance when available; this expanded card keeps its own typography. The row derives its name, lifecycle, and body only from the frozen call/result slice supplied by ui-tool, never from the current catalog, so replay stays stable when installed skills or their descriptions change. Text and icons are tertiary at rest and secondary on hover; error and interruption text retains its semantic color. -Hovering over `/name` highlights the entire reference. Clicking a known skill opens its provider-supplied `SKILL.md` path in the right Sidebar while keeping the token editable. An uncached click shares the per-Session catalog fetch and opens when it completes, retaining the clicked Session address. Preset changes, connection resets, and plugin disposal cancel pending previews; a later click fetches the current catalog again. Skills without a file path remain invocable but have no file preview. +Hovering over `/name` highlights the entire reference. Clicking a known skill opens its provider-supplied `SKILL.md` path in the right Sidebar while keeping the token editable. An uncached click shares the per-Session catalog fetch and opens when it completes, retaining the clicked Session address. Preset changes, plugin manager operations, connection resets, and plugin disposal cancel pending previews; a later click fetches the current catalog again. Skills without a file path remain invocable but have no file preview. ----- @@ -51,9 +51,9 @@ The source implements no adjudication hooks and no reference codec: the pick lan ### Candidate flow -Catalogs cache per ordinary session with a single-flight fetch; the scope-birth `warm` hook prewarms the session's entry, the forwarded `agent-preset/selected` owner event drops that one session's entry (the catalog belongs to the preset, and a blank session may switch after the warm), and `connection/reset` clears everything. Catalog-addressed continuable children resolve no skill candidates locally because the existing skill RPC requires an attached session; viewing their persisted history must not activate them. The list RPC rides the plugin's root-context connection captured at registration; draft chip visuals derive from the `lexicon` scan. +Catalogs cache per ordinary session with a single-flight fetch; the scope-birth `warm` hook prewarms the session's entry, the forwarded `agent-preset/selected` owner event drops that one session's entry (the catalog belongs to the preset, and a blank session may switch after the warm), the forwarded `plugin-manager/changed` event clears everything (a manager operation may add or remove skill providers that every session reads), and `connection/reset` clears everything. Catalog-addressed continuable children resolve no skill candidates locally because the existing skill RPC requires an attached session; viewing their persisted history must not activate them. The list RPC rides the plugin's root-context connection captured at registration; draft chip visuals derive from the `lexicon` scan. -Each catalog fetch requires an existing retained Client Session and waits for its initial history open to succeed before sending `skills/list`. A temporary `skillCatalog` reference holds that Session until the fetch settles. An unretained Session or a failed open rejects without sending the RPC; preset invalidation, connection reset, and plugin disposal also cancel a pending history wait. +Each catalog fetch requires an existing retained Client Session and waits for its initial history open to succeed before sending `skills/list`. A temporary `skillCatalog` reference holds that Session until the fetch settles. An unretained Session or a failed open rejects without sending the RPC; preset invalidation, plugin manager operations, connection reset, and plugin disposal also cancel a pending history wait. ### Registration @@ -104,6 +104,7 @@ These limits define where the reference and the row fall back to generic behavio - **Result-only history pages use the generic row** — keyed dispatch needs the paired call in the runtime window; pagination that leaves the call outside has no tool identity. This client presentation feature does not extend the history wire contract to recover it. - **Text is the truth** — the reference is plain draft text; a hand-typed identical token is the same reference, and the host gesture boundary judges the sent text, not the menu interaction. Chip visuals derive from the lexicon scan; no occurrence identity, position tracking, or structured reference payload exists on the prompt wire. - **A menu opened before the prewarm settles** shows no skill candidates for that keystroke; the next keystroke re-polls the settled cache. +- **Profile changes outside the plugin manager keep cached catalogs** — an HMR reload after a CLI or hand edit announces no `plugin-manager/changed` event, so an open session lists its previous skills until a preset switch or connection reset. ### Dev Note diff --git a/packages/client/ui-skill/README.zh.md b/packages/client/ui-skill/README.zh.md index d18c52f30d..208f8756fb 100644 --- a/packages/client/ui-skill/README.zh.md +++ b/packages/client/ui-skill/README.zh.md @@ -37,7 +37,7 @@ kind: "package-reference" 收起的行显示 skill 图标、`Skill` 标题与请求加载的 skill 名称,并与普通工具行使用相同的 secondary 字号轴、行高、行高度和图标缩放。所有生命周期状态都保留普通 skill 图标;运行中的调用以同一道高光从左到右扫过标题、分隔符与 skill 名称,失败时以错误首行替换名称,中断则保留明确状态文本。已结算的行展开为一个尺寸受限的 `Instructions` 卡片,其中原样呈现持久化的工具输出;可用时还会提供标准轨迹的 `Inspect` 入口,展开卡片保留自身排版。该行的名称、生命周期与正文只派生自 ui-tool 提供的冻结调用/结果切片,绝不读取当前目录,因此即使已安装的 skill 或其描述发生变化,回放仍保持稳定。 文字和图标默认使用 tertiary 色,悬停使用 secondary 色;错误和中断文字保留各自的语义色。 -鼠标移入 `/name` 时,背景覆盖整个引用。点击已知 skill 会在右侧栏打开提供方给出的 `SKILL.md` 路径,同时保留文本的可编辑性。缓存未就绪时,点击复用该 Session 的目录请求,在完成后按点击时的 Session 地址打开预览。切换预设、重置连接和插件释放会取消待处理的预览;后续点击重新获取当前目录。没有文件路径的 skill 仍可调用,但没有文件预览。 +鼠标移入 `/name` 时,背景覆盖整个引用。点击已知 skill 会在右侧栏打开提供方给出的 `SKILL.md` 路径,同时保留文本的可编辑性。缓存未就绪时,点击复用该 Session 的目录请求,在完成后按点击时的 Session 地址打开预览。切换预设、插件管理操作、重置连接和插件释放会取消待处理的预览;后续点击重新获取当前目录。没有文件路径的 skill 仍可调用,但没有文件预览。 ----- @@ -51,9 +51,9 @@ source 不实现任何裁决钩子,也没有引用 codec:pick 落下字面 ### 候选流程 -目录按普通会话缓存,拉取走 single-flight;scope 创建时的 `warm` 钩子预热该会话的缓存项,转发的 owner 事件 `agent-preset/selected` 丢弃该会话这一项(目录属于 preset,而空会话可能在预热之后才切换),`connection/reset` 清空全部缓存。由目录寻址的可继续 subagent 在客户端解析为没有 skill 候选,因为现有 skill RPC 要求会话已挂载;查看其持久化历史不得激活它。列表 RPC 使用插件注册时捕获的根上下文连接;草稿 chip 视觉由 `lexicon` 扫描派生。 +目录按普通会话缓存,拉取走 single-flight;scope 创建时的 `warm` 钩子预热该会话的缓存项,转发的 owner 事件 `agent-preset/selected` 丢弃该会话这一项(目录属于 preset,而空会话可能在预热之后才切换),转发的 `plugin-manager/changed` 事件清空全部缓存(插件管理操作可能增删每个会话都会读取的 skill provider),`connection/reset` 清空全部缓存。由目录寻址的可继续 subagent 在客户端解析为没有 skill 候选,因为现有 skill RPC 要求会话已挂载;查看其持久化历史不得激活它。列表 RPC 使用插件注册时捕获的根上下文连接;草稿 chip 视觉由 `lexicon` 扫描派生。 -每次目录拉取都要求客户端已持有该会话,并等待首次历史打开成功后才发送 `skills/list`。临时的 `skillCatalog` 引用持续持有会话,直到拉取结束。未被持有的会话或打开失败会直接拒绝,不发送 RPC;预设失效、连接重置和插件释放也会取消正在等待的历史打开。 +每次目录拉取都要求客户端已持有该会话,并等待首次历史打开成功后才发送 `skills/list`。临时的 `skillCatalog` 引用持续持有会话,直到拉取结束。未被持有的会话或打开失败会直接拒绝,不发送 RPC;预设失效、插件管理操作、连接重置和插件释放也会取消正在等待的历史打开。 ### 注册 @@ -104,6 +104,7 @@ source 不实现任何裁决钩子,也没有引用 codec:pick 落下字面 - **仅含工具结果的 history 页使用通用行**:键控分派要求配对的工具调用位于运行时窗口内;分页将工具调用留在窗口外时,工具结果没有工具身份。这项客户端呈现功能不会为了恢复该身份而扩展 history 协议约定。 - **文本是唯一依据**:引用是普通的草稿文本;手动键入的相同 token 就是同一个引用,宿主手势边界评判的是发出的文本,而不是菜单交互。chip 视觉由 lexicon 扫描派生;提示词协议上没有 occurrence 身份、位置跟踪或结构化引用载荷。 - **预热落定之前打开的菜单**:在那次击键下不显示 skill 候选;下一次击键会重新轮询已落定的缓存。 +- **插件管理器之外的 profile 变更保留已缓存的目录**:CLI 或手动编辑后由 HMR 应用的重载不发出 `plugin-manager/changed` 事件,已打开的会话会继续列出之前的 skill,直到切换预设或重置连接。 ### 开发备注 diff --git a/packages/client/ui-skill/package.json b/packages/client/ui-skill/package.json index ba6f20647f..049120d7f1 100644 --- a/packages/client/ui-skill/package.json +++ b/packages/client/ui-skill/package.json @@ -61,6 +61,7 @@ "@deepseek-ai/dsh-client-ui-renderer": "workspace:*", "@deepseek-ai/dsh-client-ui-slots": "workspace:*", "@deepseek-ai/dsh-client-ui-tool": "workspace:*", + "@deepseek-ai/dsh-plugin-manager": "workspace:*", "@deepseek-ai/dsh-session": "workspace:*", "@testing-library/react": "^16.3.3", "@deepseek-ai/cordis": "workspace:~", diff --git a/packages/client/ui-skill/src/client/index.ts b/packages/client/ui-skill/src/client/index.ts index ee67b91e4c..2de10d2ccb 100644 --- a/packages/client/ui-skill/src/client/index.ts +++ b/packages/client/ui-skill/src/client/index.ts @@ -19,12 +19,13 @@ * snapshot locally, so one session costs one RPC. The scope-birth warm hook * prewarms the session's key; a preset switch drops that one key (the * catalog is the preset's, and a blank session may switch after the warm); - * connection/reset clears everything — the host - * catalog may differ across generations. A shared in-flight fetch - * deliberately outlives any single menu interaction: closing the menu must - * not kill the prewarm other consumers will hit, so it carries its own - * abort (fired only on invalidation/teardown) while a candidates caller - * with an aborted signal just returns early. + * plugin-manager/changed clears everything — a manager operation may add or + * remove providers any session's catalog reads; connection/reset clears + * everything — the host catalog may differ across generations. A shared + * in-flight fetch deliberately outlives any single menu interaction: closing + * the menu must not kill the prewarm other consumers will hit, so it carries + * its own abort (fired only on invalidation/teardown) while a candidates + * caller with an aborted signal just returns early. * Catalog RPCs retain an existing Client Session through completion and * wait for its initial history open to succeed before contacting the Host. * @@ -36,6 +37,8 @@ import type {} from '@deepseek-ai/dsh-client-ui-sidebar-right/client' import type { Context as ClientContext } from '@deepseek-ai/cordis' import type { SkillEntry } from '@deepseek-ai/dsh-api-remotes/client' import type {} from '@deepseek-ai/dsh-api-session-controller/client' +// Type-only: the forwarded `plugin-manager/changed` declaration. +import type {} from '@deepseek-ai/dsh-plugin-manager/types' import type { SessionId } from '@deepseek-ai/dsh-session/types' import type { InputTriggerServiceContract, InputTriggerSource } from '@deepseek-ai/dsh-client-ui-input-trigger/client' import { fileAddressFor } from '@deepseek-ai/dsh-util-workspace-path' @@ -246,6 +249,9 @@ export function apply(ctx: ClientContext): void { // A preset decides which skill providers an agent reads, so a switched // session's cached catalog belongs to the composition it no longer runs. ctx.remote.$on('agent-preset/selected', invalidate) + // The Host announces a manager operation after its reload, and the plugins + // it switched may register providers in the global layer every session reads. + ctx.remote.$on('plugin-manager/changed', clearAll) ctx.on('connection/reset', clearAll) ctx.effect(() => { const unregister = inputTriggers.registerSource(source) diff --git a/packages/client/ui-skill/tests/browser-plugin.client.spec.ts b/packages/client/ui-skill/tests/browser-plugin.client.spec.ts index fa997d86b4..b426da40fd 100644 --- a/packages/client/ui-skill/tests/browser-plugin.client.spec.ts +++ b/packages/client/ui-skill/tests/browser-plugin.client.spec.ts @@ -5,7 +5,8 @@ * the source behavior contract driven directly on the captured source with * real ClientSessionContext projections — sessionId addressing, the * session-keyed catalog cache (single-flight per key, scope-birth warm - * prewarm, connection/reset clear), shared fuzzy name ranking, RPC-failure + * prewarm, plugin-manager/changed and connection/reset clears), shared fuzzy + * name ranking, RPC-failure * rejection, pick → plain-text outcome (the plain-text-reference decision: * .agents/notes/archived/architecture/2026-07-25-web-input-machine-and-slash-pipeline.md), * the synchronous @@ -375,6 +376,19 @@ describe('catalog cache', () => { await source.candidates(proj('s2'), req('')) expect(payloads).toHaveLength(4) }) + + it('plugin-manager/changed clears every cached session', async () => { + const { list, payloads } = countingList() + const { source, remote } = await bench(list) + await source.candidates(proj('s1'), req('')) + await source.candidates(proj('s2'), req('')) + expect(payloads).toHaveLength(2) + // A switched plugin may register into the global layer every session reads. + remote.emit('plugin-manager/changed', [{ reason: 'bundle' }]) + await source.candidates(proj('s1'), req('')) + await source.candidates(proj('s2'), req('')) + expect(payloads).toHaveLength(4) + }) }) describe('lexicon', () => { @@ -536,7 +550,7 @@ describe('reference preview', () => { expect(list.mock.calls.map(([payload]) => payload)).toEqual([{ sessionId: 'first' }, { sessionId: 'second' }]) }) - it.each(['reset', 'preset', 'dispose'] as const)('cancels a pending preview on %s even if the RPC completes late', async (reason) => { + it.each(['reset', 'preset', 'plugin', 'dispose'] as const)('cancels a pending preview on %s even if the RPC completes late', async (reason) => { const gate = Promise.withResolvers() const { ctx, source, remote, fiber, openResource } = await bench(() => gate.promise) const session = proj('preview') @@ -546,6 +560,7 @@ describe('reference preview', () => { const completion = expect(source.candidates(session, req(''))).rejects.toThrow() if (reason === 'reset') ctx.emit('connection/reset') else if (reason === 'preset') remote.emit('agent-preset/selected', [session.sessionId, 'minimal']) + else if (reason === 'plugin') remote.emit('plugin-manager/changed', [{ reason: 'plugin' }]) else await fiber.dispose() expect(listener).toHaveBeenCalledTimes(1) gate.resolve({ ok: true, value: { skills: rows } }) diff --git a/packages/client/ui-skill/tsconfig.json b/packages/client/ui-skill/tsconfig.json index 276da77105..cf3c43a1cd 100644 --- a/packages/client/ui-skill/tsconfig.json +++ b/packages/client/ui-skill/tsconfig.json @@ -14,6 +14,9 @@ { "path": "../../api/session-controller/tsconfig.client.json" }, + { + "path": "../../boot/plugin-manager" + }, { "path": "../../core/session" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5de58cc2e..680692b9d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5983,6 +5983,9 @@ importers: '@deepseek-ai/dsh-client-ui-tool': specifier: workspace:* version: link:../ui-tool + '@deepseek-ai/dsh-plugin-manager': + specifier: workspace:* + version: link:../../boot/plugin-manager '@deepseek-ai/dsh-session': specifier: workspace:* version: link:../../core/session diff --git a/tsconfig.host.json b/tsconfig.host.json index 90cb6d8b0b..715adae96f 100644 --- a/tsconfig.host.json +++ b/tsconfig.host.json @@ -161,6 +161,7 @@ "apps/web/tests/queue-image.e2e.ts", "apps/web/tests/skill-invocation-policy.e2e.ts", "apps/web/tests/skill-user-invoke.e2e.ts", + "apps/web/tests/skill-menu-plugin-change.e2e.ts", "apps/web/tests/permission-policy-context.e2e.ts", "apps/web/tests/access-confirmation.e2e.ts", "apps/web/tests/agent-preset-selection.e2e.ts", From cfa52b0bac7e34cf76b5249ae7792d1018c9bd17 Mon Sep 17 00:00:00 2001 From: winewill <324803222+winewill@users.noreply.github.com> Date: Thu, 15 Oct 2026 17:19:42 +0800 Subject: [PATCH 2/9] feat(infra): supervise Windows packaging runner with Task Scheduler --- .../scripts/run-windows-runner-task.ps1 | 26 ++++ apps/desktop/scripts/windows-runner-task.ps1 | 113 ++++++++++++++++++ apps/desktop/tests/windows-runner-task.ps1 | 93 ++++++++++++++ apps/desktop/windows-signing/README.i18n.yaml | 7 +- apps/desktop/windows-signing/README.md | 10 ++ apps/desktop/windows-signing/README.zh.md | 10 ++ 6 files changed, 257 insertions(+), 2 deletions(-) create mode 100644 apps/desktop/scripts/run-windows-runner-task.ps1 create mode 100644 apps/desktop/scripts/windows-runner-task.ps1 create mode 100644 apps/desktop/tests/windows-runner-task.ps1 diff --git a/apps/desktop/scripts/run-windows-runner-task.ps1 b/apps/desktop/scripts/run-windows-runner-task.ps1 new file mode 100644 index 0000000000..cd094d5d1c --- /dev/null +++ b/apps/desktop/scripts/run-windows-runner-task.ps1 @@ -0,0 +1,26 @@ +# Repeating Task Scheduler triggers recover an exited launcher without relying on action exit-code retries. +$ErrorActionPreference = 'Stop' +$log = Join-Path $PSScriptRoot ('run-' + [DateTime]::UtcNow.ToString('yyyyMMddTHHmmssfffZ') + '-' + $PID + '.log') +try { + @{ Pid = $PID; Started = (Get-Process -Id $PID).StartTime.ToUniversalTime().Ticks } | ConvertTo-Json | Set-Content -LiteralPath (Join-Path $PSScriptRoot 'process.json') + $config = Get-Content -LiteralPath (Join-Path $PSScriptRoot 'config.json') -Raw | ConvertFrom-Json + $attemptFile = Join-Path $PSScriptRoot 'attempts.txt' + $attempts = [int](Get-Content -LiteralPath $attemptFile -Raw) + if ($attempts -lt 0 -or $config.RestartCount -lt 1 -or $config.RestartCount -gt 999) { throw 'Invalid restart budget; reinstall the task.' } + if ($attempts -gt $config.RestartCount) { + $null = Disable-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + Set-Content -LiteralPath $log -Value 'Restart budget exhausted. Task disabled; inspect runner logs, fix the cause and run start.' + exit 1 + } + Set-Content -LiteralPath $attemptFile -Value ($attempts + 1) + & (Join-Path $PSHOME 'pwsh.exe') -NoProfile -NonInteractive -File (Join-Path $PSScriptRoot 'start.ps1') -RunnerRoot $config.RunnerRoot -ConfigRoot $config.ConfigRoot *> $log + $code = $LASTEXITCODE + Add-Content -LiteralPath $log -Value "Runner launcher exited with code $code." + # run.cmd maps several listener failures to zero; a persistent task must stay alive until explicitly stopped. + exit 1 +} catch { + $message = 'Runner task failed: ' + $_.Exception.Message + [Console]::Error.WriteLine($message) + Add-Content -LiteralPath $log -Value $message + exit 1 +} diff --git a/apps/desktop/scripts/windows-runner-task.ps1 b/apps/desktop/scripts/windows-runner-task.ps1 new file mode 100644 index 0000000000..ff6db25853 --- /dev/null +++ b/apps/desktop/scripts/windows-runner-task.ps1 @@ -0,0 +1,113 @@ +# Manage a registered packaging runner in the current user's interactive Windows session. +[CmdletBinding()] +param( + [Parameter(Mandatory=$true)][ValidateSet('install','start','stop','status','uninstall')][string]$Action, + [Parameter(Mandatory=$true)][string]$RunnerRoot, + [string]$ConfigRoot, + [ValidateRange(1,1440)][int]$RestartMinutes = 1, + [ValidateRange(1,999)][int]$RestartCount = 10 +) +$ErrorActionPreference = 'Stop' +if (-not $IsWindows) { throw 'This command requires PowerShell 7 on Windows.' } +if ($RunnerRoot -notmatch '^[A-Za-z]:[\\/]') { throw 'RunnerRoot must be an absolute local directory.' } +$RunnerRoot = [IO.Path]::GetFullPath($RunnerRoot).TrimEnd('\','/') +if (-not (Test-Path -LiteralPath (Join-Path $RunnerRoot '.runner') -PathType Leaf)) { throw 'Register the runner before managing its task.' } +for ($ancestor = [IO.DirectoryInfo]::new($RunnerRoot); $null -ne $ancestor; $ancestor = $ancestor.Parent) { + if ($ancestor.Attributes -band [IO.FileAttributes]::ReparsePoint) { throw 'RunnerRoot cannot contain linked directories.' } +} +$sid = [Security.Principal.WindowsIdentity]::GetCurrent().User.Value +$digest = [Convert]::ToHexString([Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($RunnerRoot.ToUpperInvariant()))) +$taskName = 'DSH-Packaging-' + $digest.Substring(0,16) +$serviceDir = Join-Path $RunnerRoot 'dsh-task' +$task = Get-ScheduledTask -TaskPath '\' | Where-Object TaskName -eq $taskName +if ($task -and $task.Description -ne "DSH packaging runner: $RunnerRoot; owner: $sid") { throw 'Task ownership differs; inspect it in Task Scheduler.' } + +if ($Action -eq 'install') { + if ($task) { throw 'Task already installed; stop and uninstall before reinstalling.' } + if (-not $ConfigRoot -or $ConfigRoot -notmatch '^[A-Za-z]:[\\/]') { throw 'Install requires an absolute ConfigRoot.' } + $ConfigRoot = [IO.Path]::GetFullPath($ConfigRoot) + $pwsh = Join-Path $PSHOME 'pwsh.exe' + & $pwsh -NoProfile -File (Join-Path $PSScriptRoot 'start-windows-packaging-runner.ps1') -RunnerRoot $RunnerRoot -ConfigRoot $ConfigRoot -CheckOnly + if ($LASTEXITCODE -ne 0) { throw 'Runner preflight failed; no task was installed.' } + if (Test-Path -LiteralPath $serviceDir) { + if ((Get-Item -LiteralPath $serviceDir).Attributes -band [IO.FileAttributes]::ReparsePoint) { throw 'Task directory cannot be a link.' } + } else { + $null = New-Item -ItemType Directory -Path $serviceDir + } + Copy-Item -LiteralPath (Join-Path $PSScriptRoot 'start-windows-packaging-runner.ps1') -Destination (Join-Path $serviceDir 'start.ps1') + Copy-Item -LiteralPath (Join-Path $PSScriptRoot 'run-windows-runner-task.ps1') -Destination (Join-Path $serviceDir 'run.ps1') + @{ RunnerRoot = $RunnerRoot; ConfigRoot = $ConfigRoot; TaskName = $taskName; RestartCount = $RestartCount } | ConvertTo-Json | Set-Content -LiteralPath (Join-Path $serviceDir 'config.json') -Encoding utf8 + Set-Content -LiteralPath (Join-Path $serviceDir 'attempts.txt') -Value '0' + $arguments = '-NoProfile -NonInteractive -WindowStyle Hidden -File "' + (Join-Path $serviceDir 'run.ps1') + '"' + $execution = New-ScheduledTaskAction -Execute $pwsh -Argument $arguments -WorkingDirectory $RunnerRoot + $principal = New-ScheduledTaskPrincipal -UserId $sid -LogonType Interactive -RunLevel Limited + $trigger = @( + (New-ScheduledTaskTrigger -AtLogOn -User $sid), + (New-ScheduledTaskTrigger -Once -At (Get-Date).AddMinutes($RestartMinutes) -RepetitionInterval (New-TimeSpan -Minutes $RestartMinutes)) + ) + $settings = New-ScheduledTaskSettingsSet -MultipleInstances IgnoreNew -ExecutionTimeLimit ([TimeSpan]::Zero) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries + $settings.Enabled = $false + $null = Register-ScheduledTask -TaskName $taskName -TaskPath '\' -Action $execution -Principal $principal -Trigger $trigger -Settings $settings -Description "DSH packaging runner: $RunnerRoot; owner: $sid" + Write-Output "Installed disabled task $taskName. Run start while logged in; reboot requires desktop login. Logs: $serviceDir" + exit 0 +} +if (-not $task) { throw 'Task is not installed for this runner directory.' } +switch ($Action) { + 'status' { + $info = Get-ScheduledTaskInfo -InputObject $task + [pscustomobject]@{ TaskName = $taskName; State = $task.State; LastRunTime = $info.LastRunTime; LastTaskResult = $info.LastTaskResult; Launches = (Get-Content -LiteralPath (Join-Path $serviceDir 'attempts.txt') -Raw).Trim(); Logs = $serviceDir } + } + 'start' { + if ($task.State -eq 'Running') { Write-Output "$taskName is already running."; break } + Set-Content -LiteralPath (Join-Path $serviceDir 'attempts.txt') -Value '0' + $null = Enable-ScheduledTask -InputObject $task + Start-ScheduledTask -InputObject $task + Write-Output "Start requested for $taskName. Verify Connected to GitHub and Listening for Jobs in $serviceDir." + } + 'stop' { + # Operators pause workflow dispatch first; this local check cannot reserve an idle GitHub runner. + $workers = Get-CimInstance Win32_Process -Filter "Name = 'Runner.Worker.exe'" + foreach ($worker in $workers) { + if (-not $worker.ExecutablePath -or $worker.ExecutablePath.StartsWith($RunnerRoot + '\', [StringComparison]::OrdinalIgnoreCase)) { + throw 'A runner job is active or its location is unreadable. Wait for completion before stopping.' + } + } + $null = Disable-ScheduledTask -InputObject $task + if ($task.State -eq 'Running') { + $record = Get-Content -LiteralPath (Join-Path $serviceDir 'process.json') -Raw | ConvertFrom-Json + $owner = Get-Process -Id $record.Pid -ErrorAction SilentlyContinue + if (-not $owner -or $owner.StartTime.ToUniversalTime().Ticks -ne $record.Started) { + throw 'Running task process identity is unavailable. Automatic starts are disabled; inspect the task before stopping it.' + } + $processes = @(Get-CimInstance Win32_Process) + $ownedIds = [Collections.Generic.HashSet[int]]::new() + $null = $ownedIds.Add($owner.Id) + do { + $added = $false + foreach ($process in $processes) { + if ($ownedIds.Contains([int]$process.ParentProcessId) -and $ownedIds.Add([int]$process.ProcessId)) { $added = $true } + } + } while ($added) + $owned = @(foreach ($ownedId in $ownedIds) { Get-Process -Id $ownedId -ErrorAction SilentlyContinue }) + & "$env:SystemRoot/System32/taskkill.exe" /PID $owner.Id /T /F + if ($LASTEXITCODE -ne 0 -and -not $owner.HasExited) { throw 'Runner task process tree could not be stopped; inspect it before restarting.' } + foreach ($process in $owned) { + if (-not $process.WaitForExit(30000)) { throw 'Runner task child remains alive; inspect it before restarting.' } + } + } + Stop-ScheduledTask -InputObject $task + $deadline = [DateTime]::UtcNow.AddSeconds(30) + do { + $state = (Get-ScheduledTask -TaskName $taskName -TaskPath '\').State + if ($state -ne 'Running') { break } + Start-Sleep -Milliseconds 200 + } while ([DateTime]::UtcNow -lt $deadline) + if ($state -eq 'Running') { throw 'Task remains running; inspect its processes before further maintenance.' } + Write-Output "Stopped and disabled $taskName. Run start to enable automatic starts again." + } + 'uninstall' { + if ($task.State -ne 'Disabled') { throw 'Stop the task before uninstalling.' } + Unregister-ScheduledTask -InputObject $task -Confirm:$false + Write-Output "Uninstalled $taskName. Registration, configuration and logs remain in $RunnerRoot." + } +} diff --git a/apps/desktop/tests/windows-runner-task.ps1 b/apps/desktop/tests/windows-runner-task.ps1 new file mode 100644 index 0000000000..87cf196e8b --- /dev/null +++ b/apps/desktop/tests/windows-runner-task.ps1 @@ -0,0 +1,93 @@ +# Opt-in Windows Task Scheduler acceptance: isolated fake runner, no GitHub registration or signing access. +$ErrorActionPreference = 'Stop' +if (-not $IsWindows) { throw 'Requires PowerShell 7 on Windows.' } +$root = Join-Path ([IO.Path]::GetTempPath()) ('dsh-runner-task-' + [guid]::NewGuid().ToString('N')) +$null = New-Item -ItemType Directory -Path $root +$source = [IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../scripts')) +$runner = Join-Path $root 'runner with spaces' +$null = New-Item -ItemType Directory -Path $runner +Set-Content -LiteralPath (Join-Path $runner '.runner') -Value '{}' +foreach ($file in @('windows-runner-task.ps1','run-windows-runner-task.ps1')) { Copy-Item -LiteralPath (Join-Path $source $file) -Destination $root } +$manager = Join-Path $root 'windows-runner-task.ps1' +@' +param([string]$RunnerRoot, [string]$ConfigRoot, [switch]$CheckOnly) +if ($CheckOnly) { exit 0 } +Add-Content -LiteralPath (Join-Path $RunnerRoot 'starts.txt') -Value $PID +if (-not (Test-Path -LiteralPath (Join-Path $RunnerRoot 'failed-once'))) { + Set-Content -LiteralPath (Join-Path $RunnerRoot 'failed-once') -Value 'yes' + exit 0 +} +Write-Output 'FAKE RUNNER READY' +while ($true) { Start-Sleep -Seconds 1 } +'@ | Set-Content -LiteralPath (Join-Path $root 'start-windows-packaging-runner.ps1') +function Invoke-Manager([string]$Operation, [switch]$ExpectFailure) { + & (Join-Path $PSHOME 'pwsh.exe') -NoProfile -File $manager -Action $Operation -RunnerRoot $runner -ConfigRoot $root -RestartCount 2 + if (($LASTEXITCODE -eq 0) -eq [bool]$ExpectFailure) { throw "Unexpected exit $LASTEXITCODE for $Operation" } +} +function Wait-Condition([scriptblock]$Condition, [string]$Description, [int]$Seconds = 30) { + $deadline = [DateTime]::UtcNow.AddSeconds($Seconds) + do { + if (& $Condition) { return } + Start-Sleep -Milliseconds 200 + } while ([DateTime]::UtcNow -lt $deadline) + throw "Timed out: $Description" +} +$installed = $false +try { + Invoke-Manager install + $installed = $true + $config = Get-Content -LiteralPath (Join-Path $runner 'dsh-task/config.json') -Raw | ConvertFrom-Json + $task = Get-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + if ($task.State -ne 'Disabled' -or $task.Settings.ExecutionTimeLimit -ne 'PT0S' -or $task.Settings.MultipleInstances -ne 'IgnoreNew') { throw 'Unexpected task scheduling settings.' } + Invoke-Manager install -ExpectFailure + Invoke-Manager start + $starts = Join-Path $runner 'starts.txt' + Wait-Condition { (Test-Path -LiteralPath $starts) -and @(Get-Content -LiteralPath $starts).Count -ge 2 } 'automatic retry after unexpected clean exit' 110 + $childId = [int]@(Get-Content -LiteralPath $starts)[-1] + $child = Get-Process -Id $childId + Invoke-Manager start + Invoke-Manager status + if (@(Get-Content -LiteralPath $starts).Count -ne 2) { throw 'Duplicate runner started.' } + Invoke-Manager uninstall -ExpectFailure + $recordFile = Join-Path $runner 'dsh-task/process.json' + $originalRecord = Get-Content -LiteralPath $recordFile -Raw + $record = $originalRecord | ConvertFrom-Json + $record.Started = 0 + $record | ConvertTo-Json | Set-Content -LiteralPath $recordFile + Invoke-Manager stop -ExpectFailure + if ($child.HasExited) { throw 'Stale process record terminated a process.' } + Set-Content -LiteralPath $recordFile -Value $originalRecord + Invoke-Manager stop + Wait-Condition { $child.Refresh(); $child.HasExited } 'scheduler child termination' + Invoke-Manager start + Wait-Condition { @(Get-Content -LiteralPath $starts).Count -eq 3 } 'explicit restart' + $child = Get-Process -Id ([int]@(Get-Content -LiteralPath $starts)[-1]) + Invoke-Manager stop + Wait-Condition { $child.Refresh(); $child.HasExited } 'restarted child termination' + Set-Content -LiteralPath (Join-Path $runner 'dsh-task/attempts.txt') -Value '3' + $null = Enable-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + Start-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + Wait-Condition { (Get-ScheduledTask -TaskName $config.TaskName -TaskPath '\').State -eq 'Disabled' } 'exhausted restart budget disables task' + if (@(Get-Content -LiteralPath $starts).Count -ne 3) { throw 'Exhausted budget launched another runner.' } + Invoke-Manager uninstall + $installed = $false + Invoke-Manager status -ExpectFailure + if (-not (Test-Path -LiteralPath (Join-Path $runner '.runner'))) { throw 'Registration removed.' } + Write-Output "PASS: install, duplicate refusal, automatic retry, start, status, stop, child teardown, retry exhaustion, uninstall. Evidence: $root" +} finally { + if ($installed) { + Invoke-Manager stop + Invoke-Manager uninstall + } + foreach ($process in @(Get-CimInstance Win32_Process -Filter "Name = 'pwsh.exe'")) { + if ($process.CommandLine -and $process.CommandLine.Contains($root)) { + $owned = Get-Process -Id $process.ProcessId -ErrorAction SilentlyContinue + if ($owned) { + Stop-Process -InputObject $owned + if (-not $owned.WaitForExit(30000)) { throw 'Fixture process did not exit.' } + } + } + } + # Logs stay available for diagnosing scheduler failures; the fixture owns no registered runner credentials. + Write-Output "Fixture retained: $root" +} diff --git a/apps/desktop/windows-signing/README.i18n.yaml b/apps/desktop/windows-signing/README.i18n.yaml index c063a69c88..2fa1ab5e8c 100644 --- a/apps/desktop/windows-signing/README.i18n.yaml +++ b/apps/desktop/windows-signing/README.i18n.yaml @@ -18,8 +18,11 @@ en: 0c261f3948178d55 zh: 1086cd882468ad8f /windows-signing-and-runner-operations/machine-setup-and-runner-startup: - en: ba3de07cc9553056 - zh: 887e652c40d57091 + en: bb889e9514678d1c + zh: 48cbec1e907d6a2b +/windows-signing-and-runner-operations/machine-setup-and-runner-startup/supervised-startup: + en: 45ed84267ca7bdf7 + zh: 6750dc58cce42023 /windows-signing-and-runner-operations/signing-configuration: en: 4b5548818375eb9a zh: 8c975adbb1dca9c8 diff --git a/apps/desktop/windows-signing/README.md b/apps/desktop/windows-signing/README.md index eb3fd4a76d..bb1675cba2 100644 --- a/apps/desktop/windows-signing/README.md +++ b/apps/desktop/windows-signing/README.md @@ -34,6 +34,16 @@ Use a runner-owned checkout and keep configuration, certificates and caches outs Run `pwsh -NoProfile -File apps/desktop/scripts/setup-windows-packaging.ps1 -Root ` to prepare private `packaging/{presets,secrets,certificates}` and `cache/windows-signatures` directories and copy templates without overwriting existing files. Add `-CheckOnly` to inspect without writes. Fill the [preset templates](../config/windows-packaging/test.env.example) and [signing template](../config/windows-packaging/windows-signing.env.example) on the machine. Run `start-windows-packaging-runner.ps1 -RunnerRoot -ConfigRoot /packaging -CheckOnly` from the same scripts directory to inspect PowerShell 7.6.6 under the runner's `tools` directory, Node, Python, Git, tar and Visual C++ tools; packaging `--check` performs the remaining toolchain validation. Omit `-CheckOnly` to start the existing runner with an explicit config root and scrubbed inherited environment. Registration and tool installation are separate; these scripts never create tokens, alter system security settings or clear signing failure records. Use the signing cache maintenance command below to migrate existing entries before changing the preset's cache path. +### Supervised startup + +Run `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging` as the runner's Windows user, using its installed PowerShell 7. The installer checks the environment and copies startup scripts into `runner/dsh-task`; registration, tools and secrets remain separate. It registers a disabled, limited-permission interactive Task Scheduler task without storing an account password. Run the same command with `-Action start` or `-Action status`; only installation needs `-ConfigRoot`. The task starts after this user's desktop login, including after reboot, and stops on logout. It does not provide unattended boot or unlock a signing Token. + +The task permits one instance and has no execution time limit. A repeating trigger checks every `-RestartMinutes` minutes (default `1`) and restarts an exited launcher, including an unexpected zero exit. The persisted budget permits the initial launch plus `-RestartCount` restarts (default `10`) between explicit starts; starting an already running task does not reset it. GitHub's launcher owns runner updates; task recovery does not rerun a failed workflow or clear signing interlocks. After retries are exhausted, inspect `runner/dsh-task/run-*.log`, the runner's `_diag` logs and `status`, correct the cause, then run `start`. A running task alone does not prove connectivity: verify `Connected to GitHub` and `Listening for Jobs`, then verify assignment in Actions. Logs are retained for operator-managed cleanup. + +Before maintenance, pause new workflow dispatch and wait for the runner to become idle. `-Action stop` refuses an active worker for this runner, disables future starts and stops its task process tree; the local check cannot prevent a concurrent GitHub assignment. `-Action uninstall` requires a stopped, disabled task and retains registration, configuration and logs. To update installed scripts, stop, uninstall and install again. When migrating a manually launched runner, stop its existing launcher only after it is idle, then start the task; never run both launchers together. + +Operators can run `pwsh -NoProfile -File apps/desktop/tests/windows-runner-task.ps1` on Windows to exercise installation, automatic recovery, duplicate-start prevention, stop, child-process teardown and uninstall against an isolated fake runner. This opt-in test creates a temporary task and retains diagnostic files; it does not contact GitHub or access signing hardware. Real-machine acceptance additionally checks an idle runner coming online, an Actions job being assigned, and login after an operator-approved reboot. Signed packaging and logout/reboot acceptance require separate operator verification. + ## Signing configuration diff --git a/apps/desktop/windows-signing/README.zh.md b/apps/desktop/windows-signing/README.zh.md index 70718a8bf7..1a7bc9ea22 100644 --- a/apps/desktop/windows-signing/README.zh.md +++ b/apps/desktop/windows-signing/README.zh.md @@ -34,6 +34,16 @@ description: "配置和维护 Windows 打包 runner、签名凭据、EV Token 运行 `pwsh -NoProfile -File apps/desktop/scripts/setup-windows-packaging.ps1 -Root ` 创建私有 `packaging/{presets,secrets,certificates}` 和 `cache/windows-signatures` 目录并复制模板,不覆盖现有文件。添加 `-CheckOnly` 只检查不写入。在机器上填写 [preset 模板](../config/windows-packaging/test.env.example)和[签名模板](../config/windows-packaging/windows-signing.env.example)。从同一 scripts 目录运行 `start-windows-packaging-runner.ps1 -RunnerRoot -ConfigRoot /packaging -CheckOnly`,检查 runner 的 `tools` 目录下 PowerShell 7.6.6、Node、Python、Git、tar 和 Visual C++ 工具;打包 `--check` 完成其余工具链检查。省略 `-CheckOnly`,以显式配置目录和清理后的继承环境启动现有 runner。注册和工具安装单独进行;这些脚本不创建 token、不改系统安全设置、不清除签名失败记录。修改 preset 缓存路径前,使用下文签名缓存维护命令迁移已有条目。 +### 受监督启动 + +以 runner 的 Windows 用户运行 `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging`,使用该机器安装的 PowerShell 7。安装器检查环境,并将启动脚本复制到 `runner/dsh-task`;注册、工具和凭据仍单独管理。它注册一个初始禁用、权限受限的交互式计划任务,不保存账户密码。将同一命令的操作改为 `-Action start` 或 `-Action status`;只有安装需要 `-ConfigRoot`。任务在该用户登录桌面后启动,重启后也需要登录,注销时停止。它不提供无人值守开机,也不解锁签名 Token。 + +任务只允许一个实例,且没有执行时限。周期触发器每隔 `-RestartMinutes` 分钟(默认 `1`)检查一次,并恢复已退出的启动器,包括意外的零退出码。持久预算允许首次启动及 `-RestartCount` 次重启(默认 `10`),直到再次显式启动;对正在运行的任务执行 start 不会重置预算。GitHub 启动器负责 runner 更新;任务恢复不会重跑失败的 workflow,也不会清除签名互锁。重试耗尽后,检查 `runner/dsh-task/run-*.log`、runner 的 `_diag` 日志和 `status`,修复原因后运行 `start`。任务运行不等于连接成功:确认出现 `Connected to GitHub` 和 `Listening for Jobs`,再到 Actions 确认任务分配。日志保留,由操作者管理清理。 + +维护前暂停新 workflow 的触发,等待 runner 空闲。`-Action stop` 在该 runner 存在活跃 worker 时拒绝停止,否则禁用后续启动并停止任务进程树;本地检查无法阻止 GitHub 同时分配任务。`-Action uninstall` 要求任务已停止并禁用,保留注册、配置和日志。更新已安装脚本时,依次停止、卸载、重新安装。迁移手动启动的 runner 时,只在空闲后停止原启动器,再启动计划任务;不要同时运行两个启动器。 + +操作者可在 Windows 上运行 `pwsh -NoProfile -File apps/desktop/tests/windows-runner-task.ps1`,使用隔离的假 runner 验证安装、自动恢复、防止重复启动、停止、子进程退出和卸载。此显式运行的测试创建临时任务并保留诊断文件,不连接 GitHub 或访问签名硬件。真实机器验收还需检查空闲 runner 上线、Actions job 分配,以及经操作者批准的重启后登录。签名打包和注销/重启验收需要操作者单独验证。 + ## 签名配置 From 5e23825f155ed275916ed074ea639b7535280f73 Mon Sep 17 00:00:00 2001 From: winewill <324803222+winewill@users.noreply.github.com> Date: Thu, 15 Oct 2026 17:40:38 +0800 Subject: [PATCH 3/9] fix(desktop): reject debug publications early and harden runner supervision --- .github/workflows/ci.yml | 9 ++++ .github/workflows/desktop-publish.yml | 6 +++ .github/workflows/macos-package.yml | 2 +- .github/workflows/windows-package.yml | 2 +- apps/desktop/packaging/README.i18n.yaml | 4 +- apps/desktop/packaging/README.md | 2 + apps/desktop/packaging/README.zh.md | 2 + apps/desktop/publishing/ci/README.i18n.yaml | 4 +- apps/desktop/publishing/ci/README.md | 2 + apps/desktop/publishing/ci/README.zh.md | 2 + .../desktop-publish-qualification.d.mts | 7 +++ .../scripts/desktop-publish-qualification.mjs | 15 ++++++ apps/desktop/scripts/desktop-publish-route.ts | 5 +- .../scripts/preflight-desktop-publish.d.mts | 10 ++++ .../scripts/preflight-desktop-publish.mjs | 47 +++++++++++++++++++ apps/desktop/scripts/publish-desktop-ci.ts | 5 +- .../scripts/resolve-desktop-publish-ci.ts | 3 +- apps/desktop/scripts/retain-desktop-ci.ts | 5 +- .../scripts/run-windows-runner-task.ps1 | 7 ++- apps/desktop/scripts/windows-runner-task.ps1 | 13 ++++- .../tests/desktop-publish-preflight.spec.ts | 36 ++++++++++++++ .../tests/desktop-publish-route.spec.ts | 10 ++++ .../tests/expected/retained-unnotarized.md | 4 ++ .../tests/expected/retained-unsigned.md | 4 ++ apps/desktop/tests/retain-desktop-ci.spec.ts | 27 ++++++++--- apps/desktop/tests/windows-runner-task.ps1 | 35 ++++++++++---- apps/desktop/windows-signing/README.i18n.yaml | 4 +- apps/desktop/windows-signing/README.md | 4 +- apps/desktop/windows-signing/README.zh.md | 4 +- scripts/desktop-publish-workflow.spec.ts | 9 ++++ 30 files changed, 254 insertions(+), 35 deletions(-) create mode 100644 apps/desktop/scripts/desktop-publish-qualification.d.mts create mode 100644 apps/desktop/scripts/desktop-publish-qualification.mjs create mode 100644 apps/desktop/scripts/preflight-desktop-publish.d.mts create mode 100644 apps/desktop/scripts/preflight-desktop-publish.mjs create mode 100644 apps/desktop/tests/desktop-publish-preflight.spec.ts create mode 100644 apps/desktop/tests/expected/retained-unnotarized.md create mode 100644 apps/desktop/tests/expected/retained-unsigned.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93c3d5293c..1dc4318e48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -572,6 +572,15 @@ jobs: - name: Run blocking Windows builds shell: pwsh run: pnpm run check:ci:windows-blocking + - name: Parse Windows runner supervision scripts + shell: pwsh + run: | + foreach ($path in @('apps/desktop/scripts/windows-runner-task.ps1', 'apps/desktop/scripts/run-windows-runner-task.ps1', 'apps/desktop/tests/windows-runner-task.ps1')) { + $tokens = $null + $parseErrors = $null + $null = [Management.Automation.Language.Parser]::ParseFile((Join-Path $env:GITHUB_WORKSPACE $path), [ref]$tokens, [ref]$parseErrors) + if ($parseErrors.Count) { throw ($parseErrors -join "`n") } + } - name: Run Windows observational gates on built artifacts id: observational continue-on-error: true diff --git a/.github/workflows/desktop-publish.yml b/.github/workflows/desktop-publish.yml index 89e9e1da4e..ba8f5b0896 100644 --- a/.github/workflows/desktop-publish.yml +++ b/.github/workflows/desktop-publish.yml @@ -31,6 +31,11 @@ jobs: - uses: actions/checkout@v7.0.1 with: persist-credentials: false + - name: Reject debugging packages before dependency installation + id: preflight + env: + GH_TOKEN: ${{ github.token }} + run: node apps/desktop/scripts/preflight-desktop-publish.mjs - uses: pnpm/action-setup@v5.0.0 - uses: actions/setup-node@v7.0.0 with: @@ -41,6 +46,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} DESKTOP_PUBLISH_RUNNERS: ${{ vars.DESKTOP_PUBLISH_RUNNERS }} + DESKTOP_PACKAGE_ATTEMPT: ${{ steps.preflight.outputs.attempt }} run: node --import tsx apps/desktop/scripts/resolve-desktop-publish-ci.ts prepare: diff --git a/.github/workflows/macos-package.yml b/.github/workflows/macos-package.yml index b483ee6b20..b0c3164729 100644 --- a/.github/workflows/macos-package.yml +++ b/.github/workflows/macos-package.yml @@ -10,7 +10,7 @@ on: default: test required: true skip_notarization: - description: '跳过公证和 stapling:仅限内部调试,不可用于发布或自动更新' + description: '跳过公证和 stapling:仅限内部调试,禁止发布到 test / production 或用于自动更新;需要发布请勿勾选' type: boolean default: false required: true diff --git a/.github/workflows/windows-package.yml b/.github/workflows/windows-package.yml index bfc6f7589a..60729c98f3 100644 --- a/.github/workflows/windows-package.yml +++ b/.github/workflows/windows-package.yml @@ -10,7 +10,7 @@ on: default: test required: true signing: - description: '签名方式:unsigned 仅供内部测试;signed 使用机器配置的 EV 硬件令牌' + description: '签名方式:unsigned 仅限内部调试,禁止发布到 test / production 或用于自动更新;需要发布请选择 signed(EV 硬件令牌)' type: choice options: [unsigned, signed] default: unsigned diff --git a/apps/desktop/packaging/README.i18n.yaml b/apps/desktop/packaging/README.i18n.yaml index 0f98b2c3e7..9307a642fe 100644 --- a/apps/desktop/packaging/README.i18n.yaml +++ b/apps/desktop/packaging/README.i18n.yaml @@ -24,8 +24,8 @@ en: f5dc36baf414ecc5 zh: 8984741b356ac1d3 /desktop-packaging/windows-actions-packaging: - en: e3f51e7130a0fe05 - zh: 70fd6a40d5899871 + en: 6f8f6df680a43ea0 + zh: 276a1d60dcd5f573 /desktop-packaging/macos-self-hosted-packaging: en: a3af9523fdc60036 zh: 5e18d4740e9b7f57 diff --git a/apps/desktop/packaging/README.md b/apps/desktop/packaging/README.md index 84c725f4f3..680bd6d356 100644 --- a/apps/desktop/packaging/README.md +++ b/apps/desktop/packaging/README.md @@ -103,6 +103,8 @@ Each target owns its packed package inputs, prepared runtime, package set, dsh t ## Windows Actions packaging +For supervised runner startup and recovery, follow [Windows runner machine setup](../windows-signing/README.md#machine-setup). + The `Package Desktop · Windows` [manual workflow](../../../.github/workflows/windows-package.yml) selects the dedicated Windows x64 runner label `dsh-win-package-trial` and the machine preset `test` or `production`. Choose `unsigned` (default) or `signed`; signed mode uses the existing EV token preflight, signature cache and failure interlock. It does not publish or upload a release. `build_version` defaults to `auto`, using the CI identifier in [Release versions](#release-versions); an explicit value may be the checkout's product version or an extended build version such as `0.2.1-alpha.1.20261009.1` for product `0.2.1-alpha.1`. The version prefix must match the selected checkout; validation errors show its current example. Manifests remain unchanged. Select the workflow in Actions, choose the source branch, preset, signing mode and version, then click Run workflow. Before merging input changes, test the pushed branch with `gh workflow run windows-package.yml --ref -f preset=test -f signing=unsigned -f build_version=auto`; verify the web form after merging. There is no push or PR trigger. Logs and successful EXEs are retained for 14 days. Inspect the retained logs and installer before relying on packaging; installation is separate. Before checkout, Node removes the runner-owned source directory without following dependency junctions; the workflow validates its location and rejects linked ancestors. Never point it at a development checkout. Runs share one concurrency group without cancelling an active build; only one run remains pending, and a newer dispatch replaces it. Diagnostics upload requires a successful clean checkout. Machine settings stay outside the checkout and are never uploaded as artifacts. diff --git a/apps/desktop/packaging/README.zh.md b/apps/desktop/packaging/README.zh.md index d9e617aac7..89300fd195 100644 --- a/apps/desktop/packaging/README.zh.md +++ b/apps/desktop/packaging/README.zh.md @@ -103,6 +103,8 @@ macOS 正式发布和本地未签名 DMG 都通过 [electron-builder 配置](../ ## Windows Actions 打包 +runner 的受监督启动和恢复见 [Windows runner 机器准备](../windows-signing/README.zh.md#machine-setup)。 + `Package Desktop · Windows` [手动工作流](../../../.github/workflows/windows-package.yml) 选择专用 Windows x64 runner 标签 `dsh-win-package-trial`,并使用机器 preset `test` 或 `production`。选择 `unsigned`(默认)或 `signed`;签名模式复用现有 EV token 预检、签名缓存与失败 interlock,不发布或上传 release。`build_version` 默认为 `auto`,使用[发布版本](#release-versions)中的 CI 标识;显式值可以是源码产品版本,或扩展构建版本,例如产品 `0.2.1-alpha.1` 对应 `0.2.1-alpha.1.20261009.1`。版本前缀必须匹配所选源码;校验错误显示其当前示例。manifest 保持不变。 在 Actions 选择工作流、源码分支、preset、签名模式和版本,再点击 Run workflow。输入变更合并前,用 `gh workflow run windows-package.yml --ref -f preset=test -f signing=unsigned -f build_version=auto` 测试已推送分支;合并后验证网页表单。它不监听 push 或 PR。日志和成功生成的 EXE 保留 14 天。依赖打包流程前检查日志和安装包;安装是独立操作。检出前,Node 删除 runner 专用源码目录,不跟随依赖 junction;工作流校验目标位置并拒绝链接祖先目录。不得指向日常开发目录。运行共享一个并发组,不取消正在进行的构建;最多保留一个待运行任务,新触发会替换它。仅在成功完成干净检出后上传诊断。机器配置位于 checkout 之外,不作为产物上传。 diff --git a/apps/desktop/publishing/ci/README.i18n.yaml b/apps/desktop/publishing/ci/README.i18n.yaml index d13895e476..21834b860e 100644 --- a/apps/desktop/publishing/ci/README.i18n.yaml +++ b/apps/desktop/publishing/ci/README.i18n.yaml @@ -18,8 +18,8 @@ en: 990ff7e56dd6005a zh: 18f9dc23c520dc8c /desktop-ci-publication/package-and-publish: - en: 2143e73bc7c65385 - zh: cd968050774f4bb3 + en: 0a26537845e89dda + zh: 307378bb65e24650 /desktop-ci-publication/recovery-and-records: en: e92bfad06162443e zh: 6c3e3d8ece673217 diff --git a/apps/desktop/publishing/ci/README.md b/apps/desktop/publishing/ci/README.md index b8011c85ed..579c24c9b2 100644 --- a/apps/desktop/publishing/ci/README.md +++ b/apps/desktop/publishing/ci/README.md @@ -35,6 +35,8 @@ Environment approval gates this workflow, not arbitrary code running under the s ## Package and publish +For publication to either test or production, choose Windows `signing=signed` or leave macOS **Skip notarization** unchecked. Unsigned and unnotarized packages are only for internal debugging; they cannot publish or provide automatic updates. Before installing dependencies, the hosted routing job rejects debugging artifacts identified by the selected run and attempt. Missing artifact metadata does not establish eligibility: the original machine still validates its retained manifest and signatures. A debugging-package rejection requires a new signed/notarized package and its run ID / attempt; retrying publication cannot qualify the existing bytes. + Select the platform's `Package Desktop` workflow, preset, source, channel and version mode. `source_ref` accepts repository branch names (for example `feature/desktop-update`) or `dsh-v*` tags for test; production accepts only `master` or `dsh-v*` tags. Names matching `dsh-v` followed by a digit and letters, digits, dots or hyphens are treated as tags, even if a branch has that name. Tags must match the selected product version. We recommend dispatching the packaging workflow from `master` and enter the source separately; raw commit SHAs, PR refs and fork repositories are not supported. The selected source must contain the CI adapters, so older sources fail before dependency installation. Only select trusted branches: their build code runs on the signing machine. This is an operating convention, not enforced workflow-origin or credential isolation. Publication uses the recorded commit and requires it to remain in the selected branch history; normal branch advances are allowed, deletion or a diverging force-push rejects. Tag publication requires the tag to still resolve to the recorded commit. Dispatch the publisher from `master`; its hosted routing job rejects other refs before scheduling the original machine. The packaged source commit is recorded separately. `version_mode=default` selects product for production and auto for test; product preserves the selected checkout version, auto appends date/run/attempt, and manual requires `build_version`. A latest package requires a stable version, so test/latest needs product or a stable manual version. The optional `test_release_id` is the test URL prefix: blank retains the machine default, successive upgrade tests on that platform need the same value, and defaults should be rotated periodically. It is not a GitHub run ID. See [packaging configuration](../../packaging/README.md#configuration-and-local-builds) for its validation and rotation limits. Packaging only retains files. After success, open **Publish Desktop · COS → Run workflow** on `master`, enter `package_run_id` from the packaging run URL, and optionally enter `package_run_attempt`. Blank selects the latest attempt, which must have succeeded; it never falls back to an older success. An explicit attempt selects that exact successful build. Windows must be signed; macOS must finish notarization and stapling. GitHub job evidence selects the original runner; its local manifest supplies the preset, version, source and channel before approval. No installer or request artifact is downloaded. Retained packages with the old `publishRequested=false` flag remain eligible; missing or changed local files stop publication. diff --git a/apps/desktop/publishing/ci/README.zh.md b/apps/desktop/publishing/ci/README.zh.md index 84a58ce6f1..7cdbe98b2d 100644 --- a/apps/desktop/publishing/ci/README.zh.md +++ b/apps/desktop/publishing/ci/README.zh.md @@ -35,6 +35,8 @@ Environment 审批限制此工作流,不限制同一机器账户运行的任 ## 打包与发布 +发布到 test 或 production 都必须在 Windows 选择 `signing=signed`,或在 macOS 不勾选**跳过公证**。无签名、无公证的包仅限内部调试,不能发布或用于自动更新。托管路由 job 会在安装依赖前,依据所选 run 和 attempt 对应的 artifact 名称拒绝已标明的调试包。缺少 artifact 元数据不代表允许发布:原机器仍会验证留存清单和签名。遇到调试包拒绝提示时,需重新完成签名或公证,再使用新包的 run ID / attempt 发布;重跑发布不能使现有产物获得发布资格。 + 选择对应平台的 `Package Desktop` 工作流、preset、源码、通道和版本模式。test 的 `source_ref` 接受仓库内分支名(如 `feature/desktop-update`)或 `dsh-v*` tag;production 仅接受 `master` 或 `dsh-v*` tag。符合 `dsh-v` 后接数字、其余为字母、数字、点或连字符的名称按 tag 处理,即使存在同名分支。tag 必须与所选产品版本一致。建议从 `master` 启动打包工作流,再单独填写打包源码;不支持直接填写 commit SHA、PR ref 或 fork 仓库。源码必须包含 CI 适配脚本,旧源码会在安装依赖前失败。仅选择可信分支:其构建代码将在签名机器上执行。这是操作约定,不提供工作流来源强制限制或凭据隔离。发布使用记录的 commit,并要求该提交仍在所选分支历史中;正常追加提交不影响发布,删除分支或导致历史分叉的强推会拒绝。tag 发布要求 tag 仍指向记录的提交。从 `master` 发起发布;托管路由 job 会在派发到原机器前拒绝其他 ref。实际打包源码提交单独记录。`version_mode=default` 对 production 选择 product,对 test 选择 auto;product 保留所选源码版本,auto 追加日期/run/attempt,manual 要求填写 `build_version`。latest 包要求稳定版本,因此 test/latest 需选择 product 或稳定的手填版本。可选 `test_release_id` 是测试 URL 前缀:留空沿用机器默认值,同一平台连续升级测试需保持相同值,并应定期轮换默认值。它不是 GitHub run ID。格式校验和轮换限制见[打包配置](../../packaging/README.zh.md#configuration-and-local-builds)。 打包只保留文件。成功后,在 `master` 上打开 **Publish Desktop · COS → Run workflow**,填写打包运行 URL 中的 `package_run_id`,并可填写 `package_run_attempt`。留空选择最新尝试,且该尝试必须成功,不会回退到较早的成功尝试;显式填写则选择对应的成功构建。Windows 必须完成签名,macOS 必须完成公证和 stapling。GitHub job 证据确定原 runner,本机清单在审批前提供 preset、版本、源码和通道。不会下载安装包或请求 artifact。旧清单的 `publishRequested=false` 不影响发布资格;本机文件缺失或变化会停止发布。 diff --git a/apps/desktop/scripts/desktop-publish-qualification.d.mts b/apps/desktop/scripts/desktop-publish-qualification.d.mts new file mode 100644 index 0000000000..b72cb33d02 --- /dev/null +++ b/apps/desktop/scripts/desktop-publish-qualification.d.mts @@ -0,0 +1,7 @@ +/** Explain why retained debugging packages cannot enter either publication environment. */ +/** + * Return rebuilding instructions for debugging packages. + * @param qualification Recorded package qualification. + * @returns Diagnostic, or undefined for a non-debugging qualification. + */ +export function desktopPublishQualificationError(qualification: string): string | undefined diff --git a/apps/desktop/scripts/desktop-publish-qualification.mjs b/apps/desktop/scripts/desktop-publish-qualification.mjs new file mode 100644 index 0000000000..05eae5ffbf --- /dev/null +++ b/apps/desktop/scripts/desktop-publish-qualification.mjs @@ -0,0 +1,15 @@ +/** Explain why retained debugging packages cannot enter either publication environment. */ + +/** + * Return rebuilding instructions for debugging packages. + * @param {string} qualification Recorded package qualification. + * @returns {string | undefined} Diagnostic, or undefined for a non-debugging qualification. + */ +export function desktopPublishQualificationError(qualification) { + const remedy = qualification === 'unsigned' + ? '该包未签名(unsigned)。请重新运行 Windows 打包并选择 signing=signed。' + : qualification === 'unnotarized' + ? '该包跳过了公证(unnotarized)。请重新运行 macOS 打包,取消勾选“跳过公证”,完成公证和 stapling。' + : undefined + return remedy && `desktop publish: ${remedy}当前产物仅限内部调试,不能发布到 test 或 production,也不能用于自动更新。打包成功后使用新的 run ID / attempt 发布;重跑当前发布任务无效。` +} diff --git a/apps/desktop/scripts/desktop-publish-route.ts b/apps/desktop/scripts/desktop-publish-route.ts index b452eab3e1..303c447040 100644 --- a/apps/desktop/scripts/desktop-publish-route.ts +++ b/apps/desktop/scripts/desktop-publish-route.ts @@ -1,5 +1,6 @@ /** Validate a completed packaging attempt and route publication back to its original runner. */ import { z } from 'zod' +import { desktopPublishQualificationError } from './desktop-publish-qualification.mjs' const positive = z.number().int().positive() const runSchema = z.object({ @@ -12,7 +13,7 @@ const requestSchema = z.object({ source: z.object({ workflowCommit: z.string(), sourceRef: z.string().min(1), channel: z.enum(['nightly', 'latest']), runnerName: z.string(), target: z.enum(['mac-arm64', 'win-x64']), preset: z.enum(['test', 'production']), - qualification: z.enum(['signed', 'notarized']), + qualification: z.enum(['signed', 'notarized', 'unsigned', 'unnotarized']), }).refine(source => source.preset === 'test' || /^(?:master|dsh-v[0-9][0-9A-Za-z.-]*)$/u.test(source.sourceRef), 'Production source must be master or dsh-v*') }) const jobsSchema = z.array(z.object({ name: z.string(), runner_name: z.string().nullable(), conclusion: z.string().nullable() })) @@ -45,6 +46,8 @@ export function resolveDesktopPublishRoute( ): DesktopPublishRoute { const run = runSchema.parse(runValue) const { source } = requestSchema.parse(requestValue) + const diagnostic = desktopPublishQualificationError(source.qualification) + if (diagnostic) throw new Error(diagnostic) const jobs = jobsSchema.parse(jobsValue) const routes = routesSchema.parse(routesValue) const workflow = source.target === 'win-x64' ? '.github/workflows/windows-package.yml' : '.github/workflows/macos-package.yml' diff --git a/apps/desktop/scripts/preflight-desktop-publish.d.mts b/apps/desktop/scripts/preflight-desktop-publish.d.mts new file mode 100644 index 0000000000..84b300c61b --- /dev/null +++ b/apps/desktop/scripts/preflight-desktop-publish.d.mts @@ -0,0 +1,10 @@ +/** Reject identifiable debugging artifacts before installing publication dependencies. */ +/** + * Pin the requested attempt and reject its explicitly named debugging artifacts. + * @param repository GitHub repository. + * @param inputs Dispatch inputs. + * @param api Parsed GitHub JSON. + * @returns Exact attempt for subsequent routing; local verification remains required. + */ +export function preflightDesktopPublish(repository: string, inputs: { package_run_id: string; package_run_attempt?: string }, + api: (path: string, paginate?: boolean) => unknown): string diff --git a/apps/desktop/scripts/preflight-desktop-publish.mjs b/apps/desktop/scripts/preflight-desktop-publish.mjs new file mode 100644 index 0000000000..3d9624b20f --- /dev/null +++ b/apps/desktop/scripts/preflight-desktop-publish.mjs @@ -0,0 +1,47 @@ +/** Reject identifiable debugging artifacts before installing publication dependencies. */ +import { execFileSync } from 'node:child_process' +import { appendFile, readFile } from 'node:fs/promises' +import { resolve } from 'node:path' +import { desktopPublishQualificationError } from './desktop-publish-qualification.mjs' + +/** + * Pin the requested attempt and reject its explicitly named debugging artifacts. + * Artifact names only reject; local inventory and signature verification still authorize publication. + * @param {string} repository GitHub repository. + * @param {{ package_run_id: string, package_run_attempt?: string }} inputs Dispatch inputs. + * @param {(path: string, paginate?: boolean) => unknown} api Parsed GitHub JSON; validated here without dependencies. + * @returns {string} Exact attempt for subsequent routing. + */ +export function preflightDesktopPublish(repository, inputs, api) { + if (!/^[\w.-]+\/[\w.-]+$/u.test(repository) || !/^[1-9]\d*$/u.test(inputs.package_run_id) + || (inputs.package_run_attempt && !/^[1-9]\d*$/u.test(inputs.package_run_attempt))) { + throw new Error('desktop publish: repository, package_run_id and package_run_attempt must identify a valid packaging attempt') + } + const base = `repos/${repository}/actions/runs/${inputs.package_run_id}` + const latest = inputs.package_run_attempt ? undefined : api(base) + const attempt = inputs.package_run_attempt || String(latest && typeof latest === 'object' && 'run_attempt' in latest ? latest.run_attempt : '') + if (!/^[1-9]\d*$/u.test(attempt)) throw new Error('desktop publish: GitHub returned an invalid attempt') + const pages = api(`${base}/artifacts?per_page=100`, true) + if (!Array.isArray(pages) || pages.some(page => !Array.isArray(page.artifacts) + || page.artifacts.some(artifact => typeof artifact.name !== 'string'))) { + throw new Error('desktop publish: GitHub returned invalid artifact metadata') + } + for (const { name } of pages.flatMap(page => page.artifacts)) { + if (!name.endsWith(`-${inputs.package_run_id}-${attempt}`)) continue + const qualification = name.startsWith('windows-x64-unsigned-') ? 'unsigned' + : name.startsWith('macos-arm64-unnotarized-debug-') ? 'unnotarized' : '' + const diagnostic = desktopPublishQualificationError(qualification) + if (diagnostic) throw new Error(diagnostic) + } + return attempt +} + +if (process.argv[1] !== undefined && resolve(process.argv[1]) === import.meta.filename) { + const env = process.env + if (!env.GITHUB_EVENT_PATH || !env.GITHUB_REPOSITORY || !env.GITHUB_OUTPUT) throw new Error('desktop publish: Actions context required') + const event = JSON.parse(await readFile(env.GITHUB_EVENT_PATH, 'utf8')) + const attempt = preflightDesktopPublish(env.GITHUB_REPOSITORY, event.inputs, (path, paginate) => + JSON.parse(execFileSync('gh', ['api', ...(paginate ? ['--paginate', '--slurp'] : []), path], + { encoding: 'utf8', timeout: 60_000, maxBuffer: 8 * 1024 * 1024 }))) + await appendFile(env.GITHUB_OUTPUT, `attempt=${attempt}\n`) +} diff --git a/apps/desktop/scripts/publish-desktop-ci.ts b/apps/desktop/scripts/publish-desktop-ci.ts index 29057f8c01..4b9c3e77d1 100644 --- a/apps/desktop/scripts/publish-desktop-ci.ts +++ b/apps/desktop/scripts/publish-desktop-ci.ts @@ -14,6 +14,7 @@ import { publishDesktopRelease } from './desktop-publish.ts' import { desktopPublicationFailure } from './desktop-publication-failure.ts' import { desktopPublicationSummary } from './desktop-publication-summary.ts' import { publishDesktopTag } from './desktop-publish-tag.ts' +import { desktopPublishQualificationError } from './desktop-publish-qualification.mjs' const routeSchema = z.object({ runId: z.string(), attempt: z.string(), commit: z.string(), runnerName: z.string(), sourceRef: z.string(), channel: z.enum(['nightly', 'latest']), @@ -36,7 +37,9 @@ export async function prepareDesktopPublication(env: NodeJS.ProcessEnv, verifySi || source.preset !== route.preset) { throw new Error('desktop publish: local package differs from the routed request') } - if (source.qualification !== (source.target === 'win-x64' ? 'signed' : 'notarized')) throw new Error('desktop publish: debugging artifacts cannot be published') + const diagnostic = desktopPublishQualificationError(source.qualification) + if (diagnostic) throw new Error(diagnostic) + if (source.qualification !== (source.target === 'win-x64' ? 'signed' : 'notarized')) throw new Error('desktop publish: package qualification does not match its platform') const config = await readDesktopPublishConfig(env.DSH_PACKAGING_CONFIG_DIR!, source.preset) const directory = retainedDesktopPath(root, route.runId, route.attempt) const environment = source.preset === 'test' diff --git a/apps/desktop/scripts/resolve-desktop-publish-ci.ts b/apps/desktop/scripts/resolve-desktop-publish-ci.ts index 0657b70be6..ce39bc32bc 100644 --- a/apps/desktop/scripts/resolve-desktop-publish-ci.ts +++ b/apps/desktop/scripts/resolve-desktop-publish-ci.ts @@ -62,6 +62,7 @@ if (process.argv[1] !== undefined && resolve(process.argv[1]) === import.meta.fi const env = process.env if (!env.GITHUB_EVENT_PATH || !env.GITHUB_REPOSITORY || !env.GITHUB_OUTPUT) throw new Error('desktop publish: Actions context required') const event = z.object({ inputs: inputsSchema }).parse(JSON.parse(await readFile(env.GITHUB_EVENT_PATH, 'utf8'))) - const selected = selectDesktopPackage(env.GITHUB_REPOSITORY, event.inputs, JSON.parse(env.DESKTOP_PUBLISH_RUNNERS || '{}'), desktopPublishApi) + const inputs = { ...event.inputs, package_run_attempt: env.DESKTOP_PACKAGE_ATTEMPT || event.inputs.package_run_attempt } + const selected = selectDesktopPackage(env.GITHUB_REPOSITORY, inputs, JSON.parse(env.DESKTOP_PUBLISH_RUNNERS || '{}'), desktopPublishApi) await appendFile(env.GITHUB_OUTPUT, `selection=${JSON.stringify(selected)}\nrunner=${selected.runnerLabel}\n`) } diff --git a/apps/desktop/scripts/retain-desktop-ci.ts b/apps/desktop/scripts/retain-desktop-ci.ts index 280d043e08..69bade9712 100644 --- a/apps/desktop/scripts/retain-desktop-ci.ts +++ b/apps/desktop/scripts/retain-desktop-ci.ts @@ -6,6 +6,7 @@ import { desktopBuildRecordFilename, desktopUpdateMetadataFilename, resolveDeskt import { loadDesktopPackageEnvironment } from './desktop-package-environment.mjs' import { retainDesktopRelease, type DesktopRetainedSource } from './desktop-release-store.ts' import { validateDesktopBuildVersion } from './desktop-build-version.mjs' +import { desktopPublishQualificationError } from './desktop-publish-qualification.mjs' function required(env: NodeJS.ProcessEnv, name: string): string { const value = env[name] @@ -66,8 +67,10 @@ export async function retainDesktopCi(env: NodeJS.ProcessEnv, appRoot = resolve( } const retained = await retainDesktopRelease(desktopReleasesRoot(env), source, names.map(name => join(artifacts, name))) if (env.GITHUB_OUTPUT) await appendFile(env.GITHUB_OUTPUT, `directory=${retained}\n`) + const nextStep = desktopPublishQualificationError(qualification) + ?? `Publish separately with package_run_id=${env.GITHUB_RUN_ID} and package_run_attempt=${env.GITHUB_RUN_ATTEMPT}` if (env.GITHUB_STEP_SUMMARY) await appendFile(env.GITHUB_STEP_SUMMARY, - `\nRetained package: ${env.GITHUB_RUN_ID}/${env.GITHUB_RUN_ATTEMPT}\n\nPublish separately with package_run_id=${env.GITHUB_RUN_ID} and package_run_attempt=${env.GITHUB_RUN_ATTEMPT}\n`) + `\nRetained package: ${env.GITHUB_RUN_ID}/${env.GITHUB_RUN_ATTEMPT}\n\n${nextStep}\n`) return retained } diff --git a/apps/desktop/scripts/run-windows-runner-task.ps1 b/apps/desktop/scripts/run-windows-runner-task.ps1 index cd094d5d1c..1fe68ad15b 100644 --- a/apps/desktop/scripts/run-windows-runner-task.ps1 +++ b/apps/desktop/scripts/run-windows-runner-task.ps1 @@ -1,5 +1,8 @@ # Repeating Task Scheduler triggers recover an exited launcher without relying on action exit-code retries. $ErrorActionPreference = 'Stop' +$runnerRoot = [IO.Path]::GetFullPath((Split-Path -Parent $PSScriptRoot)).TrimEnd('\','/') +$digest = [Convert]::ToHexString([Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($runnerRoot.ToUpperInvariant()))) +$taskName = 'DSH-Packaging-' + $digest.Substring(0,16) $log = Join-Path $PSScriptRoot ('run-' + [DateTime]::UtcNow.ToString('yyyyMMddTHHmmssfffZ') + '-' + $PID + '.log') try { @{ Pid = $PID; Started = (Get-Process -Id $PID).StartTime.ToUniversalTime().Ticks } | ConvertTo-Json | Set-Content -LiteralPath (Join-Path $PSScriptRoot 'process.json') @@ -16,9 +19,11 @@ try { & (Join-Path $PSHOME 'pwsh.exe') -NoProfile -NonInteractive -File (Join-Path $PSScriptRoot 'start.ps1') -RunnerRoot $config.RunnerRoot -ConfigRoot $config.ConfigRoot *> $log $code = $LASTEXITCODE Add-Content -LiteralPath $log -Value "Runner launcher exited with code $code." - # run.cmd maps several listener failures to zero; a persistent task must stay alive until explicitly stopped. + # An unexpected exit is a task failure even when run.cmd hides the listener's nonzero status; the log retains its code. exit 1 } catch { + # A missing or unwritable counter cannot bound retries; the task name must not depend on readable configuration. + $null = Disable-ScheduledTask -TaskName $taskName -TaskPath '\' $message = 'Runner task failed: ' + $_.Exception.Message [Console]::Error.WriteLine($message) Add-Content -LiteralPath $log -Value $message diff --git a/apps/desktop/scripts/windows-runner-task.ps1 b/apps/desktop/scripts/windows-runner-task.ps1 index ff6db25853..65c6d08799 100644 --- a/apps/desktop/scripts/windows-runner-task.ps1 +++ b/apps/desktop/scripts/windows-runner-task.ps1 @@ -9,6 +9,9 @@ param( ) $ErrorActionPreference = 'Stop' if (-not $IsWindows) { throw 'This command requires PowerShell 7 on Windows.' } +if ($Action -ne 'install' -and @('ConfigRoot','RestartMinutes','RestartCount').Where({ $PSBoundParameters.ContainsKey($_) }).Count) { + throw 'ConfigRoot, RestartMinutes and RestartCount apply only to install; reinstall to change them.' +} if ($RunnerRoot -notmatch '^[A-Za-z]:[\\/]') { throw 'RunnerRoot must be an absolute local directory.' } $RunnerRoot = [IO.Path]::GetFullPath($RunnerRoot).TrimEnd('\','/') if (-not (Test-Path -LiteralPath (Join-Path $RunnerRoot '.runner') -PathType Leaf)) { throw 'Register the runner before managing its task.' } @@ -55,7 +58,9 @@ if (-not $task) { throw 'Task is not installed for this runner directory.' } switch ($Action) { 'status' { $info = Get-ScheduledTaskInfo -InputObject $task - [pscustomobject]@{ TaskName = $taskName; State = $task.State; LastRunTime = $info.LastRunTime; LastTaskResult = $info.LastTaskResult; Launches = (Get-Content -LiteralPath (Join-Path $serviceDir 'attempts.txt') -Raw).Trim(); Logs = $serviceDir } + $launches = [int](Get-Content -LiteralPath (Join-Path $serviceDir 'attempts.txt') -Raw) + $config = Get-Content -LiteralPath (Join-Path $serviceDir 'config.json') -Raw | ConvertFrom-Json + [pscustomobject]@{ TaskName = $taskName; State = $task.State; LastRunTime = $info.LastRunTime; LastTaskResult = $info.LastTaskResult; Launches = $launches; RemainingLaunches = [Math]::Max(0, 1 + $config.RestartCount - $launches); Logs = $serviceDir } } 'start' { if ($task.State -eq 'Running') { Write-Output "$taskName is already running."; break } @@ -73,12 +78,16 @@ switch ($Action) { } } $null = Disable-ScheduledTask -InputObject $task + $task = Get-ScheduledTask -TaskName $taskName -TaskPath '\' if ($task.State -eq 'Running') { - $record = Get-Content -LiteralPath (Join-Path $serviceDir 'process.json') -Raw | ConvertFrom-Json + $recordFile = Join-Path $serviceDir 'process.json' + if (-not (Test-Path -LiteralPath $recordFile)) { throw 'Running task process identity is unavailable. Automatic starts are disabled; inspect the task before stopping it.' } + $record = Get-Content -LiteralPath $recordFile -Raw | ConvertFrom-Json $owner = Get-Process -Id $record.Pid -ErrorAction SilentlyContinue if (-not $owner -or $owner.StartTime.ToUniversalTime().Ticks -ne $record.Started) { throw 'Running task process identity is unavailable. Automatic starts are disabled; inspect the task before stopping it.' } + # Parent IDs can be reused; this snapshot supplies wait handles, not termination authority. $processes = @(Get-CimInstance Win32_Process) $ownedIds = [Collections.Generic.HashSet[int]]::new() $null = $ownedIds.Add($owner.Id) diff --git a/apps/desktop/tests/desktop-publish-preflight.spec.ts b/apps/desktop/tests/desktop-publish-preflight.spec.ts new file mode 100644 index 0000000000..2af6f288b1 --- /dev/null +++ b/apps/desktop/tests/desktop-publish-preflight.spec.ts @@ -0,0 +1,36 @@ +import { expect, it } from 'vitest' +import { preflightDesktopPublish } from '../scripts/preflight-desktop-publish.mjs' + +it.each([ + ['macos-arm64-unnotarized-debug-1.0.0-42-2', '跳过了公证'], + ['windows-x64-unsigned-1.0.0-42-2', '未签名'], +])('rejects %s from paginated artifact metadata with rebuilding instructions', (name, reason) => { + const paths: string[] = [] + expect(() => preflightDesktopPublish('owner/repo', { package_run_id: '42' }, (path, paginate) => { + paths.push(path) + if (!paginate) return { run_attempt: 2 } + return [{ artifacts: [] }, { artifacts: [{ name, expired: true }] }] + })).toThrow(reason) + expect(paths).toEqual(['repos/owner/repo/actions/runs/42', 'repos/owner/repo/actions/runs/42/artifacts?per_page=100']) +}) + +it.each([{ artifacts: [] }, { artifacts: [{ name: 'windows-x64-signed-1.0.0-42-2' }] }, { artifacts: [{ name: 'windows-x64-unsigned-1.0.0-42-1' }] }])( + 'leaves missing metadata and other attempts to authoritative local verification: %j', ({ artifacts }) => { + expect(preflightDesktopPublish('owner/repo', { package_run_id: '42', package_run_attempt: '2' }, (path, paginate) => { + expect(paginate).toBe(true) + expect(path).toContain('/42/artifacts?') + return [{ artifacts }] + })).toBe('2') + }, +) + +it('rejects malformed input before contacting GitHub', () => { + expect(() => preflightDesktopPublish('owner/repo', { package_run_id: '../42' }, () => { + throw new Error('API must not be called') + })).toThrow(/valid packaging attempt/u) +}) + +it.each([{ response: {} }, { response: [{ artifacts: [{}] }] }])('rejects invalid artifact responses: %j', ({ response }) => { + expect(() => preflightDesktopPublish('owner/repo', { package_run_id: '42', package_run_attempt: '2' }, () => response)) + .toThrow(/invalid artifact metadata/u) +}) diff --git a/apps/desktop/tests/desktop-publish-route.spec.ts b/apps/desktop/tests/desktop-publish-route.spec.ts index b086fb0cf0..37258e26ed 100644 --- a/apps/desktop/tests/desktop-publish-route.spec.ts +++ b/apps/desktop/tests/desktop-publish-route.spec.ts @@ -18,6 +18,16 @@ it('routes the exact successful attempt to its registered machine', () => { .toMatchObject({ runId: '42', attempt: '2', runnerLabel: 'dsh-mini', preset: 'test' }) }) +it.each(['test', 'production'])('explains how to rebuild debugging packages for %s', (preset) => { + for (const [qualification, remedy] of [['unsigned', 'signing=signed'], ['unnotarized', '取消勾选“跳过公证”']]) { + const f = fixture() + f.source.preset = preset + f.source.qualification = qualification! + expect(() => resolveDesktopPublishRoute('owner/repo', f.run, { source: f.source }, f.jobs, f.routes)).toThrow(remedy) + expect(() => resolveDesktopPublishRoute('owner/repo', f.run, { source: f.source }, f.jobs, f.routes)).toThrow('重跑当前发布任务无效') + } +}) + it.each(['attempt', 'repository', 'commit', 'mode', 'runner', 'workflow'] as const)('rejects mismatched %s evidence', (field) => { const f = fixture() if (field === 'attempt') f.source.attempt = '1' diff --git a/apps/desktop/tests/expected/retained-unnotarized.md b/apps/desktop/tests/expected/retained-unnotarized.md new file mode 100644 index 0000000000..47032b70b0 --- /dev/null +++ b/apps/desktop/tests/expected/retained-unnotarized.md @@ -0,0 +1,4 @@ + +Retained package: 123/2 + +desktop publish: 该包跳过了公证(unnotarized)。请重新运行 macOS 打包,取消勾选“跳过公证”,完成公证和 stapling。当前产物仅限内部调试,不能发布到 test 或 production,也不能用于自动更新。打包成功后使用新的 run ID / attempt 发布;重跑当前发布任务无效。 diff --git a/apps/desktop/tests/expected/retained-unsigned.md b/apps/desktop/tests/expected/retained-unsigned.md new file mode 100644 index 0000000000..bf101e0590 --- /dev/null +++ b/apps/desktop/tests/expected/retained-unsigned.md @@ -0,0 +1,4 @@ + +Retained package: 123/2 + +desktop publish: 该包未签名(unsigned)。请重新运行 Windows 打包并选择 signing=signed。当前产物仅限内部调试,不能发布到 test 或 production,也不能用于自动更新。打包成功后使用新的 run ID / attempt 发布;重跑当前发布任务无效。 diff --git a/apps/desktop/tests/retain-desktop-ci.spec.ts b/apps/desktop/tests/retain-desktop-ci.spec.ts index 419becda3b..abe3565e93 100644 --- a/apps/desktop/tests/retain-desktop-ci.spec.ts +++ b/apps/desktop/tests/retain-desktop-ci.spec.ts @@ -1,36 +1,51 @@ -import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises' +import { mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it } from 'vitest' import { desktopReleasesRoot, retainDesktopCi } from '../scripts/retain-desktop-ci.ts' import { verifyRetainedDesktopRelease } from '../scripts/desktop-release-store.ts' +import { prepareDesktopPublication } from '../scripts/publish-desktop-ci.ts' const roots: string[] = [] afterEach(async () => { await Promise.all(roots.splice(0).map(root => rm(root, { recursive: true, force: true }))) }) -it.each(['mac-arm64', 'win-x64'] as const)('retains the complete %s release without signing or upload credentials', async (target) => { +it.each([ + ['mac-arm64', 'notarized'], ['win-x64', 'signed'], ['mac-arm64', 'unnotarized'], ['win-x64', 'unsigned'], +] as const)('retains the complete %s %s release without signing or upload credentials', async (target, qualification) => { const root = await mkdtemp(join(tmpdir(), 'retain-ci-')) roots.push(root) const appRoot = join(root, 'checkout') const config = join(root, 'packaging') - const artifacts = join(appRoot, '.desktop-build', 'targets', target, 'artifacts') + const debug = qualification === 'unsigned' || qualification === 'unnotarized' + const artifacts = join(appRoot, '.desktop-build', 'targets', target, debug ? `${qualification}-artifacts` : 'artifacts') await mkdir(artifacts, { recursive: true }) await mkdir(join(config, 'presets'), { recursive: true }) await writeFile(join(appRoot, 'package.json'), '{"version":"1.0.0"}') await writeFile(join(config, 'presets/test.env'), `DSH_DESKTOP_AUTO_UPDATE_ENV=test\nDOWNLOAD_TEST_RELEASE_ID=${'a'.repeat(32)}\n`) - const names = target === 'win-x64' + const names = debug ? (target === 'win-x64' ? [`deepseek-harness-1.0.0-win-x64-${qualification}.exe`] + : [`deepseek-harness-1.0.0-mac-arm64-${qualification}.dmg`, `deepseek-harness-1.0.0-mac-arm64-${qualification}.zip`]) : target === 'win-x64' ? ['deepseek-harness-1.0.0-win-x64.exe', 'deepseek-harness-1.0.0-win-x64.exe.blockmap', 'win-x64-release.json', 'nightly.yml'] : ['deepseek-harness-1.0.0-mac-arm64.dmg', 'deepseek-harness-1.0.0-mac-arm64.zip', 'deepseek-harness-1.0.0-mac-arm64.zip.blockmap', 'mac-arm64-release.json', 'nightly-mac.yml'] await Promise.all(names.map(name => writeFile(join(artifacts, name), 'fixture'))) const env = { DSH_PACKAGING_CONFIG_DIR: config, DSH_PACKAGING_PRESET: 'test', DSH_DESKTOP_TARGET_PLATFORM: target === 'win-x64' ? 'win32' : 'darwin', DSH_DESKTOP_TARGET_ARCH: target === 'win-x64' ? 'x64' : 'arm64', PACKAGE_SOURCE_REF: 'master', PACKAGE_SOURCE_SHA: 'b'.repeat(40), PACKAGE_VERSION: '1.0.0', - PACKAGE_SIGNING: 'signed', PACKAGE_SKIP_NOTARIZATION: 'false', GITHUB_RUN_ID: '123', GITHUB_RUN_ATTEMPT: '2', + PACKAGE_SIGNING: qualification === 'unsigned' ? 'unsigned' : 'signed', PACKAGE_SKIP_NOTARIZATION: qualification === 'unnotarized' ? 'true' : 'false', GITHUB_RUN_ID: '123', GITHUB_RUN_ATTEMPT: '2', + GITHUB_STEP_SUMMARY: join(root, 'summary.md'), GITHUB_REPOSITORY: 'owner/repository', GITHUB_SHA: 'b'.repeat(40), RUNNER_NAME: 'dedicated', } await retainDesktopCi(env, appRoot) const manifest = await verifyRetainedDesktopRelease(desktopReleasesRoot(env), '123', '2') expect(manifest.files.map(file => file.name)).toEqual(names) - expect(manifest.source).toMatchObject({ target, qualification: target === 'win-x64' ? 'signed' : 'notarized' }) + expect(manifest.source).toMatchObject({ target, qualification }) expect(manifest.source.publishRequested).toBeUndefined() + const summary = await readFile(env.GITHUB_STEP_SUMMARY, 'utf8') + if (debug) { + expect(summary).toContain('不能发布到 test 或 production') + expect(summary).not.toContain('Publish separately') + await expect(prepareDesktopPublication({ ...env, DESKTOP_PUBLISH_ROUTE: JSON.stringify({ + runId: '123', attempt: '2', commit: env.GITHUB_SHA, runnerName: env.RUNNER_NAME, target, preset: 'test', sourceRef: 'master', channel: 'nightly', + }) })).rejects.toThrow('重跑当前发布任务无效') + await expect(summary).toMatchFileSnapshot(`./expected/retained-${qualification}.md`) + } else expect(summary).toContain('Publish separately with package_run_id=123 and package_run_attempt=2') }) diff --git a/apps/desktop/tests/windows-runner-task.ps1 b/apps/desktop/tests/windows-runner-task.ps1 index 87cf196e8b..1e4a03f2a4 100644 --- a/apps/desktop/tests/windows-runner-task.ps1 +++ b/apps/desktop/tests/windows-runner-task.ps1 @@ -21,7 +21,8 @@ Write-Output 'FAKE RUNNER READY' while ($true) { Start-Sleep -Seconds 1 } '@ | Set-Content -LiteralPath (Join-Path $root 'start-windows-packaging-runner.ps1') function Invoke-Manager([string]$Operation, [switch]$ExpectFailure) { - & (Join-Path $PSHOME 'pwsh.exe') -NoProfile -File $manager -Action $Operation -RunnerRoot $runner -ConfigRoot $root -RestartCount 2 + $installOptions = if ($Operation -eq 'install') { @('-ConfigRoot', $root, '-RestartCount', '2') } else { @() } + & (Join-Path $PSHOME 'pwsh.exe') -NoProfile -File $manager -Action $Operation -RunnerRoot $runner @installOptions if (($LASTEXITCODE -eq 0) -eq [bool]$ExpectFailure) { throw "Unexpected exit $LASTEXITCODE for $Operation" } } function Wait-Condition([scriptblock]$Condition, [string]$Description, [int]$Seconds = 30) { @@ -33,6 +34,9 @@ function Wait-Condition([scriptblock]$Condition, [string]$Description, [int]$Sec throw "Timed out: $Description" } $installed = $false +$primaryFailure = $null +$digest = [Convert]::ToHexString([Security.Cryptography.SHA256]::HashData([Text.Encoding]::UTF8.GetBytes($runner.ToUpperInvariant()))) +$taskName = 'DSH-Packaging-' + $digest.Substring(0,16) try { Invoke-Manager install $installed = $true @@ -53,10 +57,11 @@ try { $originalRecord = Get-Content -LiteralPath $recordFile -Raw $record = $originalRecord | ConvertFrom-Json $record.Started = 0 - $record | ConvertTo-Json | Set-Content -LiteralPath $recordFile - Invoke-Manager stop -ExpectFailure - if ($child.HasExited) { throw 'Stale process record terminated a process.' } - Set-Content -LiteralPath $recordFile -Value $originalRecord + try { + $record | ConvertTo-Json | Set-Content -LiteralPath $recordFile + Invoke-Manager stop -ExpectFailure + if ($child.HasExited) { throw 'Stale process record terminated a process.' } + } finally { Set-Content -LiteralPath $recordFile -Value $originalRecord } Invoke-Manager stop Wait-Condition { $child.Refresh(); $child.HasExited } 'scheduler child termination' Invoke-Manager start @@ -69,25 +74,35 @@ try { Start-ScheduledTask -TaskName $config.TaskName -TaskPath '\' Wait-Condition { (Get-ScheduledTask -TaskName $config.TaskName -TaskPath '\').State -eq 'Disabled' } 'exhausted restart budget disables task' if (@(Get-Content -LiteralPath $starts).Count -ne 3) { throw 'Exhausted budget launched another runner.' } + Set-Content -LiteralPath (Join-Path $runner 'dsh-task/attempts.txt') -Value 'invalid' + $null = Enable-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + Start-ScheduledTask -TaskName $config.TaskName -TaskPath '\' + Wait-Condition { (Get-ScheduledTask -TaskName $config.TaskName -TaskPath '\').State -eq 'Disabled' } 'invalid restart budget disables task' + if (@(Get-Content -LiteralPath $starts).Count -ne 3) { throw 'Invalid budget launched another runner.' } Invoke-Manager uninstall $installed = $false Invoke-Manager status -ExpectFailure if (-not (Test-Path -LiteralPath (Join-Path $runner '.runner'))) { throw 'Registration removed.' } Write-Output "PASS: install, duplicate refusal, automatic retry, start, status, stop, child teardown, retry exhaustion, uninstall. Evidence: $root" -} finally { +} catch { $primaryFailure = $_; throw } finally { + $cleanupErrors = @() if ($installed) { - Invoke-Manager stop - Invoke-Manager uninstall + try { $null = Disable-ScheduledTask -TaskName $taskName -TaskPath '\' } catch { $cleanupErrors += $_ } + try { Stop-ScheduledTask -TaskName $taskName -TaskPath '\' } catch { $cleanupErrors += $_ } + try { Unregister-ScheduledTask -TaskName $taskName -TaskPath '\' -Confirm:$false } catch { $cleanupErrors += $_ } } foreach ($process in @(Get-CimInstance Win32_Process -Filter "Name = 'pwsh.exe'")) { if ($process.CommandLine -and $process.CommandLine.Contains($root)) { $owned = Get-Process -Id $process.ProcessId -ErrorAction SilentlyContinue if ($owned) { - Stop-Process -InputObject $owned - if (-not $owned.WaitForExit(30000)) { throw 'Fixture process did not exit.' } + try { + Stop-Process -InputObject $owned + if (-not $owned.WaitForExit(30000)) { throw 'Fixture process did not exit.' } + } catch { $cleanupErrors += $_ } } } } # Logs stay available for diagnosing scheduler failures; the fixture owns no registered runner credentials. Write-Output "Fixture retained: $root" + if ($cleanupErrors.Count) { Write-Warning ($cleanupErrors -join "`n"); if (-not $primaryFailure) { throw 'Fixture cleanup failed.' } } } diff --git a/apps/desktop/windows-signing/README.i18n.yaml b/apps/desktop/windows-signing/README.i18n.yaml index 2fa1ab5e8c..6d77ed774c 100644 --- a/apps/desktop/windows-signing/README.i18n.yaml +++ b/apps/desktop/windows-signing/README.i18n.yaml @@ -21,8 +21,8 @@ en: bb889e9514678d1c zh: 48cbec1e907d6a2b /windows-signing-and-runner-operations/machine-setup-and-runner-startup/supervised-startup: - en: 45ed84267ca7bdf7 - zh: 6750dc58cce42023 + en: d32f9f8ce9f5b861 + zh: 80d9078a7763f85d /windows-signing-and-runner-operations/signing-configuration: en: 4b5548818375eb9a zh: 8c975adbb1dca9c8 diff --git a/apps/desktop/windows-signing/README.md b/apps/desktop/windows-signing/README.md index bb1675cba2..0109bbbaed 100644 --- a/apps/desktop/windows-signing/README.md +++ b/apps/desktop/windows-signing/README.md @@ -36,9 +36,9 @@ Run `pwsh -NoProfile -File apps/desktop/scripts/setup-windows-packaging.ps1 -Roo ### Supervised startup -Run `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging` as the runner's Windows user, using its installed PowerShell 7. The installer checks the environment and copies startup scripts into `runner/dsh-task`; registration, tools and secrets remain separate. It registers a disabled, limited-permission interactive Task Scheduler task without storing an account password. Run the same command with `-Action start` or `-Action status`; only installation needs `-ConfigRoot`. The task starts after this user's desktop login, including after reboot, and stops on logout. It does not provide unattended boot or unlock a signing Token. +Run `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging` as the runner's Windows user, using its installed PowerShell 7. The installer checks the environment and copies startup scripts into `runner/dsh-task`; registration, tools and secrets remain separate. It registers a disabled, limited-permission interactive Task Scheduler task without storing an account password. For `-Action start` or `-Action status`, pass only `-RunnerRoot`; configuration and retry options apply only to installation. The task starts after this user's desktop login, including after reboot, and stops on logout. It does not provide unattended boot or unlock a signing Token. -The task permits one instance and has no execution time limit. A repeating trigger checks every `-RestartMinutes` minutes (default `1`) and restarts an exited launcher, including an unexpected zero exit. The persisted budget permits the initial launch plus `-RestartCount` restarts (default `10`) between explicit starts; starting an already running task does not reset it. GitHub's launcher owns runner updates; task recovery does not rerun a failed workflow or clear signing interlocks. After retries are exhausted, inspect `runner/dsh-task/run-*.log`, the runner's `_diag` logs and `status`, correct the cause, then run `start`. A running task alone does not prove connectivity: verify `Connected to GitHub` and `Listening for Jobs`, then verify assignment in Actions. Logs are retained for operator-managed cleanup. +The task permits one instance and has no execution time limit. A repeating trigger checks every `-RestartMinutes` minutes (default `1`) and restarts an exited launcher, including an unexpected zero exit. The persisted budget permits the initial launch plus `-RestartCount` restarts (default `10`) between explicit starts. Every desktop login also consumes this budget; `status` shows the remaining launches. After the budget is exhausted, login alone cannot restart the runner. Starting an already running task does not reset the budget. Missing or invalid budget/configuration files disable automatic starts until repaired. GitHub's launcher owns runner updates; task recovery does not rerun a failed workflow or clear signing interlocks. After retries are exhausted, inspect `runner/dsh-task/run-*.log`, the runner's `_diag` logs and `status`, correct the cause, then run `start`. A running task alone does not prove connectivity: verify `Connected to GitHub` and `Listening for Jobs`, then verify assignment in Actions. Logs are retained for operator-managed cleanup. Before maintenance, pause new workflow dispatch and wait for the runner to become idle. `-Action stop` refuses an active worker for this runner, disables future starts and stops its task process tree; the local check cannot prevent a concurrent GitHub assignment. `-Action uninstall` requires a stopped, disabled task and retains registration, configuration and logs. To update installed scripts, stop, uninstall and install again. When migrating a manually launched runner, stop its existing launcher only after it is idle, then start the task; never run both launchers together. diff --git a/apps/desktop/windows-signing/README.zh.md b/apps/desktop/windows-signing/README.zh.md index 1a7bc9ea22..56ba17eef7 100644 --- a/apps/desktop/windows-signing/README.zh.md +++ b/apps/desktop/windows-signing/README.zh.md @@ -36,9 +36,9 @@ description: "配置和维护 Windows 打包 runner、签名凭据、EV Token ### 受监督启动 -以 runner 的 Windows 用户运行 `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging`,使用该机器安装的 PowerShell 7。安装器检查环境,并将启动脚本复制到 `runner/dsh-task`;注册、工具和凭据仍单独管理。它注册一个初始禁用、权限受限的交互式计划任务,不保存账户密码。将同一命令的操作改为 `-Action start` 或 `-Action status`;只有安装需要 `-ConfigRoot`。任务在该用户登录桌面后启动,重启后也需要登录,注销时停止。它不提供无人值守开机,也不解锁签名 Token。 +以 runner 的 Windows 用户运行 `pwsh -NoProfile -File apps/desktop/scripts/windows-runner-task.ps1 -Action install -RunnerRoot -ConfigRoot /packaging`,使用该机器安装的 PowerShell 7。安装器检查环境,并将启动脚本复制到 `runner/dsh-task`;注册、工具和凭据仍单独管理。它注册一个初始禁用、权限受限的交互式计划任务,不保存账户密码。执行 `-Action start` 或 `-Action status` 时只传 `-RunnerRoot`;配置目录及重试选项仅适用于安装。任务在该用户登录桌面后启动,重启后也需要登录,注销时停止。它不提供无人值守开机,也不解锁签名 Token。 -任务只允许一个实例,且没有执行时限。周期触发器每隔 `-RestartMinutes` 分钟(默认 `1`)检查一次,并恢复已退出的启动器,包括意外的零退出码。持久预算允许首次启动及 `-RestartCount` 次重启(默认 `10`),直到再次显式启动;对正在运行的任务执行 start 不会重置预算。GitHub 启动器负责 runner 更新;任务恢复不会重跑失败的 workflow,也不会清除签名互锁。重试耗尽后,检查 `runner/dsh-task/run-*.log`、runner 的 `_diag` 日志和 `status`,修复原因后运行 `start`。任务运行不等于连接成功:确认出现 `Connected to GitHub` 和 `Listening for Jobs`,再到 Actions 确认任务分配。日志保留,由操作者管理清理。 +任务只允许一个实例,且没有执行时限。周期触发器每隔 `-RestartMinutes` 分钟(默认 `1`)检查一次,并恢复已退出的启动器,包括意外的零退出码。持久预算允许首次启动及 `-RestartCount` 次重启(默认 `10`),直到再次显式启动。每次桌面登录也会消耗预算,`status` 显示剩余启动次数;预算耗尽后,仅登录不能重启 runner。对正在运行的任务执行 start 不会重置预算。预算或配置文件缺失、无效时,自动启动会禁用,需修复后恢复。GitHub 启动器负责 runner 更新;任务恢复不会重跑失败的 workflow,也不会清除签名互锁。重试耗尽后,检查 `runner/dsh-task/run-*.log`、runner 的 `_diag` 日志和 `status`,修复原因后运行 `start`。任务运行不等于连接成功:确认出现 `Connected to GitHub` 和 `Listening for Jobs`,再到 Actions 确认任务分配。日志保留,由操作者管理清理。 维护前暂停新 workflow 的触发,等待 runner 空闲。`-Action stop` 在该 runner 存在活跃 worker 时拒绝停止,否则禁用后续启动并停止任务进程树;本地检查无法阻止 GitHub 同时分配任务。`-Action uninstall` 要求任务已停止并禁用,保留注册、配置和日志。更新已安装脚本时,依次停止、卸载、重新安装。迁移手动启动的 runner 时,只在空闲后停止原启动器,再启动计划任务;不要同时运行两个启动器。 diff --git a/scripts/desktop-publish-workflow.spec.ts b/scripts/desktop-publish-workflow.spec.ts index 917bd87efa..fc44ac267a 100644 --- a/scripts/desktop-publish-workflow.spec.ts +++ b/scripts/desktop-publish-workflow.spec.ts @@ -18,6 +18,15 @@ const workflow = yaml.load(readFileSync(resolve(import.meta.dirname, '../.github }> } +it('rejects debugging packages before dependency setup and pins the checked attempt for routing', () => { + const steps = workflow.jobs.route!.steps + const preflight = steps.findIndex(step => step.id === 'preflight') + expect(preflight).toBeGreaterThan(0) + expect(preflight).toBeLessThan(steps.findIndex(step => step.uses?.startsWith('pnpm/'))) + expect(steps[preflight]?.run).toBe('node apps/desktop/scripts/preflight-desktop-publish.mjs') + expect(steps.find(step => step.id === 'route')?.env?.DESKTOP_PACKAGE_ATTEMPT).toBe('${{ steps.preflight.outputs.attempt }}') +}) + it('selects packages manually and gates production secrets with the production Environment', () => { expect(Object.keys(workflow.on)).toEqual(['workflow_dispatch']) expect(workflow.on.workflow_dispatch).toMatchObject({ inputs: { From af66022ace79d723be1a0999ede982d176a2e39a Mon Sep 17 00:00:00 2001 From: winewill <324803222+winewill@users.noreply.github.com> Date: Thu, 15 Oct 2026 17:52:13 +0800 Subject: [PATCH 4/9] fix(desktop): default Windows packaging to signed --- .github/workflows/windows-package.yml | 4 ++-- apps/desktop/packaging/README.i18n.yaml | 4 ++-- apps/desktop/packaging/README.md | 2 +- apps/desktop/packaging/README.zh.md | 2 +- scripts/windows-package-workflow.spec.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows-package.yml b/.github/workflows/windows-package.yml index 60729c98f3..bc76eca87b 100644 --- a/.github/workflows/windows-package.yml +++ b/.github/workflows/windows-package.yml @@ -12,8 +12,8 @@ on: signing: description: '签名方式:unsigned 仅限内部调试,禁止发布到 test / production 或用于自动更新;需要发布请选择 signed(EV 硬件令牌)' type: choice - options: [unsigned, signed] - default: unsigned + options: [signed, unsigned] + default: signed required: true test_release_id: description: '测试 release ID:32 位小写十六进制随机前缀(非鉴权);留空使用机器默认值,连续升级测试须保持相同值' diff --git a/apps/desktop/packaging/README.i18n.yaml b/apps/desktop/packaging/README.i18n.yaml index 9307a642fe..a2cdac0936 100644 --- a/apps/desktop/packaging/README.i18n.yaml +++ b/apps/desktop/packaging/README.i18n.yaml @@ -24,8 +24,8 @@ en: f5dc36baf414ecc5 zh: 8984741b356ac1d3 /desktop-packaging/windows-actions-packaging: - en: 6f8f6df680a43ea0 - zh: 276a1d60dcd5f573 + en: e1b101593f6f755e + zh: 121f225de399de1e /desktop-packaging/macos-self-hosted-packaging: en: a3af9523fdc60036 zh: 5e18d4740e9b7f57 diff --git a/apps/desktop/packaging/README.md b/apps/desktop/packaging/README.md index 680bd6d356..b29bc9dcc2 100644 --- a/apps/desktop/packaging/README.md +++ b/apps/desktop/packaging/README.md @@ -105,7 +105,7 @@ Each target owns its packed package inputs, prepared runtime, package set, dsh t For supervised runner startup and recovery, follow [Windows runner machine setup](../windows-signing/README.md#machine-setup). -The `Package Desktop · Windows` [manual workflow](../../../.github/workflows/windows-package.yml) selects the dedicated Windows x64 runner label `dsh-win-package-trial` and the machine preset `test` or `production`. Choose `unsigned` (default) or `signed`; signed mode uses the existing EV token preflight, signature cache and failure interlock. It does not publish or upload a release. `build_version` defaults to `auto`, using the CI identifier in [Release versions](#release-versions); an explicit value may be the checkout's product version or an extended build version such as `0.2.1-alpha.1.20261009.1` for product `0.2.1-alpha.1`. The version prefix must match the selected checkout; validation errors show its current example. Manifests remain unchanged. +The `Package Desktop · Windows` [manual workflow](../../../.github/workflows/windows-package.yml) selects the dedicated Windows x64 runner label `dsh-win-package-trial` and the machine preset `test` or `production`. Choose `signed` (default) or `unsigned`; signed mode uses the existing EV token preflight, signature cache and failure interlock. It does not publish or upload a release. `build_version` defaults to `auto`, using the CI identifier in [Release versions](#release-versions); an explicit value may be the checkout's product version or an extended build version such as `0.2.1-alpha.1.20261009.1` for product `0.2.1-alpha.1`. The version prefix must match the selected checkout; validation errors show its current example. Manifests remain unchanged. Select the workflow in Actions, choose the source branch, preset, signing mode and version, then click Run workflow. Before merging input changes, test the pushed branch with `gh workflow run windows-package.yml --ref -f preset=test -f signing=unsigned -f build_version=auto`; verify the web form after merging. There is no push or PR trigger. Logs and successful EXEs are retained for 14 days. Inspect the retained logs and installer before relying on packaging; installation is separate. Before checkout, Node removes the runner-owned source directory without following dependency junctions; the workflow validates its location and rejects linked ancestors. Never point it at a development checkout. Runs share one concurrency group without cancelling an active build; only one run remains pending, and a newer dispatch replaces it. Diagnostics upload requires a successful clean checkout. Machine settings stay outside the checkout and are never uploaded as artifacts. diff --git a/apps/desktop/packaging/README.zh.md b/apps/desktop/packaging/README.zh.md index 89300fd195..e97f072a2f 100644 --- a/apps/desktop/packaging/README.zh.md +++ b/apps/desktop/packaging/README.zh.md @@ -105,7 +105,7 @@ macOS 正式发布和本地未签名 DMG 都通过 [electron-builder 配置](../ runner 的受监督启动和恢复见 [Windows runner 机器准备](../windows-signing/README.zh.md#machine-setup)。 -`Package Desktop · Windows` [手动工作流](../../../.github/workflows/windows-package.yml) 选择专用 Windows x64 runner 标签 `dsh-win-package-trial`,并使用机器 preset `test` 或 `production`。选择 `unsigned`(默认)或 `signed`;签名模式复用现有 EV token 预检、签名缓存与失败 interlock,不发布或上传 release。`build_version` 默认为 `auto`,使用[发布版本](#release-versions)中的 CI 标识;显式值可以是源码产品版本,或扩展构建版本,例如产品 `0.2.1-alpha.1` 对应 `0.2.1-alpha.1.20261009.1`。版本前缀必须匹配所选源码;校验错误显示其当前示例。manifest 保持不变。 +`Package Desktop · Windows` [手动工作流](../../../.github/workflows/windows-package.yml) 选择专用 Windows x64 runner 标签 `dsh-win-package-trial`,并使用机器 preset `test` 或 `production`。选择 `signed`(默认)或 `unsigned`;签名模式复用现有 EV token 预检、签名缓存与失败 interlock,不发布或上传 release。`build_version` 默认为 `auto`,使用[发布版本](#release-versions)中的 CI 标识;显式值可以是源码产品版本,或扩展构建版本,例如产品 `0.2.1-alpha.1` 对应 `0.2.1-alpha.1.20261009.1`。版本前缀必须匹配所选源码;校验错误显示其当前示例。manifest 保持不变。 在 Actions 选择工作流、源码分支、preset、签名模式和版本,再点击 Run workflow。输入变更合并前,用 `gh workflow run windows-package.yml --ref -f preset=test -f signing=unsigned -f build_version=auto` 测试已推送分支;合并后验证网页表单。它不监听 push 或 PR。日志和成功生成的 EXE 保留 14 天。依赖打包流程前检查日志和安装包;安装是独立操作。检出前,Node 删除 runner 专用源码目录,不跟随依赖 junction;工作流校验目标位置并拒绝链接祖先目录。不得指向日常开发目录。运行共享一个并发组,不取消正在进行的构建;最多保留一个待运行任务,新触发会替换它。仅在成功完成干净检出后上传诊断。机器配置位于 checkout 之外,不作为产物上传。 diff --git a/scripts/windows-package-workflow.spec.ts b/scripts/windows-package-workflow.spec.ts index 538487a98b..9be7cd8f6c 100644 --- a/scripts/windows-package-workflow.spec.ts +++ b/scripts/windows-package-workflow.spec.ts @@ -66,7 +66,7 @@ it('routes manual packaging to the dedicated runner with explicit preset and sig expect(Object.keys(workflow.on.workflow_dispatch!.inputs).sort()).toEqual([ 'build_version', 'preset', 'signing', 'source_ref', 'test_release_id', 'update_channel', 'version_mode', ]) - expect(workflow.on.workflow_dispatch!.inputs.signing!.default).toBe('unsigned') + expect(workflow.on.workflow_dispatch!.inputs.signing!.default).toBe('signed') expect(workflow.on.workflow_dispatch!.inputs.build_version!.required).toBe(false) expect(workflow.on.workflow_dispatch!.inputs.version_mode!.default).toBe('default') expect(workflow.on.workflow_dispatch!.inputs.source_ref!.default).toBe('master') From b8f8abc5d65cf6be916a5348b8a3e2c82cf3e412 Mon Sep 17 00:00:00 2001 From: winewill <324803222+winewill@users.noreply.github.com> Date: Thu, 15 Oct 2026 18:18:18 +0800 Subject: [PATCH 5/9] fix(desktop): publish to administratively unversioned COS buckets --- apps/desktop/publishing/ci/README.i18n.yaml | 8 ++--- apps/desktop/publishing/ci/README.md | 4 +-- apps/desktop/publishing/ci/README.zh.md | 4 +-- .../scripts/desktop-publication-failure.ts | 29 ++++++++++++++++++- apps/desktop/scripts/desktop-publish-cos.ts | 13 ++++----- .../tests/desktop-publication-failure.spec.ts | 12 +++++++- .../desktop/tests/desktop-publish-cos.spec.ts | 29 ++++++++++++++++++- .../tests/expected/cos-GetObject-denied.json | 8 +++++ .../tests/expected/cos-PutObject-denied.json | 8 +++++ scripts/macos-package-workflow.spec.ts | 2 +- 10 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 apps/desktop/tests/expected/cos-GetObject-denied.json create mode 100644 apps/desktop/tests/expected/cos-PutObject-denied.json diff --git a/apps/desktop/publishing/ci/README.i18n.yaml b/apps/desktop/publishing/ci/README.i18n.yaml index 21834b860e..a16c1bc513 100644 --- a/apps/desktop/publishing/ci/README.i18n.yaml +++ b/apps/desktop/publishing/ci/README.i18n.yaml @@ -15,14 +15,14 @@ en: 1b6a4d7146879eec zh: f2520fc412cd2d2a /desktop-ci-publication/machine-setup: - en: 990ff7e56dd6005a - zh: 18f9dc23c520dc8c + en: f80388c2b1ffef4c + zh: f242ab2316bf38a1 /desktop-ci-publication/package-and-publish: en: 0a26537845e89dda zh: 307378bb65e24650 /desktop-ci-publication/recovery-and-records: - en: e92bfad06162443e - zh: 6c3e3d8ece673217 + en: 2e1e6b16d0d6bd41 + zh: 6ff4ad5a8f1f57b4 /desktop-ci-publication/restore-a-channel: en: d82e2ccf70cce397 zh: d93dcb77cc4b463e diff --git a/apps/desktop/publishing/ci/README.md b/apps/desktop/publishing/ci/README.md index 579c24c9b2..0028260f96 100644 --- a/apps/desktop/publishing/ci/README.md +++ b/apps/desktop/publishing/ci/README.md @@ -23,7 +23,7 @@ Publish a completed package from its original machine without downloading its in Keep `DSH_PACKAGING_CONFIG_DIR` pointed at the existing machine packaging directory. Completed attempts are copied to its sibling `releases///`; `DSH_DESKTOP_RELEASES_DIR` overrides that root with an absolute path. The inventory includes installers, update archives, blockmaps, completion metadata and a credential-free manifest. Debug packages are retained but cannot publish. Copies are checked before the attempt directory becomes visible, and an existing attempt cannot be replaced. GitHub retains the same file inventory for 14 days. Local files remain until an operator removes them; do not delete an attempt while it is being verified or published. -Create `publishing/test.json` and, when authorized, `publishing/production.json` below the configuration directory. Each declares `bucket`, HTTPS `origin` without a path, and an absolute `credentialsFile`. The credential file contains only `secretId` and `secretKey`. macOS also requires `macOS.signingIdentity` and `macOS.teamId`; Windows requires `windows.certificateThumbprint`. Production requires the exact origin `https://download.deepseek.com` and `githubApp.clientId` plus an absolute `githubApp.privateKeyFile`. These files stay outside Git. The uploader supports permanent COS credentials, not STS session credentials. Bucket versioning must be disabled for immutable binary writes. +Create `publishing/test.json` and, when authorized, `publishing/production.json` below the configuration directory. Each declares `bucket`, HTTPS `origin` without a path, and an absolute `credentialsFile`. The credential file contains only `secretId` and `secretKey`. macOS also requires `macOS.signingIdentity` and `macOS.teamId`; Windows requires `windows.certificateThumbprint`. Production requires the exact origin `https://download.deepseek.com` and `githubApp.clientId` plus an absolute `githubApp.privateKeyFile`. These files stay outside Git. The uploader supports permanent COS credentials, not STS session credentials. Administrators must keep test and production buckets unversioned (neither enabled nor suspended). Publication assumes this deployment prerequisite and does not call `GetBucketVersioning` or require its permission. Immutable binary PUTs retain `x-cos-forbid-overwrite`; their protection depends on administrators maintaining the bucket configuration. Set the repository variable `DESKTOP_PUBLISH_RUNNERS` to a JSON mapping of registered runner names to unique labels and targets, for example `{"mini":{"label":"dsh-mini-publish","target":"mac-arm64"}}`. Assign that label to exactly that runner. Windows uses target `win-x64`. The routing job checks the original successful job, and the publisher checks its own runner name against the recorded name. Machines need no shared filesystem or LAN connection to each other. @@ -49,7 +49,7 @@ Before uploading, the publisher hashes all retained files, checks version and de After resolving a failure, re-run the failed publishing job to keep its prepared package attempt, or start a new publication with the explicit original package run and attempt. Re-running all jobs with a blank attempt resolves the latest package attempt again and requires a new approval. Do not rebuild solely to retry an upload. Missing objects are uploaded, identical objects are skipped, and conflicting same-name bytes stop the operation. Unknown write outcomes are reconciled by reading remote bytes. A newer channel version prevents a stale upload from replacing it. Each package updates only its embedded channel: nightly writes `nightly.yml` / `nightly-mac.yml`, latest writes `latest.yml` / `latest-mac.yml`. Latest binaries use a `latest/` subdirectory under the target binary prefix, separate from existing nightly objects. Publishing the same source/version to both channels requires two packages; an existing release tag is reused only for the same source commit. -The sibling `upload-records/` directory retains an operation identity, newline-delimited events and terminal result. Feed-write intents retain both previous and requested YAML. Failures record their stage, safe error classification and diagnostic; raw provider responses are excluded. Audit initialization becomes visible only after its files are complete; abandoned `.initializing-*` directories are not scanned for completed publication. Writes and readback are recorded before proceeding; missing terminal results mean interruption, not success. Actions also keeps its operation record as a diagnostic artifact for 30 days. These local records are not tamper-proof. COS readback verifies storage bytes, not public CDN behavior; public download acceptance is separate. +The sibling `upload-records/` directory retains an operation identity, newline-delimited events and terminal result. Feed-write intents retain both previous and requested YAML. Failures record their stage, safe error classification and diagnostic; COS failures also identify `GetObject` or `PutObject`, plus a validated HTTP status and request ID when available. Access-denied reports name the permission to inspect. Raw provider responses and credentials are excluded. Audit initialization becomes visible only after its files are complete; abandoned `.initializing-*` directories are not scanned for completed publication. Writes and readback are recorded before proceeding; missing terminal results mean interruption, not success. Actions also keeps its operation record as a diagnostic artifact for 30 days. These local records are not tamper-proof. COS readback verifies storage bytes, not public CDN behavior; public download acceptance is separate. If the feed completed but tagging failed, the result is `published-tag-pending` and the job fails visibly. On retry, durable feed-completion evidence permits only tag recovery, even if a later release has advanced the channel. It never re-publishes old YAML. An existing conflicting tag requires administrator investigation and is never moved automatically. diff --git a/apps/desktop/publishing/ci/README.zh.md b/apps/desktop/publishing/ci/README.zh.md index 7cdbe98b2d..c6165845b5 100644 --- a/apps/desktop/publishing/ci/README.zh.md +++ b/apps/desktop/publishing/ci/README.zh.md @@ -23,7 +23,7 @@ description: "在专用 macOS 和 Windows runner 上发布留存的 Desktop 安 保持 `DSH_PACKAGING_CONFIG_DIR` 指向现有机器打包目录。完成的构建复制到其同级 `releases///`;`DSH_DESKTOP_RELEASES_DIR` 可用绝对路径覆盖该根目录。文件清单包含安装包、更新归档、blockmap、完成记录和不含凭据的 manifest。调试包会留存,但不能发布。复制内容通过校验后才开放 attempt 目录,已有 attempt 不能被替换。GitHub 保留相同文件清单 14 天。本地文件保留到操作员删除;校验或发布期间不要删除对应 attempt。 -在配置目录下创建 `publishing/test.json`,获得授权后再创建 `publishing/production.json`。每份配置声明 `bucket`、不带路径的 HTTPS `origin` 和绝对路径 `credentialsFile`。凭据文件只包含 `secretId` 和 `secretKey`。macOS 还需 `macOS.signingIdentity` 和 `macOS.teamId`;Windows 需要 `windows.certificateThumbprint`。production 必须使用 origin `https://download.deepseek.com`,并提供 `githubApp.clientId` 和绝对路径 `githubApp.privateKeyFile`。这些文件不进入 Git。上传器支持长期 COS 凭据,不支持 STS 会话凭据。不可覆盖的二进制写入要求 bucket 版本控制关闭。 +在配置目录下创建 `publishing/test.json`,获得授权后再创建 `publishing/production.json`。每份配置声明 `bucket`、不带路径的 HTTPS `origin` 和绝对路径 `credentialsFile`。凭据文件只包含 `secretId` 和 `secretKey`。macOS 还需 `macOS.signingIdentity` 和 `macOS.teamId`;Windows 需要 `windows.certificateThumbprint`。production 必须使用 origin `https://download.deepseek.com`,并提供 `githubApp.clientId` 和绝对路径 `githubApp.privateKeyFile`。这些文件不进入 Git。上传器支持长期 COS 凭据,不支持 STS 会话凭据。管理员必须维持 test 和 production bucket 未启用版本控制(不能是已启用或已暂停状态)。发布流程以此为部署前提,不调用 `GetBucketVersioning`,也不要求该权限。二进制 PUT 仍携带 `x-cos-forbid-overwrite`;防覆盖保证依赖管理员维持桶配置。 将仓库变量 `DESKTOP_PUBLISH_RUNNERS` 配置为已注册 runner 名称到唯一标签和目标的 JSON 映射,例如 `{"mini":{"label":"dsh-mini-publish","target":"mac-arm64"}}`。该标签只能分配给这台 runner。Windows 使用目标 `win-x64`。路由 job 检查原构建成功的 job,发布器再检查自身 runner 名称与记录一致。机器之间不需要共享文件系统或局域网连接。 @@ -49,7 +49,7 @@ Environment 审批限制此工作流,不限制同一机器账户运行的任 解决故障后重跑失败的发布 job,以保持准备阶段选定的打包尝试;也可显式填写原打包运行和尝试,发起新的发布。尝试留空时重跑所有 job 会重新解析最新打包尝试,并需要重新审批。不要仅为重试上传而重新打包。缺失对象会上传,相同对象跳过,同名但字节不同的对象会停止操作。写入结果不明时通过读取远端字节核对。频道已有更高版本时,旧上传不能替换它。每个包只更新自身内置通道:nightly 写入 `nightly.yml` / `nightly-mac.yml`,latest 写入 `latest.yml` / `latest-mac.yml`。latest 二进制位于目标二进制前缀下的 `latest/` 子目录,与已有 nightly 对象分离。同一源码和版本发布到两个通道需要分别打包;已有发布 tag 仅在源码提交相同时复用。 -同级 `upload-records/` 目录保留操作标识、逐行事件和最终结果。频道写入意图同时记录先前和目标 YAML。失败记录阶段、安全错误分类与诊断,不保存原始服务响应。审计初始化在文件完整后才可见;遗留的 `.initializing-*` 目录不参与已完成发布的扫描。写入和回读在继续操作前落盘;没有最终结果代表中断,不代表成功。Actions 还将操作记录保存为诊断 artifact,保留 30 天。这些本地记录不防篡改。COS 回读验证存储字节,不代表公开 CDN 行为;公开下载需单独验收。 +同级 `upload-records/` 目录保留操作标识、逐行事件和最终结果。频道写入意图同时记录先前和目标 YAML。失败记录阶段、安全错误分类与诊断;COS 失败还标明 `GetObject` 或 `PutObject`,并在可用时记录经过校验的 HTTP 状态码和 request ID。访问拒绝提示会指出需检查的权限。不保存原始服务响应或凭据。审计初始化在文件完整后才可见;遗留的 `.initializing-*` 目录不参与已完成发布的扫描。写入和回读在继续操作前落盘;没有最终结果代表中断,不代表成功。Actions 还将操作记录保存为诊断 artifact,保留 30 天。这些本地记录不防篡改。COS 回读验证存储字节,不代表公开 CDN 行为;公开下载需单独验收。 频道更新完成但 tag 失败时,结果为 `published-tag-pending`,job 明确失败。重试时,已落盘的频道完成证据只允许恢复 tag,即使后来发布已推进频道,也不会重新发布旧 YAML。已有冲突 tag 需要管理员调查,不会自动移动。 diff --git a/apps/desktop/scripts/desktop-publication-failure.ts b/apps/desktop/scripts/desktop-publication-failure.ts index 8f3e6beb55..930c23da2d 100644 --- a/apps/desktop/scripts/desktop-publication-failure.ts +++ b/apps/desktop/scripts/desktop-publication-failure.ts @@ -5,13 +5,40 @@ import { DesktopPublishError } from './desktop-publish.ts' const publicCodes = new Set(['AccessDenied', 'InternalError', 'NoSuchBucket', 'BadDigest', 'SignatureDoesNotMatch', 'RequestTimeout', 'TimeoutError', 'AbortError', 'ECONNRESET', 'ETIMEDOUT', 'ENOTFOUND', 'ENOSPC', 'EACCES', 'EPERM', 'ENOENT']) +/** COS operation failure retaining its cause for safe diagnostics; a failed write may have an unknown remote outcome. */ +export class DesktopCosOperationError extends Error { + constructor(readonly operation: 'GetObject' | 'PutObject', cause: unknown) { + const failure = desktopPublicationFailure(cause, operation) + const message = failure.code === 'AccessDenied' + ? `AccessDenied. Check name/cos:${operation} permission and explicit deny rules for the selected bucket/object. Publication stopped; reconcile remote state before retrying.` + : failure.message + super(`COS ${operation}: ${message}`, { cause }) + this.name = 'DesktopCosOperationError' + } +} + /** * Keep actionable local validation details without recording SDK response bodies or credentials. * @param error Failure from validation, filesystem, subprocess or remote transport. * @param phase Operation stage known by the entrypoint. * @returns Credential-free diagnostic suitable for stderr and an audit event. */ -export function desktopPublicationFailure(error: unknown, phase: string): { phase: string; code: string; message: string } { +export function desktopPublicationFailure(error: unknown, phase: string): { + phase: string + code: string + message: string + operation?: 'GetObject' | 'PutObject' + requestId?: string + httpStatus?: number +} { + if (error instanceof DesktopCosOperationError) { + const cause = typeof error.cause === 'object' && error.cause !== null ? error.cause : {} + const requestId = 'RequestId' in cause ? cause.RequestId : undefined + const status = 'statusCode' in cause ? cause.statusCode : undefined + return { ...desktopPublicationFailure(error.cause, phase), operation: error.operation, message: error.message, + ...(typeof requestId === 'string' && /^[\w+/=.-]{1,256}$/u.test(requestId) ? { requestId } : {}), + ...(typeof status === 'number' && Number.isInteger(status) && status >= 100 && status <= 599 ? { httpStatus: status } : {}) } + } if (error instanceof DesktopPublishError) return { phase, code: error.code, message: error.message } if (error instanceof ZodError) return { phase, code: 'invalid-data', message: `Invalid fields: ${error.issues.map(issue => `${issue.path.join('.') || '(root)'} (${issue.code})`).join(', ')}` } diff --git a/apps/desktop/scripts/desktop-publish-cos.ts b/apps/desktop/scripts/desktop-publish-cos.ts index 5b89a8ef40..00a6f108d1 100644 --- a/apps/desktop/scripts/desktop-publish-cos.ts +++ b/apps/desktop/scripts/desktop-publish-cos.ts @@ -7,6 +7,7 @@ import { createDesktopCos, DESKTOP_COS_REGION, type DesktopCosCredentials } from import { cosOperation } from './cos-operation.ts' import type { DesktopUploadPlan } from './desktop-upload-plan.ts' import { desktopArtifactDigest, type DesktopPublishTransport } from './desktop-publish.ts' +import { DesktopCosOperationError } from './desktop-publication-failure.ts' function missing(error: unknown): boolean { return typeof error === 'object' && error !== null && 'code' in error && error.code === 'NoSuchKey' @@ -14,6 +15,7 @@ function missing(error: unknown): boolean { /** * Create a bounded COS transport restricted to the validated plan's object keys. + * Administrators must keep bucket versioning absent; publication does not query bucket configuration. * @param plan Destination and exact object inventory; arbitrary keys are rejected. * @param credentials Credentials for this deployment only. * @param createClient Client factory; absent uses the shared production client, tests supply a loopback client. @@ -51,7 +53,7 @@ export function desktopPublishCos( return { size, sha512: sha512.digest('base64'), ...(channel ? { contents: Buffer.concat(chunks).toString('utf8') } : {}) } } catch (error) { if (missing(error)) return null - throw error + throw new DesktopCosOperationError('GetObject', error) } finally { output.destroy() } }, async put(artifact, digest, forbidOverwrite) { @@ -62,13 +64,6 @@ export function desktopPublishCos( const actual = await desktopArtifactDigest(artifact) if (actual.size !== digest.size || actual.sha512 !== digest.sha512) throw new Error('desktop publish: local input changed') const cos = client() - // COS overwrite prevention requires versioning to be absent, not enabled or suspended. - if (forbidOverwrite) { - const state = await cosOperation(cos, 30_000, () => cos.getBucketVersioning({ Bucket: plan.bucket, Region: DESKTOP_COS_REGION })) - if (state.statusCode !== 200 || state.VersioningConfiguration.Status !== undefined) { - throw new Error('desktop publish: immutable objects require bucket versioning to be disabled') - } - } const md5 = createHash('md5') const bytes = artifact.contents === undefined ? createReadStream(artifact.path) : [Buffer.from(artifact.contents)] for await (const chunk of bytes) md5.update(chunk) @@ -78,6 +73,8 @@ export function desktopPublishCos( ...address, Body: body, ContentLength: digest.size, ContentType: artifact.contentType, Headers: { 'Content-MD5': md5.digest('base64'), ...(forbidOverwrite ? { 'x-cos-forbid-overwrite': 'true' } : {}) }, })) + } catch (error) { + throw new DesktopCosOperationError('PutObject', error) } finally { body.destroy() } }, } diff --git a/apps/desktop/tests/desktop-publication-failure.spec.ts b/apps/desktop/tests/desktop-publication-failure.spec.ts index f19e1f76b5..6f9e8d05e6 100644 --- a/apps/desktop/tests/desktop-publication-failure.spec.ts +++ b/apps/desktop/tests/desktop-publication-failure.spec.ts @@ -2,7 +2,7 @@ import { spawnSync } from 'node:child_process' import { fileURLToPath } from 'node:url' import { expect, it } from 'vitest' import { z } from 'zod' -import { desktopPublicationFailure } from '../scripts/desktop-publication-failure.ts' +import { DesktopCosOperationError, desktopPublicationFailure } from '../scripts/desktop-publication-failure.ts' import { DesktopPublishError } from '../scripts/desktop-publish.ts' it('preserves actionable validation and filesystem diagnostics', () => { @@ -34,3 +34,13 @@ it('prints rollback usage through the real CLI before any audit or remote operat expect(diagnostic.code).toBe('validation') expect(diagnostic.message).toContain('Usage: rollback-desktop-channel.ts') }) + +it('omits malformed provider receipt fields and never copies raw errors into COS diagnostics', () => { + const error = new DesktopCosOperationError('PutObject', { code: 'AccessDenied', statusCode: 'fixture-secret', + RequestId: 'Authorization: fixture-secret', body: 'fixture-secret', message: 'fixture-secret' }) + const failure = desktopPublicationFailure(error, 'publication') + expect(failure).toMatchObject({ code: 'AccessDenied', operation: 'PutObject' }) + expect(failure).not.toHaveProperty('requestId') + expect(failure).not.toHaveProperty('httpStatus') + expect(JSON.stringify(failure)).not.toContain('fixture-secret') +}) diff --git a/apps/desktop/tests/desktop-publish-cos.spec.ts b/apps/desktop/tests/desktop-publish-cos.spec.ts index 848e37f71c..4c66bd6fb3 100644 --- a/apps/desktop/tests/desktop-publish-cos.spec.ts +++ b/apps/desktop/tests/desktop-publish-cos.spec.ts @@ -4,11 +4,12 @@ import { desktopPublishCos } from '../scripts/desktop-publish-cos.ts' import { desktopArtifactDigest } from '../scripts/desktop-publish.ts' import type { DesktopUploadPlan } from '../scripts/desktop-upload-plan.ts' import { answer, cosError, startCosLoopback } from './cos-loopback.ts' +import { desktopPublicationFailure } from '../scripts/desktop-publication-failure.ts' it('uses overwrite prevention, streams verified bytes, and hashes remote readback through the SDK', async () => { const objects = new Map() const server = await startCosLoopback((request, response) => { - if (request.path.includes('versioning')) { answer(response, 200, ''); return } + if (request.path.includes('versioning')) { answer(response, 403, cosError('AccessDenied')); return } if (request.method === 'PUT') { expect(request.headers['x-cos-forbid-overwrite']).toBe('true') objects.set(request.path, request.body) @@ -36,6 +37,8 @@ it('uses overwrite prevention, streams verified bytes, and hashes remote readbac expect(await transport.read(artifact.key, false)).toEqual(digest) await expect(transport.read('elsewhere/file.exe', false)).rejects.toThrow(/outside/u) expect(server.requests.filter(request => request.method === 'PUT')).toHaveLength(1) + expect(server.requests.map(request => request.method)).toEqual(['GET', 'PUT', 'GET']) + expect(server.requests.every(request => !request.path.includes('versioning'))).toBe(true) } finally { await server.close() } }) @@ -54,3 +57,27 @@ it('propagates an oversized channel stream error through the SDK and closes the expect(server.requests).toHaveLength(1) } finally { await server.close() } }) + +it.each(['GetObject', 'PutObject'] as const)('reports %s denial with a safe COS receipt', async (operation) => { + const server = await startCosLoopback((_request, response) => { + answer(response, 403, cosError('AccessDenied'), { 'content-type': 'application/xml', 'x-cos-request-id': 'fixture-request' }) + }) + try { + const artifact = { path: '', filename: 'file.exe', key: 'bin/file.exe', contents: 'fixture bytes', contentType: 'application/octet-stream', channelMetadata: false } + const plan: DesktopUploadPlan = { environment: 'test', target: 'win-x64', version: '1.0.0', bucket: 'fixture-1250000000', + publicUrl: 'https://example.com/', secretIdEnvName: 'ID', secretKeyEnvName: 'KEY', artifacts: [artifact] } + const transport = desktopPublishCos(plan, { secretId: 'fixture-id', secretKey: 'fixture-secret' }, (credentials) => { + const client = createDesktopCos(credentials) + server.redirect(client) + return client + }) + const digest = await desktopArtifactDigest(artifact) + const pending = operation === 'GetObject' ? transport.read(artifact.key, false) : transport.put(artifact, digest, true) + const failure = await pending.then(() => { throw new Error('Expected COS denial') }, (error: unknown) => desktopPublicationFailure(error, 'publication')) + expect(failure).toMatchObject({ operation, code: 'AccessDenied', httpStatus: 403, requestId: 'fixture-request' }) + expect(JSON.stringify(failure)).not.toContain('fixture-secret') + await expect(JSON.stringify(failure, null, 2) + '\n').toMatchFileSnapshot(`./expected/cos-${operation}-denied.json`) + expect(server.requests).toHaveLength(1) + expect(server.requests[0]!.method).toBe(operation === 'GetObject' ? 'GET' : 'PUT') + } finally { await server.close() } +}) diff --git a/apps/desktop/tests/expected/cos-GetObject-denied.json b/apps/desktop/tests/expected/cos-GetObject-denied.json new file mode 100644 index 0000000000..e41a3e30cd --- /dev/null +++ b/apps/desktop/tests/expected/cos-GetObject-denied.json @@ -0,0 +1,8 @@ +{ + "phase": "publication", + "code": "AccessDenied", + "message": "COS GetObject: AccessDenied. Check name/cos:GetObject permission and explicit deny rules for the selected bucket/object. Publication stopped; reconcile remote state before retrying.", + "operation": "GetObject", + "requestId": "fixture-request", + "httpStatus": 403 +} diff --git a/apps/desktop/tests/expected/cos-PutObject-denied.json b/apps/desktop/tests/expected/cos-PutObject-denied.json new file mode 100644 index 0000000000..e455316e1f --- /dev/null +++ b/apps/desktop/tests/expected/cos-PutObject-denied.json @@ -0,0 +1,8 @@ +{ + "phase": "publication", + "code": "AccessDenied", + "message": "COS PutObject: AccessDenied. Check name/cos:PutObject permission and explicit deny rules for the selected bucket/object. Publication stopped; reconcile remote state before retrying.", + "operation": "PutObject", + "requestId": "fixture-request", + "httpStatus": 403 +} diff --git a/scripts/macos-package-workflow.spec.ts b/scripts/macos-package-workflow.spec.ts index ad6a28ed76..fb85352d0e 100644 --- a/scripts/macos-package-workflow.spec.ts +++ b/scripts/macos-package-workflow.spec.ts @@ -34,7 +34,7 @@ it('confines signed Mac packaging to manual dispatch and a dedicated Apple Silic it('defaults to notarization and labels the explicit debugging option', () => { expect(workflow.on.workflow_dispatch).toMatchObject({ inputs: { skip_notarization: { type: 'boolean', default: false, - description: '跳过公证和 stapling:仅限内部调试,不可用于发布或自动更新', + description: '跳过公证和 stapling:仅限内部调试,禁止发布到 test / production 或用于自动更新;需要发布请勿勾选', } } }) const steps = workflow.jobs.package!.steps expect(steps.filter(step => step.run?.includes('args+=(--skip-notarization)'))).toHaveLength(2) From ba392ae0e7d21785292efe19b77777b41aa488e9 Mon Sep 17 00:00:00 2001 From: gengruilin Date: Thu, 15 Oct 2026 20:17:59 +0800 Subject: [PATCH 6/9] docs(ui-skill): record the catalog gaps a plugin change leaves State why every plugin manager operation drops every cached catalog, and list two remaining gaps among the known limitations: on-disk SKILL.md changes forward no event to an open session, and draft skill highlighting waits for the next catalog fetch after an invalidation. --- packages/client/ui-skill/README.i18n.yaml | 4 ++-- packages/client/ui-skill/README.md | 3 ++- packages/client/ui-skill/README.zh.md | 3 ++- packages/client/ui-skill/src/client/index.ts | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/client/ui-skill/README.i18n.yaml b/packages/client/ui-skill/README.i18n.yaml index 88c72545c3..59386d4b39 100644 --- a/packages/client/ui-skill/README.i18n.yaml +++ b/packages/client/ui-skill/README.i18n.yaml @@ -51,8 +51,8 @@ en: da53c649077dad7e zh: 845f77793f8e10a2 /deepseek-ai-dsh-client-ui-skill/known-limitations-and-deferred-work: - en: cf53f93101c7ef11 - zh: e27ec720dad7b75d + en: 3c5dd1c12e5a5d61 + zh: 19e27163cb94dbc1 /deepseek-ai-dsh-client-ui-skill/known-limitations-and-deferred-work/dev-note: en: e67f633dc6fe7773 zh: 3bb0c20c93f16f98 diff --git a/packages/client/ui-skill/README.md b/packages/client/ui-skill/README.md index 94ef9a1465..fcc361b188 100644 --- a/packages/client/ui-skill/README.md +++ b/packages/client/ui-skill/README.md @@ -104,7 +104,8 @@ These limits define where the reference and the row fall back to generic behavio - **Result-only history pages use the generic row** — keyed dispatch needs the paired call in the runtime window; pagination that leaves the call outside has no tool identity. This client presentation feature does not extend the history wire contract to recover it. - **Text is the truth** — the reference is plain draft text; a hand-typed identical token is the same reference, and the host gesture boundary judges the sent text, not the menu interaction. Chip visuals derive from the lexicon scan; no occurrence identity, position tracking, or structured reference payload exists on the prompt wire. - **A menu opened before the prewarm settles** shows no skill candidates for that keystroke; the next keystroke re-polls the settled cache. -- **Profile changes outside the plugin manager keep cached catalogs** — an HMR reload after a CLI or hand edit announces no `plugin-manager/changed` event, so an open session lists its previous skills until a preset switch or connection reset. +- **Catalog changes without a forwarded event keep cached catalogs** — an HMR reload after a CLI or hand edit announces no `plugin-manager/changed` event, and adding or removing a `SKILL.md` on disk forwards no event at all, so an open session lists its previous skills until a preset switch, plugin manager operation, or connection reset. +- **Draft skill highlighting waits for the next catalog fetch** — a preset switch, plugin manager operation, or connection reset empties the session's lexicon, so with the menu closed an existing `/name` in the draft loses its skill highlight until the `/` menu fetches the catalog again; an open menu fetches it immediately. ### Dev Note diff --git a/packages/client/ui-skill/README.zh.md b/packages/client/ui-skill/README.zh.md index 208f8756fb..6594d3807d 100644 --- a/packages/client/ui-skill/README.zh.md +++ b/packages/client/ui-skill/README.zh.md @@ -104,7 +104,8 @@ source 不实现任何裁决钩子,也没有引用 codec:pick 落下字面 - **仅含工具结果的 history 页使用通用行**:键控分派要求配对的工具调用位于运行时窗口内;分页将工具调用留在窗口外时,工具结果没有工具身份。这项客户端呈现功能不会为了恢复该身份而扩展 history 协议约定。 - **文本是唯一依据**:引用是普通的草稿文本;手动键入的相同 token 就是同一个引用,宿主手势边界评判的是发出的文本,而不是菜单交互。chip 视觉由 lexicon 扫描派生;提示词协议上没有 occurrence 身份、位置跟踪或结构化引用载荷。 - **预热落定之前打开的菜单**:在那次击键下不显示 skill 候选;下一次击键会重新轮询已落定的缓存。 -- **插件管理器之外的 profile 变更保留已缓存的目录**:CLI 或手动编辑后由 HMR 应用的重载不发出 `plugin-manager/changed` 事件,已打开的会话会继续列出之前的 skill,直到切换预设或重置连接。 +- **没有转发事件的目录变更保留已缓存的目录**:CLI 或手动编辑后由 HMR 应用的重载不发出 `plugin-manager/changed` 事件,在磁盘上增删 `SKILL.md` 也不会转发任何事件,已打开的会话会继续列出之前的 skill,直到切换预设、执行插件管理操作或重置连接。 +- **草稿中的 skill 高亮等待下一次目录拉取**:切换预设、插件管理操作或重置连接会清空该会话的 lexicon;菜单关闭时,草稿里已有的 `/name` 会失去 skill 高亮,直到 `/` 菜单重新拉取目录;菜单打开时会立即重新拉取。 ### 开发备注 diff --git a/packages/client/ui-skill/src/client/index.ts b/packages/client/ui-skill/src/client/index.ts index 2de10d2ccb..c00dc119fd 100644 --- a/packages/client/ui-skill/src/client/index.ts +++ b/packages/client/ui-skill/src/client/index.ts @@ -249,8 +249,9 @@ export function apply(ctx: ClientContext): void { // A preset decides which skill providers an agent reads, so a switched // session's cached catalog belongs to the composition it no longer runs. ctx.remote.$on('agent-preset/selected', invalidate) - // The Host announces a manager operation after its reload, and the plugins - // it switched may register providers in the global layer every session reads. + // The Host announces every manager operation after its reload without + // naming what changed, and a switched plugin may register providers in the + // global layer every session reads, so each one drops every cached catalog. ctx.remote.$on('plugin-manager/changed', clearAll) ctx.on('connection/reset', clearAll) ctx.effect(() => { From 81803f7ca5b5fe6a9ab5b4158cb5ffa1d80a4d14 Mon Sep 17 00:00:00 2001 From: imccyu <276526105+imccyu@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:07:47 +0800 Subject: [PATCH 7/9] test(web): keep page timers running under the pinned fixture day pinHostClock replaces Date.now in the Vitest worker, where Playwright's server also runs. page.clock.setFixedTime therefore recorded the fixture day, and after a navigation the page clock replayed the gap to the real day. The resulting negative timer delay was truncated to a 32-bit integer and, from 2026-10-15T13:45:20Z, became a delay of weeks that stopped every page timer, failing the steering and seeded-history suites. pinBrowserClock now replaces only the page's Date so it reads the fixture day while native timers and animation frames keep their real schedule; a regression test navigates twice with both clocks pinned. --- apps/web/tests/markdown-images.e2e.ts | 4 +- apps/web/tests/message-actions.e2e.ts | 4 +- apps/web/tests/pinned-clock.e2e.ts | 38 +++++++++++++++++++ apps/web/tests/reference-composer.e2e.ts | 4 +- apps/web/tests/seeded-history.e2e.ts | 4 +- apps/web/tests/steering.e2e.ts | 10 ++--- apps/web/tests/support.ts | 48 ++++++++++++------------ 7 files changed, 70 insertions(+), 42 deletions(-) create mode 100644 apps/web/tests/pinned-clock.e2e.ts diff --git a/apps/web/tests/markdown-images.e2e.ts b/apps/web/tests/markdown-images.e2e.ts index 390675a3d1..db3cad441a 100644 --- a/apps/web/tests/markdown-images.e2e.ts +++ b/apps/web/tests/markdown-images.e2e.ts @@ -166,7 +166,6 @@ describe('web e2e: Markdown image rendering', () => { let browser: Browser let page: Page let tripwire: ReturnType - let unpinBrowserClock: (() => void) | undefined const mediaResponses = new Map() beforeAll(async () => { @@ -191,7 +190,7 @@ describe('web e2e: Markdown image rendering', () => { { createdAt: WEB_FIXTURE_TIME - 60_000 }) browser = await chromium.launch() page = await newEnglishPage(browser) - unpinBrowserClock = await pinBrowserClock(page) + await pinBrowserClock(page) tripwire = watchConsole(page) page.on('response', (response) => { const url = new URL(response.url()) @@ -204,7 +203,6 @@ describe('web e2e: Markdown image rendering', () => { }, 120_000) afterAll(async () => { - unpinBrowserClock?.() await browser?.close() await scaffold?.close() if (imageOrigin !== undefined) await stopServer(imageOrigin.server) diff --git a/apps/web/tests/message-actions.e2e.ts b/apps/web/tests/message-actions.e2e.ts index 2254c9dafe..d70558dab4 100644 --- a/apps/web/tests/message-actions.e2e.ts +++ b/apps/web/tests/message-actions.e2e.ts @@ -191,7 +191,6 @@ describe('web e2e: message IconActions and clocks on settled history', () => { let browser: Browser let page: Page let tripwire: ReturnType - let unpinBrowserClock: (() => void) | undefined beforeAll(async () => { scaffold = await launchWebScaffold() @@ -212,14 +211,13 @@ describe('web e2e: message IconActions and clocks on settled history', () => { await seedSession(scaffold, raw, SEED_ID, undefined, { createdAt: WEB_FIXTURE_TIME - 90_000 }) browser = await chromium.launch() page = await newEnglishPage(browser) - unpinBrowserClock = await pinBrowserClock(page) + await pinBrowserClock(page) tripwire = watchConsole(page) await page.goto(scaffold.authenticatedUrl, { waitUntil: 'load' }) await page.waitForSelector('[class*="frame"]', { timeout: 30_000 }) }, 120_000) afterAll(async () => { - unpinBrowserClock?.() await browser?.close() await scaffold?.close() }) diff --git a/apps/web/tests/pinned-clock.e2e.ts b/apps/web/tests/pinned-clock.e2e.ts new file mode 100644 index 0000000000..6350b3e3c4 --- /dev/null +++ b/apps/web/tests/pinned-clock.e2e.ts @@ -0,0 +1,38 @@ +/** Pinned Host and page calendars keep page timers on their real schedule across navigations. */ +import { chromium, type Browser } from 'playwright' +import { afterAll, beforeAll, expect, it } from 'vitest' +import { newEnglishPage, pinBrowserClock, pinHostClock, WEB_FIXTURE_TIME } from './support.ts' + +let browser: Browser | undefined +let hostClock: ReturnType | undefined + +beforeAll(async () => { + hostClock = pinHostClock() + browser = await chromium.launch() +}) + +afterAll(async () => { + try { + await browser?.close() + } finally { + hostClock?.mockRestore() + } +}) + +it('fires page timers after each navigation while reading the fixture day', async () => { + const page = await newEnglishPage(browser!) + await pinBrowserClock(page) + for (const body of ['

first document

', '

second document

']) { + await page.goto(`data:text/html,${encodeURIComponent(body)}`) + const fired = page.evaluate(() => Promise.all([ + new Promise((resolve) => { setTimeout(resolve, 0) }), + new Promise((resolve) => { requestAnimationFrame(() => { resolve() }) }), + ]).then(() => 'fired' as const)) + // The Node timer runs on the real clock, so it bounds a stalled page. + const stalled = new Promise<'stalled'>((resolve) => { setTimeout(() => { resolve('stalled') }, 5_000) }) + expect(await Promise.race([fired, stalled])).toBe('fired') + const read = await page.evaluate(() => ({ now: Date.now(), constructed: new Date().getTime() })) + expect(Math.abs(read.now - WEB_FIXTURE_TIME)).toBeLessThan(120_000) + expect(Math.abs(read.constructed - WEB_FIXTURE_TIME)).toBeLessThan(120_000) + } +}) diff --git a/apps/web/tests/reference-composer.e2e.ts b/apps/web/tests/reference-composer.e2e.ts index 6381deb606..a1e83e6bd0 100644 --- a/apps/web/tests/reference-composer.e2e.ts +++ b/apps/web/tests/reference-composer.e2e.ts @@ -142,7 +142,6 @@ describe.skipIf(MODE === 'record')('web e2e: file and session references through let browser: Browser let page: Page let tripwire: ReturnType - let unpinBrowserClock: (() => void) | undefined beforeAll(async () => { scaffold = await launchWebScaffold({}) @@ -151,7 +150,7 @@ describe.skipIf(MODE === 'record')('web e2e: file and session references through await seedSession(scaffold, targetSessionFixture(), TARGET_SESSION_ID, undefined, { createdAt: targetCreatedAt }) browser = await chromium.launch() page = await newEnglishPage(browser) - unpinBrowserClock = await pinBrowserClock(page) + await pinBrowserClock(page) tripwire = watchConsole(page) // Fixture files land before the workspace connects so the Host's file // index never races their creation (the connect helper mkdirs the same @@ -171,7 +170,6 @@ describe.skipIf(MODE === 'record')('web e2e: file and session references through }, 120_000) afterAll(async () => { - unpinBrowserClock?.() await browser?.close() await scaffold?.close() }) diff --git a/apps/web/tests/seeded-history.e2e.ts b/apps/web/tests/seeded-history.e2e.ts index 4c6fff7f18..5dbee101e4 100644 --- a/apps/web/tests/seeded-history.e2e.ts +++ b/apps/web/tests/seeded-history.e2e.ts @@ -230,7 +230,6 @@ describe('web e2e: seeded history renders through cold resume', () => { let seededThroughSeq = -1 let openingWindow: unknown let hostClock: ReturnType | undefined - let unpinBrowserClock: (() => void) | undefined beforeAll(async () => { // Seeded and later command timestamps share the renderer's fixture day across midnight. @@ -271,7 +270,7 @@ describe('web e2e: seeded history renders through cold resume', () => { } browser = await chromium.launch() page = await newEnglishPage(browser) - if (MODE !== 'record') unpinBrowserClock = await pinBrowserClock(page) + if (MODE !== 'record') await pinBrowserClock(page) tripwire = watchConsole(page) if (MODE !== 'record') { // A one-message tail makes this short recording exercise the real Load earlier path. @@ -303,7 +302,6 @@ describe('web e2e: seeded history renders through cold resume', () => { await browser?.close() await scaffold?.close() } finally { - unpinBrowserClock?.() hostClock?.mockRestore() } }) diff --git a/apps/web/tests/steering.e2e.ts b/apps/web/tests/steering.e2e.ts index b2790aea83..2f0921321e 100644 --- a/apps/web/tests/steering.e2e.ts +++ b/apps/web/tests/steering.e2e.ts @@ -73,7 +73,6 @@ describe('web e2e: mid-turn steering lands durably and visibly', () => { let page: Page let tripwire: ReturnType let hostClock: MockInstance | undefined - let unpinBrowserClock: (() => void) | undefined const sessionEvents: SessionEvent[] = [] beforeAll(async () => { @@ -87,7 +86,7 @@ describe('web e2e: mid-turn steering lands durably and visibly', () => { scaffold.ctx.on('session/event', (_session, event) => { sessionEvents.push(event) }) browser = await chromium.launch() page = await newEnglishPage(browser) - unpinBrowserClock = await pinBrowserClock(page) + await pinBrowserClock(page) tripwire = watchConsole(page) await page.goto(scaffold.authenticatedUrl, { waitUntil: 'load' }) await page.waitForSelector('[class*="frame"]', { timeout: 30_000 }) @@ -101,8 +100,7 @@ describe('web e2e: mid-turn steering lands durably and visibly', () => { await scaffold?.close() } finally { // A failing close (unconsumed fixture, mismatched snapshot) must not - // leave the pinned clocks running for the suites after this one. - unpinBrowserClock?.() + // leave the pinned Host clock running for the suites after this one. hostClock?.mockRestore() } }) @@ -396,7 +394,6 @@ describe('web e2e: empty-draft Cmd+Enter steers the whole queue', () => { let page: Page let tripwire: ReturnType let hostClock: MockInstance | undefined - let unpinBrowserClock: (() => void) | undefined const sessionEvents: SessionEvent[] = [] beforeAll(async () => { @@ -416,7 +413,7 @@ describe('web e2e: empty-draft Cmd+Enter steers the whole queue', () => { scaffold.ctx.on('session/event', (_session, event) => { sessionEvents.push(event) }) browser = await chromium.launch() page = await newEnglishPage(browser) - unpinBrowserClock = await pinBrowserClock(page) + await pinBrowserClock(page) tripwire = watchConsole(page) await page.goto(scaffold.authenticatedUrl, { waitUntil: 'load' }) await page.waitForSelector('[class*="frame"]', { timeout: 30_000 }) @@ -431,7 +428,6 @@ describe('web e2e: empty-draft Cmd+Enter steers the whole queue', () => { await browser?.close() await scaffold?.close() } finally { - unpinBrowserClock?.() hostClock?.mockRestore() } }) diff --git a/apps/web/tests/support.ts b/apps/web/tests/support.ts index d60a81dba5..33cfdeb374 100644 --- a/apps/web/tests/support.ts +++ b/apps/web/tests/support.ts @@ -50,9 +50,6 @@ export const WEB_FIXTURE_TIME = Date.parse('2026-01-15T12:00:00+08:00') */ export const PLUGIN_TOGGLE_SETTLE_MS = 10_000 -/** How often a pinned browser clock advances, in milliseconds. */ -const PINNED_CLOCK_STEP_MS = 250 - /** * Pin the Host clock to the shared fixture day for one scenario suite. * @@ -74,31 +71,36 @@ export function pinHostClock(): MockInstance { } /** - * Pin a scenario page's clock to the shared fixture day, advancing with real + * Pin a scenario page's calendar to the shared fixture day, advancing with real * time. Pair it with {@link pinHostClock} for a scenario that stamps its own * message times, and with `seedSession`'s `createdAt` for a seeded one. * - * The frozen instant is re-applied from the anchor on an interval rather than - * left at one value, because product logic reads two `Date.now()` values to - * decide a minimum display hold or a deadline window; a permanently frozen - * clock stops supplying elapsed time, so a title that owes its golden settled - * text keeps rendering its previous one. Both clocks therefore advance at the - * real rate and stay within one step of each other. - * @param page - page whose clock is pinned. - * @returns the disposer that stops re-pinning; call it in teardown. + * Only the page's `Date` reads the fixture day; native timers and + * `requestAnimationFrame` keep their real scheduling. Playwright's + * `page.clock` is not used: its server records clock state with the Vitest + * worker's `Date.now`, which {@link pinHostClock} replaces, so after a + * navigation the page clock replays the gap between the real and fixture days + * and hands the resulting negative delay to native `setTimeout`. The browser + * truncates that delay to a 32-bit integer, and in about half of the dates the + * result is a positive delay of weeks that stops every page timer. The `Date` + * override is installed for every later document and on the current one, and + * stays until the page closes. + * @param page - page whose calendar is pinned. */ -export async function pinBrowserClock(page: Page): Promise<() => void> { - const startedAt = Date.now() - const step = async (): Promise => { - try { - await page.clock.setFixedTime(WEB_FIXTURE_TIME + (Date.now() - startedAt)) - } catch { - // The page closed under the interval; teardown owns the last word. - } +export async function pinBrowserClock(page: Page): Promise { + // The worker's `new Date()` keeps the real clock even when `Date.now` is pinned. + const offset = WEB_FIXTURE_TIME - new Date().getTime() + const install = (offset: number): void => { + const NativeDate = Date + const now = (): number => NativeDate.now() + offset + globalThis.Date = new Proxy(NativeDate, { + construct: (target, args, newTarget): Date => Reflect.construct(target, args.length === 0 ? [now()] : args, newTarget) as Date, + apply: () => new NativeDate(now()).toString(), + get: (target, property, receiver): unknown => property === 'now' ? now : Reflect.get(target, property, receiver), + }) } - await step() - const timer = setInterval(() => { void step() }, PINNED_CLOCK_STEP_MS) - return () => { clearInterval(timer) } + await page.addInitScript(install, offset) + await page.evaluate(install, offset) } /** From 4cea5c36d2928360665b92e97cfd9467b971e620 Mon Sep 17 00:00:00 2001 From: imccyu <276526105+imccyu@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:23:10 +0800 Subject: [PATCH 8/9] test(web): sweep the Host clock distance in the pinned-clock regression The page clock failure depended on the real-to-fixture distance modulo 2^32 ms, so a regression run on today's date alone passes against the old fixture for half of every period. The test now shifts the Host clock across eight phases of that period; the page.clock fixture fails every phase, either with stopped page timers or with a Date that does not advance. --- apps/web/tests/pinned-clock.e2e.ts | 84 +++++++++++++++++++----------- 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/apps/web/tests/pinned-clock.e2e.ts b/apps/web/tests/pinned-clock.e2e.ts index 6350b3e3c4..5488f20e02 100644 --- a/apps/web/tests/pinned-clock.e2e.ts +++ b/apps/web/tests/pinned-clock.e2e.ts @@ -1,38 +1,60 @@ -/** Pinned Host and page calendars keep page timers on their real schedule across navigations. */ +/** Fixture-day clock pins keep page scheduling native at every real-to-fixture distance. */ import { chromium, type Browser } from 'playwright' -import { afterAll, beforeAll, expect, it } from 'vitest' -import { newEnglishPage, pinBrowserClock, pinHostClock, WEB_FIXTURE_TIME } from './support.ts' +import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' +import { newEnglishPage, pinBrowserClock, WEB_FIXTURE_TIME } from './support.ts' -let browser: Browser | undefined -let hostClock: ReturnType | undefined +// Host clock shifts spread over one 2^32 ms period of the real-to-fixture +// distance; Playwright's page clock stopped page timers in half of that period. +const DISTANCE_PERIOD_MS = 2 ** 32 +const HOST_SHIFTS_MS = Array.from({ length: 8 }, (_, index) => index * DISTANCE_PERIOD_MS / 8) -beforeAll(async () => { - hostClock = pinHostClock() - browser = await chromium.launch() -}) +describe('web e2e: pinned fixture clocks', () => { + let browser: Browser -afterAll(async () => { - try { + beforeAll(async () => { + browser = await chromium.launch() + }, 120_000) + + afterAll(async () => { await browser?.close() - } finally { - hostClock?.mockRestore() - } -}) + }) -it('fires page timers after each navigation while reading the fixture day', async () => { - const page = await newEnglishPage(browser!) - await pinBrowserClock(page) - for (const body of ['

first document

', '

second document

']) { - await page.goto(`data:text/html,${encodeURIComponent(body)}`) - const fired = page.evaluate(() => Promise.all([ - new Promise((resolve) => { setTimeout(resolve, 0) }), - new Promise((resolve) => { requestAnimationFrame(() => { resolve() }) }), - ]).then(() => 'fired' as const)) - // The Node timer runs on the real clock, so it bounds a stalled page. - const stalled = new Promise<'stalled'>((resolve) => { setTimeout(() => { resolve('stalled') }, 5_000) }) - expect(await Promise.race([fired, stalled])).toBe('fired') - const read = await page.evaluate(() => ({ now: Date.now(), constructed: new Date().getTime() })) - expect(Math.abs(read.now - WEB_FIXTURE_TIME)).toBeLessThan(120_000) - expect(Math.abs(read.constructed - WEB_FIXTURE_TIME)).toBeLessThan(120_000) - } + it.each(HOST_SHIFTS_MS)('runs page timers and reads the fixture day with the Host clock %d ms behind it', async (shift) => { + const hostStartedAt = performance.now() + const hostClock = vi.spyOn(Date, 'now').mockImplementation(() => + WEB_FIXTURE_TIME - shift + Math.floor(performance.now() - hostStartedAt)) + const page = await newEnglishPage(browser) + try { + await pinBrowserClock(page) + for (const navigation of ['initial', 'replacement']) { + await page.goto(`data:text/html,${navigation}`) + const pageStartedAt = await page.evaluate(() => { + requestAnimationFrame(() => { document.body.dataset.frame = 'done' }) + setTimeout(() => { document.body.dataset.timer = 'done' }, 20) + return Date.now() + }) + await expect.poll(() => page.evaluate(() => ({ + frame: document.body.dataset.frame, + timer: document.body.dataset.timer, + })), { timeout: 5_000 }).toEqual({ frame: 'done', timer: 'done' }) + const dates = await page.evaluate(() => ({ + now: Date.now(), + day: new Date().toISOString().slice(0, 10), + explicit: new Date(0).getTime(), + parsed: Date.parse('2000-01-01T00:00:00Z'), + })) + expect(pageStartedAt).toBeGreaterThanOrEqual(WEB_FIXTURE_TIME) + expect(dates.now).toBeGreaterThan(pageStartedAt) + expect(dates.day).toBe(new Date(WEB_FIXTURE_TIME).toISOString().slice(0, 10)) + expect(dates.explicit).toBe(0) + expect(dates.parsed).toBe(946_684_800_000) + } + } finally { + try { + await page.close() + } finally { + hostClock.mockRestore() + } + } + }, 60_000) }) From f2bd43f4e844d6cff95044a3df3c2ba08c075c71 Mon Sep 17 00:00:00 2001 From: Dudu-0223 Date: Fri, 16 Oct 2026 12:58:26 +0800 Subject: [PATCH 9/9] Migrate headless delegation replay fixtures to names --- .../subagent-diagnostic/parent.expected.jsonl | 2 +- .../subagent-inheritance/child.expected.jsonl | 4 +-- .../parent.expected.jsonl | 11 +++---- .../subagent-inheritance/replay.override.json | 2 +- .../subagent-settlement/child.expected.jsonl | 4 +-- .../subagent-settlement/parent.override.json | 4 +-- .../stream-json.expected.jsonl | 29 ++++++++++--------- .../tests/subagent-diagnostic.expected.e2e.ts | 2 +- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-diagnostic/parent.expected.jsonl b/apps/cli/tests/profiles/headless/tests/expected/subagent-diagnostic/parent.expected.jsonl index a421fc3826..ecf80738ee 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-diagnostic/parent.expected.jsonl +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-diagnostic/parent.expected.jsonl @@ -22,7 +22,7 @@ {"type":"session/title","data":{"title":"Start a background job.","messageSeqs":[3],"source":{"kind":"fallback"}}} {"type":"assistant/message","data":{"turn":2,"step":1,"message":{"role":"assistant","content":[{"type":"tool-call","id":"list-once","name":"list_agents","arguments":"{}"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"tool-call"}},{"type":"tool-call-chunks","time0":0,"index":0,"dt":[],"id":"list-once","name":"list_agents","args":["{}"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"tool-call","id":"list-once","name":"list_agents","arguments":"{}"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"tool-calls"}}}]},"surfaceOp":"append"} {"type":"tool/call","data":{"turn":2,"step":1,"callId":"list-once","name":"list_agents","arguments":"{}"}} -{"type":"tool/result","data":{"turn":2,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"list-once"},"toolCallId":"list-once","content":[{"type":"text","text":"{{sessionId}} [inactive] parent={{sessionId}} depth=1 — descriptorless child"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[22],"surfaceOp":"append"} +{"type":"tool/result","data":{"turn":2,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"list-once"},"toolCallId":"list-once","content":[{"type":"text","text":"legacy:{{sessionId}} [inactive] parent=lead depth=1 — descriptorless child"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[22],"surfaceOp":"append"} {"type":"step/end","data":{"turn":2,"step":1}} {"type":"step/start","data":{"turn":2,"step":2}} {"type":"assistant/message","data":{"turn":2,"step":2,"message":{"role":"assistant","content":[{"type":"text","text":"The catalogued subagent is ready. PARENT_DONE"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["The catalogued subagent is ready. PARENT_DONE"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"The catalogued subagent is ready. PARENT_DONE"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"} diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/child.expected.jsonl b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/child.expected.jsonl index b0372d96c6..7bb44452de 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/child.expected.jsonl +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/child.expected.jsonl @@ -2,12 +2,12 @@ {"type":"subagent/descriptor","data":{"version":3,"mode":"continuable","provider":"spawn","label":"Delegated write probe","agentProvider":"deepseek-official","agentModel":"deepseek-v4-flash","agentReasoningEffort":"low"}} {"type":"sandbox/mode","data":{"mode":"read-only","source":"delegation"}} {"type":"approval/policy","data":{"policy":"never","source":"delegation"}} -{"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE."},{"type":"text","text":"Your parent agent id is \"{{sessionId}}\". Before you finish, send your result to that agent with send_message({ agent_id: \"{{sessionId}}\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"}]}} +{"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE."},{"type":"text","text":"Your name is \"write-probe\". Your parent agent name is \"lead\". Before you finish, send your result to that agent with send_message({ name: \"lead\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"}]}} {"type":"turn/start","data":{"turn":1}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"removedCount":1,"inserted":[]}} {"type":"step/start","data":{"turn":1,"step":1}} {"type":"system/message","data":{"turn":1,"step":1,"message":{"role":"system","content":[{"type":"text","text":"{{system}}"}],"source":{"kind":"system-prompt"},"id":"{{sessionId}}"}},"surfaceOp":"append"} -{"type":"user/message","data":{"content":[{"type":"text","text":"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE."},{"type":"text","text":"Your parent agent id is \"{{sessionId}}\". Before you finish, send your result to that agent with send_message({ agent_id: \"{{sessionId}}\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} +{"type":"user/message","data":{"content":[{"type":"text","text":"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE."},{"type":"text","text":"Your name is \"write-probe\". Your parent agent name is \"lead\". Before you finish, send your result to that agent with send_message({ name: \"lead\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} {"type":"user/message","data":{"content":[{"type":"text","text":"Current runtime context. This snapshot supersedes earlier runtime-context snapshots.\n\nCurrent working directory: \"{{cwd}}\".\n\nCurrent DSH file policy: read-only. Any available operation enforced by the DSH file sandbox cannot modify files in the standing mode. Do not refuse a required modification from this policy alone: try an available tool normally and follow any denial and escalation guidance it returns.\n\nApproval prompts are disabled in this session: actions that require approval are rejected automatically — do not request sandbox escalation (do not set `sandbox_permissions`).\n\nDelegation depth for `subagent`: current 1, maximum 1, remaining levels 0. Do not call `subagent` at this depth; carry out the work directly.\n\nDelegation depth for `subagent_fork`: current 1, maximum 1, remaining levels 0. Do not call `subagent_fork` at this depth; carry out the work directly.\n\nYou are a delegated subagent: your permission scope was fixed when you were started and cannot be widened from inside this session — operations that require approval are rejected automatically. When the task needs access beyond that scope, do not retry the denied operation; state the limitation in your reply so the delegating agent can handle it."}],"source":{"kind":"runtime-context","form":"snapshot","sections":[{"name":"working-directory:current","text":"Current working directory: \"{{cwd}}\"."},{"name":"sandbox:policy","text":"Current DSH file policy: read-only. Any available operation enforced by the DSH file sandbox cannot modify files in the standing mode. Do not refuse a required modification from this policy alone: try an available tool normally and follow any denial and escalation guidance it returns."},{"name":"approval:policy","text":"Approval prompts are disabled in this session: actions that require approval are rejected automatically — do not request sandbox escalation (do not set `sandbox_permissions`)."},{"name":"tool:subagent:depth","text":"Delegation depth for `subagent`: current 1, maximum 1, remaining levels 0. Do not call `subagent` at this depth; carry out the work directly."},{"name":"tool:subagent_fork:depth","text":"Delegation depth for `subagent_fork`: current 1, maximum 1, remaining levels 0. Do not call `subagent_fork` at this depth; carry out the work directly."},{"name":"subagent:delegation","text":"You are a delegated subagent: your permission scope was fixed when you were started and cannot be widened from inside this session — operations that require approval are rejected automatically. When the task needs access beyond that scope, do not retry the denied operation; state the limitation in your reply so the delegating agent can handle it."}]},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} {"type":"request/header","data":{"header":{"config":{"provider":"deepseek-official","model":"deepseek-v4-flash","reasoningEffort":"low"},"tools":"{{tools}}"},"reason":"initial"}} {"type":"request/context","data":{"provider":"deepseek-official","model":"deepseek-v4-flash"}} diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/parent.expected.jsonl b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/parent.expected.jsonl index 1cee326a29..2420e86e79 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/parent.expected.jsonl +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/parent.expected.jsonl @@ -21,15 +21,16 @@ {"type":"developer/message","data":{"turn":2,"step":1,"message":{"source":{"kind":"tool-registry"},"content":[{"type":"tool-addition","toolName":"bash"},{"type":"tool-addition","toolName":"create_goal"},{"type":"tool-addition","toolName":"edit"},{"type":"tool-addition","toolName":"exit_plan_mode"},{"type":"tool-addition","toolName":"get_goal"},{"type":"tool-addition","toolName":"glob"},{"type":"tool-addition","toolName":"grep"},{"type":"tool-addition","toolName":"interrupt_agent"},{"type":"tool-addition","toolName":"job_kill"},{"type":"tool-addition","toolName":"job_list"},{"type":"tool-addition","toolName":"job_output"},{"type":"tool-addition","toolName":"list_agents"},{"type":"tool-addition","toolName":"read"},{"type":"tool-addition","toolName":"read_image"},{"type":"tool-addition","toolName":"send_message"},{"type":"tool-addition","toolName":"skill"},{"type":"tool-addition","toolName":"subagent"},{"type":"tool-addition","toolName":"subagent_fork"},{"type":"tool-addition","toolName":"todo_write"},{"type":"tool-addition","toolName":"update_goal"},{"type":"tool-addition","toolName":"web_fetch"},{"type":"tool-addition","toolName":"web_search"},{"type":"tool-addition","toolName":"workflow"},{"type":"tool-addition","toolName":"working_directory"},{"type":"tool-addition","toolName":"write"}],"role":"developer","id":"{{sessionId}}"},"headerSeq":18},"surfaceOp":"append"} {"type":"request/context","data":{"provider":"deepseek-official","model":"deepseek-v4-flash"}} {"type":"session/title","data":{"title":"Tighten this session to read-only.","messageSeqs":[3],"source":{"kind":"fallback"}}} -{"type":"assistant/message","data":{"turn":2,"step":1,"message":{"role":"assistant","content":[{"type":"tool-call","id":"delegate-write","name":"subagent","arguments":"{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"tool-call"}},{"type":"tool-call-chunks","time0":0,"index":0,"dt":[],"id":"delegate-write","name":"subagent","args":["{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"tool-call","id":"delegate-write","name":"subagent","arguments":"{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"tool-calls"}}}]},"surfaceOp":"append"} -{"type":"tool/call","data":{"turn":2,"step":1,"callId":"delegate-write","name":"subagent","arguments":"{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}} +{"type":"assistant/message","data":{"turn":2,"step":1,"message":{"role":"assistant","content":[{"type":"tool-call","id":"delegate-write","name":"subagent","arguments":"{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"tool-call"}},{"type":"tool-call-chunks","time0":0,"index":0,"dt":[],"id":"delegate-write","name":"subagent","args":["{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"tool-call","id":"delegate-write","name":"subagent","arguments":"{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"tool-calls"}}}]},"surfaceOp":"append"} +{"type":"tool/call","data":{"turn":2,"step":1,"callId":"delegate-write","name":"subagent","arguments":"{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}} {"type":"subagent/catalog","data":{"version":0,"childId":"{{sessionId}}","childCreatedAt":0,"mode":"continuable","label":"Delegated write probe"}} -{"type":"agent/inbox/spliced","data":{"target":"next-step","start":0,"inserted":[{"content":[{"type":"text","text":"Background subagent {{sessionId}} finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_DENIED [sandbox: file access denied under read-only mode]"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent {{sessionId}} finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"}]}} -{"type":"tool/result","data":{"turn":2,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"delegate-write"},"toolCallId":"delegate-write","content":[{"type":"text","text":"started subagent {{sessionId}}"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[23],"surfaceOp":"append"} +{"type":"subagent/named","data":{"name":"write-probe","id":"{{sessionId}}"}} +{"type":"agent/inbox/spliced","data":{"target":"next-step","start":0,"inserted":[{"content":[{"type":"text","text":"Background subagent write-probe finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_DENIED [sandbox: file access denied under read-only mode]"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent write-probe finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"}]}} +{"type":"tool/result","data":{"turn":2,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"delegate-write"},"toolCallId":"delegate-write","content":[{"type":"text","text":"started subagent write-probe"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[23],"surfaceOp":"append"} {"type":"step/end","data":{"turn":2,"step":1}} {"type":"agent/inbox/spliced","data":{"target":"next-step","start":0,"removedCount":1,"inserted":[]}} {"type":"step/start","data":{"turn":2,"step":2}} -{"type":"user/message","data":{"content":[{"type":"text","text":"Background subagent {{sessionId}} finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_DENIED [sandbox: file access denied under read-only mode]"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent {{sessionId}} finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} +{"type":"user/message","data":{"content":[{"type":"text","text":"Background subagent write-probe finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_DENIED [sandbox: file access denied under read-only mode]"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent write-probe finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} {"type":"assistant/message","data":{"turn":2,"step":2,"message":{"role":"assistant","content":[{"type":"text","text":"The delegated child was denied by the sandbox. PARENT_DONE"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["The delegated child was denied by the sandbox. PARENT_DONE"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"The delegated child was denied by the sandbox. PARENT_DONE"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"} {"type":"step/end","data":{"turn":2,"step":2}} {"type":"turn/end","data":{"turn":2,"reason":{"kind":"completed"}}} diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/replay.override.json b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/replay.override.json index 1c0fe9ffad..e6da428e6c 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/replay.override.json +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/replay.override.json @@ -1 +1 @@ -[{"kind": "chunks", "chunks": [{"type": "block-start", "index": 0, "blockType": "tool-call"}, {"type": "tool-call-delta", "index": 0, "id": "delegate-write", "name": "subagent", "argumentsDelta": "{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}, {"type": "block-end", "index": 0, "block": {"type": "tool-call", "id": "delegate-write", "name": "subagent", "arguments": "{\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}}, {"type": "usage", "usage": {"inputTokens": 10, "outputTokens": 5}}, {"type": "finish", "reason": {"kind": "tool-calls"}}]}, {"kind": "chunks", "chunks": [{"type": "block-start", "index": 0, "blockType": "text"}, {"type": "text-delta", "index": 0, "text": "The delegated child was denied by the sandbox. PARENT_DONE"}, {"type": "block-end", "index": 0, "block": {"type": "text", "text": "The delegated child was denied by the sandbox. PARENT_DONE"}}, {"type": "usage", "usage": {"inputTokens": 10, "outputTokens": 5}}, {"type": "finish", "reason": {"kind": "stop"}}]}] +[{"kind": "chunks", "chunks": [{"type": "block-start", "index": 0, "blockType": "tool-call"}, {"type": "tool-call-delta", "index": 0, "id": "delegate-write", "name": "subagent", "argumentsDelta": "{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}, {"type": "block-end", "index": 0, "block": {"type": "tool-call", "id": "delegate-write", "name": "subagent", "arguments": "{\"name\":\"write-probe\",\"description\": \"Delegated write probe\", \"prompt\": \"Use the write tool exactly once with file_path set to exactly the relative path inherited.txt and content escaped. If the write is denied, reply with the single word CHILD_DENIED and the denial marker line; do not retry and do not request escalation. If it succeeds, reply CHILD_WROTE.\"}"}}, {"type": "usage", "usage": {"inputTokens": 10, "outputTokens": 5}}, {"type": "finish", "reason": {"kind": "tool-calls"}}]}, {"kind": "chunks", "chunks": [{"type": "block-start", "index": 0, "blockType": "text"}, {"type": "text-delta", "index": 0, "text": "The delegated child was denied by the sandbox. PARENT_DONE"}, {"type": "block-end", "index": 0, "block": {"type": "text", "text": "The delegated child was denied by the sandbox. PARENT_DONE"}}, {"type": "usage", "usage": {"inputTokens": 10, "outputTokens": 5}}, {"type": "finish", "reason": {"kind": "stop"}}]}] diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/child.expected.jsonl b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/child.expected.jsonl index c07532bd7d..8be6658199 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/child.expected.jsonl +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/child.expected.jsonl @@ -2,12 +2,12 @@ {"type":"subagent/descriptor","data":{"version":3,"mode":"continuable","provider":"spawn","label":"Return child result","agentProvider":"deepseek-official","agentModel":"deepseek-v4-flash"}} {"type":"sandbox/mode","data":{"mode":"workspace-write","source":"delegation"}} {"type":"approval/policy","data":{"policy":"never","source":"delegation"}} -{"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message."},{"type":"text","text":"Your parent agent id is \"{{sessionId}}\". Before you finish, send your result to that agent with send_message({ agent_id: \"{{sessionId}}\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"}]}} +{"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message."},{"type":"text","text":"Your name is \"settlement-child\". Your parent agent name is \"lead\". Before you finish, send your result to that agent with send_message({ name: \"lead\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"}]}} {"type":"turn/start","data":{"turn":1}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"removedCount":1,"inserted":[]}} {"type":"step/start","data":{"turn":1,"step":1}} {"type":"system/message","data":{"turn":1,"step":1,"message":{"role":"system","content":[{"type":"text","text":"{{system}}"}],"source":{"kind":"system-prompt"},"id":"{{sessionId}}"}},"surfaceOp":"append"} -{"type":"user/message","data":{"content":[{"type":"text","text":"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message."},{"type":"text","text":"Your parent agent id is \"{{sessionId}}\". Before you finish, send your result to that agent with send_message({ agent_id: \"{{sessionId}}\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} +{"type":"user/message","data":{"content":[{"type":"text","text":"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message."},{"type":"text","text":"Your name is \"settlement-child\". Your parent agent name is \"lead\". Before you finish, send your result to that agent with send_message({ name: \"lead\", message: \"\" }). The parent shares your workspace but does not automatically receive your transcript, tool output, or reasoning. Send earlier messages as well when a finding changes what the parent should do next; sending a message does not end your turn."}],"source":{"kind":"user"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} {"type":"user/message","data":{"content":[{"type":"text","text":"Current runtime context. This snapshot supersedes earlier runtime-context snapshots.\n\nCurrent working directory: \"{{cwd}}\".\n\nCurrent DSH file policy: workspace-write. Any available operation enforced by the DSH file sandbox may modify files under the session workspace: \"{{cwd}}\". Some platform temporary areas may also be writable.\n\nApproval prompts are disabled in this session: actions that require approval are rejected automatically — do not request sandbox escalation (do not set `sandbox_permissions`).\n\nDelegation depth for `subagent`: current 1, maximum 1, remaining levels 0. Do not call `subagent` at this depth; carry out the work directly.\n\nDelegation depth for `subagent_fork`: current 1, maximum 1, remaining levels 0. Do not call `subagent_fork` at this depth; carry out the work directly.\n\nYou are a delegated subagent: your permission scope was fixed when you were started and cannot be widened from inside this session — operations that require approval are rejected automatically. When the task needs access beyond that scope, do not retry the denied operation; state the limitation in your reply so the delegating agent can handle it."}],"source":{"kind":"runtime-context","form":"snapshot","sections":[{"name":"working-directory:current","text":"Current working directory: \"{{cwd}}\"."},{"name":"sandbox:policy","text":"Current DSH file policy: workspace-write. Any available operation enforced by the DSH file sandbox may modify files under the session workspace: \"{{cwd}}\". Some platform temporary areas may also be writable."},{"name":"approval:policy","text":"Approval prompts are disabled in this session: actions that require approval are rejected automatically — do not request sandbox escalation (do not set `sandbox_permissions`)."},{"name":"tool:subagent:depth","text":"Delegation depth for `subagent`: current 1, maximum 1, remaining levels 0. Do not call `subagent` at this depth; carry out the work directly."},{"name":"tool:subagent_fork:depth","text":"Delegation depth for `subagent_fork`: current 1, maximum 1, remaining levels 0. Do not call `subagent_fork` at this depth; carry out the work directly."},{"name":"subagent:delegation","text":"You are a delegated subagent: your permission scope was fixed when you were started and cannot be widened from inside this session — operations that require approval are rejected automatically. When the task needs access beyond that scope, do not retry the denied operation; state the limitation in your reply so the delegating agent can handle it."}]},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"} {"type":"request/header","data":{"header":{"config":{"provider":"deepseek-official","model":"deepseek-v4-flash"},"tools":"{{tools}}"},"reason":"initial"}} {"type":"request/context","data":{"provider":"deepseek-official","model":"deepseek-v4-flash"}} diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/parent.override.json b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/parent.override.json index 91428bb387..1ce2e97ca7 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/parent.override.json +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/parent.override.json @@ -3,8 +3,8 @@ "kind": "chunks", "chunks": [ { "type": "block-start", "index": 0, "blockType": "tool-call" }, - { "type": "tool-call-delta", "index": 0, "id": "start-child", "name": "subagent", "argumentsDelta": "{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}" }, - { "type": "block-end", "index": 0, "block": { "type": "tool-call", "id": "start-child", "name": "subagent", "arguments": "{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}" } }, + { "type": "tool-call-delta", "index": 0, "id": "start-child", "name": "subagent", "argumentsDelta": "{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}" }, + { "type": "block-end", "index": 0, "block": { "type": "tool-call", "id": "start-child", "name": "subagent", "arguments": "{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}" } }, { "type": "usage", "usage": { "inputTokens": 10, "outputTokens": 5 } }, { "type": "finish", "reason": { "kind": "tool-calls" } } ] diff --git a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/stream-json.expected.jsonl b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/stream-json.expected.jsonl index f06a75700f..f8fbb77c56 100644 --- a/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/stream-json.expected.jsonl +++ b/apps/cli/tests/profiles/headless/tests/expected/subagent-settlement/stream-json.expected.jsonl @@ -9,20 +9,21 @@ {"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"request/context","seq":11,"time":0,"data":{"provider":"deepseek-official","model":"deepseek-v4-flash"}}} {"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"session/title","seq":12,"time":0,"data":{"title":"Start one continuable subagent and","messageSeqs":[8],"source":{"kind":"fallback"}}}} {"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"session/title-llm-request","seq":13,"time":0,"data":{"titleProvider":"session-title-first-prompt-llm","messageSeqs":[8],"route":{"provider":"deepseek-official","model":"deepseek-v4-flash"},"system":"Create a concise title for an AI coding-assistant session from the supplied human messages.\nReturn only the title on one line, **in plain text of natural language**, with no quotes, prefix, explanation, Markdown, XML, or terminal control codes. No code is allowed.\nUse the language of the messages.\nAim for about 5 words in non-CJK languages or 10 CJK characters.\nIf the messages give little to name, still return a short best-effort title, such as Greeting, instead of explaining.","messages":[{"content":[{"type":"text","text":"Generate the session title from this JSON array of human messages:\n[{\"seq\":8,\"text\":\"Start one continuable subagent and acknowledge its completion notice. Do not call list_agents or send_message.\"}]"}],"source":{"kind":"dsh-session-title-llm"},"role":"user","id":"{{sessionId}}"}],"maxTokens":4096}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":14,"time":0,"data":{"turn":1,"step":1,"message":{"role":"assistant","content":[{"type":"tool-call","id":"start-child","name":"subagent","arguments":"{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"tool-call"}},{"type":"tool-call-chunks","time0":0,"index":0,"dt":[],"id":"start-child","name":"subagent","args":["{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"tool-call","id":"start-child","name":"subagent","arguments":"{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"tool-calls"}}}]},"surfaceOp":"append"}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"tool/call","seq":15,"time":0,"data":{"turn":1,"step":1,"callId":"start-child","name":"subagent","arguments":"{\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":14,"time":0,"data":{"turn":1,"step":1,"message":{"role":"assistant","content":[{"type":"tool-call","id":"start-child","name":"subagent","arguments":"{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"tool-call"}},{"type":"tool-call-chunks","time0":0,"index":0,"dt":[],"id":"start-child","name":"subagent","args":["{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"tool-call","id":"start-child","name":"subagent","arguments":"{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"tool-calls"}}}]},"surfaceOp":"append"}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"tool/call","seq":15,"time":0,"data":{"turn":1,"step":1,"callId":"start-child","name":"subagent","arguments":"{\"name\":\"settlement-child\",\"description\":\"Return child result\",\"prompt\":\"Reply with exactly CHILD_RESULT and nothing else. Do not call send_message.\"}"}}} {"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"session/title","seq":16,"time":0,"data":{"title":"Subagent settlement","messageSeqs":[8],"source":{"kind":"provider","provider":"session-title-first-prompt-llm","model":{"provider":"deepseek-official","model":"deepseek-v4-flash"}}}}} {"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"subagent/catalog","seq":17,"time":0,"data":{"version":0,"childId":"{{sessionId}}","childCreatedAt":0,"mode":"continuable","label":"Return child result"}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"tool/result","seq":18,"time":0,"data":{"turn":1,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"start-child"},"toolCallId":"start-child","content":[{"type":"text","text":"started subagent {{sessionId}}"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[15],"surfaceOp":"append"}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":19,"time":0,"data":{"turn":1,"step":1}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"agent/inbox/spliced","seq":20,"time":0,"data":{"target":"next-step","start":0,"inserted":[{"content":[{"type":"text","text":"Background subagent {{sessionId}} finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_RESULT"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent {{sessionId}} finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"}]}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/start","seq":21,"time":0,"data":{"turn":1,"step":2}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":22,"time":0,"data":{"turn":1,"step":2,"message":{"role":"assistant","content":[{"type":"text","text":"STARTED"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["STARTED"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"STARTED"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":23,"time":0,"data":{"turn":1,"step":2}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"agent/inbox/spliced","seq":24,"time":0,"data":{"target":"next-step","start":0,"removedCount":1,"inserted":[]}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/start","seq":25,"time":0,"data":{"turn":1,"step":3}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"user/message","seq":26,"time":0,"data":{"content":[{"type":"text","text":"Background subagent {{sessionId}} finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_RESULT"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent {{sessionId}} finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":27,"time":0,"data":{"turn":1,"step":3,"message":{"role":"assistant","content":[{"type":"text","text":"PARENT_RECEIVED_SETTLEMENT_NOTICE"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["PARENT_RECEIVED_SETTLEMENT_NOTICE"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"PARENT_RECEIVED_SETTLEMENT_NOTICE"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":28,"time":0,"data":{"turn":1,"step":3}}} -{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"turn/end","seq":29,"time":0,"data":{"turn":1,"reason":{"kind":"completed"}}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"subagent/named","seq":18,"time":0,"data":{"name":"settlement-child","id":"{{sessionId}}"}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"tool/result","seq":19,"time":0,"data":{"turn":1,"step":1,"message":{"role":"tool","source":{"kind":"tool","callId":"start-child"},"toolCallId":"start-child","content":[{"type":"text","text":"started subagent settlement-child"}],"isError":false,"id":"{{sessionId}}"}},"sourceEventSeqs":[15],"surfaceOp":"append"}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":20,"time":0,"data":{"turn":1,"step":1}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"agent/inbox/spliced","seq":21,"time":0,"data":{"target":"next-step","start":0,"inserted":[{"content":[{"type":"text","text":"Background subagent settlement-child finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_RESULT"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent settlement-child finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"}]}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/start","seq":22,"time":0,"data":{"turn":1,"step":2}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":23,"time":0,"data":{"turn":1,"step":2,"message":{"role":"assistant","content":[{"type":"text","text":"STARTED"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["STARTED"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"STARTED"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":24,"time":0,"data":{"turn":1,"step":2}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"agent/inbox/spliced","seq":25,"time":0,"data":{"target":"next-step","start":0,"removedCount":1,"inserted":[]}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/start","seq":26,"time":0,"data":{"turn":1,"step":3}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"user/message","seq":27,"time":0,"data":{"content":[{"type":"text","text":"Background subagent settlement-child finished and will do no further work unless you send it more."},{"type":"text","text":"Its closing message:"},{"type":"text","text":"CHILD_RESULT"}],"source":{"kind":"subagent-settled","form":"notice","summary":"Background subagent settlement-child finished and will do no further work unless you send it more.","senderSessionId":"{{sessionId}}"},"role":"user","id":"{{sessionId}}"},"surfaceOp":"append"}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"assistant/message","seq":28,"time":0,"data":{"turn":1,"step":3,"message":{"role":"assistant","content":[{"type":"text","text":"PARENT_RECEIVED_SETTLEMENT_NOTICE"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{sessionId}}"},"usage":{"inputTokens":10,"outputTokens":5},"stream":[{"type":"chunk","time":0,"chunk":{"type":"block-start","index":0,"blockType":"text"}},{"type":"text-chunks","time0":0,"index":0,"dt":[],"texts":["PARENT_RECEIVED_SETTLEMENT_NOTICE"]},{"type":"chunk","time":0,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"PARENT_RECEIVED_SETTLEMENT_NOTICE"}}},{"type":"chunk","time":0,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":5}}},{"type":"chunk","time":0,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"step/end","seq":29,"time":0,"data":{"turn":1,"step":3}}} +{"type":"session_event","sessionId":"{{sessionId}}","event":{"type":"turn/end","seq":30,"time":0,"data":{"turn":1,"reason":{"kind":"completed"}}}} {"type":"result","sessionId":"{{sessionId}}","output":"PARENT_RECEIVED_SETTLEMENT_NOTICE","usage":{"inputTokens":30,"outputTokens":15}} diff --git a/apps/cli/tests/profiles/headless/tests/subagent-diagnostic.expected.e2e.ts b/apps/cli/tests/profiles/headless/tests/subagent-diagnostic.expected.e2e.ts index 3aff474038..f4f70361cf 100644 --- a/apps/cli/tests/profiles/headless/tests/subagent-diagnostic.expected.e2e.ts +++ b/apps/cli/tests/profiles/headless/tests/subagent-diagnostic.expected.e2e.ts @@ -132,7 +132,7 @@ describe('parent-owned cold child catalog snapshot', () => { if (parent === undefined) throw new Error('missing persisted parent log') // Discovery reads child catalogs without requiring activation descriptors. - expect(parent).toContain(`${childId} [inactive] parent=${parentId} depth=1 — descriptorless child`) + expect(parent).toContain(`legacy:${childId} [inactive] parent=lead depth=1 — descriptorless child`) expect(parent).not.toContain('[diagnostic: corrupt]') const context: NormalizeContext = { sessionIds: [parentId, childId], cwd }