@brainervirus/workit-claude-code 8.30.0 → 8.31.1

package/dist/workit.js

@@ -9285,7 +9285,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@brainervirus/workit-cli",
-    version: "8.30.0",
+    version: "8.31.1",
     private: false,
     description: "Workit CLI — setup wizard, doctor, and task control for agentic coding workflows",
     keywords: [
@@ -9323,13 +9323,13 @@ var init_package = __esm(() => {
     },
     dependencies: {
       "@babel/parser": "7.29.9",
-      "@brainervirus/workit-cursor": "^8.30.0",
+      "@brainervirus/workit-cursor": "^8.31.1",
       "@inkjs/ui": "2.0.0",
       ink: "7.1.1",
       react: "19.2.8"
     },
     devDependencies: {
-      "@brainervirus/workit-core": "^8.30.0"
+      "@brainervirus/workit-core": "^8.31.1"
     },
     engines: {
       node: ">=24"
@@ -14621,6 +14621,18 @@ function diffHash(cwd, base, head) {
   }
   return `sha256:${hash.digest("hex")}`;
 }
+function cleanRebase(cwd, range) {
+  if (!Object.values(range).every(safeRef2))
+    return false;
+  const fromFork = git4(cwd, ["merge-base", range.fromBase, range.from]);
+  const toFork = git4(cwd, ["merge-base", range.toBase, range.to]);
+  if (!fromFork || !toFork || fromFork === toFork)
+    return false;
+  const merged = gitRun2(cwd, ["merge-tree", "--write-tree", "--no-messages", `--merge-base=${fromFork}`, toFork, range.from], GIT_TIMEOUTS.worktree);
+  const tree = merged.ok ? merged.stdout.split(`
+`)[0]?.trim() : null;
+  return Boolean(tree) && tree === git4(cwd, ["rev-parse", "--verify", "-q", `${range.to}^{tree}`]);
+}
 function storeRoot(cwd) {
   const location = resolveStore(path20.resolve(cwd));
   if (location instanceof Error)
@@ -15142,23 +15154,24 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     return drift;
   };
   const exactCache = new Map;
-  const exactCarry = (row) => {
-    if (FAILING.has(String(row.result)))
-      return true;
+  const exactMatch = (row) => {
     let exact = exactCache.get(row);
     if (exact === undefined) {
       const toBase = row.base ?? fallbackBase;
       const toBaseSha = toBase ? resolveCommit(cwd, toBase) : null;
       const fromBase = row.baseSha ?? toBaseSha;
-      exact = Boolean(row.head && head && toBaseSha && fromBase && sameOwnChange(cwd, { from: row.head, to: head, fromBase, toBase: toBaseSha }));
+      const range = row.head && head && toBaseSha && fromBase ? { from: row.head, to: head, fromBase, toBase: toBaseSha } : null;
+      exact = !range ? null : sameOwnChange(cwd, range) ? "same" : cleanRebase(cwd, range) ? "rebase" : null;
       exactCache.set(row, exact);
     }
     return exact;
   };
+  const exactCarry = (row) => FAILING.has(String(row.result)) || exactMatch(row) !== null;
   const keyBasis = (row) => {
     const basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
     return basis === "carried" && !exactCarry(row) ? "stale" : basis;
   };
+  const rebaseNote = (row) => row.head && head && row.head !== head && !FAILING.has(String(row.result)) && keyBasis(row) === "carried" && exactMatch(row) === "rebase" ? { rule: "rebase", since: row.head, files: [] } : null;
   const restacked = (row) => restackCarries(FAILING.has(String(row.result)) ? null : cwd, rows, branch, row.head, head);
   const carryOf = (row) => {
     if (keyBasis(row) !== "stale")
@@ -15236,7 +15249,7 @@ function checkVerdicts(cwd, branch, ledgerRows) {
       independent: independence.length === 0,
       accepted: reasons.length === 0,
       reasons,
-      carry: basis === "carried" ? carryOf(row) : null,
+      carry: basis === "carried" ? rebaseNote(row) ?? carryOf(row) : null,
       verdict: row
     });
     if (reasons.length === 0) {
@@ -15813,7 +15826,7 @@ ${body}`), TAIL_BYTES, lastLine = (fd, size) => {
     session: str(actor.session),
     agentId: str(actor.agentId)
   };
-}, TAMPER_REASONS, tamperCache, fileStamp = (stat) => `${stat.ino}:${stat.mtimeMs}:${stat.ctimeMs}`, tamperedWarning = (cwd, breaks) => `the ledger was edited, or a row was removed or moved (${breaks.slice(0, 3).map((row) => `${row.reason} at row ${row.seq}`).join(", ")}${breaks.length > 3 ? ", …" : ""}): no verdict is accepted until it is repaired. ${tamperedUnblock(cwd)}`, carryLabel = (carry) => `carried (${carry.rule === "lane-none" ? "lane none" : "tests only"} since ${carry.since.slice(0, 12)})`, isLiveVerdict = (row, retired) => row.type === "verdict" && typeof row.result === "string" && !retired.has(row.id), RENAMED, renameAwareBranch = (scopeOf, branch) => {
+}, TAMPER_REASONS, tamperCache, fileStamp = (stat) => `${stat.ino}:${stat.mtimeMs}:${stat.ctimeMs}`, tamperedWarning = (cwd, breaks) => `the ledger was edited, or a row was removed or moved (${breaks.slice(0, 3).map((row) => `${row.reason} at row ${row.seq}`).join(", ")}${breaks.length > 3 ? ", …" : ""}): no verdict is accepted until it is repaired. ${tamperedUnblock(cwd)}`, carryLabel = (carry) => carry.rule === "rebase" ? "carried (rebase: patch unchanged)" : `carried (${carry.rule === "lane-none" ? "lane none" : "tests only"} since ${carry.since.slice(0, 12)})`, isLiveVerdict = (row, retired) => row.type === "verdict" && typeof row.result === "string" && !retired.has(row.id), RENAMED, renameAwareBranch = (scopeOf, branch) => {
   return (target) => {
     const own = typeof branch === "string" ? branch : null;
     const theirs = typeof target.branch === "string" ? target.branch : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-claude-code",
-  "version": "8.30.0",
+  "version": "8.31.1",
   "private": false,
   "description": "Workit Claude Code plugin — session and per-turn task context, branch policy on git shell commands, workit method skills, and verifier/reviewer/implementer agents",
   "keywords": [
@@ -39,8 +39,8 @@
     "build": "bun scripts/build.ts"
   },
   "devDependencies": {
-    "@brainervirus/workit-cli": "^8.30.0",
-    "@brainervirus/workit-core": "^8.30.0"
+    "@brainervirus/workit-cli": "^8.31.1",
+    "@brainervirus/workit-core": "^8.31.1"
   },
   "engines": {
     "node": ">=24"