Merge master into job lifecycle timing and refresh owned fixtures

This commit is contained in:
fz committed 2026-10-08 11:02:16 +08:00
commit 672b384eea
5646 files changed
+135257 -53826

No files matched your search

+20 -21
View File
@@ -11,6 +11,7 @@
* @module @deepseek-ai/dsh-tool-bash
*/
import type {} from '@deepseek-ai/dsh-working-directory'
import { FiberState } from '@deepseek-ai/cordis'
import type { Context } from '@deepseek-ai/cordis'
import z from '@deepseek-ai/schemastery'
@@ -18,7 +19,6 @@ import { isAbsolute, sep } from 'node:path'
import { defineTool, TOOL_ABORTED } from '@deepseek-ai/dsh-tools'
import type { GenericCallView, TerminalCallView, ToolDefinition, ToolExecution, ToolResult, ToolResultView } from '@deepseek-ai/dsh-tools'
import { HarnessError } from '@deepseek-ai/dsh-llm'
import type { Agent } from '@deepseek-ai/dsh-agent'
import type { JobId, JobRegistry, JobView } from '@deepseek-ai/dsh-jobs'
import type {} from '@deepseek-ai/dsh-user-approval'
import type {} from '@deepseek-ai/dsh-shell-env'
@@ -31,7 +31,7 @@ import { processJob, processOutcome, processSources, ringDelta } from './backgro
import { parseExitStatus, renderJobRead, renderPromoted, renderResult } from './render.ts'
export const name = 'tool-bash'
export const inject = ['tools', 'shell', 'systemPrompt', 'shellEnv']
export const inject = ['tools', 'shell', 'systemPrompt', 'shellEnv', 'workingDirectory']
/** Configuration for the bash tool. */
export interface Config {
@@ -142,19 +142,8 @@ function presentBashResult(args: unknown, result: ToolResult): ToolResultView |
return { card: 'terminal', output: body, ...exit }
}
/**
* Resolve an explicit workdir first, making a relative one session-workspace-relative;
* otherwise use the filesystem identity of the session cwd and leave executor
* defaulting as the fallback. A resolved sandbox-policy root wins so workdir
* and confinement use the exact same per-call identity.
*/
function resolveWorkdir(
modelWorkdir: string | undefined,
exec: { agent?: Agent },
policyWorkspaceRoot?: string,
): string | undefined {
const headerCwd = exec.agent?.session.header.cwd
const sessionCwd = policyWorkspaceRoot ?? headerCwd
/** Resolve a relative per-call override against the Session's current directory. */
function resolveWorkdir(modelWorkdir: string | undefined, sessionCwd: string | undefined): string | undefined {
if (modelWorkdir === undefined) return sessionCwd
if (sessionCwd !== undefined && !isAbsolute(modelWorkdir)) {
return `${sessionCwd}${sep}${modelWorkdir}`
@@ -163,13 +152,14 @@ function resolveWorkdir(
}
/** Detach the executor DTO from readonly Service Definition types into plain JSON data. */
function canonicalBashResult(result: ShellRunResult) {
function canonicalBashResult(result: ShellRunResult, cwd: string) {
const output = (stream: ShellRunResult['stdout']) => ({
text: stream.text,
truncated: stream.truncated,
...stream.spillPath !== undefined ? { spillPath: stream.spillPath } : {},
})
return {
cwd,
exitCode: result.exitCode,
signal: result.signal,
timedOut: result.timedOut,
@@ -206,6 +196,7 @@ interface StartedJob {
const BACKGROUND_OUTPUT_PROPERTIES = {
kind: { type: 'string', required: true, const: 'background' },
jobId: { type: 'string', required: true },
cwd: { type: 'string', required: true },
} as const
export function apply(ctx: Context, config: Config = {}): void {
@@ -335,6 +326,7 @@ export function apply(ctx: Context, config: Config = {}): void {
await stop('timed out during preparation')
return {
kind: 'foreground' as const,
cwd: spec.workdir,
exitCode: null,
signal: null,
timedOut: true,
@@ -352,6 +344,7 @@ export function apply(ctx: Context, config: Config = {}): void {
const read = registry.read(attached.id, owner)
return {
kind: 'promoted' as const,
cwd: spec.workdir,
jobId: attached.id,
timeoutMs,
output: renderJobRead(
@@ -370,7 +363,7 @@ export function apply(ctx: Context, config: Config = {}): void {
if (process === undefined) throw new Error(view.detail)
const result = await process.result()
const stopped = attached.stopped()
return { kind: 'foreground' as const, ...canonicalBashResult(result), ...stopped !== undefined ? { stopped } : {} }
return { kind: 'foreground' as const, ...canonicalBashResult(result, spec.workdir), ...stopped !== undefined ? { stopped } : {} }
}
return defineTool({
name: 'bash',
@@ -420,6 +413,7 @@ export function apply(ctx: Context, config: Config = {}): void {
additionalProperties: false,
properties: {
kind: { type: 'string', required: true, const: 'promoted' },
cwd: { type: 'string', required: true },
jobId: { type: 'string', required: true },
timeoutMs: { type: 'number', required: true },
output: { type: 'string', required: true },
@@ -430,6 +424,7 @@ export function apply(ctx: Context, config: Config = {}): void {
additionalProperties: false,
properties: {
kind: { type: 'string', required: true, const: 'foreground' },
cwd: { type: 'string', required: true },
exitCode: { required: true, oneOf: [{ type: 'integer' }, { type: 'null' }] },
signal: { required: true, oneOf: [{ type: 'string' }, { type: 'null' }] },
timedOut: { type: 'boolean', required: true },
@@ -478,6 +473,7 @@ export function apply(ctx: Context, config: Config = {}): void {
? renderPromoted(value)
: renderResult(value as { kind: 'foreground' } & ShellRunResult, escalationModes),
}],
presentationMeta: (_args, value) => ({ cwd: value.cwd }),
},
async execute(args: BashToolArgs, exec) {
// Description is display metadata; workdir defaults to the caller's session.
@@ -489,7 +485,8 @@ export function apply(ctx: Context, config: Config = {}): void {
const policy = approvedMode === undefined
? standingPolicy
: { ...(standingPolicy as SandboxExecutionPolicy), mode: approvedMode }
const workdir = resolveWorkdir(args.workdir, exec, standingPolicy?.workspaceRoot)
const cwd = exec.agent === undefined ? undefined : await ctx.workingDirectory.ensure(exec.agent, exec.signal)
const workdir = resolveWorkdir(args.workdir, cwd)
const dshEnv = ctx.shellEnv.collect(exec)
const request: ShellExecRequest = {
command: args.command,
@@ -508,7 +505,8 @@ export function apply(ctx: Context, config: Config = {}): void {
}
// The caller owns cancellation until ctx.jobs commits detached ownership.
if (exec.signal.aborted) throw toolAborted()
return { kind: 'background' as const, jobId: startJob(jobs, args, exec, ctx.shell.resolve({ ...request, onExpiry: 'none' })).id }
const spec = ctx.shell.resolve({ ...request, onExpiry: 'none' })
return { kind: 'background' as const, jobId: startJob(jobs, args, exec, spec).id, cwd: spec.workdir }
}
// A foreground call is a job the tool waits on, so the command is
// visible and killable from the moment it starts and outlives the wait
@@ -525,10 +523,11 @@ export function apply(ctx: Context, config: Config = {}): void {
}
if (attached !== undefined) return waitOnJob(jobs, attached, exec, spec)
}
const foreground = await ctx.shell.execute(ctx.shell.resolve({ ...request, signal: exec.signal }))
const spec = ctx.shell.resolve({ ...request, signal: exec.signal })
const foreground = await ctx.shell.execute(spec)
const result = await foreground.result()
if (result.aborted) throw toolAborted()
return { kind: 'foreground' as const, ...canonicalBashResult(result) }
return { kind: 'foreground' as const, ...canonicalBashResult(result, spec.workdir) }
},
presentCall: presentBashCall,
presentResult: presentBashResult,