@monoes/monomindcli 2.7.16 → 2.8.0

package/dist/src/orgrt/kimicode-runner.js

@@ -0,0 +1,363 @@
+// packages/@monomind/cli/src/orgrt/kimicode-runner.ts
+/**
+ * KimiCodeAgentRunner — AgentRunner impl backed by the Kimi Code CLI.
+ *
+ * Architectural difference from ClaudeAgentRunner:
+ *   - Claude's `query()` runs the whole agent loop IN-PROCESS (tools execute
+ *     inside the same Node process as the daemon). That's why ClaudeAgentRunner
+ *     can register org tools (org_send, ask_human, …) directly via
+ *     createSdkMcpServer.
+ *   - Kimi Code has no embeddable SDK. The CLI is driven as a subprocess:
+ *     `kimi -p "<prompt>" --output-format stream-json` runs one non-interactive
+ *     turn and emits JSONL events on stdout (verified against kimi 0.29.2:
+ *     {"role":"assistant","content":...} per reply, then a
+ *     {"role":"meta","type":"session.resume_hint",session_id} event).
+ *     Session continuity comes from `--session <id>` on later turns.
+ *     ARG ORDER MATTERS: the prompt must immediately follow `-p` — flags in
+ *     between are consumed as the prompt text.
+ *
+ * Org tools (org_send, knowledge_search, ask_human, …) — FENCE PROTOCOL:
+ *   kimi's tool surface can only be extended via MCP servers or plugins, both
+ *   loaded by the CLI itself, not by an external caller per-turn. Instead the
+ *   tools are rendered INTO the role's system prompt: the model emits
+ *   ```tool_call fenced JSON blocks, this runner parses them out of the
+ *   assistant text, executes the real OrgToolDef handlers in-process (the same
+ *   handlers ClaudeAgentRunner registers with the SDK), and feeds the results
+ *   back as the next prompt IN THE SAME kimi session. Loop repeats until a
+ *   turn produces no tool calls (cap: MAX_TOOL_ROUNDS). Tool-call fences are
+ *   stripped from the text yielded to session.ts so the bus only sees prose.
+ *
+ * Usage accounting — WIRE FILE:
+ *   kimi's stream-json has no usage/result event, but every session writes
+ *   usage.record entries to $KIMI_CODE_HOME/sessions/<wd>/<session_id>/
+ *   agents/main/wire.jsonl. After each CLI turn this runner reads the new
+ *   entries written since each round started (timestamp-filtered, so a
+ *   resumed session's historical entries are never double-counted) and
+ *   attaches the summed tokens to the synthesized result message session.ts
+ *   needs for budget checks.
+ *
+ * Non-disturbance guarantees (mirrors the opencode integration):
+ *   - No new package dependency: the runner shells out to the `kimi` binary
+ *     via node:child_process; nothing is imported at module load time.
+ *   - The runner is only constructed when MONOMIND_RUNTIME=kimicode is set
+ *     (daemon.ts runner resolution). Without the env var, or without a `kimi`
+ *     binary on PATH, the Claude path is byte-for-byte unchanged and run()
+ *     rejects with a clear actionable error instead of crashing at import.
+ */
+import { spawn } from 'node:child_process';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { buildToolProtocol, parseToolCalls, executeToolCall, formatToolResults, MAX_TOOL_ROUNDS, TOOL_CALL_RE } from './tool-fence.js';
+/** How long a single `kimi -p` invocation may run before we kill it (2 hours,
+ *  matching kimi's own subagent default). */
+const TURN_TIMEOUT_MS = 2 * 60 * 60 * 1000;
+export class KimiCodeAgentRunner {
+    kimiBin;
+    constructor(kimiBin) {
+        this.kimiBin = kimiBin;
+    }
+    async *run(args) {
+        const bin = this.kimiBin || process.env.KIMI_CLI_BIN || 'kimi';
+        // The system prompt reaches kimi as an agent file (--agent-file binds the
+        // agent at session creation; resume restores it, so later turns only need
+        // --session). Written to a per-run temp dir and cleaned up in finally.
+        const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'monomind-kimi-'));
+        const agentFile = path.join(tmpDir, 'org-role.md');
+        fs.writeFileSync(agentFile, `---\nname: monomind-org-role\ndescription: Monomind org role (managed by monomind orgrt)\n---\n\n` +
+            args.systemPrompt + buildToolProtocol(args.tools));
+        let sessionId = args.resume;
+        try {
+            for await (const p of args.prompt) {
+                const text = typeof p === 'string' ? p : (p?.message?.content ?? String(p ?? ''));
+                let nextPrompt = text;
+                let turnInputTokens = 0;
+                let turnOutputTokens = 0;
+                // Tool-call loop: keep driving the same kimi session until a turn
+                // produces no tool_call fences (or the round cap hits).
+                for (let round = 0; round <= MAX_TOOL_ROUNDS; round++) {
+                    const roundStart = Date.now();
+                    const outcome = await this.runTurn(bin, nextPrompt, sessionId, args, agentFile);
+                    if (outcome.sessionId)
+                        sessionId = outcome.sessionId;
+                    if (outcome.exitCode !== 0) {
+                        throw turnError(outcome, round, bin);
+                    }
+                    for (const t of outcome.texts) {
+                        if (t.trim())
+                            yield { type: 'assistant', session_id: sessionId, text: t };
+                    }
+                    const usage = this.readUsageDelta(sessionId, args.env, roundStart);
+                    turnInputTokens += usage.input;
+                    turnOutputTokens += usage.output;
+                    const calls = parseToolCalls(outcome.rawTexts);
+                    if (calls.length === 0)
+                        break;
+                    if (round === MAX_TOOL_ROUNDS) {
+                        yield {
+                            type: 'assistant',
+                            session_id: sessionId,
+                            text: `[monomind] tool-call round cap (${MAX_TOOL_ROUNDS}) reached — dropping ${calls.length} pending tool call(s)`,
+                        };
+                        break;
+                    }
+                    // Execute the real OrgToolDef handlers in-process and feed results
+                    // back into the same kimi session as the next prompt.
+                    const results = [];
+                    for (const call of calls) {
+                        results.push(await executeToolCall(args.tools, call));
+                    }
+                    nextPrompt = formatToolResults(calls, results);
+                }
+                // kimi emits no usage/result event, so synthesize one per mailbox
+                // prompt: session.ts uses result messages for usage accounting and
+                // budget checks, and other runners yield exactly one result per turn.
+                yield {
+                    type: 'result',
+                    session_id: sessionId,
+                    subtype: 'success',
+                    input_tokens: turnInputTokens,
+                    output_tokens: turnOutputTokens,
+                };
+            }
+        }
+        catch (err) {
+            // Spawn-level failure (binary missing) gets the opencode-style guidance.
+            if (err.code === 'ENOENT') {
+                throw new Error('KimiCodeAgentRunner requires the Kimi Code CLI (kimi) on PATH. ' +
+                    'Install it and log in, or unset MONOMIND_RUNTIME to use the Claude runner.');
+            }
+            throw err;
+        }
+        finally {
+            try {
+                fs.rmSync(tmpDir, { recursive: true, force: true });
+            }
+            catch { /* best-effort */ }
+        }
+    }
+    /** Run one `kimi -p` invocation and normalize its stream-json output. */
+    runTurn(bin, promptText, sessionId, args, agentFile) {
+        return new Promise((resolve, reject) => {
+            // ARG ORDER MATTERS: -p consumes the IMMEDIATELY following argument as
+            // the prompt. Putting flags in between (e.g. `-p --session <id> text`)
+            // makes kimi consume the flag as the prompt and fail with
+            // "unknown command". Prompt first, flags after.
+            const cliArgs = ['-p', promptText, '--output-format', 'stream-json'];
+            if (sessionId) {
+                cliArgs.push('--session', sessionId);
+            }
+            else {
+                // First turn: bind the role's system prompt via --agent-file.
+                // (--agent-file and --session/--continue are mutually exclusive.)
+                cliArgs.push('--agent-file', agentFile);
+            }
+            // Model only on the first turn: the session binds it at creation and
+            // kimi rejects model changes on resume.
+            if (args.model && !sessionId)
+                cliArgs.push('--model', args.model);
+            const child = spawn(bin, cliArgs, {
+                cwd: args.cwd,
+                env: {
+                    ...process.env,
+                    ...args.env,
+                    // --agent-file (the role's system prompt) requires kimi's v2
+                    // engine; without this the CLI exits 1 with
+                    // "--agent-file is only available with the v2 engine".
+                    KIMI_CODE_EXPERIMENTAL_FLAG: process.env.KIMI_CODE_EXPERIMENTAL_FLAG || '1',
+                },
+                stdio: ['ignore', 'pipe', 'pipe'],
+            });
+            let stderrTail = '';
+            child.stderr?.on('data', (c) => {
+                stderrTail = (stderrTail + c.toString()).slice(-4000);
+            });
+            // Arm the turn timeout BEFORE consuming stdout — a hung CLI must be
+            // killed while we're still reading, not after it finishes.
+            let timedOut = false;
+            const KILL_GRACE_MS = 5000;
+            let killTimer;
+            const timer = setTimeout(() => {
+                timedOut = true;
+                child.kill('SIGTERM');
+                // A wedged CLI that ignores SIGTERM must not leak a zombie per turn:
+                // escalate to SIGKILL after a short grace period.
+                killTimer = setTimeout(() => { try {
+                    child.kill('SIGKILL');
+                }
+                catch { /* already gone */ } }, KILL_GRACE_MS);
+                killTimer.unref?.();
+            }, TURN_TIMEOUT_MS);
+            // Attach the exit promise BEFORE consuming stdout: on a spawn failure
+            // (ENOENT, bad binary) the 'error' event fires almost immediately —
+            // if no listener is attached yet it escapes as an unhandled 'error'
+            // event and crashes the process instead of reaching our catch block.
+            const exitPromise = new Promise((res, rej) => {
+                child.on('error', rej);
+                child.on('close', (code) => res(code ?? 1));
+            });
+            // Prevent an unhandled-rejection crash if the stdout loop below throws
+            // before we await exitPromise (the await still sees the rejection).
+            exitPromise.catch(() => { });
+            (async () => {
+                let buf = '';
+                const lines = [];
+                for await (const chunk of child.stdout) {
+                    buf += chunk.toString();
+                    const parts = buf.split('\n');
+                    buf = parts.pop() ?? '';
+                    for (const line of parts)
+                        lines.push(line);
+                }
+                if (buf.trim())
+                    lines.push(buf);
+                return lines;
+            })().then((lines) => exitPromise.finally(() => { clearTimeout(timer); if (killTimer)
+                clearTimeout(killTimer); }).then((exitCode) => ({ lines, exitCode })))
+                .then(({ lines, exitCode }) => {
+                const parsed = parseStreamJsonLines(lines);
+                resolve({
+                    texts: parsed.texts,
+                    rawTexts: parsed.rawTexts,
+                    sessionId: parsed.sessionId ?? sessionId,
+                    exitCode,
+                    stderrTail,
+                    timedOut,
+                });
+            }, reject);
+        });
+    }
+    /**
+     * Sum usage.record entries in the session's wire.jsonl written at or after
+     * `since` (the round's start time). Timestamp filtering (not line offsets)
+     * is what makes resume safe: a resumed session's wire file already contains
+     * historical entries from previous processes, and those must not be
+     * double-counted. Returns zeros when the wire file can't be found — usage
+     * reporting must never break a turn.
+     */
+    readUsageDelta(sessionId, env, since) {
+        if (!sessionId)
+            return { input: 0, output: 0 };
+        try {
+            const home = env.KIMI_CODE_HOME || process.env.KIMI_CODE_HOME || path.join(os.homedir(), '.kimi-code');
+            const sessionsDir = path.join(home, 'sessions');
+            const wirePath = findWireFile(sessionsDir, sessionId);
+            if (!wirePath)
+                return { input: 0, output: 0 };
+            const lines = fs.readFileSync(wirePath, 'utf-8').split('\n').filter(Boolean);
+            let input = 0, output = 0;
+            for (const line of lines) {
+                let ev;
+                try {
+                    ev = JSON.parse(line);
+                }
+                catch {
+                    continue;
+                }
+                if (ev.type !== 'usage.record')
+                    continue;
+                if (typeof ev.time === 'number' && ev.time < since)
+                    continue;
+                const u = (ev.usage ?? {});
+                input += (u.inputOther ?? 0) + (u.inputCacheRead ?? 0) + (u.inputCacheCreation ?? 0);
+                output += u.output ?? 0;
+            }
+            return { input, output };
+        }
+        catch {
+            return { input: 0, output: 0 };
+        }
+    }
+}
+/** Locate $KIMI_CODE_HOME/sessions/<wd>/<sessionId>/agents/main/wire.jsonl.
+ *  The wd_ directory name is a hash of the cwd — scan one level instead of
+ *  reimplementing the hash. */
+function findWireFile(sessionsDir, sessionId) {
+    let wds;
+    try {
+        wds = fs.readdirSync(sessionsDir);
+    }
+    catch {
+        return null;
+    }
+    for (const wd of wds) {
+        const candidate = path.join(sessionsDir, wd, sessionId, 'agents', 'main', 'wire.jsonl');
+        try {
+            if (fs.statSync(candidate).isFile())
+                return candidate;
+        }
+        catch { /* keep looking */ }
+    }
+    return null;
+}
+/**
+ * Parse kimi stream-json lines into normalized texts + session id.
+ * Exported for unit tests — this encodes the wire format verified against
+ * kimi 0.29.2, and a CLI format change should fail loudly in CI, not silently
+ * starve an org at runtime.
+ *
+ * Real shapes (verified):
+ *   {"role":"assistant","content":"..."}                 — reply text
+ *   {"role":"assistant","content":[{"type":"text",...}]} — block form
+ *   {"role":"meta","type":"session.resume_hint",session_id} — resume hint
+ *   {"role":"tool",...}                                  — tool progress (ignored)
+ */
+export function parseStreamJsonLines(lines) {
+    const texts = [];
+    const rawTexts = [];
+    let sessionId;
+    for (const line of lines) {
+        const t = line.trim();
+        if (!t || !t.startsWith('{'))
+            continue;
+        let ev;
+        try {
+            ev = JSON.parse(t);
+        }
+        catch {
+            continue;
+        }
+        // Capture the session id from ANY event that carries it — resume needs it
+        // on the next turn.
+        const sid = (ev.session_id ?? ev.sessionId ?? ev.session?.id);
+        if (sid && typeof sid === 'string')
+            sessionId = sid;
+        const role = (ev.role ?? ev.type);
+        if (role === 'assistant') {
+            const content = ev.content ?? ev.message?.content;
+            let text = '';
+            if (typeof content === 'string') {
+                text = content;
+            }
+            else if (Array.isArray(content)) {
+                text = content
+                    .filter((b) => b?.type === 'text')
+                    .map((b) => String(b.text ?? ''))
+                    .join('\n');
+            }
+            else if (typeof ev.text === 'string') {
+                text = ev.text;
+            }
+            if (text) {
+                rawTexts.push(text);
+                const stripped = text.replace(TOOL_CALL_RE, '').trim();
+                if (stripped)
+                    texts.push(stripped);
+            }
+        }
+    }
+    return { texts, rawTexts, sessionId };
+}
+/** Build the actionable error for a failed CLI turn. */
+function turnError(outcome, round, bin) {
+    if (outcome.timedOut) {
+        return new Error(`KimiCodeAgentRunner: kimi turn (tool round ${round}) exceeded the ${Math.round(TURN_TIMEOUT_MS / 60000)}min ` +
+            `turn timeout and was killed.${outcome.stderrTail ? ` stderr: ${outcome.stderrTail.slice(-500)}` : ''}`);
+    }
+    const hint = bin === 'kimi' || bin.endsWith('/kimi')
+        ? ' Is the Kimi Code CLI installed and logged in (kimi --version, /login)?'
+        : '';
+    return new Error(`KimiCodeAgentRunner: kimi exited with code ${outcome.exitCode} (tool round ${round}).${hint}` +
+        (outcome.stderrTail ? ` stderr: ${outcome.stderrTail.slice(-500)}` : ''));
+}
+//# sourceMappingURL=kimicode-runner.js.map

package/dist/src/orgrt/kimicode-runner.js.map

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

package/dist/src/orgrt/mailbox.d.ts

@@ -15,11 +15,20 @@ export interface OrgUserMessage {
  */
 export declare class Mailbox {
     private static readonly MAX_QUEUE;
+    /** Prefix tagging self-continuation pushes (turn-limit resume) so stream() can
+     *  tell them apart from real deliveries and the restart loop can detect a role
+     *  that is spinning on its own continuations without making progress. */
+    static readonly CONTINUE_PREFIX = "[system:turn-continue]";
     private queue;
     private wake;
     private closed;
     /** Bumped when a new stream() starts; stale generators see the mismatch and exit. */
     private generation;
+    /** Monotonic count of REAL (non-continuation) messages consumed by stream().
+     *  The restart loop snapshots this around a session to tell progress from spin. */
+    private consumedReal;
+    /** Number of real (non-continuation) messages consumed so far across all sessions. */
+    get consumedRealCount(): number;
     push(text: string): void;
     close(): void;
     get isClosed(): boolean;
@@ -45,5 +54,17 @@ export declare class Mailbox {
      * restart loop).
      */
     stream(sessionId?: string): AsyncGenerator<OrgUserMessage>;
+    /** Serialize mailbox state for checkpoint/resume - Pattern 3 */
+    serialize(): {
+        queue: string[];
+        closed: boolean;
+        consumedReal: number;
+    };
+    /** Deserialize mailbox state from checkpoint - Pattern 3 */
+    deserialize(state: {
+        queue: string[];
+        closed: boolean;
+        consumedReal: number;
+    }): void;
 }
 //# sourceMappingURL=mailbox.d.ts.map

package/dist/src/orgrt/mailbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailbox.d.ts","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,kBAAkB,EAAE,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAO;IACxC,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAS;IACvB,qFAAqF;IACrF,OAAO,CAAC,UAAU,CAAK;IAEvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAOvB;IAED,KAAK,IAAI,IAAI,CAGZ;IAED,IAAI,QAAQ,IAAI,OAAO,CAAwB;IAE/C;;;;;;;;;;OAUG;IACH,MAAM,IAAI,IAAI,CAAsB;IAEpC;;;;;;;;OAQG;IACI,MAAM,CAAC,SAAS,SAAK,GAAG,cAAc,CAAC,cAAc,CAAC,CAmB5D;CACF"}
+{"version":3,"file":"mailbox.d.ts","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,kBAAkB,EAAE,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAO;IACxC;;6EAEyE;IACzE,MAAM,CAAC,QAAQ,CAAC,eAAe,4BAA4B;IAC3D,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAS;IACvB,qFAAqF;IACrF,OAAO,CAAC,UAAU,CAAK;IACvB;uFACmF;IACnF,OAAO,CAAC,YAAY,CAAK;IAEzB,sFAAsF;IACtF,IAAI,iBAAiB,IAAI,MAAM,CAA8B;IAE7D,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAOvB;IAED,KAAK,IAAI,IAAI,CAGZ;IAED,IAAI,QAAQ,IAAI,OAAO,CAAwB;IAE/C;;;;;;;;;;OAUG;IACH,MAAM,IAAI,IAAI,CAAsB;IAEpC;;;;;;;;OAQG;IACI,MAAM,CAAC,SAAS,SAAK,GAAG,cAAc,CAAC,cAAc,CAAC,CAqB5D;IAED,gEAAgE;IAChE,SAAS,IAAI;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAMtE;IAED,4DAA4D;IAC5D,WAAW,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAOnF;CACF"}

package/dist/src/orgrt/mailbox.js

@@ -5,11 +5,20 @@
  */
 export class Mailbox {
     static MAX_QUEUE = 500;
+    /** Prefix tagging self-continuation pushes (turn-limit resume) so stream() can
+     *  tell them apart from real deliveries and the restart loop can detect a role
+     *  that is spinning on its own continuations without making progress. */
+    static CONTINUE_PREFIX = '[system:turn-continue]';
     queue = [];
     wake = null;
     closed = false;
     /** Bumped when a new stream() starts; stale generators see the mismatch and exit. */
     generation = 0;
+    /** Monotonic count of REAL (non-continuation) messages consumed by stream().
+     *  The restart loop snapshots this around a session to tell progress from spin. */
+    consumedReal = 0;
+    /** Number of real (non-continuation) messages consumed so far across all sessions. */
+    get consumedRealCount() { return this.consumedReal; }
     push(text) {
         if (this.closed)
             return;
@@ -55,9 +64,12 @@ export class Mailbox {
             while (this.queue.length > 0) {
                 if (gen !== this.generation)
                     return; // superseded — leave the queue for the live generator
+                const content = this.queue.shift();
+                if (!content.startsWith(Mailbox.CONTINUE_PREFIX))
+                    this.consumedReal++;
                 yield {
                     type: 'user',
-                    message: { role: 'user', content: this.queue.shift() },
+                    message: { role: 'user', content },
                     parent_tool_use_id: null,
                     session_id: sessionId,
                 };
@@ -71,5 +83,22 @@ export class Mailbox {
                 return;
         }
     }
+    /** Serialize mailbox state for checkpoint/resume - Pattern 3 */
+    serialize() {
+        return {
+            queue: [...this.queue], // Copy array - queue is public for checkpoint access
+            closed: this.closed,
+            consumedReal: this.consumedReal,
+        };
+    }
+    /** Deserialize mailbox state from checkpoint - Pattern 3 */
+    deserialize(state) {
+        this.queue = [...state.queue]; // Restore queue content
+        this.closed = state.closed;
+        this.consumedReal = state.consumedReal;
+        // Reset generation and wake - a new stream() call will set fresh values
+        this.generation = 0;
+        this.wake = null;
+    }
 }
 //# sourceMappingURL=mailbox.js.map

package/dist/src/orgrt/mailbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"mailbox.js","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,MAAM,OAAO,OAAO;IACV,MAAM,CAAU,SAAS,GAAG,GAAG,CAAC;IAChC,KAAK,GAAa,EAAE,CAAC;IACrB,IAAI,GAAwB,IAAI,CAAC;IACjC,MAAM,GAAG,KAAK,CAAC;IACvB,qFAAqF;IAC7E,UAAU,GAAG,CAAC,CAAC;IAEvB,IAAI,CAAC,IAAY;QACf,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ,KAAc,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/C;;;;;;;;;;OAUG;IACH,MAAM,KAAW,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IAEpC;;;;;;;;OAQG;IACH,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE;QAC1B,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;QAC9B,uDAAuD;QACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,GAAG,KAAK,IAAI,CAAC,UAAU;oBAAE,OAAO,CAAC,sDAAsD;gBAC3F,MAAM;oBACJ,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,EAAE;oBACvD,kBAAkB,EAAE,IAAI;oBACxB,UAAU,EAAE,SAAS;iBACtB,CAAC;gBACF,IAAI,GAAG,KAAK,IAAI,CAAC,UAAU;oBAAE,OAAO;YACtC,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,UAAU;gBAAE,OAAO;YACnD,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,KAAK,IAAI,CAAC,UAAU;gBAAE,OAAO;QACtC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"mailbox.js","sourceRoot":"","sources":["../../../src/orgrt/mailbox.ts"],"names":[],"mappings":"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"}

package/dist/src/orgrt/opencode-runner.d.ts

@@ -0,0 +1,43 @@
+/**
+ * OpencodeAgentRunner — AgentRunner impl backed by the opencode server.
+ *
+ * Architectural difference from ClaudeAgentRunner:
+ *   - Claude's `query()` runs the whole agent loop IN-PROCESS (tools execute
+ *     inside the same Node process as the daemon). That's why ClaudeAgentRunner
+ *     can register org tools (org_send, ask_human, …) directly via
+ *     createSdkMcpServer.
+ *   - opencode runs the agent loop in its OWN server process. The SDK is a
+ *     remote client: create a session, POST prompts, read the response.
+ *
+ * Verified against @opencode-ai/sdk 1.18.x (NOT the docs — the .d.ts and a
+ * live probe):
+ *   - `createOpencode()` spawns a server and returns { client, server }.
+ *   - `client.session.create({ body: { title } })` → `{ data: { id } }`.
+ *   - `client.session.prompt({ path: { id }, body: { parts: [{ type: 'text',
+ *     text }], system?, model? } })` BLOCKS for the whole turn and returns
+ *     `{ data: { info, parts } }` — info carries tokens
+ *     ({ input, output, reasoning, cache: { read, write } }) and cost; the
+ *     assistant text lives in parts of type "text".
+ *   - Because prompt() blocks, undici's default headers timeout (~30s) kills
+ *     any real turn with UND_ERR_HEADERS_TIMEOUT. This runner installs a
+ *     dispatcher with headersTimeout matching TURN_TIMEOUT_MS — without it
+ *     every non-trivial org turn dies.
+ *
+ * Org tools (org_send, knowledge_search, …) travel over the shared FENCE
+ * PROTOCOL (tool-fence.ts): rendered into the system prompt, parsed out of
+ * the assistant text, executed in-process, results fed back into the same
+ * session — same mechanism as KimiCodeAgentRunner.
+ *
+ * Non-disturbance guarantees:
+ *   - The SDK is imported dynamically; the package has no hard dependency on
+ *     @opencode-ai/sdk. Selected only via MONOMIND_RUNTIME=opencode; without
+ *     it the Claude path is byte-for-byte unchanged and run() rejects with a
+ *     clear actionable error instead of crashing at import time.
+ */
+import type { AgentRunner, AgentRunArgs, AgentMessage } from './agent-runner.js';
+export declare class OpencodeAgentRunner implements AgentRunner {
+    private opencodeUrl?;
+    constructor(opencodeUrl?: string | undefined);
+    run(args: AgentRunArgs): AsyncIterable<AgentMessage>;
+}
+//# sourceMappingURL=opencode-runner.d.ts.map

package/dist/src/orgrt/opencode-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/opencode-runner.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjF,qBAAa,mBAAoB,YAAW,WAAW;IACzC,OAAO,CAAC,WAAW,CAAC;IAAhC,YAAoB,WAAW,CAAC,EAAE,MAAM,YAAA,EAAI;IAErC,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CA0I1D;CACF"}