Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion packages/opencode/src/cli/cmd/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { EOL } from "os"
import { Filesystem } from "@/util/filesystem"
import { createOpencodeClient, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
import { FormatError, FormatUnknownError } from "../error"
import { createInterface } from "node:readline"
import { INTERACTIVE_INPUT_ERROR, resolveInteractiveStdin } from "./run/runtime.stdin"

type ModelInput = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
Expand Down Expand Up @@ -413,7 +414,8 @@ export const RunCommand = effectCmd({
}
}

const piped = process.stdin.isTTY ? undefined : await Bun.stdin.text()
// In --format json mode, keep stdin open for permission reply channel
const piped = (process.stdin.isTTY || args.format === "json") ? undefined : await Bun.stdin.text()
message = resolveRunInput(message, piped) ?? ""
const initialInput = resolveRunInput(rawMessage, piped)

Expand Down Expand Up @@ -802,6 +804,20 @@ export const RunCommand = effectCmd({
requestID: permission.id,
reply: "once",
})
} else if (args.format === "json") {
emit("permission_asked", {
permission: {
id: permission.id,
sessionID: permission.sessionID,
permission: permission.permission,
patterns: permission.patterns,
metadata: permission.metadata,
always: permission.always,
tool: permission.tool,
},
})
const reply = await readPermissionReply()
await client.permission.reply({ requestID: permission.id, reply })
} else {
UI.println(
UI.Style.TEXT_WARNING_BOLD + "!",
Expand All @@ -817,6 +833,25 @@ export const RunCommand = effectCmd({
}
return error
}

// Read a single JSON reply line from stdin, return the "reply" field.
// Used in --format json mode to receive permission responses.
// Times out after 120s; defaults to "reject" on timeout or parse failure.
async function readPermissionReply(): Promise<string> {
return new Promise<string>((resolve) => {
const rl = createInterface({ input: process.stdin })
const timeout = setTimeout(() => {
rl.close()
resolve("reject")
}, 120000)
rl.on("line", (line: string) => {
if (!line.trim()) return
clearTimeout(timeout)
rl.close()
resolve(JSON.parse(line).reply || "reject")
})
}).catch(() => "reject")
}
const cwd = args.attach ? (directory ?? sess.directory ?? (await current(sdk))) : (directory ?? root)
const client = args.attach ? attachSDK(cwd) : sdk

Expand Down
Loading