@openrig/cli 0.6.14 → 0.7.1

package/daemon/specs/rigs/launch/secrets-manager/secrets-manager.compose.yaml

@@ -9,7 +9,7 @@ services:
       VAULT_DEV_ROOT_TOKEN_ID: "openrig-dev-token"
       VAULT_DEV_LISTEN_ADDRESS: "0.0.0.0:8200"
     ports:
-      - "8200:8200"
+      - "127.0.0.1:8200:8200"
     healthcheck:
       test: ["CMD", "vault", "status", "-address=http://127.0.0.1:8200"]
       interval: 5s

package/dist/acp/connector.d.ts

@@ -0,0 +1,72 @@
+export interface AcpQueueRow {
+    qitemId: string;
+    state: string;
+    destinationSession: string;
+    body: string;
+    resolution?: string | null;
+    tags?: string[] | null;
+}
+/** The queue verbs the connector uses, as the calling seat. `rig acp` wires these to the daemon's queue API. */
+export interface AcpQueue {
+    show(qitemId: string): Promise<AcpQueueRow>;
+    claim(qitemId: string): Promise<void>;
+    /** A note, optionally with a state change. A note-only update stores no resolution (the queue keeps one only on close). */
+    update(qitemId: string, change: {
+        note: string;
+        state?: string;
+    }): Promise<void>;
+    create(row: {
+        destination: string;
+        body: string;
+        summary: string;
+        tags: string[];
+    }): Promise<string>;
+}
+export interface AcpRunOptions {
+    qitemId: string;
+    /** The agent's program and arguments, e.g. ["hermes", "acp"]. No shell. */
+    agent: string[];
+    cwd: string;
+    /** The calling seat, which must own the row. */
+    self: string;
+    /** Who answers permission requests (default: the calling seat). */
+    permissionsTo?: string;
+    /** Load this earlier session instead of starting one; refused rather than replaced when it can't load. */
+    loadSession?: string;
+    runId: string;
+    logPath: string;
+    pollMs?: number;
+    /** Live progress for the terminal running the connector. */
+    progress?: (line: string) => void;
+    /** Resolves when the custodian asks to cancel the turn (Ctrl-C or `rig acp cancel`). */
+    cancelRequested?: Promise<void>;
+    /** Resolves when the custodian detaches without waiting (a second Ctrl-C): stdin closes and the turn reads unknown. */
+    detachRequested?: Promise<void>;
+    /** How long to wait for the agent to exit after its stdin closes (default 5 s). */
+    exitWaitMs?: number;
+}
+export type AcpOutcomeKind = "completed" | "stopped" | "cancelled" | "failed" | "unknown";
+export interface AcpOutcome {
+    kind: AcpOutcomeKind;
+    summary: string;
+    text: string;
+    sessionId?: string;
+}
+/** Agent text that reports a failed turn while still ending it `end_turn` (OpenClaw #178057; its #44294 is open). */
+export declare const INTERRUPTION_MARKERS: string[];
+/** The command a permission row's owner runs; `done` needs a closure reason. */
+export declare const answerCommand: (row: string) => string;
+interface PermissionOption {
+    optionId: string;
+    name?: string;
+    kind?: string;
+}
+export declare function runAcpAssignment(queue: AcpQueue, options: AcpRunOptions): Promise<AcpOutcome>;
+/** The stop reason alone doesn't say the work happened: a silent `end_turn` is unknown, not done. */
+export declare function classify(stopReason: string | undefined, text: string, usage: {
+    used?: number;
+} | undefined, cancelRequestedAt: string | undefined, sessionId?: string): AcpOutcome;
+/** An owner answers with the offered option's id; its kind (allow_once …) works when only one option has it. */
+export declare function chooseOption(offered: PermissionOption[], answer: string | null | undefined): PermissionOption | undefined;
+export {};
+//# sourceMappingURL=connector.d.ts.map

package/dist/acp/connector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/acp/connector.ts"],"names":[],"mappings":"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"}

package/dist/acp/connector.js

@@ -0,0 +1,218 @@
+import { spawn } from "node:child_process";
+import { appendFileSync, mkdirSync } from "node:fs";
+import { dirname } from "node:path";
+import { JsonRpcRequestError, JsonRpcTransportClosed, StdioJsonRpcPeer } from "./json-rpc-stdio.js";
+import { findRunProcesses, RUN_MARKER } from "./run-processes.js";
+/** Agent text that reports a failed turn while still ending it `end_turn` (OpenClaw #178057; its #44294 is open). */
+export const INTERRUPTION_MARKERS = ["[OpenClaw interruption]"];
+const FINAL_STATES = new Set(["done", "canceled", "handed-off", "failed", "denied"]);
+const NOTE_TEXT_LIMIT = 6000;
+/** The command a permission row's owner runs; `done` needs a closure reason. */
+export const answerCommand = (row) => `rig queue update ${row} --state done --closure-reason no-follow-on --resolution <optionId>`;
+class DetachedBeforeTurnEnd extends Error {
+}
+export async function runAcpAssignment(queue, options) {
+    const progress = options.progress ?? (() => { });
+    const pollMs = options.pollMs ?? 2000;
+    const permissionsTo = options.permissionsTo ?? options.self;
+    let row = await queue.show(options.qitemId);
+    if (row.destinationSession !== options.self) {
+        throw new Error(`${options.qitemId} belongs to ${row.destinationSession}; run rig acp from that seat, or hand the row to ${options.self} first`);
+    }
+    if (row.state === "pending") {
+        await queue.claim(options.qitemId);
+        row = await queue.show(options.qitemId);
+    }
+    if (row.state !== "in-progress")
+        throw new Error(`${options.qitemId} is ${row.state}; rig acp runs an in-progress or pending row`);
+    mkdirSync(dirname(options.logPath), { recursive: true });
+    const log = (entry) => appendFileSync(options.logPath, `${JSON.stringify({ at: new Date().toISOString(), ...entry })}\n`);
+    const child = spawn(options.agent[0], options.agent.slice(1), {
+        cwd: options.cwd, stdio: "pipe", env: { ...process.env, [RUN_MARKER]: options.runId },
+    });
+    child.stderr.on("data", (data) => log({ direction: "stderr", text: data.toString() }));
+    const spawned = new Promise((resolve, reject) => { child.once("spawn", resolve); child.once("error", reject); });
+    const peer = new StdioJsonRpcPeer(child, (direction, packet) => log({ direction, packet }));
+    let sessionId;
+    let text = "";
+    let usage;
+    let toolCalls = 0;
+    let lastTool = "";
+    let lastProgressNote = Date.now();
+    let turnOver = false;
+    let cancelRequestedAt;
+    peer.onNotification("session/update", (params) => {
+        const { sessionId: from, update } = params;
+        if (!update || from !== sessionId)
+            return; // another session's events never reach this row
+        if (update.sessionUpdate === "agent_message_chunk") {
+            const content = update.content;
+            if (content?.type === "text" && content.text) {
+                text += content.text;
+                progress(content.text);
+            }
+        }
+        else if (update.sessionUpdate === "tool_call") {
+            toolCalls += 1;
+            lastTool = `${update.title ?? "tool"} (${update.kind ?? "other"})`;
+            progress(`\n[tool] ${lastTool}\n`);
+        }
+        else if (update.sessionUpdate === "usage_update") {
+            usage = { used: update.used, size: update.size, cost: update.cost };
+        }
+        if (Date.now() - lastProgressNote >= 60_000) {
+            lastProgressNote = Date.now();
+            void queue.update(row.qitemId, { note: `ACP run ${options.runId} progress: ${toolCalls} tool calls (latest ${lastTool || "none"}), ${text.length} characters of output so far` }).catch(() => { });
+        }
+    });
+    peer.onRequest("session/request_permission", async (params, requestId) => {
+        const request = params;
+        if (request.sessionId !== sessionId)
+            throw Object.assign(new Error(`no turn of session ${request.sessionId} is running here`), { code: -32602 });
+        const offered = request.options ?? [];
+        const toolCall = request.toolCall ?? {};
+        for (;;) {
+            if (turnOver || cancelRequestedAt)
+                return { outcome: { outcome: "cancelled" } };
+            const askId = await queue.create({
+                destination: permissionsTo,
+                summary: `Permission for ${row.qitemId}: ${String(toolCall.title ?? toolCall.toolCallId ?? "a tool call")} (${String(toolCall.kind ?? "other")})`,
+                tags: ["acp-permission", ...(row.tags ?? []).filter((tag) => /^(project|mission|slice):/.test(tag))],
+                body: permissionBody(row.qitemId, options.runId, sessionId, requestId, toolCall, offered, options.logPath),
+            });
+            await queue.update(row.qitemId, { note: `ACP request ${requestId} (session ${sessionId}): permission asked of ${permissionsTo} as ${askId}; the turn waits for that answer` });
+            progress(`\n[permission] asked ${permissionsTo} as ${askId}\n`);
+            for (;;) {
+                await new Promise((resolve) => setTimeout(resolve, pollMs));
+                if (turnOver || cancelRequestedAt) {
+                    await queue.update(askId, { state: "canceled", note: `Stale: the turn of ${row.qitemId} was cancelled before an answer; any answer here is not sent` }).catch(() => { });
+                    return { outcome: { outcome: "cancelled" } };
+                }
+                const ask = await queue.show(askId);
+                // The answer point: a cancel that landed during the read above still wins, and nothing is awaited between here and the reply.
+                if (turnOver || cancelRequestedAt) {
+                    const stale = `Stale: the turn of ${row.qitemId} was cancelled; ${FINAL_STATES.has(ask.state) ? "this answer was" : "any answer here is"} not sent`;
+                    await queue.update(askId, FINAL_STATES.has(ask.state) ? { note: stale } : { state: "canceled", note: stale }).catch(() => { });
+                    return { outcome: { outcome: "cancelled" } };
+                }
+                if (!FINAL_STATES.has(ask.state))
+                    continue;
+                const chosen = chooseOption(offered, ask.resolution);
+                if (chosen) {
+                    void queue.update(row.qitemId, { note: `ACP request ${requestId}: ${permissionsTo} answered ${chosen.optionId} on ${askId}; sent to the agent once` }).catch(() => { });
+                    return { outcome: { outcome: "selected", optionId: chosen.optionId } };
+                }
+                await queue.update(row.qitemId, { note: `ACP request ${requestId}: ${askId} closed ${ask.state} without an offered option (${JSON.stringify(ask.resolution ?? null)}); asking again` });
+                break;
+            }
+        }
+    });
+    const record = async (outcome) => {
+        const shown = outcome.text.length > NOTE_TEXT_LIMIT ? `${outcome.text.slice(0, NOTE_TEXT_LIMIT)}\n… (truncated; the full transcript is in ${options.logPath})` : outcome.text;
+        await queue.update(row.qitemId, {
+            note: `ACP run ${options.runId} outcome ${outcome.kind}: ${outcome.summary}${shown ? `\n\n${shown}` : ""}\nThis is the agent's report, not a judgment of the work; the row stays open for you to judge and close with your own resolution.`,
+        });
+        return outcome;
+    };
+    try {
+        await spawned;
+        const init = await peer.request("initialize", { protocolVersion: 1, clientCapabilities: {}, clientInfo: { name: "openrig", version: "1" } });
+        const loads = init.agentCapabilities?.loadSession === true;
+        if (options.loadSession) {
+            if (!loads)
+                return await record({ kind: "failed", summary: `the agent doesn't advertise loadSession, so session ${options.loadSession} wasn't loaded and no new session was started`, text: "" });
+            await peer.request("session/load", { sessionId: options.loadSession, cwd: options.cwd, mcpServers: [] });
+            sessionId = options.loadSession;
+        }
+        else {
+            sessionId = (await peer.request("session/new", { cwd: options.cwd, mcpServers: [] })).sessionId;
+        }
+        const agent = `${init.agentInfo?.name ?? options.agent[0]} ${init.agentInfo?.version ?? "(no version reported)"}`;
+        await queue.update(row.qitemId, {
+            note: `ACP run ${options.runId}: executor ${agent} (protocol ${init.protocolVersion ?? "?"}, loadSession ${loads ? "advertised" : "not advertised"}), session ${sessionId} ${options.loadSession ? "loaded" : "new"}, custodian ${options.self}; transcript ${options.logPath}`,
+        });
+        void options.cancelRequested?.then(async () => {
+            if (turnOver || cancelRequestedAt)
+                return;
+            cancelRequestedAt = new Date().toISOString();
+            peer.notify("session/cancel", { sessionId });
+            await queue.update(row.qitemId, { note: `ACP run ${options.runId}: cancel requested at ${cancelRequestedAt}; upstream inference and spend are unknown unless the provider shows them` });
+        });
+        // A detach settles the turn here even when the agent keeps its stdout open after stdin closes.
+        const detached = new Promise((_, reject) => {
+            void options.detachRequested?.then(() => { void peer.end(0); reject(new DetachedBeforeTurnEnd()); });
+        });
+        detached.catch(() => { });
+        const response = await Promise.race([peer.request("session/prompt", { sessionId, prompt: [{ type: "text", text: row.body }] }), detached]);
+        turnOver = true;
+        return await record(classify(response.stopReason, text, usage, cancelRequestedAt, sessionId));
+    }
+    catch (error) {
+        turnOver = true;
+        if (error instanceof JsonRpcRequestError) {
+            return await record({ kind: "failed", sessionId, text, summary: `${error.method} returned error ${error.error.code} ${error.error.message}${error.error.data === undefined ? "" : ` ${JSON.stringify(error.error.data)}`}` });
+        }
+        if (error instanceof DetachedBeforeTurnEnd) {
+            return await record({ kind: "unknown", sessionId, text, summary: "detached before the turn ended; the agent may still be working" });
+        }
+        if (error instanceof JsonRpcTransportClosed) {
+            return await record({ kind: "unknown", sessionId, text, summary: "the agent's connection closed before the turn ended" });
+        }
+        return await record({ kind: "failed", sessionId, text, summary: `the agent couldn't be run: ${error.message}` });
+    }
+    finally {
+        turnOver = true;
+        const exit = await peer.end(options.exitWaitMs ?? 5000);
+        const left = await findRunProcesses(options.runId).catch(() => undefined);
+        const settled = left === undefined ? "unknown (the process table couldn't be read)"
+            : left.length === 0 ? "settled: no process carrying this run's marker remains"
+                : `incomplete: ${left.length} process(es) carrying this run's marker still run (${left.map((p) => p.pid).join(", ")}); stop them with the runtime's own stop, or rig acp stop ${options.runId} -- <its stop command>`;
+        await queue.update(row.qitemId, { note: `ACP run ${options.runId} detached: agent ${exit === "still-running" ? "still running after stdin closed" : `exited (code ${exit.code ?? "none"}, signal ${exit.signal ?? "none"})`}; ${settled}` }).catch(() => { });
+        peer.release(); // a still-running agent keeps running, but holds nothing that keeps this process alive
+    }
+}
+/** The stop reason alone doesn't say the work happened: a silent `end_turn` is unknown, not done. */
+export function classify(stopReason, text, usage, cancelRequestedAt, sessionId) {
+    if (stopReason === "cancelled") {
+        return { kind: "cancelled", sessionId, text, summary: `cancel ${cancelRequestedAt ? `requested at ${cancelRequestedAt}, ` : ""}acknowledged by the agent at ${new Date().toISOString()} (stopReason cancelled); upstream spend is unknown` };
+    }
+    if (stopReason !== "end_turn")
+        return { kind: "stopped", sessionId, text, summary: `the agent stopped with ${stopReason ?? "no stop reason"}` };
+    const interruption = INTERRUPTION_MARKERS.find((marker) => text.includes(marker));
+    if (interruption)
+        return { kind: "unknown", sessionId, text, summary: `the agent ended its turn but reported an interruption (${interruption}); not treated as done` };
+    if (!text.trim() && !(usage?.used && usage.used > 0)) {
+        return { kind: "unknown", sessionId, text, summary: `the agent ended its turn with no output and ${usage ? "zero" : "no"} usage reported; not treated as done` };
+    }
+    return { kind: "completed", sessionId, text, summary: "the agent ended its turn (end_turn)" };
+}
+/** An owner answers with the offered option's id; its kind (allow_once …) works when only one option has it. */
+export function chooseOption(offered, answer) {
+    const value = answer?.trim();
+    if (!value)
+        return undefined;
+    const byId = offered.find((option) => option.optionId === value);
+    if (byId)
+        return byId;
+    const byKind = offered.filter((option) => option.kind === value);
+    return byKind.length === 1 ? byKind[0] : undefined;
+}
+function permissionBody(qitemId, runId, sessionId, requestId, toolCall, offered, logPath) {
+    const input = toolCall.rawInput === undefined ? undefined : JSON.stringify(toolCall.rawInput);
+    const where = Array.isArray(toolCall.locations) ? toolCall.locations.map((l) => l.path).filter(Boolean).join(", ") : "";
+    return [
+        `# The ACP agent working on ${qitemId} asks permission`,
+        "",
+        `- **Action:** ${String(toolCall.title ?? "(no title)")} (kind ${String(toolCall.kind ?? "other")}, tool call ${String(toolCall.toolCallId ?? "?")})`,
+        where ? `- **Target:** ${where}` : undefined,
+        input === undefined ? undefined : input.length > 2000 ? `- **Input:** \`${input.slice(0, 2000)}\` … (truncated; the full input is in ${logPath})` : `- **Input:** \`${input}\``,
+        `- **Asked by:** ACP run ${runId}, session ${sessionId}, request ${requestId}`,
+        "",
+        "**Options the agent offered:**",
+        ...offered.map((option) => `- \`${option.optionId}\`: ${option.name ?? ""}${option.kind ? ` (${option.kind})` : ""}`),
+        "",
+        `Answer on this row with \`${answerCommand("<this row>")}\`; don't hand it off.`,
+        "The agent's own settings and policy decide what it asks; your answer goes back to this one request, once. The turn waits until you answer.",
+    ].filter((line) => line !== undefined).join("\n");
+}
+//# sourceMappingURL=connector.js.map

package/dist/acp/connector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/acp/connector.ts"],"names":[],"mappings":"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"}

package/dist/acp/json-rpc-stdio.d.ts

@@ -0,0 +1,53 @@
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
+export interface JsonRpcErrorObject {
+    code: number;
+    message: string;
+    data?: unknown;
+}
+/** An error the agent returned, with its original code, message and data kept for the record. */
+export declare class JsonRpcRequestError extends Error {
+    readonly method: string;
+    readonly error: JsonRpcErrorObject;
+    constructor(method: string, error: JsonRpcErrorObject);
+}
+/** The connection ended before the agent answered; the request's effect is unknown. */
+export declare class JsonRpcTransportClosed extends Error {
+    readonly method: string;
+    constructor(method: string);
+}
+export type JsonRpcId = number | string;
+export type IncomingRequestHandler = (params: unknown, id: JsonRpcId) => Promise<unknown>;
+export type NotificationHandler = (params: unknown) => void;
+/** Every packet in both directions, in order; lines that aren't JSON arrive as `in-text`. */
+export type PacketRecorder = (direction: "out" | "in" | "in-text", packet: unknown) => void;
+export declare class StdioJsonRpcPeer {
+    private readonly child;
+    private readonly record;
+    private nextId;
+    private readonly pending;
+    private readonly requestHandlers;
+    private readonly notificationHandlers;
+    private ended;
+    private readonly lines;
+    readonly exited: Promise<{
+        code: number | null;
+        signal: NodeJS.Signals | null;
+    }>;
+    constructor(child: ChildProcessWithoutNullStreams, record?: PacketRecorder);
+    request(method: string, params: unknown): Promise<unknown>;
+    notify(method: string, params: unknown): void;
+    onRequest(method: string, handler: IncomingRequestHandler): void;
+    onNotification(method: string, handler: NotificationHandler): void;
+    /** Close the agent's stdin (detach) and wait for the process to exit, up to `timeoutMs`. */
+    end(timeoutMs: number): Promise<{
+        code: number | null;
+        signal: NodeJS.Signals | null;
+    } | "still-running">;
+    /** Drop this side's hold on the agent (its pipes and process handle) without signalling it, so a detached agent that
+     *  keeps running doesn't keep the caller's process alive. */
+    release(): void;
+    private send;
+    private receive;
+    private answer;
+}
+//# sourceMappingURL=json-rpc-stdio.d.ts.map

package/dist/acp/json-rpc-stdio.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-rpc-stdio.d.ts","sourceRoot":"","sources":["../../src/acp/json-rpc-stdio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AAOzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,iGAAiG;AACjG,qBAAa,mBAAoB,SAAQ,KAAK;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM;IAAE,QAAQ,CAAC,KAAK,EAAE,kBAAkB;gBAAlD,MAAM,EAAE,MAAM,EAAW,KAAK,EAAE,kBAAkB;CAIxE;AAED,uFAAuF;AACvF,qBAAa,sBAAuB,SAAQ,KAAK;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;CAIpC;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AACxC,MAAM,MAAM,sBAAsB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAC1F,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;AAC5D,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GAAG,CAAC,SAAS,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;AAE5F,qBAAa,gBAAgB;IASf,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAkC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAR3F,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+G;IACvI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;IAC7E,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA0C;IAC/E,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;IAC3D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;gBAEpD,KAAK,EAAE,8BAA8B,EAAmB,MAAM,GAAE,cAAyB;IActH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAS1D,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAI7C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIhE,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIlE,4FAA4F;IACtF,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,GAAG,eAAe,CAAC;IAO/G;iEAC6D;IAC7D,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,IAAI;IAKZ,OAAO,CAAC,OAAO;YA0BD,MAAM;CAcrB"}

package/dist/acp/json-rpc-stdio.js

@@ -0,0 +1,141 @@
+import { createInterface } from "node:readline";
+/** An error the agent returned, with its original code, message and data kept for the record. */
+export class JsonRpcRequestError extends Error {
+    method;
+    error;
+    constructor(method, error) {
+        super(`${method} failed: ${error.code} ${error.message}`);
+        this.method = method;
+        this.error = error;
+        this.name = "JsonRpcRequestError";
+    }
+}
+/** The connection ended before the agent answered; the request's effect is unknown. */
+export class JsonRpcTransportClosed extends Error {
+    method;
+    constructor(method) {
+        super(`${method}: the agent's connection closed before it answered`);
+        this.method = method;
+        this.name = "JsonRpcTransportClosed";
+    }
+}
+export class StdioJsonRpcPeer {
+    child;
+    record;
+    nextId = 0;
+    pending = new Map();
+    requestHandlers = new Map();
+    notificationHandlers = new Map();
+    ended = false;
+    lines;
+    exited;
+    constructor(child, record = () => { }) {
+        this.child = child;
+        this.record = record;
+        this.lines = createInterface({ input: child.stdout });
+        this.lines.on("line", (line) => this.receive(line));
+        this.exited = new Promise((resolve) => child.once("close", (code, signal) => {
+            this.ended = true;
+            for (const [id, request] of this.pending) {
+                this.pending.delete(id);
+                request.reject(new JsonRpcTransportClosed(request.method));
+            }
+            resolve({ code, signal });
+        }));
+        child.stdin.on("error", () => { });
+    }
+    request(method, params) {
+        if (this.ended)
+            return Promise.reject(new JsonRpcTransportClosed(method));
+        const id = ++this.nextId;
+        return new Promise((resolve, reject) => {
+            this.pending.set(id, { method, resolve, reject });
+            this.send({ jsonrpc: "2.0", id, method, params });
+        });
+    }
+    notify(method, params) {
+        if (!this.ended)
+            this.send({ jsonrpc: "2.0", method, params });
+    }
+    onRequest(method, handler) {
+        this.requestHandlers.set(method, handler);
+    }
+    onNotification(method, handler) {
+        this.notificationHandlers.set(method, handler);
+    }
+    /** Close the agent's stdin (detach) and wait for the process to exit, up to `timeoutMs`. */
+    async end(timeoutMs) {
+        this.child.stdin.end();
+        let timer;
+        const timeout = new Promise((resolve) => { timer = setTimeout(() => resolve("still-running"), timeoutMs); });
+        try {
+            return await Promise.race([this.exited, timeout]);
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    /** Drop this side's hold on the agent (its pipes and process handle) without signalling it, so a detached agent that
+     *  keeps running doesn't keep the caller's process alive. */
+    release() {
+        this.lines.close();
+        for (const stream of [this.child.stdin, this.child.stdout, this.child.stderr])
+            stream.destroy();
+        this.child.unref();
+    }
+    send(packet) {
+        this.record("out", packet);
+        this.child.stdin.write(`${JSON.stringify(packet)}\n`);
+    }
+    receive(line) {
+        if (!line.trim())
+            return;
+        let packet;
+        try {
+            const parsed = JSON.parse(line);
+            if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+                throw new Error("not an object");
+            packet = parsed;
+        }
+        catch {
+            this.record("in-text", line);
+            return;
+        }
+        this.record("in", packet);
+        const { id, method } = packet;
+        if (typeof method === "string" && (typeof id === "number" || typeof id === "string")) {
+            void this.answer(method, id, packet.params);
+        }
+        else if (typeof method === "string") {
+            this.notificationHandlers.get(method)?.(packet.params);
+        }
+        else if (typeof id === "number" || typeof id === "string") {
+            const request = this.pending.get(id);
+            if (!request)
+                return; // a reply to nothing we asked; already recorded
+            this.pending.delete(id);
+            if (packet.error && typeof packet.error === "object")
+                request.reject(new JsonRpcRequestError(request.method, packet.error));
+            else
+                request.resolve(packet.result);
+        }
+    }
+    async answer(method, id, params) {
+        const handler = this.requestHandlers.get(method);
+        if (!handler) {
+            this.send({ jsonrpc: "2.0", id, error: { code: -32601, message: `Client does not handle ${method}` } });
+            return;
+        }
+        try {
+            const result = await handler(params, id);
+            if (!this.ended)
+                this.send({ jsonrpc: "2.0", id, result });
+        }
+        catch (error) {
+            const code = typeof error.code === "number" ? error.code : -32603;
+            if (!this.ended)
+                this.send({ jsonrpc: "2.0", id, error: { code, message: error.message } });
+        }
+    }
+}
+//# sourceMappingURL=json-rpc-stdio.js.map

package/dist/acp/json-rpc-stdio.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-rpc-stdio.js","sourceRoot":"","sources":["../../src/acp/json-rpc-stdio.ts"],"names":[],"mappings":"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"}

package/dist/acp/run-processes.d.ts

@@ -0,0 +1,10 @@
+/** Set in the agent's environment by `rig acp run`; every process it launches inherits it, even one that detaches
+ *  (PPID 1), which is how a run finds what it started without touching anything it didn't. */
+export declare const RUN_MARKER = "OPENRIG_ACP_RUN";
+/** Only the pid: on macOS the listing carries the environment, which may hold secrets, so nothing else leaves here. */
+export interface RunProcess {
+    pid: number;
+}
+/** The caller's processes carrying this run's marker. Linux reads /proc; elsewhere `ps e` shows own environments. */
+export declare function findRunProcesses(runId: string): Promise<RunProcess[]>;
+//# sourceMappingURL=run-processes.d.ts.map

package/dist/acp/run-processes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-processes.d.ts","sourceRoot":"","sources":["../../src/acp/run-processes.ts"],"names":[],"mappings":"AAIA;8FAC8F;AAC9F,eAAO,MAAM,UAAU,oBAAoB,CAAC;AAE5C,uHAAuH;AACvH,MAAM,WAAW,UAAU;IAAG,GAAG,EAAE,MAAM,CAAA;CAAE;AAE3C,qHAAqH;AACrH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAoB3E"}

package/dist/acp/run-processes.js

@@ -0,0 +1,33 @@
+import { execFile } from "node:child_process";
+import { readdir, readFile } from "node:fs/promises";
+import { promisify } from "node:util";
+/** Set in the agent's environment by `rig acp run`; every process it launches inherits it, even one that detaches
+ *  (PPID 1), which is how a run finds what it started without touching anything it didn't. */
+export const RUN_MARKER = "OPENRIG_ACP_RUN";
+/** The caller's processes carrying this run's marker. Linux reads /proc; elsewhere `ps e` shows own environments. */
+export async function findRunProcesses(runId) {
+    const marker = `${RUN_MARKER}=${runId}`;
+    if (process.platform === "linux") {
+        const found = [];
+        for (const entry of await readdir("/proc")) {
+            if (!/^\d+$/.test(entry))
+                continue;
+            try {
+                const environ = await readFile(`/proc/${entry}/environ`, "utf8");
+                if (!environ.split("\0").includes(marker))
+                    continue;
+                found.push({ pid: Number(entry) });
+            }
+            catch { /* exited, or not ours to read */ }
+        }
+        return found;
+    }
+    const { stdout } = await promisify(execFile)("ps", ["axeww", "-o", "pid=,command="], { maxBuffer: 32 * 1024 * 1024 });
+    return stdout.split("\n").flatMap((line) => {
+        const match = /^\s*(\d+)\s+(.*)$/.exec(line);
+        if (!match || !match[2].split(/\s+/).includes(marker))
+            return [];
+        return [{ pid: Number(match[1]) }];
+    });
+}
+//# sourceMappingURL=run-processes.js.map

package/dist/acp/run-processes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-processes.js","sourceRoot":"","sources":["../../src/acp/run-processes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;8FAC8F;AAC9F,MAAM,CAAC,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAK5C,qHAAqH;AACrH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAa;IAClD,MAAM,MAAM,GAAG,GAAG,UAAU,IAAI,KAAK,EAAE,CAAC;IACxC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,KAAK,GAAiB,EAAE,CAAC;QAC/B,KAAK,MAAM,KAAK,IAAI,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;gBAAE,SAAS;YACnC,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAE,SAAS;gBACpD,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACrC,CAAC;YAAC,MAAM,CAAC,CAAC,iCAAiC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;IACtH,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAClE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/build-info.js

@@ -1,9 +1,9 @@
 // GENERATED by scripts/build-package.sh — the packaged build-identity stamp.
 export const BUILD_INFO = {
-  semver: "0.6.14",
-  commit: "df1c1517f03a403fb468523be1c563d489209a1d",
+  semver: "0.7.1",
+  commit: "1e392d56c31a23652da3ba78fade1acb077dea86",
   dirty: false,
-  builtAt: "2026-10-21T05:06:10Z",
+  builtAt: "2026-10-24T23:58:57Z",
 };
 export function stampFields(info = BUILD_INFO) {
   if (!info.commit) return {};

package/dist/cli-error.d.ts

@@ -38,6 +38,10 @@ export declare function renderDaemonTransportError(e: unknown, io: {
     err: (l: string) => void;
     json: boolean;
 }): boolean;
+/** For a command's own catch around a daemon request: renders a daemon transport error as the shared
+ *  path does (a timeout says the outcome is unknown and to check its effect before any retry) and returns
+ *  true; returns false for any other error, which the caller reports as before. */
+export declare function renderCaughtTransportError(e: unknown, json?: boolean): boolean;
 /**
  * Parse+run the program through the shared error path. Injectable IO for tests.
  * Returns the process exit code (0 on success / clean help/version).