larkin 0.4.24 → 0.4.26

package/dist/feishu/host-shell.cjs

@@ -221,6 +221,13 @@ function createHostShell({ env = process.env, runtimeHost, channelPackage, event
     const agentStates = new Map();
     const saveAgentState = (record) => {
         try {
+            const latest = record.store.readJson("agentState", {});
+            if (isRecord(latest.previousSessions)) {
+                record.state.previousSessions = {
+                    ...latest.previousSessions,
+                    ...(record.state.previousSessions ?? {}),
+                };
+            }
             record.store.writeJson("agentState", record.state);
         }
         catch (error) {
@@ -235,7 +242,11 @@ function createHostShell({ env = process.env, runtimeHost, channelPackage, event
         let state;
         try {
             const loaded = store.readJson("agentState", {});
-            state = { ...loaded, sessions: isRecord(loaded.sessions) ? loaded.sessions : {} };
+            state = {
+                ...loaded,
+                sessions: isRecord(loaded.sessions) ? loaded.sessions : {},
+                ...(isRecord(loaded.previousSessions) ? { previousSessions: loaded.previousSessions } : {}),
+            };
         }
         catch {
             state = { sessions: {} };
@@ -1309,13 +1320,21 @@ function createHostShell({ env = process.env, runtimeHost, channelPackage, event
         }
         if (message.type === "session") {
             const record = agentStates.get(agent.agentId);
-            if (record && record.state.sessions[message.runtime] !== message.sessionId) {
-                if (message.sessionId)
-                    record.state.sessions[message.runtime] = message.sessionId;
-                else
-                    delete record.state.sessions[message.runtime];
-                saveAgentState(record);
-                log(`持久化 agent=${agent.name} runtime=${message.runtime} sessionId=${message.sessionId}`);
+            if (record) {
+                const sessionChanged = record.state.sessions[message.runtime] !== message.sessionId;
+                if (sessionChanged) {
+                    if (message.sessionId)
+                        record.state.sessions[message.runtime] = message.sessionId;
+                    else
+                        delete record.state.sessions[message.runtime];
+                }
+                if (message.previousSession) {
+                    record.state.previousSessions = { ...(record.state.previousSessions ?? {}), [message.runtime]: message.previousSession };
+                }
+                if (sessionChanged || message.previousSession) {
+                    saveAgentState(record);
+                    log(`持久化 agent=${agent.name} runtime=${message.runtime} sessionId=${message.sessionId}`);
+                }
             }
             hostState.updateStatus(agent, (0, host_business_state_js_1.projectSessionStatus)(hostState.readStatus(agent), message.runtime, message.sessionId, message.launchId, new Date(), {
                 ...(message.model ? { model: message.model } : {}),
@@ -1564,6 +1583,7 @@ function createHostShell({ env = process.env, runtimeHost, channelPackage, event
                 await runtimeHost.start(agents.map((agent) => ({
                     ...agent,
                     sessionId: agentStates.get(agent.agentId)?.state.sessions[agent.runtime] || null,
+                    previousSession: agentStates.get(agent.agentId)?.state.previousSessions?.[agent.runtime] ?? null,
                 })));
                 reminder.startSync();
                 inboxAudit.start();

package/dist/feishu/host-shell.mjs

@@ -181,6 +181,13 @@ export function createHostShell({ env = process.env, runtimeHost, channelPackage
     const agentStates = new Map();
     const saveAgentState = (record) => {
         try {
+            const latest = record.store.readJson("agentState", {});
+            if (isRecord(latest.previousSessions)) {
+                record.state.previousSessions = {
+                    ...latest.previousSessions,
+                    ...(record.state.previousSessions ?? {}),
+                };
+            }
             record.store.writeJson("agentState", record.state);
         }
         catch (error) {
@@ -195,7 +202,11 @@ export function createHostShell({ env = process.env, runtimeHost, channelPackage
         let state;
         try {
             const loaded = store.readJson("agentState", {});
-            state = { ...loaded, sessions: isRecord(loaded.sessions) ? loaded.sessions : {} };
+            state = {
+                ...loaded,
+                sessions: isRecord(loaded.sessions) ? loaded.sessions : {},
+                ...(isRecord(loaded.previousSessions) ? { previousSessions: loaded.previousSessions } : {}),
+            };
         }
         catch {
             state = { sessions: {} };
@@ -1269,13 +1280,21 @@ export function createHostShell({ env = process.env, runtimeHost, channelPackage
         }
         if (message.type === "session") {
             const record = agentStates.get(agent.agentId);
-            if (record && record.state.sessions[message.runtime] !== message.sessionId) {
-                if (message.sessionId)
-                    record.state.sessions[message.runtime] = message.sessionId;
-                else
-                    delete record.state.sessions[message.runtime];
-                saveAgentState(record);
-                log(`持久化 agent=${agent.name} runtime=${message.runtime} sessionId=${message.sessionId}`);
+            if (record) {
+                const sessionChanged = record.state.sessions[message.runtime] !== message.sessionId;
+                if (sessionChanged) {
+                    if (message.sessionId)
+                        record.state.sessions[message.runtime] = message.sessionId;
+                    else
+                        delete record.state.sessions[message.runtime];
+                }
+                if (message.previousSession) {
+                    record.state.previousSessions = { ...(record.state.previousSessions ?? {}), [message.runtime]: message.previousSession };
+                }
+                if (sessionChanged || message.previousSession) {
+                    saveAgentState(record);
+                    log(`持久化 agent=${agent.name} runtime=${message.runtime} sessionId=${message.sessionId}`);
+                }
             }
             hostState.updateStatus(agent, projectSessionStatus(hostState.readStatus(agent), message.runtime, message.sessionId, message.launchId, new Date(), {
                 ...(message.model ? { model: message.model } : {}),
@@ -1524,6 +1543,7 @@ export function createHostShell({ env = process.env, runtimeHost, channelPackage
                 await runtimeHost.start(agents.map((agent) => ({
                     ...agent,
                     sessionId: agentStates.get(agent.agentId)?.state.sessions[agent.runtime] || null,
+                    previousSession: agentStates.get(agent.agentId)?.state.previousSessions?.[agent.runtime] ?? null,
                 })));
                 reminder.startSync();
                 inboxAudit.start();

package/dist/runtime/pi-distribution-label.cjs

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.piDistributionLabel = piDistributionLabel;
+function piDistributionLabel(distribution) {
+    return distribution === "builtin" ? "内置 Pi" : "用户安装的 Pi";
+}

package/dist/runtime/pi-distribution-label.mjs

@@ -0,0 +1,3 @@
+export function piDistributionLabel(distribution) {
+    return distribution === "builtin" ? "内置 Pi" : "用户安装的 Pi";
+}

package/dist/runtime/pi-provider-config.cjs

@@ -3,19 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PI_PROVIDER_PRESETS = exports.BUNDLED_PI_VERSION = void 0;
+exports.PI_PROVIDER_PRESETS = exports.BUNDLED_PI_VERSION = exports.piDistributionLabel = void 0;
 exports.validatePiBaseUrl = validatePiBaseUrl;
 exports.listProviderModels = listProviderModels;
 exports.resolveBuiltinPiProviderSetupSelection = resolveBuiltinPiProviderSetupSelection;
 exports.validateBuiltinPiProviderSelection = validateBuiltinPiProviderSelection;
 exports.piAgentDirectory = piAgentDirectory;
+exports.ownedPiCatalogAgentDir = ownedPiCatalogAgentDir;
+exports.piCatalogCommandSpec = piCatalogCommandSpec;
 exports.assertBuiltinPiAgentDirectory = assertBuiltinPiAgentDirectory;
 exports.configureBuiltinPiProviderModel = configureBuiltinPiProviderModel;
 exports.stageBuiltinPiProvider = stageBuiltinPiProvider;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const internal_command_js_1 = require("../app/internal-command.cjs");
 const secure_metadata_js_1 = require("../platform/secure-metadata.cjs");
+var pi_distribution_label_js_1 = require("./pi-distribution-label.cjs");
+Object.defineProperty(exports, "piDistributionLabel", { enumerable: true, get: function () { return pi_distribution_label_js_1.piDistributionLabel; } });
 exports.BUNDLED_PI_VERSION = "0.84.2";
 // These values mirror the catalog shipped by the pinned official Pi distribution.
 // Keeping the user-facing defaults here makes endpoint changes reviewable in Larkin.
@@ -137,6 +142,20 @@ function piAgentDirectory(configDir, agentId) {
         throw new Error("Pi Agent ID 格式无效");
     return node_path_1.default.join(node_path_1.default.resolve(configDir), "providers", "pi", agentId);
 }
+/** Catalog/CLI/dashboard must use the Agent-owned provider dir, never host ~/.pi. */
+function ownedPiCatalogAgentDir(configDir, agentId) {
+    return piAgentDirectory(configDir, agentId);
+}
+function piCatalogCommandSpec(distribution, env = process.env) {
+    if (distribution === "builtin") {
+        const spec = (0, internal_command_js_1.internalCommandSpec)("pi-rpc", [], env);
+        return { command: spec.command, commandArgs: spec.args };
+    }
+    return {
+        command: env.LARKIN_PI_COMMAND ?? process.env.LARKIN_PI_COMMAND ?? "pi",
+        commandArgs: [],
+    };
+}
 function assertPrivateDirectory(directory) {
     if (secure_metadata_js_1.isWindows) {
         // Windows 无 POSIX 权限位：icacls 收紧为「当前用户 + SYSTEM」并回读校验。

package/dist/runtime/pi-provider-config.mjs

@@ -1,7 +1,9 @@
 import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { internalCommandSpec } from "../app/internal-command.mjs";
 import { isWindows, secureWindowsDirectoryAcl } from "../platform/secure-metadata.mjs";
+export { piDistributionLabel } from "./pi-distribution-label.mjs";
 export const BUNDLED_PI_VERSION = "0.84.2";
 // These values mirror the catalog shipped by the pinned official Pi distribution.
 // Keeping the user-facing defaults here makes endpoint changes reviewable in Larkin.
@@ -123,6 +125,20 @@ export function piAgentDirectory(configDir, agentId) {
         throw new Error("Pi Agent ID 格式无效");
     return path.join(path.resolve(configDir), "providers", "pi", agentId);
 }
+/** Catalog/CLI/dashboard must use the Agent-owned provider dir, never host ~/.pi. */
+export function ownedPiCatalogAgentDir(configDir, agentId) {
+    return piAgentDirectory(configDir, agentId);
+}
+export function piCatalogCommandSpec(distribution, env = process.env) {
+    if (distribution === "builtin") {
+        const spec = internalCommandSpec("pi-rpc", [], env);
+        return { command: spec.command, commandArgs: spec.args };
+    }
+    return {
+        command: env.LARKIN_PI_COMMAND ?? process.env.LARKIN_PI_COMMAND ?? "pi",
+        commandArgs: [],
+    };
+}
 function assertPrivateDirectory(directory) {
     if (isWindows) {
         // Windows 无 POSIX 权限位：icacls 收紧为「当前用户 + SYSTEM」并回读校验。

package/dist/runtime/runtime-adapters.mjs

@@ -479,6 +479,7 @@ class PiSession extends EventSession {
             }));
     }
     get sessionId() { return this.sdk.sessionId ?? null; }
+    get sessionFile() { return this.sdk.sessionFile ?? null; }
     get effectiveModel() { return this.sdk.model ? `${this.sdk.model.provider}/${this.sdk.model.id}` : null; }
     get effectiveReasoningEffort() { return this.sdk.thinkingLevel ?? null; }
     async prompt(input) { return this.enqueue(input, () => this.sdk.prompt(input.text)); }
@@ -925,6 +926,7 @@ class PiRpcBackend {
     policy;
     policyManaged;
     sessionId;
+    sessionFile;
     model;
     thinkingLevel;
     constructor(client, state, policy) {
@@ -932,6 +934,7 @@ class PiRpcBackend {
         this.policy = policy;
         this.policyManaged = Boolean(policy);
         this.sessionId = state.sessionId ?? null;
+        this.sessionFile = typeof state.sessionFile === "string" && state.sessionFile ? state.sessionFile : null;
         if (state.model?.provider && state.model.id)
             this.model = {
                 provider: state.model.provider, id: state.model.id,
@@ -953,12 +956,23 @@ class PiRpcBackend {
         if (effectiveModel !== this.policy.model || state.model?.contextWindow !== this.policy.contextWindow) {
             throw new Error("Pi model or context window changed after startup; compaction policy is no longer safe");
         }
-        const ownedSettings = readOwnedPiSettings(this.policy.ownedPiDirectory);
-        assertEffectivePiCompactionSettings({ contextWindow: state.model?.contextWindow, compaction: {
-                enabled: state.autoCompactionEnabled,
-                reserveTokens: ownedSettings.compaction?.reserveTokens,
-                keepRecentTokens: ownedSettings.compaction?.keepRecentTokens,
-            } });
+        if (typeof state.sessionFile === "string" && state.sessionFile)
+            this.sessionFile = state.sessionFile;
+        if (typeof state.sessionId === "string" && state.sessionId)
+            this.sessionId = state.sessionId;
+        // Use the live process handshake, not a disk re-read of owned settings.json.
+        // Disk reserveTokens can drift after startup; that must not reject prompt.
+        const handshake = state.compactionCapabilities;
+        if (typeof handshake?.reserveTokens === "number" && typeof handshake?.keepRecentTokens === "number") {
+            assertEffectivePiCompactionSettings({ contextWindow: state.model?.contextWindow, compaction: {
+                    enabled: state.autoCompactionEnabled,
+                    reserveTokens: handshake.reserveTokens,
+                    keepRecentTokens: handshake.keepRecentTokens,
+                } });
+            return;
+        }
+        if (state.autoCompactionEnabled !== true)
+            throw new Error("Pi native compaction must be enabled");
     }
     getState() { return this.client.request("get_state"); }
     dispose() { return this.client.close(); }

package/dist/runtime/runtime-host.cjs

@@ -45,6 +45,63 @@ const BACKGROUND_COMPLETION_IMMEDIATE_RETRY_LIMIT = 5;
 const DEFAULT_SUBAGENT_RECONCILE_INTERVAL_MS = 15_000;
 const now = () => new Date().toISOString();
 const isActiveDelivery = (status) => ["pending", "submitting", "accepted"].includes(status);
+const previousSessionRefFor = (session, reason) => session.sessionId
+    ? { sessionId: session.sessionId, file: session.sessionFile ?? null, closedAt: new Date().toISOString(), reason }
+    : null;
+function parsePreviousSessionRef(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const record = value;
+    if (typeof record.sessionId !== "string" || !record.sessionId)
+        return null;
+    if (typeof record.closedAt !== "string" || typeof record.reason !== "string")
+        return null;
+    return {
+        sessionId: record.sessionId,
+        file: typeof record.file === "string" && record.file ? record.file : null,
+        closedAt: record.closedAt,
+        reason: record.reason,
+    };
+}
+function loadPersistedPreviousSession(config, store) {
+    const fromConfig = parsePreviousSessionRef(config.previousSession);
+    if (fromConfig)
+        return fromConfig;
+    if (!store)
+        return null;
+    try {
+        const state = store.readJson("agentState", {});
+        return parsePreviousSessionRef(state.previousSessions?.[config.runtime]);
+    }
+    catch {
+        return null;
+    }
+}
+function persistPreviousSession(agent, previous) {
+    agent.previousSession = previous;
+    agent.config.previousSession = previous;
+    const store = agent.stateStore;
+    if (!store)
+        return;
+    try {
+        const current = store.readJson("agentState", { sessions: {} });
+        // Delivery-ledger mocks ignore the JSON key and would be clobbered by this write.
+        if (Array.isArray(current.records) && !("sessions" in current))
+            return;
+        const previousSessions = current.previousSessions && typeof current.previousSessions === "object"
+            && !Array.isArray(current.previousSessions)
+            ? { ...current.previousSessions }
+            : {};
+        if (previous)
+            previousSessions[agent.adapter.id] = previous;
+        else
+            delete previousSessions[agent.adapter.id];
+        store.writeJson("agentState", { ...current, previousSessions });
+    }
+    catch {
+        // In-memory ref still holds for this process; restart will miss it only if this write failed.
+    }
+}
 const REPLAY_FAILURE_CODES = new Set([
     "canonical_inbox_row_missing", "canonical_inbox_malformed", "duplicate_message_id",
     "inbox_state_conflict", "delivery_target_conflict", "structured_target_invalid",
@@ -466,17 +523,12 @@ function createRuntimeHost(options) {
             && agent.piProactiveCompactionGeneration === agent.generation
             && agent.piProactiveCompactionSession === agent.session
             ? agent.piProactiveCompaction : null;
-        if (proactive && await proactive === "failed") {
-            return { status: "deferred", deliveryId: record.deliveryId, reason: "Pi proactive compaction failed for the current session generation" };
-        }
-        if (agent.adapter.id === "pi" && agent.piProactiveCompactionFailedGeneration === agent.generation) {
-            return { status: "deferred", deliveryId: record.deliveryId, reason: "Pi proactive compaction failed for the current session generation" };
-        }
+        if (proactive)
+            await proactive;
         if (agent.adapter.id === "pi" && !busy && !agent.busy && !agent.turnInProgress && agent.session) {
             const idleGate = proactivelyCompactPiAtIdle(agent, agent.session);
-            if (idleGate && await idleGate === "failed") {
-                return { status: "deferred", deliveryId: record.deliveryId, reason: "Pi proactive compaction failed for the current session generation" };
-            }
+            if (idleGate)
+                await idleGate;
         }
         agent.submitting = true;
         if (!busy)
@@ -550,20 +602,18 @@ function createRuntimeHost(options) {
                 && agent.piProactiveCompactionGeneration === agent.generation
                 && agent.piProactiveCompactionSession === agent.session
                 ? agent.piProactiveCompaction : null;
-            if (proactive && await proactive === "failed")
-                return;
+            if (proactive)
+                await proactive;
             if (agent.submitting || agent.starting) {
                 agent.retryAfterSubmit = true;
                 return;
             }
-            if (agent.adapter.id === "pi" && agent.piProactiveCompactionFailedGeneration === agent.generation)
-                return;
             if (agent.busy || agent.turnInProgress || !agent.session)
                 return;
             if (agent.adapter.id === "pi") {
                 const idleGate = proactivelyCompactPiAtIdle(agent, agent.session);
-                if (idleGate && await idleGate === "failed")
-                    return;
+                if (idleGate)
+                    await idleGate;
             }
             const record = [...agent.records.values()].find((candidate) => candidate.status === "pending" || candidate.status === "submitting");
             if (record)
@@ -769,14 +819,12 @@ function createRuntimeHost(options) {
             && agent.piProactiveCompactionGeneration === agent.generation
             && agent.piProactiveCompactionSession === agent.session
             ? agent.piProactiveCompaction : null;
-        if (proactive && await proactive === "failed")
-            return;
-        if (agent.adapter.id === "pi" && agent.piProactiveCompactionFailedGeneration === agent.generation)
-            return;
+        if (proactive)
+            await proactive;
         if (agent.adapter.id === "pi" && !agent.busy && !agent.turnInProgress && agent.session) {
             const idleGate = proactivelyCompactPiAtIdle(agent, agent.session);
-            if (idleGate && await idleGate === "failed")
-                return;
+            if (idleGate)
+                await idleGate;
         }
         if (agent.stopped || agent.busy || agent.turnInProgress || agent.submitting)
             return;
@@ -958,8 +1006,8 @@ function createRuntimeHost(options) {
             void ensureSession(agent).then(async () => {
                 const session = agent.session;
                 const proactive = session ? proactivelyCompactPiAtIdle(agent, session) : null;
-                if (proactive && await proactive === "failed")
-                    return;
+                if (proactive)
+                    await proactive;
                 reconcileSubagentLedger(agent, { forceMissing: true, missingReason: "pi session gone" });
                 enqueueUndeliveredTerminalWakes(agent);
                 await retryPending(agent);
@@ -1199,8 +1247,6 @@ function createRuntimeHost(options) {
         })();
         const tracked = task.catch((error) => {
             agent.piProactiveCompactionFailedGeneration = generation;
-            emit({ type: "agent-status", agentId: agent.config.agentId, status: "error",
-                error: "Pi proactive compaction failed; the current session generation is degraded" });
             log("Pi proactive compaction failed", String(error));
             return "failed";
         }).finally(() => {
@@ -1334,10 +1380,7 @@ function createRuntimeHost(options) {
                 emit({ type: "agent-status", agentId: agent.config.agentId, status: "active", readiness: agent.readiness });
             }
             const proactive = proactivelyCompactPiAtIdle(agent, session);
-            void (proactive ?? Promise.resolve("noop")).then((outcome) => {
-                if (outcome !== "failed")
-                    return retryPending(agent);
-            });
+            void (proactive ?? Promise.resolve("noop")).then(() => retryPending(agent));
             queueMicrotask(() => { void scanAndPromoteAcceptedInboxUpdates(agent); });
         }
         else if (event.type === "runtime-observation") {
@@ -1466,7 +1509,7 @@ function createRuntimeHost(options) {
         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"),
+            cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: agent.previousSession,
         });
         const generation = ++agent.generation;
         let completedSession = null;
@@ -1526,9 +1569,11 @@ function createRuntimeHost(options) {
             workspaceDir: agent.config.workspaceDir, stateDir: agent.config.stateDir, env: probeEnv }) : { runtime: "pi", state: "ready" };
         if (readiness.state !== "ready")
             throw new RuntimeSessionRecoveryError("recovery_staged_not_committed", "Pi context fallback readiness failed");
+        const previousRef = previousSessionRefFor(oldSession, "context-window overflow");
         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: previousRef,
         });
         let fresh;
         try {
@@ -1557,6 +1602,7 @@ function createRuntimeHost(options) {
         const oldConfigSessionId = agent.config.sessionId;
         const oldReadiness = agent.readiness;
         const oldDisabledReason = agent.disabledReason;
+        const oldPreviousSession = agent.previousSession;
         const oldRecord = { ...record, input: { ...record.input } };
         let durableRollback = null;
         let rearmedCount = 1;
@@ -1572,6 +1618,7 @@ function createRuntimeHost(options) {
             agent.launchId = node_crypto_1.default.randomUUID();
             agent.config.sessionId = null;
             agent.session = fresh;
+            persistPreviousSession(agent, previousRef);
             agent.readiness = readiness;
             agent.disabledReason = null;
             for (const candidate of agent.records.values()) {
@@ -1606,6 +1653,7 @@ function createRuntimeHost(options) {
             agent.launchId = oldLaunchId;
             agent.config.sessionId = oldConfigSessionId;
             agent.session = oldSession;
+            persistPreviousSession(agent, oldPreviousSession);
             agent.readiness = oldReadiness;
             agent.disabledReason = oldDisabledReason;
             Object.assign(record, oldRecord);
@@ -1620,17 +1668,15 @@ function createRuntimeHost(options) {
             agent.config.sessionId = fresh.sessionId;
             emit({ type: "session", agentId, runtime: agent.adapter.id, sessionId: fresh.sessionId, launchId: agent.launchId,
                 ...(fresh.effectiveModel ? { model: fresh.effectiveModel } : {}),
-                ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}) });
+                ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}),
+                ...(agent.previousSession ? { previousSession: agent.previousSession } : {}) });
         }
         emit({ type: "agent-status", agentId, status: "active", readiness });
         agent.piSessionOwner = probeEnv[pi_subagent_ledger_js_1.PI_SUBAGENT_SESSION_OWNER_ENV];
         await oldSession.close("Pi context fallback committed").catch((error) => log("previous Pi session close after fallback failed", String(error)));
         reconcileAfterSessionSwap(agent);
         const proactive = proactivelyCompactPiAtIdle(agent, fresh);
-        void (proactive ?? Promise.resolve("noop")).then((outcome) => {
-            if (outcome !== "failed")
-                return retryPending(agent);
-        });
+        void (proactive ?? Promise.resolve("noop")).then(() => retryPending(agent));
         return { generationChanged: true, sessionChanged: oldSessionId !== fresh.sessionId, turns: 0,
             runtimeReady: true, pendingCount: remainingPendingCount, rearmedCount,
             replayStatus: remainingPendingCount > 0 ? "pending" : "consumed", sessionId: fresh.sessionId };
@@ -1664,7 +1710,7 @@ function createRuntimeHost(options) {
             const standingPrompt = options.promptBuilder.build({
                 agentId: config.agentId, name: config.displayName || config.name,
                 description: config.description || "", runtime: adapter.id,
-                cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"),
+                cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: previous.previousSession,
             });
             const session = await adapter.createSession({
                 agentId: config.agentId, model: config.model, reasoningEffort: config.effort || null,
@@ -1770,10 +1816,11 @@ function createRuntimeHost(options) {
                 : { runtime: agent.adapter.id, state: "ready" };
             if (readiness.state !== "ready")
                 throw new runtime_readiness_js_1.RuntimePrerequisiteError(readiness);
+            const previousRef = previousSessionRefFor(oldSession, "operator reset");
             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"),
+                cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: previousRef,
             });
             const create = agent.adapter.createSession({
                 agentId: agent.config.agentId, model: agent.config.model, reasoningEffort: agent.config.effort || null,
@@ -1802,6 +1849,7 @@ function createRuntimeHost(options) {
                 agent.launchId = node_crypto_1.default.randomUUID();
                 agent.config.sessionId = null;
                 agent.session = fresh;
+                persistPreviousSession(agent, previousRef);
                 agent.readiness = readiness;
                 agent.disabledReason = null;
             };
@@ -1820,7 +1868,8 @@ function createRuntimeHost(options) {
                 agent.config.sessionId = fresh.sessionId;
                 emit({ type: "session", agentId, runtime: agent.adapter.id, sessionId: fresh.sessionId, launchId: agent.launchId,
                     ...(fresh.effectiveModel ? { model: fresh.effectiveModel } : {}),
-                    ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}) });
+                    ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}),
+                    ...(agent.previousSession ? { previousSession: agent.previousSession } : {}) });
             }
             emit({ type: "agent-status", agentId, status: "active", readiness });
             agent.piSessionOwner = probeEnv[pi_subagent_ledger_js_1.PI_SUBAGENT_SESSION_OWNER_ENV];
@@ -1880,10 +1929,12 @@ function createRuntimeHost(options) {
             }
             if (readiness.state !== "ready")
                 throw new runtime_readiness_js_1.RuntimePrerequisiteError(readiness);
+            const previousRef = previousSessionRefFor(oldSession, "context-window recovery");
+            const oldPreviousSession = agent.previousSession;
             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"),
+                cli: (0, agent_cli_capabilities_js_1.agentCliPromptCapabilities)("larkin"), previousSession: previousRef,
             });
             let fresh;
             try {
@@ -1924,6 +1975,7 @@ function createRuntimeHost(options) {
                 agent.generation = oldGeneration;
                 agent.launchId = oldLaunchId;
                 agent.config.sessionId = oldConfigSessionId;
+                persistPreviousSession(agent, oldPreviousSession);
                 agent.readiness = oldReadiness;
                 agent.disabledReason = oldDisabledReason;
                 agent.records = new Map(oldRecords);
@@ -1956,6 +2008,7 @@ function createRuntimeHost(options) {
                     agent.launchId = node_crypto_1.default.randomUUID();
                     agent.config.sessionId = null;
                     agent.session = fresh;
+                    persistPreviousSession(agent, previousRef);
                     agent.readiness = readiness;
                     agent.disabledReason = null;
                     for (const record of agent.records.values()) {
@@ -1971,7 +2024,8 @@ function createRuntimeHost(options) {
                     agent.config.sessionId = fresh.sessionId;
                     emit({ type: "session", agentId, runtime: agent.adapter.id, sessionId: fresh.sessionId, launchId: agent.launchId,
                         ...(fresh.effectiveModel ? { model: fresh.effectiveModel } : {}),
-                        ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}) });
+                        ...(fresh.effectiveReasoningEffort ? { reasoningEffort: fresh.effectiveReasoningEffort } : {}),
+                        ...(agent.previousSession ? { previousSession: agent.previousSession } : {}) });
                 }
                 emit({ type: "agent-status", agentId, status: "active", readiness });
                 durableRollback = null;
@@ -1980,10 +2034,7 @@ function createRuntimeHost(options) {
                     .catch((error) => log("previous runtime close after context-window recovery failed", String(error)));
                 reconcileAfterSessionSwap(agent);
                 const proactive = proactivelyCompactPiAtIdle(agent, fresh);
-                void (proactive ?? Promise.resolve("noop")).then((outcome) => {
-                    if (outcome !== "failed")
-                        return retryPending(agent);
-                });
+                void (proactive ?? Promise.resolve("noop")).then(() => retryPending(agent));
                 return { generationChanged: true, sessionChanged: oldSessionId !== fresh.sessionId, turns: 0,
                     runtimeReady: true, pendingCount: rearmed.remainingPendingCount, rearmedCount: rearmed.rearmedCount,
                     replayStatus: rearmed.remainingPendingCount > 0 ? "pending" : "consumed", sessionId: fresh.sessionId };
@@ -2063,7 +2114,8 @@ function createRuntimeHost(options) {
                         }) : undefined,
                     compactionMachines: new Map(), compactionRecoveryInFlight: new Set(), piOverflowCompactionFailed: new Set(),
                     piProactiveCompaction: null, piProactiveCompactionGeneration: null, piProactiveCompactionSession: null,
-                    piProactiveCompactionFailedGeneration: null, readiness: null,
+                    piProactiveCompactionFailedGeneration: null,
+                    previousSession: loadPersistedPreviousSession(config, stateStore), readiness: null,
                     turnInProgress: false, turnHadFailure: false, turnHadAuthenticatedOutput: false, authFailureActive: false,
                     promotedInboxUpdateIds: new Set(),
                     backgroundCompletionQueue: [], backgroundCompletionKeys: new Set(),
@@ -2105,10 +2157,10 @@ function createRuntimeHost(options) {
                     await recoverStalePiCompaction(agent);
                     const startupSession = agent.session;
                     const proactive = startupSession ? proactivelyCompactPiAtIdle(agent, startupSession) : null;
-                    const proactiveOutcome = proactive ? await proactive : "noop";
+                    if (proactive)
+                        await proactive;
                     activeCount += 1;
-                    if (proactiveOutcome !== "failed")
-                        await retryPending(agent);
+                    await retryPending(agent);
                 }
                 catch (error) {
                     const reason = error instanceof Error ? error.message : String(error);