@gobing-ai/spur 0.4.1 → 0.4.3

package/plugins/sp/scripts/inline-run-setup.mjs

@@ -3,9 +3,7 @@
 
 // plugins/sp/scripts/inline-run-setup.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync3 } from "fs";
-import { dirname, join as join3, resolve } from "path";
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // plugins/sp/lib/env.ts
 function getEnvVar(name, fallback) {
@@ -14,8 +12,30 @@ function getEnvVar(name, fallback) {
 }
 
 // plugins/sp/lib/inline-run-app.ts
-async function loadInlineApp(spurBin, resolveAppEntry, required) {
-  const { entry, portable } = resolveAppEntry(spurBin);
+import { existsSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+function resolveAppEntry(spurBin) {
+  const fallback = fileURLToPath(new URL("../../../apps/cli/src/index.ts", import.meta.url));
+  const candidates = spurBin !== "" ? [spurBin] : [fallback];
+  for (const candidate of candidates) {
+    const tokens = candidate.split(/\s+/).filter(Boolean);
+    const mainModule = [...tokens].reverse().find((t) => t.endsWith(".ts"));
+    if (mainModule === undefined || !existsSync(mainModule))
+      continue;
+    const repoRoot = resolve(dirname(mainModule), "..", "..", "..");
+    const appEntry = join(repoRoot, "packages", "app", "src", "index.ts");
+    if (existsSync(appEntry))
+      return { entry: appEntry, portable: false };
+  }
+  const entry = fileURLToPath(new URL("../lib/inline-run.generated.mjs", import.meta.url));
+  if (!existsSync(entry)) {
+    throw new Error("inline application bundle is missing — rebuild/install the sp plugin before running inline");
+  }
+  return { entry, portable: true };
+}
+async function loadInlineApp(spurBin, resolveAppEntry2, required) {
+  const { entry, portable } = resolveAppEntry2(spurBin);
   const app = await import(entry);
   const missing = portable ? required.filter((name) => typeof app[name] !== "function") : [];
   if (missing.length > 0) {
@@ -30,16 +50,14 @@ function getEnvVars() {
 }
 
 // plugins/sp/lib/run-summary-core.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join as join2 } from "node:path";
+import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join as join3 } from "node:path";
 
-// plugins/sp/lib/transcript.ts
-import { existsSync, readdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-var SESSION_ID = /^[A-Za-z0-9_-]+$/;
-var OPERATOR_TOOLS = new Set(["AskUserQuestion", "ask_user_question"]);
-var PI_ROLES = new Set(["user", "assistant", "toolResult"]);
+// plugins/sp/lib/plan-projection.generated.mjs
+var NON_ABORTING_PREFLIGHT_CODES = new Set([
+  "L4.scenario-unverified",
+  "L4.verifying-incomplete-tasks"
+]);
 var zeroTokens = () => ({ input: 0, cacheCreate: 0, cacheRead: 0, output: 0 });
 function formatDuration(ms) {
   const s = Math.round(ms / 1000);
@@ -59,18 +77,40 @@ function formatTokenSplit(t) {
   const nonCached = t.input + t.cacheCreate + t.output;
   return `${formatTokens(nonCached + t.cacheRead)} / ${formatTokens(nonCached)}`;
 }
+var OPERATOR_TOOLS = new Set(["AskUserQuestion", "ask_user_question"]);
+function isCompaction(row) {
+  return row.type === "compaction" || row.type === "system" && row.subtype === "compact_boundary";
+}
+function firstTextContent(row) {
+  const content = row.message?.content;
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return;
+  return content.find((b) => b.type === "text")?.text;
+}
+function skillInvocationPrompt(text) {
+  const name = /^\s*<skill name="([^"]+)"/.exec(text)?.[1];
+  if (name === undefined)
+    return;
+  const close = text.lastIndexOf("</skill>");
+  const args = close < 0 ? "" : text.slice(close + "</skill>".length).trim();
+  return args === "" ? `/${name}` : `/${name} ${args}`;
+}
 function promptText(row) {
+  if (row.type === "custom_message") {
+    if (row.display === false)
+      return;
+    const text = typeof row.content === "string" ? row.content.trim() : "";
+    return text === "" ? undefined : text;
+  }
   if (row.type === "message") {
     if (row.message?.role !== "user")
       return;
-    if (isInjectedPrompt(row))
-      return;
-    const content2 = row.message.content;
-    if (typeof content2 === "string")
-      return content2;
-    if (!Array.isArray(content2))
+    const text = firstTextContent(row);
+    if (text === undefined)
       return;
-    return content2.find((b) => b.type === "text")?.text;
+    return skillInvocationPrompt(text) ?? text;
   }
   if (row.type !== "user" || row.isMeta || row.isCompactSummary)
     return;
@@ -81,13 +121,6 @@ function promptText(row) {
     return;
   return content.find((b) => b.type === "text")?.text;
 }
-function isInjectedPrompt(row) {
-  if (row.type !== "message" || row.message?.role !== "user")
-    return false;
-  const content = row.message.content;
-  const text = typeof content === "string" ? content : Array.isArray(content) ? content.find((b) => b.type === "text")?.text : undefined;
-  return typeof text === "string" && text.replace(/^\s+/, "").startsWith('<skill name="');
-}
 function sumTokens(all) {
   const total = zeroTokens();
   for (const t of all)
@@ -159,72 +192,14 @@ function accumulate(acc, row, ts) {
     });
   }
 }
-function isCompaction(row) {
-  return row.type === "compaction" || row.type === "system" && row.subtype === "compact_boundary";
-}
-function sniffFormat(rows) {
-  for (const row of rows) {
-    if (row.type === "message" && PI_ROLES.has(row.message?.role ?? ""))
-      return "pi";
-    if (row.type === "user" || row.type === "assistant")
-      return "claude";
-  }
-  return "unknown";
-}
-function parseRows(lines) {
-  const rows = [];
-  let skippedLines = 0;
-  for (const line of lines) {
-    if (!line.trim())
-      continue;
-    let row;
-    try {
-      row = JSON.parse(line);
-    } catch {
-      skippedLines++;
-      continue;
-    }
-    const ts = row.timestamp ? Date.parse(row.timestamp) : Number.NaN;
-    if (!Number.isNaN(ts))
-      rows.push([row, ts]);
-  }
-  return { rows, skippedLines, format: sniffFormat(rows.map(([r]) => r)) };
-}
-function resolveTranscript(env, projectsRoot = join(homedir(), ".claude", "projects"), override) {
-  if (override)
-    return existsSync(override) ? { ok: true, path: override } : { ok: false, reason: "no transcript" };
-  const id = env.CLAUDE_CODE_SESSION_ID;
-  if (!id) {
-    const piFile = env.PI_SESSION_FILE;
-    if (piFile !== undefined && piFile !== "") {
-      return existsSync(piFile) ? { ok: true, path: piFile } : { ok: false, reason: `PI_SESSION_FILE ${piFile} does not exist` };
-    }
-    return {
-      ok: false,
-      reason: "no host session id; pass --transcript <path> (pi: ~/.pi/agent/sessions/<cwd-slug>/<file>.jsonl, " + "or set PI_SESSION_FILE)"
-    };
-  }
-  if (!SESSION_ID.test(id))
-    return { ok: false, reason: "refusing a session id with path characters" };
-  if (!existsSync(projectsRoot))
-    return { ok: false, reason: `no transcript root ${projectsRoot}` };
-  for (const dir of readdirSync(projectsRoot)) {
-    const path = join(projectsRoot, dir, `${id}.jsonl`);
-    if (existsSync(path))
-      return { ok: true, path };
-  }
-  return { ok: false, reason: `no transcript for session ${id}` };
-}
-
-// plugins/sp/lib/run-summary-core.ts
 var IDLE_GAP_MS = 300000;
 var SHELL_TOOLS = new Set(["bash", "shell", "exec", "exec_command", "run_command", "command"]);
 var SUBAGENT_TOOLS = new Set(["agent", "task", "invoke_subagent", "subagent", "dispatch_agent"]);
-var OPERATOR_TOOLS2 = new Set(["askuserquestion", "ask_user_question"]);
+var LOWERCASE_OPERATOR_TOOLS = new Set(["askuserquestion", "ask_user_question"]);
 var ACTOR_PRECEDENCE = ["operator", "subagent", "shell", "other"];
 function actorOf(tool) {
   const t = tool.toLowerCase().replace(/[^a-z_]/g, "");
-  if (OPERATOR_TOOLS2.has(t))
+  if (LOWERCASE_OPERATOR_TOOLS.has(t))
     return "operator";
   if (SUBAGENT_TOOLS.has(t))
     return "subagent";
@@ -374,7 +349,8 @@ function summaryRow(stage, status, span, measured) {
     token: formatTokenSplit(measured ? span.tokens : null)
   };
 }
-function buildRunSummary(lines, inputs, since, until) {
+function buildRunSummary(rows, inputs, opts = {}) {
+  const { since, until } = opts;
   const windows = [];
   for (const { label, progress } of inputs) {
     const states = (progress.states ?? []).flatMap((s) => {
@@ -400,7 +376,6 @@ function buildRunSummary(lines, inputs, since, until) {
     }
   }
   windows.sort((a, b) => a.start - b.start);
-  const { rows, skippedLines } = parseRows(lines);
   const measure = (start, end) => {
     const acc = newAcc(start);
     for (const [row, ts] of rows)
@@ -448,9 +423,87 @@ function buildRunSummary(lines, inputs, since, until) {
     total,
     actors: actorSplit(rows, totalStart, totalEnd),
     gate: { ms: null, reason: "no matching check receipt" },
-    skippedLines
+    skippedLines: opts.skippedLines ?? 0
   };
 }
+var SENSITIVE_PREFIXES = ["drizzle/", "packages/config/", ".github/", "plugins/sp/hooks/"];
+var SENSITIVE_GLOBS = ["apps/server/src/**/auth*", "**/*secret*", "**/*.sql"];
+function globToRegex(glob) {
+  const escaped = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("**/", "\x00").replaceAll("**", "\x01").replaceAll("*", "[^/]*").replaceAll("\x00", "(?:.*/)?").replaceAll("\x01", ".*");
+  return new RegExp(`^${escaped}$`, "s");
+}
+var SENSITIVE_MATCHERS = [
+  ...SENSITIVE_PREFIXES.map((prefix) => ({
+    label: prefix,
+    test: (path) => path.startsWith(prefix)
+  })),
+  ...SENSITIVE_GLOBS.map((glob) => {
+    const regex = globToRegex(glob);
+    return { label: glob, test: (path) => regex.test(path) };
+  })
+];
+
+// plugins/sp/lib/transcript.ts
+import { existsSync as existsSync2, readdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+var SESSION_ID = /^[A-Za-z0-9_-]+$/;
+var PI_ROLES = new Set(["user", "assistant", "toolResult"]);
+function sniffFormat(rows) {
+  for (const row of rows) {
+    if (row.type === "message" && PI_ROLES.has(row.message?.role ?? ""))
+      return "pi";
+    if (row.type === "user" || row.type === "assistant")
+      return "claude";
+  }
+  return "unknown";
+}
+function parseRows(lines) {
+  const rows = [];
+  let skippedLines = 0;
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    let row;
+    try {
+      row = JSON.parse(line);
+    } catch {
+      skippedLines++;
+      continue;
+    }
+    const ts = row.timestamp ? Date.parse(row.timestamp) : Number.NaN;
+    if (!Number.isNaN(ts))
+      rows.push([row, ts]);
+  }
+  return { rows, skippedLines, format: sniffFormat(rows.map(([r]) => r)) };
+}
+function resolveTranscript(env, projectsRoot = join2(homedir(), ".claude", "projects"), override) {
+  if (override)
+    return existsSync2(override) ? { ok: true, path: override } : { ok: false, reason: "no transcript" };
+  const id = env.CLAUDE_CODE_SESSION_ID;
+  if (!id) {
+    const piFile = env.PI_SESSION_FILE;
+    if (piFile !== undefined && piFile !== "") {
+      return existsSync2(piFile) ? { ok: true, path: piFile } : { ok: false, reason: `PI_SESSION_FILE ${piFile} does not exist` };
+    }
+    return {
+      ok: false,
+      reason: "no host session id; pass --transcript <path> (pi: ~/.pi/agent/sessions/<cwd-slug>/<file>.jsonl, " + "or set PI_SESSION_FILE)"
+    };
+  }
+  if (!SESSION_ID.test(id))
+    return { ok: false, reason: "refusing a session id with path characters" };
+  if (!existsSync2(projectsRoot))
+    return { ok: false, reason: `no transcript root ${projectsRoot}` };
+  for (const dir of readdirSync(projectsRoot)) {
+    const path = join2(projectsRoot, dir, `${id}.jsonl`);
+    if (existsSync2(path))
+      return { ok: true, path };
+  }
+  return { ok: false, reason: `no transcript for session ${id}` };
+}
+
+// plugins/sp/lib/run-summary-core.ts
 function renderSummaryMarkdown(summary) {
   const line = (r, bold = false) => {
     const stage = bold ? `**${r.stage}**` : r.stage;
@@ -482,9 +535,9 @@ function renderSummaryMarkdown(summary) {
 }
 function writeCloseSummary(run, opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
-  const runDir = join2(cwd, ".spur", "run");
-  const rel = join2(".spur", "run", `${run.runId}-summary.md`);
-  const abs = join2(cwd, rel);
+  const runDir = join3(cwd, ".spur", "run");
+  const rel = join3(".spur", "run", `${run.runId}-summary.md`);
+  const abs = join3(cwd, rel);
   const na = (reason) => {
     mkdirSync(runDir, { recursive: true });
     writeFileSync(abs, `Execution summary: n/a (${reason})
@@ -497,15 +550,19 @@ function writeCloseSummary(run, opts = {}) {
     const resolved = resolveTranscript(opts.env ?? getEnvVars(), opts.projectsRoot);
     if (!resolved.ok)
       return na(resolved.reason);
-    const lines = readFileSync(resolved.path, "utf8").split(`
-`);
-    const summary = buildRunSummary(lines, [{ progress: run.progress }], run.startedAt, run.completedAt);
+    const { rows, skippedLines } = parseRows(readFileSync(resolved.path, "utf8").split(`
+`));
+    const summary = buildRunSummary(rows, [{ progress: run.progress }], {
+      since: run.startedAt,
+      until: run.completedAt,
+      skippedLines
+    });
     if (summary.rows.length === 0)
       return na("no timed attempts");
     mkdirSync(runDir, { recursive: true });
     writeFileSync(abs, `${renderSummaryMarkdown(summary)}
 `);
-    writeFileSync(join2(runDir, `${run.runId}-summary.json`), JSON.stringify({ ...summary, runId: run.runId, startedAt: run.startedAt, completedAt: run.completedAt }, null, 2));
+    writeFileSync(join3(runDir, `${run.runId}-summary.json`), JSON.stringify({ ...summary, runId: run.runId, startedAt: run.startedAt, completedAt: run.completedAt }, null, 2));
     return rel;
   } catch (error) {
     return na(error instanceof Error ? error.message : String(error));
@@ -541,29 +598,10 @@ function refuseUnsafeRunId(runId) {
   console.error("  The run id must be a single safe filename component (alphanumeric/._-, no leading dot, no path separators, interpolation or traversal; same class as the task-pipeline route-reason guard, task 0804 R8). Allocate a fresh run id (uuid or timestamp slug) and retry.");
   process.exit(1);
 }
-function resolveAppEntry(spurBin) {
-  const fallback = fileURLToPath(new URL("../../../apps/cli/src/index.ts", import.meta.url));
-  const candidates = spurBin !== "" ? [spurBin] : [fallback];
-  for (const candidate of candidates) {
-    const tokens = candidate.split(/\s+/).filter(Boolean);
-    const mainModule = [...tokens].reverse().find((t) => t.endsWith(".ts"));
-    if (mainModule === undefined || !existsSync3(mainModule))
-      continue;
-    const repoRoot = resolve(dirname(mainModule), "..", "..", "..");
-    const appEntry = join3(repoRoot, "packages", "app", "src", "index.ts");
-    if (existsSync3(appEntry))
-      return { entry: appEntry, portable: false };
-  }
-  const entry = fileURLToPath(new URL("../lib/inline-run.generated.mjs", import.meta.url));
-  if (!existsSync3(entry)) {
-    throw new Error("inline application bundle is missing \u2014 rebuild/install the sp plugin before running inline");
-  }
-  return { entry, portable: true };
-}
 var SETUP_EXPORTS = ["readInstalledInventory", "runInlineRunSetup", "writeInlineRunOutcome"];
 async function main() {
   if (!process.versions.bun) {
-    const child = spawnSync("bun", [fileURLToPath(import.meta.url), ...process.argv.slice(2)], {
+    const child = spawnSync("bun", [fileURLToPath2(import.meta.url), ...process.argv.slice(2)], {
       stdio: "inherit"
     });
     if (child.error)
@@ -632,7 +670,7 @@ async function main() {
       refuseUnsafeRunId(runId);
     try {
       const { app: app2, portable: portable2 } = await loadInlineApp(spurBin, resolveAppEntry, ["runInlineRunDecide"]);
-      const { app: lib } = await loadInlineApp(spurBin, () => ({ entry: fileURLToPath(new URL("../lib/inline-run.generated.mjs", import.meta.url)), portable: portable2 }), ["resolveDecideDecisionMakerEnabled", "loadSpurConfig"]);
+      const { app: lib } = await loadInlineApp(spurBin, () => ({ entry: fileURLToPath2(new URL("../lib/inline-run.generated.mjs", import.meta.url)), portable: portable2 }), ["resolveDecideDecisionMakerEnabled", "loadSpurConfig"]);
       const loadOpts = portable2 ? { embeddedSchemas: lib.EMBEDDED_SPUR_SCHEMAS } : undefined;
       const [enabled, spurConfig] = await Promise.all([
         lib.resolveDecideDecisionMakerEnabled(process.cwd(), loadOpts),
@@ -688,7 +726,7 @@ async function main() {
     inventory = await app.readInstalledInventory({
       file,
       spurBin,
-      localCli: fileURLToPath(new URL("../../../apps/cli/src/index.ts", import.meta.url))
+      localCli: fileURLToPath2(new URL("../../../apps/cli/src/index.ts", import.meta.url))
     });
   } catch (error) {
     const message = `could not resolve the workflow definition: ${error instanceof Error ? error.message : String(error)}`;

package/plugins/sp/scripts/inline-run-setup.ts

@@ -3,13 +3,11 @@
  *  handshake, mode dispatch. Mode bodies live in the bundled app service (`runInlineRun*` exports); the `.mjs`
  *  twin re-enters Bun in `main()` (SQLite) and imports the bundle dynamically, so bare `node` never loads app code. */
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 // Type-only namespace import (erased before bundling; the smoke scanner exempts `import type`).
 import type * as spurApp from '@gobing-ai/spur-app';
 import { getEnvVar } from '../lib/env';
-import { loadInlineApp } from '../lib/inline-run-app';
+import { loadInlineApp, resolveAppEntry } from '../lib/inline-run-app';
 import { writeCloseSummary } from './run-summary';
 
 // EMBEDDED_SPUR_SCHEMAS: declared by the bundle twin, never exported by the barrel — optional
@@ -47,24 +45,6 @@ function refuseUnsafeRunId(runId: string): never {
 }
 
 /** Resolve the app entry: --spur-bin/SPUR_BIN main module if it proves a repo checkout, else the adjacent bundle. */
-function resolveAppEntry(spurBin: string): { entry: string; portable: boolean } {
-    const fallback = fileURLToPath(new URL('../../../apps/cli/src/index.ts', import.meta.url));
-    const candidates = spurBin !== '' ? [spurBin] : [fallback];
-    for (const candidate of candidates) {
-        const tokens = candidate.split(/\s+/).filter(Boolean);
-        // Main module = last path-like token; only a .ts source entry proves a repo checkout.
-        const mainModule = [...tokens].reverse().find((t) => t.endsWith('.ts'));
-        if (mainModule === undefined || !existsSync(mainModule)) continue;
-        const repoRoot = resolve(dirname(mainModule), '..', '..', '..');
-        const appEntry = join(repoRoot, 'packages', 'app', 'src', 'index.ts');
-        if (existsSync(appEntry)) return { entry: appEntry, portable: false };
-    }
-    const entry = fileURLToPath(new URL('../lib/inline-run.generated.mjs', import.meta.url));
-    if (!existsSync(entry)) {
-        throw new Error('inline application bundle is missing — rebuild/install the sp plugin before running inline');
-    }
-    return { entry, portable: true };
-}
 
 const SETUP_EXPORTS = ['readInstalledInventory', 'runInlineRunSetup', 'writeInlineRunOutcome'] as const;
 

package/plugins/sp/scripts/pr-reviewing.mjs

@@ -480,6 +480,15 @@ ${requestMarker(pr.headRefOid)}`;
   writeStatus(args, "REQUESTED");
   emit(args, { ok: true, requested: true, pr: pr.number, url: pr.url, head: pr.headRefOid, requestedAt, body }, `Requested GitHub Codex review on PR #${pr.number} (${pr.url}) at HEAD ${pr.headRefOid.slice(0, 7)}.`);
 }
+function revalidateWaitTarget(args, number) {
+  const fresh = viewPr();
+  if (!fresh || fresh.number !== number) {
+    writeStatus(args, "FAIL");
+    fail(args, `PR #${number} is no longer the branch's PR (view reports ${fresh ? `#${fresh.number}` : "none"}) \u2014 request a fresh review`, 2);
+  }
+  requireExpectedHead(args, fresh);
+  return fresh;
+}
 function cmdWait(args) {
   const since = args.flags.get("--since") ?? new Date().toISOString();
   const timeoutSec = Number(args.flags.get("--timeout") ?? "600");
@@ -494,24 +503,29 @@ function cmdWait(args) {
     writeStatus(args, "FAIL");
     fail(args, "no PR for the current branch", 2);
   }
+  const number = pr.number;
   requireExpectedHead(args, pr);
   const deadline = Date.now() + timeoutSec * 1000;
   for (;; ) {
-    const reviews = fetchReviews(ctx, pr.number);
-    const findings = normalizeFindings(reviews, fetchInlineComments(ctx, pr.number), fetchIssueComments(ctx, pr.number), since, pr.headRefOid);
+    const observed = revalidateWaitTarget(args, number);
+    const reviews = fetchReviews(ctx, number);
+    const findings = normalizeFindings(reviews, fetchInlineComments(ctx, number), fetchIssueComments(ctx, number), since, observed.headRefOid);
     if (findings.length > 0) {
+      revalidateWaitTarget(args, number);
       writeStatus(args, "FOUND");
       emit(args, { ok: true, verdict: "FOUND", findings }, renderFindings(findings));
       return;
     }
-    if (hasCurrentCleanReview(reviews, since, pr.headRefOid)) {
+    if (hasCurrentCleanReview(reviews, since, observed.headRefOid)) {
+      const fresh = revalidateWaitTarget(args, number);
       writeStatus(args, "CLEAN");
-      emit(args, { ok: true, verdict: "CLEAN", pr: pr.number, url: pr.url, head: pr.headRefOid, findings: [] }, `Codex review completed cleanly for HEAD ${pr.headRefOid.slice(0, 7)}.`);
+      emit(args, { ok: true, verdict: "CLEAN", pr: fresh.number, url: fresh.url, head: fresh.headRefOid, findings: [] }, `Codex review completed cleanly for HEAD ${fresh.headRefOid.slice(0, 7)}.`);
       return;
     }
     if (Date.now() >= deadline) {
+      revalidateWaitTarget(args, number);
       writeStatus(args, "TIMEOUT");
-      emit(args, { ok: true, verdict: "TIMEOUT", pr: pr.number, url: pr.url }, `No Codex review within ${timeoutSec}s \u2014 still pending. Collect later with /sp:dev-pr-review collect.
+      emit(args, { ok: true, verdict: "TIMEOUT", pr: number, url: pr.url }, `No Codex review within ${timeoutSec}s \u2014 still pending. Collect later with /sp:dev-pr-review collect.
 PR: ${pr.url}`);
       throw new ScriptExit("", 3, args.booleans.has("--json"));
     }

package/plugins/sp/scripts/pr-reviewing.ts

@@ -703,6 +703,26 @@ function cmdRequest(args: ParsedArgs): void {
     );
 }
 
+/**
+ * 1161 R1: re-read the PR and re-assert the pinned identity + expected head. Called at the start of
+ * every poll and again immediately before any FOUND/CLEAN/TIMEOUT status or output, because a head
+ * captured once at wait start lets a later push return CLEAN for an old commit. A vanished PR, a
+ * different PR on the branch, or a moved head is FAIL/exit2 through the existing error channel.
+ */
+function revalidateWaitTarget(args: ParsedArgs, number: number): GhPr {
+    const fresh = viewPr();
+    if (!fresh || fresh.number !== number) {
+        writeStatus(args, 'FAIL');
+        fail(
+            args,
+            `PR #${number} is no longer the branch's PR (view reports ${fresh ? `#${fresh.number}` : 'none'}) — request a fresh review`,
+            2,
+        );
+    }
+    requireExpectedHead(args, fresh);
+    return fresh;
+}
+
 function cmdWait(args: ParsedArgs): void {
     const since = args.flags.get('--since') ?? new Date().toISOString();
     const timeoutSec = Number(args.flags.get('--timeout') ?? '600');
@@ -715,36 +735,41 @@ function cmdWait(args: ParsedArgs): void {
         writeStatus(args, 'FAIL');
         fail(args, 'no PR for the current branch', 2);
     }
+    const number = pr.number; // 1161 R1: pinned — a switched PR number is a failure, not a retarget.
     requireExpectedHead(args, pr);
-    const deadline = Date.now() + timeoutSec * 1000;
+    const deadline = Date.now() + timeoutSec * 1000; // fixed once; validation never resets it
     for (;;) {
-        const reviews = fetchReviews(ctx, pr.number);
+        const observed = revalidateWaitTarget(args, number);
+        const reviews = fetchReviews(ctx, number);
         const findings = normalizeFindings(
             reviews,
-            fetchInlineComments(ctx, pr.number),
-            fetchIssueComments(ctx, pr.number),
+            fetchInlineComments(ctx, number),
+            fetchIssueComments(ctx, number),
             since,
-            pr.headRefOid,
+            observed.headRefOid,
         );
         if (findings.length > 0) {
+            revalidateWaitTarget(args, number); // pre-return recheck: never FOUND for a moved head
             writeStatus(args, 'FOUND');
             emit(args, { ok: true, verdict: 'FOUND', findings }, renderFindings(findings));
             return;
         }
-        if (hasCurrentCleanReview(reviews, since, pr.headRefOid)) {
+        if (hasCurrentCleanReview(reviews, since, observed.headRefOid)) {
+            const fresh = revalidateWaitTarget(args, number); // pre-return recheck: never CLEAN for a moved head
             writeStatus(args, 'CLEAN');
             emit(
                 args,
-                { ok: true, verdict: 'CLEAN', pr: pr.number, url: pr.url, head: pr.headRefOid, findings: [] },
-                `Codex review completed cleanly for HEAD ${pr.headRefOid.slice(0, 7)}.`,
+                { ok: true, verdict: 'CLEAN', pr: fresh.number, url: fresh.url, head: fresh.headRefOid, findings: [] },
+                `Codex review completed cleanly for HEAD ${fresh.headRefOid.slice(0, 7)}.`,
             );
             return;
         }
         if (Date.now() >= deadline) {
+            revalidateWaitTarget(args, number); // a head moved while pending is a failure, not a timeout
             writeStatus(args, 'TIMEOUT');
             emit(
                 args,
-                { ok: true, verdict: 'TIMEOUT', pr: pr.number, url: pr.url },
+                { ok: true, verdict: 'TIMEOUT', pr: number, url: pr.url },
                 `No Codex review within ${timeoutSec}s — still pending. Collect later with /sp:dev-pr-review collect.\nPR: ${pr.url}`,
             );
             throw new ScriptExit('', 3, args.booleans.has('--json'));