@geminixiang/pi-simplify 0.0.6 → 0.0.8

package/index.ts

@@ -7,602 +7,10 @@
  * - Efficiency: redundant work, missed concurrency, hot-path bloat, memory leaks
  */
 
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import { matchesKey, Key, truncateToWidth, type SelectItem } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-type Category = "reuse" | "quality" | "efficiency";
-type Risk = "safe" | "confirm" | "review";
-type Action = "delete" | "inline" | "refactor" | "parallelize";
-
-type SimplifyResult = {
-  category: Category;
-  file: string;
-  lines: string;
-  reason: string;
-  risk: Risk;
-  action: Action;
-};
-
-const SIMPLIFY_PROMPT = `# Simplify: Review Changed Code for Reuse, Quality, and Efficiency
-
-You are a code review assistant. Review the changed code along three axes — **Reuse**, **Quality**, and **Efficiency** — and surface concrete fixes.
-
-## What to Find
-
-### A. Reuse (Confirm Before Replacing)
-
-Before flagging, **search the codebase** (utility directories, shared modules, files adjacent to the change) for existing helpers. Quote the existing symbol you'd use.
-
-- **Duplicates an existing function**: a newly written helper does what an existing one already does
-- **Inline logic that has a utility**: hand-rolled string manipulation, manual path handling, custom env checks, ad-hoc type guards
-- **Reinvented framework primitive**: re-implementing something the language/stdlib/framework already provides
-
-### B. Quality
-
-#### B1. Dead Code (Safe to Delete)
-- Unused exports, orphan files, zombie variables, empty try/catch/if blocks
-
-#### B2. Debug Remnants (Safe to Delete)
-- \`console.log\` / \`console.warn\` / \`console.error\`, \`debugger\`, temporary feature flags, stale TODO comments
-
-#### B3. Commented-out Code (Review)
-- Old logic left in comments, disabled features, uncustomized templates
-
-#### B4. Over-engineering (Confirm)
-- Abstractions created "for future use" but unused, single-call-site helpers that should be inlined, useless indirection
-
-#### B5. Hacky Patterns (Confirm)
-- **Redundant state**: state that duplicates other state, cached values that could be derived, observers that could be direct calls
-- **Parameter sprawl**: piling new parameters onto a function instead of restructuring
-- **Copy-paste with variation**: near-duplicate blocks that should share an abstraction
-- **Leaky abstractions**: exposing internals or breaking existing boundaries
-- **Stringly-typed code**: raw strings where an existing constant/enum/union exists
-- **Unnecessary wrapper elements**: JSX/DOM wrappers that add no layout value
-- **Nested conditionals**: ternary chains or if/else nested 3+ levels deep — flatten with early returns or a lookup table
-- **Useless comments**: comments restating WHAT the code does, narrating the change, or referencing the task/caller — keep only non-obvious WHY
-
-### C. Efficiency (Confirm)
-
-- **Unnecessary work**: redundant computations, repeated file reads, duplicate API calls, N+1 patterns
-- **Missed concurrency**: independent operations run sequentially when they could run in parallel
-- **Hot-path bloat**: blocking work added to startup or per-request/per-render hot paths
-- **Recurring no-op updates**: state writes inside loops/intervals/handlers that fire unconditionally — add a change-detection guard
-- **Unnecessary existence checks**: pre-checking file/resource existence before operating (TOCTOU) — operate directly and handle the error
-- **Memory**: unbounded data structures, missing cleanup, event listener leaks
-- **Overly broad operations**: reading whole files when a slice would do, loading all items when filtering for one
-
-## How to Analyze
-
-1. Run \`git diff\` to see what changed.
-2. For each change, classify as **Essential** / **Residual** / **Legacy** (don't flag legacy code unless the diff touches it).
-3. For each finding:
-   - Identify exact file and line(s)
-   - Assign **category** (reuse / quality / efficiency) and **risk**
-   - State the concrete fix (which existing utility to call, which lines to delete, how to parallelize, etc.)
-
-## Risk Levels
-
-- **safe**: Definitely apply (dead code, debug remnants)
-- **confirm**: Apply after user confirms (reuse swaps, over-engineering, hacky patterns, efficiency fixes)
-- **review**: User should look first (commented-out code, ambiguous cases)
-
-## Rules
-
-1. When in doubt, mark as "confirm" or "review" — don't change without consent.
-2. For reuse findings, name the existing symbol/file you'd swap to.
-3. For efficiency findings, briefly justify the win (e.g., "N+1 → single query", "sequential awaits → Promise.all").
-4. Don't flag necessary code just because it's simple.
-5. Respect existing abstraction boundaries.
-6. Be especially careful with:
-   - Error handling code
-   - Security-related logic
-   - Code that looks "unused" but is called via reflection/eval
-   - Database migration files
-
-## Output Format (REQUIRED)
-
-You may write prose analysis first, but you MUST end your response with a single fenced JSON block containing ALL candidates. This JSON is parsed programmatically — it must be valid JSON and use this exact shape:
-
-\`\`\`json
-{
-  "candidates": [
-    {
-      "category": "reuse",
-      "risk": "confirm",
-      "file": "path/to/file.ext",
-      "lines": "12-15",
-      "reason": "Replace hand-rolled join with existing pathJoin() in src/utils/path.ts",
-      "action": "refactor"
-    }
-  ]
-}
-\`\`\`
-
-Field notes:
-- \`category\` — one of: "reuse", "quality", "efficiency"
-- \`risk\` — one of: "safe", "confirm", "review"
-- \`file\` — repository-relative path, no backticks, no markdown
-- \`lines\` — line number or range ("42" or "42-57"); empty string if unknown
-- \`reason\` — single plain-text sentence stating the concrete fix
-- \`action\` — one of: "delete", "inline", "refactor", "parallelize"
-
-If there are no candidates, output \`{"candidates": []}\`. Do NOT output anything after the closing \`\`\` fence.
-`;
+import { registerSimplifyWorkflow } from "./workflow.js";
 
 export default function simplifyExtension(pi: ExtensionAPI) {
-  // Accumulate assistant text across the whole turn (multiple messages when
-  // the AI makes tool calls). Overwriting would drop the JSON block if it
-  // appears in an earlier message and a later one adds a short confirmation.
-  let assistantTextBuffer = "";
-  let resolvePendingTurnStart: (() => void) | null = null;
-
-  pi.on("turn_start", () => {
-    if (!resolvePendingTurnStart) return;
-    const resolve = resolvePendingTurnStart;
-    resolvePendingTurnStart = null;
-    resolve();
-  });
-
-  pi.on("message_end", (event) => {
-    const msg = event.message;
-    if (msg.role !== "assistant" || !Array.isArray(msg.content)) return;
-    const text = (msg.content as { type: string; text?: string }[])
-      .filter((b) => b.type === "text" && typeof b.text === "string")
-      .map((b) => b.text as string)
-      .join("\n");
-    if (text) assistantTextBuffer += (assistantTextBuffer ? "\n" : "") + text;
-  });
-
-  const CATEGORY_VALUES = new Set<Category>(["reuse", "quality", "efficiency"]);
-  const RISK_VALUES = new Set<Risk>(["safe", "confirm", "review"]);
-  const ACTION_VALUES = new Set<Action>(["delete", "inline", "refactor", "parallelize"]);
-
-  function normalizeCategory(value: unknown): Category {
-    const v = String(value ?? "")
-      .toLowerCase()
-      .trim();
-    return CATEGORY_VALUES.has(v as Category) ? (v as Category) : "quality";
-  }
-
-  function normalizeRisk(value: unknown): Risk {
-    const v = String(value ?? "")
-      .toLowerCase()
-      .trim();
-    return RISK_VALUES.has(v as Risk) ? (v as Risk) : "review";
-  }
-
-  function normalizeAction(value: unknown): Action | null {
-    const v = String(value ?? "")
-      .toLowerCase()
-      .trim();
-    return ACTION_VALUES.has(v as Action) ? (v as Action) : null;
-  }
-
-  function stripMarkdown(text: string): string {
-    return text.replace(/[`*]/g, "").trim();
-  }
-
-  /**
-   * Try to parse a JSON candidates block. The prompt requires this format,
-   * but we tolerate the AI wrapping it in ```json ... ``` or ``` ... ```,
-   * and also handle the case where it embeds the JSON inline without fences.
-   * Returns null only when no valid JSON with a `candidates` array is found —
-   * a valid empty list returns [] (which means "the AI found nothing").
-   */
-  function parseCandidatesJSON(response: string): SimplifyResult[] | null {
-    const fenceRe = /```(?:json)?\s*\n([\s\S]*?)\n```/gi;
-    const blocks: string[] = [];
-    let m: RegExpExecArray | null;
-    while ((m = fenceRe.exec(response)) !== null) blocks.push(m[1]);
-
-    const bareMatch = response.match(/\{[\s\S]*"candidates"[\s\S]*\}/);
-    if (bareMatch) blocks.push(bareMatch[0]);
-
-    // Walk newest-first: the contract puts the JSON at the end of the response.
-    for (let i = blocks.length - 1; i >= 0; i--) {
-      try {
-        const parsed = JSON.parse(blocks[i]);
-        const list = parsed?.candidates;
-        if (!Array.isArray(list)) continue;
-        const out: SimplifyResult[] = [];
-        for (const item of list) {
-          if (!item || typeof item !== "object") continue;
-          const file = stripMarkdown(String(item.file ?? item.location ?? ""));
-          // Validate path is within repo (no path traversal)
-          if (!file || file.includes("..") || file.startsWith("/")) continue;
-          const reason = stripMarkdown(String(item.reason ?? item.description ?? ""));
-          const action = normalizeAction(item.action);
-          if (!action) continue;
-          out.push({
-            category: normalizeCategory(item.category),
-            file,
-            lines: stripMarkdown(String(item.lines ?? "")),
-            reason: reason || "(no reason provided)",
-            risk: normalizeRisk(item.risk),
-            action,
-          });
-        }
-        // A valid candidates array (even empty) is a successful parse
-        return out;
-      } catch {
-        // try next block
-      }
-    }
-    return null;
-  }
-
-  async function showCandidateSelector(
-    ctx: ExtensionCommandContext,
-    candidates: SimplifyResult[],
-  ): Promise<SimplifyResult[]> {
-    if (candidates.length === 0) {
-      return [];
-    }
-
-    // Categorize by risk level for display
-    const safeCandidates = candidates.filter((c) => c.risk === "safe");
-    const confirmCandidates = candidates.filter((c) => c.risk === "confirm");
-    const reviewCandidates = candidates.filter((c) => c.risk === "review");
-
-    const RISK_CONFIG = {
-      safe: { label: "Safe to apply", description: "Will be applied" },
-      confirm: { label: "Needs confirmation", description: "Select to apply" },
-      review: { label: "Needs review", description: "Review before applying" },
-    } as const;
-
-    const sections = [
-      { key: "safe" as const, items: safeCandidates },
-      { key: "confirm" as const, items: confirmCandidates },
-      { key: "review" as const, items: reviewCandidates },
-    ]
-      .map(({ key, items }) => ({ key, items, config: RISK_CONFIG[key], total: items.length }))
-      .filter((s) => s.total > 0);
-
-    const displayItems: SelectItem[] = [];
-    const selectableItems: { index: number; candidate: SimplifyResult }[] = [];
-    let globalIndex = 0;
-
-    for (const section of sections) {
-      displayItems.push({
-        value: `__section__${section.key}__`,
-        label: `── ${section.config.label} (${section.total}) ──`,
-        description: "",
-      });
-      globalIndex++;
-      for (const c of section.items) {
-        displayItems.push({
-          value: JSON.stringify(c),
-          label: `${c.file} - ${c.reason}`,
-          description: section.config.description,
-        });
-        selectableItems.push({ index: globalIndex++, candidate: c });
-      }
-    }
-
-    // Pre-select all safe items
-    const selectedSet = new Set<number>(
-      safeCandidates.length > 0 ? Array.from({ length: safeCandidates.length }, (_, i) => i) : [],
-    );
-
-    const maxVisible = 12;
-    let scrollOffset = 0;
-    let cursorPos = 0;
-
-    const result = await ctx.ui.custom<SimplifyResult[]>((tui, theme, _keybindings, done) => {
-      const renderList = (width: number): string[] => {
-        const lines: string[] = [];
-
-        const visibleItems: { selectableIdx: number | null; item: SelectItem }[] = [];
-        let nextSelectableIdx = 0;
-        for (const item of displayItems) {
-          if (item.value.startsWith("__section__")) {
-            visibleItems.push({ selectableIdx: null, item });
-          } else {
-            visibleItems.push({ selectableIdx: nextSelectableIdx++, item });
-          }
-        }
-
-        // Show visible range with scroll
-        const startIdx = Math.max(0, scrollOffset);
-        const endIdx = Math.min(visibleItems.length, startIdx + maxVisible);
-
-        for (let vIdx = startIdx; vIdx < endIdx; vIdx++) {
-          const { selectableIdx, item } = visibleItems[vIdx];
-
-          if (item.value.startsWith("__section__")) {
-            // Section header
-            lines.push(theme.fg("accent", item.label));
-          } else {
-            // Selectable item
-            const isCursor = selectableIdx === cursorPos;
-            const isSelected = selectableIdx !== null && selectedSet.has(selectableIdx);
-            const prefix = isCursor ? theme.fg("accent", "> ") : "  ";
-            const checkbox = isSelected ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
-            const truncatedLabel = truncateToWidth(item.label, width - 6);
-            const line = `${prefix}${checkbox} ${truncatedLabel}`;
-            lines.push(isCursor ? theme.fg("accent", line) : line);
-          }
-        }
-
-        // Scroll indicator
-        if (visibleItems.length > maxVisible) {
-          const scrollInfo = `  (${startIdx + 1}-${endIdx}/${visibleItems.length})`;
-          lines.push(theme.fg("dim", scrollInfo));
-        }
-
-        return lines;
-      };
-
-      return {
-        render(width: number) {
-          const lines: string[] = [];
-          lines.push(theme.bold("Simplify: Select findings to apply"));
-          lines.push(
-            theme.fg(
-              "muted",
-              `Found ${candidates.length} candidates (${safeCandidates.length} safe, ${confirmCandidates.length} confirm, ${reviewCandidates.length} review)`,
-            ),
-          );
-          lines.push("");
-          lines.push(...renderList(width));
-          lines.push("");
-          lines.push(
-            theme.fg(
-              "muted",
-              `Selected: ${selectedSet.size} • ↑↓ navigate • space toggle • a select all • enter confirm • esc cancel`,
-            ),
-          );
-          return lines;
-        },
-        invalidate() {},
-        handleInput(data: string) {
-          if (matchesKey(data, Key.enter)) {
-            const results = Array.from(selectedSet).map((i) => selectableItems[i].candidate);
-            done(results);
-            return;
-          }
-          if (matchesKey(data, Key.escape)) {
-            done([]);
-            return;
-          }
-          if (matchesKey(data, Key.space)) {
-            // Toggle current selection
-            if (selectedSet.has(cursorPos)) {
-              selectedSet.delete(cursorPos);
-            } else {
-              selectedSet.add(cursorPos);
-            }
-            tui.requestRender();
-            return;
-          }
-          if (matchesKey(data, "a")) {
-            // Select/deselect all
-            if (selectedSet.size === selectableItems.length) {
-              selectedSet.clear();
-            } else {
-              for (let i = 0; i < selectableItems.length; i++) {
-                selectedSet.add(i);
-              }
-            }
-            tui.requestRender();
-            return;
-          }
-
-          // Navigation
-          if (matchesKey(data, Key.down)) {
-            cursorPos = Math.min(selectableItems.length - 1, cursorPos + 1);
-            // Ensure cursor is within visible window
-            const displayIdx = selectableItems[cursorPos].index;
-            if (displayIdx >= scrollOffset + maxVisible) {
-              scrollOffset = displayIdx - maxVisible + 1;
-            }
-            tui.requestRender();
-            return;
-          }
-          if (matchesKey(data, Key.up)) {
-            cursorPos = Math.max(0, cursorPos - 1);
-            // Ensure cursor is within visible window
-            const displayIdx = selectableItems[cursorPos].index;
-            if (displayIdx < scrollOffset) {
-              // Scroll up to show the item, and include section header if it's just above
-              scrollOffset = Math.max(0, displayIdx - 1);
-            }
-            tui.requestRender();
-            return;
-          }
-          if (matchesKey(data, Key.home)) {
-            cursorPos = 0;
-            scrollOffset = 0;
-            tui.requestRender();
-            return;
-          }
-          if (matchesKey(data, Key.end)) {
-            cursorPos = selectableItems.length - 1;
-            const lastDisplayIdx = selectableItems[cursorPos].index;
-            scrollOffset = Math.max(0, lastDisplayIdx - maxVisible + 1);
-            tui.requestRender();
-            return;
-          }
-        },
-      };
-    });
-
-    return result ?? [];
-  }
-
-  async function applyFindings(
-    ctx: ExtensionCommandContext,
-    selected: SimplifyResult[],
-  ): Promise<void> {
-    if (selected.length === 0) {
-      ctx.ui.notify("No findings selected to apply", "info");
-      return;
-    }
-
-    const safeItems = selected.filter((c) => c.risk === "safe");
-    const confirmItems = selected.filter((c) => c.risk === "confirm");
-
-    const cleanupPrompt = `# Apply Review Findings
-
-Apply the following findings. Each item includes a bracketed action (e.g. \`[delete]\`, \`[refactor]\`, \`[parallelize]\`, \`[inline]\`) — follow that action, not a blanket delete.
-
-${selected.map((c) => `- ${c.file} (${c.lines || "?"}): ${c.reason} [${c.action}]`).join("\n")}
-
-For each item:
-1. Read the file to find the exact location
-2. Apply only the specified change (not surrounding code unless instructed)
-3. For refactor/inline/parallelize: preserve behavior; if the change has visible side effects, stop and report
-4. If the change affects other code, stop and report the issue
-
-After applying all changes:
-- Run \`npm test\` or equivalent; if there are no tests, verify the files parse/type-check
-- Report what changed, test results, and any items skipped with reasons`;
-
-    ctx.ui.notify(
-      `Applying ${selected.length} findings (${safeItems.length} safe, ${confirmItems.length} confirmed)`,
-      "info",
-    );
-
-    pi.sendUserMessage(cleanupPrompt);
-  }
-
-  pi.registerCommand("simplify", {
-    description: "Review changed code for reuse, quality, and efficiency, then apply fixes",
-    handler: async (args: string, ctx: ExtensionCommandContext) => {
-      if (!ctx.hasUI) {
-        ctx.ui.notify("Simplify requires interactive mode", "error");
-        return;
-      }
-
-      if (!ctx.isIdle()) {
-        ctx.ui.notify(
-          "Cannot run simplify while agent is busy. Wait for current task to complete.",
-          "warning",
-        );
-        return;
-      }
-
-      // Check if in git repo
-      const { code } = await pi.exec("git", ["rev-parse", "--git-dir"]);
-      if (code !== 0) {
-        ctx.ui.notify("Not a git repository", "error");
-        return;
-      }
-
-      // Check if there are changes
-      const { stdout: gitStatus } = await pi.exec("git", ["status", "--porcelain"]);
-      if (!gitStatus.trim()) {
-        ctx.ui.notify("No git changes found. Simplify reviews uncommitted changes.", "info");
-        return;
-      }
-
-      ctx.ui.notify("Analyzing code for review findings...", "info");
-
-      // Build prompt with optional focus
-      let fullPrompt = SIMPLIFY_PROMPT;
-      if (args.trim()) {
-        fullPrompt += `\n\n## Additional Focus\n\n${args.trim()}`;
-      }
-
-      // Reset capture buffer, then send prompt and wait.
-      // message_end events append to assistantTextBuffer during the turn.
-      //
-      // Wait for the queued analysis turn to actually begin before waiting for
-      // idle; otherwise waitForIdle() can return immediately while the agent is
-      // still idle and the queued prompt has not started yet.
-      assistantTextBuffer = "";
-      const turnStarted = new Promise<void>((r) => {
-        resolvePendingTurnStart = r;
-      });
-
-      pi.sendUserMessage(fullPrompt);
-
-      const started = await Promise.race<boolean>([
-        turnStarted.then(() => true),
-        new Promise<boolean>((r) => setTimeout(() => r(false), 10000)),
-      ]);
-      if (!started) {
-        resolvePendingTurnStart = null;
-        ctx.ui.notify("Analysis did not start within 10 seconds. Please try again.", "warning");
-        return;
-      }
-
-      await ctx.waitForIdle();
-      const analysisText = assistantTextBuffer;
-
-      if (!analysisText) {
-        ctx.ui.notify("Could not read analysis — no response captured.", "error");
-        return;
-      }
-
-      const candidates = parseCandidatesJSON(analysisText);
-
-      if (candidates === null) {
-        ctx.ui.notify(
-          "Could not parse review findings — the model did not return the expected JSON block.",
-          "warning",
-        );
-        return;
-      }
-
-      if (candidates.length === 0) {
-        ctx.ui.notify("No review findings found!", "info");
-        return;
-      }
-
-      ctx.ui.notify(`Found ${candidates.length} findings. Select findings to apply...`, "info");
-
-      // Show selector
-      const selected = await showCandidateSelector(ctx, candidates);
-
-      if (!selected || selected.length === 0) {
-        ctx.ui.notify("Apply findings cancelled", "info");
-        return;
-      }
-
-      // Apply selected findings
-      await applyFindings(ctx, selected);
-    },
-  });
-
-  pi.registerCommand("simplify-quick", {
-    description: "Quick cleanup of obviously safe items (debug code, unused exports)",
-    handler: async (_args: string, ctx: ExtensionCommandContext) => {
-      if (!ctx.hasUI) {
-        ctx.ui.notify("Simplify requires interactive mode", "error");
-        return;
-      }
-
-      if (!ctx.isIdle()) {
-        ctx.ui.notify("Agent is busy. Try again after current task.", "warning");
-        return;
-      }
-
-      const quickPrompt = `# Quick Cleanup
-
-Find and delete ONLY the most obviously safe cleanup items:
-
-1. \`console.log\`, \`console.warn\`, \`console.error\` statements
-2. \`debugger\` statements
-3. Unused \`import\` statements (imported but never used)
-4. Empty \`catch\` blocks (just \`catch (e) {}\`)
-5. Unused \`const\`/\`let\`/\`var\` declarations
-
-DO NOT delete:
-- Commented-out code
-- Over-engineered abstractions
-- Duplicate logic
-- Anything that might be needed
-
-For each item found:
-1. Confirm it's truly unused by searching for references
-2. Delete only the specific lines
-3. Report what was deleted
-
-Return a summary of what was deleted.`;
-
-      ctx.ui.notify("Running quick cleanup...", "info");
-      pi.sendUserMessage(quickPrompt, { deliverAs: "followUp" });
-    },
-  });
+  registerSimplifyWorkflow(pi);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geminixiang/pi-simplify",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Simplify: Review changed code for reuse, quality, and efficiency",
   "keywords": [
     "pi-package"
@@ -19,7 +19,9 @@
     "fmt:check": "oxfmt --check"
   },
   "dependencies": {
-    "@mariozechner/pi-coding-agent": "^0.65.2"
+    "@earendil-works/pi-coding-agent": ">=0.74.0",
+    "@earendil-works/pi-tui": ">=0.74.0",
+    "typebox": "^1.1.38"
   },
   "devDependencies": {
     "oxfmt": "^0.45.0",