Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results

# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
#	examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
#	examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
#	examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
#	packages/core/tools/README.md
This commit is contained in:
Tianyi Cui
2026-07-21 18:08:56 +08:00
54 changed files with 423 additions and 133 deletions

View File

@@ -1297,7 +1297,7 @@ export interface Config {
export type ToolPresentationMode = 'native' | 'code' | 'both'
```
Source: [`packages/core/tools/src/index.ts:449`](../packages/core/tools/src/index.ts)
Source: [`packages/core/tools/src/index.ts:468`](../packages/core/tools/src/index.ts)
## `@deepseek-ai/dsh-tui`