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

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`;
@@ -45,6 +60,9 @@ const formatByteSize = (bytes: number): string => {
 
 const attachmentLabels = (details: AdvisorToolDetails | undefined) =>
   [
+    details?.agentRulesBytes
+      ? `AGENTS.md rules attached · ${formatByteSize(details.agentRulesBytes)}`
+      : undefined,
     details?.draftBytes
       ? `Draft attached · ${formatByteSize(details.draftBytes)}`
       : undefined,
@@ -100,15 +118,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 +187,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/tools/types.ts

@@ -46,6 +46,7 @@ export interface AdvisorGateFailure {
 
 export interface AdvisorConsultationResult {
   adviceId: string;
+  agentRulesBytes?: number;
   draftBytes?: number;
   imageBytes?: number;
   imageCount?: number;
@@ -63,6 +64,7 @@ export interface AdvisorConsultationResult {
 }
 
 export interface AdvisorGateResult {
+  agentRulesBytes?: number;
   decision: GateDecision;
   markdown: string;
   model: string;
@@ -86,6 +88,7 @@ export type GateFailureCategory =
 export interface AdvisorToolDetails {
   adviceId?: string;
   advisor?: string;
+  agentRulesBytes?: number;
   draftBytes?: number;
   imageBytes?: number;
   imageCount?: number;

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/ui/settings-items.ts

@@ -472,6 +472,13 @@ export const createSettingsItems = ({
       settings.redactSecrets,
       false
     ),
+    toggle(
+      "agentsMdContext",
+      "AGENTS.md context",
+      "Include trusted project and global AGENTS.md rules in Advisor calls.",
+      settings.agentsMdContext,
+      true
+    ),
     {
       currentValue: settings.gitContext ?? "summary",
       description: "How much repository context is shared with the Advisor.",

package/src/ui/settings-mutations.ts

@@ -2,6 +2,7 @@ import { DEFAULT_JEV_MODEL } from "../config/types.ts";
 import type { AdvisorSettings, ContextPreset } from "./types.ts";
 
 const BOOLEAN_SETTING_FIELDS = [
+  "agentsMdContext",
   "autoLoopGate",
   "blockOnBlocked",
   "collapseResponses",

package/src/ui/types.ts

@@ -67,6 +67,7 @@ export interface ContextPreset {
 }
 
 export interface AdvisorSettings {
+  agentsMdContext?: boolean;
   alwaysOn?: boolean;
   autoLoopGate?: boolean;
   blockOnBlocked?: boolean;

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,