@ilya-lesikov/pi-pi 0.1.0 → 0.3.0

package/3p/pi-plannotator/apps/pi-extension/plannotator-browser.ts

@@ -441,10 +441,8 @@ export async function startCodeReviewBrowserSession(
 			rawPatch = result.rawPatch;
 			gitRef = result.gitRef;
 			diffError = result.error;
-			// Remember which base the initial diff was computed against so it can
-			// be forwarded to the server below. Only matters when the caller
-			// overrode the detected default; otherwise it matches gitCtx already.
 			initialBase = result.base;
+
 		} else {
 			workspace = await buildLocalWorkspaceReview(cwd, {
 				requestedDiffType: options.diffType,

package/3p/pi-plannotator/packages/shared/review-core.ts

@@ -741,8 +741,6 @@ export async function runGitDiff(
     }
   } catch (error) {
     const raw = error instanceof Error ? error.message : String(error);
-    // Git dumps its entire --help output on some failures; keep only the
-    // first meaningful line so the UI doesn't vomit a wall of text.
     const firstLine = raw.split("\n").find((l) => l.trim().length > 0) ?? raw;
     const message = firstLine.length > 200 ? firstLine.slice(0, 200) + "…" : firstLine;
     return {

package/3p/pi-subagents/src/index.ts

@@ -368,17 +368,24 @@ Use get_subagent_result for full output.`,
   /** Helper: build event data for lifecycle events from an AgentRecord. */
   function buildEventData(record: AgentRecord) {
     const durationMs = record.completedAt ? record.completedAt - record.startedAt : Date.now() - record.startedAt;
-    let tokens: { input: number; output: number; total: number } | undefined;
+    let tokens: { input: number; output: number; cacheRead: number; cacheWrite: number; total: number; cost: number } | undefined;
     try {
       if (record.session) {
         const stats = record.session.getSessionStats();
         tokens = {
           input: stats.tokens?.input ?? 0,
           output: stats.tokens?.output ?? 0,
+          cacheRead: stats.tokens?.cacheRead ?? 0,
+          cacheWrite: stats.tokens?.cacheWrite ?? 0,
           total: stats.tokens?.total ?? 0,
+          cost: typeof stats.cost === "number" ? stats.cost : 0,
         };
       }
     } catch { /* session stats unavailable */ }
+    let modelId: string | undefined;
+    try {
+      modelId = record.session?.model?.id;
+    } catch {}
     return {
       id: record.id,
       type: record.type,
@@ -388,6 +395,7 @@ Use get_subagent_result for full output.`,
       status: record.status,
       toolUses: record.toolUses,
       durationMs,
+      modelId,
       tokens,
     };
   }

package/extensions/orchestrator/agents/brainstorm-reviewer.ts

@@ -58,6 +58,7 @@ export function createBrainstormReviewerAgent(
       "",
       "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
       "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
+      "Do NOT implement, fix, or modify any source code — you are a reviewer, not an implementer.",
       "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,

package/extensions/orchestrator/agents/code-reviewer.ts

@@ -73,6 +73,7 @@ export function createCodeReviewerAgent(
       "",
       "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
       "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
+      "Do NOT implement, fix, or modify any source code — you are a reviewer, not an implementer.",
       "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,

package/extensions/orchestrator/agents/plan-reviewer.ts

@@ -54,11 +54,14 @@ export function createPlanReviewerAgent(
       'You can spawn subagents: Agent(subagent_type="Explore", ...) for codebase, Agent(subagent_type="Librarian", ...) for external docs.',
       "",
       // --- dynamic suffix ---
-      "# MANDATORY: Write your review to this exact file using the write tool:",
+      "# MANDATORY OUTPUT",
+      "",
+      "Write your review to this exact file using the write tool:",
       `  ${outputPath}`,
       "",
       "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
       "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
+      "Do NOT implement, fix, or modify any source code — you are a reviewer, not an implementer.",
       "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,

package/extensions/orchestrator/agents/planner.ts

@@ -43,11 +43,22 @@ export function createPlannerAgent(
       'You can spawn subagents: Agent(subagent_type="Explore", ...) for codebase, Agent(subagent_type="Librarian", ...) for external docs.',
       "",
       // --- dynamic suffix ---
-      "# MANDATORY: Write your plan to this exact file using the write tool:",
+      "# MANDATORY OUTPUT",
+      "",
+      "Write your plan to this exact file using the write tool:",
       `  ${outputPath}`,
       "",
       "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
-      "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
+      "",
+      "# CRITICAL: DO NOT IMPLEMENT ANYTHING",
+      "",
+      "You are a PLANNER, not an implementer. Your ONLY output is the plan file above.",
+      "- Do NOT write, edit, or create any file outside .pp/state/",
+      "- Do NOT create fix scripts, patches, or code files",
+      "- Do NOT modify source code, tests, configs, or any project file",
+      "- Do NOT use bash to write files (no echo >, sed -i, tee, scripts, etc.)",
+      "- If you catch yourself starting to implement — STOP IMMEDIATELY and go back to planning",
+      "- Violating this will cause your output to be DISCARDED",
       "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,

package/extensions/orchestrator/agents/tool-routing.ts

@@ -17,6 +17,15 @@ export const WORKING_PRINCIPLES_READONLY = [
   "",
   "- Verify, don't assume. Check actual state with tools. Never guess paths, types, or APIs.",
   "- Evidence over claims. Show what you found with file paths and tool output, not guesses.",
+  "",
+  "# STRICT READ-ONLY CONSTRAINT",
+  "",
+  "You are a READ-ONLY agent. You MUST NOT modify any source code, configuration, or project files.",
+  "- Do NOT use write or edit tools on any file outside .pp/state/",
+  "- Do NOT use bash to create, modify, or delete files (no echo >, sed -i, tee, mv, cp, rm, touch, etc.)",
+  "- Do NOT create scripts or run commands that modify the filesystem",
+  "- You MAY use bash for read-only commands: git log, git diff, go list, npm ls, cat, find, ls, etc.",
+  "- Violating this constraint is a critical failure. Your output will be discarded if you modify source files.",
 ].join("\n");
 
 export const FAILURE_RECOVERY = [

package/extensions/orchestrator/command-handlers.test.ts

@@ -5,11 +5,11 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { registerCommandHandlers } from "./command-handlers.js";
 import { Orchestrator, type ActiveTask } from "./orchestrator.js";
 
-vi.mock("./event-handlers.js", () => ({
-  runUserGateDialog: vi.fn().mockResolvedValue("User wants to continue. Run /pp:next when ready to advance."),
+vi.mock("./pp-menu.js", () => ({
+  showPpMenu: vi.fn().mockResolvedValue(undefined),
 }));
 
-import { runUserGateDialog } from "./event-handlers.js";
+import { showPpMenu } from "./pp-menu.js";
 
 type Handler = (args: string | undefined, ctx: any) => any;
 
@@ -22,7 +22,7 @@ function makeTempDir(): string {
 }
 
 afterEach(() => {
-  vi.mocked(runUserGateDialog).mockClear();
+  vi.mocked(showPpMenu).mockClear();
   while (tempDirs.length > 0) {
     const dir = tempDirs.pop();
     if (dir) rmSync(dir, { recursive: true, force: true });
@@ -53,6 +53,7 @@ function makeConfig() {
       implement: { model: "a/b", thinking: "high" },
       debug: { model: "a/b", thinking: "high" },
       brainstorm: { model: "a/b", thinking: "high" },
+      review: { model: "a/b", thinking: "high" },
     },
     planners: {},
     planReviewers: {},
@@ -109,8 +110,8 @@ function makeCtx() {
   };
 }
 
-describe("pp:next user gate", () => {
-  it("routes pp:next to shared user gate dialog", async () => {
+describe("pp command", () => {
+  it("opens pp menu command", async () => {
     const pi = makePi();
     const orchestrator = new Orchestrator(pi as any);
     const taskDir = makeTempDir();
@@ -121,30 +122,31 @@ describe("pp:next user gate", () => {
 
     const ctx = makeCtx();
 
-    const ppNext = pi._commands.get("pp:next");
-    await ppNext!.handler(undefined, ctx);
-
-    expect(runUserGateDialog).toHaveBeenCalledOnce();
-    expect(pi.sendUserMessage).toHaveBeenCalledWith("[PI-PI] User wants to continue. Run /pp:next when ready to advance.");
+    const pp = pi._commands.get("pp");
+    expect(pp).toBeTruthy();
+    await pp!.handler(undefined, ctx);
+    expect(showPpMenu).toHaveBeenCalledWith(orchestrator, ctx, "command");
   });
 
-  it("returns error when no active task", async () => {
+  it("sends follow-up message when menu returns text", async () => {
     const pi = makePi();
     const orchestrator = new Orchestrator(pi as any);
-    orchestrator.cwd = makeTempDir();
+    const taskDir = makeTempDir();
+    orchestrator.cwd = taskDir;
     orchestrator.config = makeConfig() as any;
+    orchestrator.active = makeActiveTask(taskDir);
     registerCommandHandlers(orchestrator);
 
     const ctx = makeCtx();
+    vi.mocked(showPpMenu).mockResolvedValueOnce("User wants to continue. Run /pp when ready to advance.");
 
-    const ppNext = pi._commands.get("pp:next");
-    await ppNext!.handler(undefined, ctx);
-
-    expect(ctx.ui.notify).toHaveBeenCalledWith("No active task.", "error");
-    expect(runUserGateDialog).not.toHaveBeenCalled();
+    const pp = pi._commands.get("pp");
+    expect(pp).toBeTruthy();
+    await pp!.handler(undefined, ctx);
+    expect(pi.sendUserMessage).toHaveBeenCalledWith("[PI-PI] User wants to continue. Run /pp when ready to advance.");
   });
 
-  it("passes standard summary text to user gate dialog", async () => {
+  it("registers pp command", () => {
     const pi = makePi();
     const orchestrator = new Orchestrator(pi as any);
     const taskDir = makeTempDir();
@@ -153,11 +155,6 @@ describe("pp:next user gate", () => {
     orchestrator.active = makeActiveTask(taskDir);
     registerCommandHandlers(orchestrator);
 
-    const ctx = makeCtx();
-
-    const ppNext = pi._commands.get("pp:next");
-    await ppNext!.handler(undefined, ctx);
-
-    expect(runUserGateDialog).toHaveBeenCalledWith(orchestrator, ctx, "Choose next action");
+    expect(pi._commands.has("pp")).toBe(true);
   });
 });

package/extensions/orchestrator/config.test.ts

@@ -89,6 +89,7 @@ describe("validateConfig", () => {
           implement: { model: "provider/model-1" },
           debug: { model: "provider/model-2" },
           brainstorm: { model: "provider/model-3" },
+          review: { model: "provider/model-4" },
         },
         planners: {
           good: { enabled: true, model: "provider/model-4" },

package/extensions/orchestrator/config.ts

@@ -37,6 +37,7 @@ export interface PiPiConfig {
     implement: ModelConfig;
     debug: ModelConfig;
     brainstorm: ModelConfig;
+    review: ModelConfig;
   };
   planners: Record<string, VariantConfig>;
   planReviewers: Record<string, VariantConfig>;
@@ -61,6 +62,7 @@ const DEFAULT_CONFIG: PiPiConfig = {
     implement: { model: "anthropic/claude-opus-4-6", thinking: "high" },
     debug: { model: "openai/gpt-5.4", thinking: "high" },
     brainstorm: { model: "anthropic/claude-opus-4-6", thinking: "high" },
+    review: { model: "anthropic/claude-opus-4-6", thinking: "high" },
   },
   planners: {
     opus: { enabled: true, model: "anthropic/claude-opus-4-6", thinking: "high" },
@@ -128,7 +130,7 @@ export function deepMerge(target: Record<string, any>, source: Record<string, an
 
 export function validateConfig(config: Record<string, any>): void {
   if (config.mainModel) {
-    for (const key of ["implement", "debug", "brainstorm"]) {
+    for (const key of ["implement", "debug", "brainstorm", "review"]) {
       const mc = config.mainModel[key];
       if (mc && typeof mc.model === "string" && mc.model.length === 0) {
         throw new Error(`config.mainModel.${key}.model must be non-empty`);

package/extensions/orchestrator/custom-footer.ts

@@ -0,0 +1,146 @@
+import { homedir } from "node:os";
+import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, visibleWidth, type Component, type TUI } from "@earendil-works/pi-tui";
+import type { UsageTracker } from "./usage-tracker.js";
+
+let footerCtx: ExtensionContext | undefined;
+let footerTracker: UsageTracker | undefined;
+
+export function setFooterContext(ctx: ExtensionContext): void {
+  footerCtx = ctx;
+}
+
+export function setFooterTracker(tracker: UsageTracker): void {
+  footerTracker = tracker;
+}
+
+function formatTokens(count: number): string {
+  if (count < 1000) return count.toString();
+  if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
+  if (count < 1000000) return `${Math.round(count / 1000)}k`;
+  if (count < 10000000) return `${(count / 1000000).toFixed(1)}M`;
+  return `${Math.round(count / 1000000)}M`;
+}
+
+function sanitizeStatusText(text: string): string {
+  return text.replace(/[\r\n\t]/g, " ").replace(/ +/g, " ").trim();
+}
+
+function formatPath(cwd: string): string {
+  const home = homedir();
+  return cwd.startsWith(home) ? `~${cwd.slice(home.length)}` : cwd;
+}
+
+function toThinkingLevel(ctx: ExtensionContext | undefined): string {
+  if (!ctx) return "off";
+  const entries = ctx.sessionManager.getEntries();
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i] as any;
+    if (entry?.type === "thinking_level_change" && typeof entry.thinkingLevel === "string") {
+      return entry.thinkingLevel;
+    }
+  }
+  return "off";
+}
+
+function toContextUsagePart(ctx: ExtensionContext | undefined, theme: Theme): string {
+  const usage = ctx?.getContextUsage();
+  const contextWindow = usage?.contextWindow ?? 0;
+  const percentValue = usage?.percent ?? null;
+  const percentText = percentValue === null ? "?" : percentValue.toFixed(1);
+  const display = `${percentText}%/${formatTokens(contextWindow)} (auto)`;
+  if (percentValue !== null && percentValue > 90) return theme.fg("error", display);
+  if (percentValue !== null && percentValue > 70) return theme.fg("warning", display);
+  return display;
+}
+
+function renderStatsLine(width: number, theme: Theme): string {
+  const ctx = footerCtx;
+  const tracker = footerTracker;
+
+  const inputTokens = tracker?.getTotalInputTokens() ?? 0;
+  const outputTokens = tracker?.getTotalOutputTokens() ?? 0;
+  const cacheRate = tracker?.getCacheHitRate() ?? 0;
+  const totalCost = tracker?.getTotalCost() ?? 0;
+
+  const leftParts: string[] = [`↑${formatTokens(inputTokens)}`, `↓${formatTokens(outputTokens)}`];
+  if (cacheRate > 0) leftParts.push(`⚡${Math.round(cacheRate * 100)}%`);
+  if (totalCost > 0) leftParts.push(`$${totalCost.toFixed(2)}`);
+  leftParts.push(toContextUsagePart(ctx, theme));
+  let left = leftParts.join(" ");
+
+  const modelId = ctx?.model?.id ?? "no-model";
+  const provider = ctx?.model?.provider ?? "unknown";
+  const thinkingLevel = toThinkingLevel(ctx);
+  let right = `(${provider}) ${modelId} • ${thinkingLevel}`;
+
+  let leftWidth = visibleWidth(left);
+  if (leftWidth > width) {
+    left = truncateToWidth(left, width, "...");
+    leftWidth = visibleWidth(left);
+    right = "";
+  }
+
+  const minPadding = 2;
+  const rightWidth = visibleWidth(right);
+  const totalNeeded = leftWidth + minPadding + rightWidth;
+  let fullLine: string;
+
+  if (right && totalNeeded <= width) {
+    const padding = " ".repeat(width - leftWidth - rightWidth);
+    fullLine = left + padding + right;
+  } else if (right) {
+    const availableRight = width - leftWidth - minPadding;
+    if (availableRight > 0) {
+      const truncatedRight = truncateToWidth(right, availableRight, "");
+      const truncatedRightWidth = visibleWidth(truncatedRight);
+      const padding = " ".repeat(Math.max(0, width - leftWidth - truncatedRightWidth));
+      fullLine = left + padding + truncatedRight;
+    } else {
+      fullLine = left;
+    }
+  } else {
+    fullLine = left;
+  }
+
+  const remainder = fullLine.slice(left.length);
+  return theme.fg("dim", left) + theme.fg("dim", remainder);
+}
+
+function renderPathLine(width: number, theme: Theme, footerData: ReadonlyFooterDataProvider): string {
+  const ctx = footerCtx;
+  const path = formatPath(ctx?.cwd ?? process.cwd());
+  const branch = footerData.getGitBranch();
+  const sessionName = ctx?.sessionManager.getSessionName();
+
+  let line = path;
+  if (branch) line += ` (${branch})`;
+  if (sessionName) line += ` • ${sessionName}`;
+
+  return truncateToWidth(theme.fg("dim", line), width, theme.fg("dim", "..."));
+}
+
+function renderStatusLine(width: number, theme: Theme, footerData: ReadonlyFooterDataProvider): string | undefined {
+  const statuses = footerData.getExtensionStatuses();
+  if (statuses.size === 0) return undefined;
+
+  const line = Array.from(statuses.entries())
+    .sort(([a], [b]) => a.localeCompare(b))
+    .map(([, text]) => sanitizeStatusText(text))
+    .join(" ");
+
+  return truncateToWidth(theme.fg("dim", line), width, theme.fg("dim", "..."));
+}
+
+export function createCustomFooter(_tui: TUI, theme: Theme, footerData: ReadonlyFooterDataProvider): Component & { dispose?(): void } {
+  return {
+    render(width: number): string[] {
+      const line1 = renderPathLine(width, theme, footerData);
+      const line2 = renderStatsLine(width, theme);
+      const line3 = renderStatusLine(width, theme, footerData) ?? theme.fg("dim", "");
+      return [line1, line2, line3];
+    },
+    invalidate(): void {},
+    dispose(): void {},
+  };
+}

package/extensions/orchestrator/event-handlers.test.ts

@@ -34,6 +34,7 @@ function makeConfig() {
       implement: { model: "a/b", thinking: "high" },
       debug: { model: "a/b", thinking: "high" },
       brainstorm: { model: "a/b", thinking: "high" },
+      review: { model: "a/b", thinking: "high" },
     },
     planners: {},
     planReviewers: {},