Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose

# Conflicts: # docs/config-catalog.md # docs/development.i18n.yaml # docs/development.zh.md # docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md # docs/rfc/implemented/feature/2026-07-06-sandbox.md # examples/AGENTS.md # examples/README.md # examples/acp-agent/README.md # examples/acp-agent/cordis.yml # examples/acp-agent/tests/acp.e2e.ts # examples/acp-agent/tests/escalation.e2e.ts # examples/sandbox-acp-agent/README.md # examples/sandbox-acp-agent/cordis.snapshot.yml # examples/sandbox-acp-agent/cordis.yml # examples/sandbox-acp-agent/tests/acp.snapshot.ts # packages/ui/acp-agent/src/bin.ts # packages/ui/acp/README.md # packages/ui/jsonrpc-agent/README.md # packages/ui/jsonrpc-agent/src/bin.ts # scripts/verify-translation-pairing.ts
2026-08-15 21:04:50 +00:00 · 2026-07-14 12:34:14 +08:00
parent d11b713e0a 7cd7c234be
commit 1ab64dba62
180 changed files with 3874 additions and 1935 deletions
--- a/scripts/demo-code-mode.mjs
+++ b/scripts/demo-code-mode.mjs
@@ -10,7 +10,7 @@ import { spawn } from 'node:child_process'
 // Loader's HMR path).
 const UIS = new Map([
  ['repl', ['--expose-internals', '--import', 'tsx', 'packages/ui/stdio-agent/src/bin.ts', 'examples/coding-agent/code-mode.cordis.yml']],
-  ['acp', ['--import', 'tsx', 'packages/ui/acp-agent/src/bin.ts', 'examples/acp-agent/code-mode.cordis.yml']],
+  ['acp', ['--import', 'tsx', 'packages/ui/acp-agent/src/bin.ts', '--config', 'examples/acp-agent/code-mode.cordis.yml']],
 ])

 const ui = process.argv[2] ?? 'repl'
--- a/scripts/gen-doc-graphs.ts
+++ b/scripts/gen-doc-graphs.ts
@@ -60,6 +60,7 @@ const GROUP_ORDER = [
  'cordis',
  'hooks',
  'session-persistence',
+  'session-query',
  'support',
  'ui',
 ]
@@ -79,7 +80,7 @@ const SERVICE_ROLES: ServiceRole[] = [
    pkg: 'session',
    title: 'In-memory session store',
    mode: 'core',
-    consumers: ['agent-loop', 'agent', 'session-persistence', 'subagent-inprocess', 'invariants'],
+    consumers: ['agent-loop', 'agent', 'session-persistence', 'session-query', 'subagent-inprocess', 'invariants'],
    note: 'Owns append-only Session instances and emits the durable session event feed.',
  },
  {
@@ -88,9 +89,16 @@ const SERVICE_ROLES: ServiceRole[] = [
    title: 'Durable session persistence seam',
    mode: 'seam',
    implementations: ['session-persistence-jsonl', 'session-persistence-sqlite'],
-    consumers: ['agent-loop', 'acp'],
+    consumers: ['agent-loop', 'acp', 'session-query'],
    note: 'Backends persist the same SessionEvent vocabulary; apps choose a backend at composition time.',
  },
+  {
+    key: 'sessionQuery',
+    pkg: 'session-query',
+    title: 'Exact session-history reads',
+    mode: 'seam',
+    note: 'Resolves live and optional persisted logs into one logical corpus for exact reads.',
+  },
  {
    key: 'systemPrompt',
    pkg: 'system-prompt',
@@ -168,6 +176,15 @@ const SERVICE_ROLES: ServiceRole[] = [
    consumers: ['tools', 'tool-bash'],
    note: 'One-shot permission decisions dispatched over the `approval/request` waterfall; answerers are listeners (the ACP bridge for its own agents), absence fails closed to `unavailable`.',
  },
+  {
+    key: 'permission',
+    pkg: 'permission',
+    title: 'Permission presets',
+    mode: 'core',
+    implementations: [],
+    consumers: ['acp'],
+    note: 'User-facing preset table (`workspace-write`/`danger-full-access`) bundling the sandbox-mode and approval-policy knobs; a switch writes one `permission/preset` event through to both knob events.',
+  },
  {
    key: 'codeRuntime',
    pkg: 'code-runtime',
--- a/scripts/gen-module-graph.ts
+++ b/scripts/gen-module-graph.ts
@@ -32,6 +32,7 @@ const GROUP_ORDER = [
  'cordis',
  'hooks',
  'session-persistence',
+  'session-query',
  'support',
  'ui',
 ]
--- a/scripts/translation-pairing.manifest.json
+++ b/scripts/translation-pairing.manifest.json
@@ -1,4 +1,5 @@
 {
+  "requiredSince": "2026-07-14",
  "required": [
    "README.md",
    "docs/development.md",
@@ -12,12 +13,14 @@
  ],
  "excluded": [
    "docs/AGENTS.md",
-    "docs/module-graph.md",
    "docs/config-catalog.md",
-    "docs/tool-catalog.md",
-    "docs/persistence-catalog.md",
    "docs/cordis-catalog/",
+    "docs/i18n/style-samples.md",
    "docs/i18n/terminology.md",
+    "docs/i18n/translation-prompt.md",
+    "docs/module-graph.md",
+    "docs/persistence-catalog.md",
+    "docs/tool-catalog.md",
    "python/sdk-runtime/src/deepseek_harness_runtime/runtime/node/"
  ]
 }
--- a/scripts/type-equiv.manifest.json
+++ b/scripts/type-equiv.manifest.json
@@ -40,10 +40,19 @@
    { "doc": "docs/core-data-structures/session.md", "symbol": "SurfaceOp", "source": "packages/core/session/src/types.ts" },
    { "doc": "docs/core-data-structures/session.md", "symbol": "SurfaceIntent", "source": "packages/core/session/src/types.ts" },
    { "doc": "docs/core-data-structures/session.md", "symbol": "SurfaceNode", "source": "packages/core/session/src/surface.ts" },
+    { "doc": "docs/core-data-structures/session.md", "symbol": "SurfaceFoldReplacement", "source": "packages/core/session/src/surface.ts" },
+    { "doc": "docs/core-data-structures/session.md", "symbol": "SurfaceFoldResult", "source": "packages/core/session/src/surface.ts" },

    { "doc": "docs/core-data-structures/persistence.md", "symbol": "SessionHeader", "source": "packages/core/session/src/types.ts" },
    { "doc": "docs/core-data-structures/persistence.md", "symbol": "CreateSessionOptions", "source": "packages/core/session/src/types.ts" },

+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionEventSurface", "source": "packages/session-query/session-query/src/types.ts" },
+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionRecord", "source": "packages/session-query/session-query/src/types.ts" },
+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionEventRecord", "source": "packages/session-query/session-query/src/types.ts" },
+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionQueryErrorCode", "source": "packages/session-query/session-query/src/config.ts" },
+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionEventReadRequest", "source": "packages/session-query/session-query/src/types.ts" },
+    { "doc": "docs/core-data-structures/session-query.md", "symbol": "SessionEventWindow", "source": "packages/session-query/session-query/src/types.ts" },
+
    { "doc": "docs/core-data-structures/tools.md", "symbol": "ToolDefinition", "source": "packages/core/tools/src/index.ts" },
    { "doc": "docs/core-data-structures/tools.md", "symbol": "SchemaProp", "source": "packages/core/tools/src/schema.ts" },
    { "doc": "docs/core-data-structures/tools.md", "symbol": "SchemaSpec", "source": "packages/core/tools/src/schema.ts" },
--- a/scripts/verify-translation-pairing.ts
+++ b/scripts/verify-translation-pairing.ts
@@ -1,10 +1,10 @@
 /**
 * Enforce complete English/Chinese pairs, matching structure, and recorded git
- * blob hashes under the bilingual manifest. `--list` reports state; `--write`
- * records both sides after human review. Translation quality remains a review
- * responsibility. A complete pair includes both documents and its sidecar;
- * headings, fences, tables, lists, and link targets must align, while excluded
- * documents may have neither counterpart nor sidecar. See `docs/i18n/README.md`.
+ * blob hashes under the bilingual manifest. Required files and date-named docs
+ * at or after `requiredSince` must be paired; excluded docs may have neither a
+ * counterpart nor sidecar. `--list` reports state and `--write` records both
+ * sides after human review. Translation quality remains a review responsibility.
+ * See `docs/i18n/README.md` for the owning contract.
 */

 import { createHash } from 'node:crypto'
@@ -26,6 +26,8 @@ const SCOPE_PATTERNS = ['README.md', 'README.zh.md', 'README.i18n.yaml', 'docs/*
 interface Manifest {
  required: string[]
  excluded: string[]
+  /** Date-named documents (yyyy-mm-dd-*.md, i.e. RFCs) dated on/after this day must merge bilingual. */
+  requiredSince: string
 }
 const manifest = JSON.parse(readFileSync(join(root, 'scripts/translation-pairing.manifest.json'), 'utf8')) as Manifest

@@ -213,7 +215,22 @@ for (const req of manifest.required) {
  }
 }

-// 2. Every pair that exists at all is complete and consistent. Anchor on the
+// 2. Date-named documents (RFCs) dated on/after the requiredSince cutoff merge
+// bilingual: a new RFC lands with its pair or not at all. Deterministic from
+// the filename alone — no git history, so it holds on shallow CI checkouts.
+const DATED = /(?:^|\/)(\d{4}-\d{2}-\d{2})-[^/]*\.md$/
+for (const source of sources) {
+  if (isExcluded(source)) continue
+  const dated = DATED.exec(source)
+  if (!dated?.[1] || dated[1] < manifest.requiredSince) continue
+  const { zh } = pairPaths(source)
+  if (!existsSync(join(root, zh))) {
+    errors.push(`${source}: dated ${dated[1]} — documents dated on/after ${manifest.requiredSince} merge bilingual (docs/i18n/README.md); add the counterpart and record the pair`)
+    state.set(source, 'missing')
+  }
+}
+
+// 3. Every pair that exists at all is complete and consistent. Anchor on the
 // union of .zh.md files and .i18n.yaml records so a half-deleted pair is
 // caught from either remnant.
 const pairAnchors = new Set<string>()
@@ -280,7 +297,9 @@ if (listMode) {
  const rows = [...state.entries()].sort((a, b) => order[a[1]] - order[b[1]] || a[0].localeCompare(b[0]))
  for (const [file, status] of rows) {
    const required = manifest.required.includes(file)
-    console.log(`${status.padEnd(11)} ${file}${status === 'missing' ? (required ? '  (required)' : '  (backlog)') : ''}`)
+    const date = DATED.exec(file)?.[1]
+    const tag = required ? '  (required)' : date && date >= manifest.requiredSince ? '  (required by date)' : '  (backlog)'
+    console.log(`${status.padEnd(11)} ${file}${status === 'missing' ? tag : ''}`)
  }
  const counts = { 'ok': 0, 'out-of-sync': 0, 'missing': 0 }
  for (const status of state.values()) counts[status]++