pi-orchestrator-config 4.2.0 → 4.3.2

package/extensions/orchestrator/overlay-dashboard.ts

@@ -109,6 +109,8 @@ export class OverlayListDashboard<
 > implements Component {
   private closed = false;
   private ticker: ReturnType<typeof setInterval>;
+  private cachedWidth: number | undefined;
+  private cachedLines: string[] | undefined;
 
   constructor(
     private tui: TUI,
@@ -118,7 +120,7 @@ export class OverlayListDashboard<
     private selection: OverlaySelection<TId>,
     private done: (value: TId | null) => void,
   ) {
-    this.ticker = setInterval(() => this.tui.requestRender(), 1000);
+    this.ticker = setInterval(() => { this.invalidate(); this.tui.requestRender(); }, 1000);
   }
 
   private items(): TItem[] {
@@ -169,7 +171,8 @@ export class OverlayListDashboard<
         this.selection.index =
           (this.selection.index - 1 + items.length) % items.length;
         this.selection.id = items[this.selection.index]?.id;
-        this.tui.requestRender();
+        this.invalidate();
+        this.tui.requestRender(true);
       }
       return;
     }
@@ -181,7 +184,8 @@ export class OverlayListDashboard<
       if (items.length > 0) {
         this.selection.index = (this.selection.index + 1) % items.length;
         this.selection.id = items[this.selection.index]?.id;
-        this.tui.requestRender();
+        this.invalidate();
+        this.tui.requestRender(true);
       }
       return;
     }
@@ -193,12 +197,15 @@ export class OverlayListDashboard<
           this.close(null);
           return;
         }
-        this.tui.requestRender();
+        this.invalidate();
+        this.tui.requestRender(true);
       }
     }
   }
 
   render(width: number): string[] {
+    if (this.cachedLines && this.cachedWidth === width) return this.cachedLines;
+
     const theme = this.theme;
     const items = this.items();
     reconcileSelection(this.selection, items);
@@ -243,6 +250,8 @@ export class OverlayListDashboard<
       truncateToWidth(theme.fg("dim", `  ${this.spec.footerHints}`), width),
     );
 
+    this.cachedLines = lines;
+    this.cachedWidth = width;
     return lines;
   }
 
@@ -290,7 +299,10 @@ export class OverlayListDashboard<
     return out;
   }
 
-  invalidate(): void {}
+  invalidate(): void {
+    this.cachedWidth = undefined;
+    this.cachedLines = undefined;
+  }
 }
 
 export class OverlayScrollDetail implements Component {

package/extensions/orchestrator/parse-model-override.ts

@@ -0,0 +1,29 @@
+/** Parse 'provider/model-id' into separate provider and model. Plain 'model-id' returns undefined provider. */
+export function parseModelOverride(modelStr: string | undefined): { model?: string; provider?: string } | undefined {
+  if (!modelStr) return undefined;
+  const trimmed = modelStr.trim();
+  if (!trimmed) return undefined;
+  const slashIdx = trimmed.indexOf("/");
+  if (slashIdx > 0) {
+    const provider = trimmed.slice(0, slashIdx).trim();
+    const model = trimmed.slice(slashIdx + 1).trim();
+    if (!provider || !model) return undefined;
+    return { provider, model };
+  }
+  return { model: trimmed };
+}
+
+/** Merge task-level model override with top-level explicit fallback. Task fields win. */
+export function mergeModelOverride(
+  taskModel: string | undefined,
+  explicit: { model?: string; provider?: string } | undefined,
+): { model?: string; provider?: string } | undefined {
+  const taskParsed = parseModelOverride(taskModel);
+  if (taskParsed) {
+    return {
+      model: taskParsed.model || explicit?.model,
+      provider: taskParsed.provider || explicit?.provider,
+    };
+  }
+  return explicit;
+}

package/extensions/orchestrator/pi-config-review-state.ts

@@ -1,12 +1,20 @@
 /**
  * Review state machine — tracks code review loop status.
- * State stored in <worktree-root>/.pi/data/pi-config-review-state.json (per-worktree, not shared).
+ * State stored in <worktree-root>/.pi/data/pi-config-review-state.jsonl (per-worktree, not shared).
  * Each worktree gets its own state file via resolveWorktreeRoot (--show-toplevel).
  * Used by enforcement to block git commit until all reviewers approve.
+ *
+ * Persistence: append-only JSONL via JsonlStateStore (issue #724).
+ * Each state mutation appends a single JSON line. The latest valid line
+ * is the current state. Auto-compaction prevents unbounded growth.
+ * On first access, migrates any legacy pi-config-review-state.json automatically.
  */
 
-import { existsSync, readFileSync, writeFileSync, unlinkSync, renameSync } from "node:fs";
+import { readFileSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
+import { getSetting } from "./project-settings.js";
+import { createCachedStore } from "./state-jsonl.js";
+import type { JsonlStateStore } from "./state-jsonl.js";
 import { resolveWorktreeRoot, getProjectDataDir } from "./utils.js";
 
 type StateTransitionCallback = (state: ReviewState) => void;
@@ -22,7 +30,7 @@ export function onStateTransition(cb: StateTransitionCallback): void {
 function notifyTransition(state: ReviewState): void {
   if (!onTransitionCb) return;
   try { onTransitionCb({ ...state, reviewers_pending: [...state.reviewers_pending] }); }
-  catch (e: any) { console.debug("[pi-config-review-state] transition callback failed:", e?.message); }
+  catch { /* transition callback failed — fire-and-forget, never propagate */ }
 }
 
 export interface ReviewState {
@@ -37,14 +45,16 @@ export interface ReviewState {
   tests_passed: boolean;
 }
 
-const STATE_FILE = "pi-config-review-state.json";
+const STATE_FILE_JSONL = "pi-config-review-state.jsonl";
+const LEGACY_STATE_FILE = "pi-config-review-state.json";
 
-export function statePath(cwd: string): string {
-  return join(getProjectDataDir(resolveWorktreeRoot(cwd)), STATE_FILE);
+function getStore(cwd: string): JsonlStateStore<ReviewState> {
+  const dataDir = getProjectDataDir(resolveWorktreeRoot(cwd));
+  return createCachedStore<ReviewState>(dataDir, STATE_FILE_JSONL, LEGACY_STATE_FILE);
 }
 
-function ensureDataDir(cwd: string): void {
-  getProjectDataDir(resolveWorktreeRoot(cwd));
+export function statePath(cwd: string): string {
+  return join(getProjectDataDir(resolveWorktreeRoot(cwd)), STATE_FILE_JSONL);
 }
 
 function defaultState(): ReviewState {
@@ -61,29 +71,35 @@ function defaultState(): ReviewState {
   };
 }
 
+/** Normalize a raw parsed object into a valid ReviewState with defaults for missing fields. */
+function normalizeRawState(raw: any): ReviewState {
+  return {
+    status: raw.status ?? "none",
+    cycle: typeof raw.cycle === "number" ? raw.cycle : 0,
+    reviewers_pending: Array.isArray(raw.reviewers_pending) ? raw.reviewers_pending : [],
+    reviewers_total: typeof raw.reviewers_total === "number" ? raw.reviewers_total : 0,
+    findings_count: typeof raw.findings_count === "number" ? raw.findings_count : 0,
+    last_edit_at: typeof raw.last_edit_at === "string" ? raw.last_edit_at : null,
+    last_clean_at: typeof raw.last_clean_at === "string" ? raw.last_clean_at : null,
+    edited_during_cycle: raw.edited_during_cycle === true,
+    tests_passed: raw.tests_passed === true,
+  };
+}
+
 export function readReviewState(cwd: string): ReviewState {
-  const p = statePath(cwd);
-  if (!existsSync(p)) return defaultState();
+  const store = getStore(cwd);
+  const raw = store.read();
+  if (raw === null) return defaultState();
   try {
-    const raw = JSON.parse(readFileSync(p, "utf-8"));
-    return {
-      status: raw.status ?? "none",
-      cycle: typeof raw.cycle === "number" ? raw.cycle : 0,
-      reviewers_pending: Array.isArray(raw.reviewers_pending) ? raw.reviewers_pending : [],
-      reviewers_total: typeof raw.reviewers_total === "number" ? raw.reviewers_total : 0,
-      findings_count: typeof raw.findings_count === "number" ? raw.findings_count : 0,
-      last_edit_at: typeof raw.last_edit_at === "string" ? raw.last_edit_at : null,
-      last_clean_at: typeof raw.last_clean_at === "string" ? raw.last_clean_at : null,
-      edited_during_cycle: raw.edited_during_cycle === true,
-      tests_passed: raw.tests_passed === true,
-    };
-  } catch (e: any) {
-    console.debug("[pi-config-review-state] failed to parse state:", e?.message);
+    return normalizeRawState(raw);
+  } catch {
+    // failed to parse state — return defaults
     return defaultState();
   }
 }
 
 function lockPath(cwd: string): string {
+  // Lock file sits next to the JSONL state file
   return statePath(cwd) + ".lock";
 }
 
@@ -92,7 +108,7 @@ function acquireLock(cwd: string): boolean {
   const maxRetries = 100;
   for (let i = 0; i < maxRetries; i++) {
     try {
-      ensureDataDir(cwd);
+      getProjectDataDir(resolveWorktreeRoot(cwd));
       writeFileSync(lock, String(process.pid), { flag: "wx" });
       return true;
     } catch {
@@ -125,15 +141,11 @@ function releaseLock(cwd: string): void {
 }
 
 function writeState(cwd: string, state: ReviewState): void {
-  const p = statePath(cwd);
   try {
-    ensureDataDir(cwd);
-    // Atomic write: temp file + rename
-    const tmp = `${p}.${process.pid}.tmp`;
-    writeFileSync(tmp, JSON.stringify(state, null, 2) + "\n");
-    renameSync(tmp, p);
-  } catch (e: any) {
-    console.debug("[pi-config-review-state] write failed:", e?.message);
+    const store = getStore(cwd);
+    store.write(state);
+  } catch {
+    // write failed — non-fatal, state file may be stale
   }
 }
 
@@ -254,6 +266,18 @@ export function isReviewClean(cwd: string): boolean {
   return true;
 }
 
+/** Check if commit is allowed — clean review, no tracking, or max cycles exhausted. */
+export function isCommitAllowed(cwd: string): boolean {
+  if (isReviewClean(cwd)) return true;
+  const state = readReviewState(cwd);
+  // Allow commit when max review cycles exhausted — cap reached, no reviewers running
+  if ((state.status === "has_findings" || state.status === "clean" || state.status === "needs_review") && state.reviewers_pending.length === 0) {
+    const maxCycles = getSetting(cwd, "review_loop_max_cycles");
+    if (state.cycle >= maxCycles) return true;
+  }
+  return false;
+}
+
 /** Mark that tests have passed. Only meaningful when review status is being tracked. */
 export function markTestsPassed(cwd: string): void {
   withStateLock(cwd, (state) => {