@brainervirus/workit-cursor 8.34.0 → 8.35.2

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.34.0",
+  "version": "8.35.2",
   "author": {
     "name": "Cristhofer Pincetti"
   },

package/dist/cursor-session-start.js

@@ -7856,9 +7856,16 @@ function workspaceDefaultTarget(cwd, globalDefault) {
 }
 var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspaceCommitPolicySchema, workspaceProfileSchema, versionSourceSchema, releaseTrackSchema, workspaceConfigSchema, workspacesFileSchema, workspacesRevision = (contents) => createHash4("sha256").update(contents ?? "<missing>").digest("hex"), validateWorkspacesDocument = (parsed, file) => {
   if (!isConfigObject(parsed)) {
-    return { status: "malformed", path: file, entries: [], error: `${file} is not a JSON object` };
+    return {
+      status: "malformed",
+      path: file,
+      entries: [],
+      error: `${file} is not a JSON object`
+    };
   }
-  const validated = workspacesFileSchema.safeParse(parsed, { reportInput: true });
+  const validated = workspacesFileSchema.safeParse(parsed, {
+    reportInput: true
+  });
   if (!validated.success) {
     const detail = validated.error.issues.map((issue) => {
       const field = String(issue.path[issue.path.length - 1] ?? "");
@@ -7897,7 +7904,12 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
     raw = readFileSync2(file, "utf8");
   } catch (error) {
     if (error.code === "ENOENT")
-      return { status: "missing", path: file, entries: [], revision: workspacesRevision(null) };
+      return {
+        status: "missing",
+        path: file,
+        entries: [],
+        revision: workspacesRevision(null)
+      };
     return {
       status: "malformed",
       path: file,
@@ -7917,7 +7929,10 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
       error: `${file} is not valid JSON`
     };
   }
-  return { ...validateWorkspacesDocument(parsed, file), revision: workspacesRevision(raw) };
+  return {
+    ...validateWorkspacesDocument(parsed, file),
+    revision: workspacesRevision(raw)
+  };
 }, globToRegExp = (glob) => {
   let out = "";
   for (let i = 0;i < glob.length; i++) {
@@ -8103,7 +8118,10 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
   return selected ? { file, selected, matches } : null;
 }, resolveRuntimeReleaseTracks = (cwd) => {
   const matched = matchRuntimeWorkspace(cwd);
-  return matched ? { workspace: matched.selected.name, releaseTracks: matched.selected.releaseTracks } : null;
+  return matched ? {
+    workspace: matched.selected.name,
+    releaseTracks: matched.selected.releaseTracks
+  } : null;
 }, inheritedSetting = (cwd, dir, has) => {
   let matched;
   try {
@@ -8115,7 +8133,10 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
     return null;
   const { selected, matches } = matched;
   const enclosing = matches.filter((entry) => entry !== selected).toSorted((a, b) => globSpecificity(b.glob) - globSpecificity(a.glob));
-  return { workspace: selected.name, source: [selected, ...enclosing].find(has) ?? null };
+  return {
+    workspace: selected.name,
+    source: [selected, ...enclosing].find(has) ?? null
+  };
 }, workspaceTrailers = (cwd, dir) => {
   const found = inheritedSetting(cwd, dir, (entry) => typeof entry.trailers === "boolean");
   return {
@@ -8236,7 +8257,11 @@ var init_workspaces = __esm(() => {
       ["requiredChecks", track.requiredChecks ?? []]
     ]) {
       if (new Set(values).size !== values.length) {
-        context.addIssue({ code: "custom", path: [field], message: "entries must be unique" });
+        context.addIssue({
+          code: "custom",
+          path: [field],
+          message: "entries must be unique"
+        });
       }
     }
     if (track.versionSource?.kind === "package-json" && (path4.posix.isAbsolute(track.versionSource.path.replaceAll("\\", "/")) || /^[A-Za-z]:\//u.test(track.versionSource.path.replaceAll("\\", "/")) || track.versionSource.path.replaceAll("\\", "/").split("/").includes(".."))) {
@@ -8269,7 +8294,10 @@ var init_workspaces = __esm(() => {
       kind,
       union([boolean2(), literal("verified")]).optional()
     ]))).passthrough().optional(),
-    youtrack: object({ baseUrl: nonBlank.optional(), link_issues: boolean2().optional() }).passthrough().optional(),
+    youtrack: object({
+      baseUrl: nonBlank.optional(),
+      link_issues: boolean2().optional()
+    }).passthrough().optional(),
     issues: object({
       provider: _enum(["github", "gitlab", "youtrack"]).optional(),
       link: boolean2().optional(),
@@ -10420,7 +10448,12 @@ function readLedger(cwd, options = {}) {
     });
   return {
     ok: true,
-    value: { path: file.value, rows, skipped, integrity: options.integrity ? integrity : null }
+    value: {
+      path: file.value,
+      rows,
+      skipped,
+      integrity: options.integrity ? integrity : null
+    }
   };
 }
 function ledgerTampering(cwd) {
@@ -10496,7 +10529,10 @@ function branchScope(cwd, branch) {
     return at >= since && at <= until;
   };
 }
-function authorSessions(cwd, rows, branch, range = { base: null, head: null }, scope = branchScope(cwd, branch)) {
+function authorSessions(cwd, rows, branch, range = {
+  base: null,
+  head: null
+}, scope = branchScope(cwd, branch)) {
   const sessions = new Set;
   for (const row of rows) {
     if (!scope(row) || row.type !== "commit.recorded" && row.type !== "task.opened")
@@ -10571,12 +10607,13 @@ function restackCarries(exactIn, rows, branch, from, to) {
     const cwd = exactIn;
     let known = restackExact.get(row);
     if (known === undefined) {
-      known = typeof row.fromBase === "string" && typeof row.toBase === "string" && sameOwnChange(cwd, {
+      const range = typeof row.fromBase === "string" && typeof row.toBase === "string" ? {
         from: fromHead,
         to: head,
         fromBase: row.fromBase,
         toBase: row.toBase
-      });
+      } : null;
+      known = range !== null && (sameOwnChange(cwd, range) || cleanRebase(cwd, range));
       restackExact.set(row, known);
     }
     return known;
@@ -10611,7 +10648,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     const cacheKey = `${base}\x00${at}`;
     let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      key = {
+        patchId: patchId(cwd, base, at),
+        diffHash: diffHash(cwd, base, at)
+      };
       keyCache.set(cacheKey, key);
     }
     return key;
@@ -10651,7 +10691,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   };
   const exactCarry = (row) => FAILING.has(String(row.result)) || exactMatch(row) !== null;
   const keyBasis = (row) => {
-    const basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
+    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;
@@ -10756,7 +10799,11 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   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 && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
-  const accepted = tampered.length ? { accepted: false, verdict: null, reasons: ["ledger_tampered"] } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
+  const accepted = tampered.length ? {
+    accepted: false,
+    verdict: null,
+    reasons: ["ledger_tampered"]
+  } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
     reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
@@ -10774,7 +10821,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     selfVerdict: accepted.accepted ? null : selfEntry?.verdict ?? null,
     base: newestCurrent?.verdict.base ?? fallbackBase,
     patchId: keyFor(newestCurrent?.verdict.base ?? fallbackBase).patchId,
-    current: { basis: newestCurrent?.basis ?? "none", verdict: newestCurrent?.verdict ?? null },
+    current: {
+      basis: newestCurrent?.basis ?? "none",
+      verdict: newestCurrent?.verdict ?? null
+    },
     carry: carryEntry?.carry ?? null,
     reverify,
     accepted,
@@ -17622,7 +17672,10 @@ function entryCompactContext(store, entry, session, context) {
   const task = entry ? store.readTask(entry.id) : null;
   if (task && !task.ok)
     return null;
-  const freshness = { mode: "signal", current: () => recentSignal(store.root) };
+  const freshness = {
+    mode: "signal",
+    current: () => recentSignal(store.root)
+  };
   const observed = task?.data.evidence.some(isObservedCheck) ?? false;
   const files = (task?.data.decisions ?? []).flatMap((decision) => decision.data.binding.contentRefs.flatMap((ref) => ref.kind === "file" ? [path20.resolve(store.root, ref.path)] : []));
   const observedFiles = filesKey(files);
@@ -17719,7 +17772,10 @@ ${options.addendum}` : ""}
     if (fs15.existsSync(dotGit)) {
       const admin = fs15.statSync(dotGit).isFile() ? path20.resolve(dir, /^gitdir:\s*(.+)$/mu.exec(fs15.readFileSync(dotGit, "utf8"))?.[1]?.trim() ?? "") : dotGit;
       const head = fs15.readFileSync(path20.join(admin, "HEAD"), "utf8").trim();
-      return { root: dir, branch: /^ref: refs\/heads\/(.+)$/u.exec(head)?.[1] ?? null };
+      return {
+        root: dir,
+        branch: /^ref: refs\/heads\/(.+)$/u.exec(head)?.[1] ?? null
+      };
     }
     if (path20.dirname(dir) === dir)
       return null;

package/dist/mcp-server.js

@@ -17307,7 +17307,11 @@ var releaseTrackSchema = object2({
     ["requiredChecks", track.requiredChecks ?? []]
   ]) {
     if (new Set(values).size !== values.length) {
-      context.addIssue({ code: "custom", path: [field], message: "entries must be unique" });
+      context.addIssue({
+        code: "custom",
+        path: [field],
+        message: "entries must be unique"
+      });
     }
   }
   if (track.versionSource?.kind === "package-json" && (path4.posix.isAbsolute(track.versionSource.path.replaceAll("\\", "/")) || /^[A-Za-z]:\//u.test(track.versionSource.path.replaceAll("\\", "/")) || track.versionSource.path.replaceAll("\\", "/").split("/").includes(".."))) {
@@ -17340,7 +17344,10 @@ var workspaceConfigSchema = object2({
     kind,
     union([boolean2(), literal("verified")]).optional()
   ]))).passthrough().optional(),
-  youtrack: object2({ baseUrl: nonBlank.optional(), link_issues: boolean2().optional() }).passthrough().optional(),
+  youtrack: object2({
+    baseUrl: nonBlank.optional(),
+    link_issues: boolean2().optional()
+  }).passthrough().optional(),
   issues: object2({
     provider: _enum(["github", "gitlab", "youtrack"]).optional(),
     link: boolean2().optional(),
@@ -17381,9 +17388,16 @@ var workspacesFileSchema = object2({
 var workspacesRevision = (contents) => createHash2("sha256").update(contents ?? "<missing>").digest("hex");
 var validateWorkspacesDocument = (parsed, file) => {
   if (!isConfigObject(parsed)) {
-    return { status: "malformed", path: file, entries: [], error: `${file} is not a JSON object` };
+    return {
+      status: "malformed",
+      path: file,
+      entries: [],
+      error: `${file} is not a JSON object`
+    };
   }
-  const validated = workspacesFileSchema.safeParse(parsed, { reportInput: true });
+  const validated = workspacesFileSchema.safeParse(parsed, {
+    reportInput: true
+  });
   if (!validated.success) {
     const detail = validated.error.issues.map((issue) => {
       const field = String(issue.path[issue.path.length - 1] ?? "");
@@ -17423,7 +17437,12 @@ var readWorkspacesResult = (dir = configDir()) => {
     raw = readFileSync2(file, "utf8");
   } catch (error) {
     if (error.code === "ENOENT")
-      return { status: "missing", path: file, entries: [], revision: workspacesRevision(null) };
+      return {
+        status: "missing",
+        path: file,
+        entries: [],
+        revision: workspacesRevision(null)
+      };
     return {
       status: "malformed",
       path: file,
@@ -17443,7 +17462,10 @@ var readWorkspacesResult = (dir = configDir()) => {
       error: `${file} is not valid JSON`
     };
   }
-  return { ...validateWorkspacesDocument(parsed, file), revision: workspacesRevision(raw) };
+  return {
+    ...validateWorkspacesDocument(parsed, file),
+    revision: workspacesRevision(raw)
+  };
 };
 var globToRegExp = (glob) => {
   let out = "";
@@ -17654,7 +17676,10 @@ var matchRuntimeWorkspace = (cwd, dir = configDir()) => {
 };
 var resolveRuntimeReleaseTracks = (cwd) => {
   const matched = matchRuntimeWorkspace(cwd);
-  return matched ? { workspace: matched.selected.name, releaseTracks: matched.selected.releaseTracks } : null;
+  return matched ? {
+    workspace: matched.selected.name,
+    releaseTracks: matched.selected.releaseTracks
+  } : null;
 };
 var TIER_KEYS = new Set(["mundane", "standard", "hard"]);
 var TIER_HOSTS = new Set([
@@ -22997,7 +23022,12 @@ function readLedger(cwd, options = {}) {
     });
   return {
     ok: true,
-    value: { path: file.value, rows, skipped, integrity: options.integrity ? integrity : null }
+    value: {
+      path: file.value,
+      rows,
+      skipped,
+      integrity: options.integrity ? integrity : null
+    }
   };
 }
 var TAMPER_REASONS = new Set(["hash_mismatch", "broken_link"]);
@@ -23090,7 +23120,10 @@ var renameAwareBranch = (scopeOf, branch) => {
     return scopeOf(own)({ branch: theirs, at: target.at });
   };
 };
-function authorSessions(cwd, rows, branch, range = { base: null, head: null }, scope = branchScope(cwd, branch)) {
+function authorSessions(cwd, rows, branch, range = {
+  base: null,
+  head: null
+}, scope = branchScope(cwd, branch)) {
   const sessions = new Set;
   for (const row of rows) {
     if (!scope(row) || row.type !== "commit.recorded" && row.type !== "task.opened")
@@ -23201,12 +23234,13 @@ function restackCarries(exactIn, rows, branch, from, to) {
     const cwd = exactIn;
     let known = restackExact.get(row);
     if (known === undefined) {
-      known = typeof row.fromBase === "string" && typeof row.toBase === "string" && sameOwnChange(cwd, {
+      const range = typeof row.fromBase === "string" && typeof row.toBase === "string" ? {
         from: fromHead,
         to: head,
         fromBase: row.fromBase,
         toBase: row.toBase
-      });
+      } : null;
+      known = range !== null && (sameOwnChange(cwd, range) || cleanRebase(cwd, range));
       restackExact.set(row, known);
     }
     return known;
@@ -23241,7 +23275,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     const cacheKey = `${base}\x00${at}`;
     let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      key = {
+        patchId: patchId(cwd, base, at),
+        diffHash: diffHash(cwd, base, at)
+      };
       keyCache.set(cacheKey, key);
     }
     return key;
@@ -23281,7 +23318,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   };
   const exactCarry = (row) => FAILING.has(String(row.result)) || exactMatch(row) !== null;
   const keyBasis = (row) => {
-    const basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
+    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;
@@ -23386,7 +23426,11 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   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 && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
-  const accepted = tampered.length ? { accepted: false, verdict: null, reasons: ["ledger_tampered"] } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
+  const accepted = tampered.length ? {
+    accepted: false,
+    verdict: null,
+    reasons: ["ledger_tampered"]
+  } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
     reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
@@ -23404,7 +23448,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     selfVerdict: accepted.accepted ? null : selfEntry?.verdict ?? null,
     base: newestCurrent?.verdict.base ?? fallbackBase,
     patchId: keyFor(newestCurrent?.verdict.base ?? fallbackBase).patchId,
-    current: { basis: newestCurrent?.basis ?? "none", verdict: newestCurrent?.verdict ?? null },
+    current: {
+      basis: newestCurrent?.basis ?? "none",
+      verdict: newestCurrent?.verdict ?? null
+    },
     carry: carryEntry?.carry ?? null,
     reverify,
     accepted,

package/dist/workit-hook.js

@@ -7836,7 +7836,11 @@ var releaseTrackSchema = object({
     ["requiredChecks", track.requiredChecks ?? []]
   ]) {
     if (new Set(values).size !== values.length) {
-      context.addIssue({ code: "custom", path: [field], message: "entries must be unique" });
+      context.addIssue({
+        code: "custom",
+        path: [field],
+        message: "entries must be unique"
+      });
     }
   }
   if (track.versionSource?.kind === "package-json" && (path4.posix.isAbsolute(track.versionSource.path.replaceAll("\\", "/")) || /^[A-Za-z]:\//u.test(track.versionSource.path.replaceAll("\\", "/")) || track.versionSource.path.replaceAll("\\", "/").split("/").includes(".."))) {
@@ -7869,7 +7873,10 @@ var workspaceConfigSchema = object({
     kind,
     union([boolean2(), literal("verified")]).optional()
   ]))).passthrough().optional(),
-  youtrack: object({ baseUrl: nonBlank.optional(), link_issues: boolean2().optional() }).passthrough().optional(),
+  youtrack: object({
+    baseUrl: nonBlank.optional(),
+    link_issues: boolean2().optional()
+  }).passthrough().optional(),
   issues: object({
     provider: _enum(["github", "gitlab", "youtrack"]).optional(),
     link: boolean2().optional(),
@@ -7910,9 +7917,16 @@ var workspacesFileSchema = object({
 var workspacesRevision = (contents) => createHash4("sha256").update(contents ?? "<missing>").digest("hex");
 var validateWorkspacesDocument = (parsed, file) => {
   if (!isConfigObject(parsed)) {
-    return { status: "malformed", path: file, entries: [], error: `${file} is not a JSON object` };
+    return {
+      status: "malformed",
+      path: file,
+      entries: [],
+      error: `${file} is not a JSON object`
+    };
   }
-  const validated = workspacesFileSchema.safeParse(parsed, { reportInput: true });
+  const validated = workspacesFileSchema.safeParse(parsed, {
+    reportInput: true
+  });
   if (!validated.success) {
     const detail = validated.error.issues.map((issue) => {
       const field = String(issue.path[issue.path.length - 1] ?? "");
@@ -7952,7 +7966,12 @@ var readWorkspacesResult = (dir = configDir()) => {
     raw = readFileSync2(file, "utf8");
   } catch (error) {
     if (error.code === "ENOENT")
-      return { status: "missing", path: file, entries: [], revision: workspacesRevision(null) };
+      return {
+        status: "missing",
+        path: file,
+        entries: [],
+        revision: workspacesRevision(null)
+      };
     return {
       status: "malformed",
       path: file,
@@ -7972,7 +7991,10 @@ var readWorkspacesResult = (dir = configDir()) => {
       error: `${file} is not valid JSON`
     };
   }
-  return { ...validateWorkspacesDocument(parsed, file), revision: workspacesRevision(raw) };
+  return {
+    ...validateWorkspacesDocument(parsed, file),
+    revision: workspacesRevision(raw)
+  };
 };
 var globToRegExp = (glob) => {
   let out = "";
@@ -8183,7 +8205,10 @@ var matchRuntimeWorkspace = (cwd, dir = configDir()) => {
 };
 var resolveRuntimeReleaseTracks = (cwd) => {
   const matched = matchRuntimeWorkspace(cwd);
-  return matched ? { workspace: matched.selected.name, releaseTracks: matched.selected.releaseTracks } : null;
+  return matched ? {
+    workspace: matched.selected.name,
+    releaseTracks: matched.selected.releaseTracks
+  } : null;
 };
 var inheritedSetting = (cwd, dir, has) => {
   let matched;
@@ -8196,7 +8221,10 @@ var inheritedSetting = (cwd, dir, has) => {
     return null;
   const { selected, matches } = matched;
   const enclosing = matches.filter((entry) => entry !== selected).toSorted((a, b) => globSpecificity(b.glob) - globSpecificity(a.glob));
-  return { workspace: selected.name, source: [selected, ...enclosing].find(has) ?? null };
+  return {
+    workspace: selected.name,
+    source: [selected, ...enclosing].find(has) ?? null
+  };
 };
 var workspaceTrailers = (cwd, dir) => {
   const found = inheritedSetting(cwd, dir, (entry) => typeof entry.trailers === "boolean");
@@ -10581,7 +10609,12 @@ function readLedger(cwd, options = {}) {
     });
   return {
     ok: true,
-    value: { path: file.value, rows, skipped, integrity: options.integrity ? integrity : null }
+    value: {
+      path: file.value,
+      rows,
+      skipped,
+      integrity: options.integrity ? integrity : null
+    }
   };
 }
 var TAMPER_REASONS = new Set(["hash_mismatch", "broken_link"]);
@@ -10674,7 +10707,10 @@ var renameAwareBranch = (scopeOf, branch) => {
     return scopeOf(own)({ branch: theirs, at: target.at });
   };
 };
-function authorSessions(cwd, rows, branch, range = { base: null, head: null }, scope = branchScope(cwd, branch)) {
+function authorSessions(cwd, rows, branch, range = {
+  base: null,
+  head: null
+}, scope = branchScope(cwd, branch)) {
   const sessions = new Set;
   for (const row of rows) {
     if (!scope(row) || row.type !== "commit.recorded" && row.type !== "task.opened")
@@ -10785,12 +10821,13 @@ function restackCarries(exactIn, rows, branch, from, to) {
     const cwd = exactIn;
     let known = restackExact.get(row);
     if (known === undefined) {
-      known = typeof row.fromBase === "string" && typeof row.toBase === "string" && sameOwnChange(cwd, {
+      const range = typeof row.fromBase === "string" && typeof row.toBase === "string" ? {
         from: fromHead,
         to: head,
         fromBase: row.fromBase,
         toBase: row.toBase
-      });
+      } : null;
+      known = range !== null && (sameOwnChange(cwd, range) || cleanRebase(cwd, range));
       restackExact.set(row, known);
     }
     return known;
@@ -10825,7 +10862,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     const cacheKey = `${base}\x00${at}`;
     let key = keyCache.get(cacheKey);
     if (!key) {
-      key = { patchId: patchId(cwd, base, at), diffHash: diffHash(cwd, base, at) };
+      key = {
+        patchId: patchId(cwd, base, at),
+        diffHash: diffHash(cwd, base, at)
+      };
       keyCache.set(cacheKey, key);
     }
     return key;
@@ -10865,7 +10905,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   };
   const exactCarry = (row) => FAILING.has(String(row.result)) || exactMatch(row) !== null;
   const keyBasis = (row) => {
-    const basis = verdictBasis(row, { head, ...keyFor(row.base ?? fallbackBase) });
+    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;
@@ -10970,7 +11013,11 @@ function checkVerdicts(cwd, branch, ledgerRows) {
   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 && STRONG_RESULTS.has(String(entry.verdict.result))) ?? null;
-  const accepted = tampered.length ? { accepted: false, verdict: null, reasons: ["ledger_tampered"] } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
+  const accepted = tampered.length ? {
+    accepted: false,
+    verdict: null,
+    reasons: ["ledger_tampered"]
+  } : newestAccepted && !failing ? { accepted: true, verdict: newestAccepted.verdict, reasons: [] } : {
     accepted: false,
     verdict: failing?.verdict ?? null,
     reasons: failing ? ["failing_verdict"] : !newestCurrent ? ["no_verdict"] : newestCurrent.reasons.length ? newestCurrent.reasons : ["type_check_only"]
@@ -10988,7 +11035,10 @@ function checkVerdicts(cwd, branch, ledgerRows) {
     selfVerdict: accepted.accepted ? null : selfEntry?.verdict ?? null,
     base: newestCurrent?.verdict.base ?? fallbackBase,
     patchId: keyFor(newestCurrent?.verdict.base ?? fallbackBase).patchId,
-    current: { basis: newestCurrent?.basis ?? "none", verdict: newestCurrent?.verdict ?? null },
+    current: {
+      basis: newestCurrent?.basis ?? "none",
+      verdict: newestCurrent?.verdict ?? null
+    },
     carry: carryEntry?.carry ?? null,
     reverify,
     accepted,
@@ -17713,7 +17763,10 @@ function entryCompactContext(store, entry, session, context) {
   const task = entry ? store.readTask(entry.id) : null;
   if (task && !task.ok)
     return null;
-  const freshness = { mode: "signal", current: () => recentSignal(store.root) };
+  const freshness = {
+    mode: "signal",
+    current: () => recentSignal(store.root)
+  };
   const observed = task?.data.evidence.some(isObservedCheck) ?? false;
   const files = (task?.data.decisions ?? []).flatMap((decision) => decision.data.binding.contentRefs.flatMap((ref) => ref.kind === "file" ? [path20.resolve(store.root, ref.path)] : []));
   const observedFiles = filesKey(files);
@@ -17779,7 +17832,10 @@ var checkoutAt = (cwd) => {
     if (fs15.existsSync(dotGit)) {
       const admin = fs15.statSync(dotGit).isFile() ? path20.resolve(dir, /^gitdir:\s*(.+)$/mu.exec(fs15.readFileSync(dotGit, "utf8"))?.[1]?.trim() ?? "") : dotGit;
       const head = fs15.readFileSync(path20.join(admin, "HEAD"), "utf8").trim();
-      return { root: dir, branch: /^ref: refs\/heads\/(.+)$/u.exec(head)?.[1] ?? null };
+      return {
+        root: dir,
+        branch: /^ref: refs\/heads\/(.+)$/u.exec(head)?.[1] ?? null
+      };
     }
     if (path20.dirname(dir) === dir)
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-cursor",
-  "version": "8.34.0",
+  "version": "8.35.2",
   "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.34.0",
-    "@brainervirus/workit-mcp": "^8.34.0"
+    "@brainervirus/workit-core": "^8.35.2",
+    "@brainervirus/workit-mcp": "^8.35.2"
   },
   "engines": {
     "node": ">=24"