Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks

# Conflicts:
#	docs/config-catalog.md
#	docs/core-data-structures/bash.md
#	packages/bash/bash-local/src/index.ts
#	packages/bash/bash/src/types.ts
#	packages/bash/bash/tests/service.spec.ts
#	packages/bash/tool-bash/README.md
#	packages/bash/tool-bash/src/index.ts
#	packages/bash/tool-bash/tests/tools.spec.ts
#	packages/cordis/tool-cordis/src/api-catalog.ts
This commit is contained in:
Yichen Jiang
2026-07-15 13:38:17 +08:00
16 changed files with 181 additions and 182 deletions
+4 -7
View File
@@ -16,7 +16,8 @@ import ApprovalService from '@deepseek-ai/dsh-user-approval'
import type { ApprovalOutcome } from '@deepseek-ai/dsh-user-approval'
import { LocalBashExecutor } from '@deepseek-ai/dsh-bash-local'
import * as ToolBash from '@deepseek-ai/dsh-tool-bash'
import { processOutcome, renderProcessRead, renderResult } from '@deepseek-ai/dsh-tool-bash'
import { processOutcome } from '../src/background.ts'
import { renderProcessRead, renderResult } from '../src/render.ts'
const spillDir = mkdtempSync(join(tmpdir(), 'dsh-tool-bash-spec-'))
@@ -123,7 +124,6 @@ class RecordingSandboxExecutor extends BashExecutor {
start(spec: BashExecSpec): BashProcess {
this.modes.push(spec.sandboxMode)
return {
command: spec.command,
status: 'completed',
exitCode: 0,
signal: null,
@@ -145,10 +145,9 @@ class CountingStartExecutor extends BashExecutor {
run(): Promise<BashRunResult> { return Promise.reject(new Error('unused')) }
start(spec: BashExecSpec): BashProcess {
start(): BashProcess {
this.starts += 1
return {
command: spec.command,
status: 'completed',
exitCode: 0,
signal: null,
@@ -652,7 +651,6 @@ describe('renderProcessRead', () => {
describe('processOutcome', () => {
function settled(over: Partial<BashProcess>): BashProcess {
return {
command: 'x',
status: 'completed',
exitCode: 0,
signal: null,
@@ -955,9 +953,8 @@ describe('the model-facing bash tool builds its request from named args only (no
stdout: { text: 'ok', truncated: false }, stderr: { text: '', truncated: false },
})
}
start(spec: BashExecSpec): BashProcess {
start(): BashProcess {
return {
command: spec.command,
status: 'completed',
exitCode: 0,
signal: null,