larkin 0.5.2 → 0.5.4

package/dist/runtime/runtime-adapters.mjs

@@ -12,7 +12,7 @@ import { resolvePiSubagentRecordWatchdogExtensionArg } from "./pi-subagent-recor
 import { effectivePiStateDir, extractBackgroundPiSubagentDispatch } from "./pi-subagent-ledger.mjs";
 import { resolvePiBashTimeoutExtensionArg } from "./pi-bash-timeout-injection.mjs";
 import { classifyPiMissingCredentialRejection, classifyRuntimePrerequisite, missingProviderCredentialReadiness, probeNativeRuntimeReadiness, providerAuthenticationFailureReadiness, RuntimePrerequisiteError, } from "./runtime-readiness.mjs";
-import { buildStrictProviderErrorInput, classifyStrictProviderError, INTERNAL_CONTEXT_WINDOW_PROJECTION_REASON, } from "./provider-error-classifier.mjs";
+import { buildStrictProviderErrorInput, classifyStrictProviderError, INTERNAL_CONTEXT_WINDOW_PROJECTION_REASON, safeProviderDiagnostic, } from "./provider-error-classifier.mjs";
 import { assertEffectivePiCompactionSettings, MINIMUM_PI_VERSION, calculatePiCompactionSettings, parsePiExecutableVersion, projectPiSettingsFile, readOwnedPiSettings, verifyPiCapabilities, writeOwnedPiSettings, } from "./pi-compaction-recovery.mjs";
 /** External pi must see the user's own agent dir; Larkin never injects or honors PI_CODING_AGENT_DIR. */
 function stripPiCodingAgentDir(env) {
@@ -20,6 +20,31 @@ function stripPiCodingAgentDir(env) {
     delete next.PI_CODING_AGENT_DIR;
     return next;
 }
+const PI_INITIALIZATION_CONCURRENCY = 2;
+/** Limits short-lived Pi startup handshakes without serializing live sessions. */
+function createInitializationLimiter(limit) {
+    let active = 0;
+    const waiters = [];
+    const release = () => {
+        const next = waiters.shift();
+        if (next)
+            next();
+        else
+            active -= 1;
+    };
+    return async (operation) => {
+        if (active >= limit)
+            await new Promise((resolve) => waiters.push(resolve));
+        else
+            active += 1;
+        try {
+            return await operation();
+        }
+        finally {
+            release();
+        }
+    };
+}
 class EventSession {
     listeners = new Set();
     subscribe(listener) {
@@ -780,14 +805,7 @@ class PiSession extends EventSession {
     }
 }
 function safeProviderText(value, fallback) {
-    const source = typeof value === "string" ? value : fallback;
-    return source
-        .replace(/\b(?:authorization|proxy-authorization)\s*[:=]\s*(?:Bearer\s+)?[^\s,;]+/gi, (match) => `${match.split(/[:=]/, 1)[0]}=[redacted]`)
-        .replace(/\b(?:cookie|set-cookie|api[_ -]?key|access[_ -]?token|refresh[_ -]?token|secret)\s*[:=]\s*[^\s,;]+/gi, (match) => `${match.split(/[:=]/, 1)[0]}=[redacted]`)
-        .replace(/(["'](?:authorization|cookie|api[_-]?key|access[_-]?token|refresh[_-]?token|token|secret)["']\s*:\s*)["'][^"']*["']/gi, "$1\"[redacted]\"")
-        .replace(/Bearer\s+[A-Za-z0-9._~+\/-]+/gi, "Bearer [redacted]")
-        .replace(/\bsk-[A-Za-z0-9_-]{8,}\b/g, "[redacted]")
-        .replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim().slice(0, 2_000) || fallback;
+    return safeProviderDiagnostic(value, fallback);
 }
 function piAssistantProviderError(message) {
     const diagnostic = [...(Array.isArray(message.diagnostics) ? message.diagnostics : [])]
@@ -1048,8 +1066,16 @@ async function createPiRpcBackend(input, dependencies, spawn, productionSpawn =
     commandArgs.push(...extensionArgs);
     let probedModel = null;
     if (productionSpawn) {
-        // 隔离探测用户自己的 Pi home（无 PI_CODING_AGENT_DIR），再把 15% reserve 写到工作区项目设置。
-        probedModel = await discoverEffectivePiContextWindow(input, command, commandPrefix, requestedModel, childEnv, spawn, dependencies.piRpcClientOptions);
+        try {
+            // Isolated probes must share the same prerequisite contract as the
+            // session handshake, so a cold-start timeout can use bounded recovery.
+            probedModel = await discoverEffectivePiContextWindow(input, command, commandPrefix, requestedModel, childEnv, spawn, dependencies.piRpcClientOptions);
+        }
+        catch (error) {
+            if (error instanceof RuntimePrerequisiteError)
+                throw error;
+            throw new RuntimePrerequisiteError(classifyRuntimePrerequisite("pi", error, command));
+        }
         writeOwnedPiSettings(input.workspaceDir, calculatePiCompactionSettings(probedModel.contextWindow));
     }
     const child = spawn(command, commandArgs, {
@@ -1119,6 +1145,7 @@ export function createNativeRuntimeAdapter(id, dependencies = {}) {
             ? dependencies.codexCommand ?? dependencies.env?.LARKIN_CODEX_COMMAND ?? "codex"
             : dependencies.claudeCommand ?? dependencies.env?.LARKIN_CLAUDE_COMMAND ?? "claude";
     const codexCommand = dependencies.codexCommand ?? dependencies.env?.LARKIN_CODEX_COMMAND ?? "codex";
+    const runPiInitialization = createInitializationLimiter(PI_INITIALIZATION_CONCURRENCY);
     let codexUpdateAttempt = null;
     let codexUpdateAttempted = false;
     const runCodexUpdate = () => new Promise((resolve) => {
@@ -1217,9 +1244,9 @@ export function createNativeRuntimeAdapter(id, dependencies = {}) {
                     throw new RuntimePrerequisiteError(readiness);
             }
             if (id === "pi") {
-                return new PiSession(await (dependencies.createPiSession
+                return runPiInitialization(async () => new PiSession(await (dependencies.createPiSession
                     ? dependencies.createPiSession(input)
-                    : createPiRpcBackend(input, { ...dependencies, piCommand: resolvedExecutable }, spawn, productionSpawn)));
+                    : createPiRpcBackend(input, { ...dependencies, piCommand: resolvedExecutable }, spawn, productionSpawn))));
             }
             if (id === "codex") {
                 const codexInput = dependencies.codexModelOverride?.trim()

package/dist/runtime/runtime-host.cjs

@@ -1640,38 +1640,45 @@ function createRuntimeHost(options) {
     const ensureSession = async (agent) => {
         if (agent.disabledReason)
             throw new Error(agent.disabledReason);
+        if (agent.stopped)
+            throw new Error("runtime Agent is stopped");
         if (agent.session)
             return agent.session;
         if (agent.starting)
             return agent.starting;
-        const probeEnv = runtimeEnv(agent.config);
-        await assertOfficialCliReady(agent.config, probeEnv);
-        const readiness = agent.adapter.probe ? await agent.adapter.probe({ agentId: agent.config.agentId,
-            workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
-            env: { LARKIN_PI_COMMAND: process.env.LARKIN_PI_COMMAND, LARKIN_CODEX_COMMAND: process.env.LARKIN_CODEX_COMMAND,
-                LARKIN_CLAUDE_COMMAND: process.env.LARKIN_CLAUDE_COMMAND, ...probeEnv } })
-            : { runtime: agent.adapter.id, state: "ready" };
-        if (!agent.authFailureActive)
-            agent.readiness = readiness;
-        if (readiness.state !== "ready")
-            throw new runtime_readiness_js_1.RuntimePrerequisiteError(readiness);
-        const standingPrompt = options.promptBuilder.build({
-            agentId: agent.config.agentId, name: agent.config.displayName || agent.config.name,
-            description: agent.config.description || "", runtime: agent.adapter.id,
-            cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: agent.previousSession,
-        });
-        const generation = ++agent.generation;
         let completedSession = null;
-        const sessionEnv = runtimeEnv(agent.config, `${agent.launchId}:${generation}`);
-        agent.starting = agent.adapter.createSession({
-            agentId: agent.config.agentId, model: agent.config.model, reasoningEffort: agent.config.effort || null,
-            workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
-            resumeSessionId: agent.config.sessionId || null, standingPrompt,
-            env: sessionEnv,
-        }).then((session) => {
+        agent.starting = (async () => {
+            const probeEnv = runtimeEnv(agent.config);
+            await assertOfficialCliReady(agent.config, probeEnv);
+            if (agent.stopped)
+                throw new Error("runtime Agent is stopped");
+            const readiness = agent.adapter.probe ? await agent.adapter.probe({ agentId: agent.config.agentId,
+                workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
+                env: { LARKIN_PI_COMMAND: process.env.LARKIN_PI_COMMAND, LARKIN_CODEX_COMMAND: process.env.LARKIN_CODEX_COMMAND,
+                    LARKIN_CLAUDE_COMMAND: process.env.LARKIN_CLAUDE_COMMAND, ...probeEnv } })
+                : { runtime: agent.adapter.id, state: "ready" };
+            if (!agent.authFailureActive)
+                agent.readiness = readiness;
+            if (readiness.state !== "ready")
+                throw new runtime_readiness_js_1.RuntimePrerequisiteError(readiness);
+            if (agent.stopped)
+                throw new Error("runtime Agent is stopped");
+            const standingPrompt = options.promptBuilder.build({
+                agentId: agent.config.agentId, name: agent.config.displayName || agent.config.name,
+                description: agent.config.description || "", runtime: agent.adapter.id,
+                cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: agent.previousSession,
+            });
+            const generation = ++agent.generation;
+            const sessionEnv = runtimeEnv(agent.config, `${agent.launchId}:${generation}`);
+            const session = await agent.adapter.createSession({
+                agentId: agent.config.agentId, model: agent.config.model, reasoningEffort: agent.config.effort || null,
+                workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
+                resumeSessionId: agent.config.sessionId || null, standingPrompt,
+                env: sessionEnv,
+            });
             completedSession = session;
             if (agent.stopped || generation !== agent.generation) {
-                void session.close("stale creation");
+                await session.close("stale creation");
                 throw new Error("stale runtime session creation");
             }
             agent.session = session;
@@ -1691,7 +1698,7 @@ function createRuntimeHost(options) {
             agent.stabilityTimer = setTimeout(() => markSessionStable(agent, session), retryPolicy.stableWindowMs);
             agent.stabilityTimer.unref?.();
             return session;
-        }).finally(() => {
+        })().finally(() => {
             agent.starting = null;
             if (completedSession && !agent.session && !agent.stopped) {
                 scheduleRecreate(agent, agent.recreateReason || "runtime closed during session initialization");
@@ -2329,6 +2336,8 @@ function createRuntimeHost(options) {
                 emitConsumed(agent, [...startupConsumed, ...persist(agent)]);
                 try {
                     await ensureSession(agent);
+                    if (agent.stopped)
+                        return;
                     reconcileSubagentLedger(agent, { forceMissing: true, missingReason: "runtime restarted" });
                     enqueueUndeliveredTerminalWakes(agent);
                     await recoverStalePiCompaction(agent);
@@ -2336,10 +2345,14 @@ function createRuntimeHost(options) {
                     const proactive = startupSession ? proactivelyCompactPiAtIdle(agent, startupSession) : null;
                     if (proactive)
                         await proactive;
+                    if (agent.stopped)
+                        return;
                     activeCount += 1;
                     await retryPending(agent);
                 }
                 catch (error) {
+                    if (agent.stopped)
+                        return;
                     const reason = error instanceof Error ? error.message : String(error);
                     const transient = error instanceof runtime_readiness_js_1.RuntimePrerequisiteError && error.readiness.state === "unavailable";
                     agent.disabledReason = transient ? null : reason;
@@ -2353,6 +2366,8 @@ function createRuntimeHost(options) {
                     emit({ type: "agent-status", agentId: config.agentId, status: "error", error: reason,
                         ...(error instanceof runtime_readiness_js_1.RuntimePrerequisiteError ? { readiness: error.readiness } : {}) });
                 }
+                if (agent.stopped)
+                    return;
                 const visibleQuarantines = startupQuarantined.filter(({ record }) => agent.records.get(record.deliveryId)?.status === "error");
                 for (const { record, code } of visibleQuarantines)
                     emit({ type: "delivery", agentId: config.agentId,
@@ -2447,6 +2462,7 @@ function createRuntimeHost(options) {
             if (!agent)
                 return;
             agent.stopped = true;
+            const starting = agent.starting;
             if (agent.poller)
                 clearInterval(agent.poller);
             if (agent.retryTimer)
@@ -2460,6 +2476,10 @@ function createRuntimeHost(options) {
             if (agent.busy)
                 await agent.session?.cancel(reason);
             await agent.session?.close(reason);
+            // A queued Pi initializer cannot be cancelled through the public adapter
+            // contract. Drain it before removing the Agent; ensureSession sees stopped
+            // and closes any session created after this point.
+            await starting?.catch(() => { });
             managed.delete(agentId);
             emit({ type: "agent-status", agentId, status: "inactive" });
         },

package/dist/runtime/runtime-host.mjs

@@ -1631,38 +1631,45 @@ export function createRuntimeHost(options) {
     const ensureSession = async (agent) => {
         if (agent.disabledReason)
             throw new Error(agent.disabledReason);
+        if (agent.stopped)
+            throw new Error("runtime Agent is stopped");
         if (agent.session)
             return agent.session;
         if (agent.starting)
             return agent.starting;
-        const probeEnv = runtimeEnv(agent.config);
-        await assertOfficialCliReady(agent.config, probeEnv);
-        const readiness = agent.adapter.probe ? await agent.adapter.probe({ agentId: agent.config.agentId,
-            workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
-            env: { LARKIN_PI_COMMAND: process.env.LARKIN_PI_COMMAND, LARKIN_CODEX_COMMAND: process.env.LARKIN_CODEX_COMMAND,
-                LARKIN_CLAUDE_COMMAND: process.env.LARKIN_CLAUDE_COMMAND, ...probeEnv } })
-            : { runtime: agent.adapter.id, state: "ready" };
-        if (!agent.authFailureActive)
-            agent.readiness = readiness;
-        if (readiness.state !== "ready")
-            throw new RuntimePrerequisiteError(readiness);
-        const standingPrompt = options.promptBuilder.build({
-            agentId: agent.config.agentId, name: agent.config.displayName || agent.config.name,
-            description: agent.config.description || "", runtime: agent.adapter.id,
-            cli: agentCliPromptCapabilities("larkin"), previousSession: agent.previousSession,
-        });
-        const generation = ++agent.generation;
         let completedSession = null;
-        const sessionEnv = runtimeEnv(agent.config, `${agent.launchId}:${generation}`);
-        agent.starting = agent.adapter.createSession({
-            agentId: agent.config.agentId, model: agent.config.model, reasoningEffort: agent.config.effort || null,
-            workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
-            resumeSessionId: agent.config.sessionId || null, standingPrompt,
-            env: sessionEnv,
-        }).then((session) => {
+        agent.starting = (async () => {
+            const probeEnv = runtimeEnv(agent.config);
+            await assertOfficialCliReady(agent.config, probeEnv);
+            if (agent.stopped)
+                throw new Error("runtime Agent is stopped");
+            const readiness = agent.adapter.probe ? await agent.adapter.probe({ agentId: agent.config.agentId,
+                workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
+                env: { LARKIN_PI_COMMAND: process.env.LARKIN_PI_COMMAND, LARKIN_CODEX_COMMAND: process.env.LARKIN_CODEX_COMMAND,
+                    LARKIN_CLAUDE_COMMAND: process.env.LARKIN_CLAUDE_COMMAND, ...probeEnv } })
+                : { runtime: agent.adapter.id, state: "ready" };
+            if (!agent.authFailureActive)
+                agent.readiness = readiness;
+            if (readiness.state !== "ready")
+                throw new RuntimePrerequisiteError(readiness);
+            if (agent.stopped)
+                throw new Error("runtime Agent is stopped");
+            const standingPrompt = options.promptBuilder.build({
+                agentId: agent.config.agentId, name: agent.config.displayName || agent.config.name,
+                description: agent.config.description || "", runtime: agent.adapter.id,
+                cli: agentCliPromptCapabilities("larkin"), previousSession: agent.previousSession,
+            });
+            const generation = ++agent.generation;
+            const sessionEnv = runtimeEnv(agent.config, `${agent.launchId}:${generation}`);
+            const session = await agent.adapter.createSession({
+                agentId: agent.config.agentId, model: agent.config.model, reasoningEffort: agent.config.effort || null,
+                workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir,
+                resumeSessionId: agent.config.sessionId || null, standingPrompt,
+                env: sessionEnv,
+            });
             completedSession = session;
             if (agent.stopped || generation !== agent.generation) {
-                void session.close("stale creation");
+                await session.close("stale creation");
                 throw new Error("stale runtime session creation");
             }
             agent.session = session;
@@ -1682,7 +1689,7 @@ export function createRuntimeHost(options) {
             agent.stabilityTimer = setTimeout(() => markSessionStable(agent, session), retryPolicy.stableWindowMs);
             agent.stabilityTimer.unref?.();
             return session;
-        }).finally(() => {
+        })().finally(() => {
             agent.starting = null;
             if (completedSession && !agent.session && !agent.stopped) {
                 scheduleRecreate(agent, agent.recreateReason || "runtime closed during session initialization");
@@ -2320,6 +2327,8 @@ export function createRuntimeHost(options) {
                 emitConsumed(agent, [...startupConsumed, ...persist(agent)]);
                 try {
                     await ensureSession(agent);
+                    if (agent.stopped)
+                        return;
                     reconcileSubagentLedger(agent, { forceMissing: true, missingReason: "runtime restarted" });
                     enqueueUndeliveredTerminalWakes(agent);
                     await recoverStalePiCompaction(agent);
@@ -2327,10 +2336,14 @@ export function createRuntimeHost(options) {
                     const proactive = startupSession ? proactivelyCompactPiAtIdle(agent, startupSession) : null;
                     if (proactive)
                         await proactive;
+                    if (agent.stopped)
+                        return;
                     activeCount += 1;
                     await retryPending(agent);
                 }
                 catch (error) {
+                    if (agent.stopped)
+                        return;
                     const reason = error instanceof Error ? error.message : String(error);
                     const transient = error instanceof RuntimePrerequisiteError && error.readiness.state === "unavailable";
                     agent.disabledReason = transient ? null : reason;
@@ -2344,6 +2357,8 @@ export function createRuntimeHost(options) {
                     emit({ type: "agent-status", agentId: config.agentId, status: "error", error: reason,
                         ...(error instanceof RuntimePrerequisiteError ? { readiness: error.readiness } : {}) });
                 }
+                if (agent.stopped)
+                    return;
                 const visibleQuarantines = startupQuarantined.filter(({ record }) => agent.records.get(record.deliveryId)?.status === "error");
                 for (const { record, code } of visibleQuarantines)
                     emit({ type: "delivery", agentId: config.agentId,
@@ -2438,6 +2453,7 @@ export function createRuntimeHost(options) {
             if (!agent)
                 return;
             agent.stopped = true;
+            const starting = agent.starting;
             if (agent.poller)
                 clearInterval(agent.poller);
             if (agent.retryTimer)
@@ -2451,6 +2467,10 @@ export function createRuntimeHost(options) {
             if (agent.busy)
                 await agent.session?.cancel(reason);
             await agent.session?.close(reason);
+            // A queued Pi initializer cannot be cancelled through the public adapter
+            // contract. Drain it before removing the Agent; ensureSession sees stopped
+            // and closes any session created after this point.
+            await starting?.catch(() => { });
             managed.delete(agentId);
             emit({ type: "agent-status", agentId, status: "inactive" });
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkin",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "private": false,
   "larkinPackageRole": "npm-published",
   "files": [