ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): keep model-facing background instruction out of rendered shell output

Browse source
This commit is contained in:
Kit Langton 2026-07-02 09:22:11 -04:00
commit 9b5f689b4e
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packages/core/src/tool/shell.ts
View file

@ -18,10 +18,12 @@ export const DEFAULT_TIMEOUT_MS = 2 * 60 * 1_000
export const MAX_TIMEOUT_MS = 10 * 60 * 1_000
export const MAX_CAPTURE_BYTES = 1024 * 1024
// Persisted in the transcript, so it must stay accurate after the command later
// finishes; do not claim the command is currently running.
const BACKGROUND_STARTED =
"The command was moved to the background. You will be notified automatically when it finishes. DO NOT sleep, poll, or proactively check on its progress."
// Rendered in clients and persisted in the transcript, so it must stay accurate
// after the command later finishes; do not claim the command is currently running.
// The model-facing behavioral instruction lives in modelOutput instead.
const BACKGROUND_STARTED = "The command was moved to the background."
const BACKGROUND_INSTRUCTION =
"You will be notified automatically when the command finishes. DO NOT sleep, poll, or proactively check on its progress."
export const Input = Schema.Struct({
command: Schema.String.annotate({ description: "Shell command string to execute" }),
@ -56,10 +58,11 @@ const Output = Schema.Struct({
type Output = typeof Output.Type
const modelOutput = (output: Output): string | undefined => {
if (output.status === "running") return undefined
const warnings = output.warnings?.length
? `\n\nWarnings:\n${output.warnings.map((warning) => `- ${warning}`).join("\n")}`
: ""
if (output.status === "running")
return `${warnings.trimStart()}${warnings ? "\n\n" : ""}${BACKGROUND_INSTRUCTION}`
if (output.timeout) return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command timed out before completion.`
return `${warnings.trimStart()}${warnings ? "\n\n" : ""}Command exited with code ${output.exit}.`
}

9
packages/core/test/tool-shell.test.ts
View file

@ -513,9 +513,14 @@ describe("ShellTool", () => {
const structured = settled.output?.structured as Record<string, unknown> | undefined
const shellID = typeof structured?.shellID === "string" ? structured.shellID : undefined
expect(settled.output?.structured).toMatchObject({ truncated: false })
expect(settled.output?.content[0]).toMatchObject({
// content[0] is rendered by clients; the model-facing instruction stays in content[1].
expect(settled.output?.content[0]).toEqual({
type: "text",
text: expect.stringContaining("moved to the background"),
text: "The command was moved to the background.",
})
expect(settled.output?.content[1]).toMatchObject({
type: "text",
text: expect.stringContaining("DO NOT sleep, poll"),
})
expect(shellID).toStartWith("sh_")