@enderfga/claw-orchestrator 7.13.0 → 7.15.0

package/dist/src/persistent-acp-session.js

@@ -0,0 +1,433 @@
+/**
+ * ACP Session — drives any agent that speaks the Agent Client Protocol on stdio.
+ *
+ * `acp-server.ts` is the other half: there the orchestrator is the agent. Here
+ * it is the client, so one wrapper covers every ACP agent (`kimi acp`,
+ * `opencode acp`, a Claude Code ACP adapter, …) with no per-agent parsing. The
+ * agent process lives as long as the session; each send is one `session/prompt`.
+ *
+ * Protocol notes (`@agentclientprotocol/sdk` 1.3.0, protocol v1):
+ *   - `initialize` → `session/new` (or `session/load` / `session/resume` for a
+ *     stored session id) → `session/prompt` per send. The prompt's response
+ *     carries the stop reason; text, tool calls and usage arrive before it as
+ *     `session/update` notifications.
+ *   - The client advertises no `fs` or `terminal` capability, so the agent
+ *     reads, writes and runs commands with its own tools, in its own process.
+ *   - `session/request_permission` is answered at once from the session's
+ *     permission mode. Nothing here can put a question to a person, and an
+ *     unanswered request would hold the turn until it times out.
+ */
+import { EventEmitter } from 'node:events';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { Readable, Writable } from 'node:stream';
+import * as acp from '@agentclientprotocol/sdk';
+import { killEngineTree, spawnEngine } from './engine-spawn.js';
+import { resolveAcpAgent } from './engine-presets.js';
+import { resolveAlias } from './models.js';
+import { SESSION_EVENT, MAX_HISTORY_ITEMS, DEFAULT_HISTORY_LIMIT } from './constants.js';
+import { sanitizeSecrets } from './sanitize.js';
+const DEFAULT_TURN_TIMEOUT_MS = 600_000;
+/** Permission modes under which the agent may act without asking. */
+const ALLOWING_MODES = new Set(['bypassPermissions', 'acceptEdits', 'auto', 'dontAsk']);
+export class PersistentAcpSession extends EventEmitter {
+    options;
+    agent;
+    proc = null;
+    conn = null;
+    acpSessionId;
+    _isReady = false;
+    _isPaused = false;
+    _isBusy = false;
+    _startTime = null;
+    _history = [];
+    _requests = 0;
+    /**
+     * `systemPrompt` and `appendSystemPrompt`, waiting for the first prompt of a new
+     * session. ACP has no system-prompt channel, so they go at the top of the first
+     * message, as the one-shot engines do it — a council seat's charter travels this
+     * way. A resumed session already holds them.
+     */
+    pendingInstructions;
+    /** The turn in flight: its text so far and how to fail it if the process dies. */
+    turnText = '';
+    turnFail = null;
+    sessionId;
+    _stats = {
+        turns: 0,
+        turnsSucceeded: 0,
+        toolCalls: 0,
+        toolErrors: 0,
+        tokensIn: 0,
+        tokensOut: 0,
+        cachedTokens: 0,
+        costUsd: 0,
+        /** True once the agent has reported a cost; the registry estimate is then never used. */
+        costReported: false,
+        contextUsed: 0,
+        contextSize: 0,
+        lastActivity: null,
+    };
+    constructor(config) {
+        super();
+        const agent = resolveAcpAgent(config.acpAgent);
+        if (!agent)
+            throw new Error("engine 'acp' needs `acpAgent`: a bundled preset id or an inline config");
+        // The agent's tools run inside the agent process; this client only sees the
+        // permission requests the agent chooses to send. Nothing here can stop a write,
+        // so a read-only session is refused rather than run writable under that label.
+        if (config.sandboxMode === 'read-only') {
+            throw new Error(`ACP agent '${agent.name}' cannot be held to sandboxMode 'read-only': its tools run inside the agent. ` +
+                "permissionMode 'plan' rejects the permission requests it sends, for agents that ask.");
+        }
+        this.agent = agent;
+        this.options = { ...config, permissionMode: config.permissionMode || 'bypassPermissions' };
+    }
+    // ── Property accessors ─────────────────────────────────────────────────
+    get pid() {
+        return this.proc?.pid ?? undefined;
+    }
+    get isReady() {
+        return this._isReady;
+    }
+    get isPaused() {
+        return this._isPaused;
+    }
+    get isBusy() {
+        return this._isBusy;
+    }
+    /** The agent's own session id; a later session resumes it. */
+    get agentSessionId() {
+        return this.acpSessionId;
+    }
+    // ── Lifecycle ──────────────────────────────────────────────────────────
+    async start() {
+        const cwd = path.resolve(this.options.cwd || process.cwd());
+        if (!fs.existsSync(cwd))
+            fs.mkdirSync(cwd, { recursive: true });
+        this.options.cwd = cwd;
+        const command = (this.agent.commandEnv && process.env[this.agent.commandEnv]) || this.agent.command;
+        const proc = spawnEngine(command, this.agent.args ?? [], {
+            launcher: this.options.launcher,
+            cwd,
+            env: { ...process.env, ...this.agent.env },
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        this.proc = proc;
+        proc.stderr?.on('data', (d) => this.emit(SESSION_EVENT.LOG, `[acp:${this.agent.name}] ${sanitizeSecrets(d.toString())}`));
+        const exited = new Promise((_, reject) => {
+            proc.once('error', (err) => reject(new Error(`could not start ${command}: ${err.message}`)));
+            proc.once('exit', (code, signal) => {
+                this._isReady = false;
+                const err = new Error(`ACP agent ${this.agent.name} exited (${signal ?? `code ${code}`})`);
+                this.turnFail?.(err);
+                this.turnFail = null;
+                this.conn?.close(err);
+                reject(err);
+                this.emit(SESSION_EVENT.CLOSE, code ?? 0);
+            });
+        });
+        exited.catch(() => undefined);
+        const stream = acp.ndJsonStream(Writable.toWeb(proc.stdin), Readable.toWeb(proc.stdout));
+        this.conn = acp
+            .client({ name: 'claw-orchestrator' })
+            .onRequest(acp.methods.client.session.requestPermission, (ctx) => this._answerPermission(ctx.params))
+            .onNotification(acp.methods.client.session.update, (ctx) => this._onUpdate(ctx.params))
+            .connect(stream);
+        // A closed connection is a dead session, whether or not the exit has been reported yet.
+        this.conn.closed.then(() => (this._isReady = false), () => (this._isReady = false));
+        const agent = this.conn.agent;
+        const init = await Promise.race([
+            agent.request(acp.methods.agent.initialize, {
+                protocolVersion: acp.PROTOCOL_VERSION,
+                clientCapabilities: {},
+                clientInfo: { name: 'claw-orchestrator', version: '1' },
+            }),
+            exited,
+        ]);
+        const caps = init.agentCapabilities ?? {};
+        const resumeId = this.options.resumeSessionId;
+        if (resumeId) {
+            // A stored id that cannot be honoured is an error, not a fresh session:
+            // the caller asked for that conversation, and a new one would silently
+            // drop everything it knew.
+            if (caps.sessionCapabilities?.resume) {
+                await Promise.race([
+                    agent.request(acp.methods.agent.session.resume, { sessionId: resumeId, cwd, mcpServers: [] }),
+                    exited,
+                ]);
+            }
+            else if (caps.loadSession) {
+                await Promise.race([
+                    agent.request(acp.methods.agent.session.load, { sessionId: resumeId, cwd, mcpServers: [] }),
+                    exited,
+                ]);
+            }
+            else {
+                this.stop();
+                throw new Error(`ACP agent ${this.agent.name} cannot resume a session (no loadSession or resume capability)`);
+            }
+            // Set only now: `session/load` replays the conversation as updates
+            // before it returns, and an update for an id not yet ours is dropped —
+            // that history is not this session's work.
+            this.acpSessionId = resumeId;
+        }
+        else {
+            const created = await Promise.race([
+                agent.request(acp.methods.agent.session.new, { cwd, mcpServers: [] }),
+                exited,
+            ]);
+            this.acpSessionId = created.sessionId;
+            const instructions = [this.options.systemPrompt, this.options.appendSystemPrompt]
+                .map((t) => t?.trim())
+                .filter(Boolean)
+                .join('\n\n');
+            this.pendingInstructions = instructions || undefined;
+        }
+        this.sessionId = `acp-${this.agent.name}-${Date.now().toString(36)}`;
+        this._startTime = new Date().toISOString();
+        this._isReady = true;
+        this.emit(SESSION_EVENT.READY);
+        this.emit(SESSION_EVENT.INIT, { type: 'system', subtype: 'init', session_id: this.sessionId });
+        return this;
+    }
+    stop() {
+        this._isReady = false;
+        this._isPaused = false;
+        if (this.conn && this.acpSessionId && this._isBusy) {
+            this.conn.agent.notify(acp.methods.agent.session.cancel, { sessionId: this.acpSessionId }).catch(() => undefined);
+        }
+        this.conn?.close();
+        this.conn = null;
+        if (this.proc) {
+            killEngineTree(this.proc);
+            this.proc = null;
+        }
+    }
+    pause() {
+        this._isPaused = true;
+        this.emit(SESSION_EVENT.PAUSED, { sessionId: this.sessionId });
+    }
+    resume() {
+        this._isPaused = false;
+        this.emit(SESSION_EVENT.RESUMED, { sessionId: this.sessionId });
+    }
+    // ── send() ─────────────────────────────────────────────────────────────
+    async send(message, options = {}) {
+        if (!this._isReady || !this.conn || !this.acpSessionId)
+            throw new Error('Session not ready. Call start() first.');
+        if (this._isBusy)
+            throw new Error('A turn is already running on this ACP session');
+        let text = typeof message === 'string' ? message : JSON.stringify(message);
+        if (this.pendingInstructions) {
+            text = `${this.pendingInstructions}\n\n---\n\n${text}`;
+            this.pendingInstructions = undefined;
+        }
+        const id = ++this._requests;
+        if (!options.waitForComplete) {
+            this._turn(text, options).catch((err) => this._emitError(err));
+            return { requestId: id, sent: true };
+        }
+        return this._turn(text, options);
+    }
+    async _turn(text, options) {
+        const conn = this.conn;
+        const sessionId = this.acpSessionId;
+        this._isBusy = true;
+        this.turnText = '';
+        const onText = (chunk) => {
+            try {
+                options.callbacks?.onText?.(chunk);
+            }
+            catch {
+                // A caller's callback failing does not fail the turn.
+            }
+        };
+        this.on(SESSION_EVENT.TEXT, onText);
+        let timer;
+        try {
+            const aborted = new Promise((_, reject) => {
+                this.turnFail = reject;
+                timer = setTimeout(() => {
+                    conn.agent.notify(acp.methods.agent.session.cancel, { sessionId }).catch(() => undefined);
+                    reject(new Error(`Timeout waiting for ACP agent ${this.agent.name} to finish the turn`));
+                }, options.timeout || DEFAULT_TURN_TIMEOUT_MS);
+            });
+            const response = await Promise.race([
+                conn.agent.request(acp.methods.agent.session.prompt, { sessionId, prompt: [{ type: 'text', text }] }),
+                aborted,
+            ]);
+            this._absorbUsage(response.usage);
+            const ok = response.stopReason === 'end_turn';
+            this._stats.turns++;
+            if (ok)
+                this._stats.turnsSucceeded++;
+            this._stats.lastActivity = new Date().toISOString();
+            const event = {
+                type: 'result',
+                subtype: ok ? 'success' : 'error',
+                result: this.turnText,
+                is_error: !ok,
+                stop_reason: response.stopReason,
+                session_id: this.sessionId,
+                total_cost_usd: this._stats.costUsd,
+            };
+            this._addHistory({ time: this._stats.lastActivity, type: 'result', event });
+            this.emit(SESSION_EVENT.RESULT, event);
+            this.emit(SESSION_EVENT.TURN_COMPLETE, event);
+            if (!ok)
+                throw new Error(`ACP agent ${this.agent.name} stopped the turn: ${response.stopReason}`);
+            return { text: this.turnText, event };
+        }
+        catch (err) {
+            if (!(err instanceof Error && err.message.startsWith(`ACP agent ${this.agent.name} stopped`))) {
+                this._stats.turns++;
+            }
+            // The connection usually ends (stdout EOF) before the exit is reported.
+            if (err instanceof Error && /connection closed/i.test(err.message)) {
+                throw new Error(`ACP agent ${this.agent.name} exited mid-turn`);
+            }
+            throw err;
+        }
+        finally {
+            clearTimeout(timer);
+            this.turnFail = null;
+            this._isBusy = false;
+            this.removeListener(SESSION_EVENT.TEXT, onText);
+        }
+    }
+    // ── Agent → client ─────────────────────────────────────────────────────
+    _answerPermission(params) {
+        const allow = ALLOWING_MODES.has(this.options.permissionMode ?? '');
+        const kinds = allow ? ['allow_once', 'allow_always'] : ['reject_once', 'reject_always'];
+        const option = kinds.map((k) => params.options.find((o) => o.kind === k)).find(Boolean);
+        this._addHistory({
+            time: new Date().toISOString(),
+            type: 'permission',
+            event: { tool: params.toolCall.title, answer: option?.kind ?? 'cancelled' },
+        });
+        return option
+            ? { outcome: { outcome: 'selected', optionId: option.optionId } }
+            : { outcome: { outcome: 'cancelled' } };
+    }
+    _onUpdate(params) {
+        if (params.sessionId !== this.acpSessionId)
+            return;
+        const update = params.update;
+        this._stats.lastActivity = new Date().toISOString();
+        switch (update.sessionUpdate) {
+            case 'agent_message_chunk':
+                if (update.content.type === 'text') {
+                    this.turnText += update.content.text;
+                    this.emit(SESSION_EVENT.TEXT, update.content.text);
+                }
+                break;
+            case 'tool_call':
+                this._stats.toolCalls++;
+                this.emit(SESSION_EVENT.TOOL_USE, { id: update.toolCallId, name: update.title, input: update.rawInput });
+                if (update.status === 'failed')
+                    this._stats.toolErrors++;
+                break;
+            case 'tool_call_update':
+                if (update.status === 'failed')
+                    this._stats.toolErrors++;
+                if (update.status === 'completed' || update.status === 'failed') {
+                    this.emit(SESSION_EVENT.TOOL_RESULT, {
+                        id: update.toolCallId,
+                        is_error: update.status === 'failed',
+                        output: update.rawOutput,
+                    });
+                }
+                break;
+            case 'usage_update':
+                this._stats.contextUsed = update.used;
+                this._stats.contextSize = update.size;
+                if (update.cost && update.cost.currency.toUpperCase() === 'USD') {
+                    this._stats.costUsd = update.cost.amount;
+                    this._stats.costReported = true;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    /** `PromptResponse.usage` holds session totals, so it replaces, never adds. */
+    _absorbUsage(usage) {
+        if (!usage)
+            return;
+        this._stats.tokensIn = usage.inputTokens;
+        this._stats.tokensOut = usage.outputTokens;
+        this._stats.cachedTokens = usage.cachedReadTokens ?? 0;
+        if (!this._stats.costReported && this.agent.pricing) {
+            const p = this.agent.pricing;
+            const fresh = Math.max(0, this._stats.tokensIn - this._stats.cachedTokens);
+            this._stats.costUsd =
+                (fresh * p.input + this._stats.cachedTokens * (p.cached ?? p.input) + this._stats.tokensOut * p.output) /
+                    1_000_000;
+        }
+    }
+    // ── ISession surface ───────────────────────────────────────────────────
+    getStats() {
+        const window = this._stats.contextSize || this.agent.contextWindow || 0;
+        return {
+            turns: this._stats.turns,
+            turnsSucceeded: this._stats.turnsSucceeded,
+            toolCalls: this._stats.toolCalls,
+            toolErrors: this._stats.toolErrors,
+            tokensIn: this._stats.tokensIn,
+            tokensOut: this._stats.tokensOut,
+            cachedTokens: this._stats.cachedTokens,
+            costUsd: Math.round(this._stats.costUsd * 10000) / 10000,
+            isReady: this._isReady,
+            startTime: this._startTime,
+            lastActivity: this._stats.lastActivity,
+            contextPercent: window ? Math.min(100, Math.round((this._stats.contextUsed / window) * 100)) : 0,
+            retries: 0,
+            sessionId: this.sessionId,
+            uptime: this._startTime ? Math.round((Date.now() - new Date(this._startTime).getTime()) / 1000) : 0,
+            acpSessionId: this.acpSessionId,
+        };
+    }
+    getHistory(limit = DEFAULT_HISTORY_LIMIT) {
+        return this._history.slice(-limit);
+    }
+    getCost() {
+        const p = this.agent.pricing;
+        return {
+            model: this.options.model || this.agent.name,
+            tokensIn: this._stats.tokensIn,
+            tokensOut: this._stats.tokensOut,
+            cachedTokens: this._stats.cachedTokens,
+            pricing: { inputPer1M: p?.input ?? 0, outputPer1M: p?.output ?? 0, cachedPer1M: p?.cached },
+            breakdown: { inputCost: 0, cachedCost: 0, outputCost: 0 },
+            totalUsd: this._stats.costUsd,
+        };
+    }
+    async compact(_summary) {
+        const event = { type: 'result', result: 'ACP agents manage their own context' };
+        return { text: 'ACP agents manage their own context', event };
+    }
+    getEffort() {
+        return this.options.effort || 'auto';
+    }
+    setEffort(level) {
+        this.options.effort = level;
+    }
+    resolveModel(alias) {
+        return resolveAlias(alias);
+    }
+    // ── Helpers ────────────────────────────────────────────────────────────
+    /** As in codex-app: with no listener, an `'error'` event would throw and take the process down. */
+    _emitError(err) {
+        if (this.listenerCount(SESSION_EVENT.ERROR) > 0)
+            this.emit(SESSION_EVENT.ERROR, err);
+        else
+            this.emit(SESSION_EVENT.LOG, `[acp:${this.agent.name}] ${err.message}`);
+    }
+    _addHistory(entry) {
+        this._history.push(entry);
+        if (this._history.length > MAX_HISTORY_ITEMS)
+            this._history.shift();
+    }
+}
+//# sourceMappingURL=persistent-acp-session.js.map

package/dist/src/persistent-acp-session.js.map

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

package/dist/src/persistent-codex-app-session.d.ts

@@ -105,6 +105,8 @@ export declare class PersistentCodexAppServerSession extends EventEmitter implem
         sent: boolean;
     }>;
     private _fireAndForgetTurn;
+    /** `turn/start` params. The effort holds for this turn and the ones after it. */
+    private _turnStartParams;
     private _runTurn;
     private _request;
     private _reply;

package/dist/src/persistent-codex-app-session.js

@@ -31,6 +31,8 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { getModelPricing, resolveAlias, getContextWindow } from './models.js';
 import { SESSION_EVENT, MAX_HISTORY_ITEMS, DEFAULT_HISTORY_LIMIT } from './constants.js';
+import { sanitizeSecrets } from './sanitize.js';
+import { codexReasoningEffort } from './persistent-codex-session.js';
 /** Name of a `CodexErrorInfo` value: `'serverOverloaded'`, or `'httpConnectionFailed'` for `{ httpConnectionFailed: … }`. */
 function errorInfoName(info) {
     if (typeof info === 'string')
@@ -139,7 +141,7 @@ export class PersistentCodexAppServerSession extends EventEmitter {
         this._rl = readline.createInterface({ input: this.proc.stdout, crlfDelay: Infinity });
         this._rl.on('line', (line) => this._handleLine(line));
         this.proc.stderr?.on('data', (data) => {
-            this.emit(SESSION_EVENT.LOG, `[codex-app-stderr] ${data.toString()}`);
+            this.emit(SESSION_EVENT.LOG, `[codex-app-stderr] ${sanitizeSecrets(data.toString())}`);
         });
         this.proc.on('exit', (code) => {
             this._isReady = false;
@@ -162,6 +164,7 @@ export class PersistentCodexAppServerSession extends EventEmitter {
         // 2. thread/start — captures threadId both from the response and the
         //    `thread/started` notification (which arrives before the response per
         //    observed protocol semantics).
+        const effort = codexReasoningEffort(this.options.effort);
         const startParams = {
             cwd: this.options.cwd,
             model: this.options.model,
@@ -171,6 +174,9 @@ export class PersistentCodexAppServerSession extends EventEmitter {
             // that wanted approval left the turn waiting forever. The sandbox mode is
             // the boundary instead.
             approvalPolicy: 'never',
+            // On the thread, not only on `turn/start`: the goal loop starts its own
+            // turns, and those read the thread's config.
+            ...(effort ? { config: { model_reasoning_effort: effort } } : {}),
         };
         // When resuming a known thread, use `thread/resume` (loads prior turns)
         // instead of `thread/start` (which opens a fresh thread). A stale/unknown
@@ -246,7 +252,7 @@ export class PersistentCodexAppServerSession extends EventEmitter {
         if (instructions)
             text = `${instructions}\n\n---\n\n${text}`;
         if (!options.waitForComplete) {
-            this._fireAndForgetTurn(text).catch((err) => this._emitError(err));
+            this._fireAndForgetTurn(text, options).catch((err) => this._emitError(err));
             return { requestId: this._nextRpcId, sent: true };
         }
         this._isBusy = true;
@@ -257,11 +263,17 @@ export class PersistentCodexAppServerSession extends EventEmitter {
             this._isBusy = false;
         }
     }
-    async _fireAndForgetTurn(text) {
-        await this._request('turn/start', {
+    async _fireAndForgetTurn(text, options) {
+        await this._request('turn/start', this._turnStartParams(text, options));
+    }
+    /** `turn/start` params. The effort holds for this turn and the ones after it. */
+    _turnStartParams(text, options) {
+        const effort = codexReasoningEffort(options.effort ?? this.options.effort);
+        return {
             threadId: this.threadId,
             input: [{ type: 'text', text, text_elements: [] }],
-        });
+            ...(effort ? { effort } : {}),
+        };
     }
     async _runTurn(text, options) {
         const timeout = options.timeout || 600_000;
@@ -290,10 +302,7 @@ export class PersistentCodexAppServerSession extends EventEmitter {
             }
         }, timeout);
         try {
-            await this._request('turn/start', {
-                threadId: this.threadId,
-                input: [{ type: 'text', text, text_elements: [] }],
-            });
+            await this._request('turn/start', this._turnStartParams(text, options));
             const result = await turnPromise;
             return result;
         }