@oh-my-pi/pi-coding-agent 17.0.5 → 17.0.6

package/dist/types/exec/bash-executor.d.ts

@@ -45,4 +45,5 @@ export interface BashResult {
 }
 /** Translate `ShellMinimizerSettings` into native `MinimizerOptions`, or `undefined` when disabled. */
 export declare function buildMinimizerOptions(group: ShellMinimizerSettings): MinimizerOptions | undefined;
+export declare function isPersistentShellCdCommand(command: string): boolean;
 export declare function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult>;

package/dist/types/extensibility/extensions/load-errors.d.ts

@@ -0,0 +1,3 @@
+import type { LoadExtensionsResult } from "./types.js";
+/** Formats extension load failures for user-visible startup diagnostics. */
+export declare function formatExtensionLoadNotifications(errors: LoadExtensionsResult["errors"]): string[];

package/dist/types/extensibility/plugins/legacy-pi-compat.d.ts

@@ -1,4 +1,11 @@
 import * as path from "node:path";
+declare const BUNDLED_VIRTUAL_NAMESPACE = "omp-legacy-pi-bundled";
+interface BundledVirtualResolveResult {
+    path: string;
+    namespace: typeof BUNDLED_VIRTUAL_NAMESPACE;
+}
+/** Maps a bundled virtual specifier or registry key to Bun's plugin namespace shape. */
+export declare function resolveBundledVirtualSpecifier(specifier: string): BundledVirtualResolveResult;
 /** Test seam for the virtual module's named/default export forwarding. */
 export declare function __synthesizeLegacyPiBundledSourceWithModules(moduleKey: string, modules: Readonly<Record<string, Readonly<Record<string, unknown>>>>): string;
 /** Test seam for the global bridge key shared with synthetic module source. */
@@ -65,3 +72,4 @@ export declare function loadLegacyPiModule(resolvedPath: string): Promise<unknow
 export declare function installLegacyPiSpecifierShim(): void;
 /** Test seam: clears the memoized canonical specifier resolutions. */
 export declare function __resetLegacyPiResolutionCache(): void;
+export {};

package/dist/types/modes/components/status-line/component.d.ts

@@ -64,6 +64,14 @@ export declare class StatusLineComponent implements Component {
     setVibeModeStatus(status: {
         enabled: boolean;
     } | undefined): void;
+    /**
+     * Inject the aggregator that returns the aggregate tok/s of this session's
+     * live vibe worker sessions (null when no workers are streaming). Wired by
+     * interactive-mode, which owns the VibeSessionRegistry coupling, so the
+     * render layer stays off the heavy vibe/task dependency graph. Pass
+     * `undefined` to clear.
+     */
+    setVibeWorkerTokenRateProvider(provider: (() => number | null) | undefined): void;
     setCollabStatus(status: CollabStatus | null): void;
     setHookStatus(key: string, text: string | undefined): void;
     watchBranch(onBranchChange: () => void): void;

package/dist/types/modes/components/usage-row.d.ts

@@ -1,3 +1,3 @@
 import type { Usage } from "@oh-my-pi/pi-ai";
 import { Container } from "@oh-my-pi/pi-tui";
-export declare function createUsageRowBlock(usage: Usage, durationMs?: number, ttftMs?: number): Container;
+export declare function createUsageRowBlock(usage: Usage, durationMs?: number, ttftMs?: number, timestamp?: number): Container;

package/dist/types/modes/rpc/rpc-client.d.ts

@@ -61,7 +61,7 @@ export declare class RpcClient {
     /**
      * Stop the RPC agent process.
      */
-    stop(): void;
+    stop(): Promise<void>;
     /**
      * Stop the RPC agent process and clean up resources.
      */

package/dist/types/modes/rpc/rpc-frame.d.ts

@@ -0,0 +1,9 @@
+/** Maximum UTF-8 size of one newline-delimited RPC frame, including the newline. */
+export declare const MAX_RPC_FRAME_BYTES: number;
+/** Serialize a complete JSONL frame while enforcing the transport byte ceiling. */
+export declare function encodeRpcFrame(frame: object, streamedMessageCount?: number, streamedMessages?: readonly unknown[]): string;
+/** Stateful encoder that tracks which messages a client has already received. */
+export declare class RpcFrameEncoder {
+    #private;
+    encode(frame: object): string;
+}

package/dist/types/modes/setup-wizard/index.d.ts

@@ -5,7 +5,7 @@ import type { SetupScene } from "./scenes/types.js";
 export type { SetupScene, SetupSceneController, SetupSceneHost, SetupSceneResult } from "./scenes/types.js";
 export { runStartupSplash } from "./startup-splash.js";
 export { CURRENT_SETUP_VERSION };
-export declare const ALL_SCENES: readonly [SetupScene, SetupScene, SetupScene];
+export declare const ALL_SCENES: readonly [SetupScene, SetupScene, SetupScene, SetupScene];
 export interface SetupSceneSelectionOptions {
     resuming?: boolean;
     isTTY?: boolean;

package/dist/types/modes/setup-wizard/scenes/model.d.ts

@@ -0,0 +1,3 @@
+import type { SetupScene } from "./types.js";
+/** Setup step that assigns one available model to the persisted default role. */
+export declare const modelSetupScene: SetupScene;

package/dist/types/session/agent-session.d.ts

@@ -13,7 +13,7 @@
  * Modes use this class and add their own I/O layer on top.
  */
 import type { InMemorySnapshotStore } from "@oh-my-pi/hashline";
-import { Agent, type AgentEvent, type AgentMessage, type AgentState, type AgentTool, type StreamFn, ThinkingLevel, type ToolChoiceDirective } from "@oh-my-pi/pi-agent-core";
+import { Agent, type AgentEvent, type AgentMessage, type AgentState, type AgentTool, type AgentToolResult, type StreamFn, ThinkingLevel, type ToolChoiceDirective } from "@oh-my-pi/pi-agent-core";
 import { type CompactionResult, type ShakeConfig } from "@oh-my-pi/pi-agent-core/compaction";
 import type { AssistantMessage, Context, ImageContent, Message, MessageAttribution, Model, ProviderSessionState, ResetCreditAccountStatus, ResetCreditRedeemOutcome, ResetCreditTarget, ServiceTier, ServiceTierByFamily, ServiceTierFamily, SimpleStreamOptions, TextContent, ToolChoice, UsageReport } from "@oh-my-pi/pi-ai";
 import { Effort } from "@oh-my-pi/pi-ai";
@@ -41,6 +41,7 @@ import type { Goal, GoalModeState } from "../goals/state.js";
 import type { HindsightSessionState } from "../hindsight/state.js";
 import { type IrcMessage } from "../irc/bus.js";
 import { type MnemopiSessionState } from "../mnemopi/state.js";
+import { type PlanApprovalDetails } from "../plan-mode/approved-plan.js";
 import type { PlanModeState } from "../plan-mode/state.js";
 import { type SecretObfuscator } from "../secrets/obfuscator.js";
 import { type ConfiguredThinkingLevel } from "../thinking.js";
@@ -542,6 +543,8 @@ export declare class AgentSession {
      * is already armed and waiting.
      */
     armPrewalk(target: Model, thinkingLevel?: ConfiguredThinkingLevel): void;
+    /** Validate the active plan artifact and shape an `xd://propose` result for review-mode hosts. */
+    preparePlanForReview(title: string): Promise<AgentToolResult<PlanApprovalDetails>>;
     constructor(config: AgentSessionConfig);
     /** Model registry for API key resolution and model discovery */
     get modelRegistry(): ModelRegistry;
@@ -730,6 +733,21 @@ export declare class AgentSession {
      * Changes take effect before the next model call.
      */
     setActiveToolsByName(toolNames: string[]): Promise<void>;
+    /**
+     * Restore an enabled tool set with its exact top-level versus `xd://` partition.
+     *
+     * Both inputs are required because {@link setActiveToolsByName} only receives the
+     * enabled name list and classifies mounts from the *current* `#mountedXdevToolNames`.
+     * Rollback/restore callers must pass the snapshotted mounted subset so names that
+     * were top-level stay pinned (`#runtimeSelectedToolNames`) and names that were under
+     * `xd://` remain mount-eligible, even when the live mount set has drifted.
+     *
+     * Names outside `mountedToolNames` are pinned top-level for this application;
+     * names in the mounted subset remain eligible for xdev mounting. Delegates the
+     * actual apply through `#applyActiveToolsByName` and restores the prior runtime
+     * selection if that apply throws.
+     */
+    setActiveToolPresentation(toolNames: string[], mountedToolNames: string[]): Promise<void>;
     /** Rebuild the base system prompt using the current active tool set. */
     refreshBaseSystemPrompt(): Promise<void>;
     /**
@@ -1054,10 +1072,10 @@ export declare class AgentSession {
      */
     getAvailableModels(): Model[];
     /**
-     * Set the thinking level. `auto` enables per-turn classification; the selector
-     * itself is never written to the session log, but resolved concrete levels are
-     * persisted when real user turns are classified so resumed sessions keep the
-     * last resolved effort instead of reverting to pending auto.
+     * Set the thinking level. `auto` enables per-turn classification. Entering
+     * auto writes its provisional level plus `configured: "auto"` immediately,
+     * giving external readers an authoritative selection receipt before the next
+     * user turn. Later classifications persist only changed concrete resolutions.
      */
     setThinkingLevel(level: ConfiguredThinkingLevel | undefined, persist?: boolean): void;
     /**

package/dist/types/session/session-paths.d.ts

@@ -10,16 +10,33 @@ export declare function computeDefaultSessionDir(cwd: string, storage: SessionSt
  * Write a breadcrumb linking the current terminal to a session file.
  * The breadcrumb contains the cwd and session path so --continue can
  * find "this terminal's last session" even when running concurrent instances.
+ *
+ * `fresh` marks a `/new` (or freshly-minted) session boundary whose JSONL is
+ * not yet materialized (new-session persistence is lazy until assistant output
+ * exists). A fresh breadcrumb is honored by {@link readTerminalBreadcrumbEntry}
+ * even when its target file is still absent, so relaunch/auto-resume reopens the
+ * post-`/new` session instead of falling back to the pre-`/new` transcript. Once
+ * the session materializes the caller rewrites the breadcrumb with `fresh:false`
+ * so a later external delete is still treated as a genuinely stale crumb.
  */
-export declare function writeTerminalBreadcrumb(cwd: string, sessionFile: string): void;
+export declare function writeTerminalBreadcrumb(cwd: string, sessionFile: string, fresh?: boolean): void;
 export interface TerminalBreadcrumb {
     cwd: string;
     sessionFile: string;
+    /** The recorded session file exists on disk right now. */
+    exists: boolean;
+    /** Recorded as a `/new` fresh-session boundary whose JSONL may not exist yet. */
+    fresh: boolean;
 }
 /**
  * Read the raw terminal breadcrumb for the current terminal.
- * Returns the recorded cwd + session file (verified to exist) regardless of
- * whether the recorded cwd still matches the current one. Callers decide how
- * to interpret a cwd mismatch (e.g. a moved/renamed worktree).
+ * Returns the recorded cwd + session file regardless of whether the recorded
+ * cwd still matches the current one. Callers decide how to interpret a cwd
+ * mismatch (e.g. a moved/renamed worktree).
+ *
+ * A missing target file yields `null` UNLESS the breadcrumb is a `fresh`
+ * boundary — a lazy `/new` session whose JSONL was never written — in which case
+ * the entry is returned with `exists:false` so the caller can distinguish it
+ * from a genuinely stale/deleted breadcrumb.
  */
 export declare function readTerminalBreadcrumbEntry(): Promise<TerminalBreadcrumb | null>;

package/dist/types/tools/xdev.d.ts

@@ -32,9 +32,11 @@ import type { ToolRenderer } from "./renderers.js";
 /**
  * Discoverable built-ins that must stay top-level even when xdev mounting is
  * active: `todo` feeds the todo prelude/prewalk machinery, `ask` is the
- * model's user-interaction affordance, and `grep` is the redirect target of
- * the bash interceptor rules — each loses its harness integration if hidden
- * behind dispatch.
+ * model's user-interaction affordance, `grep` is the redirect target of the
+ * bash interceptor rules, and `web_search` is invoked directly by most models
+ * (which have no notion of the `xd://` protocol) so hiding it behind dispatch
+ * makes it unreachable in practice (issue #5973) — each loses its harness
+ * integration or usability if hidden behind dispatch.
  */
 export declare const XDEV_KEEP_TOP_LEVEL: Record<string, true>;
 /**

package/dist/types/vibe/__tests__/token-rate.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/vibe/runtime.d.ts

@@ -83,6 +83,17 @@ export declare class VibeSessionRegistry {
     static global(): VibeSessionRegistry;
     /** Reset the global registry. Test-only. */
     static resetGlobalForTests(): void;
+    /**
+     * Insert a bare worker record without the spawn/job machinery. Test-only —
+     * lets {@link aggregateVibeWorkerTokensPerSecond} be exercised against a
+     * fake roster + AgentRegistry session without driving a real turn.
+     */
+    registerRecordForTests(record: {
+        id: string;
+        cli?: VibeCli;
+        ownerId: string;
+        state?: VibeSessionState;
+    }): void;
     listIds(owner: string): string[];
     /**
      * Live screen snapshots for rich rendering (the "TV wall"): one entry per
@@ -122,3 +133,15 @@ export declare class VibeSessionRegistry {
     /** Kill every session belonging to `owner` (vibe-mode exit / teardown). Returns the number killed. */
     killAll(owner: string, manager?: AsyncJobManager): Promise<number>;
 }
+/**
+ * Aggregate tok/s across every live vibe worker session owned by `ownerId`.
+ * Returns null when no workers are streaming (so callers can fall back to
+ * their own rate unchanged). The director is often idle while workers stream,
+ * so without this aggregation the status-line tok/s badge would show a stale
+ * value while parallel work is actively generating tokens.
+ *
+ * Reads each worker's last assistant message via {@link calculateTokensPerSecond}
+ * — the same leaf calculator the main status line uses — so worker rates are
+ * computed identically to the main session's rate.
+ */
+export declare function aggregateVibeWorkerTokensPerSecond(ownerId: string): number | null;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "17.0.5",
+	"version": "17.0.6",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -52,17 +52,17 @@
 		"@agentclientprotocol/sdk": "1.2.1",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "17.0.5",
-		"@oh-my-pi/omp-stats": "17.0.5",
-		"@oh-my-pi/pi-agent-core": "17.0.5",
-		"@oh-my-pi/pi-ai": "17.0.5",
-		"@oh-my-pi/pi-catalog": "17.0.5",
-		"@oh-my-pi/pi-mnemopi": "17.0.5",
-		"@oh-my-pi/pi-natives": "17.0.5",
-		"@oh-my-pi/pi-tui": "17.0.5",
-		"@oh-my-pi/pi-utils": "17.0.5",
-		"@oh-my-pi/pi-wire": "17.0.5",
-		"@oh-my-pi/snapcompact": "17.0.5",
+		"@oh-my-pi/hashline": "17.0.6",
+		"@oh-my-pi/omp-stats": "17.0.6",
+		"@oh-my-pi/pi-agent-core": "17.0.6",
+		"@oh-my-pi/pi-ai": "17.0.6",
+		"@oh-my-pi/pi-catalog": "17.0.6",
+		"@oh-my-pi/pi-mnemopi": "17.0.6",
+		"@oh-my-pi/pi-natives": "17.0.6",
+		"@oh-my-pi/pi-tui": "17.0.6",
+		"@oh-my-pi/pi-utils": "17.0.6",
+		"@oh-my-pi/pi-wire": "17.0.6",
+		"@oh-my-pi/snapcompact": "17.0.6",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/api-logs": "^0.220.0",
 		"@opentelemetry/context-async-hooks": "^2.9.0",

package/src/exec/bash-executor.ts

@@ -150,9 +150,56 @@ function isBashShell(shell: string): boolean {
 	return basename.includes("bash");
 }
 
+const UNSUPPORTED_UNQUOTED_CD_CHARS = "\\$`;&|<>(){}*?[]!#\"'";
+
+function hasUnsupportedUnquotedCdSyntax(value: string): boolean {
+	for (const char of value) {
+		if (/\s/.test(char) || UNSUPPORTED_UNQUOTED_CD_CHARS.includes(char)) return true;
+	}
+	return false;
+}
+
+export function isPersistentShellCdCommand(command: string): boolean {
+	if (/[\r\n]/.test(command)) return false;
+
+	const trimmed = command.trim();
+	if (trimmed === "cd") return true;
+	if (!trimmed.startsWith("cd") || !/[ \t]/.test(trimmed[2] ?? "")) return false;
+
+	let rest = trimmed.slice(2).trim();
+	if (rest === "" || rest === "--") return true;
+
+	let hasOptionTerminator = false;
+	if (/^--[ \t]/.test(rest)) {
+		hasOptionTerminator = true;
+		rest = rest.slice(2).trimStart();
+	}
+	if (rest === "") return true;
+
+	const quote = rest[0];
+	let target: string;
+	let quoted = false;
+	if (quote === `"` || quote === "'") {
+		if (rest.length < 2 || rest[rest.length - 1] !== quote) return false;
+		target = rest.slice(1, -1);
+		if (target.includes(quote)) return false;
+		if (quote === `"` && /[\\$`\r\n]/.test(target)) return false;
+		quoted = true;
+	} else {
+		if (hasUnsupportedUnquotedCdSyntax(rest)) return false;
+		target = rest;
+	}
+
+	if (target === "") return false;
+	if (/^[+-]\d+$/.test(target)) return false;
+	if (!hasOptionTerminator && target.startsWith("-") && target !== "-") return false;
+	if (!quoted && target.startsWith("~") && target !== "~" && !target.startsWith("~/")) return false;
+	return true;
+}
+
 function needsInteractiveShellArg(shell: string): boolean {
 	const basename = shellBasename(shell);
-	return basename.includes("zsh");
+	return basename.includes("zsh") || basename.includes("fish");
 }
 
 function supportsAutoUserShell(shell: string): boolean {
@@ -165,19 +212,31 @@ function hasInteractiveShellArg(args: string[]): boolean {
 }
 
 function ensureInteractiveShellArgs(shell: string, args: string[]): string[] {
-	if (!needsInteractiveShellArg(shell) || hasInteractiveShellArg(args)) return args;
+	if (!needsInteractiveShellArg(shell)) return args;
+
+	// fish sources the same config files (config.fish + conf.d) for interactive
+	// shells as for login shells, so the inherited `-l` adds nothing — it only
+	// marks the shell as login, firing `status is-login` blocks in user config
+	// (agent/keychain setup, path mutation) on every `!` command. zsh keeps `-l`
+	// because .zprofile is login-only. Args originate from procmgr's
+	// getShellArgs(), so login only ever appears as a standalone `-l`/`--login`.
+	const effectiveArgs = shellBasename(shell).includes("fish")
+		? args.filter(arg => arg !== "-l" && arg !== "--login")
+		: args;
+
+	if (hasInteractiveShellArg(effectiveArgs)) return effectiveArgs;
 
-	const commandIndex = args.findIndex(arg => arg === "-c" || arg === "--command");
+	const commandIndex = effectiveArgs.findIndex(arg => arg === "-c" || arg === "--command");
 	if (commandIndex !== -1) {
-		return [...args.slice(0, commandIndex), "-i", ...args.slice(commandIndex)];
+		return [...effectiveArgs.slice(0, commandIndex), "-i", ...effectiveArgs.slice(commandIndex)];
 	}
 
-	const compactCommandIndex = args.findIndex(arg => /^-[^-]*c[^-]*$/.test(arg));
+	const compactCommandIndex = effectiveArgs.findIndex(arg => /^-[^-]*c[^-]*$/.test(arg));
 	if (compactCommandIndex !== -1) {
-		return args.map((arg, index) => (index === compactCommandIndex ? arg.replace("c", "ic") : arg));
+		return effectiveArgs.map((arg, index) => (index === compactCommandIndex ? arg.replace("c", "ic") : arg));
 	}
 
-	return [...args, "-i"];
+	return [...effectiveArgs, "-i"];
 }
 
 function quoteShellArg(value: string): string {
@@ -224,8 +283,9 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 
 	// Apply command prefix if configured
 	const prefixedCommand = prefix ? `${prefix} ${command}` : command;
+	const runCdInPersistentShell = options?.useUserShell === true && !prefix && isPersistentShellCdCommand(command);
 	const finalCommand =
-		options?.useUserShell === true && !bashShell
+		options?.useUserShell === true && !bashShell && !runCdInPersistentShell
 			? buildUserShellCommand(shell, args, prefixedCommand)
 			: prefixedCommand;
 

package/src/extensibility/extensions/load-errors.ts

@@ -0,0 +1,13 @@
+import { replaceTabs, shortenPath, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
+import type { LoadExtensionsResult } from "./types";
+
+/** Formats extension load failures for user-visible startup diagnostics. */
+export function formatExtensionLoadNotifications(errors: LoadExtensionsResult["errors"]): string[] {
+	const messages: string[] = [];
+	for (const { path, error } of errors) {
+		const displayPath = truncateToWidth(replaceTabs(shortenPath(path)), TRUNCATE_LENGTHS.CONTENT);
+		const displayError = truncateToWidth(replaceTabs(error.replace(/\s+/g, " ").trim()), TRUNCATE_LENGTHS.LONG);
+		messages.push(`Failed to load extension ${displayPath}: ${displayError}`);
+	}
+	return messages;
+}

package/src/extensibility/plugins/legacy-pi-compat.ts

@@ -32,6 +32,16 @@ type BundledModule = Readonly<Record<string, unknown>>;
 type BundledModules = Readonly<Record<string, BundledModule>>;
 type BundledModuleLoaders = Readonly<Record<string, () => Promise<BundledModule>>>;
 
+interface LegacyPiResolveResult {
+	path: string;
+	namespace?: string;
+}
+
+interface BundledVirtualResolveResult {
+	path: string;
+	namespace: typeof BUNDLED_VIRTUAL_NAMESPACE;
+}
+
 const loadedBundledModules: Record<string, BundledModule> = {};
 let bundledModuleLoadersPromise: Promise<BundledModuleLoaders> | null = null;
 
@@ -72,6 +82,25 @@ function isBundledVirtualSpecifier(value: string): boolean {
 	return value.startsWith(BUNDLED_VIRTUAL_SCHEME);
 }
 
+function toLegacyPiResolveResult(resolvedPath: string): LegacyPiResolveResult {
+	if (isBundledVirtualSpecifier(resolvedPath)) {
+		const registryKey = resolvedPath.slice(BUNDLED_VIRTUAL_SCHEME.length);
+		return { path: registryKey, namespace: BUNDLED_VIRTUAL_NAMESPACE };
+	}
+	return { path: resolvedPath };
+}
+
+/** Maps a bundled virtual specifier or registry key to Bun's plugin namespace shape. */
+export function resolveBundledVirtualSpecifier(specifier: string): BundledVirtualResolveResult {
+	const registryKey = isBundledVirtualSpecifier(specifier)
+		? specifier.slice(BUNDLED_VIRTUAL_SCHEME.length)
+		: specifier;
+	if (!registryKey) {
+		throw new Error("omp:legacy-pi-shim: bundled virtual specifier has no registry key");
+	}
+	return { path: registryKey, namespace: BUNDLED_VIRTUAL_NAMESPACE };
+}
+
 /**
  * Build a synthetic ES module for one live bundled namespace. Every export
  * reads through the global bridge; no bunfs path or copied package is involved.
@@ -1611,7 +1640,7 @@ function getLoader(path: string): "js" | "jsx" | "ts" | "tsx" {
 	return "js";
 }
 
-function resolveLegacyPiSpecifier(args: { path: string; importer: string }): { path: string } | undefined {
+function resolveLegacyPiSpecifier(args: { path: string; importer: string }): LegacyPiResolveResult | undefined {
 	const remappedSpecifier = remapLegacyPiSpecifier(args.path);
 	if (!remappedSpecifier) {
 		return undefined;
@@ -1620,7 +1649,7 @@ function resolveLegacyPiSpecifier(args: { path: string; importer: string }): { p
 	// Primary: resolve the canonical @oh-my-pi/* specifier from the host binary
 	// location. Works in dev mode and in source-link installs.
 	try {
-		return { path: resolveCanonicalPiSpecifier(remappedSpecifier) };
+		return toLegacyPiResolveResult(resolveCanonicalPiSpecifier(remappedSpecifier));
 	} catch {
 		// Fallback for compiled binary mode: the bundled packages live inside
 		// /$bunfs/root and aren't reachable by filesystem resolution. Prefer the
@@ -1630,10 +1659,10 @@ function resolveLegacyPiSpecifier(args: { path: string; importer: string }): { p
 		// @earendil-works peer deps.
 		const importerDir = path.dirname(args.importer);
 		try {
-			return { path: Bun.resolveSync(remappedSpecifier, importerDir) };
+			return toLegacyPiResolveResult(Bun.resolveSync(remappedSpecifier, importerDir));
 		} catch {
 			try {
-				return { path: Bun.resolveSync(args.path, importerDir) };
+				return toLegacyPiResolveResult(Bun.resolveSync(args.path, importerDir));
 			} catch {
 				return undefined;
 			}
@@ -1641,8 +1670,8 @@ function resolveLegacyPiSpecifier(args: { path: string; importer: string }): { p
 	}
 }
 
-function resolveTypeBoxSpecifier(): { path: string } | undefined {
-	return TYPEBOX_SHIM_PATH ? { path: TYPEBOX_SHIM_PATH } : undefined;
+function resolveTypeBoxSpecifier(): LegacyPiResolveResult | undefined {
+	return TYPEBOX_SHIM_PATH ? toLegacyPiResolveResult(TYPEBOX_SHIM_PATH) : undefined;
 }
 
 export function installLegacyPiSpecifierShim(): void {
@@ -1656,6 +1685,12 @@ export function installLegacyPiSpecifierShim(): void {
 		setup(build) {
 			build.onResolve({ filter: LEGACY_PI_SPECIFIER_FILTER, namespace: "file" }, resolveLegacyPiSpecifier);
 			build.onResolve({ filter: TYPEBOX_SPECIFIER_FILTER, namespace: "file" }, resolveTypeBoxSpecifier);
+			build.onResolve({ filter: /^omp-legacy-pi-bundled:.+$/, namespace: "file" }, args =>
+				resolveBundledVirtualSpecifier(args.path),
+			);
+			build.onResolve({ filter: /.*/, namespace: BUNDLED_VIRTUAL_NAMESPACE }, args =>
+				resolveBundledVirtualSpecifier(args.path),
+			);
 			// Compiled mode serves `omp-legacy-pi-bundled:<key>` imports from
 			// live host module references. No bunfs path leaves this loader.
 			build.onLoad({ filter: /.*/, namespace: BUNDLED_VIRTUAL_NAMESPACE }, async args => {

package/src/main.ts

@@ -50,6 +50,7 @@ import {
 	resolveActiveProjectRegistryPath,
 } from "./discovery/helpers";
 import { injectOmpExtensionCliRoots } from "./discovery/omp-extension-roots";
+import { formatExtensionLoadNotifications } from "./extensibility/extensions/load-errors";
 import { ExtensionRunner } from "./extensibility/extensions/runner";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
 import { scheduleMarketplaceAutoUpdate } from "./extensibility/plugins/marketplace-auto-update";
@@ -1433,6 +1434,13 @@ export async function runRootCommand(
 		};
 		const initialArgs = applyExtensionFlags(extensionFlagSink, rawArgs) ?? parsedArgs;
 		normalizeContinueSessionArgs(initialArgs, rawArgs);
+		for (const message of formatExtensionLoadNotifications(extensionsResult.errors)) {
+			if (isInteractive) {
+				notifs.push({ kind: "warn", message });
+			} else {
+				process.stderr.write(`${chalk.yellow(`${message}\n`)}`);
+			}
+		}
 		// Fail fast on stale/typo flags (e.g. `omp --list-models`) now that we
 		// know the real extension flag set. Without this check the unrecognized
 		// token gets silently consumed and any following positional leaks as the

package/src/modes/components/chat-transcript-builder.ts

@@ -85,6 +85,7 @@ export class ChatTranscriptBuilder {
 	#pendingUsage: Usage | undefined;
 	#pendingUsageDuration: number | undefined;
 	#pendingUsageTtft: number | undefined;
+	#pendingUsageTimestamp: number | undefined;
 	#lastAssistantUsage: Usage | undefined;
 	#waitingPoll: ToolExecutionComponent | null = null;
 	#todoSnapshot: ToolExecutionComponent | null = null;
@@ -133,6 +134,7 @@ export class ChatTranscriptBuilder {
 		this.#pendingUsage = undefined;
 		this.#pendingUsageDuration = undefined;
 		this.#pendingUsageTtft = undefined;
+		this.#pendingUsageTimestamp = undefined;
 		this.#lastAssistantUsage = undefined;
 		this.#waitingPoll = null;
 		this.#todoSnapshot = null;
@@ -201,11 +203,17 @@ export class ChatTranscriptBuilder {
 		this.#readGroup?.seal();
 		this.#readGroup = null;
 		this.container.addChild(
-			createUsageRowBlock(this.#pendingUsage, this.#pendingUsageDuration, this.#pendingUsageTtft),
+			createUsageRowBlock(
+				this.#pendingUsage,
+				this.#pendingUsageDuration,
+				this.#pendingUsageTtft,
+				this.#pendingUsageTimestamp,
+			),
 		);
 		this.#pendingUsage = undefined;
 		this.#pendingUsageDuration = undefined;
 		this.#pendingUsageTtft = undefined;
+		this.#pendingUsageTimestamp = undefined;
 	}
 
 	#appendChatMessage(message: AgentMessage): void {
@@ -381,6 +389,7 @@ export class ChatTranscriptBuilder {
 			settings.get("display.showTokenUsage") && assistantUsageIsBilled(message.usage) ? message.usage : undefined;
 		this.#pendingUsageDuration = message.duration;
 		this.#pendingUsageTtft = message.ttft;
+		this.#pendingUsageTimestamp = message.timestamp;
 	}
 
 	#appendToolResult(message: Extract<AgentMessage, { role: "toolResult" }>): void {