Merge remote-tracking branch 'origin/master' into codex/system-prompt-snapshots

# Conflicts:
#	examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	packages/support/acp-snapshot/src/suite.ts

examples/sandbox-acp-agent/cordis.yml

@@ -0,0 +1,60 @@
+# The sandbox-acp-agent plugin tree: the sandboxed coding agent served over the
+# Agent Client Protocol, with the approval seam composed — the first LIVE
+# approval composition. A sandbox denial escalated by the model
+# (sandbox_permissions + justification) reaches the EDITOR as a
+# session/request_permission prompt through the ACP bridge's answerer, and an
+# "Allow once" runs exactly that command under the wider mode.
+#
+# CRITICAL: this tree loads NO stdout logger and NO hmr — stdout is reserved
+# for the ACP JSON-RPC protocol (a property of @deepseek-ai/dsh-acp-agent,
+# same as examples/acp-agent).
+#
+# Requires DEEPSEEK_API_KEY (and optionally DEEPSEEK_BASE_URL) — the
+# dsh-acp-agent bin loads the gitignored repo-root .env first (on STDERR only).
+
+# The DeepSeek adapter.
+- id: llm-deepseek
+  name: '@deepseek-ai/dsh-llm-deepseek'
+  config:
+    apiKey: !!js process.env.DEEPSEEK_API_KEY
+    baseURL: !!js process.env.DEEPSEEK_BASE_URL
+    models:
+      - deepseek-v4-flash
+
+# The sandbox stack: the platform-runner provider (bwrap → per-platform
+# Landlock launcher → Seatbelt, functionally probed), then the confined bash executor.
+# read-only is the fail-safe default; the write boundary for an escalated
+# workspace-write run is workspaceRoot + the platform's temp area. NOTE: the
+# workspace root is CONFIG-FIXED for the executor's lifetime (the launch dir
+# here), while each ACP session has its own cwd — a per-session root is config-
+# phase future work in the sandbox RFC.
+- id: sandbox
+  name: '@deepseek-ai/dsh-sandbox-local'
+- id: bash
+  name: '@deepseek-ai/dsh-bash-sandbox'
+  config:
+    mode: read-only
+    workspaceRoot: !!js process.cwd()
+
+# The approval seam (ctx.approval — mechanism only, no config): with it
+# mounted, the bash tool's escalation gate has a channel, and the ACP bridge
+# inside dsh-acp-agent answers for the sessions it owns by prompting the
+# editor. Without an editor attached nothing can answer, and every ask fails
+# closed.
+- id: approval
+  name: '@deepseek-ai/dsh-user-approval'
+
+# The ACP server app: the agent-core spine + JSONL persistence + the ACP
+# bridge (whose approval answerer completes the loop).
+- id: acp-agent
+  name: '@deepseek-ai/dsh-acp-agent'
+  config:
+    model: deepseek-v4-flash
+    # Persistence root: $DSH_SNAPSHOT_SESSIONS_ROOT when the snapshot harness
+    # sets it (so a record run's logs land where the harness harvests them),
+    # else the local ./.sessions default.
+    persistenceRoot: !!js process.env.DSH_SNAPSHOT_SESSIONS_ROOT ?? './.sessions'
+    persona: |
+      You are a coding assistant powered by the {{model}} model. Your working directory is {{cwd}}. Your bash tool runs under a file sandbox — a `[sandbox: file access denied …]` result is policy, not a command bug.
+
+      Verify your work by running the code or tests. Keep answers brief and factual.