@brainervirus/workit-cli 8.35.0 → 8.35.2

package/dist/index.js

@@ -6401,9 +6401,16 @@ function workspaceDefaultTarget(cwd, globalDefault) {
 }
 var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspaceCommitPolicySchema, workspaceProfileSchema, versionSourceSchema, releaseTrackSchema, workspaceConfigSchema, workspacesFileSchema, workspacesRevision = (contents) => createHash("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] ?? "");
@@ -6442,7 +6449,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,
@@ -6462,7 +6474,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)
+  };
 }, loadWorkspacesFrom = (dir) => readWorkspacesResult(dir).entries, globToRegExp = (glob) => {
   let out = "";
   for (let i = 0;i < glob.length; i++) {
@@ -6591,7 +6606,7 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
     for (const b of entries.slice(i + 1)) {
       const aInB = matchWorkspace(b.glob, globRoot(a.glob));
       const bInA = matchWorkspace(a.glob, globRoot(b.glob));
-      if (!aInB && !bInA)
+      if (!aInB && !bInA && !globsMayOverlap(a.glob, b.glob))
         continue;
       const [inner, outer] = aInB && !bInA ? [a, b] : bInA && !aInB ? [b, a] : globSpecificity(a.glob) >= globSpecificity(b.glob) ? [a, b] : [b, a];
       const si = globSpecificity(inner.glob);
@@ -6681,7 +6696,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 {
@@ -6693,7 +6711,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
+  };
 }, workspaceDeleteBranch = (cwd, dir) => inheritedSetting(cwd, dir, (entry) => typeof entry.deleteBranch === "boolean")?.source?.deleteBranch !== false, workspaceTrailers = (cwd, dir) => {
   const found = inheritedSetting(cwd, dir, (entry) => typeof entry.trailers === "boolean");
   return {
@@ -6821,7 +6842,10 @@ var nonBlank, branchPreset, commitPreset, workspaceBranchPolicySchema, workspace
     status: "resolved",
     profileName: null,
     workspace: null,
-    provenance: { branchPolicy: "user-default", commitPolicy: "user-default" }
+    provenance: {
+      branchPolicy: "user-default",
+      commitPolicy: "user-default"
+    }
   };
   if (selected.status === "invalid")
     return selected;
@@ -6892,7 +6916,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" && (path2.posix.isAbsolute(track.versionSource.path.replaceAll("\\", "/")) || /^[A-Za-z]:\//u.test(track.versionSource.path.replaceAll("\\", "/")) || track.versionSource.path.replaceAll("\\", "/").split("/").includes(".."))) {
@@ -6925,7 +6953,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(),
@@ -9286,7 +9317,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@brainervirus/workit-cli",
-    version: "8.35.0",
+    version: "8.35.2",
     private: false,
     description: "Workit CLI — setup wizard, doctor, and task control for agentic coding workflows",
     keywords: [
@@ -9324,13 +9355,13 @@ var init_package = __esm(() => {
     },
     dependencies: {
       "@babel/parser": "7.29.9",
-      "@brainervirus/workit-cursor": "^8.35.0",
+      "@brainervirus/workit-cursor": "^8.35.2",
       "@inkjs/ui": "2.0.0",
       ink: "7.1.1",
       react: "19.2.8"
     },
     devDependencies: {
-      "@brainervirus/workit-core": "^8.35.0"
+      "@brainervirus/workit-core": "^8.35.2"
     },
     engines: {
       node: ">=24"
@@ -14889,7 +14920,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) {
@@ -15014,7 +15050,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")
@@ -15089,12 +15128,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;
@@ -15129,7 +15169,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;
@@ -15169,7 +15212,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;
@@ -15274,7 +15320,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"]
@@ -15292,7 +15342,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,
@@ -15531,10 +15584,18 @@ function recordVerdict(context, input) {
 }
 function untrackedField(cwd) {
   const files = untrackedFiles2(cwd);
-  return files.length ? { untracked: files.slice(0, MAX_UNTRACKED_LISTED), untrackedCount: files.length } : {};
+  return files.length ? {
+    untracked: files.slice(0, MAX_UNTRACKED_LISTED),
+    untrackedCount: files.length
+  } : {};
 }
 function recordHandoff(context, input) {
-  return appendRow(context.cwd, { ...common(context, noteKey(context)), type: "handoff", note: input.note, next: input.next }, { now: context.now });
+  return appendRow(context.cwd, {
+    ...common(context, noteKey(context)),
+    type: "handoff",
+    note: input.note,
+    next: input.next
+  }, { now: context.now });
 }
 function rowLabels(row) {
   const labels = [];
@@ -15689,7 +15750,11 @@ function buildHandoff(cwd, options = {}) {
   }));
   const lastHandoffRow = mine.findLast((row) => row.type === "handoff");
   const partial = {
-    store: { root: store.value.root, shared: store.value.shared, ledger: ledger.path },
+    store: {
+      root: store.value.root,
+      shared: store.value.shared,
+      ledger: ledger.path
+    },
     branch,
     head,
     subject: head ? git4(cwd, ["log", "-1", "--format=%s", head]) : null,
@@ -15722,7 +15787,11 @@ function buildHandoff(cwd, options = {}) {
   const nextCommand = nextCommandFor(partial);
   return {
     ok: true,
-    value: { ...partial, nextCommand, next: options.next?.trim() || nextCommand }
+    value: {
+      ...partial,
+      nextCommand,
+      next: options.next?.trim() || nextCommand
+    }
   };
 }
 var LEDGER_VERSION = 1, MAX_LINE_BYTES = 4096, VERDICT_RESULTS, PASSING, FAILING, STRONG_RESULTS, VERDICT_KINDS, VERDICT_SURFACES, PR_ROW_TYPES, err = (code, error, unblock) => ({
@@ -15887,7 +15956,11 @@ ${body}`), TAIL_BYTES, lastLine = (fd, size) => {
     if (entry[0] === "R" || entry[0] === "C")
       index += 1;
   }
-  return { dirty: paths.length > 0, files: paths.length, paths: paths.slice(0, MAX_DIRTY_PATHS) };
+  return {
+    dirty: paths.length > 0,
+    files: paths.length,
+    paths: paths.slice(0, MAX_DIRTY_PATHS)
+  };
 }, nextCommandFor = (brief) => {
   const branchFlag = brief.branch ? ` --branch ${brief.branch}` : "";
   const verify = `workit ledger verdict verified${branchFlag} --how "<method and evidence>"  (from a session that did not author the branch, with WORKIT_SESSION_ID set)`;
@@ -80569,12 +80642,22 @@ function gitRestack(cwd, input) {
   if (!dir) {
     const scratch = scratchDir(cwd);
     if (!scratch)
-      return { ok: false, conflict: false, worktree: cwd, error: "no store root" };
+      return {
+        ok: false,
+        conflict: false,
+        worktree: cwd,
+        error: "no store root"
+      };
     fs28.mkdirSync(scratch, { recursive: true });
     dir = path56.join(scratch, `${input.branch.replace(/[^A-Za-z0-9._-]+/gu, "_").slice(0, 40)}-${randomBytes4(4).toString("hex")}`);
     const added = gitRun3(cwd, ["worktree", "add", "-q", dir, input.branch], GIT_TIMEOUTS.worktree);
     if (!added.ok)
-      return { ok: false, conflict: false, worktree: cwd, error: firstLine(added) };
+      return {
+        ok: false,
+        conflict: false,
+        worktree: cwd,
+        error: firstLine(added)
+      };
   }
   const run = gitRun3(dir, [
     "-c",
@@ -80597,7 +80680,12 @@ function gitRestack(cwd, input) {
         error: `git rebase did not finish within ${stackDeps.rebaseTimeoutMs} ms`
       };
     if (rebaseInProgress(dir))
-      return { ok: false, conflict: true, worktree: dir, error: firstLine(run) };
+      return {
+        ok: false,
+        conflict: true,
+        worktree: dir,
+        error: firstLine(run)
+      };
     if (!owner)
       gitRun3(cwd, ["worktree", "remove", "--force", dir]);
     return { ok: false, conflict: false, worktree: dir, error: firstLine(run) };
@@ -80605,7 +80693,12 @@ function gitRestack(cwd, input) {
   if (!owner)
     gitRun3(cwd, ["worktree", "remove", "--force", dir]);
   const head = branchTip(cwd, input.branch);
-  return head ? { ok: true, head } : { ok: false, conflict: false, worktree: dir, error: `${input.branch} vanished` };
+  return head ? { ok: true, head } : {
+    ok: false,
+    conflict: false,
+    worktree: dir,
+    error: `${input.branch} vanished`
+  };
 }
 function pruneScratch(cwd) {
   const scratch = scratchDir(cwd);
@@ -80730,7 +80823,10 @@ function listStacks(cwd) {
     if (parsed && fileFor(parsed.name) === name)
       out.push(parsed);
   }
-  return { ok: true, data: out.toSorted((a, b) => a.name.localeCompare(b.name)) };
+  return {
+    ok: true,
+    data: out.toSorted((a, b) => a.name.localeCompare(b.name))
+  };
 }
 function selectStack(cwd, name) {
   if (name !== null && !validName(name))
@@ -81075,7 +81171,10 @@ function statusDoc(ctx, pr) {
   const status = ctx.resolved.forge.prStatus(pr);
   if (!status.ok)
     return status;
-  return buildStatusDoc(ctx.cwd, ctx.resolved, status.data, { logLines: 0, behind: false });
+  return buildStatusDoc(ctx.cwd, ctx.resolved, status.data, {
+    logLines: 0,
+    behind: false
+  });
 }
 function prBinding(ctx, entry, doc) {
   const label = noun2(ctx.resolved, entry.pr);
@@ -81095,7 +81194,10 @@ function prBinding(ctx, entry, doc) {
 function repoMismatch(ctx, stack) {
   const { kind, repo } = ctx.resolved.forge;
   if (stack.repo && stack.repo !== repo || stack.forge && stack.forge !== kind)
-    return stackFail("blocked", `repo_mismatch: stack ${stack.name} was planned on ${stack.forge ?? "?"} ${stack.repo ?? "?"}, but this checkout resolves to ${kind} ${repo}`, `workit stack plan --name ${stack.name} <branch…>  # re-plan it here, or run from the right checkout`, { planned: { forge: stack.forge, repo: stack.repo }, resolved: { forge: kind, repo } });
+    return stackFail("blocked", `repo_mismatch: stack ${stack.name} was planned on ${stack.forge ?? "?"} ${stack.repo ?? "?"}, but this checkout resolves to ${kind} ${repo}`, `workit stack plan --name ${stack.name} <branch…>  # re-plan it here, or run from the right checkout`, {
+      planned: { forge: stack.forge, repo: stack.repo },
+      resolved: { forge: kind, repo }
+    });
   return null;
 }
 function qualify(ctx, stack, entry, doc, verdict, grant, binding = null, bypass = false) {
@@ -81236,7 +81338,11 @@ function detectMerged(ctx, cwd, stack, trunkSha, state) {
       merged = tip !== null && hasOwnCommits(cwd, tip, entry.lastParentHead) && isAncestor2(cwd, tip, trunkSha);
     }
     if (merged) {
-      entry.merged = { pr: entry.pr, mergeSha: null, at: new Date().toISOString() };
+      entry.merged = {
+        pr: entry.pr,
+        mergeSha: null,
+        at: new Date().toISOString()
+      };
       newly.push({ branch: entry.branch, pr: entry.pr });
     }
   }
@@ -81250,18 +81356,31 @@ function pushBranch(cwd, actor, branch, priorTip) {
   if (!remote.ok)
     return stackFail(remote.code, remote.error);
   if (remote.sha === plan.data.sha)
-    return { ok: true, data: { pushed: false, forced: false, sha: plan.data.sha } };
+    return {
+      ok: true,
+      data: { pushed: false, forced: false, sha: plan.data.sha }
+    };
   const grant = requireGrant(cwd, "push", { forge: !plan.data.local });
   if (!grant.allowed)
-    return stackFail("blocked", grant.error, grant.unblock, { reason: grant.reason });
+    return stackFail("blocked", grant.error, grant.unblock, {
+      reason: grant.reason
+    });
   const force = remote.sha !== null && !isAncestor2(cwd, remote.sha, plan.data.sha);
   const expect = !force ? null : remote.sha === priorTip ? priorTip : recordedRemoteTip(cwd, plan.data) ?? null;
-  const pushed = executePush(cwd, plan.data, { forceWithLease: force, expect, actor });
+  const pushed = executePush(cwd, plan.data, {
+    forceWithLease: force,
+    expect,
+    actor
+  });
   if (!pushed.ok)
     return { ...fromForge(pushed), data: { branch } };
   return {
     ok: true,
-    data: { pushed: pushed.data.pushed, forced: pushed.data.forced, sha: plan.data.sha }
+    data: {
+      pushed: pushed.data.pushed,
+      forced: pushed.data.forced,
+      sha: plan.data.sha
+    }
   };
 }
 function syncStack(cwd, ctx, stack, options, actor) {
@@ -81371,7 +81490,11 @@ function syncStack(cwd, ctx, stack, options, actor) {
               worktree: rebased.worktree,
               progress: outcome
             });
-          return rebased.conflict ? stackFail("blocked", `conflict restacking ${entry.branch} onto ${parent.name}: ${rebased.error}`, `resolve the conflicts in ${rebased.worktree}, git rebase --continue, then workit stack sync  # or git rebase --abort`, { conflict: entry.branch, worktree: rebased.worktree, progress: outcome }) : stackFail("failed", `restacking ${entry.branch} failed: ${rebased.error}`, undefined, {
+          return rebased.conflict ? stackFail("blocked", `conflict restacking ${entry.branch} onto ${parent.name}: ${rebased.error}`, `resolve the conflicts in ${rebased.worktree}, git rebase --continue, then workit stack sync  # or git rebase --abort`, {
+            conflict: entry.branch,
+            worktree: rebased.worktree,
+            progress: outcome
+          }) : stackFail("failed", `restacking ${entry.branch} failed: ${rebased.error}`, undefined, {
             branch: entry.branch,
             progress: outcome
           });
@@ -81431,8 +81554,16 @@ function syncStack(cwd, ctx, stack, options, actor) {
           p: patchId(cwd, fromBase, fromHead),
           d: diffHash(cwd, fromBase, fromHead)
         };
-        const after = { p: patchId(cwd, parentTip, newTip), d: diffHash(cwd, parentTip, newTip) };
-        const equal = before.d !== null && before.d === after.d && before.p !== null && before.p === after.p && sameOwnChange(cwd, { from: fromHead, to: newTip, fromBase, toBase: parentTip });
+        const after = {
+          p: patchId(cwd, parentTip, newTip),
+          d: diffHash(cwd, parentTip, newTip)
+        };
+        const equal = before.d !== null && before.d === after.d && before.p !== null && before.p === after.p && sameOwnChange(cwd, {
+          from: fromHead,
+          to: newTip,
+          fromBase,
+          toBase: parentTip
+        });
         appendObserved(cwd, {
           type: "stack.restacked",
           actor,
@@ -81450,7 +81581,12 @@ function syncStack(cwd, ctx, stack, options, actor) {
         if (step.restack)
           step.restack.carried = equal;
         else
-          step.restack = { from: fromBase, onto: parentTip, head: newTip, carried: equal };
+          step.restack = {
+            from: fromBase,
+            onto: parentTip,
+            head: newTip,
+            carried: equal
+          };
       }
       if (options.publish) {
         touchStackLock();
@@ -81479,7 +81615,10 @@ function syncStack(cwd, ctx, stack, options, actor) {
             });
           const updated = ctx.resolved.forge.updateBase(entry.pr, parent.name);
           if (!updated.ok)
-            return { ...fromForge(updated), data: { branch: entry.branch, progress: outcome } };
+            return {
+              ...fromForge(updated),
+              data: { branch: entry.branch, progress: outcome }
+            };
           appendObserved(cwd, {
             type: "pr.retargeted",
             actor,
@@ -81554,7 +81693,9 @@ async function landStack(ctx, stack, options) {
   if (bypass) {
     const grant = requireGrant(ctx.cwd, "merge");
     if (!grant.allowed)
-      return failWith(stackFail("blocked", grant.error, grant.unblock, { reason: "grant_required" }));
+      return failWith(stackFail("blocked", grant.error, grant.unblock, {
+        reason: "grant_required"
+      }));
     if (!grant.allowUnverified)
       return failWith(stackFail("blocked", `unverified_refused: workspace ${grant.workspace ? `"${grant.workspace}"` : "(none)"} grants merge: "verified", which never lands without an accepted independent verdict`, "a non-author session verifies each head (workit-review), then land without --unverified", { reason: "unverified_refused" }));
   }
@@ -81627,7 +81768,8 @@ async function landStack(ctx, stack, options) {
       deleteBranch: false,
       actor: ctx.actor,
       expect: { base: stack.trunk, branch: entry.branch },
-      ...bypass && !verdict.satisfied ? { unverified: bypass } : {}
+      ...bypass && !verdict.satisfied ? { unverified: bypass } : {},
+      ...options.baseRedOk ? { baseRedOk: options.baseRedOk } : {}
     }, ctx.sleep);
     if (!merged.ok) {
       if (merged.code === "blocked" && "refusal" in merged && merged.refusal) {
@@ -81649,7 +81791,11 @@ async function landStack(ctx, stack, options) {
       mergeSha: merged.data.mergeSha,
       unverified: merged.data.unverified?.recorded ?? null
     });
-    entry.merged = { pr, mergeSha: merged.data.mergeSha, at: new Date().toISOString() };
+    entry.merged = {
+      pr,
+      mergeSha: merged.data.mergeSha,
+      at: new Date().toISOString()
+    };
     const written = writeStack(ctx.cwd, stack);
     if (!written.ok)
       return failWith(written);
@@ -87411,7 +87557,11 @@ __export(exports_stack, {
   run: () => run20
 });
 async function plan(argv, io) {
-  const flags = parseFlags(argv, { name: "value", trunk: "value", track: "value" });
+  const flags = parseFlags(argv, {
+    name: "value",
+    trunk: "value",
+    track: "value"
+  });
   if (typeof flags === "string")
     return usage4(io, flags, PLAN_USAGE);
   const name = flags.values.name ?? null;
@@ -87472,7 +87622,12 @@ async function status3(argv, io) {
   const connected = connect(io, selected.data.branches[0]?.branch ?? null);
   if (!connected.ok)
     return forgeFail(io, connected);
-  const result = stackStatus({ cwd: io.cwd, resolved: connected.data, actor: actorFromEnv(io.env), sleep: forgeDeps.sleep }, selected.data);
+  const result = stackStatus({
+    cwd: io.cwd,
+    resolved: connected.data,
+    actor: actorFromEnv(io.env),
+    sleep: forgeDeps.sleep
+  }, selected.data);
   if (!result.ok)
     return stackFailed(io, result);
   return emit(io, ok2(result.data), (data) => [
@@ -87536,11 +87691,16 @@ async function land(argv, io) {
     timeout: "value",
     interval: "value",
     unverified: "boolean",
+    "base-red-ok": "boolean",
     reason: "value"
   });
   if (typeof flags === "string")
     return usage4(io, flags, LAND_USAGE);
-  const unverified = unverifiedFlag(flags);
+  const baseRedOk = flags.booleans.has("base-red-ok");
+  const baseRedReason = flags.values.reason?.trim();
+  if (baseRedOk && !baseRedReason)
+    return usage4(io, "--base-red-ok needs --reason <why merging onto a red base is fine>", LAND_USAGE);
+  const unverified = baseRedOk && !flags.booleans.has("unverified") ? null : unverifiedFlag(flags);
   if (typeof unverified === "string")
     return usage4(io, unverified, LAND_USAGE);
   if (flags.positionals.length)
@@ -87573,7 +87733,15 @@ async function land(argv, io) {
       resolved: connected.data,
       actor: actorFromEnv(io.env),
       sleep: forgeDeps.sleep
-    }, fresh.data ?? selected.data, { dryRun: flags.booleans.has("dry-run"), max, method, timeoutMs, intervalMs, unverified });
+    }, fresh.data ?? selected.data, {
+      dryRun: flags.booleans.has("dry-run"),
+      max,
+      method,
+      timeoutMs,
+      intervalMs,
+      unverified,
+      baseRedOk: baseRedOk && baseRedReason ? { reason: baseRedReason } : null
+    });
   });
   if (!result.ok)
     return stackFailed(io, result);
@@ -87602,7 +87770,10 @@ async function run20(argv, io) {
     return land(rest, io);
   return usage4(io, sub && !sub.startsWith("-") ? `unknown stack subcommand "${sub}"` : "missing stack subcommand", USAGE12);
 }
-var PLAN_USAGE = "workit stack plan [--name <n>] [--trunk <b> | --track <t>] [<bottom> … <top>] [--json]", STATUS_USAGE2 = "workit stack status [--name <n>] [--json]", SYNC_USAGE = "workit stack sync [--name <n>] [--local] [--dry-run] [--force <branch>]… [--json]", LAND_USAGE = "workit stack land [--name <n>] [--dry-run] [--max <n>] [--method squash|merge|rebase] [--unverified --reason <why>] [--timeout 20m] [--interval 30s] [--json]", USAGE12 = "workit stack plan|status|sync|land ... (workit help stack)", short5 = (sha) => sha ? sha.slice(0, 12) : "?", stackFailed = (io, result) => emit(io, fail2(result.code, result.error, { unblock: result.unblock, data: result.data ?? {} })), label3 = (forge, pr) => pr === null ? "no PR" : `${forge === "gitlab" ? "MR !" : "PR #"}${pr}`, renderSync = (data) => [
+var PLAN_USAGE = "workit stack plan [--name <n>] [--trunk <b> | --track <t>] [<bottom> … <top>] [--json]", STATUS_USAGE2 = "workit stack status [--name <n>] [--json]", SYNC_USAGE = "workit stack sync [--name <n>] [--local] [--dry-run] [--force <branch>]… [--json]", LAND_USAGE = "workit stack land [--name <n>] [--dry-run] [--max <n>] [--method squash|merge|rebase] [--unverified --reason <why>] [--base-red-ok --reason <why>] [--timeout 20m] [--interval 30s] [--json]", USAGE12 = "workit stack plan|status|sync|land ... (workit help stack)", short5 = (sha) => sha ? sha.slice(0, 12) : "?", stackFailed = (io, result) => emit(io, fail2(result.code, result.error, {
+  unblock: result.unblock,
+  data: result.data ?? {}
+})), label3 = (forge, pr) => pr === null ? "no PR" : `${forge === "gitlab" ? "MR !" : "PR #"}${pr}`, renderSync = (data) => [
   `${data.dryRun ? "would sync" : "synced"} stack ${data.name}${data.merged.length ? `; merged: ${data.merged.map((item) => item.branch).join(", ")}` : ""}`,
   ...data.steps.map((step) => [
     `  ${step.branch} on ${step.parent}:`,
@@ -106014,19 +106185,22 @@ function bounded(brief, cwd) {
       file = path73.join(dir, `${(brief.branch ?? "detached").replaceAll(/[^\w.-]+/gu, "-")}.txt`);
       fs37.writeFileSync(file, `${[...body, ...tail].join(`
 `)}
-`, { mode: 384 });
+`, {
+        mode: 384
+      });
     } catch {
       file = null;
     }
   const pointer = `… cut to ${MAX_BRIEF_BYTES} bytes; full brief: ${file ?? "not written (workit handoff --json has it all)"}`;
+  const cappedTail = tail.map(capLine);
   const kept = [];
   for (const line of body) {
     const cut = line.length > 400 ? `${line.slice(0, 400)}…` : line;
-    if (bytes([...kept, cut, pointer, ...tail]) > MAX_BRIEF_BYTES)
+    if (bytes([...kept, cut, pointer, ...cappedTail]) > MAX_BRIEF_BYTES)
       break;
     kept.push(cut);
   }
-  return [...kept, pointer, ...tail];
+  return [...kept, pointer, ...cappedTail];
 }
 async function resumeBrief(argv, io) {
   let values;
@@ -106048,7 +106222,9 @@ async function resumeBrief(argv, io) {
   }
   const last = values.last === undefined ? 10 : Number(values.last);
   if (!Number.isInteger(last) || last < 1)
-    return emit(io, fail2("invalid_input", "--last must be a positive integer", { unblock: USAGE19 }));
+    return emit(io, fail2("invalid_input", "--last must be a positive integer", {
+      unblock: USAGE19
+    }));
   const built = buildHandoff(io.cwd, {
     last,
     note: values.note ?? null,
@@ -106074,7 +106250,7 @@ async function run27(argv, io) {
 }
 var USAGE19 = "workit handoff [--note <text>] [--next <text>] [--record] [--last <n>] [--json]", MAX_BRIEF_BYTES = 4096, short7 = (sha) => sha ? sha.slice(0, 12) : "no commit", bytes = (lines) => Buffer.byteLength(`${lines.join(`
 `)}
-`);
+`), TAIL_LINE_BYTES = 480, capLine = (line) => Buffer.byteLength(line) <= TAIL_LINE_BYTES ? line : `${Buffer.from(line).subarray(0, TAIL_LINE_BYTES).toString().replace(/\uFFFD$/u, "")}… (cut)`;
 var init_handoff = __esm(() => {
   init_ledger();
   init_output();
@@ -106114,13 +106290,19 @@ var FAMILY_ACTIONS = {
   },
   evidence: { record: "Record evidence against a task's requirements" },
   finding: { record: "Record a finding", resolve: "Resolve a finding" },
-  decision: { record: "Record a task decision", revoke: "Revoke a task decision" },
+  decision: {
+    record: "Record a task decision",
+    revoke: "Revoke a task decision"
+  },
   worker: {
     assign: "Assign a worker to a task",
     report: "Report a worker's result",
     cancel: "Cancel a worker assignment"
   },
-  state: { export: "Export a task's state (v1)", import: "Import an exported task state" }
+  state: {
+    export: "Export a task's state (v1)",
+    import: "Import an exported task state"
+  }
 };
 var POLICY_JUDGE = "--judge risk=trivial|normal|high behavior=yes|no product-choice=yes|no plan=yes|no [--ref <path>]… [--why <reason>]";
 var TASK_IMPLICIT = [
@@ -106554,7 +106736,7 @@ var VERBS = [
       },
       {
         name: "land",
-        usage: "workit stack land [--name <n>] [--dry-run] [--max <n>] [--method squash|merge|rebase] [--unverified --reason <why>] [--timeout 20m] [--interval 30s]",
+        usage: "workit stack land [--name <n>] [--dry-run] [--max <n>] [--method squash|merge|rebase] [--unverified --reason <why>] [--base-red-ok --reason <why>] [--timeout 20m] [--interval 30s]",
         summary: "Merge the stack root first, restacking the rest as each lands"
       }
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-cli",
-  "version": "8.35.0",
+  "version": "8.35.2",
   "private": false,
   "description": "Workit CLI — setup wizard, doctor, and task control for agentic coding workflows",
   "keywords": [
@@ -38,13 +38,13 @@
   },
   "dependencies": {
     "@babel/parser": "7.29.9",
-    "@brainervirus/workit-cursor": "^8.35.0",
+    "@brainervirus/workit-cursor": "^8.35.2",
     "@inkjs/ui": "2.0.0",
     "ink": "7.1.1",
     "react": "19.2.8"
   },
   "devDependencies": {
-    "@brainervirus/workit-core": "^8.35.0"
+    "@brainervirus/workit-core": "^8.35.2"
   },
   "engines": {
     "node": ">=24"