@brainervirus/workit-cursor 7.7.0 → 8.0.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": "7.7.0",
+  "version": "8.0.1",
   "author": {
     "name": "Cristhofer Pincetti"
   },

package/dist/cursor-session-start.js

@@ -9056,7 +9056,7 @@ function authorSessions(cwd, rows, branch, range = { base: null, head: null }) {
     sessions.add(session);
   return sessions;
 }
-function effectiveOf(rows, authors) {
+function effectiveOf(rows, authors, sameCode) {
   let effective = null;
   for (const row of rows) {
     if (!effective) {
@@ -9067,7 +9067,7 @@ function effectiveOf(rows, authors) {
     const effIndependent = independenceReasons(effective, authors).length === 0;
     if (effIndependent && !rowIndependent)
       continue;
-    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session)
+    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session && sameCode(effective, row))
       continue;
     effective = row;
   }
@@ -9098,16 +9098,22 @@ function checkVerdicts(cwd, branch, rows) {
   const head = branchHead(cwd, branch);
   const fallbackBase = defaultBase(cwd);
   const keyCache = new Map;
-  const keyFor = (base) => {
-    if (!base || !head)
+  const keysAt = (base, at) => {
+    if (!base || !at)
       return { patchId: null, diffHash: null };
-    let key = keyCache.get(base);
+    const cacheKey = `${base}\x00${at}`;
+    let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, head), diffHash: diffHash(cwd, base, head) };
-      keyCache.set(base, key);
+      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      keyCache.set(cacheKey, key);
     }
     return key;
   };
+  const keyFor = (base) => keysAt(base, head);
+  const sameCode = (failed, row) => verdictBasis(failed, {
+    head: row.head,
+    ...keysAt(failed.base ?? fallbackBase, row.head)
+  }) !== "stale" || restackCarries(rows, branch, failed.head, row.head);
   const authors = authorSessions(cwd, rows, branch, { base: fallbackBase, head });
   const byKind = new Map;
   for (const row of rows)
@@ -9117,7 +9123,7 @@ function checkVerdicts(cwd, branch, rows) {
     }
   const verdicts = [];
   for (const [kind, list] of byKind) {
-    const row = effectiveOf(list, authors);
+    const row = effectiveOf(list, authors, sameCode);
     if (!row)
       continue;
     let basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
@@ -9143,11 +9149,11 @@ function checkVerdicts(cwd, branch, rows) {
   verdicts.sort((a, b) => a.verdict.seq - b.verdict.seq);
   const newestCurrent = verdicts.findLast((entry) => entry.current) ?? verdicts.at(-1) ?? null;
   const failing = verdicts.find((entry) => entry.current && entry.independent && FAILING.has(String(entry.verdict.result)));
-  const newestAccepted = verdicts.findLast((entry) => entry.accepted) ?? null;
+  const newestAccepted = verdicts.findLast((entry) => entry.accepted && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
   const accepted = newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
-    reasons: failing ? ["failing_verdict"] : newestCurrent?.reasons ?? ["no_verdict"]
+    reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
   };
   const selfEntry = failing ? undefined : verdicts.findLast((entry) => entry.current && !entry.independent && STRONG_RESULTS.has(String(entry.verdict.result)));
   return {
@@ -9229,7 +9235,7 @@ var init_ledger = __esm(() => {
     1196443219,
     198183888
   ]);
-  OBSERVED_ONLY = new Set(["check", ...PR_ROW_TYPES]);
+  OBSERVED_ONLY = new Set(["check", "merge.unverified", ...PR_ROW_TYPES]);
 });
 
 // packages/workit-core/src/core/policy/derive.ts

package/dist/mcp-server.js

@@ -21564,7 +21564,7 @@ var independenceReasons = (row, authors) => {
     reasons.push("self");
   return reasons;
 };
-function effectiveOf(rows, authors) {
+function effectiveOf(rows, authors, sameCode) {
   let effective = null;
   for (const row of rows) {
     if (!effective) {
@@ -21575,7 +21575,7 @@ function effectiveOf(rows, authors) {
     const effIndependent = independenceReasons(effective, authors).length === 0;
     if (effIndependent && !rowIndependent)
       continue;
-    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session)
+    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session && sameCode(effective, row))
       continue;
     effective = row;
   }
@@ -21606,16 +21606,22 @@ function checkVerdicts(cwd, branch, rows) {
   const head = branchHead(cwd, branch);
   const fallbackBase = defaultBase(cwd);
   const keyCache = new Map;
-  const keyFor = (base) => {
-    if (!base || !head)
+  const keysAt = (base, at) => {
+    if (!base || !at)
       return { patchId: null, diffHash: null };
-    let key = keyCache.get(base);
+    const cacheKey = `${base}\x00${at}`;
+    let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, head), diffHash: diffHash(cwd, base, head) };
-      keyCache.set(base, key);
+      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      keyCache.set(cacheKey, key);
     }
     return key;
   };
+  const keyFor = (base) => keysAt(base, head);
+  const sameCode = (failed, row) => verdictBasis(failed, {
+    head: row.head,
+    ...keysAt(failed.base ?? fallbackBase, row.head)
+  }) !== "stale" || restackCarries(rows, branch, failed.head, row.head);
   const authors = authorSessions(cwd, rows, branch, { base: fallbackBase, head });
   const byKind = new Map;
   for (const row of rows)
@@ -21625,7 +21631,7 @@ function checkVerdicts(cwd, branch, rows) {
     }
   const verdicts = [];
   for (const [kind, list] of byKind) {
-    const row = effectiveOf(list, authors);
+    const row = effectiveOf(list, authors, sameCode);
     if (!row)
       continue;
     let basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
@@ -21651,11 +21657,11 @@ function checkVerdicts(cwd, branch, rows) {
   verdicts.sort((a, b) => a.verdict.seq - b.verdict.seq);
   const newestCurrent = verdicts.findLast((entry) => entry.current) ?? verdicts.at(-1) ?? null;
   const failing = verdicts.find((entry) => entry.current && entry.independent && FAILING.has(String(entry.verdict.result)));
-  const newestAccepted = verdicts.findLast((entry) => entry.accepted) ?? null;
+  const newestAccepted = verdicts.findLast((entry) => entry.accepted && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
   const accepted = newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
-    reasons: failing ? ["failing_verdict"] : newestCurrent?.reasons ?? ["no_verdict"]
+    reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
   };
   const selfEntry = failing ? undefined : verdicts.findLast((entry) => entry.current && !entry.independent && STRONG_RESULTS.has(String(entry.verdict.result)));
   return {
@@ -21671,7 +21677,7 @@ function checkVerdicts(cwd, branch, rows) {
     authors: [...authors].toSorted()
   };
 }
-var OBSERVED_ONLY = new Set(["check", ...PR_ROW_TYPES]);
+var OBSERVED_ONLY = new Set(["check", "merge.unverified", ...PR_ROW_TYPES]);
 
 // packages/workit-core/src/core/policy/derive.ts
 var RULES = {

package/dist/workit-hook.js

@@ -9055,7 +9055,7 @@ var independenceReasons = (row, authors) => {
     reasons.push("self");
   return reasons;
 };
-function effectiveOf(rows, authors) {
+function effectiveOf(rows, authors, sameCode) {
   let effective = null;
   for (const row of rows) {
     if (!effective) {
@@ -9066,7 +9066,7 @@ function effectiveOf(rows, authors) {
     const effIndependent = independenceReasons(effective, authors).length === 0;
     if (effIndependent && !rowIndependent)
       continue;
-    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session)
+    if (effIndependent && FAILING.has(String(effective.result)) && row.actor.session === effective.actor.session && sameCode(effective, row))
       continue;
     effective = row;
   }
@@ -9097,16 +9097,22 @@ function checkVerdicts(cwd, branch, rows) {
   const head = branchHead(cwd, branch);
   const fallbackBase = defaultBase(cwd);
   const keyCache = new Map;
-  const keyFor = (base) => {
-    if (!base || !head)
+  const keysAt = (base, at) => {
+    if (!base || !at)
       return { patchId: null, diffHash: null };
-    let key = keyCache.get(base);
+    const cacheKey = `${base}\x00${at}`;
+    let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, head), diffHash: diffHash(cwd, base, head) };
-      keyCache.set(base, key);
+      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      keyCache.set(cacheKey, key);
     }
     return key;
   };
+  const keyFor = (base) => keysAt(base, head);
+  const sameCode = (failed, row) => verdictBasis(failed, {
+    head: row.head,
+    ...keysAt(failed.base ?? fallbackBase, row.head)
+  }) !== "stale" || restackCarries(rows, branch, failed.head, row.head);
   const authors = authorSessions(cwd, rows, branch, { base: fallbackBase, head });
   const byKind = new Map;
   for (const row of rows)
@@ -9116,7 +9122,7 @@ function checkVerdicts(cwd, branch, rows) {
     }
   const verdicts = [];
   for (const [kind, list] of byKind) {
-    const row = effectiveOf(list, authors);
+    const row = effectiveOf(list, authors, sameCode);
     if (!row)
       continue;
     let basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
@@ -9142,11 +9148,11 @@ function checkVerdicts(cwd, branch, rows) {
   verdicts.sort((a, b) => a.verdict.seq - b.verdict.seq);
   const newestCurrent = verdicts.findLast((entry) => entry.current) ?? verdicts.at(-1) ?? null;
   const failing = verdicts.find((entry) => entry.current && entry.independent && FAILING.has(String(entry.verdict.result)));
-  const newestAccepted = verdicts.findLast((entry) => entry.accepted) ?? null;
+  const newestAccepted = verdicts.findLast((entry) => entry.accepted && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
   const accepted = newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
-    reasons: failing ? ["failing_verdict"] : newestCurrent?.reasons ?? ["no_verdict"]
+    reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
   };
   const selfEntry = failing ? undefined : verdicts.findLast((entry) => entry.current && !entry.independent && STRONG_RESULTS.has(String(entry.verdict.result)));
   return {
@@ -9162,7 +9168,7 @@ function checkVerdicts(cwd, branch, rows) {
     authors: [...authors].toSorted()
   };
 }
-var OBSERVED_ONLY = new Set(["check", ...PR_ROW_TYPES]);
+var OBSERVED_ONLY = new Set(["check", "merge.unverified", ...PR_ROW_TYPES]);
 
 // packages/workit-core/src/core/policy/derive.ts
 var RULES = {

package/package.json

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

package/skills/workit-ship/SKILL.md

@@ -51,8 +51,8 @@ the base keeps moving, or after 3 failed fix attempts on the same check.
    flake|infra` per head. Real: reproduce with `workit check`, fix the root
    cause, batch fixes into one push.
 6. **Verified.** After the last push a non-author records a verdict
-   (read the `workit-review` skill's SKILL.md and follow it). Land only when granted: `workit stack land` (the
-   contiguous verified run from the root) or `workit pr merge`.
+   (read the `workit-review` skill's SKILL.md and follow it). Land only when granted: `workit stack land` (verified run
+   from the root) or `workit pr merge`; `--unverified --reason` only if user-asked.
 7. **Observe it landed:** `workit verify-delivery pr` or `merge`. After a failed
    verdict or a check red 3+ times, at any endpoint: offer `/wk-retro` in one
    line of the final or stop report; never pause the babysit loop for it.