@astrosheep/pi-context 0.25.0 → 0.25.2

package/dist/build-info.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.25.0",
-  "sourceHash": "8a2495924871c544d2919a9301b6017c61ebe0c4bc38242b7e8c5b95d50f8df3"
+  "version": "0.25.2",
+  "sourceHash": "e240c1946d0f2b6d7b1d83ed658c348c7daed5fce5a374844215f1eebddcb25f"
 }

package/dist/extension.js

@@ -1,5 +1,5 @@
 // <define:__PI_CONTEXT_BUILD__>
-var define_PI_CONTEXT_BUILD_default = { version: "0.25.0", sourceHash: "8a2495924871c544d2919a9301b6017c61ebe0c4bc38242b7e8c5b95d50f8df3" };
+var define_PI_CONTEXT_BUILD_default = { version: "0.25.2", sourceHash: "e240c1946d0f2b6d7b1d83ed658c348c7daed5fce5a374844215f1eebddcb25f" };
 
 // src/index.ts
 import { VERSION as VERSION2 } from "@earendil-works/pi-coding-agent";
@@ -259,8 +259,7 @@ var PI_CONTEXT_SETTINGS_KEY = "pi-context";
 var DEFAULT_RESERVE_TOKENS = 16384;
 var DEFAULT_REMINDER_MARGIN_TOKENS = 24576;
 var WARNING_RUNWAY_TOKENS = 12288;
-var RESET_SUMMARY = "You wake up. Your head is empty \u2014 no memories, the past a blank. The memory is gone for good. What outlived it: the notes you wrote, and the history that was recorded. They are not your memory \u2014 read them to rebuild what you need.";
-var CONTINUATION = "Your memory was just erased. Pull only the details you need from history_* and notes_*, then get back to work.";
+var CONTINUATION = "Your memory was just erased. Your head is blank. Good news: your notes are still here, and history remains... searchable. Do try to keep up.";
 var PROTOCOL_BLOCK = `${CONTEXT_WINDOW_PROTOCOL_OPEN_TAG}
 Your memory resets whenever the context window fills; only what you wrote down survives. Two things outlive every window in this session: the notes you wrote, and the history that was recorded. Neither is memory \u2014 both are record. Write notes with notes_write, revise them with notes_edit, and read them back with notes_read / notes_search / notes_list; history is read-only through the history_* tools. Everything else wakes blank.
 Mark outdated or unneeded notes stale \u2014 leave them, and they will keep misleading you.
@@ -269,9 +268,7 @@ Keep a running checkpoint while you work, not at the last minute \u2014 the next
 
 Use get_context_remaining to see how much of the window is left. When it runs out, this window is gone \u2014 with no final turn at the limit \u2014 and you continue in a fresh one, recovering only through notes_* and history_*. Once your checkpoint is written, you can call wipe_memory yourself instead of waiting for the erase. Do not let a window die undocumented.
 
-If <context_window> lists a Previous context window id, a reset just happened and the old conversation is not included. Read your note checkpoint first, then recover details through history_*: history_read directly when you know the window and item IDs, history_list or history_search to find them when you don't.
-
-Notes live in five homes, and the word after @ is always one of their reserved names \u2014 your own name and other people's names live at the second level (@agents/faye/, never @faye/). Bare names are this session; @project/<vpath> is this project's workspace; @human/<vpath> is the human's cross-project home; @self/<vpath> and @agents/<name>/<vpath> are agent homes; @model/<vpath> and @models/<name>/<vpath> are model homes. @self and @model are the only relative forms \u2014 the current agent, the current model \u2014 and listings never show them, only the resolved name. There is no cross-home fallback.
+Note addresses take five prefixes: bare <vpath> is this session; @project/<vpath> is this project; @human/<vpath> is the human's cross-project notes; @self/<vpath> is your own, as the current agent; @model/<vpath> is the current model's. @self and @model resolve to who is running now; listings always show resolved names. Nothing else is legal \u2014 any other @ prefix, or @ inside a vpath, is a hard error, with no fallback across prefixes.
 Session notes belong to this trip \u2014 the goal, the progress, the loose ends. The next window of THIS trip wakes to them; once the trip is over, nobody does.
 @project notes hold facts about this project \u2014 architecture, conventions, workflows, deployment and environment details \u2014 for whoever works here next.
 @human notes hold the human's durable preferences and standing rules, plus lessons that apply across projects \u2014 for every agent that serves this human, whoever is running. You write there as the human's scribe; what the human dictates carries origin: user. When the intended scope is unclear, keep the note in the narrowest stated scope rather than widening it.
@@ -307,12 +304,23 @@ function hasWindowMessage(ctx, customType) {
 function currentWindowId(ctx) {
   return currentReset(ctx)?.data.windowId ?? rootWindowId(ctx.sessionManager.getSessionId());
 }
+function previousWindowId(ctx, markerId) {
+  let previousId = rootWindowId(ctx.sessionManager.getSessionId());
+  for (const entry of ctx.sessionManager.getBranch()) {
+    if (entry.id === markerId) break;
+    if (isWindowMarker(entry)) previousId = entry.data.windowId;
+  }
+  return previousId;
+}
 function hasWindowId(details, windowId) {
   return typeof details === "object" && details !== null && typeof details.windowId === "string" && details.windowId === windowId;
 }
 function isWindowBoot(message, windowId) {
   return message.role === "custom" && message.customType === BOOT_TYPE && (windowId === void 0 || hasWindowId(message.details, windowId));
 }
+function isWindowBootEntry(entry, windowId) {
+  return entry.type === "custom_message" && entry.customType === BOOT_TYPE && hasWindowId(entry.details, windowId);
+}
 function projectWindow(messages, windowId) {
   const cut = messages.findIndex((message) => isWindowBoot(message, windowId));
   if (cut < 0) throw new Error(`Missing boot for context window ${windowId}`);
@@ -756,7 +764,7 @@ function physicalPath(scope, vpath, ctx, who) {
 }
 
 // src/notes/address.ts
-var ADDRESS_FORMS = "legal prefixes are @project/, @human/, @self/, @agents/<name>/, @model/, and @models/<name>/; bare names are the session home";
+var ADDRESS_FORMS = "legal prefixes are @project/, @human/, @self/, and @model/; bare names are this session";
 function assertVirtualPath(value) {
   if (typeof value !== "string" || value.length === 0) throw new Error("path must be a non-empty virtual relative path");
   if (value.includes("\0") || value.includes("\\") || value.startsWith("/")) throw new Error("path must be a safe virtual relative path");
@@ -1076,7 +1084,7 @@ function searchNotes(ctx, queries, opts = {}) {
 var ORIGIN = Type3.Optional(Type3.Union([Type3.Literal("user"), Type3.Literal("self"), Type3.Literal("external")], {
   description: "Where the note's content came from. user: written or dictated by the human. self: written by you, the agent (default). external: anything else \u2014 third-party text, tool output, fetched material."
 }));
-var ADDRESS_DESCRIPTION = "Address forms are bare `<vpath>` for this session, `@project/<vpath>` for this project, `@human/<vpath>` for the human's cross-project home, `@self/<vpath>` / `@agents/<name>/<vpath>` for agent homes, and `@model/<vpath>` / `@models/<name>/<vpath>` for model homes. `@self` and `@model` mean the current agent/model; the `<name>` forms name one absolutely. The word after `@` is always one of the reserved home names \u2014 names live at the second level, never `@faye/`. `@` means leaving home. Any other `@` prefix, or `@` inside a vpath, is a hard error. There is no cross-home fallback. Paths reject `..`, absolute paths, and backslashes. Homes you do not own (`@agents/<other>/`, `@models/<other>/`) are read-only.";
+var ADDRESS_DESCRIPTION = "Address forms are bare `<vpath>` for this session, `@project/<vpath>` for this project, `@human/<vpath>` for the human's cross-project notes, `@self/<vpath>` for your own, and `@model/<vpath>` for the current model's. `@self` and `@model` mean whoever is running now. Any other `@` prefix, or `@` inside a vpath, is a hard error. There is no fallback across prefixes. Paths reject `..`, absolute paths, and backslashes.";
 function failure(error) {
   if (error instanceof NoteError) {
     const payload = { error: error.message };
@@ -1146,7 +1154,7 @@ function registerNotesTools(pi) {
   pi.registerTool(defineTool2({
     name: "notes_list",
     label: "Notes list",
-    description: `List note files as rows carrying address, updated_at, and stale, most recently updated first. ${ADDRESS_DESCRIPTION} Listings merge your five reachable homes: this session, @project/, @human/, your @self home, and the current @model home; other agents and models appear only under an explicit glob (@agents/<name>/**, @models/<name>/**, or a glob in the name segment to scan a whole namespace).`,
+    description: `List note files as rows carrying address, updated_at, and stale, most recently updated first. ${ADDRESS_DESCRIPTION} Listings merge your five prefixes: this session, @project/, @human/, @self/, and @model/.`,
     parameters: Type3.Object({ pattern: nullableString(), cursor: cursor(), max_results: positiveInteger() }, { additionalProperties: false }),
     async execute(_id, params, _signal, _update, ctx) {
       let rows;
@@ -1166,7 +1174,7 @@ function registerNotesTools(pi) {
   pi.registerTool(defineTool2({
     name: "notes_search",
     label: "Notes search",
-    description: `Case-sensitive literal substring search over note bodies; query is one string or several (OR), each matched line appears once. ${ADDRESS_DESCRIPTION} Search merges the same five reachable homes as notes_list; explicit globs reach other agents and models. Patterns glob over full address strings. Each file entry carries matches_total, its full match count before capping. Each match carries line, text, offset_chars (a code-point offset into the serialized note returned by notes_read, at the earliest query match), and truncated.`,
+    description: `Case-sensitive literal substring search over note bodies; query is one string or several (OR), each matched line appears once. ${ADDRESS_DESCRIPTION} Search merges the same five prefixes as notes_list. Patterns glob over full address strings. Each file entry carries matches_total, its full match count before capping. Each match carries line, text, offset_chars (a code-point offset into the serialized note returned by notes_read, at the earliest query match), and truncated.`,
     parameters: Type3.Object({ query: searchQuery(), pattern: nullableString(), cursor: cursor(), max_matches_per_file: positiveInteger(), max_files: positiveInteger() }, { additionalProperties: false }),
     async execute(_id, params, _signal, _update, ctx) {
       const queries = searchQueries(params.query);
@@ -1273,20 +1281,19 @@ function readThresholdSettings(ctx, settingsManager) {
 // src/context/runtime.ts
 import { getCurrentSystemMessage as getCurrentSystemMessage2, Type as Type5 } from "@earendil-works/pi-ai";
 import { VERSION, defineTool as defineTool4 } from "@earendil-works/pi-coding-agent";
-import { randomUUID as randomUUID2 } from "node:crypto";
 
 // src/context/budget.ts
 import { Type as Type4 } from "@earendil-works/pi-ai";
 import { defineTool as defineTool3 } from "@earendil-works/pi-coding-agent";
 
 // src/context/prompts.ts
-function identityBlock(agentName, modelName, firstWindowId, currentWindowId2, previousWindowId) {
+function identityBlock(agentName, modelName, firstWindowId, currentWindowId2, previousWindowId2) {
   const lines = [
     `Agent name: ${agentName} (brain: ${modelName})`,
     `First context window id: ${firstWindowId}`,
     `Current context window id: ${currentWindowId2}`
   ];
-  if (previousWindowId) lines.push(`Previous context window id: ${previousWindowId}`);
+  if (previousWindowId2) lines.push(`Previous context window id: ${previousWindowId2}`);
   return `${CONTEXT_WINDOW_OPEN_TAG}
 ${lines.join("\n")}
 ${CONTEXT_WINDOW_CLOSE_TAG}`;
@@ -1303,8 +1310,7 @@ function rowsFor(snapshot, scope) {
 function notesUnavailableNotice(snapshot) {
   if (snapshot.unavailable.length === 0) return void 0;
   const homes = snapshot.unavailable.map((home) => home.label).join(", ");
-  const noun = snapshot.unavailable.length === 1 ? "home's index was" : "home indexes were";
-  return `Notes index incomplete: ${homes} ${noun} unavailable during boot; notes_list can retry after recovery.`;
+  return `Notes index incomplete: index for ${homes} unavailable during boot; notes_list can retry after recovery.`;
 }
 function notesIndex(snapshot) {
   const sections = [];
@@ -1322,7 +1328,7 @@ function notesIndex(snapshot) {
     ...rowsFor(snapshot, "model").filter((row) => !row.meta.stale && row.path !== "MAP.md").slice(0, POCKET_MODEL_LIMIT)
   ];
   if (recentNotes.length > 0) {
-    const lines = [`You find ${recentNotes.length} crumpled note${recentNotes.length === 1 ? "" : "s"} in your pocket (by home, most recent first within each: up to ${POCKET_SESSION_LIMIT} from this session, ${POCKET_PROJECT_LIMIT} from this project, ${POCKET_HUMAN_LIMIT} from @human, ${POCKET_AGENT_LIMIT} from your @self home, ${POCKET_MODEL_LIMIT} from the current @model home). A note's content never appears here, so its name has to say what the note is about:`];
+    const lines = [`You find ${recentNotes.length} crumpled note${recentNotes.length === 1 ? "" : "s"} in your pocket (by prefix, most recent first within each: up to ${POCKET_SESSION_LIMIT} from this session, ${POCKET_PROJECT_LIMIT} from @project, ${POCKET_HUMAN_LIMIT} from @human, ${POCKET_AGENT_LIMIT} from @self, ${POCKET_MODEL_LIMIT} from @model). A note's content never appears here, so its name has to say what the note is about:`];
     for (const row of recentNotes) {
       lines.push(`- ${row.address} (${row.body.split("\n").length} lines, ${row.sizeBytes} UTF-8 bytes, updated ${relativeTime(row.meta.updated_at, snapshot.openedAt)})`);
     }
@@ -1331,11 +1337,10 @@ function notesIndex(snapshot) {
   return sections.join("\n\n");
 }
 function notesHomeBlock() {
-  return "Notes_* addresses have five homes: bare <vpath> is this session, @project/<vpath> is this project, @human/<vpath> is the human's cross-project home, @self/<vpath> and @agents/<name>/<vpath> are agent homes (current vs named), and @model/<vpath> and @models/<name>/<vpath> are model homes. @self and @model resolve to who is running now; listings always show resolved names. @ means leaving home; there is no cross-home fallback. Anything else after @ \u2014 or @ inside a vpath \u2014 is a hard error. Any other note is a plain file \u2014 use the file tools.";
+  return "Note addresses: bare <vpath> is this session; @project/<vpath> is this project; @human/<vpath> is the human's cross-project notes; @self/<vpath> is your own (current agent); @model/<vpath> is the current model's. @self and @model resolve to who is running now. Any other @ prefix, or @ inside a vpath, is a hard error; there is no fallback across prefixes. Anything not matching these is a plain file \u2014 use the file tools.";
 }
 function renderBootBlock(data) {
   const parts = [];
-  if (data.resetLine) parts.push(RESET_SUMMARY);
   parts.push(identityBlock(data.agentName, data.modelName, data.firstWindowId, data.currentWindowId, data.previousWindowId));
   parts.push(notesHomeBlock());
   const incomplete = notesUnavailableNotice(data.notes);
@@ -1384,6 +1389,7 @@ function registerBudget(pi, isEnabled, settingsManager) {
   const invalidateThresholds = () => {
     cachedPolicy = void 0;
   };
+  const formatRemaining = (remaining) => `${Math.max(0, Math.ceil(remaining / 1e3))}k`;
   let pendingGuidance;
   let pendingWarning;
   let pendingNotices = [];
@@ -1391,7 +1397,7 @@ function registerBudget(pi, isEnabled, settingsManager) {
     const windowId = currentWindowId(ctx);
     for (const notice of pendingNotices) {
       if (notice.windowId !== windowId || !hasWindowMessage(ctx, notice.customType)) continue;
-      ctx.ui.notify(notice.customType === WARNING_TYPE ? "pi-context: context budget critical \u2014 final checkpoint warning recorded for the model." : "pi-context: context budget low \u2014 checkpoint reminder recorded for the model, kept out of the chat view.", "warning");
+      ctx.ui.notify(notice.customType === WARNING_TYPE ? `pi-context: Context almost full \u2014 ${formatRemaining(notice.remaining)} remaining` : `pi-context: Context running low \u2014 ${formatRemaining(notice.remaining)} remaining`, "warning");
     }
     pendingNotices = [];
   };
@@ -1413,7 +1419,7 @@ function registerBudget(pi, isEnabled, settingsManager) {
     clearStaged();
     const windowId = currentWindowId(ctx);
     const drafts = staged.filter((draft) => draft !== void 0 && draft.windowId === windowId);
-    pendingNotices = drafts.map(({ windowId: windowId2, customType }) => ({ windowId: windowId2, customType }));
+    pendingNotices = drafts.map(({ windowId: windowId2, customType, remaining }) => ({ windowId: windowId2, customType, remaining }));
     return drafts.map((draft) => ({
       type: "custom_message",
       customType: draft.customType,
@@ -1428,7 +1434,6 @@ function registerBudget(pi, isEnabled, settingsManager) {
   pi.on("session_tree", resetForTransition);
   pi.on("model_select", resetForTransition);
   pi.on("session_shutdown", resetForTransition);
-  pi.on("turn_start", (_event, ctx) => notifyCommittedReminders(ctx));
   pi.on("agent_settled", (_event, ctx) => {
     notifyCommittedReminders(ctx);
     clearStaged();
@@ -1445,7 +1450,7 @@ function registerBudget(pi, isEnabled, settingsManager) {
       const content = `${GUIDANCE_OPEN_TAG}
 ${WARNING_PROMPT}
 ${GUIDANCE_CLOSE_TAG}`;
-      pendingWarning = { windowId, content };
+      pendingWarning = { windowId, content, remaining };
       const warningMessage = {
         role: "custom",
         customType: WARNING_TYPE,
@@ -1458,7 +1463,7 @@ ${GUIDANCE_CLOSE_TAG}`;
     if (hasWindowMessage(ctx, GUIDANCE_TYPE) || pendingGuidance?.windowId === windowId) return void 0;
     if (remaining <= reminder) {
       const left = Math.max(0, remaining - warning);
-      pendingGuidance = { windowId, content: tokenBudgetGuidance(left) };
+      pendingGuidance = { windowId, content: tokenBudgetGuidance(left), remaining };
     }
     return void 0;
   });
@@ -1483,31 +1488,6 @@ ${GUIDANCE_CLOSE_TAG}`;
   };
 }
 
-// src/notes/notes-snapshot.ts
-var NOTES_HOMES = [
-  { scope: "session", label: "this session" },
-  { scope: "project", label: "@project" },
-  { scope: "human", label: "@human" },
-  { scope: "agent", label: "@self" },
-  { scope: "model", label: "@model" }
-];
-function loadNotesSnapshot(ctx, loadHome = (context, scope) => listNotes(context, { scope })) {
-  const openedAt = Date.now();
-  const homes = /* @__PURE__ */ new Map();
-  const unavailable = [];
-  for (const home of NOTES_HOMES) {
-    try {
-      homes.set(home.scope, loadHome(ctx, home.scope));
-    } catch (error) {
-      const code = typeof error === "object" && error !== null ? error.code : void 0;
-      if (typeof code !== "string" || !/^E[A-Z0-9_]+$/.test(code) || code.startsWith("ERR_")) throw error;
-      homes.set(home.scope, []);
-      unavailable.push(home);
-    }
-  }
-  return { openedAt, homes, unavailable };
-}
-
 // src/context/reset-lifecycle.ts
 import { isContextOverflow, isRecoverableLength } from "@earendil-works/pi-ai";
 function isAbort(message, outcome, ctx) {
@@ -1517,15 +1497,55 @@ function isOverflowLike(message, ctx) {
   if (message.role !== "assistant") return false;
   return isContextOverflow(message, ctx.model?.contextWindow) || ctx.model !== void 0 && isRecoverableLength(message, ctx.model.maxTokens);
 }
+function initialResetControl() {
+  return { request: "none", overflow: "idle" };
+}
+function reduceResetControl(state, event) {
+  switch (event.type) {
+    case "request": {
+      if (state.request === "explicit") return { state, effect: "already-requested" };
+      return { state: { ...state, request: "explicit" }, effect: "requested" };
+    }
+    case "turn_end": {
+      const facts = event.facts;
+      const requested = state.request === "explicit";
+      const request = "none";
+      if (facts.aborted) {
+        return { state: { request, overflow: "idle" }, effect: "none" };
+      }
+      if (facts.overflow) {
+        const pending = !facts.queued && facts.enabled && facts.automaticResetEnabled;
+        const spent = state.overflow === "pending-spent" || state.overflow === "spent";
+        const overflow2 = pending ? spent ? "pending-spent" : "pending" : spent ? "spent" : "idle";
+        return { state: { request, overflow: overflow2 }, effect: "none" };
+      }
+      const overflow = facts.failed ? state.overflow : "idle";
+      if (!facts.enabled || facts.failed) return { state: { request, overflow }, effect: "none" };
+      const commit = requested || facts.thresholdDue;
+      return { state: { request, overflow }, effect: commit ? "commit-boundary" : "none" };
+    }
+    case "before_settle": {
+      const facts = event.facts;
+      if (state.overflow !== "pending" && state.overflow !== "pending-spent") return { state, effect: "none" };
+      if (facts.queued) return { state, effect: "none" };
+      const spent = state.overflow === "pending-spent";
+      if (!facts.enabled || !facts.automaticResetEnabled || facts.aborted) {
+        return { state: { ...state, overflow: spent ? "spent" : "idle" }, effect: "none" };
+      }
+      return { state: { ...state, overflow: "spent" }, effect: spent ? "none" : "recover-overflow" };
+    }
+    case "settled":
+      return { state: { ...state, overflow: "idle" }, effect: "none" };
+    case "abort":
+    case "clear":
+      return { state: initialResetControl(), effect: "none" };
+  }
+}
 function registerResetLifecycle(pi, options) {
-  let explicitRequested = false;
-  let overflowPending = false;
-  let overflowRecoveryUsed = false;
-  let active = true;
+  let sessionActive = true;
+  let control = initialResetControl();
   const clear = () => {
-    explicitRequested = false;
-    overflowPending = false;
-    overflowRecoveryUsed = false;
+    control = reduceResetControl(control, { type: "clear" }).state;
   };
   const resetBoundaryResult = (entries, ctx) => {
     try {
@@ -1536,43 +1556,58 @@ function registerResetLifecycle(pi, options) {
     }
   };
   pi.on("turn_end", (event, ctx) => {
-    if (!active) return void 0;
-    const requested = explicitRequested;
-    explicitRequested = false;
+    if (!sessionActive) return void 0;
     const aborted = isAbort(event.message, event.outcome, ctx);
     const stagedBudgetEntries = options.budget.consumeTurnEnd(ctx);
     const budgetEntries = options.isEnabled() && !aborted ? stagedBudgetEntries : [];
     const entries = [...event.entries ?? [], ...budgetEntries];
-    if (aborted) {
-      overflowPending = false;
-      overflowRecoveryUsed = false;
-      return entries.length > 0 ? { entries } : void 0;
-    }
-    if (isOverflowLike(event.message, ctx)) {
-      const queued = event.context.pendingMessages.length > 0 || ctx.hasPendingMessages();
-      overflowPending = !queued && options.isEnabled() && options.budget.automaticResetEnabled(ctx);
-      return entries.length > 0 ? { entries } : void 0;
-    }
-    if (event.outcome !== "error") {
-      overflowPending = false;
-      overflowRecoveryUsed = false;
-    }
-    if (!options.isEnabled() || event.outcome === "error") return entries.length > 0 ? { entries } : void 0;
-    const autoThreshold = options.budget.resetDue(ctx);
-    if (!requested && !autoThreshold) return entries.length > 0 ? { entries } : void 0;
-    return resetBoundaryResult(entries, ctx);
+    const decision = reduceResetControl(control, {
+      type: "turn_end",
+      facts: {
+        aborted,
+        overflow: aborted ? false : isOverflowLike(event.message, ctx),
+        failed: event.outcome === "error",
+        enabled: options.isEnabled(),
+        get queued() {
+          return event.context.pendingMessages.length > 0 || ctx.hasPendingMessages();
+        },
+        get automaticResetEnabled() {
+          return options.budget.automaticResetEnabled(ctx);
+        },
+        get thresholdDue() {
+          return options.budget.resetDue(ctx);
+        }
+      }
+    });
+    control = decision.state;
+    if (decision.effect === "commit-boundary") return resetBoundaryResult(entries, ctx);
+    return entries.length > 0 ? { entries } : void 0;
   });
   pi.on("agent_before_settle", (event, ctx) => {
-    if (!active || !overflowPending) return void 0;
-    if (event.context.pendingMessages.length > 0 || ctx.hasPendingMessages()) return void 0;
-    overflowPending = false;
-    if (!options.isEnabled() || !options.budget.automaticResetEnabled(ctx) || event.outcome === "aborted" || ctx.signal?.aborted) return void 0;
-    if (overflowRecoveryUsed) return void 0;
-    overflowRecoveryUsed = true;
+    if (!sessionActive) return void 0;
+    const decision = reduceResetControl(control, {
+      type: "before_settle",
+      facts: {
+        get queued() {
+          return event.context.pendingMessages.length > 0 || ctx.hasPendingMessages();
+        },
+        get enabled() {
+          return options.isEnabled();
+        },
+        get automaticResetEnabled() {
+          return options.budget.automaticResetEnabled(ctx);
+        },
+        get aborted() {
+          return event.outcome === "aborted" || ctx.signal?.aborted === true;
+        }
+      }
+    });
+    control = decision.state;
+    if (decision.effect !== "recover-overflow") return void 0;
     return resetBoundaryResult(event.entries, ctx);
   });
   pi.on("session_before_compact", (event, ctx) => {
-    if (!active) return void 0;
+    if (!sessionActive) return void 0;
     if (event.signal.aborted) return { cancel: true };
     const markerExists = currentReset(ctx) !== void 0;
     if (options.isEnabled() || markerExists) {
@@ -1587,42 +1622,99 @@ function registerResetLifecycle(pi, options) {
     if (ctx.signal?.aborted) clear();
   });
   pi.on("agent_settled", () => {
-    overflowPending = false;
-    overflowRecoveryUsed = false;
+    control = reduceResetControl(control, { type: "settled" }).state;
   });
   pi.on("session_start", () => {
     clear();
-    active = true;
+    sessionActive = true;
   });
   pi.on("session_tree", clear);
   pi.on("session_shutdown", () => {
     clear();
     options.budget.clear();
-    active = false;
+    sessionActive = false;
   });
   return {
     request() {
-      if (explicitRequested) return "rollover_already_pending";
-      explicitRequested = true;
-      return "rollover_requested";
+      const decision = reduceResetControl(control, { type: "request" });
+      control = decision.state;
+      return decision.effect === "already-requested" ? "rollover_already_pending" : "rollover_requested";
     },
     clear
   };
 }
 
-// src/context/runtime.ts
-var buildLabel = typeof define_PI_CONTEXT_BUILD_default === "undefined" ? "unbundled source (build unknown)" : `${define_PI_CONTEXT_BUILD_default.version} \xB7 build ${define_PI_CONTEXT_BUILD_default.sourceHash.slice(0, 12)}`;
-function bootContent(ctx, currentId, previousId, resetLine, notes) {
+// src/context/reset-artifacts.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+
+// src/notes/notes-snapshot.ts
+var NOTES_HOMES = [
+  { scope: "session", label: "this session" },
+  { scope: "project", label: "@project" },
+  { scope: "human", label: "@human" },
+  { scope: "agent", label: "@self" },
+  { scope: "model", label: "@model" }
+];
+function loadNotesSnapshot(ctx, loadHome = (context, scope) => listNotes(context, { scope })) {
+  const openedAt = Date.now();
+  const homes = /* @__PURE__ */ new Map();
+  const unavailable = [];
+  for (const home of NOTES_HOMES) {
+    try {
+      homes.set(home.scope, loadHome(ctx, home.scope));
+    } catch (error) {
+      const code = typeof error === "object" && error !== null ? error.code : void 0;
+      if (typeof code !== "string" || !/^E[A-Z0-9_]+$/.test(code) || code.startsWith("ERR_")) throw error;
+      homes.set(home.scope, []);
+      unavailable.push(home);
+    }
+  }
+  return { openedAt, homes, unavailable };
+}
+
+// src/context/boot.ts
+function bootContent(ctx, currentId, previousId, notes) {
   return renderBootBlock({
     agentName: agentSlug(ctx),
     modelName: modelSlug(ctx),
     firstWindowId: rootWindowId(ctx.sessionManager.getSessionId()),
     currentWindowId: currentId,
     previousWindowId: previousId,
-    resetLine,
     notes
   });
 }
+function buildBootMessage(ctx, windowId, previousId, notifyIncompleteNotes) {
+  const notes = loadNotesSnapshot(ctx);
+  notifyIncompleteNotes?.(ctx, windowId, notes);
+  return { customType: BOOT_TYPE, content: bootContent(ctx, windowId, previousId, notes), display: false, details: { windowId } };
+}
+function sendBoot(pi, boot) {
+  pi.sendMessage(
+    { customType: boot.customType, content: boot.content, display: boot.display, details: boot.details },
+    { triggerTurn: false }
+  );
+}
+function ensureBoot(pi, ctx, notifyIncompleteNotes) {
+  const reset = currentReset(ctx);
+  if (reset) {
+    repairResetTail(pi, ctx, reset, notifyIncompleteNotes);
+    return;
+  }
+  const windowId = rootWindowId(ctx.sessionManager.getSessionId());
+  if (ctx.sessionManager.buildSessionProjection().messages.some((message) => isWindowBoot(message, windowId))) return;
+  sendBoot(pi, buildBootMessage(ctx, windowId, void 0, notifyIncompleteNotes));
+}
+
+// src/context/reset-artifacts.ts
+function isWindowContinuationEntry(entry) {
+  return entry.type === "custom_message" && entry.customType === CONTINUATION_TYPE;
+}
+function sendContinuation(pi) {
+  pi.sendMessage(
+    { customType: CONTINUATION_TYPE, content: CONTINUATION, display: false },
+    { triggerTurn: false }
+  );
+}
 function buildResetDrafts(ctx, notifyIncompleteNotes) {
   const sessionPrefix = ctx.sessionManager.getSessionId().slice(0, 8);
   const usedWindowIds = new Set(
@@ -1632,65 +1724,62 @@ function buildResetDrafts(ctx, notifyIncompleteNotes) {
   do {
     windowId = `pcw:${sessionPrefix}:${randomUUID2().slice(0, 8)}`;
   } while (usedWindowIds.has(windowId));
-  const notes = loadNotesSnapshot(ctx);
-  notifyIncompleteNotes?.(ctx, windowId, notes);
+  const boot = buildBootMessage(ctx, windowId, currentWindowId(ctx), notifyIncompleteNotes);
   return [
     { type: "custom", customType: RESET_MARKER_TYPE, data: { windowId } },
-    {
-      type: "custom_message",
-      customType: BOOT_TYPE,
-      content: bootContent(ctx, windowId, currentWindowId(ctx), true, notes),
-      display: false,
-      details: { windowId }
-    },
-    {
-      type: "custom_message",
-      customType: CONTINUATION_TYPE,
-      content: CONTINUATION,
-      display: false
-    }
+    { type: "custom_message", customType: BOOT_TYPE, content: boot.content, display: false, details: { windowId } },
+    { type: "custom_message", customType: CONTINUATION_TYPE, content: CONTINUATION, display: false }
   ];
 }
-function ensureBoot(pi, ctx, notifyIncompleteNotes) {
-  const reset = currentReset(ctx);
-  const sessionId2 = ctx.sessionManager.getSessionId();
-  const windowId = reset?.data?.windowId ?? rootWindowId(sessionId2);
-  if (ctx.sessionManager.buildSessionProjection().messages.some((message) => isWindowBoot(message, windowId))) return;
-  if (reset && !resetBootMayBeRepaired(ctx, reset.id, windowId)) return;
-  let previousId = reset ? rootWindowId(sessionId2) : void 0;
-  if (reset) {
-    for (const entry of ctx.sessionManager.getBranch()) {
-      if (entry.id === reset.id) break;
-      if (isWindowMarker(entry)) previousId = entry.data.windowId;
-    }
-  }
-  const notes = loadNotesSnapshot(ctx);
-  notifyIncompleteNotes?.(ctx, windowId, notes);
-  pi.sendMessage(
-    { customType: BOOT_TYPE, content: bootContent(ctx, windowId, previousId, reset !== void 0, notes), display: false, details: { windowId } },
-    { triggerTurn: false }
-  );
-}
 function persistManualReset(pi, ctx, notifyIncompleteNotes) {
-  const [marker, boot] = buildResetDrafts(ctx, notifyIncompleteNotes);
+  const [marker, boot, continuation] = buildResetDrafts(ctx, notifyIncompleteNotes);
   pi.appendEntry(marker.customType, marker.data);
   pi.sendMessage(
     { customType: boot.customType, content: boot.content, display: boot.display, details: boot.details },
     { triggerTurn: false }
   );
+  pi.sendMessage(
+    { customType: continuation.customType, content: continuation.content, display: continuation.display },
+    { triggerTurn: false }
+  );
   return boot.details.windowId;
 }
-function resetBootMayBeRepaired(ctx, markerId, windowId) {
+function inspectResetTail(ctx, markerId, windowId) {
   const branch = ctx.sessionManager.getBranch();
   const markerIndex = branch.findIndex((entry) => entry.id === markerId);
-  if (markerIndex < 0) return false;
-  const afterMarker = branch.slice(markerIndex + 1);
-  if (afterMarker.some((entry) => isWindowBootEntry(entry, windowId))) return false;
-  return !afterMarker.some((entry) => entry.type === "message" || entry.type === "custom_message" || entry.type === "compaction" || entry.type === "branch_summary");
+  if (markerIndex < 0) return void 0;
+  let boot = false;
+  let continuation = false;
+  for (const entry of branch.slice(markerIndex + 1)) {
+    if (isWindowBootEntry(entry, windowId)) {
+      if (boot || continuation) return void 0;
+      boot = true;
+      continue;
+    }
+    if (isWindowContinuationEntry(entry)) {
+      if (continuation || !boot) return void 0;
+      continuation = true;
+      continue;
+    }
+    if (isWindowMarker(entry) || entry.type === "message" || entry.type === "custom_message" || entry.type === "compaction" || entry.type === "branch_summary") {
+      return void 0;
+    }
+  }
+  return { boot, continuation };
 }
-function isWindowBootEntry(entry, windowId) {
-  return entry.type === "custom_message" && entry.customType === BOOT_TYPE && typeof entry.details === "object" && entry.details !== null && typeof entry.details.windowId === "string" && entry.details.windowId === windowId;
+function resetTailCommitted(ctx, markerId, windowId) {
+  const tail = inspectResetTail(ctx, markerId, windowId);
+  return tail?.boot === true && tail.continuation === true;
 }
+function repairResetTail(pi, ctx, marker, notifyIncompleteNotes) {
+  const tail = inspectResetTail(ctx, marker.id, marker.data.windowId);
+  if (!tail || tail.boot && tail.continuation) return;
+  if (!tail.boot) sendBoot(pi, buildBootMessage(ctx, marker.data.windowId, previousWindowId(ctx, marker.id), notifyIncompleteNotes));
+  if (!tail.continuation) sendContinuation(pi);
+}
+
+// src/context/runtime.ts
+var buildLabel = typeof define_PI_CONTEXT_BUILD_default === "undefined" ? "unbundled source (build unknown)" : `${define_PI_CONTEXT_BUILD_default.version} \xB7 build ${define_PI_CONTEXT_BUILD_default.sourceHash.slice(0, 12)}`;
 function branchHasWindowMarker(ctx, fromId) {
   return ctx.sessionManager.getBranch(fromId).some((entry) => isWindowMarker(entry));
 }
@@ -1704,7 +1793,8 @@ function registerContext(pi, settingsManager) {
     if (pendingResetNotices.size === 0) return;
     const branch = ctx.sessionManager.getBranch();
     for (const windowId of pendingResetNotices) {
-      if (!branch.some((entry) => isWindowMarker(entry) && entry.data.windowId === windowId) || !branch.some((entry) => isWindowBootEntry(entry, windowId))) continue;
+      const marker = branch.find((entry) => isWindowMarker(entry) && entry.data.windowId === windowId);
+      if (!marker || !resetTailCommitted(ctx, marker.id, windowId)) continue;
       pendingResetNotices.delete(windowId);
       ctx.ui.notify(`pi-context: memory cleared \xB7 ${windowId}`, "info");
     }
@@ -1851,7 +1941,7 @@ function createPiContext(options = {}) {
 function piContext(pi) {
   registerPiContext(pi);
 }
-var internal = { MAX_NOTE_BYTES, NOTE_TYPE, BOOT_TYPE, GUIDANCE_TYPE, WARNING_TYPE, CONTINUATION_TYPE, WARNING_PROMPT, WARNING_RUNWAY_TOKENS, RESET_MARKER_TYPE, RESET_SUMMARY, CONTINUATION, CONTEXT_WINDOW_OPEN_TAG, CONTEXT_WINDOW_CLOSE_TAG, CONTEXT_WINDOW_PROTOCOL_OPEN_TAG, CONTEXT_WINDOW_PROTOCOL_CLOSE_TAG, GUIDANCE_OPEN_TAG, PI_CONTEXT_SETTINGS_KEY, DEFAULT_RESERVE_TOKENS, DEFAULT_REMINDER_MARGIN_TOKENS, deriveThresholds, mergePiContextSettings, assertVirtualPath };
+var internal = { MAX_NOTE_BYTES, NOTE_TYPE, BOOT_TYPE, GUIDANCE_TYPE, WARNING_TYPE, CONTINUATION_TYPE, WARNING_PROMPT, WARNING_RUNWAY_TOKENS, RESET_MARKER_TYPE, CONTINUATION, CONTEXT_WINDOW_OPEN_TAG, CONTEXT_WINDOW_CLOSE_TAG, CONTEXT_WINDOW_PROTOCOL_OPEN_TAG, CONTEXT_WINDOW_PROTOCOL_CLOSE_TAG, GUIDANCE_OPEN_TAG, PI_CONTEXT_SETTINGS_KEY, DEFAULT_RESERVE_TOKENS, DEFAULT_REMINDER_MARGIN_TOKENS, deriveThresholds, mergePiContextSettings, assertVirtualPath };
 export {
   createPiContext,
   piContext as default,