Merge commit 'refs/codex/unblock/master-current' into HEAD

# Conflicts:
#	docs/event-producer-consumer.md
#	examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
#	examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
#	examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
#	examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
#	examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
#	packages/context/workspace-context/tests/workspace-context.spec.ts
#	packages/core/agent/src/index.ts
#	packages/support/invariants/tests/invariants.spec.ts
#	packages/ui/acp/src/index.ts
#	packages/ui/tui/tests/harness.ts
#	packages/ui/tui/tests/tui.spec.ts

examples/cordis-agent/composition.md

@@ -20,6 +20,8 @@ flowchart LR
   cfg --> plugin_cordis_web
   plugin_cordis_web_fetch_local["web-fetch-local<br/>@deepseek-ai/dsh-web-fetch-local"]
   cfg --> plugin_cordis_web_fetch_local
+  plugin_cordis_token_meter["token-meter<br/>@deepseek-ai/dsh-token-meter"]
+  cfg --> plugin_cordis_token_meter
   plugin_cordis_tui_agent["tui-agent<br/>@deepseek-ai/dsh-tui-demo"]
   cfg --> plugin_cordis_tui_agent
   plugin_cordis_tui_agent --> bundle_agent_core["@deepseek-ai/dsh-agent-spine-demo"]
@@ -41,6 +43,7 @@ flowchart LR
 | `fs-local` | `@deepseek-ai/dsh-fs-local` |
 | `web` | `@deepseek-ai/dsh-web` |
 | `web-fetch-local` | `@deepseek-ai/dsh-web-fetch-local` |
+| `token-meter` | `@deepseek-ai/dsh-token-meter` |
 | `tui-agent` | `@deepseek-ai/dsh-tui-demo` |
 | `tool-cordis` | `@deepseek-ai/dsh-tool-cordis` |
 

examples/cordis-agent/cordis.yml

@@ -44,6 +44,9 @@
 - id: web-fetch-local
   name: '@deepseek-ai/dsh-web-fetch-local'
 
+- id: token-meter
+  name: '@deepseek-ai/dsh-token-meter'
+
 # The app bundle pre-creates the self-referential demo's `main` agent.
 - id: tui-agent
   name: '@deepseek-ai/dsh-tui-demo'