Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question

Restack the ask-user domain layer onto the carrier-chain architecture
branch. Conflict policy: runtime and ui-conversation take the
carrier-chain side (master sessions shape, dual-kind PendingCard,
'internal' envelope shell tests); the 'cancelled' wire code and its
semantics tests stay in apiproxy + ui-question (domain layer); the
smoke fixture keeps the nine-bundle success pass with the resident
question round over the carrier-chain first-describe shape.

packages/host/runtime/README.md

@@ -1,6 +1,6 @@
 # @deepseek-ai/dsh-host-runtime
 
-Host runtime assembly for `dsh`: `bootHost` composes the core plugin spine (LLM service + DeepSeek adapter, sessions with JSONL persistence, system prompt, tools, agents, agent loop, local bash, and the provider-neutral user-interaction service), `createApiProxy` implements the [`dsh-host-apiproxy`](../apiproxy/README.md) contract over that composition, and `startHost` is the one-step shell seam returning `{ api, handler, defaults, ctx, dispose }`.
+Host runtime assembly for `dsh`: `bootHost` composes the core plugin spine (LLM service + DeepSeek adapter, sessions with JSONL persistence, system prompt, tools, agents, agent loop, workspace instructions, local bash, and the provider-neutral user-interaction service), `createApiProxy` implements the [`dsh-host-apiproxy`](../apiproxy/README.md) contract over that composition, and `startHost` is the one-step shell seam returning `{ api, handler, defaults, ctx, dispose }`.
 
 Which plugins mount and with what defaults is decided only here — shells must not `ctx.plugin` to alter the assembly. `RunningHost.ctx` is a formal seam with exactly two sanctioned uses: mounting protocol front-door plugins (e.g. a future `dsh acp`) and headless session-event subscription; consuming clients must not bypass `api` through it.
 
@@ -9,6 +9,7 @@ Which plugins mount and with what defaults is decided only here — shells must
 | Key | Default | Contract |
 |---|---:|---|
 | `persistenceRoot` | (required) | Root directory for JSONL session persistence. |
+| `workspaceContext` | (required) | [`AGENTS.md`/`CLAUDE.md` loader](../../context/workspace-context/README.md) config with an explicit `maxBytes`, or `false` to disable it. |
 | `provider` | `'deepseek'` | Default provider route injected as agentOptions on create/resume and reported by `host.describe`. |
 | `model` | `'deepseek-v4-flash'` | Default model id, same single source as `provider`. |
 
@@ -18,7 +19,7 @@ Unary methods take the narrow `RpcRequest<P>` and echo `request.rpcId`; a prompt
 
 ## Model Experience
 
-Indirectly, through the model-facing plugins bootHost mounts and the provider/model defaults injected into created and resumed agents.
+Indirectly, through the model-facing plugins bootHost mounts and the provider/model defaults injected into created and resumed agents. When `workspaceContext` is enabled, each agent-loop instance freezes the applicable workspace instructions into its logged request prefix; the owning package documents the exact [model-visible framing](../../context/workspace-context/README.md#prompt-shape).
 
 #### KV Cache effect
 
@@ -27,5 +28,5 @@ No direct invalidation; the mounted model-facing plugins own their request-prefi
 ## Known Limitations and Deferred Work
 
 - **Question waits are process-memory state** — browser reconnects recover them, but a host process restart aborts the owning tool call instead of restoring the wait from persistence.
-- **`host.describe.version` is a placeholder** — it does not yet read the `apps/cli` package version.
+- **`host.describe.version` is a placeholder** — it does not yet report the `apps/cli` package version.
 - **The assembly is fixed** — per-deployment plugin selection (user profile, log sinks, alternative persistence) has a documented home here but no configuration surface yet.

packages/host/runtime/package.json

@@ -71,6 +71,7 @@
     "@deepseek-ai/dsh-tool-workflow": "workspace:^",
     "@deepseek-ai/dsh-tools": "workspace:^",
     "@deepseek-ai/dsh-user-interaction": "workspace:^",
+    "@deepseek-ai/dsh-workspace-context": "workspace:^",
     "@deepseek-ai/dsh-workflow-workerthread": "workspace:^"
   },
   "peerDependencies": {

packages/host/runtime/src/boot.ts

@@ -23,6 +23,7 @@ import FsLocal from '@deepseek-ai/dsh-fs-local'
 import * as fsPolicy from '@deepseek-ai/dsh-fs-policy'
 import * as toolFs from '@deepseek-ai/dsh-tool-fs'
 import * as toolFsSearch from '@deepseek-ai/dsh-tool-fs-search'
+import * as workspaceContext from '@deepseek-ai/dsh-workspace-context'
 import SkillService from '@deepseek-ai/dsh-skill'
 import * as SkillLocal from '@deepseek-ai/dsh-skill-local'
 import * as toolSkill from '@deepseek-ai/dsh-tool-skill'
@@ -43,6 +44,8 @@ import UserInteractionService from '@deepseek-ai/dsh-user-interaction'
 export interface BootHostOptions {
   /** Root directory for JSONL session persistence. */
   persistenceRoot: string
+  /** Workspace-instruction byte budget/config, or false to disable AGENTS.md/CLAUDE.md loading. */
+  workspaceContext: workspaceContext.Config | false
   /** Default provider route for created/resumed agents (defaults to 'deepseek', the only adapter bootHost registers). */
   provider?: string
   /** Default model id (defaults to 'deepseek-v4-flash', matching the demos). */
@@ -77,7 +80,7 @@ export interface HostHandle {
 /**
  * Compose the harness host plugin assembly (the one place deciding which plugins mount and
  * with what defaults — shells must not alter the assembly).
- * @param options - persistence root and optional default provider/model.
+ * @param options - persistence, workspace instructions, and optional default routing.
  * @returns the booted handle (ctx + defaults + dispose).
  */
 export async function bootHost(options: BootHostOptions): Promise<HostHandle> {
@@ -111,6 +114,9 @@ export async function bootHost(options: BootHostOptions): Promise<HostHandle> {
   await ctx.plugin(fsPolicy)
   await ctx.plugin(toolFs, {})
   await ctx.plugin(toolFsSearch, {})
+  if (options.workspaceContext !== false) {
+    await ctx.plugin(workspaceContext, options.workspaceContext)
+  }
   // Skill stack with the demo default dshHome (~/.dsh via resolveDshHome).
   await ctx.plugin(SkillService, {})
   await ctx.plugin(SkillLocal, {})

packages/host/runtime/src/start.ts

@@ -16,10 +16,9 @@ import { createApiProxy } from './api-proxy.ts'
 /** Options for startHost. */
 export interface StartHostOptions {
   /**
-   * Passed through to bootHost verbatim (persistenceRoot required +
-   * provider?/model?). Future host-level knobs (profile, log sink — any
-   * output added to the assembly MUST be switchable off here) land as
-   * additive fields.
+   * Passed through to bootHost verbatim. Future host-level knobs (profile,
+   * log sink — any output added to the assembly MUST be switchable off here)
+   * land as additive fields.
    */
   boot: BootHostOptions
 }

packages/host/runtime/tests/host-runtime.spec.ts

@@ -1,4 +1,4 @@
-import { mkdtempSync } from 'node:fs'
+import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -15,11 +15,14 @@ import { bootHost, startHost, type HostHandle, type RunningHost } from '../src/i
 
 /** Scripted adapter: each model call consumes the next chunk list; 'hang' streams then waits for abort. */
 class ScriptedAdapter extends LlmAdapter {
+  readonly requests: GenerateOptions[] = []
+
   constructor(private script: (StreamChunk[] | 'hang')[]) {
     super()
   }
 
   async * stream(options: GenerateOptions): AsyncIterable<StreamChunk> {
+    this.requests.push(options)
     const entry = this.script.shift()
     if (!entry) throw new Error('ScriptedAdapter: script exhausted')
     if (entry === 'hang') {
@@ -79,7 +82,12 @@ afterEach(async () => {
 
 async function boot(script: (StreamChunk[] | 'hang')[] = []): Promise<RunningHost> {
   host = await startHost({
-    boot: { persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-runtime-')), provider: 'scripted', model: 'test-model' },
+    boot: {
+      persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-runtime-')),
+      workspaceContext: false,
+      provider: 'scripted',
+      model: 'test-model',
+    },
   })
   host.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter(script))
   return host
@@ -87,7 +95,10 @@ async function boot(script: (StreamChunk[] | 'hang')[] = []): Promise<RunningHos
 
 describe('bootHost / startHost', () => {
   it('falls back to the deepseek defaults and disposes idempotently', async () => {
-    const handle: HostHandle = await bootHost({ persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-boot-')) })
+    const handle: HostHandle = await bootHost({
+      persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-boot-')),
+      workspaceContext: false,
+    })
     expect(handle.defaults).toMatchObject({ provider: 'deepseek', model: 'deepseek-v4-flash' })
     expect(typeof handle.defaults.cwd).toBe('string')
     await handle.dispose()
@@ -105,6 +116,41 @@ describe('bootHost / startHost', () => {
     await first
     host = undefined
   })
+
+  it('routes workspace instructions through the assembled agent request prefix', async () => {
+    const workspace = mkdtempSync(join(tmpdir(), 'dsh-host-workspace-'))
+    mkdirSync(join(workspace, '.git'))
+    writeFileSync(join(workspace, 'AGENTS.md'), 'host-workspace-context-probe\n')
+    const adapter = new ScriptedAdapter([textResponse('done')])
+    host = await startHost({
+      boot: {
+        persistenceRoot: mkdtempSync(join(tmpdir(), 'dsh-host-workspace-sessions-')),
+        workspaceContext: { dshHome: join(workspace, '.dsh'), maxBytes: 65_536 },
+        provider: 'scripted',
+        model: 'test-model',
+        cwd: workspace,
+      },
+    })
+    host.ctx.llm.registerAdapter(['scripted'], adapter)
+    const { sessionId } = expectOk(await host.api.sessions.create(request({})))
+    const agent = host.ctx.agents.get(sessionId) as Agent
+    const idle = waitForIdle(host.ctx, agent)
+
+    expectOk(await host.api.sessions.prompt(request({
+      sessionId,
+      mode: 'queue' as const,
+      content: [{ type: 'text' as const, text: 'go' }],
+    })))
+    await idle
+
+    const requestText = adapter.requests[0]?.messages
+      .flatMap(message => message.content)
+      .filter(block => block.type === 'text')
+      .map(block => block.text)
+      .join('\n') ?? ''
+    expect(requestText).toContain('Instructions from: AGENTS.md')
+    expect(requestText).toContain('host-workspace-context-probe')
+  })
 })
 
 describe('host.describe', () => {
@@ -196,7 +242,9 @@ describe('sessions.prompt / cancel', () => {
 describe('sessions.history', () => {
   it('implicitly resumes a cold session, deduplicating concurrent calls to one attach', async () => {
     const persistenceRoot = mkdtempSync(join(tmpdir(), 'dsh-host-resume-'))
-    const first = await startHost({ boot: { persistenceRoot, provider: 'scripted', model: 'test-model' } })
+    const first = await startHost({
+      boot: { persistenceRoot, workspaceContext: false, provider: 'scripted', model: 'test-model' },
+    })
     first.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter([textResponse('persisted')]))
     const { sessionId } = expectOk(await first.api.sessions.create(request({})))
     const agent = first.ctx.agents.get(sessionId) as Agent
@@ -205,7 +253,9 @@ describe('sessions.history', () => {
     await idle
     await first.dispose()
 
-    host = await startHost({ boot: { persistenceRoot, provider: 'scripted', model: 'test-model' } })
+    host = await startHost({
+      boot: { persistenceRoot, workspaceContext: false, provider: 'scripted', model: 'test-model' },
+    })
     host.ctx.llm.registerAdapter(['scripted'], new ScriptedAdapter([]))
     expect(host.ctx.agents.get(sessionId)).toBeUndefined()
     const [a, b] = await Promise.all([

packages/host/runtime/tsconfig.json

@@ -62,6 +62,9 @@
     {
       "path": "../../fs/tool-fs-search"
     },
+    {
+      "path": "../../context/workspace-context"
+    },
     {
       "path": "../../llm/token-meter"
     },