@addai/node 0.30.16-msp.8 → 0.30.16-msp.9

package/dist/claude-print.d.ts

@@ -16,6 +16,9 @@ export interface ClaudePrintInput {
     allowedTools?: string[];
     /** Write the CLI's debug log here, to time each app's connection. */
     debugFile?: string;
+    /** Start now and take the prompt later through sendPrompt, so the CLI's
+     *  start-up overlaps whatever the prompt is still waiting on. */
+    deferPrompt?: boolean;
 }
 /**
  * findClaudeBinary for the spawn path. The lookup runs `where` or a login shell
@@ -51,6 +54,8 @@ export type ClaudePrintInputBlock = {
     };
 };
 /** Stream JSON reaches stdin only; files never become command-line arguments. */
+/** The one stdin line a run started with deferPrompt gets. */
+export declare function claudePrintPromptMessage(prompt: string): string;
 export declare function claudePrintInputMessage(prompt: string, blocks: readonly ClaudePrintInputBlock[]): string;
 /**
  * The text to emit for one flushed block, given what came before.
@@ -73,6 +78,11 @@ export interface ClaudePrintHandle {
     onEvent(cb: (e: RuntimeEvent) => void): void;
     /** Resolves with exit code; rejects on spawn error. */
     done: Promise<number>;
+    /** deferPrompt only. Closes stdin behind the message, so from here the run
+     *  ends the way any other run does: one turn, then the process exits. */
+    sendPrompt?(prompt: string): void;
+    /** True once the process has gone, so a deferred start can be passed over. */
+    hasExited(): boolean;
 }
 /**
  * Parse one stream-json line into 0+ RuntimeEvents.

package/dist/claude-print.js

@@ -40,6 +40,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cachedClaudeBinary = cachedClaudeBinary;
 exports.parseMcpTimings = parseMcpTimings;
+exports.claudePrintPromptMessage = claudePrintPromptMessage;
 exports.claudePrintInputMessage = claudePrintInputMessage;
 exports.blockDelta = blockDelta;
 exports.lineToEvents = lineToEvents;
@@ -104,6 +105,10 @@ function parseMcpTimings(log) {
     };
 }
 /** Stream JSON reaches stdin only; files never become command-line arguments. */
+/** The one stdin line a run started with deferPrompt gets. */
+function claudePrintPromptMessage(prompt) {
+    return JSON.stringify({ type: 'user', session_id: '', parent_tool_use_id: null, message: { role: 'user', content: [{ type: 'text', text: prompt }] } }) + '\n';
+}
 function claudePrintInputMessage(prompt, blocks) {
     if (!Array.isArray(blocks) || blocks.length < 1 || blocks.length > 12 || !blocks.every(b => b && (b.type === 'text' && typeof b.text === 'string' || ['image', 'document'].includes(b.type) && 'source' in b && b.source?.type === 'base64' && typeof b.source.data === 'string' && /^[A-Za-z0-9+/]*={0,2}$/.test(b.source.data)
         && (b.type === 'document' ? b.source.media_type === 'application/pdf' : ['image/png', 'image/jpeg', 'image/webp', 'image/gif'].includes(b.source.media_type)))))
@@ -241,7 +246,7 @@ function spawnClaudePrint(input) {
         args.push('--include-partial-messages');
     if (input.debugFile)
         args.push('--debug-file', input.debugFile);
-    if (input.inputBlocks)
+    if (input.inputBlocks || input.deferPrompt)
         args.push('--input-format', 'stream-json');
     if (input.permissionMode === 'bypassPermissions') {
         args.push('--dangerously-skip-permissions');
@@ -308,15 +313,28 @@ function spawnClaudePrint(input) {
         // Mark handled now — the caller awaits `done` a few ticks later, and an
         // already-rejected promise with no handler would fire unhandledRejection.
         done.catch(() => { });
-        return { pid: undefined, sessionId: null, kill: () => { }, onEvent: () => { }, done };
+        return { pid: undefined, sessionId: null, kill: () => { }, onEvent: () => { }, done, hasExited: () => true };
     }
-    (0, prompt_transport_1.feedStdin)(proc, transport.stdin);
+    // A child that dies before its deferred prompt turns the later write into
+    // EPIPE; its exit reports that, same as feedStdin.
+    if (input.deferPrompt)
+        proc.stdin?.on('error', () => { });
+    else
+        (0, prompt_transport_1.feedStdin)(proc, transport.stdin);
     const listeners = [];
-    const emit = (e) => { for (const l of listeners)
-        try {
-            l(e);
+    // A deferred start can say something before the run has attached to it.
+    const unheard = [];
+    const emit = (e) => {
+        if (input.deferPrompt && listeners.length === 0) {
+            unheard.push(e);
+            return;
         }
-        catch { } };
+        for (const l of listeners)
+            try {
+                l(e);
+            }
+            catch { }
+    };
     let sessionId = null;
     let buffer = '';
     // Text-delta coalescer (partial-stream mode). Token deltas arrive many times
@@ -447,9 +465,11 @@ function spawnClaudePrint(input) {
     proc.stderr?.on('data', (chunk) => {
         stderrBuf += chunk.toString('utf8');
     });
+    let exited = false;
     const done = new Promise((resolve, reject) => {
-        proc.once('error', reject);
+        proc.once('error', (err) => { exited = true; reject(err); });
         proc.once('exit', (code) => {
+            exited = true;
             sysPrompt.cleanup();
             flushThinking();
             flushText();
@@ -460,11 +480,24 @@ function spawnClaudePrint(input) {
             resolve(code ?? -1);
         });
     });
+    // Nothing awaits a deferred start's done until its prompt is ready, and a
+    // rejection nobody has handled yet would take the whole daemon down.
+    if (input.deferPrompt)
+        done.catch(() => { });
     return {
         pid: proc.pid,
         get sessionId() { return sessionId; },
         kill: () => { (0, win_1.killProcessTree)(proc); },
-        onEvent: (cb) => { listeners.push(cb); },
+        onEvent: (cb) => {
+            listeners.push(cb);
+            for (const e of unheard.splice(0))
+                try {
+                    cb(e);
+                }
+                catch { }
+        },
         done,
+        hasExited: () => exited,
+        ...(input.deferPrompt ? { sendPrompt: (prompt) => { proc.stdin?.end(claudePrintPromptMessage(prompt), 'utf8'); } } : {}),
     };
 }

package/dist/session-runner.d.ts

@@ -1,3 +1,4 @@
+import { type ClaudePrintHandle } from './claude-print';
 import { type EntityboxQueueServices } from './entitybox-queue-request';
 import { type InstallResult } from './install';
 import { fetchMemoryPack } from './memory-pack';
@@ -130,6 +131,14 @@ export interface RuntimeRequestRow {
      *  the spawn. Resolves null for every entity without MSP switched on, and
      *  is undefined for runs it can't apply to. See model-selector.ts. */
     mspDecision?: Promise<MspDecision | null>;
+    /** NOT a DB column. What applyModelSelection decided: it publishes, so it
+     *  runs once however many steps ask. */
+    mspApplied?: Promise<MspDecision | null>;
+    /** NOT a DB column. A CLI startClaudeEarly has running, waiting for its prompt. */
+    earlyStart?: {
+        handle: ClaudePrintHandle;
+        at: number;
+    };
 }
 export declare function notifyFlowsIfFlowRequest(requestId: string): Promise<void>;
 export declare function notifyWidgetstudioIfWidgetRequest(requestId: string): Promise<void>;
@@ -145,6 +154,9 @@ export declare function notifySelfImproveIfEnabled(requestId: string): Promise<v
  *
  *  Exported for tests. */
 export declare function resumeSessionIsVoid(workingDirectory: string | null | undefined, resumeSessionId: string | null | undefined, cwdSubstituted: boolean): boolean;
+/** The selector's early_start setting, on a turn it can work for. A new session
+ *  carries its memories in the system prompt, so that can't start before they land. */
+export declare function earlyStartWanted(req: Pick<RuntimeRequestRow, 'agent' | 'mode' | 'prompt' | 'resume_session_id' | 'entitybox_file_request'>, config: unknown): boolean;
 type MemoryPack = Awaited<ReturnType<typeof fetchMemoryPack>>;
 /**
  * Setup for a turn with the model selector on. It does what the block in
@@ -153,6 +165,6 @@ type MemoryPack = Awaited<ReturnType<typeof fetchMemoryPack>>;
  * turn. Claude reuses a resumed session's first system prompt, so its memory
  * pack and pointer there are only read again after a compaction.
  */
-export declare function prepareFastSetup(req: RuntimeRequestRow, cwd: string, installed: InstallResult, pack: Promise<MemoryPack>, startedAt: number): Promise<void>;
+export declare function prepareFastSetup(req: RuntimeRequestRow, cwd: string, installed: InstallResult, pack: Promise<MemoryPack>, startedAt: number, onSystemPromptReady?: () => Promise<void>): Promise<void>;
 export declare function runRequest(req: RuntimeRequestRow, entitybox?: EntityboxQueueServices): Promise<void>;
 export {};

package/dist/session-runner.js

@@ -43,6 +43,7 @@ exports.notifyFlowsIfFlowRequest = notifyFlowsIfFlowRequest;
 exports.notifyWidgetstudioIfWidgetRequest = notifyWidgetstudioIfWidgetRequest;
 exports.notifySelfImproveIfEnabled = notifySelfImproveIfEnabled;
 exports.resumeSessionIsVoid = resumeSessionIsVoid;
+exports.earlyStartWanted = earlyStartWanted;
 exports.prepareFastSetup = prepareFastSetup;
 exports.runRequest = runRequest;
 const fs = __importStar(require("fs"));
@@ -1647,7 +1648,10 @@ function publishModelSelection(req, d, changed) {
 }
 /** This turn's model and effort, when MSP is on. Written onto req so a guardrail
  *  retry turn stays on the same model. Call it just before the spawn. */
-async function applyModelSelection(req) {
+function applyModelSelection(req) {
+    return req.mspApplied ??= selectModelOnce(req);
+}
+async function selectModelOnce(req) {
     const msp = req.mspDecision ? await req.mspDecision : null;
     if (!msp)
         return null;
@@ -1681,12 +1685,55 @@ function reportMcpTimings(req, file) {
     catch { /* best-effort */ }
 }
 // ── claude --print ─────────────────────────────────────────────────────────
+function mcpDebugFileFor(req, msp) {
+    return msp?.mcp_timing ? path.join(os.tmpdir(), `ainode-mcp-${req.id}.log`) : null;
+}
+function claudePrintInputFor(req, cwd, installed, msp) {
+    const debugFile = mcpDebugFileFor(req, msp);
+    return {
+        workingDirectory: cwd,
+        prompt: req.prompt ?? '',
+        permissionMode: req.agent === 'claude-bypass' ? 'bypassPermissions' : (req.permission_mode ?? undefined),
+        effortLevel: req.effort ?? undefined,
+        model: (0, model_filter_1.modelForAgent)('claude', req.model),
+        mcpConfigPath: installed.mcpConfigPath ?? undefined,
+        resumeSessionId: req.resume_session_id ?? undefined,
+        appendSystemPrompt: msp ? (0, time_context_1.appendChatTimeContext)(req.system_prompt) : (0, time_context_1.appendTimeContext)(req.system_prompt),
+        allowedTools: req.allowed_tools ?? undefined,
+        ...(debugFile ? { debugFile } : {}),
+    };
+}
+/** The selector's early_start setting, on a turn it can work for. A new session
+ *  carries its memories in the system prompt, so that can't start before they land. */
+function earlyStartWanted(req, config) {
+    if (process.env.ADDAI_EARLY_START === '0')
+        return false;
+    if (config?.early_start !== true)
+        return false;
+    return req.agent === 'claude' && req.mode === 'print' && !!req.prompt && !!req.resume_session_id
+        && req.entitybox_file_request !== true;
+}
+/**
+ * Start the CLI while the memory lookup is still running. Its start-up doesn't
+ * need the message, so the two can overlap instead of one waiting for the other.
+ * It's still one process for one turn, gone when the turn ends, so nothing stays
+ * running on the node. If this fails, runClaudePrint spawns the normal way.
+ */
+async function startClaudeEarly(req, cwd, installed) {
+    try {
+        const msp = await applyModelSelection(req);
+        const handle = (0, claude_print_1.spawnClaudePrint)({ ...claudePrintInputFor(req, cwd, installed, msp), prompt: '', deferPrompt: true });
+        req.earlyStart = { handle, at: Date.now() };
+    }
+    catch (err) {
+        console.error(`[setup] early start failed [reqId=${req.id}]: ${err.message}`);
+    }
+}
 async function runClaudePrint(req, cwd, installed) {
     if (!req.prompt) {
         await setStatus(req.id, { status: 'failed', errorCode: 'no_prompt', errorMessage: 'print mode requires a prompt' });
         return;
     }
-    const permissionMode = req.agent === 'claude-bypass' ? 'bypassPermissions' : (req.permission_mode ?? undefined);
     // Floor for "which subagent transcripts belong to this attempt" — see
     // subagent-usage.ts. Taken before the spawn so nothing this run writes
     // can fall outside the window.
@@ -1712,22 +1759,24 @@ async function runClaudePrint(req, cwd, installed) {
         }
     }
     const msp = await applyModelSelection(req);
-    const mcpDebugFile = msp?.mcp_timing ? path.join(os.tmpdir(), `ainode-mcp-${req.id}.log`) : null;
+    const mcpDebugFile = mcpDebugFileFor(req, msp);
+    // A CLI that started early and has already gone (a session it can't resume, a
+    // bad flag) is passed over, so the normal spawn gives this turn its usual chance.
+    const early = req.earlyStart && !req.earlyStart.handle.hasExited() ? req.earlyStart : null;
+    req.earlyStart = undefined;
     let handle;
     try {
-        handle = (0, claude_print_1.spawnClaudePrint)({
-            workingDirectory: cwd,
-            prompt: req.prompt,
-            ...(inputBlocks ? { inputBlocks } : {}),
-            permissionMode,
-            effortLevel: req.effort ?? undefined,
-            model: (0, model_filter_1.modelForAgent)('claude', req.model),
-            mcpConfigPath: installed.mcpConfigPath ?? undefined,
-            resumeSessionId: req.resume_session_id ?? undefined,
-            appendSystemPrompt: msp ? (0, time_context_1.appendChatTimeContext)(req.system_prompt) : (0, time_context_1.appendTimeContext)(req.system_prompt),
-            allowedTools: req.allowed_tools ?? undefined,
-            ...(mcpDebugFile ? { debugFile: mcpDebugFile } : {}),
-        });
+        if (early) {
+            handle = early.handle;
+            handle.sendPrompt?.(req.prompt);
+            void emit(req.id, 'early_start', { lead_ms: Date.now() - early.at });
+        }
+        else {
+            handle = (0, claude_print_1.spawnClaudePrint)({
+                ...claudePrintInputFor(req, cwd, installed, msp),
+                ...(inputBlocks ? { inputBlocks } : {}),
+            });
+        }
     }
     catch (err) {
         await failRequest(req, 'spawn_failed', err.message);
@@ -2393,7 +2442,7 @@ function launchAppsDirectly(cwd, installed) {
  * turn. Claude reuses a resumed session's first system prompt, so its memory
  * pack and pointer there are only read again after a compaction.
  */
-async function prepareFastSetup(req, cwd, installed, pack, startedAt) {
+async function prepareFastSetup(req, cwd, installed, pack, startedAt, onSystemPromptReady) {
     const resumedClaude = req.agent !== 'codex' && !!req.resume_session_id;
     const timing = { pack_ms: null };
     try {
@@ -2452,6 +2501,8 @@ async function prepareFastSetup(req, cwd, installed, pack, startedAt) {
     let recall = 'system_prompt';
     if (resumedClaude) {
         const decision = await req.mspDecision;
+        // Only the message changes from here on, and that's what the pack is for.
+        await onSystemPromptReady?.();
         const found = await (decision?.picked === 'quick'
             ? Promise.race([pack, new Promise(done => setTimeout(() => done(null), QUICK_RECALL_WAIT_MS))])
             : pack);
@@ -2603,10 +2654,11 @@ async function runRequest(req, entitybox) {
             skills_installed: installed.skillSlugs,
         });
     }
-    const fast = !!earlyPack && !!(await mspSetting);
+    const fastSetting = earlyPack ? await mspSetting : null;
+    const fast = !!fastSetting;
     if (fast) {
         try {
-            await prepareFastSetup(req, cwd, installed, earlyPack, startedAt);
+            await prepareFastSetup(req, cwd, installed, earlyPack, startedAt, earlyStartWanted(req, fastSetting?.config) ? () => startClaudeEarly(req, cwd, installed) : undefined);
         }
         catch (err) {
             console.error(`[setup] fast setup failed [reqId=${req.id}]: ${err.message}`);
@@ -2700,6 +2752,8 @@ async function runRequest(req, entitybox) {
         }
     }
     finally {
+        // An early start nothing went on to use. The turn is over, so it must not outlive it.
+        req.earlyStart?.handle.kill();
         // Best-effort cleanup of installed files. If the request crashed
         // mid-flight we may leak files; next install run for the same cwd
         // will overwrite them.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addai/node",
-  "version": "0.30.16-msp.8",
+  "version": "0.30.16-msp.9",
   "description": "Daemon that pairs a machine with your +Ai account and runs Claude / Codex / Kimi / Gemini agents on its behalf. Reachable via Supabase from Vault, Entity Studio, or any other +Ai surface.",
   "license": "MIT",
   "keywords": [