pi-goosedump 0.12.16 → 0.12.17

package/dist/index.ts

@@ -1411,7 +1411,6 @@ function createGoosedumpIntegration(options = {}) {
   let operationGeneration = 0;
   let activeSessionFile = null;
   let sessionActive = false;
-  let agentEndObserved = true;
   const rememberQueue = [];
   let rememberRunning = null;
   function enqueueRemember(target, reportError) {
@@ -1503,6 +1502,19 @@ function createGoosedumpIntegration(options = {}) {
   function runningOperationIsCurrent(operation, generation, sessionFile) {
     return generation === sessionGeneration && sessionFile === activeSessionFile && compactionState.phase === "running" && compactionState.operation === operation;
   }
+  function releasePiCompactionOnAbort(ctx, signal, operation, generation, sessionFile, request, reason) {
+    signal?.addEventListener("abort", () => {
+      if (!runningOperationIsCurrent(operation, generation, sessionFile))
+        return;
+      setCompactionState(ctx, reason !== "manual" && request && requestIsCurrent(request) ? {
+        phase: "queued",
+        request: {
+          ...request,
+          eligibleSettlement: Math.max(request.eligibleSettlement, settlementGeneration + 2)
+        }
+      } : { phase: "idle" });
+    }, { once: true });
+  }
   function requestHasCompactableHistory(ctx, keep) {
     return keep === null ? hasCompactableHistory(ctx) : keepBoundaryId(ctx.sessionManager.getBranch(), keep) !== undefined;
   }
@@ -1545,7 +1557,7 @@ function createGoosedumpIntegration(options = {}) {
       operation,
       sessionGeneration: generation,
       sessionFile,
-      hookActive: false
+      hookClaimed: false
     });
     ctx.compact({
       onComplete: () => {
@@ -1564,6 +1576,17 @@ function createGoosedumpIntegration(options = {}) {
     });
     return true;
   }
+  function deferQueuedCompaction(ctx) {
+    if (compactionState.phase !== "queued")
+      return;
+    const request = compactionState.request;
+    setImmediate(() => {
+      if (compactionState.phase !== "queued" || compactionState.request !== request || !contextIsCurrent(ctx)) {
+        return;
+      }
+      startQueuedCompaction(ctx);
+    });
+  }
   function requestCompaction(ctx, keep) {
     if (compactionState.phase !== "idle")
       return "busy";
@@ -1946,8 +1969,8 @@ ${lines.join(`
       if (compactionState.phase === "idle") {
         queueTurnCompaction(ctx, settlementGeneration);
       }
-      if (agentEndObserved && compactionState.phase === "queued" && compactionState.request.eligibleSettlement <= settlementGeneration) {
-        startQueuedCompaction(ctx);
+      if (compactionState.phase === "queued" && compactionState.request.eligibleSettlement <= settlementGeneration) {
+        deferQueuedCompaction(ctx);
       }
     }
     pi.on("session_start", async (_event, ctx) => {
@@ -1955,27 +1978,29 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = ctx.sessionManager.getSessionFile?.() ?? null;
       sessionActive = true;
-      agentEndObserved = true;
       compactionState = { phase: "idle" };
       goosedumpAvailable = checkGoosedump(ctx);
       notifyInvalidSettings(ctx);
       syncCompactCounters(ctx);
       updateStatus(ctx);
       queueTurnCompaction(ctx, 1);
+      deferQueuedCompaction(ctx);
     });
     pi.on("session_shutdown", async () => {
       sessionGeneration += 1;
       settlementGeneration = 0;
       activeSessionFile = null;
       sessionActive = false;
-      agentEndObserved = true;
       compactionState = { phase: "idle" };
     });
-    pi.on("agent_start", async () => {
-      agentEndObserved = false;
-    });
-    pi.on("agent_end", async () => {
-      agentEndObserved = true;
+    pi.on("agent_start", async (_event, ctx) => {
+      if (compactionState.phase !== "running" || compactionState.owner !== "pi")
+        return;
+      const request = compactionState.request;
+      setCompactionState(ctx, request && requestIsCurrent(request) ? {
+        phase: "queued",
+        request: { ...request, eligibleSettlement: settlementGeneration + 1 }
+      } : { phase: "idle" });
     });
     pi.on("turn_end", async (event, ctx) => {
       if (isCompletedAssistant(event.message))
@@ -1987,15 +2012,8 @@ ${lines.join(`
     pi.on("session_before_compact", async (event, ctx) => {
       if (!shouldOverrideDefaultCompaction || !goosedumpAvailable)
         return;
-      if (event.customInstructions?.trim()) {
-        if (compactionState.phase === "running")
-          return { cancel: true };
-        if (compactionState.phase === "queued") {
-          setCompactionState(ctx, { phase: "idle" });
-        }
-        return;
-      }
-      if (event.signal.aborted) {
+      const signal = event.signal;
+      if (signal?.aborted) {
         if (compactionState.phase === "queued" && requestIsCurrent(compactionState.request)) {
           setCompactionState(ctx, event.reason === "manual" ? { phase: "idle" } : {
             phase: "queued",
@@ -2005,6 +2023,22 @@ ${lines.join(`
             }
           });
         }
+        return { cancel: true };
+      }
+      if (event.customInstructions?.trim()) {
+        if (compactionState.phase === "running")
+          return { cancel: true };
+        const operation2 = ++operationGeneration;
+        setCompactionState(ctx, {
+          phase: "running",
+          request: null,
+          owner: "pi",
+          operation: operation2,
+          sessionGeneration,
+          sessionFile: activeSessionFile,
+          hookClaimed: true
+        });
+        releasePiCompactionOnAbort(ctx, signal, operation2, sessionGeneration, activeSessionFile, null, event.reason);
         return;
       }
       let operation;
@@ -2013,7 +2047,7 @@ ${lines.join(`
       let request;
       let owner;
       if (compactionState.phase === "running") {
-        if (compactionState.hookActive || compactionState.owner === "pi") {
+        if (compactionState.hookClaimed || compactionState.owner === "pi") {
           return { cancel: true };
         }
         operation = compactionState.operation;
@@ -2021,7 +2055,7 @@ ${lines.join(`
         sessionFile = compactionState.sessionFile;
         request = compactionState.request;
         owner = "extension";
-        compactionState = { ...compactionState, hookActive: true };
+        compactionState = { ...compactionState, hookClaimed: true };
       } else {
         request = compactionState.phase === "queued" && requestIsCurrent(compactionState.request) ? compactionState.request : null;
         operation = ++operationGeneration;
@@ -2035,9 +2069,12 @@ ${lines.join(`
           operation,
           sessionGeneration: generation,
           sessionFile,
-          hookActive: true
+          hookClaimed: true
         });
       }
+      if (owner === "pi") {
+        releasePiCompactionOnAbort(ctx, signal, operation, generation, sessionFile, request, event.reason);
+      }
       try {
         const { messagesToSummarize, turnPrefixMessages } = event.preparation;
         if ((request?.keep ?? null) === null && messagesToSummarize.length === 0 && turnPrefixMessages.length === 0) {
@@ -2061,11 +2098,11 @@ ${lines.join(`
               operation,
               sessionGeneration: generation,
               sessionFile,
-              hookActive: true
+              hookClaimed: true
             });
           }
         }
-        const compaction = await buildGoosedumpCompaction(target, event.preparation, event.branchEntries, effectiveSummaryMaxTokens(ctx.cwd, projectSettingsTrusted(ctx)), keep, event.signal, nativeExecutablePath);
+        const compaction = await buildGoosedumpCompaction(target, event.preparation, event.branchEntries, effectiveSummaryMaxTokens(ctx.cwd, projectSettingsTrusted(ctx)), keep, signal, nativeExecutablePath);
         if (!runningOperationIsCurrent(operation, generation, sessionFile)) {
           return { cancel: true };
         }
@@ -2085,8 +2122,12 @@ ${lines.join(`
         if (!runningOperationIsCurrent(operation, generation, sessionFile)) {
           return { cancel: true };
         }
-        if (event.signal.aborted)
+        if (signal?.aborted) {
+          if (owner === "pi" && event.reason === "manual") {
+            setCompactionState(ctx, { phase: "idle" });
+          }
           return { cancel: true };
+        }
         if (ctx.hasUI) {
           const message = err instanceof Error ? err.message : String(err);
           ctx.ui.notify(`goosedump compaction failed; falling back to Pi compaction: ${message}`, "error");
@@ -2094,14 +2135,14 @@ ${lines.join(`
         return;
       } finally {
         if (runningOperationIsCurrent(operation, generation, sessionFile)) {
-          setCompactionState(ctx, owner === "pi" && event.reason === "manual" ? { phase: "idle" } : {
+          setCompactionState(ctx, {
             phase: "running",
             request,
             owner,
             operation,
             sessionGeneration: generation,
             sessionFile,
-            hookActive: false
+            hookClaimed: true
           });
         }
       }
@@ -2114,7 +2155,9 @@ ${lines.join(`
       if (compactionState.phase === "queued" && compactionState.request.keep !== null && ctx.hasUI) {
         ctx.ui.notify("Queued keep request was superseded by another compaction.", "info");
       }
-      compactionState = { phase: "idle" };
+      const extensionOwned = compactionState.phase === "running" && compactionState.owner === "extension";
+      if (!extensionOwned)
+        compactionState = { phase: "idle" };
       syncCompactCounters(ctx);
       updateStatus(ctx);
       if (!goosedumpAvailable)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.12.16",
+  "version": "0.12.17",
   "description": "Pi extension for goosedump session search, durable memory, and compaction",
   "keywords": [
     "compaction",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-tui": "^0.82.1",
-    "@jarkkojs/goosedump": "^0.12.16",
+    "@jarkkojs/goosedump": "^0.12.17",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {