Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input

# Conflicts:
#	apps/cli/src/web.ts
#	apps/web/tests/smoke-fixture.e2e.ts
#	docs/architecture.i18n.yaml
#	packages/client/connection/src/client/fixture.ts
#	packages/client/ui-conversation/README.md
#	packages/client/ui-conversation/package.json
#	packages/client/ui-conversation/src/client/apply.ts
#	packages/client/ui-conversation/src/client/chat/ChatView.tsx
#	packages/client/ui-conversation/src/client/chat/register.ts
#	packages/client/ui-conversation/src/client/contract/slots.ts
#	packages/client/ui-conversation/src/client/contract/views.ts
#	packages/client/ui-conversation/src/client/service.ts
#	packages/client/ui-conversation/src/client/skeleton/ConversationRoot.tsx
#	packages/client/ui-conversation/src/client/stores.ts
#	packages/client/ui-conversation/tests/skeleton-branches.spec.tsx
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/host/runtime/src/boot.ts
#	packages/host/runtime/tests/host-runtime.spec.ts
#	pnpm-lock.yaml

packages/host/runtime/src/api-proxy.ts

@@ -12,7 +12,7 @@ import type { Agent, AgentStatus } from '@deepseek-ai/dsh-agent'
 import { AttachmentError } from '@deepseek-ai/dsh-attachment-local'
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment-local'
 import type { ContentBlock, MessageSource } from '@deepseek-ai/dsh-llm'
-import type { Session, SessionEvent, SessionHeader, SessionId } from '@deepseek-ai/dsh-session'
+import type { JsonValue, Session, SessionEvent, SessionHeader, SessionId } from '@deepseek-ai/dsh-session'
 import type { SessionPersistence } from '@deepseek-ai/dsh-session-persistence'
 import type { ApiProxy, HistoryEntry, HostFrame, MuxFrame, PromptContentPart, SessionSummary, ToolEventView } from '@deepseek-ai/dsh-host-apiproxy/api'
 import type { ClientResponse, RpcError, RpcReceipt, RpcRequest, RpcResponse } from '@deepseek-ai/dsh-host-apiproxy/api/rpc'
@@ -218,7 +218,7 @@ export interface ApiProxyDefaults {
 /** The tool/call payload fields the presenter path reads. */
 interface ToolCallData { callId: string; name: string; arguments: string }
 /** The tool/result payload fields the presenter path reads. */
-interface ToolResultData { callId: string; content: ContentBlock[]; isError: boolean; meta?: unknown }
+interface ToolResultData { callId: string; content: ContentBlock[]; isError: boolean; meta?: JsonValue }
 
 /**
  * Compute the render intent for a tool/call or tool/result event through the

packages/host/runtime/src/boot.ts

@@ -26,6 +26,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'
@@ -45,6 +46,8 @@ import * as spillPolicy from '@deepseek-ai/dsh-spill-policy'
 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
   /** Explicit harness home for durable attachments; omitted follows DSH_HOME then ~/.dsh. */
   dshHome?: string
   /** Default provider route for created/resumed agents (defaults to 'deepseek', the only adapter bootHost registers). */
@@ -83,7 +86,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, attachment storage, and optional default routing.
  * @returns the booted handle (ctx + defaults + dispose).
  */
 export async function bootHost(options: BootHostOptions): Promise<HostHandle> {
@@ -108,7 +111,7 @@ export async function bootHost(options: BootHostOptions): Promise<HostHandle> {
   if (options.piAiProviders !== undefined && options.piAiProviders.length > 0) {
     await ctx.plugin(LlmPiAi, { providers: options.piAiProviders })
   }
-  await ctx.plugin(SessionPersistenceJsonl, { root: options.persistenceRoot, compression: 'none' })
+  await ctx.plugin(SessionPersistenceJsonl, { root: options.persistenceRoot })
   await ctx.plugin(LocalBashExecutor, {})
   // Tool suite mirroring the demo:repl composition (repl-agent/cordis.yml +
   // the agent-spine bundle) so web sessions get the same coding-agent tool
@@ -122,6 +125,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
 }