Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1

`minimal` was rewritten upstream into a fixed-prompt PTY surface that now
carries its own compaction group, so this branch's token-meter move applies to
it too: the row leaves the group and `tokenMeter` leaves the realm, exactly as
in the other three presets. Master's header prose is kept whole — the note this
branch had added there described a composition that no longer exists.

`docs/event-producer-consumer.*` is generated; regenerated after the merge.

apps/web/tests/agent-preset-authoring.e2e.ts

@@ -161,7 +161,7 @@ describe('web e2e: agent-preset authoring is a host-side copy', () => {
     expect(composition).toBe(await readFile(join(SHIPPED_PRESETS, 'minimal', 'agent.cordis.yml'), 'utf8'))
     const metadata = await readFile(join(userRoot, 'my-agent', 'preset.yml'), 'utf8')
     expect(metadata).toContain('name: 我的模式')
-    expect(metadata).toContain('description: 仅提供 bash 与 str_replace_editor 的双工具编码 Agent，用于基准测试和最小复现。')
+    expect(metadata).toContain('description: 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。')
     expect(metadata).not.toContain('order:')
   }, 60_000)
 

apps/web/tests/core-web-profile.snapshot.ts

@@ -1,137 +0,0 @@
-import { writeFile } from 'node:fs/promises'
-import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import type { AgentHandle } from '@deepseek-ai/dsh-agent'
-import { CallId, createUserMessage } from '@deepseek-ai/dsh-llm'
-import { SessionId } from '@deepseek-ai/dsh-session'
-import { assertFixtureInventory, launchWebScaffold, type WebScaffold } from './scaffold.ts'
-
-const CORE_WEB_OVERLAY = fileURLToPath(new URL('../../cli/config/core-web.cordis.yml', import.meta.url))
-const SNAPSHOT_DIR = fileURLToPath(new URL('./snapshots/core-web-profile', import.meta.url))
-const FIXTURE = join(SNAPSHOT_DIR, 'session.jsonl')
-const PROMPT = 'Reply exactly CORE_WEB_REQUEST_OK and stop.'
-
-describe('core Web profile', () => {
-  let scaffold: WebScaffold
-  let agentHandle: AgentHandle
-
-  beforeAll(async () => {
-    const systemPrompt = process.env.DSH_SYSTEM_PROMPT
-    Reflect.deleteProperty(process.env, 'DSH_SYSTEM_PROMPT')
-    try {
-      scaffold = await launchWebScaffold({ extraOverlayPath: CORE_WEB_OVERLAY, replayFixture: FIXTURE })
-    } finally {
-      if (systemPrompt !== undefined) process.env.DSH_SYSTEM_PROMPT = systemPrompt
-    }
-    agentHandle = await scaffold.ctx.agents.create({
-      sessionId: SessionId('core-web-profile-smoke'),
-      meta: { cwd: scaffold.workspaceCwd },
-      agentOptions: { provider: 'deepseek-official', model: 'deepseek-v4-flash' },
-    })
-  })
-
-  afterAll(async () => {
-    const failures: unknown[] = []
-    await agentHandle?.dispose().catch((error: unknown) => failures.push(error))
-    await scaffold?.close().catch((error: unknown) => failures.push(error))
-    if (failures.length === 1) throw failures[0]
-    if (failures.length > 1) throw new AggregateError(failures, 'core Web profile smoke teardown failed')
-  })
-
-  it('sends the RL prompt and tool schemas through a real request, then executes both tools', async () => {
-    agentHandle.agent.followup(createUserMessage({
-      content: [{ type: 'text', text: PROMPT }],
-      source: { kind: 'user' },
-    }))
-    await agentHandle.agent.whenIdle()
-
-    const requestHeader = agentHandle.agent.session.requestHeader()
-    if (requestHeader === undefined) throw new Error('the core Web agent issued no model request')
-
-    const seedPath = join(scaffold.workspaceCwd, 'profile-smoke.txt')
-    await writeFile(seedPath, 'CORE_WEB_EDITOR_OK\n')
-    const signal = new AbortController().signal
-    const bash = await scaffold.ctx.tools.execute({
-      signal,
-      callId: CallId('core-web-bash-smoke'),
-      name: 'bash',
-      arguments: { command: "printf 'CORE_WEB_BASH_OK\\n'" },
-      agent: agentHandle.agent,
-    })
-    const editor = await scaffold.ctx.tools.execute({
-      signal,
-      callId: CallId('core-web-editor-smoke'),
-      name: 'str_replace_editor',
-      arguments: { command: 'view', path: seedPath },
-      agent: agentHandle.agent,
-    })
-
-    const text = (result: typeof bash): string => result.content
-      .filter(block => block.type === 'text')
-      .map(block => block.text)
-      .join('')
-      .replaceAll(scaffold.workspaceCwd, '{{cwd}}')
-      .trimEnd()
-
-    expect({
-      prompt: requestHeader.system,
-      tools: requestHeader.tools?.map(tool => tool.name),
-      bash: text(bash),
-      editor: text(editor),
-    }).toMatchInlineSnapshot(`
-      {
-        "bash": "CORE_WEB_BASH_OK",
-        "editor": "Here's the content of {{cwd}}/profile-smoke.txt with line numbers (which has a total of 2 lines):
-           1  CORE_WEB_EDITOR_OK
-           2",
-        "prompt": "You are a helpful software engineer assistant.",
-        "tools": [
-          "bash",
-          "str_replace_editor",
-        ],
-      }
-    `)
-    expect(requestHeader.tools).toEqual(scaffold.ctx.tools.schemas(agentHandle.agent))
-
-    const entries = [...scaffold.ctx.loader.entries()]
-    expect(entries.find(entry => entry.options.id === 'persistent-bash')?.fiber).toBeDefined()
-    expect(entries.find(entry => entry.options.id === 'pty-local')?.fiber).toBeDefined()
-    expect(entries.find(entry => entry.options.id === 'str-replace-editor')?.fiber).toBeDefined()
-    expect(entries.find(entry => entry.options.id === 'web-runtime')?.fiber).toBeDefined()
-    expect(entries.find(entry => entry.options.id === 'workspace-context')?.fiber).toBeUndefined()
-    await assertFixtureInventory(SNAPSHOT_DIR, ['session.jsonl'])
-  })
-
-  it('uses DSH_SYSTEM_PROMPT as the complete prompt when configured', async () => {
-    const previous = process.env.DSH_SYSTEM_PROMPT
-    process.env.DSH_SYSTEM_PROMPT = 'RL prompt override'
-    let overrideScaffold: WebScaffold | undefined
-    let overrideAgent: AgentHandle | undefined
-    try {
-      overrideScaffold = await launchWebScaffold({ extraOverlayPath: CORE_WEB_OVERLAY, replayFixture: FIXTURE })
-      overrideAgent = await overrideScaffold.ctx.agents.create({
-        sessionId: SessionId('core-web-profile-override'),
-        meta: { cwd: overrideScaffold.workspaceCwd },
-        agentOptions: { provider: 'deepseek-official', model: 'deepseek-v4-flash' },
-      })
-      overrideAgent.agent.followup(createUserMessage({
-        content: [{ type: 'text', text: PROMPT }],
-        source: { kind: 'user' },
-      }))
-      await overrideAgent.agent.whenIdle()
-      expect(overrideAgent.agent.session.requestHeader()?.system).toBe('RL prompt override')
-    } finally {
-      try {
-        await overrideAgent?.dispose()
-      } finally {
-        try {
-          await overrideScaffold?.close()
-        } finally {
-          if (previous === undefined) Reflect.deleteProperty(process.env, 'DSH_SYSTEM_PROMPT')
-          else process.env.DSH_SYSTEM_PROMPT = previous
-        }
-      }
-    }
-  })
-})

apps/web/tests/minimal-preset.snapshot.ts

@@ -0,0 +1,115 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import type { AgentHandle } from '@deepseek-ai/dsh-agent'
+import { CallId, createUserMessage } from '@deepseek-ai/dsh-llm'
+import { SessionId } from '@deepseek-ai/dsh-session'
+import type {} from '@deepseek-ai/dsh-agent-presets'
+import type {} from '@deepseek-ai/dsh-system-prompt'
+import { assertFixtureInventory, launchWebScaffold, type WebScaffold } from './scaffold.ts'
+
+const SNAPSHOT_DIR = fileURLToPath(new URL('./snapshots/minimal-preset', import.meta.url))
+const FIXTURE = join(SNAPSHOT_DIR, 'session.jsonl')
+const PROMPT = 'Reply exactly MINIMAL_PRESET_REQUEST_OK and stop.'
+
+describe('minimal agent preset', () => {
+  let scaffold: WebScaffold
+  let agentHandle: AgentHandle
+  let disposeInjectedPrompt: () => void
+
+  beforeAll(async () => {
+    scaffold = await launchWebScaffold({ replayFixture: FIXTURE })
+    disposeInjectedPrompt = scaffold.ctx.systemPrompt.section({
+      name: 'test:injected-prompt',
+      order: 999,
+      text: 'THIS TEXT MUST NOT REACH THE MODEL.',
+    })
+    agentHandle = await scaffold.ctx.agents.create({
+      sessionId: SessionId('minimal-preset-smoke'),
+      meta: { cwd: scaffold.workspaceCwd, agentPreset: 'minimal' },
+      agentOptions: { provider: 'deepseek-official', model: 'deepseek-v4-flash' },
+      setup: agentCtx => scaffold.ctx.agentPresets.mount(agentCtx, 'minimal').then(() => undefined),
+    })
+  })
+
+  afterAll(async () => {
+    const failures: unknown[] = []
+    await agentHandle?.dispose().catch((error: unknown) => failures.push(error))
+    try {
+      disposeInjectedPrompt?.()
+    } catch (error: unknown) {
+      failures.push(error)
+    }
+    await scaffold?.close().catch((error: unknown) => failures.push(error))
+    if (failures.length === 1) throw failures[0]
+    if (failures.length > 1) throw new AggregateError(failures, 'minimal preset smoke teardown failed')
+  })
+
+  it('sends the exact RL prompt and schemas, then executes the persistent shell and editor', async () => {
+    agentHandle.agent.followup(createUserMessage({
+      content: [{ type: 'text', text: PROMPT }],
+      source: { kind: 'user' },
+    }))
+    await agentHandle.agent.whenIdle()
+
+    const requestHeader = agentHandle.agent.session.requestHeader()
+    if (requestHeader === undefined) throw new Error('the minimal agent issued no model request')
+
+    const stateDir = join(scaffold.workspaceCwd, 'persistent-state')
+    await mkdir(stateDir)
+    const signal = new AbortController().signal
+    await scaffold.ctx.tools.execute({
+      signal,
+      callId: CallId('minimal-bash-state-setup'),
+      name: 'bash',
+      arguments: { command: `cd ${JSON.stringify(stateDir)} && export DSH_MINIMAL_STATE=PERSISTED` },
+      agent: agentHandle.agent,
+    })
+    const bash = await scaffold.ctx.tools.execute({
+      signal,
+      callId: CallId('minimal-bash-state-read'),
+      name: 'bash',
+      arguments: { command: 'printf \'%s:%s\n\' "$DSH_MINIMAL_STATE" "$PWD"' },
+      agent: agentHandle.agent,
+    })
+    const seedPath = join(scaffold.workspaceCwd, 'preset-smoke.txt')
+    await writeFile(seedPath, 'MINIMAL_EDITOR_OK\n')
+    const editor = await scaffold.ctx.tools.execute({
+      signal,
+      callId: CallId('minimal-editor-smoke'),
+      name: 'str_replace_editor',
+      arguments: { command: 'view', path: seedPath },
+      agent: agentHandle.agent,
+    })
+
+    const text = (result: typeof bash): string => result.content
+      .filter(block => block.type === 'text')
+      .map(block => block.text)
+      .join('')
+      .replaceAll(scaffold.workspaceCwd, '{{cwd}}')
+      .trimEnd()
+
+    expect({
+      prompt: requestHeader.system,
+      tools: requestHeader.tools?.map(tool => tool.name),
+      bash: text(bash),
+      editor: text(editor),
+    }).toMatchInlineSnapshot(`
+      {
+        "bash": "PERSISTED:{{cwd}}/persistent-state",
+        "editor": "Here's the content of {{cwd}}/preset-smoke.txt with line numbers (which has a total of 2 lines):
+           1  MINIMAL_EDITOR_OK
+           2",
+        "prompt": "You are a helpful software engineer assistant.",
+        "tools": [
+          "bash",
+          "str_replace_editor",
+        ],
+      }
+    `)
+    expect(requestHeader.tools?.toSorted((left, right) => left.name.localeCompare(right.name)))
+      .toEqual(scaffold.ctx.tools.schemas(agentHandle.agent).toSorted((left, right) => left.name.localeCompare(right.name)))
+    await assertFixtureInventory(SNAPSHOT_DIR, ['session.jsonl'])
+  })
+})

apps/web/tests/shipped-composition.e2e.ts

@@ -38,7 +38,6 @@ const EXPECTED_TOOLS = [
   'read',
   'send_message',
   'skill',
-  'str_replace_editor',
   'subagent',
   'subagent_fork',
   'task_kill',

apps/web/tests/snapshots/agent-preset-authoring/created.expected.md

@@ -40,7 +40,7 @@
         - text: 复制
     - listitem:
       - 'button "设为默认: 极简模式"':
-        - text: 极简模式 内置 仅提供 bash 与 str_replace_editor 的双工具编码 Agent，用于基准测试和最小复现。
+        - text: 极简模式 内置 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。
         - code: minimal
       - 'button "查看: 极简模式"':
         - img
@@ -62,7 +62,7 @@
   - list:
     - listitem:
       - 'button "设为默认: 我的模式"':
-        - text: 我的模式 自定义 仅提供 bash 与 str_replace_editor 的双工具编码 Agent，用于基准测试和最小复现。
+        - text: 我的模式 自定义 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。
         - code: my-agent
       - 'button "查看路径: 我的模式"':
         - img

apps/web/tests/snapshots/agent-preset-authoring/damaged.expected.md

@@ -40,7 +40,7 @@
         - text: 复制
     - listitem:
       - 'button "设为默认: 极简模式"':
-        - text: 极简模式 内置 仅提供 bash 与 str_replace_editor 的双工具编码 Agent，用于基准测试和最小复现。
+        - text: 极简模式 内置 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。
         - code: minimal
       - 'button "查看: 极简模式"':
         - img

apps/web/tests/snapshots/agent-preset-authoring/section.expected.md

@@ -40,7 +40,7 @@
         - text: 复制
     - listitem:
       - 'button "设为默认: 极简模式"':
-        - text: 极简模式 内置 仅提供 bash 与 str_replace_editor 的双工具编码 Agent，用于基准测试和最小复现。
+        - text: 极简模式 内置 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。
         - code: minimal
       - 'button "查看: 极简模式"':
         - img

apps/web/tests/snapshots/agent-preset-selection/menu.expected.md

@@ -3,5 +3,5 @@
     - text: Standard mode Full coding agent with file editing, shell, file and web search, skills, planning, goals, subagents, and workflows.
     - img
   - menuitem "Code mode All Standard mode capabilities, with tools exposed through the Code Mode SDK so the model can combine multi-step operations in one TypeScript program."
-  - menuitem "Minimal mode Two-tool coding agent with only bash and str_replace_editor, for benchmarks and minimal reproductions."
+  - menuitem "Minimal mode Two-tool coding agent with persistent bash and str_replace_editor."
   - menuitem "Creator mode Built for creating custom agent presets, with all Standard mode capabilities plus runtime inspection, plugin experiments, and preset-authoring guidance."

apps/web/tests/snapshots/minimal-preset/session.jsonl

@@ -1,7 +1,7 @@
-{"type":"session","version":0,"id":"{{sessionId}}","createdAt":1785974400000,"cwd":"{{cwd}}"}
-{"type":"user/message","seq":0,"time":1785974400001,"data":{"content":[{"type":"text","text":"Reply exactly CORE_WEB_REQUEST_OK and stop."}],"source":{"kind":"user","rpcId":"{{rpcId}}"}},"surfaceOp":"append"}
+{"type":"session","version":0,"id":"{{sessionId}}","createdAt":1785974400000,"cwd":"{{cwd}}","agentPreset":"minimal"}
+{"type":"user/message","seq":0,"time":1785974400001,"data":{"content":[{"type":"text","text":"Reply exactly MINIMAL_PRESET_REQUEST_OK and stop."}],"source":{"kind":"user","rpcId":"{{rpcId}}"}},"surfaceOp":"append"}
 {"type":"assistant/chunk","seq":1,"time":1785974400002,"data":{"turn":1,"step":1,"chunk":{"type":"block-start","index":0,"blockType":"text"}}}
-{"type":"assistant/chunk","seq":2,"time":1785974400003,"data":{"turn":1,"step":1,"chunk":{"type":"text-delta","index":0,"text":"CORE_WEB_REQUEST_OK"}}}
-{"type":"assistant/chunk","seq":3,"time":1785974400004,"data":{"turn":1,"step":1,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"CORE_WEB_REQUEST_OK"}}}}
+{"type":"assistant/chunk","seq":2,"time":1785974400003,"data":{"turn":1,"step":1,"chunk":{"type":"text-delta","index":0,"text":"MINIMAL_PRESET_REQUEST_OK"}}}
+{"type":"assistant/chunk","seq":3,"time":1785974400004,"data":{"turn":1,"step":1,"chunk":{"type":"block-end","index":0,"block":{"type":"text","text":"MINIMAL_PRESET_REQUEST_OK"}}}}
 {"type":"assistant/chunk","seq":4,"time":1785974400005,"data":{"turn":1,"step":1,"chunk":{"type":"usage","usage":{"inputTokens":10,"outputTokens":4}}}}
 {"type":"assistant/chunk","seq":5,"time":1785974400006,"data":{"turn":1,"step":1,"chunk":{"type":"finish","reason":{"kind":"stop"}}}}