@brainervirus/workit-cursor 8.30.0 → 8.31.1

package/.cursor-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "workit",
   "displayName": "Workit",
   "description": "Adaptive Workit workflow with shared MCP tools and native Cursor hooks",
-  "version": "8.30.0",
+  "version": "8.31.1",
   "author": {
     "name": "Cristhofer Pincetti"
   },

package/dist/cursor-session-start.js

@@ -10166,6 +10166,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 = git3(cwd, ["merge-base", range.fromBase, range.from]);
+  const toFork = git3(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 === git3(cwd, ["rev-parse", "--verify", "-q", `${range.to}^{tree}`]);
+}
 function storeRoot(cwd) {
   const location = resolveStore(path10.resolve(cwd));
   if (location instanceof Error)
@@ -10624,23 +10636,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")
@@ -10718,7 +10731,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) {

package/dist/mcp-server.js

@@ -22593,6 +22593,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(path15.resolve(cwd));
   if (location instanceof Error)
@@ -23253,23 +23265,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")
@@ -23347,7 +23360,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) {

package/dist/workit-hook.js

@@ -10175,6 +10175,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 = git3(cwd, ["merge-base", range.fromBase, range.from]);
+  const toFork = git3(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 === git3(cwd, ["rev-parse", "--verify", "-q", `${range.to}^{tree}`]);
+}
 function storeRoot(cwd) {
   const location = resolveStore(path10.resolve(cwd));
   if (location instanceof Error)
@@ -10838,23 +10850,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")
@@ -10932,7 +10945,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-cursor",
-  "version": "8.30.0",
+  "version": "8.31.1",
   "private": false,
   "description": "Workit Cursor plugin — shared MCP transport, native hooks, and sixteen method skills",
   "keywords": [
@@ -46,8 +46,8 @@
     "build": "bun scripts/build.ts"
   },
   "devDependencies": {
-    "@brainervirus/workit-core": "^8.30.0",
-    "@brainervirus/workit-mcp": "^8.30.0"
+    "@brainervirus/workit-core": "^8.31.1",
+    "@brainervirus/workit-mcp": "^8.31.1"
   },
   "engines": {
     "node": ">=24"