@enderfga/claw-orchestrator 7.12.1 → 7.14.0

package/dist/src/sanitize.js

@@ -31,6 +31,32 @@ export function sanitizeSecrets(text) {
     }
     return result;
 }
+/**
+ * A short, single-line reason for a log line, or `unknown error`.
+ *
+ * Source is `err instanceof Error ? String(err.message) : String(err)`; a throw
+ * during that conversion returns `unknown error`. Whitespace runs become one
+ * space, then trim; known secret shapes are redacted; the result is capped at
+ * 300 UTF-16 units (a trailing high surrogate is dropped). Empty output, or
+ * any Unicode Cc/Cf code point, becomes `unknown error`.
+ */
+export function boundedErrorReason(err) {
+    let text;
+    try {
+        text = err instanceof Error ? String(err.message) : String(err);
+    }
+    catch {
+        return 'unknown error';
+    }
+    text = text.replace(/\s+/g, ' ').trim();
+    text = sanitizeSecrets(text);
+    text = text.slice(0, 300);
+    if (/[\uD800-\uDBFF]$/.test(text))
+        text = text.slice(0, -1);
+    if (!text || /[\p{Cc}\p{Cf}]/u.test(text))
+        return 'unknown error';
+    return text;
+}
 /** Build a sanitizer from common secret patterns plus optional config patterns. */
 export function buildSanitizer(options = {}) {
     const patterns = [...SECRET_PATTERNS];

package/dist/src/sanitize.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../src/sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,MAAM,eAAe,GAAuD;IACjF,mEAAmE;IACnE,+DAA+D;IAC/D,EAAE,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,YAAY,EAAE;IAC5D,8DAA8D;IAC9D,EAAE,EAAE,EAAE,wBAAwB,EAAE,WAAW,EAAE,QAAQ,EAAE;IACvD,4DAA4D;IAC5D,EAAE,EAAE,EAAE,wCAAwC,EAAE,WAAW,EAAE,OAAO,EAAE;IACtE,kDAAkD;IAClD,mFAAmF;IACnF,EAAE,EAAE,EAAE,iDAAiD,EAAE,WAAW,EAAE,QAAQ,EAAE;CACjF,CAAC;AAEF,6DAA6D;AAC7D,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,KAAK,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC;QAClD,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAOD,mFAAmF;AACnF,MAAM,UAAU,cAAc,CAAC,UAA4B,EAAE;IAC3D,MAAM,QAAQ,GAA+C,CAAC,GAAG,eAAe,CAAC,CAAC;IAClF,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,0EAA0E;YAC1E,+DAA+D;YAC/D,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,CAAsB,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,oCAAoC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAM,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACjH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAY,EAAU,EAAE;QAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,KAAK,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,QAAQ,EAAE,CAAC;YAC3C,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;YACjB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../src/sanitize.ts"],"names":[],"mappings":"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"}

package/dist/src/session-manager.d.ts

@@ -22,12 +22,15 @@ import { type RunSummary } from './kernel/store.js';
 import type { KernelEvent, RunRecord, RunState, WorkflowSpec } from './kernel/types.js';
 import { type EvidenceBundle } from './verify/evidence.js';
 import { type RunLedgerQuery, type RunLedgerRow, type RunLedgerSummary } from './run-ledger.js';
+import { type ThreadGoal } from './persistent-codex-app-session.js';
+import type { GoalSession } from './kernel/nodes/goal.js';
 import { type SessionConfig, type SessionInfo, type SendOptions, type SendResult, type PluginConfig, type EffortLevel, type EngineType, type CustomEngineConfig, type AgentInfo, type SkillInfo, type RuleInfo, type ISession, type CouncilConfig, type CouncilSession, type CouncilReviewResult, type CouncilAcceptResult, type CouncilRejectResult, type InboxMessage, type UltraplanResult, type UltrareviewResult } from './types.js';
 import { Council } from './council.js';
 import { type FanoutConfig, type FanoutSession } from './fanout.js';
 import { AutoloopRunner } from './autoloop/runner.js';
 import { ClaudeAgentDispatcher } from './autoloop/dispatcher.js';
 import type { AutoloopState } from './autoloop/types.js';
+import { type AnyAutoloopMessage } from './autoloop/messages.js';
 import { UltraappManager } from './ultraapp/manager.js';
 import type { UltraappRouter } from './ultraapp/router.js';
 type AutoloopRoleName = 'planner' | 'coder' | 'reviewer';
@@ -327,30 +330,26 @@ export declare class SessionManager {
      * After shutdown(), no new sessions can be started. Idempotent.
      */
     shutdown(): Promise<void>;
+    /** The live `codex-app` session behind `name`, for the kernel's `goal` node. */
+    codexGoalSession(name: string): GoalSession | undefined;
     /**
-     * Send a `/goal <args>` slash command to a `codex-app` session. Used by
-     * the `codex_goal_*` tools. The server-side parser interprets the slash
-     * command and emits goal-related notifications which the session class
-     * caches.
+     * Act on a `codex-app` session's goal through the app-server's
+     * `thread/goal/*` RPCs. Used by the `codex_goal_*` tools; `get` asks the
+     * server rather than a cache.
      *
-     * Errors clearly when called against a non-`codex-app` session — those
-     * sessions cannot interpret `/goal` (the `codex exec` path has no slash
-     * command surface).
-     */
-    codexGoalCommand(name: string, slashArgs: string, timeoutMs?: number): Promise<{
+     * Errors clearly when called against a non-`codex-app` session — `codex
+     * exec` has no goal surface.
+     */
+    codexGoal(name: string, op: {
+        action: 'set';
+        objective: string;
+        tokenBudget?: number | null;
+    } | {
+        action: 'pause' | 'resume' | 'clear' | 'get';
+    }): Promise<{
         ok: true;
-        text: string;
-        goal: unknown;
+        goal: ThreadGoal | null;
     }>;
-    /**
-     * Read the cached goal state from a `codex-app` session without sending
-     * any command. Returns null if no goal is set or the session has not yet
-     * received a `thread/goal/updated` notification.
-     */
-    codexGoalGet(name: string): {
-        ok: true;
-        goal: unknown;
-    };
     private _getCodexAppSession;
     codexInterrupt(name: string): Promise<{
         ok: true;
@@ -679,6 +678,12 @@ export declare class SessionManager {
         plannerSession: string;
         state: AutoloopState;
     }>;
+    /**
+     * Durably accept a chat message for a live run's Planner and return the
+     * envelope to deliver. Throws, with nothing accepted, when the run cannot
+     * checkpoint it. Internal: callers pass the result to `runner.send`.
+     */
+    acceptAutoloopChat(runId: string, text: string): AnyAutoloopMessage;
     /**
      * Inject a user chat message into a v2 run's Planner. Returns the Planner's
      * natural-language reply.

package/dist/src/session-manager.js

@@ -136,15 +136,17 @@ import { PersistentGrokSession } from './persistent-grok-session.js';
 import { PersistentOpencodeSession } from './persistent-opencode-session.js';
 import { PersistentAgySession } from './persistent-agy-session.js';
 import { PersistentCustomSession } from './persistent-custom-session.js';
+import { PersistentAcpSession } from './persistent-acp-session.js';
 import { resolveCustomEngine } from './engine-presets.js';
 import { EFFORT_LEVELS, ENGINE_TYPES, overrideModelPricing, ENGINE_BINARY_NAMES, } from './types.js';
 import { resolveAlias, isClaudeModel, lookupModel } from './models.js';
 import { isAgyConversationId } from './agy-conversation.js';
 import { Council } from './council.js';
 import { AutoloopRunner } from './autoloop/runner.js';
+import { boundedErrorReason } from './sanitize.js';
 import { ClaudeAgentDispatcher } from './autoloop/dispatcher.js';
 import { DEFAULT_PUSH_POLICY, DEFAULT_SEND_TIMEOUT_MS, MAX_METRIC_HISTORY, validateAutoloopTimeoutConfig, } from './autoloop/types.js';
-import { Msg as AutoloopMsg } from './autoloop/messages.js';
+import { Msg as AutoloopMsg, } from './autoloop/messages.js';
 import { appendPushLog, notifyUserFallbackChain } from './autoloop/notify.js';
 import { UltraappManager } from './ultraapp/manager.js';
 import { UltraappStore, defaultStoreRoot } from './ultraapp/store.js';
@@ -1421,7 +1423,7 @@ export class SessionManager {
             // its executor is registered here with a builder closed over `this`
             // rather than living in the kernel.
             kernel.setExecutor('autoloop', makeAutoloopExecutor({
-                boot: (config, secrets, { freshStart }) => this._bootAutoloop({
+                boot: (config, secrets, { freshStart, restoredInput }) => this._bootAutoloop({
                     ...config,
                     // Custom-engine configs never reach the spec, so they come from
                     // the run's in-memory secret bag — supplied at start, and
@@ -1432,6 +1434,7 @@ export class SessionManager {
                     // Always set (including false on resume) — omitting false left a
                     // `_freshStart: true` from config/secrets intact.
                     _freshStart: freshStart,
+                    _restoredInput: restoredInput,
                 }),
                 ready: (key, value) => {
                     const deferred = this._autoloopReady.get(key);
@@ -1968,46 +1971,35 @@ export class SessionManager {
         // Persist final state (TTL-expired sessions already removed by cleanup)
         this._savePersisted();
     }
-    // ─── Codex /goal helpers (codex-app engine only) ─────────────────────
+    // ─── Codex goals (codex-app engine only) ─────────────────────────────
+    /** The live `codex-app` session behind `name`, for the kernel's `goal` node. */
+    codexGoalSession(name) {
+        const session = this.sessions.get(name)?.session;
+        return session instanceof PersistentCodexAppServerSession ? session : undefined;
+    }
     /**
-     * Send a `/goal <args>` slash command to a `codex-app` session. Used by
-     * the `codex_goal_*` tools. The server-side parser interprets the slash
-     * command and emits goal-related notifications which the session class
-     * caches.
+     * Act on a `codex-app` session's goal through the app-server's
+     * `thread/goal/*` RPCs. Used by the `codex_goal_*` tools; `get` asks the
+     * server rather than a cache.
      *
-     * Errors clearly when called against a non-`codex-app` session — those
-     * sessions cannot interpret `/goal` (the `codex exec` path has no slash
-     * command surface).
+     * Errors clearly when called against a non-`codex-app` session — `codex
+     * exec` has no goal surface.
      */
-    async codexGoalCommand(name, slashArgs, timeoutMs) {
-        const managed = this.sessions.get(name);
-        if (!managed)
-            throw new Error(`Session not found: ${name}`);
-        const session = managed.session;
-        if (typeof session.sendGoalCommand !== 'function') {
-            const engine = managed.config.engine || 'claude';
-            throw new Error(`Session "${name}" uses engine "${engine}" which does not support /goal. ` +
-                `Start a session with engine: "codex-app" to use the goal tools.`);
+    async codexGoal(name, op) {
+        const session = this._getCodexAppSession(name, '/goal');
+        switch (op.action) {
+            case 'set':
+                return { ok: true, goal: await session.setGoal({ objective: op.objective, tokenBudget: op.tokenBudget }) };
+            case 'pause':
+                return { ok: true, goal: await session.setGoal({ status: 'paused' }) };
+            case 'resume':
+                return { ok: true, goal: await session.setGoal({ status: 'active' }) };
+            case 'clear':
+                await session.clearGoal();
+                return { ok: true, goal: null };
+            case 'get':
+                return { ok: true, goal: await session.getGoal() };
         }
-        const result = await session.sendGoalCommand(slashArgs, timeoutMs);
-        return { ok: true, text: result.text, goal: result.goal };
-    }
-    /**
-     * Read the cached goal state from a `codex-app` session without sending
-     * any command. Returns null if no goal is set or the session has not yet
-     * received a `thread/goal/updated` notification.
-     */
-    codexGoalGet(name) {
-        const managed = this.sessions.get(name);
-        if (!managed)
-            throw new Error(`Session not found: ${name}`);
-        const session = managed.session;
-        if (!('goal' in session)) {
-            const engine = managed.config.engine || 'claude';
-            throw new Error(`Session "${name}" uses engine "${engine}" which does not track goal state. ` +
-                `Start a session with engine: "codex-app" to use the goal tools.`);
-        }
-        return { ok: true, goal: session.goal ?? null };
     }
     // ─── Codex app-server v2 RPCs (codex-app engine only, Codex 0.137) ────────
     //
@@ -2679,6 +2671,16 @@ export class SessionManager {
         if (engine === 'codex') {
             return session.threadId;
         }
+        // `sessionId` on a codex-app session is a label of ours; `thread/resume`
+        // needs the app-server's own thread id, and silently opened a new thread
+        // when handed the label.
+        if (engine === 'codex-app') {
+            return session.codexThreadId;
+        }
+        // Likewise an ACP session's `sessionId` is ours; the agent resumes its own.
+        if (engine === 'acp') {
+            return session.agentSessionId;
+        }
         return session.sessionId;
     }
     _storedResumeId(engine, id) {
@@ -2688,6 +2690,10 @@ export class SessionManager {
             return id && !/^codex-\d+-/.test(id) ? id : undefined;
         if (engine === 'grok')
             return id && !/^grok-\d+-/.test(id) ? id : undefined;
+        if (engine === 'codex-app')
+            return id && !id.startsWith('codex-app-') ? id : undefined;
+        if (engine === 'acp')
+            return id && !id.startsWith('acp-') ? id : undefined;
         return id;
     }
     _listMdFiles(dir) {
@@ -2729,6 +2735,8 @@ export class SessionManager {
                 if (!config.customEngine)
                     throw new Error('customEngine config is required for engine type "custom"');
                 return new PersistentCustomSession(config);
+            case 'acp':
+                return new PersistentAcpSession(config);
             case 'claude':
             default:
                 return new PersistentClaudeSession(config, this.pluginConfig.claudeBin);
@@ -3261,6 +3269,10 @@ export class SessionManager {
             run_id: opts.runId,
             workspace: opts.workspace,
             ledger_dir: ledgerDir,
+            persistCheckpoint: () => {
+                const publish = this._autoloopPublishers.get(runId);
+                return publish ? publish() : false;
+            },
             push_policy: pushPolicy,
             notifyUser: async (level, summary, detail, channel) => {
                 const result = await notifyUserFallbackChain({
@@ -3285,11 +3297,18 @@ export class SessionManager {
             activityLeaseMs: opts.activityLeaseMs,
             autoloopHardTimeoutMs: opts.autoloopHardTimeoutMs,
         });
+        // Background resume/deadline/stall paths emit 'error' after a void catch.
+        // Without a listener, Node turns that into an unhandled rejection.
+        runner.on('error', (err) => {
+            this.logger.error?.(`[autoloop/${runId}] background runner task failed: ${boundedErrorReason(err)}`);
+        });
         runnerRef = runner;
         if (closedLedgerRestore) {
             runner.state.iter = closedLedgerRestore.iter;
             runner.state.metric_history = closedLedgerRestore.metric_history.slice();
         }
+        if (opts._restoredInput)
+            runner.loadRestoredInput(opts._restoredInput);
         try {
             await runner.start();
             // A reconstructed migration becomes externally visible only after its
@@ -3297,7 +3316,6 @@ export class SessionManager {
             // this inside the startup try makes an append failure follow the same
             // cleanup path as any other failed resume.
             opts._commitTimeoutMigration?.();
-            await this._recoverCommittedCoderIteration(opts.workspace, ledgerDir, runId, runner, dispatcher);
         }
         catch (err) {
             try {
@@ -3311,7 +3329,17 @@ export class SessionManager {
             runner.stop();
             throw err;
         }
-        return { runner, dispatcher, ledgerDir, pushPolicy };
+        // Committed-iteration recovery runs after publisher registration, the
+        // initial-publish check and notice reconciliation (see afterPublishReconcile
+        // in makeAutoloopExecutor) — never inside boot before that gate.
+        return {
+            runner,
+            dispatcher,
+            ledgerDir,
+            pushPolicy,
+            abort: () => runner.markCancelledByKernel(),
+            afterPublishReconcile: () => this._recoverCommittedCoderIteration(opts.workspace, ledgerDir, runId, runner, dispatcher),
+        };
     }
     /**
      * If the durable ledger has a committed Coder iteration with no Reviewer
@@ -3352,8 +3380,12 @@ export class SessionManager {
             return;
         this.logger.info?.(`[autoloop/${runId}] recovering committed iter ${n} into Reviewer`);
         await dispatcher.ensureReviewerForCommittedRecovery();
-        runner.markSubagentsSpawned();
+        // Keep a reconciled chat_notice_pending pause so Planner-bound follow-ups
+        // park until the notice is recorded; live spawn_subagents stays unchanged.
+        runner.markSubagentsSpawned({ preservePause: true });
         runner.state.iter = n;
+        // Queue only — never await the physical Reviewer turn. Readiness and the
+        // cancellation observer must install before any model transport settles.
         void runner
             .send(AutoloopMsg.reviewRequest(n, {
             iter: n,
@@ -3441,12 +3473,21 @@ export class SessionManager {
             this._autoloopStarting.delete(tag);
         }
     }
+    /**
+     * Durably accept a chat message for a live run's Planner and return the
+     * envelope to deliver. Throws, with nothing accepted, when the run cannot
+     * checkpoint it. Internal: callers pass the result to `runner.send`.
+     */
+    acceptAutoloopChat(runId, text) {
+        return this._liveAutoloop(runId).runner.acceptChat(text);
+    }
     /**
      * Inject a user chat message into a v2 run's Planner. Returns the Planner's
      * natural-language reply.
      */
     async autoloopChat(runId, text) {
         const ctx = this._liveAutoloop(runId);
+        const env = this.acceptAutoloopChat(runId, text);
         let reply = '';
         const onReply = (...args) => {
             const t = args[0];
@@ -3455,7 +3496,7 @@ export class SessionManager {
         };
         ctx.dispatcher.on('planner_reply', onReply);
         try {
-            await ctx.runner.send(AutoloopMsg.chat(ctx.runner.state.iter, { text }));
+            await ctx.runner.send(env);
         }
         finally {
             ctx.dispatcher.off('planner_reply', onReply);
@@ -3566,8 +3607,16 @@ export class SessionManager {
         }
         const live = this.kernel.handle(runId, LEGACY_NODE);
         if (live) {
-            if (!hasTimeoutIncrease)
+            if (!hasTimeoutIncrease) {
+                // Ordinary and activity-lease pauses have no uncertain in-flight
+                // dispatch. A pending send timeout stays the historical no-op until
+                // an explicit timeout increase names that dispatch.
+                if (live.runner.state.status === 'paused' && live.runner.state.pending_dispatch === null) {
+                    live.runner.resumePaused();
+                    this._autoloopPublishers.get(runId)?.();
+                }
                 return live.runner.state;
+            }
             const pending = live.runner.state.pending_dispatch;
             if (live.runner.state.status !== 'paused' || !pending) {
                 throw new Error(`Autoloop run '${runId}' is not awaiting a recoverable send timeout`);