tool-bash-persistent overwrote the backend's PS1, so terminal-bash prompt readiness never matched and every send degraded to the 3.5s silence tier (idleSilenceMs + handoffGraceMs) under production defaults. The controlled PROMPT_COMMAND now re-asserts PS1 before every prompt, so an in-shell override never survives to the next prompt. The tool initializes with stty -echo alone and detects the no-end-marker fallback through the seam's stdin_read wait reason instead of matching its own prompt text. Tool calls drop from 7180/3560/3566 ms to 355/88/91 ms (spawn+init+echo, echo, pwd; darwin, production defaults). The loader composition suite now pins the fast path by pushing idleSilenceMs beyond the send bound, and a real-PTY case proves PS1 self-healing. Fixes #2585
157 lines
6.3 KiB
TypeScript
157 lines
6.3 KiB
TypeScript
/**
|
|
* Persistent shell PTY backend over the subprocess terminal primitive, shared
|
|
* sandbox policy, bounded output, and provider-owned session cleanup.
|
|
* @module @deepseek-ai/dsh-terminal-bash
|
|
*/
|
|
|
|
import { Context } from '@deepseek-ai/cordis'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
|
|
import { TerminalBackendCleanupError } from '@deepseek-ai/dsh-terminal'
|
|
import type { TerminalBackend, TerminalBackendSpawnSpec } from '@deepseek-ai/dsh-terminal'
|
|
import type { SubprocessTerminalHandle, SubprocessTerminalSpawnSpec } from '@deepseek-ai/dsh-subprocess'
|
|
import type { SandboxExecutionPolicy } from '@deepseek-ai/dsh-sandbox'
|
|
import { effectiveSandboxMode } from '@deepseek-ai/dsh-sandbox-policy'
|
|
import { type Config, type ResolvedConfig, validateConfig } from './config.ts'
|
|
import { LocalPtySession } from './session.ts'
|
|
import { CONTROLLED_PROMPT } from './sanitize.ts'
|
|
|
|
export { Config } from './config.ts'
|
|
export type { Config as TerminalLocalConfig } from './config.ts'
|
|
|
|
/** Cordis plugin name. */
|
|
export const name = 'terminal-bash'
|
|
/** Required services: PTY registry, shared confinement policy, and process substrate. */
|
|
export const inject = ['terminals', 'sandboxPolicy', 'subprocess']
|
|
|
|
interface SandboxModeFenceState {
|
|
pty: Context['terminals']
|
|
sandboxPolicy: Context['sandboxPolicy']
|
|
}
|
|
|
|
const sandboxModeFences = new WeakMap<Agent, SandboxModeFenceState>()
|
|
|
|
function ensureSandboxModeFence(ctx: Context, owner: Agent): void {
|
|
const existing = sandboxModeFences.get(owner)
|
|
if (existing !== undefined) {
|
|
existing.pty = ctx.terminals
|
|
existing.sandboxPolicy = ctx.sandboxPolicy
|
|
return
|
|
}
|
|
const state: SandboxModeFenceState = { pty: ctx.terminals, sandboxPolicy: ctx.sandboxPolicy }
|
|
sandboxModeFences.set(owner, state)
|
|
owner.ctx.on('internal/dispatch', (_mode, eventName, args) => {
|
|
if (eventName !== 'session/event') return
|
|
const [session, event] = args as [Session, SessionEvent]
|
|
if (session !== owner.session || event.type !== 'sandbox/mode') return
|
|
const currentMode = effectiveSandboxMode(session.events) ?? state.sandboxPolicy.defaultMode
|
|
if (event.data.mode === currentMode || !state.pty.hasOwnerActivity(owner)) return
|
|
throw new Error(
|
|
`cannot change sandbox mode from "${currentMode}" to "${event.data.mode}" while persistent terminal sessions are open or being created; wait for creation to settle and close them first`,
|
|
)
|
|
}, { global: true })
|
|
}
|
|
|
|
function childEnvironment(spec: TerminalBackendSpawnSpec): Record<string, string> {
|
|
// The subprocess provider supplies its own scrubbed ambient base; these are
|
|
// deliberate terminal-specific overrides layered after it.
|
|
return {
|
|
TERM: 'dumb',
|
|
PAGER: 'cat',
|
|
GIT_PAGER: 'cat',
|
|
PS1: CONTROLLED_PROMPT,
|
|
// Re-asserting PS1 after the marker keeps prompt readiness working when a
|
|
// command overwrote the shell variable: bash runs PROMPT_COMMAND before
|
|
// rendering each prompt, so an override never survives to the next prompt.
|
|
PROMPT_COMMAND: `printf "\\033]133;D;%s\\007" "$?"; PS1='${CONTROLLED_PROMPT}'`,
|
|
BASH_SILENCE_DEPRECATION_WARNING: '1',
|
|
DSH_SHELL: '1',
|
|
DSH_SESSION_ID: spec.owner.id,
|
|
DSH_PTY_SESSION_ID: spec.sessionId,
|
|
}
|
|
}
|
|
|
|
function spawnArgv(ctx: Context, config: ResolvedConfig, policy: SandboxExecutionPolicy): string[] {
|
|
const argv = [config.shellPath, ...config.shellArgs]
|
|
if (policy.mode === 'danger-full-access') return argv
|
|
const sandbox = ctx.get('sandbox')
|
|
if (sandbox === undefined) {
|
|
throw new Error(`terminal-bash: sandbox mode "${policy.mode}" requires a ctx.sandbox provider in the execution world`)
|
|
}
|
|
// Re-state the discriminant because object spread does not preserve its narrowed type.
|
|
return sandbox.confine(argv, { ...policy, mode: policy.mode }).argv
|
|
}
|
|
|
|
// TODO(pty-initialize-race-home): Fold this outer abort race into
|
|
// LocalPtySession.initialize when the send-state consolidation lands; the
|
|
// session already owns the send lifecycle the race protects.
|
|
async function initializeSession(session: LocalPtySession, signal?: AbortSignal): Promise<void> {
|
|
if (signal === undefined) {
|
|
await session.initialize(signal)
|
|
return
|
|
}
|
|
const aborted = Promise.withResolvers<never>()
|
|
const onAbort = (): void => { aborted.reject(signal.reason) }
|
|
signal.addEventListener('abort', onAbort, { once: true })
|
|
try {
|
|
signal.throwIfAborted()
|
|
await Promise.race([session.initialize(signal), aborted.promise])
|
|
} finally {
|
|
signal.removeEventListener('abort', onAbort)
|
|
}
|
|
}
|
|
|
|
/** Local shell backend registered under the configured type. */
|
|
export class BashTerminalBackend implements TerminalBackend {
|
|
readonly type: string
|
|
|
|
constructor(
|
|
private readonly ctx: Context,
|
|
private readonly config: ResolvedConfig,
|
|
private readonly spawnTerminal: (
|
|
spec: SubprocessTerminalSpawnSpec,
|
|
) => Promise<SubprocessTerminalHandle> = spec => ctx.subprocess.spawnTerminal(spec),
|
|
private readonly createSession: (
|
|
terminal: SubprocessTerminalHandle,
|
|
config: ResolvedConfig,
|
|
) => LocalPtySession = (terminal, config) => new LocalPtySession(terminal, config),
|
|
) {
|
|
this.type = config.backendType
|
|
}
|
|
|
|
async spawn(spec: TerminalBackendSpawnSpec): Promise<LocalPtySession> {
|
|
spec.signal?.throwIfAborted()
|
|
ensureSandboxModeFence(this.ctx, spec.owner)
|
|
const policy = this.ctx.sandboxPolicy.resolve({ session: spec.owner.session })
|
|
const argv = spawnArgv(this.ctx, this.config, policy)
|
|
if (argv[0] === undefined) throw new Error('terminal-bash: sandbox returned empty argv')
|
|
const terminal = await this.spawnTerminal({
|
|
argv,
|
|
cwd: spec.cwd ?? policy.workspaceRoot,
|
|
env: childEnvironment(spec),
|
|
rows: this.config.rows,
|
|
cols: this.config.cols,
|
|
graceMs: this.config.disposeGraceMs,
|
|
signal: spec.signal,
|
|
})
|
|
const session = this.createSession(terminal, this.config)
|
|
try {
|
|
await initializeSession(session, spec.signal)
|
|
return session
|
|
} catch (error) {
|
|
try {
|
|
await session.close('PTY startup failed')
|
|
} catch (closeError: unknown) {
|
|
throw new TerminalBackendCleanupError(error, closeError)
|
|
}
|
|
throw error
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Register the local PTY backend. */
|
|
export function apply(ctx: Context, config: Config): void {
|
|
validateConfig(config)
|
|
ctx.terminals.registerBackend(new BashTerminalBackend(ctx, config))
|
|
}
|