altimate-receipts 0.6.2 → 0.8.0

package/dist/cli.js

@@ -1,29 +1,33 @@
 #!/usr/bin/env node
 import {
   CHECK_CATALOG,
-  applyDiffScope,
+  authoredBranch,
+  branchShas,
   canonicalize,
-  changedFiles,
   checkForId,
   compareToTranscript,
   copyToClipboard,
-  inDiff,
-  narrowEffort,
+  eventKey,
+  gitInvocations,
   rederiveFromTranscript,
   renderShareMarkdown,
+  shaWindow,
   sliceByBranch,
-  toDsseEnvelope
-} from "./chunk-5R6W4W4R.js";
+  toDsseEnvelope,
+  visibleMergeFindings
+} from "./chunk-NPYC3NGR.js";
 import {
   computeTrends,
   deriveTargets,
   renderTrends,
   upsertTrendsSection
-} from "./chunk-OQJHGUIN.js";
+} from "./chunk-6QULLAVH.js";
 import {
   agentIds,
   anyDetected,
+  applyDiffScope,
   buildReceipt,
+  changedFiles,
   collectGuardrails,
   cwdAtFirstGit,
   deriveFindings,
@@ -31,9 +35,11 @@ import {
   formatCostAlways,
   formatTokens,
   getVersion,
+  inDiff,
   inRepo,
   listSessions,
   loadSession,
+  narrowEffort,
   redact,
   redactReceipt,
   renderCard,
@@ -43,11 +49,12 @@ import {
   selectForBranch,
   selectSummary,
   upsertGuardrailsSection,
-  verifyBundle
-} from "./chunk-72Y2GS7I.js";
+  verifyBundle,
+  windowedEffort
+} from "./chunk-SGVU3CGP.js";
 
 // src/cli.ts
-import { spawnSync as spawnSync5 } from "child_process";
+import { spawnSync as spawnSync4 } from "child_process";
 import {
   existsSync as existsSync4,
   mkdirSync as mkdirSync3,
@@ -234,37 +241,6 @@ function pushReceiptRef(slug, remote = "origin", cwd) {
   return git2(["push", remote, `+${ref}:${ref}`], { cwd }).ok;
 }
 
-// src/trace/gitCommand.ts
-var WRAPPERS = /* @__PURE__ */ new Set(["command", "exec", "nohup", "time", "env"]);
-var GIT_VALUE_FLAGS = /* @__PURE__ */ new Set(["-C", "-c", "--git-dir", "--work-tree", "--exec-path"]);
-function gitInvocations(command) {
-  const blanked = command.replace(/\\["']/g, "  ").replace(/'[^']*'/g, " ").replace(/"[^"]*"/g, " ");
-  const out = [];
-  for (const simple of blanked.split(/(?:&&|\|\||[;|\n])/)) {
-    const tokens = simple.trim().split(/\s+/).filter(Boolean);
-    let i = 0;
-    while (i < tokens.length && (/^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[i]) || WRAPPERS.has(tokens[i]))) {
-      i++;
-    }
-    if (tokens[i] !== "git") {
-      continue;
-    }
-    i++;
-    while (i < tokens.length && tokens[i].startsWith("-")) {
-      const flag = tokens[i];
-      i++;
-      if (GIT_VALUE_FLAGS.has(flag)) {
-        i++;
-      }
-    }
-    const sub = tokens[i];
-    if (sub) {
-      out.push({ sub, rest: tokens.slice(i + 1) });
-    }
-  }
-  return out;
-}
-
 // src/hook/settingsMerge.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { dirname, join as join2 } from "path";
@@ -1146,72 +1122,6 @@ function renderHandoffMarkdown(h) {
 `;
 }
 
-// src/trace/commitMatch.ts
-import { spawnSync as spawnSync4 } from "child_process";
-var SHA_CAP = 200;
-function branchShas(base, cwd) {
-  if (!base) {
-    return [];
-  }
-  const r = spawnSync4("git", ["log", `--max-count=${SHA_CAP}`, "--format=%H", `${base}..HEAD`], {
-    encoding: "utf8",
-    cwd
-  });
-  if (r.status !== 0) {
-    return [];
-  }
-  return r.stdout.split("\n").filter((s) => /^[0-9a-f]{40}$/.test(s));
-}
-var HEX_RUN = /\b[0-9a-f]{7,40}\b/g;
-function commandOf(input) {
-  if (typeof input === "string") {
-    const t = input.trim();
-    if (t.startsWith("{")) {
-      try {
-        return commandOf(JSON.parse(t));
-      } catch {
-        return input;
-      }
-    }
-    return input;
-  }
-  if (input && typeof input === "object") {
-    const o = input;
-    for (const key of ["command", "cmd"]) {
-      const v = o[key];
-      if (typeof v === "string") {
-        return v;
-      }
-      if (Array.isArray(v)) {
-        return v.filter((t) => typeof t === "string").join(" ");
-      }
-    }
-  }
-  return "";
-}
-function isGitWrite(command) {
-  return gitInvocations(command).some((g) => g.sub === "commit" || g.sub === "push");
-}
-function authoredBranch(spans, shas) {
-  if (shas.length === 0) {
-    return false;
-  }
-  for (const s of spans) {
-    if (s.kind !== "tool" || typeof s.output !== "string") {
-      continue;
-    }
-    if (!isGitWrite(commandOf(s.input))) {
-      continue;
-    }
-    for (const token of s.output.match(HEX_RUN) ?? []) {
-      if (shas.some((full) => full.startsWith(token))) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
 // src/cli.ts
 var HELP = `
 \u{1F9FE}  receipts \u2014 proof, not vibes
@@ -1558,7 +1468,7 @@ Run a coding-agent session first, then try again.
   return 0;
 }
 function git4(args) {
-  const r = spawnSync5("git", args, { encoding: "utf8" });
+  const r = spawnSync4("git", args, { encoding: "utf8" });
   return r.status === 0 ? r.stdout.trim() : "";
 }
 var PR_SELECT_SCAN = 150;
@@ -1654,7 +1564,17 @@ Build the branch with a coding agent first, or run \`receipts --list\`.
     scope = { kind: "diff", base: diff.base, files: diff.files };
     scopeNote = `diff vs ${diff.base} (${diff.files.length} file${diff.files.length === 1 ? "" : "s"})`;
     const slice = sliceByBranch(session, branch);
-    const eff = narrowEffort(slice ? deriveSpans(slice) : null, diff.files);
+    let eff = narrowEffort(slice ? deriveSpans(slice) : null, diff.files);
+    if (!eff) {
+      const shas = branchShas(diff.base);
+      const win = shaWindow(derived.spans, shas);
+      if (win) {
+        eff = windowedEffort(derived, diff.files, win);
+        if (eff) {
+          scope.shas = shas;
+        }
+      }
+    }
     if (eff) {
       derived = { ...derived, diffCostUsd: eff.cost, diffTokens: eff.tokens, diffTurns: eff.turns };
       scope.branch = branch;
@@ -1672,6 +1592,70 @@ Build the branch with a coding agent first, or run \`receipts --list\`.
     }
   }
   const receipt = redactReceipt(await buildReceipt(scopedSession, derived, findings, { scope }));
+  const p = receipt.predicate;
+  if (repoRoot && scope.kind === "diff") {
+    const slug = branch.replace(/[/\\]/g, "-");
+    let priorRaw = null;
+    try {
+      priorRaw = readReceiptRef(slug, repoRoot);
+      if (priorRaw == null) {
+        const f = join7(repoRoot, ".receipts", `${slug}.json`);
+        priorRaw = existsSync4(f) ? readFileSync6(f, "utf8") : null;
+      }
+    } catch {
+      priorRaw = null;
+    }
+    if (priorRaw != null) {
+      try {
+        const prev = JSON.parse(priorRaw).predicate;
+        const sameSession = prev.session?.startedAt === p.session.startedAt && prev.session?.agent === p.session.agent;
+        if (p.evidence.diffCostUsd != null) {
+          const priorUsd = sameSession ? prev.prEffort?.priorUsd ?? 0 : prev.prEffort?.totalUsd ?? prev.evidence.diffCostUsd ?? 0;
+          const sessions = sameSession ? prev.prEffort?.sessions ?? 1 : (prev.prEffort?.sessions ?? 1) + 1;
+          if (priorUsd > 0) {
+            p.prEffort = {
+              priorUsd: Math.round(priorUsd * 100) / 100,
+              totalUsd: Math.round((priorUsd + p.evidence.diffCostUsd) * 100) / 100,
+              sessions
+            };
+          }
+        }
+        const prevVisible = visibleMergeFindings(prev.findings ?? []);
+        const currVisible = visibleMergeFindings(p.findings);
+        const currKeys = new Set(currVisible.map(eventKey));
+        const prevKeys = new Set(prevVisible.map(eventKey));
+        const clearedNow = prevVisible.filter((f) => !currKeys.has(eventKey(f))).map((f) => ({ title: f.title, ...f.filePath ? { filePath: f.filePath } : {} }));
+        const newCount = currVisible.filter((f) => !prevKeys.has(eventKey(f))).length;
+        const base = prev.prHistory?.length ? prev.prHistory : [
+          {
+            push: 1,
+            ...prev.session?.endedAt ? { endedAt: prev.session.endedAt } : {},
+            new: prevVisible.length,
+            cleared: 0,
+            open: prevVisible.length,
+            ...prev.evidence.diffCostUsd != null ? { costUsd: prev.evidence.diffCostUsd } : {}
+          }
+        ];
+        const sha = git4(["rev-parse", "--short=7", "HEAD"]) || void 0;
+        const last = base[base.length - 1];
+        const sameHead = !!sha && last.sha === sha;
+        const entry2 = {
+          push: sameHead ? last.push : last.push + 1,
+          ...sha ? { sha } : {},
+          ...p.session.endedAt ? { endedAt: p.session.endedAt } : {},
+          new: newCount,
+          cleared: clearedNow.length,
+          open: currVisible.length,
+          ...p.evidence.diffCostUsd != null ? { costUsd: p.evidence.diffCostUsd } : {}
+        };
+        p.prHistory = [...sameHead ? base.slice(0, -1) : base, entry2].slice(-10);
+        if (clearedNow.length) {
+          p.prCleared = clearedNow;
+        }
+      } catch {
+      }
+    }
+  }
   const json = `${JSON.stringify(receipt, null, 2)}
 `;
   const store = (opts.store || process.env.RECEIPTS_STORE || (repoRoot ? settingsStore(repoRoot) ?? settingsStore(primaryCheckout(repoRoot) ?? "") : void 0) || "commit").toLowerCase();
@@ -2211,12 +2195,12 @@ function openAdoptionPr(written, lines) {
     );
     return;
   }
-  if (spawnSync5("git", ["checkout", "-b", ADOPT_BRANCH], { encoding: "utf8" }).status !== 0) {
+  if (spawnSync4("git", ["checkout", "-b", ADOPT_BRANCH], { encoding: "utf8" }).status !== 0) {
     lines.push(`receipts init: could not create branch ${ADOPT_BRANCH} \u2014 commit manually.`);
     return;
   }
-  spawnSync5("git", ["add", "--", ...written], { encoding: "utf8" });
-  const commit = spawnSync5(
+  spawnSync4("git", ["add", "--", ...written], { encoding: "utf8" });
+  const commit = spawnSync4(
     "git",
     ["commit", "-m", "chore: adopt receipts \u2014 zero-install agent-work verification"],
     { encoding: "utf8" }
@@ -2228,7 +2212,7 @@ function openAdoptionPr(written, lines) {
     return;
   }
   lines.push(`receipts init: committed ${written.length} file(s) on ${ADOPT_BRANCH}.`);
-  const push = spawnSync5("git", ["push", "-u", "origin", ADOPT_BRANCH], { encoding: "utf8" });
+  const push = spawnSync4("git", ["push", "-u", "origin", ADOPT_BRANCH], { encoding: "utf8" });
   if (push.status !== 0) {
     lines.push(
       "receipts init: push failed (no remote / auth?) \u2014 push the branch and open a PR manually."
@@ -2236,7 +2220,7 @@ function openAdoptionPr(written, lines) {
     return;
   }
   lines.push(`receipts init: pushed ${ADOPT_BRANCH}.`);
-  const gh = spawnSync5(
+  const gh = spawnSync4(
     "gh",
     [
       "pr",