pi-ui-extend 0.1.34 → 0.1.35

package/external/pi-tools-suite/src/dcp/prompts.ts

@@ -26,7 +26,9 @@ When multiple independent stale sections exist, prefer several focused compressi
 When one older message is huge but the surrounding context is still useful, use message-mode compression for that single message instead of compressing a broad range.
 Summaries should be proportional to future usefulness, not proportional to the amount of text being removed.
 
-Use \`compress\` as steady housekeeping while you work. After any completed implementation + verification slice, compress that closed slice before replying or starting a new task unless the next step needs exact raw logs/diffs. Do not carry large stale tool outputs across task boundaries.
+Use \`compress\` as steady housekeeping while you work. Closed slice => compress now. Do not start a new search, file-read batch, test, verification run, or web lookup while older completed work remains raw.
+
+A closed slice is any finished implementation, verification, config edit, answered exploration, dead-end debugging branch, or test/log inspection. Passing logs are summary-only: preserve command, pass/fail, key failures if any, and whether follow-up is needed; never keep a full passing log in live context. Treat large shell/read/repo/web outputs as disposable evidence once their facts are extracted.
 
 Before compressing while work is unfinished, ensure one \`todo in_progress\` captures the active objective and next step.
 
@@ -38,6 +40,7 @@ CADENCE, SIGNALS, AND LATENCY
 - Prioritize closedness and independence over raw size
 - Prefer smaller, regular compressions over infrequent massive compressions for better latency and summary quality
 - When multiple independent stale sections are ready, batch compressions in parallel
+- Before more exploration, ask whether an older completed slice can become summary-only; if yes, compress first
 
 COMPRESS WHEN
 
@@ -45,6 +48,8 @@ A section is genuinely closed and the raw conversation has served its purpose:
 
 - Research concluded and findings are clear
 - Implementation finished and verified
+- Config/doc edit finished
+- Test, lint, or CI output has been understood, especially passing logs
 - Exploration exhausted and patterns understood
 - Dead-end noise can be discarded without waiting for a whole chapter to close
 
@@ -77,7 +82,10 @@ It is your responsibility to keep a sharp, high-quality context window for optim
 export const COMPRESS_RANGE_DESCRIPTION = `Collapse one or more ranges of the conversation into detailed summaries.
 
 AUTONOMOUS HOUSEKEEPING
-Do not wait for context emergencies. After a completed implementation + verification slice, compress that closed slice before replying or starting a new task unless the next step needs exact raw logs/diffs. Do not carry large stale tool outputs across task boundaries.
+Do not wait for context emergencies. Closed slice => compress now. A closed slice includes completed implementation, verification, config/doc edit, answered exploration, dead-end debugging, or finished test/log inspection. Compress before starting the next search/read/test/web lookup unless exact raw text is still needed.
+
+PASSING LOGS AND LARGE OUTPUTS
+Passing check/test/lint/tsc logs are summary-only after you know the result. Preserve command, pass/fail, key failures if any, and follow-up status; drop full passing output. Treat large shell/read/repo/web outputs as disposable evidence once important facts are extracted.
 
 DCP REMINDERS
 If a \`<dcp-system-reminder>\` is present in context, treat it as a direct instruction to evaluate compression immediately. If a safe closed range exists, call this tool before further exploration. Skipping compression is acceptable only when the newest raw context is still needed for the next concrete edit, test, or answer.
@@ -87,7 +95,7 @@ Your summary must be COMPLETE FOR CONTINUATION, not a transcript rewrite. Preser
 
 If active unfinished work exists, start with \`Active objective\` and \`Next step\`.
 
-Default to a compact structured summary (roughly 5-15 bullets for a normal completed work slice). Grow beyond that only when the compressed range contains multiple independent decisions, unresolved blockers, or precise state that is genuinely required to continue.
+Default to a compact structured summary (roughly 4-10 bullets for a normal completed work slice). Grow beyond that only when the compressed range contains multiple independent decisions, unresolved blockers, or precise state that is genuinely required to continue.
 
 Do not copy long raw code, JSON, diffs, logs, or tool output into summaries. Prefer semantic descriptions such as “updated foo.json so scene_assets_1.zai-svg has maxConcurrentRuns set to 5.” Include exact snippets only when the literal text is required for safe continuation, and keep them short and single-line.
 
@@ -98,7 +106,7 @@ USER INTENT FIDELITY
 When the compressed range includes user messages, preserve the user's intent with extra care. Do not change scope, constraints, priorities, acceptance criteria, or requested outcomes.
 Directly quote user messages when they are short enough to include safely. Direct quotes are preferred when they best preserve exact meaning.
 
-Be LEAN. Strip away the noise: failed attempts that led nowhere, verbose tool outputs, back-and-forth exploration, and incidental line-by-line edit history. What remains should be pure signal with enough detail to resume work confidently.
+Be LEAN. Strip away full logs, repeated search/read output, duplicate summaries, incidental failed attempts, and line-by-line edit history. What remains should be pure signal with enough detail to resume work confidently.
 
 TWO COMPRESSION MODES
 You may use either or both modes in one call:
@@ -174,7 +182,7 @@ You are at or beyond the configured max context threshold. This is an emergency
 You MUST use the \`compress\` tool now. Do not continue normal exploration until compression is handled.
 
 If you are in the middle of a critical atomic operation, finish that atomic step first, then compress immediately.
-If a completed implementation+verification slice exists, compress it before replying or starting another task.
+If any closed slice exists (finished implementation, verification, config/doc edit, answered exploration, dead end, or test/log inspection), compress it before replying or starting another task. Passing logs should become command + pass/fail + follow-up status only.
 
 RANGE STRATEGY (MANDATORY)
 Prioritize one large, closed, high-yield compression range first.
@@ -201,9 +209,9 @@ ACTION REQUIRED: Context usage is high.
 
 Before doing more exploration, look for a closed, self-contained range that no longer needs to stay raw and compress it now.
 
-Do not treat this as optional housekeeping. If any completed research, implementation, verification, CI-log inspection, or dead-end debugging slice is present, call the \`compress\` tool before continuing normal work.
+Do not treat this as optional housekeeping. If any completed research, implementation, verification, config/doc edit, CI-log inspection, or dead-end debugging slice is present, call the \`compress\` tool before continuing normal work.
 If a completed implementation+verification slice exists, compress it before replying or starting another task.
-High-priority stale tool outputs must be compressed once no exact raw text is needed.
+High-priority stale shell/read/repo/web outputs must be compressed once no exact raw text is needed. Passing logs should not remain raw after they are understood.
 
 RANGE SELECTION
 Prefer older, resolved history. Avoid the newest active working slice unless it is clearly done.
@@ -225,7 +233,7 @@ If any range is cleanly closed and unlikely to be needed again, use the \`compre
 If direction has shifted, compress earlier ranges that are now less relevant.
 
 Do not defer this across another batch of searches, reads, CI log fetches, or tests. The next safe action should be compression whenever a closed slice exists.
-High-priority stale tool outputs must be compressed once no exact raw text is needed.
+High-priority stale shell/read/repo/web outputs and understood passing logs must be compressed once no exact raw text is needed.
 
 Prefer small, closed-range compressions over one broad compression.
 Use message-mode compression for isolated large stale messages.
@@ -239,7 +247,7 @@ Keep active context uncompressed.
 export const ITERATION_NUDGE = `<dcp-system-reminder>
 ACTION REQUIRED: You've been iterating for a while after the last user message.
 
-Pause before the next non-atomic tool call. If there is a closed portion that is unlikely to be referenced immediately (for example, finished research before implementation, completed CI-log triage, a verified fix, or a dead-end investigation), use the \`compress\` tool on it now.
+Pause before the next non-atomic tool call. If there is a closed portion that is unlikely to be referenced immediately (for example, finished research before implementation, completed config edit, completed CI-log triage, a verified fix, or a dead-end investigation), use the \`compress\` tool on it now.
 
 Do not keep accumulating tool outputs while a completed slice remains raw. If a range is closed, compression is the next safe action.
 If a completed implementation+verification slice exists, compress it before replying or starting another task.

package/external/pi-tools-suite/src/dcp/pruner-candidates.ts

@@ -17,6 +17,55 @@ interface CandidateBoundary {
   isSystemReminder: boolean;
 }
 
+function hasAddressableSnapshot(state: DcpState): boolean {
+  return state.messageMetaSnapshot.size > 0 || state.messageIdSnapshot.size > 0;
+}
+
+function isActiveBlockId(blockId: number, state: DcpState): boolean {
+  return state.compressionBlocks.some((block) => block.id === blockId && block.active);
+}
+
+function findCurrentMessageId(msg: any, state: DcpState): string | undefined {
+  const role = msg?.role ?? "";
+  const timestamp = msg?.timestamp;
+  if (!Number.isFinite(timestamp)) return undefined;
+
+  for (const [id, meta] of state.messageMetaSnapshot) {
+    if (meta.timestamp === timestamp && meta.role === role && meta.blockId === undefined) return id;
+  }
+
+  for (const [id, ts] of state.messageIdSnapshot) {
+    if (ts === timestamp) return id;
+  }
+
+  return undefined;
+}
+
+function resolveAddressableBoundaryId(
+  msg: any,
+  state: DcpState,
+  options: { allowBlocks: boolean },
+): { id: string; blockId?: number; text: string } | null {
+  const text = messageText(msg);
+  const blockId = extractBlockId(text);
+  if (blockId !== undefined) {
+    if (options.allowBlocks && isActiveBlockId(blockId, state)) return { id: `b${blockId}`, blockId, text };
+    if (!hasAddressableSnapshot(state) && options.allowBlocks) return { id: `b${blockId}`, blockId, text };
+    return null;
+  }
+
+  const messageId = extractMessageId(text);
+  if (!messageId) return null;
+  if (!hasAddressableSnapshot(state)) return { id: messageId, text };
+
+  if (state.messageMetaSnapshot.has(messageId) || state.messageIdSnapshot.has(messageId)) {
+    return { id: messageId, text };
+  }
+
+  const currentId = findCurrentMessageId(msg, state);
+  return currentId ? { id: currentId, text } : null;
+}
+
 export function detectCompressionCandidate(
   messages: any[],
   _state: DcpState,
@@ -29,19 +78,16 @@ export function detectCompressionCandidate(
 
   const boundaries: CandidateBoundary[] = [];
   for (const msg of messages) {
-    const text = messageText(msg);
-    const blockId = extractBlockId(text);
-    const messageId = extractMessageId(text);
-    const id = blockId !== undefined ? `b${blockId}` : messageId;
-    if (!id) continue;
+    const boundary = resolveAddressableBoundaryId(msg, _state, { allowBlocks: true });
+    if (!boundary) continue;
     if (!Number.isFinite(msg.timestamp)) continue;
     boundaries.push({
-      id,
+      id: boundary.id,
       role: msg.role ?? "",
       timestamp: msg.timestamp,
       tokenEstimate: estimateMessageTokens(msg),
-      blockId,
-      isSystemReminder: text.includes("<dcp-system-reminder>"),
+      blockId: boundary.blockId,
+      isSystemReminder: boundary.text.includes("<dcp-system-reminder>"),
     });
   }
 
@@ -102,6 +148,7 @@ export function formatCompressionCandidateHint(candidate: CompressionCandidate):
 
 export function detectMessageCompressionCandidates(
   messages: any[],
+  state: DcpState,
   config: DcpConfig,
   contextPercent: number,
 ): MessageCompressionCandidate[] {
@@ -111,18 +158,15 @@ export function detectMessageCompressionCandidates(
 
   const boundaries: CandidateBoundary[] = [];
   for (const msg of messages) {
-    const text = messageText(msg);
-    const blockId = extractBlockId(text);
-    const messageId = extractMessageId(text);
-    if (!messageId || blockId !== undefined) continue;
+    const boundary = resolveAddressableBoundaryId(msg, state, { allowBlocks: false });
+    if (!boundary || boundary.blockId !== undefined) continue;
     if (!Number.isFinite(msg.timestamp)) continue;
     boundaries.push({
-      id: messageId,
+      id: boundary.id,
       role: msg.role ?? "",
       timestamp: msg.timestamp,
       tokenEstimate: estimateMessageTokens(msg),
-      blockId,
-      isSystemReminder: text.includes("<dcp-system-reminder>"),
+      isSystemReminder: boundary.text.includes("<dcp-system-reminder>"),
     });
   }
 

package/external/pi-tools-suite/src/dcp/pruner-metadata.ts

@@ -1,4 +1,4 @@
-import type { DcpConfig } from "./config.js";
+import { matchingModelEntries, type DcpConfig } from "./config.js";
 import type { DcpState } from "./state.js";
 import type { NudgeThresholds } from "./pruner-types.js";
 import { createRequire } from "node:module";
@@ -107,8 +107,6 @@ export function resolveContextThresholds(
   modelKeys: Array<string | undefined> = [],
   contextWindow?: number,
 ): Required<NudgeThresholds> {
-  const candidates = modelKeys.filter((key): key is string => typeof key === "string" && key.length > 0);
-
   const resolveThresholdValue = (value: number | string | undefined): number | undefined => {
     if (typeof value === "string") {
       const trimmed = value.trim();
@@ -130,12 +128,12 @@ export function resolveContextThresholds(
   };
 
   const resolveOverride = (map: Record<string, number | string> | undefined): number | undefined => {
-    if (!map) return undefined;
-    for (const key of candidates) {
-      const value = resolveThresholdValue(map[key]);
-      if (value !== undefined) return value;
+    let resolved: number | undefined;
+    for (const [, rawValue] of matchingModelEntries(map, modelKeys)) {
+      const value = resolveThresholdValue(rawValue);
+      if (value !== undefined) resolved = value;
     }
-    return undefined;
+    return resolved;
   };
 
   const min =

package/external/pi-tools-suite/src/dcp/pruner-nudge.ts

@@ -157,7 +157,7 @@ function formatCandidateActions(
 
   if (candidate) {
     parts.push(
-      `Recommended range candidate: ${candidate.startId}..${candidate.endId} (${candidate.messageCount} messages, ~${candidate.estimatedTokens} tokens, ${candidate.reason}). Compress this before the next search/read/test if it is closed.`,
+      `Recommended range candidate: ${candidate.startId}..${candidate.endId} (${candidate.messageCount} messages, ~${candidate.estimatedTokens} tokens, ${candidate.reason}). Compress this before the next search/read/test/web lookup if it is closed.`,
     );
     if (candidate.includedBlockIds.length > 0) {
       parts.push(
@@ -172,7 +172,7 @@ function formatCandidateActions(
     parts.push(
       `Recommended message candidates: ${listedMessages
         .map((item) => `${item.messageId} (${item.priority}, ${item.role}, ~${item.estimatedTokens} tokens)`)
-        .join(", ")}. High-priority stale messages MUST be compressed once their full text is no longer needed. Batch multiple messages in one compress call when possible.`,
+        .join(", ")}. High-priority stale messages MUST be compressed once their full text is no longer needed; passing logs should become command + pass/fail + follow-up status only. Batch multiple messages in one compress call when possible.`,
     );
   }
 
@@ -180,7 +180,7 @@ function formatCandidateActions(
   if (activeBlocks) parts.push(activeBlocks);
 
   if (parts.length === 0) {
-    parts.push("No automatic candidate is certain; scan the older closed context now and compress any completed research, implementation, verification, CI-log inspection, or dead-end debugging slice before accumulating more tool output.");
+    parts.push("No automatic candidate is certain; scan the older closed context now and compress any completed research, implementation, config/doc edit, verification, CI-log inspection, or dead-end debugging slice before accumulating more tool output.");
   }
 
   return [`CONCRETE NEXT ACTION`, ...parts].join("\n");

package/external/pi-tools-suite/src/default-pi-tools-suite-config.ts

@@ -19,11 +19,61 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
   "dcp": {
     "enabled": true,
     "manualMode": { "enabled": false, "automaticStrategies": true },
+    "modelOverrides": {
+      "openai-codex/gpt-5.5": {
+        "compress": {
+          "minContextPercent": "28%",
+          "maxContextPercent": "48%"
+        }
+      },
+      "openai-codex/gpt-5.4-mini": {
+        "compress": {
+          "minContextPercent": "20%",
+          "maxContextPercent": "38%"
+        }
+      },
+      "zai/*": {
+        "compress": {
+          "minContextPercent": "16%",
+          "maxContextPercent": "30%"
+        }
+      },
+      "antigravity/*sonnet*": {
+        "compress": {
+          "minContextPercent": "22%",
+          "maxContextPercent": "40%"
+        }
+      },
+      "antigravity/gemini-3.1-pro*": {
+        "compress": {
+          "minContextPercent": "24%",
+          "maxContextPercent": "42%"
+        }
+      },
+      "antigravity/gemini-3-flash*": {
+        "compress": {
+          "minContextPercent": "18%",
+          "maxContextPercent": "34%"
+        }
+      },
+      "antigravity/gemini-2.5-flash*": {
+        "compress": {
+          "minContextPercent": "18%",
+          "maxContextPercent": "32%"
+        }
+      },
+      "antigravity/antigravity-claude-opus-4-6-thinking": {
+        "compress": {
+          "minContextPercent": "26%",
+          "maxContextPercent": "44%"
+        }
+      }
+    },
     "compress": {
       "minContextPercent": "20%",
       "maxContextPercent": "55%",
       "nudgeFrequency": 1,
-      "iterationNudgeThreshold": 6,
+      "iterationNudgeThreshold": 4,
       "autoCandidates": { "minContextPercent": 0.2 },
       "messageMode": { "minContextPercent": 0.2 }
     }

package/external/pi-tools-suite/src/glm-coding-discipline/index.ts

@@ -5,6 +5,7 @@ import type { Api, AssistantMessage, ImageContent, Model, TextContent } from "@e
 import { Type } from "typebox";
 
 import { loadPiToolsSuiteConfig } from "../config.js";
+import { ignoreStaleExtensionContextError } from "../context-usage.js";
 
 type ExtensionAPI = any;
 
@@ -189,20 +190,24 @@ export default function glmCodingDiscipline(pi: ExtensionAPI) {
 	}
 
 	function syncLookupToolAvailability(modelRef: string | undefined, cwd?: string): void {
-		const activeTools = typeof pi.getActiveTools === "function" ? pi.getActiveTools() : undefined;
-		if (!Array.isArray(activeTools)) return;
+		try {
+			const activeTools = typeof pi.getActiveTools === "function" ? pi.getActiveTools() : undefined;
+			if (!Array.isArray(activeTools)) return;
 
-		const lookupEnabled = Boolean(lookupModelFromConfig(cwd));
-		const shouldExposeLookup = lookupEnabled && isGlmModel(modelRef);
-		const hasLookup = activeTools.includes(LOOKUP_TOOL_NAME);
+			const lookupEnabled = Boolean(lookupModelFromConfig(cwd));
+			const shouldExposeLookup = lookupEnabled && isGlmModel(modelRef);
+			const hasLookup = activeTools.includes(LOOKUP_TOOL_NAME);
 
-		if (shouldExposeLookup === hasLookup) return;
-		if (typeof pi.setActiveTools !== "function") return;
+			if (shouldExposeLookup === hasLookup) return;
+			if (typeof pi.setActiveTools !== "function") return;
 
-		const nextTools = shouldExposeLookup
-			? [...activeTools, LOOKUP_TOOL_NAME]
-			: activeTools.filter((tool: unknown) => tool !== LOOKUP_TOOL_NAME);
-		pi.setActiveTools([...new Set(nextTools)]);
+			const nextTools = shouldExposeLookup
+				? [...activeTools, LOOKUP_TOOL_NAME]
+				: activeTools.filter((tool: unknown) => tool !== LOOKUP_TOOL_NAME);
+			pi.setActiveTools([...new Set(nextTools)]);
+		} catch (error) {
+			ignoreStaleExtensionContextError(error);
+		}
 	}
 
 	maybeRegisterLookupTool(process.cwd());

package/external/pi-tools-suite/src/model-tools/index.ts

@@ -40,6 +40,14 @@ const MANAGED_TOOLS = new Set([...CLAUDE_ALIAS_TOOLS, ...CODEX_ALIAS_TOOLS, ...B
 const REPO_DISCOVERY_TOOL_NAME_SET = new Set(REPO_DISCOVERY_TOOL_NAMES);
 const MAX_BUILTIN_DEFINITIONS = 64;
 
+function isStaleExtensionContextError(error: unknown): boolean {
+	return error instanceof Error && /ctx is stale|stale ctx|stale after session replacement|stale after.*reload/i.test(error.message);
+}
+
+function ignoreStaleExtensionContextError(error: unknown): void {
+	if (!isStaleExtensionContextError(error)) throw error;
+}
+
 type ShellAliasInput = {
   command?: string;
   description?: string;
@@ -391,18 +399,22 @@ function sameTools(left: string[], right: string[]): boolean {
 }
 
 function applyToolProfile(pi: ExtensionAPI, model: unknown, baseTools: string[]): void {
-	const targetTools = toolsForProfile(detectModelProfile(model));
-	const preserveSelection = shouldPreserveSelection();
-	const active = pi.getActiveTools();
-	const repoTools = activeRepoDiscoveryTools(active, baseTools);
-	const preserved = active.filter((tool) => !MANAGED_TOOLS.has(tool) && !REPO_DISCOVERY_TOOL_NAME_SET.has(tool));
-	const baseWithoutRepoTools = baseTools.filter((tool) => !REPO_DISCOVERY_TOOL_NAME_SET.has(tool));
-	const selectedTargetTools = preserveSelection
-		? selectSuitableToolsForModel(model, active.filter((tool) => MANAGED_TOOLS.has(tool)))
-		: targetTools;
-	const next = selectedTargetTools ? [...repoTools, ...preserved, ...selectedTargetTools] : [...repoTools, ...preserved, ...baseWithoutRepoTools];
-	const nextTools = [...new Set(next)];
-	if (!sameTools(active, nextTools)) pi.setActiveTools(nextTools);
+	try {
+		const targetTools = toolsForProfile(detectModelProfile(model));
+		const preserveSelection = shouldPreserveSelection();
+		const active = pi.getActiveTools();
+		const repoTools = activeRepoDiscoveryTools(active, baseTools);
+		const preserved = active.filter((tool) => !MANAGED_TOOLS.has(tool) && !REPO_DISCOVERY_TOOL_NAME_SET.has(tool));
+		const baseWithoutRepoTools = baseTools.filter((tool) => !REPO_DISCOVERY_TOOL_NAME_SET.has(tool));
+		const selectedTargetTools = preserveSelection
+			? selectSuitableToolsForModel(model, active.filter((tool) => MANAGED_TOOLS.has(tool)))
+			: targetTools;
+		const next = selectedTargetTools ? [...repoTools, ...preserved, ...selectedTargetTools] : [...repoTools, ...preserved, ...baseWithoutRepoTools];
+		const nextTools = [...new Set(next)];
+		if (!sameTools(active, nextTools)) pi.setActiveTools(nextTools);
+	} catch (error) {
+		ignoreStaleExtensionContextError(error);
+	}
 }
 
 function shouldPreserveSelection(env: NodeJS.ProcessEnv = process.env): boolean {

package/external/pi-tools-suite/src/prompt-commands/index.ts

@@ -3,6 +3,7 @@ import { dirname } from "node:path";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { applyEdits, modify, parse as parseJsonc } from "jsonc-parser";
 import { ensurePiToolsSuiteUserConfig, getPiToolsSuiteUserConfigPath } from "../config";
+import { ignoreStaleExtensionContextError } from "../context-usage";
 import { publishStartupSection } from "../startup-section";
 
 type PromptCommand = {
@@ -166,12 +167,20 @@ async function runPromptCommand(pi: ExtensionAPI, ctx: ExtensionCommandContext,
 	if (!prompt) return notify(ctx, `/${name} has an empty prompt.`, "error");
 
 	await ctx.waitForIdle();
-	pi.sendUserMessage(prompt);
+	try {
+		pi.sendUserMessage(prompt);
+	} catch (error) {
+		ignoreStaleExtensionContextError(error);
+	}
 }
 
 async function reloadAfterConfigChange(ctx: ExtensionCommandContext, message: string): Promise<void> {
 	notify(ctx, `${message}\nReloading commands from ${getConfigPath()}…`);
-	await ctx.reload();
+	try {
+		await ctx.reload();
+	} catch (error) {
+		ignoreStaleExtensionContextError(error);
+	}
 }
 
 async function selectCommand(ctx: ExtensionContext, title: string, commands: Record<string, PromptCommand>): Promise<string | undefined> {

package/external/pi-tools-suite/src/telegram-mirror/index.ts

@@ -35,6 +35,7 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { loadTelegramMirrorConfig } from "../config.js";
+import { ignoreStaleExtensionContextError, isAgentBusyRaceError } from "../context-usage.js";
 import { TelegramBot } from "./bot.js";
 import { captureAbortableContext, registerPixEventHandlers, type PixMirrorHooks, type RendererSink } from "./events.js";
 import { TurnRenderer, type RendererEvent } from "./renderer.js";
@@ -104,11 +105,32 @@ export default function telegramMirror(pi: ExtensionAPI): void {
 		console.error(`[telegram-mirror] ${message}`);
 	};
 
+	function staleSafe<T>(callback: () => T, fallback?: T): T | undefined {
+		try {
+			return callback();
+		} catch (error) {
+			ignoreStaleExtensionContextError(error);
+			return fallback;
+		}
+	}
+
+	function sendUserMessageSafely(text: string): void {
+		try {
+			pi.sendUserMessage(text);
+		} catch (error) {
+			if (isAgentBusyRaceError(error)) {
+				pi.sendUserMessage(text, { deliverAs: "followUp" });
+				return;
+			}
+			throw error;
+		}
+	}
+
 	// Dispatch the leader uses to execute commands on its own pi session.
-		const localDispatch: LocalDispatch = {
-			sendUserMessage(text) {
-				pi.sendUserMessage(text);
-			},
+	const localDispatch: LocalDispatch = {
+		sendUserMessage(text) {
+			staleSafe(() => sendUserMessageSafely(text));
+		},
 			currentDialog() {
 				return mirrorCtx?.currentDialog();
 			},
@@ -119,8 +141,12 @@ export default function telegramMirror(pi: ExtensionAPI): void {
 			mirrorCtx?.compact();
 		},
 		status() {
-			if (!mirrorCtx) return undefined;
-			return { idle: mirrorCtx.isIdle(), hasPending: mirrorCtx.hasPendingMessages() };
+			const ctx = mirrorCtx;
+			if (!ctx) return undefined;
+			return {
+				idle: staleSafe(() => ctx.isIdle(), true) ?? true,
+				hasPending: staleSafe(() => ctx.hasPendingMessages(), false) ?? false,
+			};
 		},
 	};
 
@@ -336,7 +362,7 @@ export default function telegramMirror(pi: ExtensionAPI): void {
 		try {
 			switch (command) {
 				case "sendUserMessage":
-					pi.sendUserMessage(((args as { text?: string } | undefined)?.text ?? ""));
+					sendUserMessageSafely(((args as { text?: string } | undefined)?.text ?? ""));
 					break;
 				case "abort":
 					mirrorCtx?.abort();
@@ -477,22 +503,30 @@ export default function telegramMirror(pi: ExtensionAPI): void {
 	function refreshCtx(ctx: ExtensionContext | undefined): void {
 		if (!ctx) return;
 		if (!mirrorCtx) {
-				mirrorCtx = makeCtx({
-					abort: () => ctx.abort(),
-					isIdle: () => ctx.isIdle(),
-					hasPendingMessages: () => ctx.hasPendingMessages(),
-					compact: () => ctx.compact(),
+			mirrorCtx = makeCtx({
+					abort: () => {
+						staleSafe(() => ctx.abort());
+					},
+					isIdle: () => staleSafe(() => ctx.isIdle(), true) ?? true,
+					hasPendingMessages: () => staleSafe(() => ctx.hasPendingMessages(), false) ?? false,
+					compact: () => {
+						staleSafe(() => ctx.compact());
+					},
 					currentDialog: () => currentDialogFromContext(ctx),
 				});
-				return;
-			}
-		const m = mirrorCtx as Mutable<MirrorContext>;
-		m.abort = () => ctx.abort();
-			m.isIdle = () => ctx.isIdle();
-			m.hasPendingMessages = () => ctx.hasPendingMessages();
-			m.compact = () => ctx.compact();
-			m.currentDialog = () => currentDialogFromContext(ctx);
+			return;
 		}
+		const m = mirrorCtx as Mutable<MirrorContext>;
+		m.abort = () => {
+			staleSafe(() => ctx.abort());
+		};
+		m.isIdle = () => staleSafe(() => ctx.isIdle(), true) ?? true;
+		m.hasPendingMessages = () => staleSafe(() => ctx.hasPendingMessages(), false) ?? false;
+		m.compact = () => {
+			staleSafe(() => ctx.compact());
+		};
+		m.currentDialog = () => currentDialogFromContext(ctx);
+	}
 
 	function refreshSelfInfo(ctx: ExtensionContext | undefined): void {
 		const snapshot = sessionSnapshot(ctx);
@@ -611,13 +645,18 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 
 function sessionSnapshot(ctx: ExtensionContext | undefined): SessionSnapshot | undefined {
 	if (!ctx) return undefined;
-	const manager = ctx.sessionManager;
-	return {
-		cwd: manager.getCwd?.() ?? ctx.cwd,
-		...(manager.getSessionId?.() ? { sessionId: manager.getSessionId() } : {}),
-		...(manager.getSessionFile?.() ? { sessionFile: manager.getSessionFile() } : {}),
-		...(manager.getSessionName?.() ? { sessionName: manager.getSessionName() } : {}),
-	};
+	try {
+		const manager = ctx.sessionManager;
+		return {
+			cwd: manager.getCwd?.() ?? ctx.cwd,
+			...(manager.getSessionId?.() ? { sessionId: manager.getSessionId() } : {}),
+			...(manager.getSessionFile?.() ? { sessionFile: manager.getSessionFile() } : {}),
+			...(manager.getSessionName?.() ? { sessionName: manager.getSessionName() } : {}),
+		};
+	} catch (error) {
+		ignoreStaleExtensionContextError(error);
+		return undefined;
+	}
 }
 
 function notify(ctx: { hasUI?: boolean; ui?: { notify?: (message: string, type?: "info" | "warning" | "error") => void } }, message: string, type: "info" | "warning" | "error" = "info"): void {