@enderfga/claw-orchestrator 7.14.0 → 7.16.0

package/dist/src/claude-goal-session.js

@@ -0,0 +1,355 @@
+/**
+ * A Claude Code `/goal` behind the `GoalSession` surface the kernel's `goal`
+ * node drives, so one node runs a goal on either engine.
+ *
+ * Codex's app-server owns a goal: it has RPCs to set, pause and read it, and
+ * notifies every status change. Claude Code has none of that. What it has,
+ * measured on CLI 2.1.312 in stream-json mode:
+ *
+ *  - `/goal <condition>` sets the goal and starts working. A Stop hook judges
+ *    the condition after every turn and feeds the turn back while it does not
+ *    hold, all inside the one send; a single `result` arrives when the goal is
+ *    met, and the goal clears itself.
+ *  - A bare `/goal` answers at once, without a model turn: `Goal active: …` or
+ *    `No goal set. …`. That is the only way to read the goal.
+ *  - The goal is part of the transcript. A process that dies and is resumed
+ *    with `--resume` still has it, but nothing drives it until a message comes.
+ *  - The `interrupt` control request ends the running turn with an
+ *    `error_during_execution` result and leaves the goal set.
+ *  - A turn that fails (an auth error, a usage limit) ends with an `is_error`
+ *    result, and the CLI clears the goal then too ("Goal cleared after an
+ *    unrecoverable error"). "No goal set" alone does not mean the goal was met.
+ *  - The condition is judged by a separate model reading the transcript, not by
+ *    the agent. When it blocks the agent's stop 9 times running, the CLI ends
+ *    the turn anyway and says so in an `informational` system event; the goal
+ *    stays set.
+ *
+ * So the status here is partly the adapter's own bookkeeping. `active` while a
+ * goal turn runs. `complete` only when a turn that started with the goal set
+ * ended without an error and the goal is gone: the Stop hook let it end. A
+ * goal still set with nothing driving it, a failed turn, and a reopened thread
+ * whose goal is gone are all `paused`, which the node resumes within its bound;
+ * resuming re-arms the goal (`/goal <objective>` again) when the CLI dropped
+ * it, so a goal already met costs one turn to confirm. A failed login is
+ * `blocked`: resuming cannot fix it. So is a turn the CLI had to end over the
+ * Stop hook: the agent asked to stop again and again, and continuing it only
+ * repeats that. The node goes on to its verifier either way, and the contract,
+ * not the agent or the hook, decides.
+ *
+ * Tokens are the session's input, output and cache-read tokens; the CLI reports
+ * no goal-level count. A reopened process starts its counters at zero, so the
+ * node hands over what the thread had already spent.
+ */
+import { EventEmitter } from 'node:events';
+import { SESSION_EVENT } from './constants.js';
+/** Sent to pick a goal back up: the Stop hook keeps it going from there. */
+export const CLAUDE_GOAL_CONTINUE = 'Continue working toward the active goal. Pick up from where the work stands now.';
+const PROBE_TIMEOUT_MS = 60_000;
+/** Map a failed turn's text onto the codex error codes the node treats as transient. */
+export function classifyClaudeError(text, apiStatus) {
+    const status = typeof apiStatus === 'number' ? apiStatus : Number.NaN;
+    if (status === 401 ||
+        status === 403 ||
+        /not logged in|\/login|invalid api key|authentication|unauthorized/i.test(text)) {
+        return 'unauthorized';
+    }
+    if (status === 429 || /usage limit|rate limit|limit reached|hit your limit|\b429\b/i.test(text)) {
+        return 'usageLimitExceeded';
+    }
+    if (status === 529 || /overloaded|\b529\b/i.test(text))
+        return 'serverOverloaded';
+    if ((status >= 500 && status < 600) ||
+        /\b5\d\d\b|internal server error|api error|ECONNRESET|ETIMEDOUT|socket hang up|fetch failed|network/i.test(text)) {
+        return 'internalServerError';
+    }
+    return null;
+}
+/** Read a bare `/goal` answer. */
+export function parseGoalProbe(text) {
+    const t = text.trim();
+    if (/^no goal set/i.test(t))
+        return { active: false };
+    const m = /^goal active:\s*([\s\S]*?)(?:\s*\((?:not yet evaluated|[^()]*)\))?\s*$/i.exec(t);
+    if (m)
+        return { active: true, objective: m[1].trim() };
+    return undefined;
+}
+export class ClaudeGoalSession extends EventEmitter {
+    host;
+    open;
+    _goal = null;
+    _lastError = null;
+    _turnActive = false;
+    _interrupting = false;
+    /** The CLI held the goal when the running (or last) turn started. */
+    _armed = false;
+    /** The CLI's notice that it ended the running turn over the Stop hook. */
+    _hookOverride = null;
+    _tokensAtOpen;
+    _budgetFrom = 0;
+    _turnStartedAt = null;
+    _timeUsed;
+    _seedTokens;
+    _onText = (...args) => this.emit(SESSION_EVENT.TEXT, ...args);
+    _onClose = (...args) => {
+        this._endTurn();
+        // What the dead process spent, so the node hands it to the one it reopens.
+        if (this._goal)
+            this.emit('goal:updated', this._snapshot());
+        this.emit(SESSION_EVENT.CLOSE, ...args);
+    };
+    /** `_settle` reading why the last turn ended; nothing else may probe meanwhile. */
+    _settling = null;
+    _onResult = (...args) => {
+        const settling = this._settle(args[0]).finally(() => {
+            if (this._settling === settling)
+                this._settling = null;
+        });
+        this._settling = settling;
+    };
+    _onSystem = (...args) => {
+        const e = args[0];
+        if (!this._turnActive || e?.subtype !== 'informational' || typeof e.content !== 'string')
+            return;
+        if (/blocked the turn from ending \d+ consecutive times/i.test(e.content))
+            this._hookOverride = e.content;
+    };
+    constructor(host, open = {}) {
+        super();
+        this.host = host;
+        this.open = open;
+        this._tokensAtOpen = this._sessionTokens();
+        this._seedTokens = open.tokensUsed ?? 0;
+        this._timeUsed = open.timeUsedSeconds ?? 0;
+        host.on(SESSION_EVENT.TEXT, this._onText);
+        host.on(SESSION_EVENT.CLOSE, this._onClose);
+        host.on(SESSION_EVENT.RESULT, this._onResult);
+        host.on(SESSION_EVENT.SYSTEM, this._onSystem);
+    }
+    /** Stop listening to the host. The session itself is the manager's to stop. */
+    detach() {
+        this.host.off(SESSION_EVENT.TEXT, this._onText);
+        this.host.off(SESSION_EVENT.CLOSE, this._onClose);
+        this.host.off(SESSION_EVENT.RESULT, this._onResult);
+        this.host.off(SESSION_EVENT.SYSTEM, this._onSystem);
+    }
+    /** The Claude session id. Named for the interface, which Codex defined. */
+    get codexThreadId() {
+        return this.host.sessionId || this.open.threadId;
+    }
+    get goal() {
+        return this._goal ? this._snapshot() : null;
+    }
+    get lastError() {
+        return this._lastError;
+    }
+    get turnActive() {
+        return this._turnActive;
+    }
+    async setGoal(p) {
+        if (p.objective !== undefined) {
+            this._goal = {
+                objective: p.objective,
+                status: 'active',
+                tokenBudget: p.tokenBudget ?? null,
+                tokensUsed: this._tokensUsed(),
+                timeUsedSeconds: this._seconds(),
+            };
+            this._budgetFrom = this._tokensUsed();
+            await this._startTurn(`/goal ${p.objective}`, true);
+        }
+        else if (p.status === 'paused') {
+            if (this._turnActive)
+                this._interrupt();
+            this._setStatus('paused');
+        }
+        else if (p.status === 'active') {
+            await this._settling;
+            if (!this._goal)
+                throw new Error('no goal to resume: set an objective first');
+            this._setStatus('active');
+            if (!this._turnActive) {
+                // A failed turn or a restart may have cost the CLI its goal: set it again rather than chat.
+                const probe = await this._probe();
+                if (probe?.active)
+                    await this._startTurn(CLAUDE_GOAL_CONTINUE, true);
+                else
+                    await this._startTurn(`/goal ${this._goal.objective}`, true);
+            }
+        }
+        return this._snapshot();
+    }
+    async getGoal() {
+        if (this._settling) {
+            // A turn just ended and its own probe decides the status: a second `/goal` would race it.
+            await this._settling;
+            return this._goal ? this._snapshot() : null;
+        }
+        if (this._turnActive) {
+            this._enforceBudget();
+            return this._snapshot();
+        }
+        const status = this._goal?.status;
+        if (status === 'complete' || status === 'budgetLimited' || status === 'blocked')
+            return this._snapshot();
+        const probe = await this._probe();
+        if (probe?.active) {
+            // Set, and nothing is working on it: a node that sees `paused` resumes it.
+            const keep = this._goal?.status === 'usageLimited' ? 'usageLimited' : 'paused';
+            this._goal = this._goal
+                ? { ...this._goal, status: keep }
+                : {
+                    objective: this.open.objective || probe.objective,
+                    status: keep,
+                    tokenBudget: null,
+                    tokensUsed: 0,
+                    timeUsedSeconds: 0,
+                };
+            this._budgetFrom = this._budgetFrom || this._tokensUsed();
+        }
+        else if (probe && !probe.active) {
+            // Gone, but not seen to be met (that is `_settle`'s call): met, or dropped by a failed turn.
+            // Paused, so resuming re-arms it; a goal already met then ends in one turn.
+            if (this._goal?.status === 'active') {
+                this._goal = { ...this._goal, status: 'paused' };
+            }
+            else if (!this._goal && this.open.resumed && this.open.objective) {
+                const objective = this.open.objective;
+                this._goal = { objective, status: 'paused', tokenBudget: null, tokensUsed: 0, timeUsedSeconds: 0 };
+            }
+        }
+        return this._goal ? this._snapshot() : null;
+    }
+    async clearGoal() {
+        if (this._turnActive)
+            this._interrupt();
+        await this.host.send('/goal clear', { waitForComplete: true, timeout: PROBE_TIMEOUT_MS }).catch(() => undefined);
+        this._goal = null;
+    }
+    async steer(text) {
+        if (!this._turnActive)
+            return { steered: false };
+        // A message written during a turn is folded into it by the CLI.
+        await this.host.send(text, { waitForComplete: false });
+        return { steered: true };
+    }
+    async interrupt() {
+        if (!this._turnActive)
+            return { interrupted: false };
+        return { interrupted: this._interrupt() };
+    }
+    // ─── Internals ─────────────────────────────────────────────────────────
+    _sessionTokens() {
+        try {
+            const s = this.host.getStats();
+            return (s.tokensIn || 0) + (s.tokensOut || 0) + (s.cachedTokens || 0);
+        }
+        catch {
+            return 0;
+        }
+    }
+    _tokensUsed() {
+        return this._seedTokens + Math.max(0, this._sessionTokens() - this._tokensAtOpen);
+    }
+    _seconds() {
+        const running = this._turnStartedAt === null ? 0 : (Date.now() - this._turnStartedAt) / 1000;
+        return Math.round(this._timeUsed + running);
+    }
+    _snapshot() {
+        const g = this._goal;
+        return { ...g, tokensUsed: this._tokensUsed(), timeUsedSeconds: this._seconds() };
+    }
+    _setStatus(status) {
+        if (!this._goal || this._goal.status === status)
+            return;
+        this._goal = { ...this._goal, status };
+        this.emit('goal:updated', this._snapshot());
+    }
+    async _startTurn(text, armed) {
+        this._turnActive = true;
+        this._interrupting = false;
+        this._armed = armed;
+        this._hookOverride = null;
+        this._turnStartedAt = Date.now();
+        try {
+            await this.host.send(text, { waitForComplete: false });
+        }
+        catch (err) {
+            this._endTurn();
+            this._fail(err.message, null);
+        }
+    }
+    _endTurn() {
+        if (this._turnStartedAt !== null)
+            this._timeUsed += (Date.now() - this._turnStartedAt) / 1000;
+        this._turnStartedAt = null;
+        this._turnActive = false;
+    }
+    _interrupt() {
+        this._interrupting = true;
+        return this.host.interruptTurn();
+    }
+    _fail(message, code) {
+        this._lastError = { message, code, willRetry: false, at: new Date().toISOString() };
+        this.emit('codex:error', this._lastError);
+    }
+    /** Past its budget the goal stops, as Codex's does: `budgetLimited` is terminal. */
+    _enforceBudget() {
+        const budget = this._goal?.tokenBudget;
+        if (!budget || this._goal?.status !== 'active')
+            return;
+        if (this._tokensUsed() - this._budgetFrom < budget)
+            return;
+        if (this._turnActive)
+            this._interrupt();
+        this._setStatus('budgetLimited');
+    }
+    async _probe() {
+        try {
+            const r = (await this.host.send('/goal', { waitForComplete: true, timeout: PROBE_TIMEOUT_MS }));
+            return typeof r?.text === 'string' ? parseGoalProbe(r.text) : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /** A goal turn ended: read why, and what the goal is now. */
+    async _settle(event) {
+        if (!this._turnActive || !event)
+            return;
+        this._endTurn();
+        this.emit(SESSION_EVENT.RESULT, event);
+        const text = typeof event.result === 'string' ? event.result : '';
+        const failed = !!event.is_error || event.stop_reason === 'error' || String(event.subtype ?? '').startsWith('error');
+        if (this._interrupting) {
+            this._interrupting = false;
+            // A stop we asked for: pause and budget already set the status.
+            if (this._goal?.status === 'active')
+                this._setStatus('paused');
+            return;
+        }
+        if (failed) {
+            // The CLI drops the goal with a failed turn; resuming re-arms it.
+            this._armed = false;
+            const code = classifyClaudeError(text, event.api_error_status);
+            this._fail(text || String(event.subtype ?? 'the turn failed'), code);
+            this._setStatus(code === 'usageLimitExceeded' ? 'usageLimited' : code === 'unauthorized' ? 'blocked' : 'paused');
+            return;
+        }
+        const armed = this._armed;
+        const probe = await this._probe();
+        this._enforceBudget();
+        if (this._goal?.status !== 'active')
+            return;
+        // Met: the goal was set when the turn started, the turn ended cleanly, and the CLI cleared it.
+        if (armed && probe && !probe.active)
+            this._setStatus('complete');
+        else if (probe?.active && this._hookOverride) {
+            this._fail(this._hookOverride, null);
+            this._setStatus('blocked');
+        }
+        else
+            this._setStatus('paused');
+    }
+}
+//# sourceMappingURL=claude-goal-session.js.map

package/dist/src/claude-goal-session.js.map

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

package/dist/src/council.d.ts

@@ -38,6 +38,12 @@ interface SessionManagerLike {
  * `split(/\s+/)[0]` truncates any path containing a space.
  */
 export declare function councilWorktreePaths(projectDir: string): Promise<string[]>;
+/**
+ * The package this module belongs to: the nearest directory above it holding a
+ * package.json. A fixed `..` is right from `src/` but lands on `dist/` from the
+ * built `dist/src/`, which would leave the package root itself unguarded.
+ */
+export declare function programRoot(moduleFile?: string): string;
 export declare class Council extends EventEmitter {
     private config;
     private manager;
@@ -60,6 +66,8 @@ export declare class Council extends EventEmitter {
      * from a rebuilt session. This is what lets them run after a restart, which
      * the in-memory registry made impossible.
      */
+    /** Add one send's cost to the council's total. */
+    private _charge;
     adoptSession(session: CouncilSession): void;
     getSession(): CouncilSession | undefined;
     injectMessage(message: string): void;

package/dist/src/council.js

@@ -127,17 +127,26 @@ async function setupWorktrees(projectDir, agents, logger) {
     if (!isGit) {
         await spawnAsync('git', ['-C', projectDir, 'init'], { timeout: GIT_CMD_TIMEOUT_MS });
     }
-    // Git user config
-    await spawnAsync('git', ['-C', projectDir, 'config', '--local', 'user.email', 'council@openclaw'], {
-        timeout: GIT_CMD_TIMEOUT_MS,
-    }).catch((err) => {
-        log.error('Failed to set git user.email:', err.message);
-    });
-    await spawnAsync('git', ['-C', projectDir, 'config', '--local', 'user.name', 'Council'], {
-        timeout: GIT_CMD_TIMEOUT_MS,
-    }).catch((err) => {
-        log.error('Failed to set git user.name:', err.message);
-    });
+    // Commits here (and the agents' own, in the worktrees) need an identity. Only
+    // a missing one is filled in: `.git/config` belongs to the user and outlives
+    // the council, so an identity they configured at any level is left alone.
+    for (const [key, value] of [
+        ['user.email', 'council@openclaw'],
+        ['user.name', 'Council'],
+    ]) {
+        const configured = await spawnAsync('git', ['-C', projectDir, 'config', '--get', key], {
+            timeout: GIT_CMD_TIMEOUT_MS,
+        })
+            .then((r) => r.stdout.trim().length > 0)
+            .catch(() => false);
+        if (configured)
+            continue;
+        await spawnAsync('git', ['-C', projectDir, 'config', '--local', key, value], {
+            timeout: GIT_CMD_TIMEOUT_MS,
+        }).catch((err) => {
+            log.error(`Failed to set git ${key}:`, err.message);
+        });
+    }
     // Ensure at least one commit
     const hasCommit = await spawnAsync('git', ['-C', projectDir, 'rev-parse', 'HEAD'], { timeout: GIT_CMD_TIMEOUT_MS })
         .then(() => true)
@@ -288,6 +297,22 @@ Collaboration ends **only when all members vote YES**.
 
 Start working!`;
 }
+/**
+ * The package this module belongs to: the nearest directory above it holding a
+ * package.json. A fixed `..` is right from `src/` but lands on `dist/` from the
+ * built `dist/src/`, which would leave the package root itself unguarded.
+ */
+export function programRoot(moduleFile = fileURLToPath(import.meta.url)) {
+    let dir = path.dirname(moduleFile);
+    for (;;) {
+        if (fs.existsSync(path.join(dir, 'package.json')))
+            return dir;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return path.resolve(path.dirname(moduleFile), '..');
+        dir = parent;
+    }
+}
 /** Resolve the path to configs/ relative to this module (works from both src/ and dist/) */
 function resolveConfigPath(filename) {
     const filePath = fileURLToPath(import.meta.url);
@@ -352,6 +377,11 @@ export class Council extends EventEmitter {
      * from a rebuilt session. This is what lets them run after a restart, which
      * the in-memory registry made impossible.
      */
+    /** Add one send's cost to the council's total. */
+    _charge(result) {
+        if (this._session && result.usage)
+            this._session.costUsd = (this._session.costUsd ?? 0) + result.usage.costUsd;
+    }
     adoptSession(session) {
         this._session = session;
     }
@@ -420,6 +450,7 @@ export class Council extends EventEmitter {
                     maxTurns: this.config.maxTurnsPerAgent || DEFAULT_MAX_TURNS_PER_AGENT,
                     maxBudgetUsd: this.config.maxBudgetUsd,
                     customEngine: agent.customEngine,
+                    ...(agent.acpAgent === undefined ? {} : { acpAgent: agent.acpAgent }),
                     effort: agent.effort,
                     ultracode: agent.ultracode,
                 });
@@ -431,6 +462,7 @@ export class Council extends EventEmitter {
                         this.emitEvent({ type: 'agent-chunk', sessionId, round, agent: agent.name, content: chunk });
                     },
                 });
+                this._charge(result);
                 content = result.output;
                 // Check if response is substantive
                 const stripped = content.replace(/^\[Agent completed[^\]]*\]\s*/i, '').trim();
@@ -448,6 +480,7 @@ export class Council extends EventEmitter {
                         break;
                     try {
                         const followup = await this.manager.sendMessage(sessionName, 'Stop all tool calls. Output your complete report now, including your consensus vote [CONSENSUS: YES] or [CONSENSUS: NO].', { timeout: FOLLOWUP_TIMEOUT_MS, parentRunId: sessionId });
+                        this._charge(followup);
                         if (followup.output.trim().length > 0) {
                             content = followup.output;
                             if (hasConsensusMarker(content) || content.length >= MIN_COMPLETE_RESPONSE_LENGTH)
@@ -509,7 +542,7 @@ export class Council extends EventEmitter {
             throw new Error('Council not initialised — call init() first');
         const trimmedTask = session.task;
         // Safety check: prevent council from running inside the program's own directory
-        const moduleRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+        const moduleRoot = programRoot();
         const resolvedProjectDir = path.resolve(this.config.projectDir);
         const rel = path.relative(moduleRoot, resolvedProjectDir);
         const isInside = rel === '' || (!rel.startsWith('..') && !path.isAbsolute(rel));