@mrclrchtr/supi-review 2.7.0 → 3.0.0

package/src/tool/review-handlers.ts

@@ -1,314 +0,0 @@
-import {
-  type AgentSession,
-  type AgentSessionEvent,
-  defineTool,
-} from "@earendil-works/pi-coding-agent";
-import type {
-  ChildFailureDiagnostics,
-  RawReviewResult,
-  ReviewInvocation,
-  ReviewOutputEvent,
-  ReviewProgress,
-} from "../types.ts";
-import type { ChildLifecycleHostMarker } from "./child-lifecycle-trace.ts";
-import { buildProgressTokens } from "./runner-helpers.ts";
-import { reviewOutputSchema } from "./schemas.ts";
-
-const STEER_SUBMIT_MESSAGE =
-  "You stopped without calling submit_review. Call submit_review now with your findings.";
-const DEFAULT_TIMEOUT_MS = 60 * 60 * 1_000;
-
-// ---------------------------------------------------------------------------
-// Runner-specific context combining lifecycle-managed fields with
-// runner-private mutable state.
-// ---------------------------------------------------------------------------
-export interface RunnerContext {
-  progress: ReviewProgress;
-  session: AgentSession;
-  resolve: (result: RawReviewResult) => void;
-  cleanup: (result: RawReviewResult) => RawReviewResult;
-  state: { settled: boolean; aborting: boolean };
-  resultHolder: { value: ReviewOutputEvent | undefined };
-  invocation: ReviewInvocation;
-  submitSteered: boolean;
-  timeoutSteered: boolean;
-  graceTurnsRemaining: number | undefined;
-  getFailureDiagnostics: () => ChildFailureDiagnostics;
-  recordHostMarker: (marker: ChildLifecycleHostMarker) => void;
-  /** Accumulated per-tool-label execution counts. */
-  toolCounts: Record<string, number>;
-  /** Set of distinct file paths inspected via read_snapshot_diff / read_snapshot_file. */
-  inspectedFiles: Set<string>;
-  /** Timestamp (ms) when the runner started, for elapsed-time display. */
-  startTime: number;
-}
-
-// ---------------------------------------------------------------------------
-// Tool and progress helpers
-// ---------------------------------------------------------------------------
-
-/** Maps tool names to compact display labels for the progress line. */
-function toolNameToLabel(name: string): string {
-  const map: Record<string, string> = {
-    read: "reads",
-    grep: "greps",
-    find: "finds",
-    ls: "ls",
-    submit_review: "submits",
-    read_snapshot_diff: "diffs",
-    read_snapshot_file: "file-reads",
-  };
-  return map[name] ?? name;
-}
-
-/** Maps tool names to focus labels for the progress narrative line. */
-function toolNameToFocusLabel(name: string): string {
-  const map: Record<string, string> = {
-    read: "Reading",
-    grep: "Searching",
-    find: "Finding",
-    ls: "Listing",
-    submit_review: "Submitting review",
-    read_snapshot_diff: "Reading",
-    read_snapshot_file: "Reading",
-  };
-  return map[name] ?? name;
-}
-
-/** Extract the basename from a file path, or return the path unchanged. */
-function extractBasename(file: string): string {
-  const lastSlash = file.lastIndexOf("/");
-  return lastSlash >= 0 ? file.slice(lastSlash + 1) : file;
-}
-
-/** Truncate a focus detail string to a display-friendly length. */
-function truncateFocusDetail(value: string): string {
-  return value.length > 40 ? `${value.slice(0, 40)}…` : value;
-}
-
-/** Extract focus detail from a read-type tool (read, read_snapshot_diff, read_snapshot_file). */
-function tryExtractReadDetail(toolName: string, a: Record<string, unknown>): string | undefined {
-  const file = (a.file ?? a.path) as string | undefined;
-  if (!file) return undefined;
-  const name = extractBasename(file);
-  if (toolName === "read_snapshot_diff") return `${name} (diff)`;
-  if (toolName === "read_snapshot_file") return `${name} (full)`;
-  return name;
-}
-
-/** Extract a human-readable detail string from tool args for the focus display. */
-function tryExtractFocusDetail(toolName: string, args: unknown): string | undefined {
-  if (typeof args !== "object" || args === null) return undefined;
-  const a = args as Record<string, unknown>;
-
-  // submit_review is self-explanatory — no detail needed
-  if (toolName === "submit_review") return undefined;
-
-  // Read-type tools: extract file path, show basename only
-  if (
-    toolName === "read" ||
-    toolName === "read_snapshot_diff" ||
-    toolName === "read_snapshot_file"
-  ) {
-    return tryExtractReadDetail(toolName, a);
-  }
-
-  // grep: show the search pattern
-  if (toolName === "grep") {
-    const pattern = a.pattern as string | undefined;
-    return pattern ? truncateFocusDetail(pattern) : undefined;
-  }
-
-  // find: show the glob / pattern
-  if (toolName === "find") {
-    const pattern = (a.pattern ?? a.glob) as string | undefined;
-    return pattern ? truncateFocusDetail(pattern) : undefined;
-  }
-
-  // ls: show the listing path
-  if (toolName === "ls") {
-    const path = a.path as string | undefined;
-    return path ? truncateFocusDetail(path) : undefined;
-  }
-
-  return undefined;
-}
-
-/** Extract a file path from tool args when the tool is file-inspecting (for inspectedFiles tracking). */
-function tryExtractFileArg(toolName: string, args: unknown): string | undefined {
-  if (toolName !== "read_snapshot_diff" && toolName !== "read_snapshot_file") return undefined;
-  if (typeof args !== "object" || args === null) return undefined;
-  const file = (args as Record<string, unknown>).file;
-  return typeof file === "string" ? file : undefined;
-}
-
-export function createSubmitReviewTool(resultHolder: {
-  value: ReviewOutputEvent | undefined;
-}): ReturnType<typeof defineTool> {
-  return defineTool({
-    name: "submit_review",
-    label: "Submit Review",
-    description:
-      "Submit the final structured review result after you finish investigating the changes.",
-    parameters: reviewOutputSchema,
-    execute: async (_toolCallId, args) => {
-      resultHolder.value = args as ReviewOutputEvent;
-      return {
-        content: [{ type: "text" as const, text: "Review submitted successfully." }],
-        details: args,
-        terminate: true,
-      };
-    },
-  });
-}
-
-export function emitProgress(ctx: RunnerContext): void {
-  ctx.progress.tokens = buildProgressTokens(() => ctx.session.getSessionStats());
-  ctx.progress.toolCounts = { ...ctx.toolCounts };
-  ctx.progress.filesInspected = ctx.inspectedFiles.size;
-  ctx.progress.filesTotal = ctx.invocation.snapshot.stats.files;
-  ctx.progress.elapsedMs = Date.now() - ctx.startTime;
-  ctx.invocation.onProgress?.(ctx.progress);
-}
-
-// ---------------------------------------------------------------------------
-// Event handlers
-// ---------------------------------------------------------------------------
-
-export function handleTurnEnd(ctx: RunnerContext): void {
-  ctx.progress.turns++;
-
-  if (!ctx.state.settled && ctx.timeoutSteered && ctx.graceTurnsRemaining !== undefined) {
-    ctx.graceTurnsRemaining--;
-    if (ctx.graceTurnsRemaining <= 0) {
-      ctx.state.aborting = true;
-      doFinalAbort(ctx);
-    }
-  }
-
-  emitProgress(ctx);
-}
-
-export function handleToolStart(
-  event: Extract<AgentSessionEvent, { type: "tool_execution_start" }>,
-  ctx: RunnerContext,
-): void {
-  ctx.progress.toolUses++;
-
-  const label = toolNameToLabel(event.toolName);
-  ctx.toolCounts[label] = (ctx.toolCounts[label] ?? 0) + 1;
-
-  const file = tryExtractFileArg(event.toolName, event.args);
-  if (file) ctx.inspectedFiles.add(file);
-
-  const focusDetail = tryExtractFocusDetail(event.toolName, event.args);
-  ctx.progress.currentFocus = {
-    label: toolNameToFocusLabel(event.toolName),
-    detail: focusDetail ?? "",
-  };
-
-  ctx.invocation.onToolActivity?.({ toolName: event.toolName, phase: "start" });
-  emitProgress(ctx);
-}
-
-export function handleToolEnd(
-  event: Extract<AgentSessionEvent, { type: "tool_execution_end" }>,
-  ctx: RunnerContext,
-): void {
-  ctx.progress.currentFocus = undefined;
-  ctx.invocation.onToolActivity?.({ toolName: event.toolName, phase: "end" });
-  emitProgress(ctx);
-}
-
-export function handleMessageEnd(
-  event: Extract<AgentSessionEvent, { type: "message_end" }>,
-  ctx: RunnerContext,
-): void {
-  if (ctx.state.settled || ctx.submitSteered || ctx.resultHolder.value) return;
-
-  const msg = event.message as { role?: string; stopReason?: string };
-  if (msg.role !== "assistant" || msg.stopReason !== "stop") return;
-
-  ctx.submitSteered = true;
-  ctx.recordHostMarker({ type: "steer_requested", reason: "submit" });
-  ctx.session.steer(STEER_SUBMIT_MESSAGE).catch(() => {});
-}
-
-/**
- * Finalize only after Pi has no retry, compaction recovery, or queued continuation left.
- * `agent_end` is a low-level boundary and is not terminal for a managed session.
- */
-export function handleAgentSettled(ctx: RunnerContext): void {
-  if (ctx.state.settled || ctx.state.aborting) return;
-
-  if (ctx.resultHolder.value) {
-    ctx.resolve(
-      ctx.cleanup({
-        kind: "success",
-        output: ctx.resultHolder.value,
-        snapshot: ctx.invocation.snapshot,
-        brief: ctx.invocation.brief,
-        modelId: ctx.invocation.model.canonicalId,
-      }),
-    );
-    return;
-  }
-
-  ctx.resolve(
-    ctx.cleanup({
-      kind: "failed",
-      failureCode: "missing-structured-output",
-      snapshot: ctx.invocation.snapshot,
-      brief: ctx.invocation.brief,
-      modelId: ctx.invocation.model.canonicalId,
-      diagnostics: ctx.getFailureDiagnostics(),
-    }),
-  );
-}
-
-export function handleSessionEvent(event: AgentSessionEvent, ctx: RunnerContext): void {
-  switch (event.type) {
-    case "turn_end":
-      handleTurnEnd(ctx);
-      break;
-    case "tool_execution_start":
-      handleToolStart(event, ctx);
-      break;
-    case "tool_execution_end":
-      handleToolEnd(event, ctx);
-      break;
-    case "message_end": {
-      handleMessageEnd(event, ctx);
-      break;
-    }
-    case "agent_settled":
-      handleAgentSettled(ctx);
-      break;
-    default:
-      break;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Hard-abort helper (called from handleTurnEnd when grace turns expire)
-// ---------------------------------------------------------------------------
-
-function doFinalAbort(ctx: RunnerContext): void {
-  emitProgress(ctx);
-  ctx.recordHostMarker({ type: "abort_requested", reason: "timeout" });
-  void ctx.session
-    .abort()
-    .catch(() => {})
-    .finally(() => {
-      ctx.resolve(
-        ctx.cleanup({
-          kind: "timeout" as const,
-          snapshot: ctx.invocation.snapshot,
-          timeoutMs: ctx.invocation.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-          brief: ctx.invocation.brief,
-          modelId: ctx.invocation.model.canonicalId,
-          diagnostics: ctx.getFailureDiagnostics(),
-        }),
-      );
-    });
-}

package/src/tool/snapshot-tools.ts

@@ -1,117 +0,0 @@
-import { StringEnum } from "@earendil-works/pi-ai";
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { getSnapshotFileContent, getSnapshotFileDiff } from "../git.ts";
-import type { ReviewSnapshot } from "../types.ts";
-
-/** Create the read_snapshot_diff custom tool for the reviewer child session. */
-export function createSnapshotDiffTool(
-  cwd: string,
-  snapshot: ReviewSnapshot,
-): ReturnType<typeof defineTool> {
-  return defineTool({
-    name: "read_snapshot_diff",
-    label: "Read Snapshot Diff",
-    description:
-      "Read the exact diff for a single changed file in the selected review snapshot. " +
-      "The file must be in the snapshot's changed-files list.",
-    parameters: Type.Object({
-      file: Type.String(),
-    }),
-    execute: async (_toolCallId, args) => {
-      const file = (args as { file: string }).file;
-      if (!snapshot.changedFiles.includes(file)) {
-        return {
-          content: [
-            {
-              type: "text" as const,
-              text:
-                `Error: "${file}" is not in the snapshot's changed-files list. ` +
-                "Use the changed-file manifest from the review task to pick a valid file.",
-            },
-          ],
-          details: null,
-        };
-      }
-
-      const diff = await getSnapshotFileDiff(cwd, snapshot, file);
-      if (!diff.trim()) {
-        return {
-          content: [
-            {
-              type: "text" as const,
-              text:
-                `No diff available for "${file}" in this snapshot. ` +
-                "The file may be untracked; use read_snapshot_file to inspect its current content.",
-            },
-          ],
-          details: null,
-        };
-      }
-
-      return {
-        content: [{ type: "text" as const, text: diff }],
-        details: null,
-      };
-    },
-  });
-}
-
-/** Create the read_snapshot_file custom tool for the reviewer child session. */
-export function createSnapshotFileTool(
-  cwd: string,
-  snapshot: ReviewSnapshot,
-): ReturnType<typeof defineTool> {
-  return defineTool({
-    name: "read_snapshot_file",
-    label: "Read Snapshot File",
-    description:
-      "Read the before or after content of a single changed file in the selected review snapshot. " +
-      '"before" shows the file before the change (HEAD for working tree, base for branch, parent for commit). ' +
-      '"after" shows the file after the change. The file must be in the snapshot\'s changed-files list.',
-    parameters: Type.Object({
-      file: Type.String(),
-      side: StringEnum(["before", "after"] as const),
-    }),
-    execute: async (_toolCallId, args) => {
-      const { file, side } = args as { file: string; side: "before" | "after" };
-
-      if (!snapshot.changedFiles.includes(file)) {
-        return {
-          content: [
-            {
-              type: "text" as const,
-              text:
-                `Error: "${file}" is not in the snapshot's changed-files list. ` +
-                "Use the changed-file manifest from the review task to pick a valid file.",
-            },
-          ],
-          details: null,
-        };
-      }
-
-      const content = await getSnapshotFileContent(cwd, snapshot, file, side);
-
-      if (content === undefined) {
-        const hint =
-          side === "before"
-            ? "The file may be newly added or renamed (use read_snapshot_diff to check for renames)."
-            : "The file may have been deleted.";
-        return {
-          content: [
-            {
-              type: "text" as const,
-              text: `Content for "${file}" (${side}) is not available. ${hint}`,
-            },
-          ],
-          details: null,
-        };
-      }
-
-      return {
-        content: [{ type: "text" as const, text: content }],
-        details: null,
-      };
-    },
-  });
-}

package/src/ui/flow.ts

@@ -1,189 +0,0 @@
-import { DynamicBorder, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Container, type SelectItem, SelectList, Text, visibleWidth } from "@earendil-works/pi-tui";
-import { getLocalBranches, getRecentCommits } from "../git.ts";
-import { getSelectableReviewModels } from "../model.ts";
-import type { ReviewModelSelection, ReviewPlan, ReviewTargetSpec } from "../types.ts";
-import { ReviewPlanPreviewComponent } from "./review-plan-inspector.ts";
-
-interface SelectFromListOptions<T> {
-  items: SelectItem[];
-  title: string;
-  maxHeight: number;
-  onSelect: (item: SelectItem) => T | undefined;
-  initialIndex?: number;
-}
-
-/** Shared TUI helper for bordered select lists used throughout the review flow. */
-function selectFromList<T>(
-  ctx: ExtensionContext,
-  options: SelectFromListOptions<T>,
-): Promise<T | undefined> {
-  const { items, title, maxHeight, onSelect, initialIndex } = options;
-  const widestLabel = items.reduce((w, item) => Math.max(w, visibleWidth(item.label)), 0);
-  const maxPrimaryColumnWidth = Math.max(widestLabel + 4, 32);
-
-  return ctx.ui.custom<T | undefined>((tui, theme, _kb, done) => {
-    const container = new Container();
-    container.addChild(new DynamicBorder((text: string) => theme.fg("accent", text)));
-    container.addChild(new Text(theme.fg("accent", title), 1, 0));
-
-    const selectList = new SelectList(
-      items,
-      Math.min(items.length, maxHeight),
-      {
-        selectedPrefix: (text) => theme.fg("accent", text),
-        selectedText: (text) => theme.fg("accent", text),
-        description: (text) => theme.fg("muted", text),
-        scrollInfo: (text) => theme.fg("dim", text),
-        noMatch: (text) => theme.fg("warning", text),
-      },
-      { maxPrimaryColumnWidth },
-    );
-    if (initialIndex !== undefined) {
-      selectList.setSelectedIndex(initialIndex);
-    }
-    selectList.onSelect = (item) => done(onSelect(item));
-    selectList.onCancel = () => done(undefined);
-
-    container.addChild(selectList);
-    container.addChild(new Text(theme.fg("dim", "↑↓ navigate • enter select • esc cancel"), 1, 0));
-    container.addChild(new DynamicBorder((text: string) => theme.fg("accent", text)));
-
-    return {
-      render: (width) => container.render(width),
-      invalidate: () => container.invalidate(),
-      handleInput: (data) => {
-        selectList.handleInput(data);
-        tui.requestRender();
-      },
-    };
-  });
-}
-
-/** Prompt for the concrete git target to review. */
-export async function selectTarget(ctx: ExtensionContext): Promise<ReviewTargetSpec | undefined> {
-  const preset = await selectFromList(ctx, {
-    items: [
-      {
-        value: "working-tree",
-        label: "Review working tree",
-        description: "Staged, unstaged, and untracked changes in the current checkout",
-      },
-      {
-        value: "branch",
-        label: "Review changes vs base branch",
-        description: "Compare the current branch against another local branch",
-      },
-      {
-        value: "commit",
-        label: "Review a commit",
-        description: "Review a single recent commit",
-      },
-    ],
-    title: "Select review target",
-    maxHeight: 8,
-    onSelect: (item) => item.value,
-  });
-
-  if (!preset) return undefined;
-
-  switch (preset) {
-    case "working-tree":
-      return { kind: "working-tree" };
-    case "branch": {
-      const base = await selectBranch(ctx);
-      return base ? { kind: "branch", base } : undefined;
-    }
-    case "commit": {
-      const sha = await selectCommit(ctx);
-      return sha ? { kind: "commit", sha } : undefined;
-    }
-    default:
-      return undefined;
-  }
-}
-
-/** Prompt for the explicit reviewer model used by both synthesis and review. */
-export async function selectModel(
-  ctx: Pick<ExtensionContext, "cwd" | "modelRegistry" | "model" | "ui">,
-): Promise<ReviewModelSelection | undefined> {
-  const models = getSelectableReviewModels(ctx);
-  if (models.length === 0) {
-    ctx.ui.notify(
-      "No scoped models are enabled for /supi-review. Configure enabledModels or use /scoped-models.",
-      "error",
-    );
-    return undefined;
-  }
-
-  const currentIndex = models.findIndex((model) => model.isCurrent);
-
-  return selectFromList(ctx as ExtensionContext, {
-    items: models.map((model) => ({
-      value: model.canonicalId,
-      label: model.isCurrent ? `${model.canonicalId}  [current]` : model.canonicalId,
-      description: model.label !== model.canonicalId ? model.label : undefined,
-    })),
-    title: "Select scoped reviewer model",
-    maxHeight: 12,
-    initialIndex: currentIndex >= 0 ? currentIndex : 0,
-    onSelect: (item) => models.find((model) => model.canonicalId === item.value),
-  });
-}
-
-/** Collect an optional freeform note for the generated review brief. */
-export async function collectReviewNote(ctx: ExtensionContext): Promise<string | undefined> {
-  const value = await ctx.ui.input(
-    "Optional review note",
-    "Anything specific to watch for? Leave empty to skip.",
-  );
-  if (value === undefined) return undefined;
-  return value.trim();
-}
-
-/** Show the synthesized brief, the actual reviewer prompt preview, and ask for approval. */
-export function previewReviewPlan(ctx: ExtensionContext, plan: ReviewPlan): Promise<boolean> {
-  return ctx.ui.custom<boolean>(
-    (tui, theme, _kb, done) =>
-      new ReviewPlanPreviewComponent({
-        plan,
-        theme,
-        onDone: done,
-        requestRender: () => tui.requestRender(),
-      }),
-  );
-}
-
-export async function selectBranch(ctx: ExtensionContext): Promise<string | undefined> {
-  const branches = await getLocalBranches(ctx.cwd);
-  if (branches.length === 0) {
-    ctx.ui.notify("No local branches found", "warning");
-    return undefined;
-  }
-
-  return selectFromList(ctx, {
-    items: branches.map((branch) => ({ value: branch, label: branch })),
-    title: "Select base branch",
-    maxHeight: 15,
-    onSelect: (item) => item.value,
-  });
-}
-
-export async function selectCommit(ctx: ExtensionContext): Promise<string | undefined> {
-  const commits = await getRecentCommits(ctx.cwd, 30);
-  if (commits.length === 0) {
-    ctx.ui.notify("No recent commits found", "warning");
-    return undefined;
-  }
-
-  return selectFromList(ctx, {
-    items: commits.map((commit) => ({
-      value: commit.sha,
-      label: `${commit.sha.slice(0, 7)}  ${commit.subject}`,
-      description: commit.sha,
-    })),
-    title: "Select commit to review",
-    maxHeight: 15,
-    onSelect: (item) => item.value,
-  });
-}