pi-subagents-lite 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-subagents-lite",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Lightweight sub-agents for pi — spawn specialized agents with isolated sessions, tools, and models.",
   "keywords": [
     "pi-package",

package/src/agents/agent-manager.ts

@@ -8,17 +8,19 @@ import { randomUUID } from "node:crypto";
 import type { AgentSession, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { runAgent } from "./agent-runner.js";
 import { AgentOutputLog } from "./output-file.js";
+import { getStore } from "../shell.js";
 import {
   type AgentRecord,
   type AgentStatus,
   type CompactionInfo,
   type RunCallbacks,
+  type StopInitiator,
   SHORT_ID_LENGTH,
   type SpawnConfig,
   type ToolActivity,
 } from "../types.js";
 import type { SubagentType } from "./types.js";
-import { addUsage, getLifetimeTotal, getSessionContextPercent, type LifetimeUsage } from "./usage.js";
+import { addUsage, getLifetimeTotal, getSessionContextPercent, type AgentUsage } from "./usage.js";
 import { errorMessage } from "../utils.js";
 
 /** How often to check for expired agent records (milliseconds). */
@@ -266,7 +268,7 @@ export class AgentManager {
 
     // Wire parent abort signal to stop the subagent when the parent is interrupted
     if (options.signal) {
-      options.signal.addEventListener("abort", () => this.abort(id), { once: true });
+      options.signal.addEventListener("abort", () => this.abort(id, "agent"), { once: true });
     }
 
     const promise = runAgent(ctx, type, prompt, {
@@ -373,7 +375,7 @@ export class AgentManager {
     options?: Pick<SpawnOptions, "onToolActivity" | "onAssistantUsage" | "onCompaction">,
   ): {
     onToolActivity: (activity: ToolActivity) => void;
-    onAssistantUsage: (usage: LifetimeUsage) => void;
+    onAssistantUsage: (usage: AgentUsage) => void;
     onCompaction: (info: CompactionInfo) => void;
   } {
     return {
@@ -382,7 +384,17 @@ export class AgentManager {
         options?.onToolActivity?.(activity);
       },
       onAssistantUsage: (usage) => {
-        addUsage(record.stats.lifetimeUsage, usage);
+        // vLLM doesn't report cache hits, so usage.input is full prompt_tokens.
+        // Estimate new tokens as delta from previous message's input.
+        const deltaEnabled = getStore().agent.deltaInputTokens;
+        const cacheRead = usage.cacheRead;
+        let inputDelta = usage.input;
+        if (deltaEnabled && cacheRead === 0 && record.stats.prevInputTokens != null && usage.input > record.stats.prevInputTokens) {
+          inputDelta = usage.input - record.stats.prevInputTokens;
+        }
+        record.stats.prevInputTokens = usage.input;
+
+        addUsage(record.stats.lifetimeUsage, { ...usage, input: inputDelta });
         options?.onAssistantUsage?.(usage);
       },
       onCompaction: (info) => {
@@ -454,18 +466,18 @@ export class AgentManager {
     );
   }
 
-  abort(id: string): boolean {
+  abort(id: string, stoppedBy?: StopInitiator): boolean {
     const record = this.agents.get(id);
     if (!record) return false;
 
-    return this.stopAgent(record);
+    return this.stopAgent(record, stoppedBy);
   }
 
   /**
    * Stop an agent by aborting its session or removing it from the queue.
    * Returns true if the agent was stopped, false if it wasn't running/queued.
    */
-  private stopAgent(record: AgentRecord): boolean {
+  private stopAgent(record: AgentRecord, stoppedBy?: StopInitiator): boolean {
     if (record.lifecycle.status === "queued") {
       this.queue = this.queue.filter(q => q.id !== record.id);
     } else if (record.lifecycle.status !== "running") {
@@ -474,6 +486,7 @@ export class AgentManager {
       record.execution.abortController?.abort();
     }
     record.lifecycle.status = "stopped";
+    record.lifecycle.stoppedBy = stoppedBy;
     record.lifecycle.completedAt = Date.now();
     return true;
   }

package/src/agents/agent-runner.ts

@@ -20,7 +20,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { getAgentConfig, getConfig, getToolNamesForType, resolveVisibleTools } from "./agent-types.js";
 import { extractText } from "../prompt/context.js";
-import type { LifetimeUsage } from "./usage.js";
+import type { AgentUsage } from "./usage.js";
 import { findModelInRegistry, GIT_EXEC_TIMEOUT_MS } from "../utils.js";
 import { DEFAULT_AGENTS } from "./default-agents.js";
 import { buildAgentPrompt, type PromptExtras } from "../prompt/prompts.js";
@@ -106,13 +106,14 @@ function forwardAbortSignal(session: AgentSession, signal?: AbortSignal): () =>
  * assistant messages at runtime, but this shape isn't reflected in the
  * AgentSessionEvent public types.
  */
-function usageFromAssistantMessage(msg: Record<string, unknown>): LifetimeUsage | undefined {
+function usageFromAssistantMessage(msg: Record<string, unknown>): AgentUsage | undefined {
   const usage = msg.usage as Record<string, unknown> | undefined;
   if (!usage) return undefined;
   return {
     input: (usage.input as number) ?? 0,
     output: (usage.output as number) ?? 0,
     cacheWrite: (usage.cacheWrite as number) ?? 0,
+    cacheRead: (usage.cacheRead as number) ?? 0,
     cost: ((usage.cost as Record<string, unknown>)?.total as number) ?? 0,
   };
 }

package/src/agents/tool-execution.ts

@@ -88,6 +88,17 @@ export function buildAgentDetails(
   return details;
 }
 
+/**
+ * Result text plus status note, for display.
+ *
+ * Shared by the foreground tool result and the subagent-result nudge so both
+ * callers stay in sync on the nullish default and separator handling — they
+ * have diverged before. getStatusNote owns the leading separator.
+ */
+export function formatResultContent(record: AgentRecord): string {
+  return (record.result ?? "") + getStatusNote(record.lifecycle);
+}
+
 // ============================================================================
 // Tool execute handlers
 // ============================================================================
@@ -186,8 +197,7 @@ export async function executeAgentTool(
     return errorResult(`Agent failed: ${record.error || "unknown error"}`, details);
   }
 
-  const statusNote = getStatusNote(record.lifecycle.status);
-  return successResult((record.result ?? "") + statusNote, details);
+  return successResult(formatResultContent(record), details);
 }
 
 // ============================================================================
@@ -244,7 +254,7 @@ export async function executeStopAgentTool(
   }
 
   // Attempt to stop the running/queued agent
-  if (getManager()!.abort(agentId)) {
+  if (getManager()!.abort(agentId, "agent")) {
     return successResult(`Stopped agent ${agentId.slice(0, SHORT_ID_LENGTH)}`);
   }
 

package/src/agents/usage.ts

@@ -9,6 +9,13 @@
  */
 export type LifetimeUsage = { input: number; output: number; cacheWrite: number; cost: number };
 
+/**
+ * A single per-turn usage event as emitted upstream. Adds `cacheRead`, which
+ * LifetimeUsage omits from totals (see issue #38). Used to estimate input
+ * deltas for providers like vLLM that don't report cache hits.
+ */
+export type AgentUsage = LifetimeUsage & { cacheRead: number };
+
 /** Sum of lifetime usage components (including cost), or 0 if undefined. */
 export function getLifetimeTotal(u?: LifetimeUsage): number {
   return u ? u.input + u.output + u.cacheWrite + u.cost : 0;

package/src/config/config-io.ts

@@ -42,6 +42,7 @@ const DEFAULT_AGENT: SubagentsConfig["agent"] = {
   showContext: true,
   showCost: false,
   showTime: true,
+  deltaInputTokens: false,
 };
 
 /**

package/src/config/config-store.ts

@@ -74,6 +74,8 @@ export interface ResolvedAgentSettings {
   readonly showContext: boolean;
   /** Whether to show elapsed time in widget stats line. */
   readonly showTime: boolean;
+  /** Whether to estimate input token delta for vLLM (no cache reporting). */
+  readonly deltaInputTokens: boolean;
   /** Buffer size for streaming thinking blocks to output file. 0 = disabled. */
   readonly outputThinkingBufferSize: number;
 }
@@ -133,6 +135,7 @@ export class ConfigStore {
       showOutput: a.showOutput !== false,
       showContext: a.showContext !== false,
       showTime: a.showTime !== false,
+      deltaInputTokens: a.deltaInputTokens !== false,
       outputThinkingBufferSize: a.outputThinkingBufferSize ?? 0,
     };
   }
@@ -265,6 +268,10 @@ export class ConfigStore {
       setShowOutput: (enabled: boolean) => this.setAgentVisibility("showOutput", enabled),
       setShowContext: (enabled: boolean) => this.setAgentVisibility("showContext", enabled),
       setShowTime: (enabled: boolean) => this.setAgentVisibility("showTime", enabled),
+      setDeltaInputTokens: (enabled: boolean): void => {
+        this.config.agent.deltaInputTokens = enabled;
+        this.persist();
+      },
       setOutputThinkingBufferSize: (size: number): void => {
         this.config.agent.outputThinkingBufferSize = size;
         this.persist();

package/src/config/types.ts

@@ -10,6 +10,7 @@ export const CONFIG_AGENT_NON_MODEL_KEYS = [
   "showOutput",
   "showContext",
   "showTime",
+  "deltaInputTokens",
   "widgetMaxLines",
   "widgetMaxLinesCompact",
   "widgetDescLengthFull",

package/src/spawn/spawn-coordinator.ts

@@ -1,5 +1,11 @@
-import { getStatusNote } from "../status-note.js";
 import { getPiInstance, getSessionCtx, getWidget } from "../shell.js";
+import { SHORT_ID_LENGTH } from "../types.js";
+
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { AgentRecord, SpawnConfig, ToolActivity } from "../types.js";
+import type { AgentManager, SpawnOptions } from "../agents/agent-manager.js";
+import { buildAgentDetails, formatResultContent } from "../agents/tool-execution.js";
+
 /**
  * spawn-coordinator.ts — Spawn-and-track coordination for subagents.
  *
@@ -11,11 +17,6 @@ import { getPiInstance, getSessionCtx, getWidget } from "../shell.js";
  * D6 (Nudge owned here), D2 (peers with AgentManager).
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { AgentRecord, SpawnConfig, ToolActivity } from "../types.js";
-import type { AgentManager, SpawnOptions } from "../agents/agent-manager.js";
-import { buildAgentDetails } from "../agents/tool-execution.js";
-
 // ============================================================================
 // Types
 // ============================================================================
@@ -234,7 +235,7 @@ export class SpawnCoordinator {
       pi.sendMessage(
         {
           customType: "subagent-result",
-          content: `[Subagent "${record.display.type}" ${record.lifecycle.status}]\n\n${record.result ?? ""} ${getStatusNote(record.lifecycle.status)}`,
+          content: `[Subagent "${record.display.type}" ${record.id.slice(0, SHORT_ID_LENGTH)} ${record.lifecycle.status}]\n\n${formatResultContent(record)}`,
           details,
           display: true,
         },

package/src/status-note.ts

@@ -1,10 +1,20 @@
-const NOTES: Record<string, string> = {
-  stopped: "STOPPED BY THE USER before completion — output is partial; the task was NOT finished",
+import type { AgentLifecycle, AgentStatus, StopInitiator } from "./types.js";
+
+const STATUS_NOTES: Partial<Record<AgentStatus, string>> = {
   aborted: "hit the turn limit before completion; output may be incomplete",
   turn_limited: "wrapped up at the turn limit — output may be partial",
 };
 
-export function getStatusNote(status: string): string {
-  const note = NOTES[status];
+const STOP_NOTES: Record<StopInitiator, string> = {
+  user: "STOPPED BY THE USER before completion — output is partial; the task was NOT finished",
+  agent: "stopped before completion — output is partial; the task was NOT finished",
+};
+
+export function getStatusNote(lifecycle: AgentLifecycle): string {
+  const note =
+    lifecycle.status === "stopped"
+      // A stopped agent with no recorded initiator reads as an agent stop.
+      ? STOP_NOTES[lifecycle.stoppedBy ?? "agent"]
+      : STATUS_NOTES[lifecycle.status];
   return note ? ` (${note})` : "";
 }

package/src/types.ts

@@ -5,7 +5,7 @@
 import type { Model } from "@earendil-works/pi-ai";
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import type { AgentOutputLog } from "./agents/output-file.js";
-import type { LifetimeUsage } from "./agents/usage.js";
+import type { LifetimeUsage, AgentUsage } from "./agents/usage.js";
 import type { SubagentType, AgentInvocation } from "./agents/types.js";
 
 /** Thinking level for agent models. */
@@ -59,7 +59,7 @@ export interface RunCallbacks {
   onTextDelta?: (delta: string, fullText: string) => void;
   onSessionCreated?: (session: AgentSession) => void;
   onTurnEnd?: (turnCount: number) => void;
-  onAssistantUsage?: (usage: LifetimeUsage) => void;
+  onAssistantUsage?: (usage: AgentUsage) => void;
   onCompaction?: (info: CompactionInfo) => void;
 }
 
@@ -95,6 +95,9 @@ export interface CompactionInfo {
 /** Possible agent lifecycle statuses. */
 export type AgentStatus = "queued" | "running" | "completed" | "turn_limited" | "aborted" | "stopped" | "error";
 
+/** Who initiated an agent stop: "user" via UI menu, or "agent" via StopAgent tool. */
+export type StopInitiator = "user" | "agent";
+
 /**
  * Lifecycle state: when the agent started, completed, and its current status.
  * Used by agent-manager (lifecycle control), menus (status display), widget (linger logic).
@@ -103,6 +106,7 @@ export interface AgentLifecycle {
   status: AgentStatus;
   startedAt: number;
   completedAt?: number;
+  stoppedBy?: StopInitiator;
 }
 
 /**
@@ -156,6 +160,8 @@ export interface AgentAccumulatedStats {
   maxTurns?: number;
   /** Number of times this agent's session has compacted. Initialized to 0 at spawn. */
   compactionCount: number;
+  /** Previous input token count for delta estimation (vLLM doesn't report cache hits). */
+  prevInputTokens?: number;
   /** Last-known context usage percentage (0–100), captured at completion. */
   contextPercent?: number | null;
 }

package/src/ui/menu/menu-running-agents.ts

@@ -134,7 +134,7 @@ export function buildAgentActionsList(
       input.onEscape = () => setActive(list);
       setActive(input);
     } else if (item.value === "stop") {
-      getManager()?.abort(record.id);
+      getManager()?.abort(record.id, "user");
       ctx.ui.notify(`Stopped ${shortId}`, "info");
       onClose();
     }
@@ -186,7 +186,7 @@ export async function showRunningAgentsMenu(
     agentList.onSelect = async (item) => {
       if (item.value === "__stop-all") {
         for (const r of running) {
-          getManager()?.abort(r.id);
+          getManager()?.abort(r.id, "user");
         }
         ctx.ui.notify(`Stopped ${running.length} agent(s)`, "info");
         done(undefined);

package/src/ui/menu/menu-widget-settings.ts

@@ -26,6 +26,7 @@ function buildStatConfig(store: ReturnType<typeof getStore>) {
     ["showTools", { label: "Show tools", get: () => store.agent.showTools, set: (v) => store.mutate.agent.setShowTools(v) }],
     ["showTurns", { label: "Show turns", get: () => store.agent.showTurns, set: (v) => store.mutate.agent.setShowTurns(v) }],
     ["showInput", { label: "Show input tokens", get: () => store.agent.showInput, set: (v) => store.mutate.agent.setShowInput(v) }],
+    ["deltaInputTokens", { label: "Delta input tokens", get: () => store.agent.deltaInputTokens, set: (v) => store.mutate.agent.setDeltaInputTokens(v) }],
     ["showOutput", { label: "Show output tokens", get: () => store.agent.showOutput, set: (v) => store.mutate.agent.setShowOutput(v) }],
     ["showContext", { label: "Show context %", get: () => store.agent.showContext, set: (v) => store.mutate.agent.setShowContext(v) }],
     ["showCost", { label: "Show cost", get: () => store.agent.showCost, set: (v) => store.mutate.agent.setShowCost(v) }],
@@ -66,6 +67,7 @@ export async function showWidgetSettingsMenu(ctx: ExtensionCommandContext): Prom
       showTools: "Show tool count (🛠 ) in the widget.",
       showTurns: "Show turn count (⟳ ) in the widget.",
       showInput: "Show input tokens (↑) in the widget.",
+      deltaInputTokens: "Estimate input token delta for vLLM (no cache reporting).",
       showOutput: "Show output tokens (↓) in the widget.",
       showContext: "Show context-fill percent (%) in the widget.",
       showCost: "Show dollar cost ($) in the widget.",