@pi-unipi/unipi 3.0.0-alpha.43 → 3.0.0-alpha.45

package/CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [3.0.0-alpha.45] — 2026-10-24
+
+Includes the never-published 3.0.0-alpha.44 changes below.
+
+### Changed
+- Graph and swarm progress bars count what's settled. The number is done + failed over the total (1 done, 1 failed, 1 running, 1 not started reads `2/4`). The bar shows done in green, failed in red and running in the accent colour, with a highlight sweeping across the running part while the run is live. Items not started yet stay grey. The same change applies to `/unipi:visualize-progress`, the app's Progress sheet and mode popover, the chart title and the end-of-run log line.
+
+### Fixed
+- Session cost now includes what child agents spend. Graph and swarm work, subagents, the Fusion sidekick and `bg_run` agent tasks each run as a separate pi process, and the footer, the app's session cost and `/unipi:info` usage used to count only the lead's own messages. So any multi-agent run was under-priced. Each child model reply is now written into the lead session as a `unipi-child-usage` entry. The entry is saved with the session, follows the branch you're on and is never sent to the model. The footer and app add these entries to the cost, and info-screen stats count the subagent and sidekick ones too. `bg_run` agents are already counted from their own session files, so they aren't counted twice. Token counts are still the lead's own. Not covered yet: grandchildren (subagents started by subagents) and runs from before this fix.
+
+## [3.0.0-alpha.44] — 2026-10-19
+
+### Fixed
+- Windows: the app can reach pi chats on a Windows PC. On Windows the bridge now listens on a named pipe (`\\.\pipe\unipi-bridge-<pid>`) instead of a Unix socket file, which Node can't create there (EACCES); Linux and macOS are unchanged. Needs UniPi host 0.5.2 on the Windows PC.
+- Deleting a queued message from the app no longer stops the run. Editing, removing or steer-promoting one of pi's own queued messages used to abort the whole run and re-send what was left (UNI-305) — which meant deleting the queue's only entry killed the chat outright. The bridge now reaches pi's `AgentSession.clearQueue()` (captured with a one-time prototype patch, used only when it provably belongs to the session being edited) to drain and re-queue around the change while pi keeps streaming; the abort-and-resend path remains only as a fallback for older pi builds, and "Send now" still stops the run on purpose. (UNI-320)
+
 ## [3.0.0-alpha.43] — 2026-10-16
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "All-in-one extension suite for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -82,28 +82,28 @@
     "typebox": "^1.1.38"
   },
   "dependencies": {
-    "@pi-unipi/app-bridge": "3.0.0-alpha.43",
-    "@pi-unipi/ask-user": "3.0.0-alpha.43",
-    "@pi-unipi/background-tasks": "3.0.0-alpha.43",
-    "@pi-unipi/btw": "3.0.0-alpha.43",
-    "@pi-unipi/command-enchantment": "3.0.0-alpha.43",
-    "@pi-unipi/compactor": "3.0.0-alpha.43",
-    "@pi-unipi/core": "3.0.0-alpha.43",
-    "@pi-unipi/dream": "3.0.0-alpha.43",
-    "@pi-unipi/footer": "3.0.0-alpha.43",
-    "@pi-unipi/fusion": "3.0.0-alpha.43",
-    "@pi-unipi/info-screen": "3.0.0-alpha.43",
-    "@pi-unipi/input-shortcuts": "3.0.0-alpha.43",
-    "@pi-unipi/kanboard": "3.0.0-alpha.43",
-    "@pi-unipi/mcp": "3.0.0-alpha.43",
-    "@pi-unipi/memory": "3.0.0-alpha.43",
-    "@pi-unipi/notify": "3.0.0-alpha.43",
-    "@pi-unipi/skill-registry": "3.0.0-alpha.43",
-    "@pi-unipi/subagents": "3.0.0-alpha.43",
-    "@pi-unipi/updater": "3.0.0-alpha.43",
-    "@pi-unipi/utility": "3.0.0-alpha.43",
-    "@pi-unipi/web-api": "3.0.0-alpha.43",
-    "@pi-unipi/workflow": "3.0.0-alpha.43",
+    "@pi-unipi/app-bridge": "3.0.0-alpha.45",
+    "@pi-unipi/ask-user": "3.0.0-alpha.45",
+    "@pi-unipi/background-tasks": "3.0.0-alpha.45",
+    "@pi-unipi/btw": "3.0.0-alpha.45",
+    "@pi-unipi/command-enchantment": "3.0.0-alpha.45",
+    "@pi-unipi/compactor": "3.0.0-alpha.45",
+    "@pi-unipi/core": "3.0.0-alpha.45",
+    "@pi-unipi/dream": "3.0.0-alpha.45",
+    "@pi-unipi/footer": "3.0.0-alpha.45",
+    "@pi-unipi/fusion": "3.0.0-alpha.45",
+    "@pi-unipi/info-screen": "3.0.0-alpha.45",
+    "@pi-unipi/input-shortcuts": "3.0.0-alpha.45",
+    "@pi-unipi/kanboard": "3.0.0-alpha.45",
+    "@pi-unipi/mcp": "3.0.0-alpha.45",
+    "@pi-unipi/memory": "3.0.0-alpha.45",
+    "@pi-unipi/notify": "3.0.0-alpha.45",
+    "@pi-unipi/skill-registry": "3.0.0-alpha.45",
+    "@pi-unipi/subagents": "3.0.0-alpha.45",
+    "@pi-unipi/updater": "3.0.0-alpha.45",
+    "@pi-unipi/utility": "3.0.0-alpha.45",
+    "@pi-unipi/web-api": "3.0.0-alpha.45",
+    "@pi-unipi/workflow": "3.0.0-alpha.45",
     "@resvg/resvg-wasm": "^2.6.2",
     "beautiful-mermaid": "^1.1.3"
   },

package/packages/app-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/app-bridge",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Live bridge between a pi TUI session and the UniPi phone app — streaming chat, prompts, steering and dialogs from the phone",
   "type": "module",
   "main": "index.ts",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.43"
+    "@pi-unipi/core": "3.0.0-alpha.45"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/app-bridge/src/bridge.ts

@@ -8,11 +8,12 @@
  * - Every hook body is try/catch: the bridge must never break a turn.
  */
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { SessionManager } from "@earendil-works/pi-coding-agent";
+import { AgentSession, SessionManager } from "@earendil-works/pi-coding-agent";
+import { createRequire } from "node:module";
 import { createServer, type Server, type Socket } from "node:net";
 import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join, relative, resolve as resolvePath } from "node:path";
+import { dirname, join, relative, resolve as resolvePath } from "node:path";
 import { DialogHub, wrapUi } from "./dialogs.js";
 import { ENTRIES_BUDGET, HELLO_ENTRIES_BUDGET, LINE_BUDGET, fitLine, historyPage, jsonBytes, phoneSafe, snapshotEntries, clipText, editedAway, wantedEntry, treeGoRestore, type TreeGoRestore } from "./snapshot.js";
 import { searchSession } from "./search.js";
@@ -45,7 +46,7 @@ import { fileSuggestions } from "./files.js";
 import { statPaths } from "./paths.js";
 import { registerPath, resolveMedia } from "./media.js";
 import { listWorkItems, stopWorkItem, backgroundWorkItem, workLogPage, workTranscript } from "./work.js";
-import { bus, callCommandRunner, commandArgCompleters, pendingWorkLabel, silenceCommandEcho, subscribePendingWork, UNIPI_EVENTS } from "@pi-unipi/core";
+import { bus, callCommandRunner, childUsageOf, commandArgCompleters, onChildUsage, pendingWorkLabel, silenceCommandEcho, subscribePendingWork, UNIPI_EVENTS } from "@pi-unipi/core";
 import type { BtwListPage } from "./wire.js";
 
 /** `media_chunk.data` (base64) stays well under the 900 KiB bridge line
@@ -151,7 +152,7 @@ interface TpsTrackerLike {
 const FOOTER_TPS_KEY = Symbol.for("unipi.footer.shared-tps");
 const getSharedTps = (): TpsTrackerLike | undefined => (globalThis as unknown as Record<symbol, unknown>)[FOOTER_TPS_KEY] as TpsTrackerLike | undefined;
 
-export const BRIDGE_VERSION = "1.0.0";
+export const BRIDGE_VERSION = "1.1.0";
 
 /** The hidden extension command the bridge uses to get a command-capable
  * context (newSession/fork/navigateTree/switchSession only exist there). */
@@ -197,6 +198,21 @@ export function bridgeDir(): string {
   return process.env.UNIPI_BRIDGE_DIR || join(homedir(), ".unipi", "bridge");
 }
 
+/** The path/pipe name the bridge listens on for a given pid. On win32 this
+ * is a named pipe (`\\\\.\\pipe\\unipi-bridge-<pid>`) so unipi-host (Windows)
+ * can connect; everywhere else it's a unix socket file inside `dir`.
+ * `platform` is injectable so this stays unit-testable on Linux. */
+export function bridgeSocketPath(dir: string, pid: number, platform: NodeJS.Platform = process.platform): string {
+  if (platform === "win32") return "\\\\.\\pipe\\unipi-bridge-" + pid;
+  return join(dir, `${pid}.sock`);
+}
+
+/** Whether `path` is a Windows named pipe (as produced by `bridgeSocketPath`
+ * on win32), rather than a unix socket file path. */
+export function isBridgePipe(path: string): boolean {
+  return path.startsWith("\\\\.\\pipe\\");
+}
+
 function alive(pid: number): boolean {
   try {
     process.kill(pid, 0);
@@ -250,7 +266,107 @@ export interface BridgeDeps {
 }
 const defaultDeps: BridgeDeps = { listSessions: SessionManager.list, listAllSessions: SessionManager.listAll as typeof SessionManager.listAll };
 
+/** UNI-320: pi's AgentSession.clearQueue() drains its own steer/followUp queue
+ * WITHOUT touching the running turn — the one primitive the extension API
+ * never exposed (the `input`/`sendUserMessage` surface can only ADD queue
+ * items, which is why editing/removing a `tui-*` row used to abort the run).
+ * The session instance isn't handed to extensions either, so it is captured
+ * by a one-time prototype patch (same approach as core's UNI-304 patch):
+ * methods pi itself always dispatches through `AgentSession.prototype` —
+ * `bindExtensions` on every session bind, `sendUserMessage`/`steer`/
+ * `followUp`/`abort` on activity — record the instance they are called on.
+ * A capture is only USED when it provably belongs to the context's session
+ * (same `sessionManager` object): a stale reference after a session switch
+ * would drain the wrong queue. Anything else — an older pi without
+ * clearQueue, a fake in tests — answers undefined and the bridge falls back
+ * to UNI-305's abort-and-resend. */
+type ClearQueueSession = {
+  clearQueue: () => { steering: string[]; followUp: string[] };
+  sessionManager?: unknown;
+};
+let capturedSession: ClearQueueSession | undefined;
+let sessionCapturePatched = false;
+/** Wrap the prototype methods pi itself always dispatches through
+ * `AgentSession.prototype` — `bindExtensions` on every session bind,
+ * `sendUserMessage`/`steer`/`followUp`/`abort` on activity — so the instance
+ * records itself. Capture-only: behavior is unchanged, and the __unipiCapture
+ * flag keeps repeated patching idempotent. Must run EAGERLY (at bridge
+ * creation), before the first prompt: a lazily-installed patch misses every
+ * dispatch that already happened, and the first queue edit would find nothing
+ * captured and fall back to abort-and-resend. */
+const patchAgentSessionPrototype = (Ctor: new () => unknown): void => {
+  const proto = Ctor.prototype as unknown as Record<string, ((...args: never[]) => unknown) | undefined>;
+  for (const name of ["bindExtensions", "sendUserMessage", "steer", "followUp", "abort"]) {
+    const current = proto[name];
+    if (typeof current !== "function" || (current as { __unipiCapture?: boolean }).__unipiCapture) continue;
+    const wrapped = function (this: unknown, ...args: never[]) {
+      capturedSession = this as ClearQueueSession;
+      return current!.apply(this, args);
+    } as ((...args: never[]) => unknown) & { __unipiCapture?: boolean };
+    wrapped.__unipiCapture = true;
+    proto[name] = wrapped;
+  }
+};
+/** The installed pi copies whose AgentSession could be the live one. There
+ * are SEVERAL in one process and which of them is real depends on how pi was
+ * started: pi's npm dist ships two separate module graphs (dist/bundle/* —
+ * what the CLI runs — and dist/index.js — the public barrel), and the
+ * extension's own static import is yet another copy: pi loads extensions
+ * through jiti, which evaluates the aliased pi module separately, so classes
+ * from the static import are never the classes the runtime uses. All
+ * candidates get the capture-only patch; the copies the runtime never
+ * instantiates simply never fire, and liveAgentSession() still validates the
+ * capture against this context's sessionManager before any use. */
+const patchAllRuntimeCopies = (): void => {
+  patchAgentSessionPrototype(AgentSession as new () => unknown);
+  const pkgRoot = join(dirname(dirname(process.execPath)), "lib", "node_modules", "@earendil-works", "pi-coding-agent");
+  const candidates = [
+    join(pkgRoot, "dist", "bundle", "index.js"),
+    join(pkgRoot, "dist", "index.js"),
+    process.argv[1]
+      ? resolvePath(dirname(process.argv[1]), "..", "lib", "node_modules", "@earendil-works", "pi-coding-agent", "dist", "bundle", "index.js")
+      : "",
+  ];
+  for (const index of candidates) {
+    if (!index) continue;
+    try {
+      const mod = createRequire(index)(index) as { AgentSession?: new () => unknown };
+      const Ctor = mod?.AgentSession;
+      if (Ctor && typeof (Ctor.prototype as { clearQueue?: unknown }).clearQueue === "function") patchAgentSessionPrototype(Ctor);
+    } catch {
+      // candidate not present in this install — the others cover it
+    }
+  }
+};
+/** Test hook: plant a stand-in session (the fake pi in tests has no real
+ * AgentSession to capture). Pass undefined to reset. */
+export function setCapturedAgentSessionForTests(session: unknown): void {
+  capturedSession = (session ?? undefined) as ClearQueueSession | undefined;
+  sessionCapturePatched = true;
+}
+/** The live AgentSession behind `c`, captured through the prototype patch —
+ * but only trusted when it provably belongs to THIS session (same
+ * sessionManager object as the extension context): a stale reference after a
+ * session switch would drain the wrong queue. Anything else — an older pi,
+ * a fake in tests — answers undefined and the bridge falls back to
+ * UNI-305's abort-and-resend. */
+const liveAgentSession = (c: ExtensionContext): ClearQueueSession | undefined => {
+  if (!sessionCapturePatched) {
+    patchAllRuntimeCopies();
+    sessionCapturePatched = true;
+  }
+  const session = capturedSession;
+  if (!session || typeof session.clearQueue !== "function") return undefined;
+  if (session.sessionManager !== (c as unknown as { sessionManager?: unknown }).sessionManager) return undefined;
+  return session;
+};
+
 export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
+  // UNI-320: install the AgentSession capture now, before any prompt can be
+  // sent — a lazily-installed patch misses every dispatch that already
+  // happened, and the first queue edit would fall back to abort-and-resend.
+  // (Session-bound validation happens later, in liveAgentSession().)
+  patchAllRuntimeCopies();
   let ctx: ExtensionContext | undefined;
   let server: Server | undefined;
   let socketPath: string | undefined;
@@ -259,10 +375,13 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
   /** pi's own queue (steer/follow-up from ANY source — TUI keybindings, the
    * harness, an extension's `pi.sendUserMessage({deliverAs})`), mirrored from
    * the `input` event's `streamingBehavior`. UNI-202: editable/removable/
-   * promotable from the phone too, even though the bridge can't reach pi's
-   * live queue array directly — an edit/remove/promote on one of these
-   * aborts the run (same effect as the TUI's Stop) and re-sends what's left
-   * via `pi.sendUserMessage`, same as the TUI's own dequeue-and-resend. */
+   * promotable from the phone too. UNI-305 did that by aborting the run and
+   * re-sending what's left; UNI-320 found a real primitive
+   * (`AgentSession.clearQueue()`, captured via a prototype patch — see
+   * `liveAgentSession`) that drains pi's queue WITHOUT touching the run, so
+   * an edit/remove/promote now keeps pi streaming and only falls back to
+   * abort-and-resend on older pi builds ("send now" always aborts: that's
+   * the point of the button). */
   const tuiQueue: Array<{ id: string; text: string; mode: "steer" | "followUp"; images?: Array<{ mime: string; data: string } | { mime: string; path: string }> }> = [];
   /** The bridge's own queue ("after it ends"): phone-only, editable/removable/reorderable/promotable,
    * delivered one at a time on `agent_end`. Survives phone reconnects (sent in `hello`), not a pi restart. */
@@ -287,6 +406,10 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
   let deltaTimer: NodeJS.Timeout | undefined;
   const toolTimers = new Map<string, NodeJS.Timeout>();
   let sessionCost = 0;
+  // Child agents (graph/swarm work, subagents, Fusion sidekick, bg_run
+  // agents) record their spend into this session as custom entries; count it
+  // live too so the phone's cost isn't lead-only.
+  let unsubChildUsage: (() => void) | undefined;
   /** "Needs you" (UNI-161): an open dialog, or idle right after an
    * `agent_end` no phone has seen yet. Written into the discovery record so
    * the host's `chat_list` (crates/host/src/chat.rs) can float it to the top
@@ -478,6 +601,7 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
     try {
       for (const e of ctx!.sessionManager.getEntries() as Array<{ type?: string; message?: { role?: string; usage?: { cost?: { total?: number } } } }>) {
         if (e.type === "message" && e.message?.role === "assistant") sessionCost += e.message.usage?.cost?.total ?? 0;
+        else sessionCost += childUsageOf(e)?.cost ?? 0;
       }
     } catch {
       // ignore
@@ -1135,23 +1259,100 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
     }
   };
 
-  const editPiQueued = async (sock: Socket, id: string, ref: string | undefined, apply: (item: (typeof tuiQueue)[number]) => "drop" | "promote" | void) => {
+  const editPiQueued = async (sock: Socket, id: string, ref: string | undefined, apply: (item: (typeof tuiQueue)[number]) => "drop" | "promote" | void, promoteNow = false) => {
     const c = ctx;
     const ack = () => write(sock, { t: "ack", ref });
     const fail = (message: string) => write(sock, { t: "error", message, ref });
     if (!c) return fail("pi is gone.");
     const i = tuiQueue.findIndex((q) => q.id === id);
     if (i < 0) return fail("That queued message is gone.");
-    // UNI-305: pi has no API to drop ONE item from its own live steer/followUp
-    // queue — the only way to edit it is to abort the whole run and re-send
-    // what's left (see the class comment above `tuiQueue`). That's fine
-    // between tool calls (there is nothing running to lose), but aborting
-    // WHILE a tool is executing kills it mid-flight — real, unsaved work —
-    // and if the removed item was the queue's only entry nothing is left to
-    // re-send: the run just dies instead of continuing. So this waits a
-    // short beat for the in-flight tool to reach its own end (the next safe
-    // boundary) before touching the queue; a tool still running past that
-    // is left alone and the edit is refused instead of destroying it.
+    const target = tuiQueue[i];
+    const contentOf = (q: (typeof tuiQueue)[number]) => (q.images?.length ? [{ type: "text" as const, text: q.text }, ...q.images.map(imageContent)] : q.text);
+    /** Re-send survivors once pi's real queue already matches: the first item
+     * starts a fresh run when idle (a deliverAs while idle would be rejected
+     * with "Specify streamingBehavior"), then the rest in pi's own order
+     * (steer drains before followUp). */
+    const resend = async (rest: Array<(typeof tuiQueue)[number]>) => {
+      send({ t: "queue", items: queueView() });
+      const order = [...rest].sort((a, b) => (a === rest[0] ? -1 : b === rest[0] ? 1 : a.mode === b.mode ? 0 : a.mode === "steer" ? -1 : 1));
+      for (const q of order) {
+        if (c.isIdle()) {
+          pi.sendUserMessage(contentOf(q), { expandPromptTemplates: true } as never);
+          const until = Date.now() + 5_000;
+          while (c.isIdle() && Date.now() < until) await sleep(20);
+        } else {
+          pi.sendUserMessage(contentOf(q), { deliverAs: q.mode, expandPromptTemplates: true } as never);
+        }
+      }
+    };
+    // UNI-320: preferred path — drain pi's own queue with clearQueue() (which
+    // leaves the running turn alone), drop/edit/promote the target in the
+    // drained truth, and re-queue the survivors. No abort, no idle-wait, no
+    // hold: a busy pi keeps streaming mid-sentence, and deleting the queue's
+    // ONLY entry no longer kills the run (the UNI-305 hole where nothing was
+    // left to re-send). "Send now" (promoteNow) still aborts on purpose —
+    // stopping the run is what that button says it does.
+    const session = promoteNow ? undefined : liveAgentSession(c);
+    if (session) {
+      tuiQueue.splice(i, 1);
+      // pi's queue holds plain expanded texts; match the target by its
+      // ORIGINAL text (apply() may edit it) so edit keeps working. Images
+      // live only in the mirror, so keep a lookup before emptying it.
+      const original = { text: target!.text, mode: target!.mode };
+      const mirrorImages = new Map(tuiQueue.filter((q) => q.images?.length).map((q) => [`${q.mode}\u0000${q.text}`, q.images]));
+      const imageOf = (text: string, mode: "steer" | "followUp") =>
+        (text === original.text && mode === original.mode ? target!.images : mirrorImages.get(`${mode}\u0000${text}`));
+      const action = apply(target!) ?? undefined;
+      const drained = session.clearQueue();
+      // The mirror must match pi's now-drained queue: empty it (the re-sent
+      // survivors echo back through `input` and re-mirror themselves).
+      tuiQueue.length = 0;
+      const steers = [...drained.steering];
+      const follows = [...drained.followUp];
+      const pool = original.mode === "steer" ? steers : follows;
+      const at = pool.indexOf(original.text);
+      if (at < 0) {
+        // pi delivered it between the phone's tap and now: put everything
+        // back untouched and refuse, like the "already handed to pi" case.
+        try {
+          await resend([
+            ...steers.map((text) => ({ id: "", text, mode: "steer" as const, images: imageOf(text, "steer") })),
+            ...follows.map((text) => ({ id: "", text, mode: "followUp" as const, images: imageOf(text, "followUp") })),
+          ]);
+        } catch {
+          // re-queue best-effort; the refusal still tells the user the truth
+        }
+        return fail("That message was already handed to pi — it can't be taken back now.");
+      }
+      pool.splice(at, 1);
+      const kept = action === "drop" ? undefined : target!;
+      const rest: Array<(typeof tuiQueue)[number]> = [
+        ...steers.map((text) => ({ id: "", text, mode: "steer" as const, images: imageOf(text, "steer") })),
+        ...follows.map((text) => ({ id: "", text, mode: "followUp" as const, images: imageOf(text, "followUp") })),
+      ];
+      if (kept) {
+        if (action === "promote") rest.unshift(kept);
+        else rest.splice(original.mode === "steer" ? Math.min(at, steers.length) : steers.length + Math.min(at, follows.length), 0, kept);
+      }
+      try {
+        await resend(rest);
+        ack();
+      } catch (error) {
+        fail(error instanceof Error ? error.message : String(error));
+      }
+      return;
+    }
+    // Fallback (older pi, or "send now"): UNI-305's abort-and-resend. pi has
+    // no API to drop ONE item from its own live steer/followUp queue there —
+    // the only way to edit it is to abort the whole run and re-send what's
+    // left (see the class comment above `tuiQueue`). That's fine between tool
+    // calls (there is nothing running to lose), but aborting WHILE a tool is
+    // executing kills it mid-flight — real, unsaved work — and if the removed
+    // item was the queue's only entry nothing is left to re-send: the run
+    // just dies instead of continuing. So this waits a short beat for the
+    // in-flight tool to reach its own end (the next safe boundary) before
+    // touching the queue; a tool still running past that is left alone and
+    // the edit is refused instead of destroying it.
     if (tools.size > 0) {
       const deadline = Date.now() + 4_000;
       while (tools.size > 0 && Date.now() < deadline) await sleep(100);
@@ -1162,14 +1363,15 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
     // actually sends it) — re-check instead of operating on a stale index.
     const liveIndex = tuiQueue.findIndex((q) => q.id === id);
     if (liveIndex < 0) return fail("That message was already handed to pi — it can't be taken back now.");
-    const [target] = tuiQueue.splice(liveIndex, 1);
-    const action = apply(target!) ?? undefined;
+    const [liveTarget] = tuiQueue.splice(liveIndex, 1);
+    const action = apply(liveTarget!) ?? undefined;
     // Keep the edited/kept target in its original slot (promote: first).
     const rest = tuiQueue.splice(0, tuiQueue.length);
-    if (action === "promote") rest.unshift(target!);
-    else if (action !== "drop") rest.splice(liveIndex, 0, target!);
+    if (action === "promote") rest.unshift(liveTarget!);
+    else if (action !== "drop") rest.splice(liveIndex, 0, liveTarget!);
     if (!c.isIdle()) {
       await abortKeepingEditor(c);
+
       const deadline = Date.now() + 10_000;
       while (!c.isIdle() && Date.now() < deadline) await sleep(50);
       // The abort was only the means to edit pi's queue: the re-sent items
@@ -1177,23 +1379,8 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
       // re-sent the hold lapses and the "after" queue delivers normally.
       holdUntilNextRun();
     }
-    send({ t: "queue", items: queueView() });
-    const contentOf = (q: (typeof tuiQueue)[number]) => (q.images?.length ? [{ type: "text" as const, text: q.text }, ...q.images.map(imageContent)] : q.text);
     try {
-      // pi is idle now, so a deliverAs message would be rejected ("Specify
-      // streamingBehavior"/"already processing"). The first item starts a
-      // fresh run; wait until pi is streaming, then queue the rest in pi's
-      // own order (steer drains before followUp).
-      const order = [...rest].sort((a, b) => (a === rest[0] ? -1 : b === rest[0] ? 1 : a.mode === b.mode ? 0 : a.mode === "steer" ? -1 : 1));
-      for (const q of order) {
-        if (c.isIdle()) {
-          pi.sendUserMessage(contentOf(q), { expandPromptTemplates: true } as never);
-          const until = Date.now() + 5_000;
-          while (c.isIdle() && Date.now() < until) await sleep(20);
-        } else {
-          pi.sendUserMessage(contentOf(q), { deliverAs: q.mode, expandPromptTemplates: true } as never);
-        }
-      }
+      await resend(rest);
       ack();
     } catch (error) {
       fail(error instanceof Error ? error.message : String(error));
@@ -1311,7 +1498,9 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
         return;
       }
       case "queue_promote": {
-        if (msg.id.startsWith("tui-")) return void (await editPiQueued(sock, msg.id, msg.ref, () => "promote"));
+        // "now" means stop the run on purpose — keep it on the abort path
+        // even when clearQueue surgery is available.
+        if (msg.id.startsWith("tui-")) return void (await editPiQueued(sock, msg.id, msg.ref, () => "promote", msg.to === "now"));
         const i = bridgeQueue.findIndex((q) => q.id === msg.id);
         if (i < 0) return fail("That queued message is gone.");
         const [item] = bridgeQueue.splice(i, 1);
@@ -1766,8 +1955,8 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
       return;
     }
     sweepDead(dir);
-    socketPath = join(dir, `${process.pid}.sock`);
-    rmSync(socketPath, { force: true });
+    socketPath = bridgeSocketPath(dir, process.pid);
+    if (!isBridgePipe(socketPath)) rmSync(socketPath, { force: true });
     const srv = createServer((sock) => {
       clients.add(sock);
       // A phone connecting has now seen the state (it's in `hello`): the
@@ -1808,10 +1997,12 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
       // Socket trouble (dir removed…) never matters to pi.
     });
     srv.listen(socketPath, () => {
-      try {
-        chmodSync(socketPath!, 0o600);
-      } catch {
-        // ignore
+      if (!isBridgePipe(socketPath!)) {
+        try {
+          chmodSync(socketPath!, 0o600);
+        } catch {
+          // ignore
+        }
       }
       writeRecord();
     });
@@ -1850,7 +2041,7 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
     server = undefined;
     const dir = bridgeDir();
     rmSync(join(dir, `${process.pid}.json`), { force: true });
-    if (socketPath) rmSync(socketPath, { force: true });
+    if (socketPath && !isBridgePipe(socketPath)) rmSync(socketPath, { force: true });
     socketPath = undefined;
   };
 
@@ -1875,6 +2066,10 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
         syncSoon();
       });
       computeCost();
+      unsubChildUsage?.();
+      unsubChildUsage = onChildUsage((data) => {
+        sessionCost += data.cost;
+      });
       setRemoteDialogs(hub);
       listen();
       writeRecord();
@@ -1998,6 +2193,8 @@ export function createBridge(pi: ExtensionAPI, deps: BridgeDeps = defaultDeps) {
   };
   on("session_start", safe(() => watchDream()));
   on("session_shutdown", safe(() => {
+    unsubChildUsage?.();
+    unsubChildUsage = undefined;
     unsubDream?.();
     unsubDream = undefined;
     if (dreamTimer) clearTimeout(dreamTimer);

package/packages/ask-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/ask-user",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Structured user input tool for Pi coding agent — single-select, multi-select, freeform",
   "type": "module",
   "main": "index.ts",
@@ -42,7 +42,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.43"
+    "@pi-unipi/core": "3.0.0-alpha.45"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/autocomplete/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/command-enchantment",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Enhanced TUI autocomplete for /unipi:* commands — colored, sorted, and grouped by package",
   "type": "module",
   "main": "src/index.ts",

package/packages/background-tasks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/background-tasks",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Background tasks for UniPi — durable shell jobs and delegated background agents with a footer dock",
   "type": "module",
   "main": "src/index.ts",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-ai": "^0.87.1",
-    "@pi-unipi/core": "3.0.0-alpha.43",
+    "@pi-unipi/core": "3.0.0-alpha.45",
     "turndown": "^7.2.4"
   },
   "devDependencies": {

package/packages/background-tasks/src/index.ts

@@ -14,6 +14,7 @@ import {
   isChildProcess,
   type KitTheme,
   openWorkTray,
+  recordChildUsage,
   registerWaitSource,
   registerWorkTrayTab,
   setBashBackgroundAdopter,
@@ -55,6 +56,7 @@ export default function backgroundTasksExtension(pi: ExtensionAPI): void {
   }
 
   const seenTaskIds = new Set<string>();
+  const costRecorded = new Set<string>();
   let currentCtx: ExtensionContext | undefined;
 
   const registry = new BackgroundTaskRegistry({
@@ -68,6 +70,16 @@ export default function backgroundTasksExtension(pi: ExtensionAPI): void {
       pi.sendMessage(message as never, options as never);
     },
     publishTerminal: (task) => {
+      // An agent task's spend belongs in the lead session's cost. Its own pi
+      // session already lives under the global sessions dir, so it is not
+      // standalone for cross-session stats.
+      if (task.isAgent && task.tokenUsage && !costRecorded.has(task.id)) {
+        costRecorded.add(task.id);
+        const u = task.tokenUsage;
+        recordChildUsage((type, data) => pi.appendEntry(type, data), { source: "bg-task", id: task.id, model: task.model, standalone: false }, {
+          input: u.input, output: u.output, cacheRead: u.cacheRead, cacheWrite: u.cacheWrite, cost: u.costTotal,
+        });
+      }
       eventService.publishTerminal(task);
     },
   });

package/packages/btw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/btw",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "A pi extension for parallel side conversations with /unipi:btw — part of the Unipi suite",
   "type": "module",
   "main": "extensions/btw.ts",
@@ -37,7 +37,7 @@
     "@earendil-works/pi-tui": "^0.87.1"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.43"
+    "@pi-unipi/core": "3.0.0-alpha.45"
   },
   "pi": {
     "extensions": [

package/packages/compactor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/compactor",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "description": "Compaction for Pi — lossless zero-LLM or model summaries, rebuilt from full history, with session recall",
   "type": "module",
   "main": "src/index.ts",
@@ -33,8 +33,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.43",
-    "@pi-unipi/info-screen": "3.0.0-alpha.43",
+    "@pi-unipi/core": "3.0.0-alpha.45",
+    "@pi-unipi/info-screen": "3.0.0-alpha.45",
     "@earendil-works/pi-agent-core": "^0.87.1"
   },
   "peerDependencies": {