Merge remote-tracking branch 'origin/master' into codex/cli-one-shot-demo

# Conflicts:
#	AGENTS.md
#	docs/architecture.md
#	docs/capability-seams.md
#	docs/cookbook/extension-cookbook.i18n.yaml
#	docs/event-producer-consumer.md
#	docs/module-graph.md
#	knip.json
#	packages/README.md
#	packages/support/loader-smoke/README.md
#	packages/support/loader-smoke/src/index.ts
#	vitest.snapshot.config.ts

packages/examples/cli-demo/tests/built-bin.e2e.ts

@@ -13,6 +13,7 @@ const dshPackages = [
   'core/system-prompt', 'core/tools', 'core/agent-loop', 'llm/llm', 'bash/bash',
   'bash/bash-local', 'bash/tool-bash', 'support/invariants', 'ui/app-boot',
   'session-persistence/session-persistence', 'session-persistence/session-persistence-jsonl',
+  'context/workspace-context',
 ]
 const vendorPackages = ['cordis', 'loader', 'include', 'timer', 'schemastery', 'cosmokit']
 
@@ -67,9 +68,11 @@ async function makeConsumer(): Promise<string> {
     '- id: cli-agent',
     "  name: '@deepseek-ai/dsh-cli-demo'",
     '  config:',
+    '    provider: built-cli-mock',
     '    model: built-cli-mock',
     "    persona: 'built CLI test'",
     "    persistenceRoot: './.sessions'",
+    '    workspaceContext: false',
     '',
   ].join('\n'))
   return dir

packages/examples/cli-demo/tests/cli-demo.spec.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { Context } from 'cordis'
 import Loader from '@cordisjs/plugin-loader'
-import { AgentId, agentEvents, type Agent } from '@deepseek-ai/dsh-agent'
+import { agentEvents, type Agent } from '@deepseek-ai/dsh-agent'
 import type { Message } from '@deepseek-ai/dsh-llm'
 import { TOOL_ORDER_REST } from '@deepseek-ai/dsh-system-prompt'
 import { afterEach, describe, expect, it } from 'vitest'
@@ -44,13 +44,15 @@ describe('dsh-cli-demo app composition', () => {
   it('composes the UI-less spine, JSONL persistence, and a main agent', async () => {
     const root = await mkdtemp(join(tmpdir(), 'dsh-cli-demo-compose-'))
     const ctx = await mount({
+      provider: 'mock',
       model: 'mock',
       persona: 'Headless.',
       tools: { mode: 'native' },
       persistenceRoot: root,
       skills: await skillConfig(),
+      workspaceContext: false,
     })
-    const agent = ctx.get('agents')?.get(AgentId('main'))
+    const [agent] = ctx.get('agents')?.roots() ?? []
     expect(ctx.get('agentLoop')).toBeDefined()
     expect(ctx.get('sessionPersistence')).toBeDefined()
     expect(agent?.session.header.cwd).toBe(process.cwd())
@@ -67,10 +69,11 @@ describe('dsh-cli-demo app composition', () => {
     try {
       const ctx = new Context()
       contexts.push(ctx)
-      cliDemo.apply(ctx, { model: 'mock' })
+      cliDemo.apply(ctx, { provider: 'mock', model: 'mock', workspaceContext: false })
       await new Promise(resolve => setTimeout(resolve, 80))
       expect(ctx.get('sessionPersistence')).toBeDefined()
-      expect(ctx.get('agents')?.get(AgentId('main'))).toBeDefined()
+      const [agent] = ctx.get('agents')?.roots() ?? []
+      expect(agent?.session.id).toMatch(/^main-session-/)
       expect(await ctx.skills.list()).toEqual([])
     } finally {
       if (oldDshHome === undefined) delete process.env.DSH_HOME
@@ -80,9 +83,11 @@ describe('dsh-cli-demo app composition', () => {
     }
 
     const ctx = await mount({
+      provider: 'mock',
       model: 'mock',
       toolOrder: ['zulu', TOOL_ORDER_REST],
       skills: await skillConfig(6),
+      workspaceContext: false,
     })
     ctx.skills.register({ name: 'cli-skill', description: 'CLI skill', source: 'runtime', content: 'body' })
     for (const name of ['alpha', 'zulu']) {

packages/examples/cli-demo/tests/cli.spec.ts

@@ -2,7 +2,7 @@ import { readdir, mkdtemp } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { Context } from 'cordis'
-import { AgentId, type Agent } from '@deepseek-ai/dsh-agent'
+import type { Agent } from '@deepseek-ai/dsh-agent'
 import { CallId, LlmAdapter, type GenerateOptions, type StreamChunk, type TokenUsage } from '@deepseek-ai/dsh-llm'
 import { SessionId, type SessionEvent, type TurnEndReason } from '@deepseek-ai/dsh-session'
 import { afterEach, describe, expect, it } from 'vitest'
@@ -93,9 +93,11 @@ async function harness(script: readonly ScriptEntry[]): Promise<Harness> {
   const ctx = new Context()
   liveContexts.push(ctx)
   await ctx.plugin(cliDemo, {
+    provider: 'mock',
     model: 'mock',
     persistenceRoot: root,
     skills: { local: { dshHome: join(skillHome, '.dsh'), agentsHome: join(skillHome, '.agents') } },
+    workspaceContext: false,
   })
   await new Promise(resolve => setTimeout(resolve, 80))
   ctx.llm.registerAdapter(['mock'], new ScriptedAdapter(script))
@@ -105,7 +107,7 @@ async function harness(script: readonly ScriptEntry[]): Promise<Harness> {
     parameters: { text: { type: 'string', required: true } },
     execute: async args => [{ type: 'text', text: `ECHO: ${(args as { text: string }).text}` }],
   })
-  const agent = ctx.agents.get(AgentId('main'))
+  const [agent] = ctx.agents.roots()
   if (agent === undefined) throw new Error('test main agent missing')
   return { ctx, agent, persistenceRoot: root }
 }
@@ -304,7 +306,7 @@ describe('runOneShot and executeCli', () => {
 
     const empty = new Context()
     liveContexts.push(empty)
-    await expect(runOneShot(empty, { task: 'task' })).rejects.toThrow('required "main" agent')
+    await expect(runOneShot(empty, { task: 'task' })).rejects.toThrow('exactly one top-level agent')
 
     const final = await harness([textResponse('answer')])
     const output = await invoke(final.ctx, ['task'], { failStdout: true })