pi-goosedump 0.12.17 → 0.12.18

package/README.md

@@ -93,17 +93,17 @@ Optional settings live under `goosedump` in:
 ```
 
 `turnsBeforeCompact` is an integer from 0 to 255. `0` disables scheduled
-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 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 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.
 
 `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,11 +590,26 @@ 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 isCompletedAssistant(message) {
-  return message.role === "assistant" && message.stopReason !== "error" && message.stopReason !== "aborted";
+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 };
 }
 var SUMMARIZABLE_ENTRY_TYPES = new Set(["message", "custom_message", "branch_summary"]);
 function piKeepRecentTokens(cwd, includeProject) {
@@ -666,7 +681,7 @@ function activeHistoryStartIndex(branchEntries) {
   const compaction = latestCompaction(branchEntries);
   return compaction ? compactionBoundaryStartIndex(branchEntries, compaction) : 0;
 }
-function completedTurnsSinceCompaction(branchEntries) {
+function completedRunsSinceCompaction(branchEntries) {
   let start = 0;
   for (let i = branchEntries.length - 1;i >= 0; i -= 1) {
     if (isCompactionEntry(branchEntries[i])) {
@@ -674,10 +689,27 @@ function completedTurnsSinceCompaction(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 < branchEntries.length; i += 1) {
+  for (let i = start;i < legacyEnd; i += 1) {
     const entry = branchEntries[i];
-    if (isMessageEntry(entry) && isCompletedAssistant(entry.message))
+    if (isMessageEntry(entry) && isTerminalAssistant(entry.message))
+      completed += 1;
+  }
+  for (let i = firstMarkerIndex;i < branchEntries.length; i += 1) {
+    if (completedAgentRunData(branchEntries[i]) !== undefined)
       completed += 1;
   }
   return completed;
@@ -845,7 +877,7 @@ async function runSettingsEditor(ctx) {
   const specs = [
     {
       key: "turnsBeforeCompact",
-      description: "LLM turns before compaction; 0 disables.",
+      description: "Completed agent runs before compaction; 0 disables.",
       min: TURNS_BEFORE_COMPACT_MIN,
       max: TURNS_BEFORE_COMPACT_MAX
     },
@@ -1411,6 +1443,8 @@ function createGoosedumpIntegration(options = {}) {
   let operationGeneration = 0;
   let activeSessionFile = null;
   let sessionActive = false;
+  let agentRunObserved = false;
+  let agentRunStartEntryId = null;
   const rememberQueue = [];
   let rememberRunning = null;
   function enqueueRemember(target, reportError) {
@@ -1448,9 +1482,9 @@ function createGoosedumpIntegration(options = {}) {
   }
   function syncCompactCounters(ctx) {
     compactSettings = resolveGoosedumpSettings(ctx.cwd, projectSettingsTrusted(ctx));
-    const completedTurns = completedTurnsSinceCompaction(ctx.sessionManager.getBranch());
-    turnsRemaining = Math.max(0, compactSettings.turnsBeforeCompact - completedTurns);
-    counterTriggered = compactSettings.turnsBeforeCompact > 0 && completedTurns >= compactSettings.turnsBeforeCompact;
+    const completedRuns = completedRunsSinceCompaction(ctx.sessionManager.getBranch());
+    turnsRemaining = Math.max(0, compactSettings.turnsBeforeCompact - completedRuns);
+    counterTriggered = compactSettings.turnsBeforeCompact > 0 && completedRuns >= compactSettings.turnsBeforeCompact;
   }
   function updateStatus(ctx) {
     if (!goosedumpAvailable)
@@ -1475,7 +1509,7 @@ function createGoosedumpIntegration(options = {}) {
     compactionState = state;
     updateStatus(ctx);
   }
-  function noteCompletedTurn(ctx) {
+  function noteCompletedRun(ctx) {
     if (!goosedumpAvailable || !shouldOverrideDefaultCompaction)
       return;
     syncCompactCounters(ctx);
@@ -1978,6 +2012,8 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = ctx.sessionManager.getSessionFile?.() ?? null;
       sessionActive = true;
+      agentRunObserved = false;
+      agentRunStartEntryId = null;
       compactionState = { phase: "idle" };
       goosedumpAvailable = checkGoosedump(ctx);
       notifyInvalidSettings(ctx);
@@ -1991,9 +2027,28 @@ ${lines.join(`
       settlementGeneration = 0;
       activeSessionFile = null;
       sessionActive = false;
+      agentRunObserved = false;
+      agentRunStartEntryId = null;
       compactionState = { phase: "idle" };
     });
+    pi.on("session_tree", async (_event, ctx) => {
+      sessionGeneration += 1;
+      settlementGeneration = 0;
+      activeSessionFile = ctx.sessionManager.getSessionFile?.() ?? null;
+      sessionActive = true;
+      agentRunObserved = false;
+      agentRunStartEntryId = null;
+      compactionState = { phase: "idle" };
+      syncCompactCounters(ctx);
+      updateStatus(ctx);
+      queueTurnCompaction(ctx, 1);
+      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;
@@ -2002,11 +2057,20 @@ ${lines.join(`
         request: { ...request, eligibleSettlement: settlementGeneration + 1 }
       } : { phase: "idle" });
     });
-    pi.on("turn_end", async (event, ctx) => {
-      if (isCompletedAssistant(event.message))
-        noteCompletedTurn(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.17",
+  "version": "0.12.18",
   "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.17",
+    "@jarkkojs/goosedump": "^0.12.18",
     "@sinclair/typebox": "^0.34.49"
   },
   "devDependencies": {