Merge origin/master into codex/acp-agent-auto-compaction

examples/acp-agent/cordis.yml

@@ -9,9 +9,6 @@
   config:
     apiKey: !!js process.env.DEEPSEEK_API_KEY
     baseURL: !!js process.env.DEEPSEEK_BASE_URL
-    models:
-      - deepseek-v4-flash
-      - deepseek-v4-pro
 
 # The default composition confines bash to the workspace and asks before a
 # wider retry. Snapshots use danger-full-access; DSH_PERMISSION_MODE overrides
@@ -33,14 +30,17 @@
 - id: permission
   name: '@deepseek-ai/dsh-permission'
 
-# The ACP server app: the agent-core spine + JSONL persistence + the ACP bridge.
+# The ACP server app: the agent-spine-demo spine + JSONL persistence + the ACP bridge.
 # Persistence root: $DSH_SNAPSHOT_SESSIONS_ROOT when the snapshot harness sets it
 # (so it can harvest / isolate the log), else ./.sessions for the demo.
 - id: acp-agent
   name: '@deepseek-ai/dsh-acp-demo'
   config:
+    provider: deepseek
     model: deepseek-v4-flash
     persistenceRoot: !!js process.env.DSH_SNAPSHOT_SESSIONS_ROOT ?? './.sessions'
+    workspaceContext:
+      maxBytes: 65536
     # Keep the persona to identity and behavior; tool plugins own tool guidance.
     # The loop resolves {{model}} and each ACP session's client-supplied {{cwd}}.
     persona: |