@brainervirus/workit-cli 8.5.2 → 8.6.1

package/dist/index.js

@@ -65,7 +65,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@brainervirus/workit-cli",
-    version: "8.5.2",
+    version: "8.6.1",
     private: false,
     description: "Workit CLI — setup wizard, doctor, and task control for agentic coding workflows",
     keywords: [
@@ -103,9 +103,9 @@ var init_package = __esm(() => {
     },
     dependencies: {
       "@babel/parser": "7.29.9",
-      "@brainervirus/workit-core": "^8.5.2",
-      "@brainervirus/workit-cursor": "^8.5.2",
-      "@brainervirus/workit-opencode": "^8.5.2",
+      "@brainervirus/workit-core": "^8.6.1",
+      "@brainervirus/workit-cursor": "^8.6.1",
+      "@brainervirus/workit-opencode": "^8.6.1",
       "@inkjs/ui": "2.0.0",
       ink: "7.1.1",
       react: "19.2.8"
@@ -15016,7 +15016,9 @@ function clearStanding(context, input) {
     target: input.target
   }, { now: context.now });
 }
-function dirtyElsewhere(cwd, branch) {
+function dirtyElsewhere(cwd, branch, head) {
+  if (headSha(cwd) === head)
+    return worktreeTree(cwd)?.dirty !== false;
   const list = git4(cwd, ["worktree", "list", "--porcelain"]);
   let worktree = null;
   for (const line of (list ?? "").split(`
@@ -15051,7 +15053,7 @@ function recordVerdict(context, input) {
   const key = codeKey(context.cwd, { branch, base: context.base });
   if (!key.head)
     return err("not_found", `branch "${branch}" has no commit to judge`);
-  if (key.dirty === true || key.dirty === null && dirtyElsewhere(context.cwd, branch))
+  if (key.dirty === true || key.dirty === null && dirtyElsewhere(context.cwd, branch, key.head))
     return err("blocked", `dirty_worktree: ${branch} has uncommitted changes, so its head is not what was judged`, "commit or stash the changes, re-check, then record the verdict");
   const session = context.actor.session;
   const selfReason = input.self === true ? "flag" : session && input.derivedFrom !== null ? null : "no_session";
@@ -72429,6 +72431,23 @@ function patchEquivalent(cwd, branch, tip) {
 `).filter(Boolean) : [];
   return lines.length > 0 && lines.every((line) => line.startsWith("-"));
 }
+function resolveExpectPrefix(prefix, tips, label) {
+  const known = [...new Set(tips.filter((tip) => typeof tip === "string"))];
+  if (!SHA_PREFIX.test(prefix))
+    return {
+      ok: false,
+      code: "invalid_input",
+      error: "--expect must be a commit sha (full, or an abbreviation of at least 7 hex digits)"
+    };
+  const matches = known.filter((tip) => tip.startsWith(prefix));
+  if (matches.length === 1)
+    return { ok: true, sha: matches[0] };
+  return {
+    ok: false,
+    code: "invalid_input",
+    error: matches.length > 1 ? `--expect ${prefix} is ambiguous for ${label}; choose one of: ${matches.join(", ")}` : `--expect ${prefix} matches no known tip of ${label}${known.length ? `; known: ${known.join(", ")}` : ""}; pass the full sha`
+  };
+}
 function executePush(cwd, plan, input) {
   const before = remoteRefTip(cwd, plan.rawUrl, `refs/heads/${plan.branch}`);
   if (!before.ok)
@@ -72439,10 +72458,15 @@ function executePush(cwd, plan, input) {
     const args = ["push", "--porcelain", "--no-follow-tags", "--recurse-submodules=no"];
     if (input.forceWithLease) {
       const explicit = input.expect !== undefined && input.expect !== null;
-      if (explicit && !SHA.test(input.expect))
-        return failure3("invalid_input", "--expect must be a full commit sha");
+      let expectSha = input.expect ?? null;
+      if (explicit && !SHA.test(expectSha)) {
+        const resolved = resolveExpectPrefix(expectSha, [before.sha, recordedRemoteTip(cwd, plan)], `${plan.remote}/${plan.branch}`);
+        if (!resolved.ok)
+          return failure3(resolved.code, resolved.error);
+        expectSha = resolved.sha;
+      }
       const integrate = `git fetch ${plan.remote} ${plan.branch} && git rebase ${plan.remote}/${plan.branch}  # or merge it; then: workit git push`;
-      const recorded = explicit ? input.expect : recordedRemoteTip(cwd, plan);
+      const recorded = explicit ? expectSha : recordedRemoteTip(cwd, plan);
       if (recorded === undefined && before.sha !== null)
         return failure3("blocked", `lease_unknown: workit has no recorded push of ${plan.branch}, so it cannot tell whose commits ${plan.remote}/${plan.branch} (${before.sha.slice(0, 12)}) holds`, `${integrate}  # or, after reviewing that tip: workit git push --force-with-lease --expect <sha you reviewed> (--overwrite-unintegrated only to drop commits you never had)`);
       const expected = recorded ?? null;
@@ -72574,7 +72598,7 @@ ${run.stdout ?? ""}`).split(/\r?\n/u).map((value) => value.trimEnd()).filter((va
     ...lines.slice(-half)
   ].join(`
 `);
-}, validRefName = (cwd, name) => !name.startsWith("-") && git5(cwd, ["check-ref-format", "--branch", name]).ok, nulList = (text) => text.split("\x00").filter(Boolean), SESSION_SAFE, TRAILER_CONFIG, nothingToCommit = (what) => failure3("failed", `nothing_to_commit: ${what}`, "workit git commit --allow-empty -m '<msg>'  # only to record an empty commit on purpose"), SHA;
+}, validRefName = (cwd, name) => !name.startsWith("-") && git5(cwd, ["check-ref-format", "--branch", name]).ok, nulList = (text) => text.split("\x00").filter(Boolean), SESSION_SAFE, TRAILER_CONFIG, nothingToCommit = (what) => failure3("failed", `nothing_to_commit: ${what}`, "workit git commit --allow-empty -m '<msg>'  # only to record an empty commit on purpose"), SHA, SHA_PREFIX;
 var init_ops = __esm(() => {
   init_branch();
   init_commit_flavors();
@@ -72588,6 +72612,7 @@ var init_ops = __esm(() => {
   SESSION_SAFE = /^[\w.:@/+-]{1,128}$/u;
   TRAILER_CONFIG = ["-c", "trailer.separators=:", "-c", "trailer.where=end"];
   SHA = /^[0-9a-f]{40,64}$/u;
+  SHA_PREFIX = /^[0-9a-f]{7,39}$/u;
 });
 
 // packages/workit-core/src/forge/reruns.ts
@@ -76894,8 +76919,8 @@ async function push(argv, io) {
   const expect = flags.values.expect ?? null;
   if ((expect !== null || flags.booleans.has("overwrite-unintegrated")) && !flags.booleans.has("force-with-lease"))
     return usage3(io, "--expect and --overwrite-unintegrated only apply with --force-with-lease", PUSH_USAGE);
-  if (expect !== null && !/^[0-9a-f]{40,64}$/u.test(expect))
-    return usage3(io, "--expect must be a full commit sha", PUSH_USAGE);
+  if (expect !== null && !/^[0-9a-f]{7,64}$/u.test(expect))
+    return usage3(io, "--expect must be a commit sha (at least 7 hex digits)", PUSH_USAGE);
   const plan = pushPreflight(io.cwd);
   if (!plan.ok)
     return forgeFail(io, plan);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-cli",
-  "version": "8.5.2",
+  "version": "8.6.1",
   "private": false,
   "description": "Workit CLI — setup wizard, doctor, and task control for agentic coding workflows",
   "keywords": [
@@ -38,9 +38,9 @@
   },
   "dependencies": {
     "@babel/parser": "7.29.9",
-    "@brainervirus/workit-core": "^8.5.2",
-    "@brainervirus/workit-cursor": "^8.5.2",
-    "@brainervirus/workit-opencode": "^8.5.2",
+    "@brainervirus/workit-core": "^8.6.1",
+    "@brainervirus/workit-cursor": "^8.6.1",
+    "@brainervirus/workit-opencode": "^8.6.1",
     "@inkjs/ui": "2.0.0",
     "ink": "7.1.1",
     "react": "19.2.8"