Merge branch 'codex/goal-session' into codex/commands

# Conflicts: # docs/architecture.md # docs/capability-seams.md # docs/config-catalog.md # docs/module-graph.md # knip.json # packages/examples/README.md # packages/examples/stdio-demo/README.md # packages/examples/stdio-demo/src/index.ts # packages/examples/tui-demo/package.json # packages/ui/README.md # packages/ui/tui/src/index.ts
2026-08-15 21:04:50 +00:00 · 2026-07-20 22:05:51 +08:00
parent 9ef673a5a3 41196b7e4f
commit 78472196c8
237 changed files with 2872 additions and 4495 deletions
--- a/scripts/demo-code-mode.mjs
+++ b/scripts/demo-code-mode.mjs
@@ -1,23 +1,20 @@
 /**
- * Boot the REPL, TUI, or ACP Code Mode overlay, defaulting to REPL. Each overlay
+ * Boot the TUI or ACP Code Mode overlay, defaulting to TUI. Each overlay
 * includes its base example, selects Code Mode, and adds the worker runtime.
 * All require a DeepSeek API key; unsupported arguments fail with usage.
 */
 import { spawn } from 'node:child_process'

-// Each UI's node invocation, verbatim what its base demo script runs plus
-// the overlay config (the stdio bin keeps --expose-internals for the cordis
-// Loader's HMR path).
+// Each UI's node invocation matches its base demo script plus the overlay config.
 const UIS = new Map([
-  ['repl', ['--expose-internals', '--import', 'tsx', 'packages/examples/stdio-demo/src/bin.ts', 'examples/repl-agent/code-mode.cordis.yml']],
-  ['tui', ['--expose-internals', '--import', 'tsx', 'packages/examples/stdio-demo/src/bin.ts', 'examples/tui-agent/code-mode.cordis.yml']],
+  ['tui', ['--expose-internals', '--import', 'tsx', 'packages/examples/tui-demo/src/bin.ts', 'examples/tui-agent/code-mode.cordis.yml']],
  ['acp', ['--import', 'tsx', 'packages/examples/acp-demo/src/bin.ts', '--config', 'examples/acp-agent/code-mode.cordis.yml']],
 ])

-const ui = process.argv[2] ?? 'repl'
+const ui = process.argv[2] ?? 'tui'
 const args = UIS.get(ui)
 if (!args || process.argv.length > 3) {
-  console.error('usage: pnpm run demo:code-mode [repl|tui|acp]')
+  console.error('usage: pnpm run demo:code-mode [tui|acp]')
  process.exit(2)
 }

--- a/scripts/gen-doc-graphs.ts
+++ b/scripts/gen-doc-graphs.ts
@@ -149,8 +149,8 @@ const SERVICE_ROLES: ServiceRole[] = [
    pkg: 'user-interaction',
    title: 'Human question/answer seam',
    mode: 'seam',
-    implementations: ['stdio-demo', 'acp'],
-    consumers: ['tool-ask-user', 'stdio-demo', 'acp'],
+    implementations: ['tui', 'acp'],
+    consumers: ['tool-ask-user', 'tui', 'acp'],
    note: 'UI front doors provide the active human-answer provider; tool-ask-user pauses a tool call on the provider-neutral ask() promise.',
  },
  {
@@ -175,7 +175,7 @@ const SERVICE_ROLES: ServiceRole[] = [
    pkg: 'agent',
    title: 'Agent service',
    mode: 'core',
-    consumers: ['agent-loop', 'acp', 'cli-demo', 'subagent-inprocess', 'stdio-demo', 'invariants'],
+    consumers: ['agent-loop', 'acp', 'cli-demo', 'subagent-inprocess', 'tui-demo', 'invariants'],
    note: 'Owns live Agent handles, the create/resume factory seam, and process-local initiator propagation.',
  },
  {
@@ -451,29 +451,13 @@ function stripYamlScalar(value: string): string {
 }

 const APP_EXAMPLES = [
-  {
-    id: 'echo',
-    rel: 'examples/echo-agent/composition.md',
-    title: 'Echo Agent App Composition',
-    label: 'examples/echo-agent',
-    config: 'examples/echo-agent/cordis.yml',
-    summary: 'The echo demo swaps in a local mock LLM and teaching echo tool, then loads the stdio app package for the shared spine and terminal front door.',
-  },
-  {
-    id: 'repl',
-    rel: 'examples/repl-agent/composition.md',
-    title: 'REPL Agent App Composition',
-    label: 'examples/repl-agent',
-    config: 'examples/repl-agent/cordis.yml',
-    summary: 'The REPL agent demo adds the real DeepSeek adapter, filesystem tools, todo_write, tool-result pruning, compaction, and both subagent transports on top of the stdio app package.',
-  },
  {
    id: 'tui',
    rel: 'examples/tui-agent/composition.md',
    title: 'TUI Agent App Composition',
    label: 'examples/tui-agent',
    config: 'examples/tui-agent/cordis.yml',
-    summary: 'The TUI agent reuses the repl-agent backend and tool composition while fixing the shared terminal app to the full-screen dsh-tui front door.',
+    summary: 'The TUI agent combines the real DeepSeek adapter, coding tools, compaction, subagents, and workflows with the full-screen terminal app package.',
  },
  {
    id: 'headless',
@@ -503,18 +487,13 @@ const APP_EXAMPLES = [

 type AppExample = typeof APP_EXAMPLES[number]

-function renderAppExpansion(lines: string[], appNode: string, pluginName: string, exampleId: string): void {
+function renderAppExpansion(lines: string[], appNode: string, pluginName: string): void {
  const agentCore = nodeId('bundle', 'agent_core')
  const jsonl = nodeId('bundle', 'jsonl')
  lines.push(`  ${appNode} --> ${agentCore}["@deepseek-ai/dsh-agent-spine-demo"]`)
  lines.push(`  ${appNode} --> ${jsonl}["@deepseek-ai/dsh-session-persistence-jsonl"]`)
-  if (pluginName === '@deepseek-ai/dsh-stdio-demo') {
-    const frontDoor = exampleId === 'tui'
-      ? '@deepseek-ai/dsh-tui<br/>pre-created main agent'
-      : exampleId === 'repl'
-        ? '@deepseek-ai/dsh-stdio<br/>pre-created main agent'
-        : 'dsh-tui (TTY) / dsh-stdio (pipes)<br/>pre-created main agent'
-    lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'stdio')}["${frontDoor}"]`)
+  if (pluginName === '@deepseek-ai/dsh-tui-demo') {
+    lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'tui')}["@deepseek-ai/dsh-tui<br/>pre-created main agent"]`)
  } else if (pluginName === '@deepseek-ai/dsh-cli-demo') {
    lines.push(`  ${appNode} --> ${nodeId('frontdoor', 'cli')}["one-shot driver<br/>format-pure stdout<br/>fresh top-level agent"]`)
  } else if (pluginName === '@deepseek-ai/dsh-acp-demo') {
@@ -543,8 +522,8 @@ function renderAppComposition(example: AppExample): string {
    const pluginNode = nodeId(`plugin_${example.id}`, plugin.id)
    lines.push(`  ${pluginNode}["${escLabel(plugin.id)}<br/>${escLabel(plugin.name)}"]`)
    lines.push(`  cfg --> ${pluginNode}`)
-    if (plugin.name === '@deepseek-ai/dsh-stdio-demo' || plugin.name === '@deepseek-ai/dsh-cli-demo' || plugin.name === '@deepseek-ai/dsh-acp-demo') {
-      renderAppExpansion(lines, pluginNode, plugin.name, example.id)
+    if (plugin.name === '@deepseek-ai/dsh-tui-demo' || plugin.name === '@deepseek-ai/dsh-cli-demo' || plugin.name === '@deepseek-ai/dsh-acp-demo') {
+      renderAppExpansion(lines, pluginNode, plugin.name)
    }
  }
  lines.push(
@@ -1042,8 +1021,6 @@ function renderDocs(): GraphDoc[] {
 function renderIndex(docs: GraphDoc[]): string {
  const labels: Record<string, string> = {
    'docs/capability-seams.md': 'capability seams and core services',
-    'examples/echo-agent/composition.md': 'echo-agent app composition',
-    'examples/repl-agent/composition.md': 'repl-agent app composition',
    'examples/headless-agent/composition.md': 'headless-agent app composition',
    'examples/tui-agent/composition.md': 'tui-agent app composition',
    'examples/cordis-agent/composition.md': 'cordis-agent app composition',
@@ -1055,8 +1032,6 @@ function renderIndex(docs: GraphDoc[]): string {
  }
  const modes: Record<string, string> = {
    'docs/capability-seams.md': 'hybrid generated',
-    'examples/echo-agent/composition.md': 'hybrid generated',
-    'examples/repl-agent/composition.md': 'hybrid generated',
    'examples/headless-agent/composition.md': 'hybrid generated',
    'examples/tui-agent/composition.md': 'hybrid generated',
    'examples/cordis-agent/composition.md': 'hybrid generated',
--- a/scripts/gen-tool-catalog.ts
+++ b/scripts/gen-tool-catalog.ts
@@ -269,7 +269,7 @@ const TOOL_PACKAGES: ToolPackage[] = [
      await ctx.plugin(ToolSubagent, { provider: 'mock' })
    },
    note:
-      'The registered tool name is the load-time `toolName` config (default `subagent`); the schema above is that default. The shipped example agents load this package once per subagent backend, so the model additionally sees `subagent_fork` (bound to the fork backend) with an identical schema — see `examples/repl-agent/cordis.yml` and `examples/acp-agent/cordis.yml`.',
+      'The registered tool name is the load-time `toolName` config (default `subagent`); the schema above is that default. The shipped example agents load this package once per subagent backend, so the model additionally sees `subagent_fork` (bound to the fork backend) with an identical schema — see `examples/tui-agent/cordis.yml` and `examples/acp-agent/cordis.yml`.',
  },
  {
    pkg: '@deepseek-ai/dsh-tool-tasks',
--- a/scripts/run-gates.ts
+++ b/scripts/run-gates.ts
@@ -5,9 +5,8 @@
 * independent commands can overlap and which commands wait for built artifacts.
 */
 import { spawn } from 'node:child_process'
-import { readdir, rm } from 'node:fs/promises'
 import { availableParallelism } from 'node:os'
-import { join, resolve } from 'node:path'
+import { resolve } from 'node:path'
 import { performance } from 'node:perf_hooks'

 type Mode =
@@ -181,6 +180,11 @@ function gatesForMode(selected: Mode): Gate[] {
          'run',
          'packages/workflow/workflow-workerthread/tests/source-worker.compat.spec.ts',
        ], { label: 'source worker smoke' }),
+        pnpmExec('jsonl-zstd-smoke', [
+          'vitest',
+          'run',
+          'packages/session-persistence/session-persistence-jsonl/tests/zstd.compat.spec.ts',
+        ], { label: 'JSONL Zstandard smoke' }),
      ]
    case 'pre-push':
      return [
@@ -210,7 +214,6 @@ function ciPrimaryGates(): Gate[] {
    pnpmScript('duplication', 'duplication'),
    coverageGate(),
    snapshotGate(),
-    demoSmokeGate({ needs: ['lint'] }),
    ...docSyncLeafGates(),
    pnpmScript('module-graph', 'verify-module-graph', { label: 'module graph' }),
    pnpmScript('knip', 'knip'),
@@ -229,18 +232,12 @@ function ciStaticGates(): Gate[] {
    pnpmScript('runtime-closure', 'verify-runtime-closure', { label: 'runtime closure' }),
    pnpmScript('constraints', 'constraints'),
    pnpmScript('cordis-config', 'verify-cordis-config', { label: 'Cordis config' }),
-    ...staticDemoSmokeGates(),
    ...docSyncLeafGates(),
    pnpmScript('module-graph', 'verify-module-graph', { label: 'module graph' }),
    pnpmScript('knip', 'knip'),
  ]
 }

-function staticDemoSmokeGates(): Gate[] {
-  // Native Windows session persistence is outside the gates-only support scope.
-  return process.platform === 'win32' ? [] : [demoSmokeGate()]
-}
-
 function ciArtifactGates(): Gate[] {
  return [
    pnpmScript('build', 'build'),
@@ -353,50 +350,14 @@ function docSyncLeafGates(options: {
  ]
 }

-function demoSmokeGate(options: { needs?: string[] } = {}): Gate {
-  const dependencyOptions = options.needs === undefined ? {} : { needs: options.needs }
-  return {
-    id: 'demo-smoke',
-    label: 'demo smoke',
-    displayCommand: 'pnpm run demo:echo',
-    ...pnpmInvocation(['run', 'demo:echo']),
-    input: 'echo ci smoke\n',
-    ...dependencyOptions,
-    verify: async (result) => {
-      const output = result.stdout + result.stderr
-      const sessionsRoot = join(root, '.sessions')
-      try {
-        if (!output.includes('[tool call] echo({"text":"ci smoke"})')) {
-          throw new Error('demo smoke did not show the echo tool call.')
-        }
-        if (!output.includes('[tool result] ECHO: CI SMOKE')) {
-          throw new Error('demo smoke did not show the echo tool result.')
-        }
-        const buckets = await readdir(sessionsRoot, { withFileTypes: true })
-        let found = false
-        for (const bucket of buckets) {
-          if (!bucket.isDirectory() || !bucket.name.startsWith('cwd-')) continue
-          const entries = await readdir(join(sessionsRoot, bucket.name))
-          if (entries.some(entry => /^main-session-.+\.jsonl$/.test(entry))) {
-            found = true
-            break
-          }
-        }
-        if (!found) throw new Error('demo smoke did not create a main-session JSONL log in a cwd bucket.')
-      } finally {
-        await rm(sessionsRoot, { recursive: true, force: true })
-      }
-    },
-  }
-}
-
 function builtBinSmokeGate(): Gate {
  return pnpmExec('built-bin-smoke', [
    'vitest',
    'run',
    '--config',
    'vitest.e2e.config.ts',
-    'packages/examples/stdio-demo/tests/built-bin.e2e.ts',
+    'examples/headless-agent/tests/keyless-smoke.e2e.ts',
+    'examples/tui-agent/tests/tui-keyless-smoke.e2e.ts',
    'packages/examples/cli-demo/tests/built-bin.e2e.ts',
    'packages/examples/acp-demo/tests/built-bin.e2e.ts',
    'packages/ui/jsonrpc/tests/built-scope-carrier.e2e.ts',
@@ -408,6 +369,7 @@ function builtBinSmokeGate(): Gate {
  ], {
    label: 'built-bin smoke',
    needs: ['build'],
+    env: { DSH_EXAMPLE_MODE: 'lib' },
  })
 }

--- a/scripts/smoke-python-runtime.py
+++ b/scripts/smoke-python-runtime.py
@@ -64,6 +64,7 @@ CUSTOM_CORDIS = """\
  name: '@deepseek-ai/dsh-session-persistence-jsonl'
  config:
    root: !!js process.env.DSH_SESSION_ROOT
+    compression: 'none'
 - id: bash
  name: '@deepseek-ai/dsh-bash-local'
  config:
@@ -391,7 +392,7 @@ def smoke_sdk_default(base_url: str) -> None:
            result = harness.run("reply with the smoke text", session_id="default-smoke")
        assert result.status == "ok", result
        assert result.final_response == EXPECTED_TEXT, result.final_response
-        assert_session_log(sessions, root, EXPECTED_TEXT)
+        assert_zstd_session_log(sessions)


 def smoke_sdk_custom(base_url: str, executable: Path) -> None:
@@ -585,6 +586,14 @@ def assert_session_log(sessions: Path, cwd: Path, *expected_texts: str) -> None:
            raise AssertionError(f"session log has no {expected!r} response: {logs[0]}")


+def assert_zstd_session_log(sessions: Path) -> None:
+    logs = list(sessions.rglob("*.jsonl.zstd"))
+    if len(logs) != 1:
+        raise AssertionError(f"expected one Zstandard JSONL session log under {sessions}, found {logs}")
+    if not logs[0].read_bytes().startswith(bytes.fromhex("28b52ffd")):
+        raise AssertionError(f"session log has no Zstandard magic: {logs[0]}")
+
+
 def read_session_logs(sessions: Path) -> dict[str, list[dict[str, object]]]:
    """Parse every persisted JSONL session into a map keyed by header id."""
    logs: dict[str, list[dict[str, object]]] = {}