pi-advisor-flow 0.9.2-dev.3 → 0.9.2-dev.4

package/CHANGELOG.md

@@ -6,6 +6,13 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 
 ## Unreleased
 
+### Fixed
+
+- Prevented settings saves from overwriting malformed `advisor.json` files and rolled back runtime settings when persistence fails.
+- Kept trusted project preferences inside the trusted project during file replacement races and isolated Advisor safety state between sessions.
+- Stopped discarded streaming renders from retaining repaint timers, made failed manual submissions retryable, and bounded unterminated-secret redaction.
+- Preserved `=` in model arguments, enforced UTF-8 byte caps on reattached advice, deduplicated withheld image paths, and avoided false zero-cost totals for incomplete provider usage.
+
 ### Changed
 
 - Pi 0.87.x and 0.99.x hosts are no longer supported; Pi 1.0.x is now the supported Pi host and the peer range is `^1.0.0`.

package/dist/index.js

@@ -826,7 +826,9 @@ var parseArgs = (args) => {
   let nextAdvisor = advisorRef;
   let nextContextMaxChars = contextMaxCharsRef;
   for (const token of args.trim().split(ARGUMENT_WHITESPACE).filter(Boolean)) {
-    const [key, value] = token.split("=");
+    const separator = token.indexOf("=");
+    const key = separator === -1 ? token : token.slice(0, separator);
+    const value = separator === -1 ? undefined : token.slice(separator + 1);
     if (key === "executor" && value) {
       nextExecutor = value;
     }
@@ -971,6 +973,21 @@ var readExistingConfig = (path) => {
     return {};
   }
 };
+var readConfigForSave = (path) => {
+  if (!existsSync(path)) {
+    return {};
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf-8"));
+  } catch (error) {
+    throw new Error(`Cannot save Advisor configuration at ${path}: existing JSON is malformed; fix advisor.json before saving.`, { cause: error });
+  }
+  if (!isRecord(parsed)) {
+    throw new Error(`Cannot save Advisor configuration at ${path}: configuration must be a JSON object.`);
+  }
+  return parsed;
+};
 var shouldPersistConfigKey = (key, persistAdvisor, persistExecutor) => (key !== "advisor" || persistAdvisor) && (key !== "executor" || persistExecutor);
 var applyChangedConfigValues = (existing, current, changedKeys, persistAdvisor, persistExecutor) => {
   const dropped = new Set;
@@ -1052,13 +1069,13 @@ var saveConfig = (_ctx, options = {}) => {
   const path = join(getAgentDir(), "advisor.json");
   const persistAdvisor = options.persistAdvisor ?? true;
   const persistExecutor = options.persistExecutor ?? true;
-  const existing = readExistingConfig(path);
   const current = currentConfigState();
   const baseline = loadedConfigPath === path ? loadedConfigState : undefined;
   const changedKeys = baseline ? SAVED_CONFIG_KEYS.filter((key) => !sameConfigValue(current[key], baseline[key])) : [...SAVED_CONFIG_KEYS];
   if (changedKeys.length === 0) {
     return path;
   }
+  const existing = readConfigForSave(path);
   const data = applyChangedConfigValues(existing, current, changedKeys, persistAdvisor, persistExecutor);
   writeFileSync(path, `${JSON.stringify(data, null, 2)}
 `);
@@ -1076,7 +1093,7 @@ var saveConfig = (_ctx, options = {}) => {
 };
 var saveGlobalOutcomeLogging = (enabled) => {
   const path = join(getAgentDir(), "advisor.json");
-  const existing = readExistingConfig(path);
+  const existing = readConfigForSave(path);
   writeFileSync(path, `${JSON.stringify({ ...existing, advisorOutcomeLogging: enabled }, null, 2)}
 `);
   resetConfigCache();
@@ -1505,7 +1522,7 @@ var REDACTION_MARKER = "[REDACTED SECRET]";
 var PEM_BEGIN_PATTERN = /-----BEGIN(?: [A-Z0-9]+)? PRIVATE KEY-----/giu;
 var PEM_END_PATTERN = /-----END(?: [A-Z0-9]+)? PRIVATE KEY-----/iu;
 var CREDENTIAL_NAME = String.raw`(?:api[_-]?key|token|secret|password|passwd)`;
-var SECRET_ASSIGNMENT_PATTERN = new RegExp(String.raw`(?:(?:"(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}"|'(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}')|(?:\b|_)${CREDENTIAL_NAME})\s*[:=]\s*(?:"(?:\\.|[^"])*(?:"|$)|'(?:\\.|[^'])*(?:'|$)|[^\s"'&,;)}\]]+)`, "giu");
+var SECRET_ASSIGNMENT_PATTERN = new RegExp(String.raw`(?:(?:"(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}"|'(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}')|(?:\b|_)${CREDENTIAL_NAME})[ \t]*[:=][ \t]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|"(?:\\.|[^"\r\n])*(?=\r?\n|$)|'(?:\\.|[^'\r\n])*(?=\r?\n|$)|[^\s"'&,;)}\]]+)`, "giu");
 var SECRET_PATTERNS = [
   /-----BEGIN(?: [A-Z0-9]+)? PRIVATE KEY-----[\s\S]*?-----END(?: [A-Z0-9]+)? PRIVATE KEY-----/giu,
   /\bBearer\s+[A-Za-z0-9._~+/=-]{8,}/giu,
@@ -2408,7 +2425,9 @@ var readImageAttachment = async (root, name, mimeType, remaining) => {
   }
 };
 var readImageFiles = async (cwd, requested, enabled, kind, remainingBytes, remainingCount) => {
-  const names = Array.isArray(requested) ? requested.filter((path) => isString(path) && imageFileCandidate(path)) : [];
+  const names = [
+    ...new Set(Array.isArray(requested) ? requested.filter((path) => isString(path) && imageFileCandidate(path)) : [])
+  ];
   if (!enabled || !names.length) {
     return { images: [], omitted: names.length };
   }
@@ -2445,6 +2464,7 @@ var readImageFiles = async (cwd, requested, enabled, kind, remainingBytes, remai
 };
 
 // src/preferences.ts
+import { constants as constants3 } from "node:fs";
 import { lstat as lstat3, open as open3, realpath as realpath3 } from "node:fs/promises";
 import { join as join2, relative as relative2 } from "node:path";
 var PREFERENCES_MAX_BYTES = 8 * 1024;
@@ -2468,8 +2488,13 @@ var readProjectPreferences = async (ctx, maxBytes = PREFERENCES_MAX_BYTES, redac
     if (!inside(root, resolved)) {
       return;
     }
-    const file = await open3(resolved, "r");
+    const flags = constants3.O_NOFOLLOW ? constants3.O_RDONLY + constants3.O_NOFOLLOW : constants3.O_RDONLY;
+    const file = await open3(resolved, flags);
     try {
+      const opened = await file.stat();
+      if (!opened.isFile() || opened.dev !== stats.dev || opened.ino !== stats.ino) {
+        return;
+      }
       const buffer = Buffer.alloc(maxBytes + 1);
       const { bytesRead } = await file.read(buffer, 0, buffer.length, 0);
       const source = buffer.subarray(0, bytesRead).toString("utf-8");
@@ -3100,6 +3125,10 @@ var buildScoutManifest = (ctx, options = {}) => {
 var finite = (value) => isNumber(value) && Number.isFinite(value) && value >= 0 ? value : undefined;
 var add = (left, right) => left === undefined || right === undefined ? left ?? right : left + right;
 var costFields = ["input", "output", "cacheRead", "cacheWrite", "total"];
+var hasPartialProviderCost = (snapshot, usage) => {
+  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
+  return cost !== undefined && snapshot.cost === undefined && costFields.some((field) => finite(cost[field]) !== undefined);
+};
 var snapshotAdvisorUsage = (usage) => {
   if (!isRecordOf(usage)) {
     return;
@@ -3117,18 +3146,29 @@ var snapshotAdvisorUsage = (usage) => {
   return Object.values(snapshot).some((value) => value !== undefined) || hasCostField ? snapshot : undefined;
 };
 var advisorUsageCost = (usage) => snapshotAdvisorUsage(usage)?.cost;
-var advisorUsageForPi = (usage) => {
+var completeUsageSnapshot = (usage) => {
   const snapshot = snapshotAdvisorUsage(usage);
   if (!(snapshot && isRecordOf(usage))) {
     return;
   }
-  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
+  if (hasPartialProviderCost(snapshot, usage)) {
+    return;
+  }
+  return { snapshot, usage };
+};
+var advisorUsageForPi = (usage) => {
+  const complete = completeUsageSnapshot(usage);
+  if (!complete) {
+    return;
+  }
+  const { snapshot } = complete;
+  const cost = isRecordOf(complete.usage.cost) ? complete.usage.cost : undefined;
   const input = snapshot.input ?? 0;
   const output = snapshot.output ?? 0;
   const cacheRead = snapshot.cacheRead ?? 0;
   const cacheWrite = snapshot.cacheWrite ?? 0;
-  const cacheWrite1h = finite(usage.cacheWrite1h);
-  const reasoning = finite(usage.reasoning);
+  const cacheWrite1h = finite(complete.usage.cacheWrite1h);
+  const reasoning = finite(complete.usage.reasoning);
   const piUsage = {
     cacheRead,
     cacheWrite,
@@ -4659,6 +4699,16 @@ class AdvisorSessionState {
 
 // src/tools/session.ts
 var advisorSessionState = new AdvisorSessionState;
+var sessionStates = new WeakMap;
+var sessionStateFor = (owner) => {
+  const existing = sessionStates.get(owner);
+  if (existing) {
+    return existing;
+  }
+  const state = new AdvisorSessionState;
+  sessionStates.set(owner, state);
+  return state;
+};
 
 // src/commands/runtime.ts
 var notify = (ctx, message, level) => {
@@ -4690,7 +4740,7 @@ class CommandRuntime {
   lastSameModelDisabled;
   constructor(pi, dependencies = {}) {
     this.pi = pi;
-    this.advisorSessionState = dependencies.sessionState ?? advisorSessionState;
+    this.advisorSessionState = dependencies.sessionState ?? sessionStateFor(pi);
     this.herdrActivity = dependencies.herdrActivity ?? herdrAdvisorActivity;
     this.scoutStatus = dependencies.statusManager ?? new ScoutStatusManager(false);
     this.requestAdvisor = dependencies.consult ?? ((ctx, question, signal, onChunk, onScout, gitContext) => consultAdvisor(ctx, question, signal, onChunk, "manual", gitContext, undefined, undefined, undefined, onScout));
@@ -5032,7 +5082,8 @@ class ManualAdvisorDialog {
   focusTarget = "editor";
   state = {
     completed: false,
-    focused: false
+    focused: false,
+    submitting: false
   };
   get focused() {
     return this.state.focused;
@@ -5204,17 +5255,22 @@ class ManualAdvisorDialog {
     return this.options.keybindings.matches(keyData, action) || matchesKey(keyData, fallback);
   }
   submit(message = this.editor.getText()) {
-    if (this.state.completed) {
+    if (this.state.completed || this.state.submitting) {
       return;
     }
-    this.state.completed = true;
+    this.state.submitting = true;
     const request = {
       gitContext: this.gitLevels[this.gitIndex] ?? "off"
     };
     if (message) {
       request.message = message;
     }
-    this.options.onSubmit(request);
+    try {
+      this.options.onSubmit(request);
+      this.state.completed = true;
+    } finally {
+      this.state.submitting = false;
+    }
   }
   cancel() {
     if (this.state.completed) {
@@ -5855,7 +5911,7 @@ var screenConsultation = (ctx, session, options, deps = {}) => {
       decision: "skip",
       kind: "repeat",
       reason: "already answered earlier in this session",
-      reattachedAdvice: reattached.slice(0, REATTACHED_ADVICE_CAP_BYTES)
+      reattachedAdvice: capUtf8Bytes(reattached, REATTACHED_ADVICE_CAP_BYTES)
     });
   }
   if (!advisorJevFilterEnabledRef) {
@@ -7368,13 +7424,19 @@ var applyAdvisorSettings = (settings) => {
   applyDisclosureSettings(settings);
 };
 var saveAdvisorSettings = (ctx, settings) => {
-  applyAdvisorSettings(settings);
-  const persisted = getPersistedModelRefs();
-  saveConfig(ctx, {
-    persistAdvisor: Boolean(persisted.advisor),
-    persistExecutor: Boolean(persisted.executor)
-  });
-  saveGlobalOutcomeLogging(settings.outcomeLogging ?? false);
+  const previous = getAdvisorSettings();
+  try {
+    applyAdvisorSettings(settings);
+    const persisted = getPersistedModelRefs();
+    saveConfig(ctx, {
+      persistAdvisor: Boolean(persisted.advisor),
+      persistExecutor: Boolean(persisted.executor)
+    });
+    saveGlobalOutcomeLogging(settings.outcomeLogging ?? false);
+  } catch (error) {
+    applyAdvisorSettings(previous);
+    throw error;
+  }
 };
 
 // src/commands/settings-commands.ts
@@ -7753,11 +7815,23 @@ import { Box as Box3, Markdown as Markdown4, Spacer, Text as Text5 } from "@eare
 var advisorResultDetails = (result) => result.details;
 var syncRenderPhase = (context, phase) => {
   if (context.state.phase !== phase && context.state.timerId) {
-    clearInterval(context.state.timerId);
+    clearTimeout(context.state.timerId);
     context.state.timerId = undefined;
   }
   context.state.phase = phase;
 };
+var scheduleRender = (context) => {
+  const timer = setTimeout(() => {
+    if (context.state.timerId !== timer) {
+      return;
+    }
+    context.state.timerId = undefined;
+    try {
+      context.invalidate();
+    } catch {}
+  }, 80);
+  context.state.timerId = timer;
+};
 var formatByteSize = (bytes) => {
   if (bytes >= 1024 ** 3) {
     return `${(bytes / 1024 ** 3).toFixed(1)} GiB`;
@@ -7796,14 +7870,7 @@ var renderPartialAdvisorResult = (box, result, expanded, theme, context) => {
   const scoutActive = scout?.status === "calling" || scout?.status === "streaming";
   syncRenderPhase(context, scoutActive ? "scout" : "advisor");
   if (!context.state.timerId) {
-    context.state.timerId = setInterval(() => {
-      try {
-        context.invalidate();
-      } catch {
-        clearInterval(context.state.timerId);
-        context.state.timerId = undefined;
-      }
-    }, 80);
+    scheduleRender(context);
   }
   if (scout) {
     renderScoutDetails(box, scout, expanded, theme);
@@ -7846,7 +7913,7 @@ var finalResultLines = (details, advice, theme) => {
 var renderFinalAdvisorResult = (box, result, expanded, theme, context) => {
   syncRenderPhase(context, "final");
   if (context.state.timerId) {
-    clearInterval(context.state.timerId);
+    clearTimeout(context.state.timerId);
     context.state.timerId = undefined;
   }
   const details = advisorResultDetails(result);
@@ -8487,7 +8554,7 @@ var registerToolRenderers = (pi) => {
 };
 
 // src/tools/registration.ts
-var registerAdvisorTool = (pi, session = advisorSessionState, dependencies = {}) => {
+var registerAdvisorTool = (pi, session = sessionStateFor(pi), dependencies = {}) => {
   const registration = {
     appendOutcome: dependencies.appendOutcome ?? appendOutcome,
     consult: dependencies.consult ?? consultAdvisor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-advisor-flow",
-  "version": "0.9.2-dev.3",
+  "version": "0.9.2-dev.4",
   "description": "Advanced Executor/Advisor flow for Pi, fully configurable and extendable.",
   "keywords": [
     "advisor",

package/src/commands/runtime.ts

@@ -12,7 +12,7 @@ import {
   sameModelAdvisorNotice,
 } from "../tools/model-access.ts";
 import { ScoutStatusManager } from "../tools/scout-status.ts";
-import { advisorSessionState as defaultAdvisorSessionState } from "../tools/session.ts";
+import { sessionStateFor } from "../tools/session.ts";
 import { uiAction } from "../ui-guard.ts";
 import type {
   CommandDependencies,
@@ -60,8 +60,7 @@ class CommandRuntime implements CommandRuntimeContract {
 
   constructor(pi: ExtensionAPI, dependencies: CommandDependencies = {}) {
     this.pi = pi;
-    this.advisorSessionState =
-      dependencies.sessionState ?? defaultAdvisorSessionState;
+    this.advisorSessionState = dependencies.sessionState ?? sessionStateFor(pi);
     this.herdrActivity = dependencies.herdrActivity ?? herdrAdvisorActivity;
     this.scoutStatus =
       dependencies.statusManager ?? new ScoutStatusManager(false);

package/src/commands/settings-persistence.ts

@@ -1,6 +1,7 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import {
+  getAdvisorSettings,
   getPersistedModelRefs,
   setAdvisorAutoLoopGateRef,
   setAdvisorBlockOnBlockedRef,
@@ -140,11 +141,17 @@ export const saveAdvisorSettings = (
   ctx: ExtensionContext,
   settings: AdvisorSettings
 ) => {
-  applyAdvisorSettings(settings);
-  const persisted = getPersistedModelRefs();
-  saveConfig(ctx, {
-    persistAdvisor: Boolean(persisted.advisor),
-    persistExecutor: Boolean(persisted.executor),
-  });
-  saveGlobalOutcomeLogging(settings.outcomeLogging ?? false);
+  const previous = getAdvisorSettings();
+  try {
+    applyAdvisorSettings(settings);
+    const persisted = getPersistedModelRefs();
+    saveConfig(ctx, {
+      persistAdvisor: Boolean(persisted.advisor),
+      persistExecutor: Boolean(persisted.executor),
+    });
+    saveGlobalOutcomeLogging(settings.outcomeLogging ?? false);
+  } catch (error) {
+    applyAdvisorSettings(previous);
+    throw error;
+  }
 };

package/src/config/args.ts

@@ -16,7 +16,9 @@ export const parseArgs = (args: string): string | undefined => {
   let nextAdvisor = advisorRef;
   let nextContextMaxChars = contextMaxCharsRef;
   for (const token of args.trim().split(ARGUMENT_WHITESPACE).filter(Boolean)) {
-    const [key, value] = token.split("=");
+    const separator = token.indexOf("=");
+    const key = separator === -1 ? token : token.slice(0, separator);
+    const value = separator === -1 ? undefined : token.slice(separator + 1);
     if (key === "executor" && value) {
       nextExecutor = value;
     }

package/src/config/storage.ts

@@ -52,6 +52,27 @@ export const readExistingConfig = (path: string): RecordValue => {
   }
 };
 
+const readConfigForSave = (path: string): RecordValue => {
+  if (!existsSync(path)) {
+    return {};
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf-8"));
+  } catch (error) {
+    throw new Error(
+      `Cannot save Advisor configuration at ${path}: existing JSON is malformed; fix advisor.json before saving.`,
+      { cause: error }
+    );
+  }
+  if (!isRecord(parsed)) {
+    throw new Error(
+      `Cannot save Advisor configuration at ${path}: configuration must be a JSON object.`
+    );
+  }
+  return parsed;
+};
+
 const shouldPersistConfigKey = (
   key: SavedConfigKey,
   persistAdvisor: boolean,
@@ -197,7 +218,6 @@ export const saveConfig = (
   const path = join(getAgentDir(), "advisor.json");
   const persistAdvisor = options.persistAdvisor ?? true;
   const persistExecutor = options.persistExecutor ?? true;
-  const existing = readExistingConfig(path);
   const current = currentConfigState();
   const baseline = loadedConfigPath === path ? loadedConfigState : undefined;
   const changedKeys = baseline
@@ -208,6 +228,7 @@ export const saveConfig = (
   if (changedKeys.length === 0) {
     return path;
   }
+  const existing = readConfigForSave(path);
   const data = applyChangedConfigValues(
     existing,
     current,
@@ -240,7 +261,7 @@ export const saveConfig = (
 /** Outcome logging is deliberately written only to the global Pi configuration. */
 export const saveGlobalOutcomeLogging = (enabled: boolean) => {
   const path = join(getAgentDir(), "advisor.json");
-  const existing = readExistingConfig(path);
+  const existing = readConfigForSave(path);
   writeFileSync(
     path,
     `${JSON.stringify({ ...existing, advisorOutcomeLogging: enabled }, null, 2)}\n`

package/src/image-attachments.ts

@@ -72,9 +72,13 @@ export const readImageFiles = async (
   remainingBytes: number,
   remainingCount: number
 ): Promise<{ images: ImageAttachment[]; omitted: number }> => {
-  const names = Array.isArray(requested)
-    ? requested.filter((path) => isString(path) && imageFileCandidate(path))
-    : [];
+  const names = [
+    ...new Set(
+      Array.isArray(requested)
+        ? requested.filter((path) => isString(path) && imageFileCandidate(path))
+        : []
+    ),
+  ];
   if (!enabled || !names.length) {
     return { images: [], omitted: names.length };
   }

package/src/preferences.ts

@@ -1,3 +1,4 @@
+import { constants } from "node:fs";
 import { lstat, open, realpath } from "node:fs/promises";
 import { join, relative } from "node:path";
 
@@ -38,8 +39,19 @@ export const readProjectPreferences = async (
     if (!inside(root, resolved)) {
       return;
     }
-    const file = await open(resolved, "r");
+    const flags = constants.O_NOFOLLOW
+      ? constants.O_RDONLY + constants.O_NOFOLLOW
+      : constants.O_RDONLY;
+    const file = await open(resolved, flags);
     try {
+      const opened = await file.stat();
+      if (
+        !opened.isFile() ||
+        opened.dev !== stats.dev ||
+        opened.ino !== stats.ino
+      ) {
+        return;
+      }
       const buffer = Buffer.alloc(maxBytes + 1);
       const { bytesRead } = await file.read(buffer, 0, buffer.length, 0);
       const source = buffer.subarray(0, bytesRead).toString("utf-8");

package/src/redaction.ts

@@ -5,7 +5,7 @@ const PEM_BEGIN_PATTERN = /-----BEGIN(?: [A-Z0-9]+)? PRIVATE KEY-----/giu;
 const PEM_END_PATTERN = /-----END(?: [A-Z0-9]+)? PRIVATE KEY-----/iu;
 const CREDENTIAL_NAME = String.raw`(?:api[_-]?key|token|secret|password|passwd)`;
 const SECRET_ASSIGNMENT_PATTERN = new RegExp(
-  String.raw`(?:(?:"(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}"|'(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}')|(?:\b|_)${CREDENTIAL_NAME})\s*[:=]\s*(?:"(?:\\.|[^"])*(?:"|$)|'(?:\\.|[^'])*(?:'|$)|[^\s"'&,;)}\]]+)`,
+  String.raw`(?:(?:"(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}"|'(?:[a-z0-9]+[_-])*?${CREDENTIAL_NAME}')|(?:\b|_)${CREDENTIAL_NAME})[ \t]*[:=][ \t]*(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|"(?:\\.|[^"\r\n])*(?=\r?\n|$)|'(?:\\.|[^'\r\n])*(?=\r?\n|$)|[^\s"'&,;)}\]]+)`,
   "giu"
 );
 const SECRET_PATTERNS = [

package/src/tools/jev-filter.ts

@@ -8,6 +8,7 @@ import {
   advisorJevFilterSkipConfidenceRef,
   isSimpleMode,
 } from "../config/state.ts";
+import { capUtf8Bytes } from "../content-utils.ts";
 import { JevFailure, jevClientFromCredentials } from "../jev/client.ts";
 import { consumePlaintextKeyWarning } from "../jev/key-store.ts";
 import {
@@ -187,7 +188,7 @@ export const screenConsultation = (
       decision: "skip",
       kind: "repeat",
       reason: "already answered earlier in this session",
-      reattachedAdvice: reattached.slice(0, REATTACHED_ADVICE_CAP_BYTES),
+      reattachedAdvice: capUtf8Bytes(reattached, REATTACHED_ADVICE_CAP_BYTES),
     });
   }
   if (!advisorJevFilterEnabledRef) {

package/src/tools/registration.ts

@@ -12,7 +12,7 @@ import { registerToolLifecycle } from "./register-lifecycle.ts";
 import { registerOutcomeTool } from "./register-outcome.ts";
 import { registerToolRenderers } from "./register-renderers.ts";
 import { ScoutStatusManager } from "./scout-status.ts";
-import { advisorSessionState } from "./session.ts";
+import { sessionStateFor } from "./session.ts";
 import type {
   ToolRegistrationContext,
   ToolRegistrationDependencies,
@@ -20,7 +20,7 @@ import type {
 
 export const registerAdvisorTool = (
   pi: ExtensionAPI,
-  session: AdvisorSessionState = advisorSessionState,
+  session: AdvisorSessionState = sessionStateFor(pi),
   dependencies: ToolRegistrationDependencies = {}
 ): void => {
   const registration: ToolRegistrationContext = {

package/src/tools/render-advisor-result.ts

@@ -24,12 +24,27 @@ const advisorResultDetails = (result: AgentToolResult<AdvisorToolDetails>) =>
 
 const syncRenderPhase = (context: AdvisorToolContext, phase: string) => {
   if (context.state.phase !== phase && context.state.timerId) {
-    clearInterval(context.state.timerId);
+    clearTimeout(context.state.timerId);
     context.state.timerId = undefined;
   }
   context.state.phase = phase;
 };
 
+const scheduleRender = (context: AdvisorToolContext) => {
+  const timer = setTimeout(() => {
+    if (context.state.timerId !== timer) {
+      return;
+    }
+    context.state.timerId = undefined;
+    try {
+      context.invalidate();
+    } catch {
+      // The render slot may have been discarded before the repaint fired.
+    }
+  }, 80);
+  context.state.timerId = timer;
+};
+
 const formatByteSize = (bytes: number): string => {
   if (bytes >= 1024 ** 3) {
     return `${(bytes / 1024 ** 3).toFixed(1)} GiB`;
@@ -100,15 +115,7 @@ const renderPartialAdvisorResult = (
     scout?.status === "calling" || scout?.status === "streaming";
   syncRenderPhase(context, scoutActive ? "scout" : "advisor");
   if (!context.state.timerId) {
-    context.state.timerId = setInterval(() => {
-      try {
-        context.invalidate();
-      } catch {
-        // Renderer context is gone; stop repainting and drop the timer.
-        clearInterval(context.state.timerId);
-        context.state.timerId = undefined;
-      }
-    }, 80);
+    scheduleRender(context);
   }
   if (scout) {
     renderScoutDetails(box, scout, expanded, theme);
@@ -177,7 +184,7 @@ const renderFinalAdvisorResult = (
 ) => {
   syncRenderPhase(context, "final");
   if (context.state.timerId) {
-    clearInterval(context.state.timerId);
+    clearTimeout(context.state.timerId);
     context.state.timerId = undefined;
   }
   const details = advisorResultDetails(result);

package/src/tools/session.ts

@@ -1,3 +1,17 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
 import { AdvisorSessionState } from "../session-state.ts";
 
 export const advisorSessionState = new AdvisorSessionState();
+
+const sessionStates = new WeakMap<object, AdvisorSessionState>();
+
+export const sessionStateFor = (owner: ExtensionAPI): AdvisorSessionState => {
+  const existing = sessionStates.get(owner);
+  if (existing) {
+    return existing;
+  }
+  const state = new AdvisorSessionState();
+  sessionStates.set(owner, state);
+  return state;
+};

package/src/ui/manual-dialog.ts

@@ -24,6 +24,7 @@ const TUI_INPUT_TAB: keyof Keybindings = ["tui", "input", "tab"].join(
 interface ManualDialogState {
   completed: boolean;
   focused: boolean;
+  submitting: boolean;
 }
 
 const isShiftTab = (keyData: string): boolean =>
@@ -40,6 +41,7 @@ export class ManualAdvisorDialog implements Component, Focusable {
   private readonly state: ManualDialogState = {
     completed: false,
     focused: false,
+    submitting: false,
   };
 
   get focused(): boolean {
@@ -273,17 +275,22 @@ export class ManualAdvisorDialog implements Component, Focusable {
   }
 
   private submit(message = this.editor.getText()): void {
-    if (this.state.completed) {
+    if (this.state.completed || this.state.submitting) {
       return;
     }
-    this.state.completed = true;
+    this.state.submitting = true;
     const request: ManualAdvisorRequest = {
       gitContext: this.gitLevels[this.gitIndex] ?? "off",
     };
     if (message) {
       request.message = message;
     }
-    this.options.onSubmit(request);
+    try {
+      this.options.onSubmit(request);
+      this.state.completed = true;
+    } finally {
+      this.state.submitting = false;
+    }
   }
 
   private cancel(): void {

package/src/usage.ts

@@ -1,7 +1,7 @@
 import type { Usage } from "@earendil-works/pi-ai/compat";
 
 import { isNumber, isRecordOf } from "./content-utils.ts";
-import type { JsonValue } from "./content-utils.ts";
+import type { JsonValue, RecordValue } from "./content-utils.ts";
 
 /** Normalized usage returned by an Advisor or Scout provider response. */
 export interface AdvisorUsageSnapshot {
@@ -33,6 +33,18 @@ const add = (left: number | undefined, right: number | undefined) =>
 
 const costFields = ["input", "output", "cacheRead", "cacheWrite", "total"];
 
+const hasPartialProviderCost = (
+  snapshot: AdvisorUsageSnapshot,
+  usage: RecordValue
+) => {
+  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
+  return (
+    cost !== undefined &&
+    snapshot.cost === undefined &&
+    costFields.some((field) => finite(cost[field]) !== undefined)
+  );
+};
+
 /** Extracts provider-agnostic usage fields without trusting provider metadata. */
 export const snapshotAdvisorUsage = <Input>(
   usage: Input
@@ -62,23 +74,39 @@ export const snapshotAdvisorUsage = <Input>(
 export const advisorUsageCost = <Input>(usage: Input): number | undefined =>
   snapshotAdvisorUsage(usage)?.cost;
 
+const completeUsageSnapshot = <Input>(
+  usage: Input
+): { snapshot: AdvisorUsageSnapshot; usage: RecordValue } | undefined => {
+  const snapshot = snapshotAdvisorUsage(usage);
+  if (!(snapshot && isRecordOf(usage))) {
+    return;
+  }
+  if (hasPartialProviderCost(snapshot, usage)) {
+    return;
+  }
+  return { snapshot, usage };
+};
+
 /**
  * Converts supported provider usage to Pi's complete nested-tool usage shape.
  * Missing fields become zero only at this Pi API boundary; absent usage remains
  * undefined so an unavailable request is never presented as a zero-cost call.
  */
 export const advisorUsageForPi = <Input>(usage: Input): Usage | undefined => {
-  const snapshot = snapshotAdvisorUsage(usage);
-  if (!(snapshot && isRecordOf(usage))) {
+  const complete = completeUsageSnapshot(usage);
+  if (!complete) {
     return undefined;
   }
-  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
+  const { snapshot } = complete;
+  const cost = isRecordOf(complete.usage.cost)
+    ? complete.usage.cost
+    : undefined;
   const input = snapshot.input ?? 0;
   const output = snapshot.output ?? 0;
   const cacheRead = snapshot.cacheRead ?? 0;
   const cacheWrite = snapshot.cacheWrite ?? 0;
-  const cacheWrite1h = finite(usage.cacheWrite1h);
-  const reasoning = finite(usage.reasoning);
+  const cacheWrite1h = finite(complete.usage.cacheWrite1h);
+  const reasoning = finite(complete.usage.reasoning);
   const piUsage: Usage = {
     cacheRead,
     cacheWrite,