pi-goosedump 0.12.18 → 0.12.20

package/README.md

@@ -93,17 +93,19 @@ Optional settings live under `goosedump` in:
 ```
 
 `turnsBeforeCompact` is an integer from 0 to 255. `0` disables scheduled
-compaction. Each fully settled agent run counts as one turn; intermediate model
-responses that call tools do not. The countdown is restored when a session
-resumes and appears in the footer with a status dot (green when >25% turns
-remain, yellow when ≤25%, red when ≤12.5%) followed by a hexadecimal countdown.
-`● GD:0A` means ten turns remain, `● GD:00` is ready to compact, and `● GD:--`
-is disabled. The footer adds `queued` while compaction is waiting for the active
-agent run to settle and `compacting` while the summary is being built. Pi remains
-the sole scheduler for its normal context threshold. Whichever limit is reached
-first compacts once, and every successful compaction resets the countdown. A
-failed or cancelled compaction leaves the counter armed at zero and is not
-retried in the same settlement.
+compaction. Each completed model response counts as one turn, including responses
+that call tools. The countdown is restored when a session resumes and appears in
+the footer with a status dot (green when >25% turns remain, yellow when ≤25%, red
+when ≤12.5%) followed by a hexadecimal countdown. `● GD:0A` means ten turns
+remain, `● GD:00` is ready to compact, and `● GD:--` is disabled. The footer
+adds `queued` while compaction is waiting to start and `compacting` while the
+summary is being built. When the counter hits zero mid tool-loop, compaction
+starts immediately after the current tool batch is persisted and the task is
+resumed automatically. When the counter hits zero on a terminal turn, compaction
+starts after the agent has settled. Pi remains the sole scheduler for its normal
+context threshold. Whichever limit is reached first compacts once, and every
+successful compaction resets the countdown. A failed or cancelled compaction
+leaves the counter armed at zero and retries on the next tool turn or settlement.
 
 `summaryMaxTokens` is an integer from 512 to 65536 (default 4096). The effective
 summary budget is the lower of this value and 80% of Pi's `compaction.reserveTokens`,

package/dist/index.ts

@@ -590,26 +590,11 @@ function currentSessionTarget(ctx) {
 function isCompactionEntry(entry) {
   return entry.type === "compaction";
 }
-var COMPLETED_AGENT_RUN_ENTRY = "goosedump-completed-agent-run";
 function isMessageEntry(entry) {
   return entry.type === "message";
 }
-function isTerminalAssistant(message) {
-  if (message.role !== "assistant")
-    return false;
-  if (message.stopReason !== "stop" && message.stopReason !== "length")
-    return false;
-  return !(Array.isArray(message.content) && message.content.some((part) => isRecord(part) && part.type === "toolCall"));
-}
-function completedAgentRunData(entry) {
-  if (entry.type !== "custom" || entry.customType !== COMPLETED_AGENT_RUN_ENTRY)
-    return;
-  if (!isRecord(entry.data) || entry.data.version !== 1)
-    return;
-  const startedAfterEntryId = entry.data.startedAfterEntryId;
-  if (startedAfterEntryId !== null && typeof startedAfterEntryId !== "string")
-    return;
-  return { version: 1, startedAfterEntryId };
+function isCompletedAssistant(message) {
+  return message.role === "assistant" && message.stopReason !== "error" && message.stopReason !== "aborted";
 }
 var SUMMARIZABLE_ENTRY_TYPES = new Set(["message", "custom_message", "branch_summary"]);
 function piKeepRecentTokens(cwd, includeProject) {
@@ -681,7 +666,7 @@ function activeHistoryStartIndex(branchEntries) {
   const compaction = latestCompaction(branchEntries);
   return compaction ? compactionBoundaryStartIndex(branchEntries, compaction) : 0;
 }
-function completedRunsSinceCompaction(branchEntries) {
+function completedTurnsSinceCompaction(branchEntries) {
   let start = 0;
   for (let i = branchEntries.length - 1;i >= 0; i -= 1) {
     if (isCompactionEntry(branchEntries[i])) {
@@ -689,27 +674,10 @@ function completedRunsSinceCompaction(branchEntries) {
       break;
     }
   }
-  const firstMarkerIndex = branchEntries.findIndex((entry, index) => index >= start && completedAgentRunData(entry) !== undefined);
-  if (firstMarkerIndex < 0) {
-    let completed2 = 0;
-    for (let i = start;i < branchEntries.length; i += 1) {
-      const entry = branchEntries[i];
-      if (isMessageEntry(entry) && isTerminalAssistant(entry.message))
-        completed2 += 1;
-    }
-    return completed2;
-  }
-  const firstMarker = completedAgentRunData(branchEntries[firstMarkerIndex]);
-  const boundaryIndex = firstMarker?.startedAfterEntryId ? branchEntries.findIndex((entry) => entry.id === firstMarker.startedAfterEntryId) : start - 1;
-  const legacyEnd = boundaryIndex >= start ? boundaryIndex + 1 : start;
   let completed = 0;
-  for (let i = start;i < legacyEnd; i += 1) {
+  for (let i = start;i < branchEntries.length; i += 1) {
     const entry = branchEntries[i];
-    if (isMessageEntry(entry) && isTerminalAssistant(entry.message))
-      completed += 1;
-  }
-  for (let i = firstMarkerIndex;i < branchEntries.length; i += 1) {
-    if (completedAgentRunData(branchEntries[i]) !== undefined)
+    if (isMessageEntry(entry) && isCompletedAssistant(entry.message))
       completed += 1;
   }
   return completed;
@@ -877,7 +845,7 @@ async function runSettingsEditor(ctx) {
   const specs = [
     {
       key: "turnsBeforeCompact",
-      description: "Completed agent runs before compaction; 0 disables.",
+      description: "LLM turns before compaction; 0 disables.",
       min: TURNS_BEFORE_COMPACT_MIN,
       max: TURNS_BEFORE_COMPACT_MAX
     },
@@ -1443,8 +1411,7 @@ function createGoosedumpIntegration(options = {}) {
   let operationGeneration = 0;
   let activeSessionFile = null;
   let sessionActive = false;
-  let agentRunObserved = false;
-  let agentRunStartEntryId = null;
+  let activePi = null;
   const rememberQueue = [];
   let rememberRunning = null;
   function enqueueRemember(target, reportError) {
@@ -1482,9 +1449,9 @@ function createGoosedumpIntegration(options = {}) {
   }
   function syncCompactCounters(ctx) {
     compactSettings = resolveGoosedumpSettings(ctx.cwd, projectSettingsTrusted(ctx));
-    const completedRuns = completedRunsSinceCompaction(ctx.sessionManager.getBranch());
-    turnsRemaining = Math.max(0, compactSettings.turnsBeforeCompact - completedRuns);
-    counterTriggered = compactSettings.turnsBeforeCompact > 0 && completedRuns >= compactSettings.turnsBeforeCompact;
+    const completedTurns = completedTurnsSinceCompaction(ctx.sessionManager.getBranch());
+    turnsRemaining = Math.max(0, compactSettings.turnsBeforeCompact - completedTurns);
+    counterTriggered = compactSettings.turnsBeforeCompact > 0 && completedTurns >= compactSettings.turnsBeforeCompact;
   }
   function updateStatus(ctx) {
     if (!goosedumpAvailable)
@@ -1509,13 +1476,44 @@ function createGoosedumpIntegration(options = {}) {
     compactionState = state;
     updateStatus(ctx);
   }
-  function noteCompletedRun(ctx) {
+  function noteCompletedTurn(ctx) {
     if (!goosedumpAvailable || !shouldOverrideDefaultCompaction)
       return;
     syncCompactCounters(ctx);
     updateStatus(ctx);
     queueTurnCompaction(ctx, settlementGeneration + 1);
   }
+  function resumeAfterSuccessfulCompaction(ctx, resume) {
+    if (!resume || !activePi || ctx.hasPendingMessages())
+      return;
+    activePi.sendMessage({
+      customType: "goosedump-autocompact-resume",
+      content: "The session was compacted to reduce context size. Continue the task you were working on from where you left off.",
+      display: false
+    }, { triggerTurn: true });
+  }
+  function tryMidRunCounterCompaction(ctx) {
+    if (!goosedumpAvailable || !shouldOverrideDefaultCompaction)
+      return false;
+    if (!counterTriggered)
+      return false;
+    if (ctx.hasPendingMessages())
+      return false;
+    if (!hasCompactableHistory(ctx))
+      return false;
+    if (compactionState.phase === "idle") {
+      queueTurnCompaction(ctx, settlementGeneration);
+    } else if (compactionState.phase === "queued") {
+      setCompactionState(ctx, {
+        phase: "queued",
+        request: {
+          ...compactionState.request,
+          eligibleSettlement: Math.min(compactionState.request.eligibleSettlement, settlementGeneration)
+        }
+      });
+    }
+    return startQueuedCompaction(ctx, { resumeAfter: true, allowActiveRun: true });
+  }
   function checkGoosedump(ctx) {
     try {
       execFileSync(process.execPath, [resolveGoosedumpBinary(), "--version"], { stdio: "ignore" });
@@ -1567,7 +1565,7 @@ function createGoosedumpIntegration(options = {}) {
       }
     });
   }
-  function startQueuedCompaction(ctx) {
+  function startQueuedCompaction(ctx, options2 = {}) {
     if (compactionState.phase !== "queued")
       return false;
     const request = compactionState.request;
@@ -1575,7 +1573,9 @@ function createGoosedumpIntegration(options = {}) {
       setCompactionState(ctx, { phase: "idle" });
       return false;
     }
-    if (!ctx.isIdle() || ctx.hasPendingMessages())
+    if (ctx.hasPendingMessages())
+      return false;
+    if (!options2.allowActiveRun && !ctx.isIdle())
       return false;
     if (!requestHasCompactableHistory(ctx, request.keep)) {
       setCompactionState(ctx, { phase: "idle" });
@@ -1584,6 +1584,7 @@ function createGoosedumpIntegration(options = {}) {
     const operation = ++operationGeneration;
     const generation = request.sessionGeneration;
     const sessionFile = request.sessionFile;
+    const resumeAfter = options2.resumeAfter === true;
     setCompactionState(ctx, {
       phase: "running",
       request,
@@ -1598,11 +1599,16 @@ function createGoosedumpIntegration(options = {}) {
         if (!runningOperationIsCurrent(operation, generation, sessionFile))
           return;
         setCompactionState(ctx, { phase: "idle" });
+        syncCompactCounters(ctx);
+        updateStatus(ctx);
+        resumeAfterSuccessfulCompaction(ctx, resumeAfter);
       },
       onError: (error) => {
         if (!runningOperationIsCurrent(operation, generation, sessionFile))
           return;
         setCompactionState(ctx, { phase: "idle" });
+        syncCompactCounters(ctx);
+        updateStatus(ctx);
         const message = error instanceof Error ? error.message : String(error);
         if (ctx.hasUI)
           ctx.ui.notify(`goosedump compaction failed: ${message}`, "error");
@@ -1638,6 +1644,7 @@ function createGoosedumpIntegration(options = {}) {
     return startQueuedCompaction(ctx) ? "started" : "queued";
   }
   function register(pi) {
+    activePi = pi;
     if (shouldRegisterTool) {
       pi.registerTool(defineTool({
         name: "goose_remember",
@@ -1989,6 +1996,8 @@ ${lines.join(`
       if (!goosedumpAvailable || !shouldOverrideDefaultCompaction)
         return;
       settlementGeneration += 1;
+      syncCompactCounters(ctx);
+      updateStatus(ctx);
       if (compactionState.phase === "running" && compactionState.owner === "pi") {
         const request = compactionState.request;
         setCompactionState(ctx, request && requestIsCurrent(request) ? {
@@ -2012,8 +2021,6 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = ctx.sessionManager.getSessionFile?.() ?? null;
       sessionActive = true;
-      agentRunObserved = false;
-      agentRunStartEntryId = null;
       compactionState = { phase: "idle" };
       goosedumpAvailable = checkGoosedump(ctx);
       notifyInvalidSettings(ctx);
@@ -2027,8 +2034,6 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = null;
       sessionActive = false;
-      agentRunObserved = false;
-      agentRunStartEntryId = null;
       compactionState = { phase: "idle" };
     });
     pi.on("session_tree", async (_event, ctx) => {
@@ -2036,8 +2041,6 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = ctx.sessionManager.getSessionFile?.() ?? null;
       sessionActive = true;
-      agentRunObserved = false;
-      agentRunStartEntryId = null;
       compactionState = { phase: "idle" };
       syncCompactCounters(ctx);
       updateStatus(ctx);
@@ -2045,10 +2048,6 @@ ${lines.join(`
       deferQueuedCompaction(ctx);
     });
     pi.on("agent_start", async (_event, ctx) => {
-      if (!agentRunObserved) {
-        agentRunObserved = true;
-        agentRunStartEntryId = ctx.sessionManager.getBranch().at(-1)?.id ?? null;
-      }
       if (compactionState.phase !== "running" || compactionState.owner !== "pi")
         return;
       const request = compactionState.request;
@@ -2057,20 +2056,13 @@ ${lines.join(`
         request: { ...request, eligibleSettlement: settlementGeneration + 1 }
       } : { phase: "idle" });
     });
+    pi.on("turn_end", async (event, ctx) => {
+      if (isCompletedAssistant(event.message))
+        noteCompletedTurn(ctx);
+      if (event.toolResults.length > 0)
+        tryMidRunCounterCompaction(ctx);
+    });
     pi.on("agent_settled", async (_event, ctx) => {
-      if (agentRunObserved) {
-        const countRun = shouldOverrideDefaultCompaction && compactSettings.turnsBeforeCompact > 0;
-        if (countRun) {
-          pi.appendEntry(COMPLETED_AGENT_RUN_ENTRY, {
-            version: 1,
-            startedAfterEntryId: agentRunStartEntryId
-          });
-        }
-        agentRunObserved = false;
-        agentRunStartEntryId = null;
-        if (countRun)
-          noteCompletedRun(ctx);
-      }
       handleAgentSettled(ctx);
     });
     pi.on("session_before_compact", async (event, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goosedump",
-  "version": "0.12.18",
+  "version": "0.12.20",
   "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.18",
+    "@jarkkojs/goosedump": "^0.12.20",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {