diff --git a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.i18n.yaml b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.i18n.yaml index 9b27bd68b6..1a6a99d648 100644 --- a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.i18n.yaml +++ b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write -2026-07-21-serial-cross-platform-ci-reference.md: b041a7412746cbedc0e7f0123c3c0e919094397d -2026-07-21-serial-cross-platform-ci-reference.zh.md: b94337d179cf9ce67b62eecb27a8d8bc7287ee75 +2026-07-21-serial-cross-platform-ci-reference.md: 3c0ae200d7dbd5b04eae6db2d6628dccc72103bf +2026-07-21-serial-cross-platform-ci-reference.zh.md: 5c159e12739d68e0baed72aaa08331072e2c3601 diff --git a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.md b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.md index b041a74127..3c0ae200d7 100644 --- a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.md +++ b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.md @@ -20,7 +20,7 @@ Each reference job runs `pnpm run check:ci` without any shard selector. `DSH_GAT Platform ownership remains explicit inside that complete aggregate. `pty-local` supports Linux and macOS and therefore owns its unit and per-file coverage contract on POSIX rather than loading a backend that rejects `win32`; the Windows run still executes every portable package. Portable fixtures derive native paths through `node:path`, compare canonical identities with the same native realpath implementation as production, and use filenames legal on every host. ACP snapshot runs also pass both JavaScript and native realpath spellings of their generated cwd to the normalizer, which replaces aliases longest-first so Windows short and long paths cannot churn shared fixtures. -The macOS reference runs the ordinary Vitest project in forked processes. Node 24 on macOS arm64 has aborted in its CJS lexer from a worker thread; the process boundary contains that external runtime failure without removing any test from the aggregate, while Linux and Windows retain the lower-overhead thread pool. Repository-owned races are fixed at their observation boundaries: dev bundle polling captures its stat baseline synchronously, and PTY readiness retains a prompt candidate until polling confirms that bash owns the foreground process group. The live-link package-manager e2e preserves the workflow-prepared Corepack home and pnpm metadata/store caches while isolating the other managers' mutable caches, so it does not discard reusable package-manager state before the install. +The macOS reference runs the ordinary Vitest project in forked processes. Node 24 on macOS arm64 has aborted in its CJS lexer from a worker thread; the process boundary contains that external runtime failure without removing any test from the aggregate, while Linux and Windows retain the lower-overhead thread pool. Repository-owned races are fixed at their observation boundaries: dev bundle polling stages each candidate table, graph, and watch-baseline map before publishing a rescan, and a missing bundle remains dirty until a successful content hash. PTY readiness retains a prompt candidate while polling checks foreground ownership; the ordinary silence bound covers inherited markers from interactive children. The live-link package-manager e2e preserves the workflow-prepared Corepack home and pnpm metadata/store caches while isolating the other managers' mutable caches, so it does not discard reusable package-manager state before the install. Master reference jobs are diagnostic and do not participate in the pull request's required `all checks passed` result. A pull request runs only its required jobs; a master push runs only the three serial references. Performance is evaluated from completed hosted-job timestamps and reported as a measurement; it is not encoded as a `timeout-minutes` value. diff --git a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.zh.md b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.zh.md index b94337d179..5c159e1273 100644 --- a/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.zh.md +++ b/.agents/notes/implemented/process/2026-07-21-serial-cross-platform-ci-reference.zh.md @@ -20,7 +20,7 @@ Status: implemented 该完整聚合流程仍明确划分平台归属。`pty-local` 支持 Linux 与 macOS,因此其单元测试和逐文件覆盖率契约由 POSIX 平台负责,而不会在 Windows 上加载一个明确拒绝 `win32` 的后端;Windows 仍会执行所有可移植包(package)。可移植 fixture(测试前置数据)通过 `node:path` 派生原生路径,使用与生产代码相同的原生 realpath 实现比较规范化后的路径标识,并采用所有宿主机均允许的文件名。ACP(Agent Client Protocol)快照运行还会把生成的 cwd 分别通过 realpath 的 JavaScript 实现与原生实现得到的两种表示一并传给规范化器;规范化器按长度从长到短替换这些别名,避免 Windows 的短路径与长路径表示差异导致共享 fixture 反复变化。 -macOS 参考流程使用 fork 进程运行常规 Vitest 项目。macOS arm64 上的 Node 24 曾在工作线程中执行 CJS 词法分析器时异常终止;进程边界能够隔离这一外部运行时故障,且无需从聚合流程中删除任何测试,而 Linux 与 Windows 仍使用开销更低的线程池。仓库自身引入的竞态均在相应的观测边界修复:开发构建产物的轮询逻辑会同步捕获其文件状态基线,PTY 就绪检测则保留提示符候选项,直到轮询确认 bash 已拥有前台进程组。实时链接场景下的包管理器 e2e 会保留由工作流预先准备的 Corepack 主目录、pnpm 元数据缓存和 store 缓存,同时隔离其他包管理器的可变缓存,因此不会在安装前丢弃可复用的包管理器状态。 +macOS 参考流程使用 fork 进程运行常规 Vitest 项目。macOS arm64 上的 Node 24 曾在工作线程中执行 CJS 词法分析器时异常终止;进程边界能够隔离这一外部运行时故障,且无需从聚合流程中删除任何测试,而 Linux 与 Windows 仍使用开销更低的线程池。仓库自身引入的竞态均在相应的观测边界修复:开发构建产物的轮询逻辑每次发布重新扫描结果前,都会先暂存候选表、候选图和候选监视基线映射;构建产物缺失后会一直保持脏状态,直到成功计算内容哈希。PTY 就绪检测会在轮询检查前台进程组归属期间保留提示符候选项;常规静默时限也适用于交互式子进程继承提示符标记的情况。实时链接场景下的包管理器 e2e 会保留由工作流预先准备的 Corepack 主目录、pnpm 元数据缓存和 store 缓存,同时隔离其他包管理器的可变缓存,因此不会在安装前丢弃可复用的包管理器状态。 master 分支的参考作业仅用于诊断,不参与拉取请求所要求的 `all checks passed` 结果。拉取请求只运行其必需作业;向 master 推送时只运行三个串行参考作业。系统根据已完成托管作业的时间戳评估性能,并将其报告为测量结果,而不是写成 `timeout-minutes` 值。 diff --git a/packages/host/webserver/README.md b/packages/host/webserver/README.md index 23f715aa4c..baa57dbfe1 100644 --- a/packages/host/webserver/README.md +++ b/packages/host/webserver/README.md @@ -8,7 +8,7 @@ Client-disconnect detection hangs off the **response** `close` event, not the re A request whose handling throws (a malformed %-escape hitting `decodeURIComponent`, a client dropping mid-body) is answered 400 — or the socket destroyed when headers are already out — and reported to `onError`; it never becomes a process-killing unhandled rejection. -In development, the client-plugin registry synchronously captures each built bundle's stat baseline before it returns, then polls those baselines and re-hashes changed content. An immediate rebuild therefore cannot disappear into an asynchronously established watch baseline; a rename window retains the last successful baseline and retries when the bundle reappears. +In development, the client-plugin registry synchronously captures each built bundle's stat baseline before it returns, then polls those baselines and re-hashes changed content. Each rescan stages its candidate table, graph, and watch map before publishing them, so a baseline failure preserves the prior graph. An immediate rebuild therefore cannot disappear into an asynchronously established watch baseline; a rename window marks the path dirty, retains the last successful baseline, and forces a re-hash when the bundle reappears even with identical metadata. ## Model Experience diff --git a/packages/host/webserver/src/web-plugins.ts b/packages/host/webserver/src/web-plugins.ts index 30afefb8d4..4e95e7a091 100644 --- a/packages/host/webserver/src/web-plugins.ts +++ b/packages/host/webserver/src/web-plugins.ts @@ -129,6 +129,13 @@ interface WebPluginRecord { clientPath: string } +interface WatchedBundle { + path: string + mtimeMs: number + size: number + dirty: boolean +} + /** Narrow an unknown parsed JSON value to the dshClient declaration, throwing on malformed fields. */ function parseDshClient(name: string, value: unknown): DshClientDeclaration | undefined { if (value === undefined) return undefined @@ -203,8 +210,32 @@ export function createHostWebPluginRegistry(deps: WebPluginRegistryDeps): HostWe throw new Error(`web-plugins: watch.intervalMs must be a positive integer (got ${String(deps.watch?.intervalMs)})`) } + const stageWatches = ( + candidateTable: Map, + currentWatches: Map, + ): Map => { + const candidateWatches = new Map() + if (watchInterval === undefined) return candidateWatches + for (const [id, record] of candidateTable) { + const current = currentWatches.get(id) + if (current?.path === record.clientPath) { + candidateWatches.set(id, { ...current }) + continue + } + const baseline = statSync(record.clientPath) + candidateWatches.set(id, { + path: record.clientPath, + mtimeMs: baseline.mtimeMs, + size: baseline.size, + dirty: false, + }) + } + return candidateWatches + } + let table = scan(deps) let graph = composeGraph(table) + let watched = stageWatches(table, new Map()) const rebuildListeners = new Set<(id: string, rev: string) => void>() const rebuilt = (id: string): string | undefined => { @@ -220,21 +251,6 @@ export function createHostWebPluginRegistry(deps: WebPluginRegistryDeps): HostWe // registry is returned, then poll those baselines. fs.watchFile establishes // its first baseline asynchronously, so an immediate rebuild can otherwise // become the baseline and disappear without an observed delta. - const watched = new Map() - const syncWatches = (): void => { - if (watchInterval === undefined) return - for (const [id, watch] of watched) { - if (table.get(id)?.clientPath === watch.path) continue - watched.delete(id) - } - for (const [id, record] of table) { - if (watched.has(id)) continue - const baseline = statSync(record.clientPath) - watched.set(id, { path: record.clientPath, mtimeMs: baseline.mtimeMs, size: baseline.size }) - } - } - syncWatches() - const pollWatches = (): void => { for (const [id, watch] of watched) { let current: Stats @@ -242,18 +258,24 @@ export function createHostWebPluginRegistry(deps: WebPluginRegistryDeps): HostWe current = statSync(watch.path) } catch (error) { const code = (error as NodeJS.ErrnoException).code - if (code === 'ENOENT') continue // mid-rename window; retry against the retained baseline + if (code === 'ENOENT') { + watch.dirty = true + continue + } deps.onError(error instanceof Error ? error : new Error(String(error))) continue } - if (current.mtimeMs === watch.mtimeMs && current.size === watch.size) continue + if (!watch.dirty && current.mtimeMs === watch.mtimeMs && current.size === watch.size) continue const before = table.get(id)?.entry.rev let rev: string | undefined try { rev = rebuilt(id) } catch (error) { const code = (error as NodeJS.ErrnoException).code - if (code === 'ENOENT') continue // mid-rename window; retry against the retained baseline + if (code === 'ENOENT') { + watch.dirty = true + continue + } watch.mtimeMs = current.mtimeMs watch.size = current.size deps.onError(error instanceof Error ? error : new Error(String(error))) @@ -261,6 +283,7 @@ export function createHostWebPluginRegistry(deps: WebPluginRegistryDeps): HostWe } watch.mtimeMs = current.mtimeMs watch.size = current.size + watch.dirty = false if (rev === undefined || rev === before) continue for (const notify of rebuildListeners) { // A throwing subscriber must not skip later subscribers or escape the @@ -283,9 +306,12 @@ export function createHostWebPluginRegistry(deps: WebPluginRegistryDeps): HostWe queueMicrotask(() => { pending = false try { - table = scan(deps) - graph = composeGraph(table) - syncWatches() + const candidateTable = scan(deps) + const candidateGraph = composeGraph(candidateTable) + const candidateWatches = stageWatches(candidateTable, watched) + table = candidateTable + graph = candidateGraph + watched = candidateWatches } catch (error) { // Keep serving the previous graph: a mid-flight rescan failure must not // take down the boot manifest for plugins that were fine. diff --git a/packages/host/webserver/tests/web-plugins.spec.ts b/packages/host/webserver/tests/web-plugins.spec.ts index b9efb1c5c9..0acff4d78b 100644 --- a/packages/host/webserver/tests/web-plugins.spec.ts +++ b/packages/host/webserver/tests/web-plugins.spec.ts @@ -1,11 +1,41 @@ -import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs' +import { + mkdirSync, + mkdtempSync, + statSync, + type PathLike, + type Stats, + unlinkSync, + utimesSync, + writeFileSync, +} from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { Context } from 'cordis' -import { describe, expect, it, vi } from 'vitest' +import { afterEach, describe, expect, it, vi } from 'vitest' import { createHostWebPluginRegistry, injectBootManifest } from '../src/index.ts' import type { LoaderEntryView, WebPluginRegistryDeps } from '../src/index.ts' +const fsControl = vi.hoisted(() => ({ failNextStatPath: undefined as string | undefined })) + +vi.mock('node:fs', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + statSync: (path: PathLike): Stats => { + if (String(path) === fsControl.failNextStatPath) { + fsControl.failNextStatPath = undefined + throw Object.assign(new Error('staged bundle missing'), { code: 'ENOENT' }) + } + return actual.statSync(path) + }, + } +}) + +afterEach(() => { + fsControl.failNextStatPath = undefined + vi.useRealTimers() +}) + /** Write a fake installed package (package.json + optional client bundle) and return its package.json path. */ function makePkg(root: string, name: string, pkg: Record, withBundle = true): string { const dir = join(root, name.replaceAll('/', '__')) @@ -147,6 +177,58 @@ describe('createHostWebPluginRegistry', () => { expect(rebuilds).toHaveLength(1) }) + it('watch mode: a failed rescan baseline preserves the published table and graph', async () => { + const { deps, entries, errors, ctx, root } = makeDeps([ + { name: 'stable', pkg: webDecl() }, + { name: 'late', pkg: webDecl(), loaded: false }, + ]) + deps.watch = { intervalMs: 1_000 } + const registry = createHostWebPluginRegistry(deps) + const before = registry.graph() + + ;(entries[1] as { fiber?: unknown }).fiber = {} + fsControl.failNextStatPath = join(root, 'late', 'lib', 'client.js') + ctx.emit('internal/plugin', ctx.fiber) + await Promise.resolve() + + expect(errors[0]?.message).toContain('staged bundle missing') + expect(registry.graph()).toBe(before) + expect(registry.clientPath('late')).toBeUndefined() + + ctx.emit('internal/plugin', ctx.fiber) + await Promise.resolve() + expect(registry.graph().entries.map(row => row.id)).toEqual(['stable', 'late']) + registry.dispose() + }) + + it('watch mode: a missing bundle forces a re-hash when identical metadata reappears', async () => { + vi.useFakeTimers() + const { deps, root } = makeDeps([{ name: 'watched', pkg: webDecl() }]) + const bundle = join(root, 'watched', 'lib', 'client.js') + const fixedTime = new Date(1_600_000_000_000) + utimesSync(bundle, fixedTime, fixedTime) + deps.watch = { intervalMs: 20 } + const registry = createHostWebPluginRegistry(deps) + const baseline = statSync(bundle) + const rebuilds: { id: string; rev: string }[] = [] + registry.onRebuilt((id, rev) => rebuilds.push({ id, rev })) + + unlinkSync(bundle) + await vi.advanceTimersByTimeAsync(20) + writeFileSync(bundle, 'x'.repeat(baseline.size)) + utimesSync(bundle, fixedTime, fixedTime) + const restored = statSync(bundle) + expect({ mtimeMs: restored.mtimeMs, size: restored.size }).toEqual({ + mtimeMs: baseline.mtimeMs, + size: baseline.size, + }) + await vi.advanceTimersByTimeAsync(20) + + expect(rebuilds).toHaveLength(1) + expect(registry.graph().entries[0]?.rev).toBe(rebuilds[0]?.rev) + registry.dispose() + }) + it('rejects a non-positive or non-integer watch interval at build time', () => { for (const intervalMs of [0, -5, 1.5]) { const { deps } = makeDeps([{ name: 'p', pkg: webDecl() }]) diff --git a/packages/pty/pty-local/README.md b/packages/pty/pty-local/README.md index f26d4a3af9..a2b3aec391 100644 --- a/packages/pty/pty-local/README.md +++ b/packages/pty/pty-local/README.md @@ -6,7 +6,7 @@ Local Linux/macOS `node-pty` backend for `ctx.pty`; loading it on another platfo The plugin injects `pty`, `sandbox`, and `sandboxPolicy`, then registers the configured backend type (`shell`). `danger-full-access` starts the shell directly; confined modes wrap the exact shell argv through `ctx.sandbox`. The effective session mode is resolved at spawn. A change to a different effective mode is rejected before its `sandbox/mode` event commits while that owner has an open PTY or a spawn in progress; the fence is attached to the exact owner and therefore outlives a local-provider reload that retains existing sessions. Wait for creation to settle and close the sessions before changing modes, so a terminal opened with wider access cannot survive a downgrade. -Linux readiness combines a foreground-verified private bash prompt marker, foreground-process-group syscall inspection, silence fallback, and absolute timeout. macOS uses the verified prompt marker plus silence/timeout because it has no `/proc` syscall surface. A marker is not ready until printable prompt text arrives, including when the OSC marker and `PS1` are split across data callbacks; when bash prints the marker before the kernel publishes its return to the foreground process group, polling retains the candidate until bash ownership is observable. Unrecognized or unreadable process state is never a positive exact-idle signal. During unpublished startup, a fallback requires observed output; zero-output silence cannot publish an empty session, and timeout rejects the spawn. Cancellation closes the unpublished shell and rejects with the caller's exact abort reason even when its foreground process group is not observable yet; if that close fails, `PtyBackendCleanupError` separately preserves the cleanup failure for registry disposal. Incomplete terminal-control sequences are bounded by `maxReadBytes` and discarded through their terminator after crossing that limit; a trailing carriage return is carried across callbacks so split CRLF becomes one newline. +Linux readiness combines a foreground-verified private bash prompt marker, foreground-process-group syscall inspection, silence fallback, and absolute timeout. macOS uses the verified prompt marker plus silence/timeout because it has no `/proc` syscall surface. A marker is not ready until printable prompt text arrives, including when the OSC marker and `PS1` are split across data callbacks; when bash prints the marker before the kernel publishes its return to the foreground process group, polling retains the candidate until bash ownership is observable or the ordinary silence bound expires. An interactive child that inherits `PROMPT_COMMAND` therefore cannot suppress inferred-idle readiness until the absolute timeout. Unrecognized or unreadable process state is never a positive exact-idle signal. During unpublished startup, a fallback requires observed output; zero-output silence cannot publish an empty session, and timeout rejects the spawn. Cancellation closes the unpublished shell and rejects with the caller's exact abort reason even when its foreground process group is not observable yet; if that close fails, `PtyBackendCleanupError` separately preserves the cleanup failure for registry disposal. Incomplete terminal-control sequences are bounded by `maxReadBytes` and discarded through their terminator after crossing that limit; a trailing carriage return is carried across callbacks so split CRLF becomes one newline. Send cancellation resolves the current foreground process group and delivers a real `SIGINT`; it never emulates interruption by writing `\x03`, so raw-mode programs remain cancellable. Close sends `SIGTERM` to descendants, waits, then sends `SIGKILL` to the union of captured survivors and newly scanned descendants so reparenting cannot hide a process from teardown. It verifies that every retained identity is gone or, on Linux, a non-executing zombie before stopping the shell; zombie entries are quiescent and are reaped as the shell exits. A survivor failure does not cache a permanently rejected close; a later close retries the teardown. diff --git a/packages/pty/pty-local/src/session.ts b/packages/pty/pty-local/src/session.ts index 8bb9709bab..4b1faccc94 100644 --- a/packages/pty/pty-local/src/session.ts +++ b/packages/pty/pty-local/src/session.ts @@ -328,13 +328,11 @@ export class LocalPtySession implements PtyBackendSession { return } } - // A complete owned marker is stronger evidence than silence, but can race - // the kernel's foreground-PGID handoff. Once it is pending, wait for bash - // ownership (or the absolute timeout) instead of misclassifying that race - // as inferred idle. - if (!(this.promptSeen && this.promptTextSeen) - && startupHasOutput - && Date.now() - this.lastOutputAt >= this.config.idleSilenceMs) { + // A prompt candidate can race bash's foreground handoff, but an interactive + // child also inherits PROMPT_COMMAND. Silence therefore remains the bound + // on waiting for shell ownership instead of letting a child marker suppress + // readiness until the absolute timeout. + if (startupHasOutput && Date.now() - this.lastOutputAt >= this.config.idleSilenceMs) { this.settleActive('inferred_idle') return } diff --git a/packages/pty/pty-local/tests/session.spec.ts b/packages/pty/pty-local/tests/session.spec.ts index 0faa9d7755..4be21c79a6 100644 --- a/packages/pty/pty-local/tests/session.spec.ts +++ b/packages/pty/pty-local/tests/session.spec.ts @@ -298,7 +298,7 @@ describe('LocalPtySession readiness and output', () => { void operation.done.then(() => { settled = true }) inspector.pgid = 789 terminal.emitData('\x1b]133;D;0\x07dsh> ') - await vi.advanceTimersByTimeAsync(60) + await vi.advanceTimersByTimeAsync(40) expect(settled).toBe(false) inspector.pgid = 456 @@ -306,6 +306,21 @@ describe('LocalPtySession readiness and output', () => { expect(settled).toBe(true) expect((await operation.done).waitReason).toBe('stdin_read') }) + + it('falls back to inferred idle when a foreground child emits an inherited prompt marker', async () => { + vi.useFakeTimers() + const terminal = new FakeTerminal() + const inspector = new FakeInspector() + const session = new LocalPtySession(terminal.asPty(), inspector, config()) + await initialize(session, terminal) + + const operation = session.startSend({ text: 'bash -i', submit: true }) + inspector.pgid = 789 + terminal.emitData('\x1b]133;D;0\x07child> ') + await vi.advanceTimersByTimeAsync(100) + + expect((await operation.done).waitReason).toBe('inferred_idle') + }) }) describe('LocalPtySession bounds, signals, and teardown', () => {