@zephyrdeng/pi-review 0.7.1 → 0.8.0

package/extensions/panel-tool.ts

@@ -3,14 +3,32 @@ import { fileURLToPath } from "node:url";
 import { Writable } from "node:stream";
 import { Type } from "typebox";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Container, Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
-import { createPanelViewState, reducePanelEvent, spawnStreamingChild, type PanelViewState, type ReviewEvent } from "@zephyrdeng/pi-review";
+import { keyHint } from "@earendil-works/pi-coding-agent";
+import { Text, type Component } from "@earendil-works/pi-tui";
+import {
+  createPanelViewState,
+  formatCost,
+  formatDurationMs,
+  formatPanelMetaAscii,
+  formatTokens,
+  formatUsage,
+  reducePanelEvent,
+  spawnStreamingChild,
+  type PanelReviewMeta,
+  type PanelViewState,
+  type ReviewEvent,
+} from "@zephyrdeng/pi-review";
 
 type Theme = { fg: (color: "toolTitle" | "muted" | "error" | "success" | "accent", text: string) => string; bold: (text: string) => string };
 type PanelToolDetails = { state: PanelViewState; error?: string };
+type PanelUi = { setStatus?: (key: string, text: string | undefined) => void };
+type PanelToolContext = { ui?: PanelUi };
 
 const extensionDir = path.dirname(fileURLToPath(import.meta.url));
 const cliPath = path.resolve(extensionDir, "../bin/pi-review.js");
+const PANEL_TOOL_DISPLAY_NAME = "Pi Review Panel";
+const PANEL_STATUS_KEY = "pi-review";
+const LIVE_TICK_MS = 2000;
 
 function duration(ms: number | undefined): string {
   if (!ms) return "0s";
@@ -18,81 +36,236 @@ function duration(ms: number | undefined): string {
 }
 
 function usageTokens(state: PanelViewState): string {
-  return state.aggregate.usage ? `${state.aggregate.usage.totalTokens.toLocaleString()} tok` : "—";
+  const usage = state.aggregate.usage;
+  if (!usage) return "—";
+  const cost = typeof usage.costTotal === "number" ? formatCost(usage.costTotal) : "n/a";
+  return `${formatTokens(usage.totalTokens)} tok · cost ${cost}`;
 }
 
 function statusSymbol(status: string): string {
   return status === "completed" ? "✓" : status === "failed" || status === "cancelled" ? "✗" : status === "running" ? "●" : "○";
 }
 
-function compactText(state: PanelViewState, theme: Theme): string {
-  const elapsed = state.startedAt ? duration((state.completedAt ?? Date.now()) - state.startedAt) : "0s";
+function compactText(state: PanelViewState, theme: Theme, now = Date.now()): string {
+  const elapsed = state.startedAt ? duration((state.completedAt ?? now) - state.startedAt) : "0s";
   const progress = `${state.aggregate.completed}/${state.aggregate.total} completed`;
-  const header = theme.fg("toolTitle", theme.bold(`pi-review panel ${progress}`)) + theme.fg("muted", ` · ${state.phase} · ${elapsed} · ${usageTokens(state)}`);
+  const header = theme.fg("toolTitle", theme.bold(`${PANEL_TOOL_DISPLAY_NAME} ${progress}`)) + theme.fg("muted", ` · ${state.phase} · ${elapsed} · ${usageTokens(state)}`);
   const rows = Object.values(state.reviewers).map((reviewer) => {
+    const lifecycle = ` · ${reviewer.status}`;
+    const model = reviewer.model ? ` · ${reviewer.model}` : "";
+    const thinking = reviewer.thinking ? ` · ${reviewer.thinking}` : "";
     const active = reviewer.activeTool ? ` · ${reviewer.activeTool}` : "";
-    const elapsed = reviewer.startedAt ? ` · ${duration((reviewer.completedAt ?? Date.now()) - reviewer.startedAt)}` : "";
-    const tokens = reviewer.usage ? ` · ${reviewer.usage.totalTokens.toLocaleString()} tok` : "";
-    return `${theme.fg(reviewer.status === "failed" ? "error" : reviewer.status === "completed" ? "success" : "accent", statusSymbol(reviewer.status))} ${theme.fg("toolTitle", reviewer.reviewerId)}${theme.fg("muted", ` ${reviewer.role}${active}${elapsed}${tokens}`)}`;
+    const activeSummary = reviewer.activeToolSummary ? ` · ${reviewer.activeToolSummary}` : "";
+    const reviewerElapsed = reviewer.startedAt ? ` · ${duration((reviewer.completedAt ?? now) - reviewer.startedAt)}` : "";
+    const idle = reviewer.status === "running" && reviewer.activityAt ? ` · idle ${duration(now - reviewer.activityAt)}` : "";
+    const tokens = reviewer.usage ? ` · ${formatTokens(reviewer.usage.totalTokens)} tok` : "";
+    const cost = reviewer.usage ? ` · cost ${typeof reviewer.usage.costTotal === "number" ? formatCost(reviewer.usage.costTotal) : "n/a"}` : "";
+    return `${theme.fg(reviewer.status === "failed" ? "error" : reviewer.status === "completed" ? "success" : "accent", statusSymbol(reviewer.status))} ${theme.fg("toolTitle", reviewer.reviewerId)}${theme.fg("muted", ` ${reviewer.role}${lifecycle}${model}${thinking}${active}${activeSummary}${reviewerElapsed}${idle}${tokens}${cost}`)}`;
   });
   return [header, ...rows].join("\n");
 }
 
-function finalMarkdown(state: PanelViewState): string {
+/** Expand hint that respects configured keybindings when available. */
+export function expandHint(): string {
+  try {
+    return keyHint("app.tools.expand", "to expand");
+  } catch {
+    return "ctrl+o to expand";
+  }
+}
+
+/** Plain-text findings list (no markdown). Pi TUI does not render markdown. */
+export function formatFindingsPlain(meta: PanelReviewMeta): string {
+  const lines: string[] = [];
+  if (meta.confirmedClusters.length > 0) {
+    lines.push("Confirmed findings:");
+    for (const c of meta.confirmedClusters) {
+      const bits = [
+        c.summary,
+        c.severity,
+        c.path,
+        `${c.supportCount}/${meta.configuredReviewers} reviewers`,
+        c.supportingReviewerIds.join(", "),
+      ].filter(Boolean);
+      lines.push(`  - ${bits.join(" · ")}`);
+    }
+  }
+  if (meta.advisories.length > 0) {
+    lines.push("Advisories (non-blocking):");
+    for (const c of meta.advisories) {
+      const bits = [
+        c.summary,
+        c.severity,
+        c.path,
+        `${c.supportCount}/${meta.configuredReviewers} reviewers`,
+        c.supportingReviewerIds.join(", "),
+      ].filter(Boolean);
+      lines.push(`  - ${bits.join(" · ")}`);
+    }
+  }
+  return lines.join("\n");
+}
+
+function reviewerSummaryLines(state: PanelViewState): string[] {
+  const fromMeta = state.meta?.reviewers ?? [];
+  if (fromMeta.length > 0) {
+    return fromMeta.map((reviewer) => {
+      const live = state.reviewers[reviewer.reviewerId];
+      const role = reviewer.role ? ` · ${reviewer.role}` : "";
+      const model = reviewer.model ? ` · ${reviewer.model}` : "";
+      const thinking = reviewer.thinking ? ` · ${reviewer.thinking}` : "";
+      const usage = reviewer.usage ? ` · ${formatTokens(reviewer.usage.totalTokens)} tok · ${formatUsage(reviewer.usage)}` : "";
+      const cost = reviewer.usage ? ` · cost ${typeof reviewer.usage.costTotal === "number" ? formatCost(reviewer.usage.costTotal) : "n/a"}` : "";
+      const head = `- ${reviewer.reviewerId}${role}${model}${thinking} · ${reviewer.status} · ${reviewer.verdict} · ${formatDurationMs(reviewer.durationMs)}${usage}${cost}`;
+      const findings = live?.submission?.result.findings?.map((finding) => finding.summary).filter(Boolean).slice(0, 5) ?? [];
+      if (findings.length > 0) return `${head}\n  ${findings.map((summary) => `• ${summary}`).join("\n  ")}`;
+      if (reviewer.runtimeError || reviewer.parseError) return `${head}\n  • ${reviewer.runtimeError ?? reviewer.parseError}`;
+      if (live?.error) return `${head}\n  • ${live.error}`;
+      return head;
+    });
+  }
+  return Object.values(state.reviewers).map((reviewer) => {
+    const role = reviewer.role ? ` · ${reviewer.role}` : "";
+    const model = reviewer.model ? ` · ${reviewer.model}` : "";
+    const thinking = reviewer.thinking ? ` · ${reviewer.thinking}` : "";
+    const status = reviewer.submission?.result.status ?? reviewer.status;
+    const verdict = reviewer.submission?.result.verdict ? ` · ${reviewer.submission.result.verdict}` : "";
+    const durationMs = reviewer.startedAt ? (reviewer.completedAt ?? Date.now()) - reviewer.startedAt : undefined;
+    const usage = reviewer.usage ? ` · ${formatTokens(reviewer.usage.totalTokens)} tok · ${formatUsage(reviewer.usage)}` : "";
+    const cost = reviewer.usage ? ` · cost ${typeof reviewer.usage.costTotal === "number" ? formatCost(reviewer.usage.costTotal) : "n/a"}` : "";
+    const head = `- ${reviewer.reviewerId}${role}${model}${thinking} · ${status}${verdict}${durationMs !== undefined ? ` · ${formatDurationMs(durationMs)}` : ""}${usage}${cost}`;
+    const findings = reviewer.submission?.result.findings?.map((finding) => finding.summary).filter(Boolean).slice(0, 5) ?? [];
+    if (findings.length > 0) return `${head}\n  ${findings.map((summary) => `• ${summary}`).join("\n  ")}`;
+    if (reviewer.error) return `${head}\n  • ${reviewer.error}`;
+    return head;
+  });
+}
+
+/**
+ * Full panel conclusion for the parent LLM and expanded TUI.
+ * Pure plain text / ASCII only — Pi does not render markdown in tool results.
+ */
+export function buildPanelResultContent(state: PanelViewState, error?: string): string {
   const meta = state.meta;
-  if (!meta) return "";
-  const confirmed = meta.confirmedClusters.map((finding) => `- ${finding.summary} (${finding.supportingReviewerIds.join(", ")})`);
-  const advisories = meta.advisories.map((finding) => `- ${finding.summary} (${finding.supportingReviewerIds.join(", ")})`);
-  return [
-    "### Panel result",
-    `Health: ${meta.panelHealth}; status: ${meta.status}.`,
-    confirmed.length ? `### Confirmed findings\n${confirmed.join("\n")}` : "### Confirmed findings\nNone.",
-    advisories.length ? `### Advisories\n${advisories.join("\n")}` : "",
-  ].filter(Boolean).join("\n\n");
+  if (!meta && !error) return "Panel completed: unknown";
+  if (!meta) return error ?? "Panel completed: unknown";
+
+  const findings = formatFindingsPlain(meta);
+  const ascii = formatPanelMetaAscii(meta);
+  const summaries = reviewerSummaryLines(state);
+  const parts = [
+    findings,
+    ascii,
+    summaries.length ? `Reviewer summaries:\n${summaries.join("\n")}` : "",
+    error ? `Error:\n${error}` : "",
+  ].filter(Boolean);
+  return parts.join("\n\n");
+}
+
+function ambientStatus(state: PanelViewState, now = Date.now()): string {
+  const elapsed = state.startedAt ? duration((state.completedAt ?? now) - state.startedAt) : "0s";
+  const running = state.aggregate.running;
+  const phase = state.phase === "aggregating" ? "aggregating" : state.phase;
+  const runningBit = running > 0 ? ` · ${running} running` : "";
+  return `● panel ${state.aggregate.completed}/${state.aggregate.total}${runningBit} · ${phase} · ${elapsed}`;
 }
 
-export function renderPanelResult(details: PanelToolDetails | undefined, expanded: boolean, theme: Theme, previous?: Component): Component {
-  if (!details) return new Text(theme.fg("muted", "Panel review has no progress details."), 0, 0);
-  if (!expanded) {
-    const text = previous instanceof Text ? previous : new Text("", 0, 0);
-    text.setText(compactText(details.state, theme));
-    return text;
+function setAmbientStatus(ctx: PanelToolContext | undefined, text: string | undefined): void {
+  try {
+    ctx?.ui?.setStatus?.(PANEL_STATUS_KEY, text);
+  } catch {
+    // Non-interactive / print hosts may not implement status chrome.
   }
-  const container = new Container();
-  container.addChild(new Text(compactText(details.state, theme), 0, 0));
-  for (const reviewer of Object.values(details.state.reviewers)) {
-    if (reviewer.recentActivity.length === 0) continue;
-    container.addChild(new Spacer(1));
-    container.addChild(new Text(theme.fg("muted", `${reviewer.reviewerId} activity`), 0, 0));
-    container.addChild(new Text(reviewer.recentActivity.join("\n"), 0, 0));
+}
+
+/**
+ * Stable tool-result component reused across onUpdate renders.
+ * Collapsed and expanded paths mutate the same child instances instead of rebuilding trees.
+ */
+export class PanelResultView implements Component {
+  private readonly compact = new Text("", 0, 0);
+  private readonly activity = new Text("", 0, 0);
+  private readonly conclusion = new Text("", 0, 0);
+  private readonly error = new Text("", 0, 0);
+  private showActivity = false;
+  private showConclusion = false;
+  private showError = false;
+
+  update(details: PanelToolDetails, expanded: boolean, theme: Theme, isPartial = false, now = Date.now()): void {
+    const body = compactText(details.state, theme, now);
+    if (!expanded) {
+      // Discoverability: host expand binding (default ctrl+o).
+      this.compact.setText(`${body}\n${expandHint()}`);
+      this.showActivity = false;
+      this.showConclusion = false;
+      this.showError = Boolean(details.error);
+      if (details.error) this.error.setText(theme.fg("error", details.error));
+      return;
+    }
+
+    this.compact.setText(body);
+    const activityBlocks = Object.values(details.state.reviewers)
+      .filter((reviewer) => reviewer.recentActivity.length > 0)
+      .map((reviewer) => `${theme.fg("muted", `${reviewer.reviewerId} activity`)}\n${reviewer.recentActivity.join("\n")}`);
+    this.showActivity = activityBlocks.length > 0;
+    if (this.showActivity) this.activity.setText(activityBlocks.join("\n\n"));
+
+    // Plain Text only — Pi does not render markdown in tool result components.
+    const conclusion = !isPartial && details.state.meta ? buildPanelResultContent(details.state) : "";
+    this.showConclusion = Boolean(conclusion);
+    if (conclusion) this.conclusion.setText(conclusion);
+
+    this.showError = Boolean(details.error);
+    if (details.error) this.error.setText(theme.fg("error", details.error));
   }
-  const markdown = finalMarkdown(details.state);
-  if (markdown) {
-    container.addChild(new Spacer(1));
-    // Pi supplies a Markdown theme to built-in renderers; plain text keeps this
-    // extension portable across public API versions while still using Markdown.
-    container.addChild(new Markdown(markdown, 0, 0, {
-      heading: theme.bold,
-      link: (text) => text,
-      linkUrl: (text) => text,
-      code: (text) => text,
-      codeBlock: (text) => text,
-      codeBlockBorder: (text) => text,
-      quote: (text) => text,
-      quoteBorder: (text) => text,
-      hr: (text) => text,
-      listBullet: (text) => text,
-      bold: theme.bold,
-      italic: (text) => text,
-      strikethrough: (text) => text,
-      underline: (text) => text,
-    }));
+
+  invalidate(): void {
+    this.compact.invalidate();
+    this.activity.invalidate();
+    this.conclusion.invalidate();
+    this.error.invalidate();
   }
-  if (details.error) {
-    container.addChild(new Spacer(1));
-    container.addChild(new Text(theme.fg("error", details.error), 0, 0));
+
+  render(width: number): string[] {
+    const lines = [...this.compact.render(width)];
+    if (this.showActivity) {
+      lines.push("");
+      lines.push(...this.activity.render(width));
+    }
+    if (this.showConclusion) {
+      lines.push("");
+      lines.push(...this.conclusion.render(width));
+    }
+    if (this.showError) {
+      lines.push("");
+      lines.push(...this.error.render(width));
+    }
+    return lines;
   }
-  return container;
+}
+
+export function renderPanelResult(details: PanelToolDetails | undefined, expanded: boolean, theme: Theme, previous?: Component, isPartial = false, now = Date.now()): Component {
+  if (!details) return new Text(theme.fg("muted", isPartial ? `${PANEL_TOOL_DISPLAY_NAME} · starting…` : "Panel review has no progress details."), 0, 0);
+  const view = previous instanceof PanelResultView ? previous : new PanelResultView();
+  view.update(details, expanded, theme, isPartial, now);
+  return view;
+}
+
+export type PanelToolParams = {
+  target: string;
+  panel?: string;
+  reviewers?: number;
+};
+
+/** Runtime guard for direct tool calls; schema validation is not the only boundary. */
+export function panelToolParamError(params: PanelToolParams): string | undefined {
+  if (params.reviewers !== undefined) {
+    if (!Number.isSafeInteger(params.reviewers) || params.reviewers < 2 || params.reviewers > 8) {
+      return "reviewers must be an integer between 2 and 8; use the shell CLI for a single reviewer";
+    }
+    if (params.panel) return "panel cannot be combined with reviewers";
+  }
+  return undefined;
 }
 
 export function registerPanelReviewTool(pi: ExtensionAPI): void {
@@ -102,17 +275,29 @@ export function registerPanelReviewTool(pi: ExtensionAPI): void {
     description: "Run an isolated read-only pi-review panel and render each reviewer live.",
     renderShell: "self",
     parameters: Type.Object({
-      target: Type.String({ description: "Review target, such as @src or a code-review brief." }),
+      target: Type.String({ description: "Review target as given by the user, such as @src, @src/foo.ts, or a free-text brief. Directories stay tool path targets; only real files are attached." }),
       mode: Type.Optional(Type.String({ description: "Review mode; defaults to code." })),
-      panel: Type.Optional(Type.String({ description: "Named panel preset; defaults to code-experts." })),
-      model: Type.Optional(Type.String({ description: "Optional reviewer model." })),
+      panel: Type.Optional(Type.String({ description: "Named panel preset; defaults to code-experts when reviewers is omitted." })),
+      reviewers: Type.Optional(Type.Number({ minimum: 2, maximum: 8, description: "Independent reviewer count (2-8). Cannot combine with panel; single review uses the shell CLI." })),
+      reviewerModels: Type.Optional(Type.Array(Type.String(), { description: "Per-reviewer models as id=provider/model[:thinking] (e.g. r1=openai/gpt-5.6-sol:low). Trailing :thinking wins over shared thinking." })),
+      consensus: Type.Optional(Type.String({ description: "any | quorum | majority | unanimous" })),
+      minAgree: Type.Optional(Type.Number({ description: "Quorum threshold when consensus=quorum" })),
+      consensusModel: Type.Optional(Type.String({ description: "Model for semantic adjudication only" })),
+      concurrency: Type.Optional(Type.Number({ description: "Bound parallel reviewers (≤ reviewer count)" })),
+      model: Type.Optional(Type.String({ description: "Optional shared reviewer model." })),
       thinking: Type.Optional(Type.String({ description: "Optional thinking level." })),
     }),
-    async execute(_toolCallId, params, signal, onUpdate) {
+    async execute(_toolCallId, params, signal, onUpdate, ctx) {
       let state = createPanelViewState();
       let buffer = "";
       let stderr = "";
-      const publish = () => onUpdate?.({ content: [{ type: "text", text: `Panel: ${state.aggregate.completed}/${state.aggregate.total} completed` }], details: { state } });
+      const toolCtx = ctx as PanelToolContext | undefined;
+      const publish = () => {
+        onUpdate?.({ content: [{ type: "text", text: `${PANEL_TOOL_DISPLAY_NAME}: ${state.aggregate.completed}/${state.aggregate.total} completed` }], details: { state } });
+        if (state.phase === "running" || state.phase === "aggregating") {
+          setAmbientStatus(toolCtx, ambientStatus(state));
+        }
+      };
       const consume = (chunk: string) => {
         buffer += chunk;
         let newline: number;
@@ -135,11 +320,45 @@ export function registerPanelReviewTool(pi: ExtensionAPI): void {
           callback();
         },
       });
-      const args = [cliPath, "--panel", params.panel ?? "code-experts", "--mode", params.mode ?? "code", "--output-format", "events-jsonl"];
+      // Preserve the full panel configuration and enforce the panel-only tool boundary.
+      const paramError = panelToolParamError(params);
+      if (paramError) {
+        setAmbientStatus(toolCtx, undefined);
+        return {
+          content: [{ type: "text", text: `${PANEL_TOOL_DISPLAY_NAME}: ${paramError}` }],
+          details: { state, error: paramError },
+          isError: true,
+        };
+      }
+      const args = [cliPath, "--mode", params.mode ?? "code", "--output-format", "events-jsonl"];
+      if (params.reviewers !== undefined) {
+        args.push("--reviewers", String(params.reviewers));
+      } else {
+        args.push("--panel", params.panel ?? "code-experts");
+      }
+      for (const mapping of params.reviewerModels ?? []) args.push("--reviewer-model", mapping);
+      if (params.consensus) args.push("--consensus", params.consensus);
+      if (params.minAgree !== undefined) args.push("--min-agree", String(params.minAgree));
+      if (params.consensusModel) args.push("--consensus-model", params.consensusModel);
+      if (params.concurrency !== undefined) args.push("--concurrency", String(params.concurrency));
       if (params.model) args.push("--model", params.model);
       if (params.thinking) args.push("--thinking", params.thinking);
       args.push("--", params.target);
-      const child = await spawnStreamingChild(process.execPath, args, { cwd: process.cwd(), env: process.env, stdoutSink, stderrSink, signal, processGroup: true });
+
+      // Keep elapsed/idle labels fresh even when the child is quiet between events.
+      const tick = setInterval(() => {
+        if (state.phase === "running" || state.phase === "aggregating") publish();
+      }, LIVE_TICK_MS);
+      tick.unref?.();
+
+      let child: Awaited<ReturnType<typeof spawnStreamingChild>>;
+      try {
+        setAmbientStatus(toolCtx, ambientStatus(state));
+        child = await spawnStreamingChild(process.execPath, args, { cwd: process.cwd(), env: process.env, stdoutSink, stderrSink, signal, processGroup: true });
+      } finally {
+        clearInterval(tick);
+        setAmbientStatus(toolCtx, undefined);
+      }
       if (buffer.trim()) {
         const tail = buffer;
         buffer = "";
@@ -152,18 +371,20 @@ export function registerPanelReviewTool(pi: ExtensionAPI): void {
           : [`pi-review ended before a final event (${child.status ?? child.signal ?? "unknown"})`, stderr.trim()].filter(Boolean).join(": ");
       const details: PanelToolDetails = { state, ...(error ? { error } : {}) };
       return {
-        content: [{ type: "text", text: error ?? `Panel completed: ${state.meta?.status ?? "unknown"}` }],
+        // Parent LLM must receive the full conclusion; details remain the TUI rendering source.
+        content: [{ type: "text", text: buildPanelResultContent(state, error) }],
         details,
         ...(error ? { isError: true } : {}),
       };
     },
     renderCall(args, theme, context) {
       const text = context.lastComponent instanceof Text ? context.lastComponent : new Text("", 0, 0);
-      text.setText(theme.fg("toolTitle", theme.bold("pi_review ")) + theme.fg("muted", `${args.panel ?? "code-experts"} · ${args.mode ?? "code"} · ${args.target}`));
+      const width = args.reviewers !== undefined ? `reviewers=${args.reviewers}` : (args.panel ?? "code-experts");
+      text.setText(theme.fg("toolTitle", theme.bold(`${PANEL_TOOL_DISPLAY_NAME} `)) + theme.fg("muted", `${width} · ${args.mode ?? "code"} · ${args.target}`));
       return text;
     },
-    renderResult(result, { expanded }, theme, context) {
-      return renderPanelResult(result.details as PanelToolDetails | undefined, expanded, theme, context.lastComponent);
+    renderResult(result, { expanded, isPartial }, theme, context) {
+      return renderPanelResult(result.details as PanelToolDetails | undefined, expanded, theme, context.lastComponent, isPartial);
     },
   });
 }

package/extensions/review.test.ts

@@ -0,0 +1,79 @@
+import assert from "node:assert/strict";
+import { test } from "vitest";
+import piReviewExtension from "./review.js";
+
+type CommandConfig = {
+  getArgumentCompletions?: (prefix: string) => Array<{ value: string; label: string }> | null;
+};
+
+type SessionStart = (_event: unknown, ctx: {
+  modelRegistry: { getAvailable: () => unknown[] };
+  model?: { provider?: string };
+  sessionManager: { getEntries: () => unknown[] };
+}) => void;
+
+function registeredExtension(): { commands: Map<string, CommandConfig>; sessionStart: SessionStart } {
+  const commands = new Map<string, CommandConfig>();
+  let sessionStart: SessionStart | undefined;
+  const pi = {
+    registerTool() {},
+    on(event: string, handler: SessionStart) {
+      if (event === "session_start") sessionStart = handler;
+    },
+    registerCommand(name: string, config: CommandConfig) {
+      commands.set(name, config);
+    },
+    sendUserMessage() {},
+  };
+  piReviewExtension(pi as never);
+  assert.ok(sessionStart);
+  return { commands, sessionStart };
+}
+
+const emptySession = () => ({
+  modelRegistry: { getAvailable: () => [] },
+  sessionManager: { getEntries: () => [] },
+});
+
+test("extension completion fallback never replaces an entered target when the catalog is empty", () => {
+  const { commands, sessionStart } = registeredExtension();
+  sessionStart({}, emptySession());
+  const complete = commands.get("rv")?.getArgumentCompletions;
+  assert.ok(complete);
+
+  const modelItems = complete!("@src --model ");
+  assert.ok(modelItems);
+  assert.ok(modelItems!.every((item) => item.value.startsWith("@src --model ")));
+
+  // Natural-language targets have no static candidate; returning null is safer than
+  // replacing the whole argument with a bare --model/--mode suggestion.
+  assert.equal(complete!("review auth behavior"), null);
+});
+
+test("a new session with an empty catalog does not reuse models captured by a previous session", () => {
+  const { commands, sessionStart } = registeredExtension();
+  const complete = commands.get("rv")?.getArgumentCompletions;
+  assert.ok(complete);
+
+  sessionStart({}, {
+    modelRegistry: {
+      getAvailable: () => [{
+        provider: "old-provider",
+        id: "old-model",
+        name: "old-model",
+        reasoning: true,
+        contextWindow: 100_000,
+        thinkingLevelMap: { high: "high" },
+      }],
+    },
+    model: { provider: "old-provider" },
+    sessionManager: { getEntries: () => [] },
+  });
+  assert.ok(complete!("--model ")?.some((item) => item.label === "old-provider/old-model"));
+
+  sessionStart({}, emptySession());
+  const next = complete!("--model ");
+  assert.ok(next);
+  assert.ok(!next!.some((item) => item.label === "old-provider/old-model"));
+  assert.ok(next!.some((item) => item.label === "<provider/model>"));
+});