@brainervirus/workit-core 8.21.2 → 8.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-core",
-  "version": "8.21.2",
+  "version": "8.22.0",
   "private": false,
   "description": "Workit shared core — task, policy, evidence, review, decision, worker, and writer state for agentic coding workflows",
   "keywords": [

package/src/core/methods.ts

@@ -125,6 +125,9 @@ Autonomy contract:
 CLI first: if a step has one right answer, use the \`workit\` verb instead of
 hand-running git, gh or glab (\`workit git|pr|ci|check|help\`;
 else \`npx -y @brainervirus/workit-cli\`).
+Other checkout: \`workit --cwd <dir> <verb>\` (Codex: \`<verb> --cwd <dir>\`); one workit
+verb per shell call, never \`cd <dir> && workit\`. zsh-safe: no \`echo =====\`
+(\`printf '%s\\n' ---\`), quote globs and URLs, no variable named \`status\` or \`path\`.
 Add Co-Authored-By via \`workit git commit --trailer "K: v" -- <paths>\`, never
 an amend.
 The task families (task, policy, evidence, finding, decision, worker, state)

package/src/hooks/cwd-normalize.ts

@@ -0,0 +1,45 @@
+// `cd <dir> && workit <args>` → `workit --cwd <dir> <args>` (issue #388).
+// On Claude Code the compound does not match a `Bash(workit:*)` allow rule
+// (every subcommand must match, and a `cd` outside the working dirs breaks
+// it), so the auto-mode classifier judged it. The rewrite is exact and
+// conservative: one literal directory, one workit call, and only read-only
+// filters after it. Anything else is left alone. Pure string work.
+import { segmentsOf } from "./shell-words";
+
+// A directory spelled as one literal word: bare, '…' or "…" with no expansion.
+const COMPOUND =
+  /^\s*cd\s+([A-Za-z0-9_./@%+:,=-]+|'[^'$`\\\n]*'|"[^"$`\\!\n]*")\s*&&\s*(workit(?:\s[\s\S]*)?)$/u;
+const FILTERS = new Set(["tail", "head", "grep"]);
+
+// A filter that reads only stdin, so moving the cwd cannot change what it
+// reads: flags and counts for tail/head, one pattern for grep (no -r/-R/-f).
+const stdinOnly = (words: readonly string[]): boolean => {
+  const [name, ...args] = words;
+  const operands = args.filter((w) => !w.startsWith("-"));
+  if (name === "grep")
+    return operands.length <= 1 && !args.some((w) => /^-[^-]*[rRf]|^--(recursive|file)/u.test(w));
+  return operands.every((w) => /^\d+$/u.test(w)) && !args.some((w) => w.startsWith("--output"));
+};
+
+/**
+ * The command rewritten to `workit --cwd <dir> …`, or null when it is not
+ * exactly `cd <literal dir> && workit … [2>&1] [| tail|head|grep …]*`.
+ */
+export const cwdRewrite = (command: string): string | null => {
+  const match = COMPOUND.exec(command);
+  const dir = match?.[1];
+  const rest = match?.[2];
+  if (!dir || !rest || dir.startsWith("-")) return null;
+  // `2>&1` is the only redirect, `|` the only operator: no `&`, `;`, `<`, `>`, backtick or newline.
+  if (/[&;<>`\n]/u.test(rest.replaceAll("2>&1", ""))) return null;
+  const segments = segmentsOf(rest);
+  const [head, ...filters] = segments;
+  if (!head || head.words[0] !== "workit") return null;
+  if (head.words.some((w) => w === "--cwd" || w.startsWith("--cwd="))) return null;
+  const clean = (s: (typeof segments)[number]) =>
+    !s.unanalyzable && !s.group && !s.subs?.length && !s.stdin?.length && !s.redirects.length;
+  if (!segments.every(clean)) return null;
+  if (!segments.slice(0, -1).every((s) => s.pipe)) return null;
+  if (!filters.every((s) => FILTERS.has(s.words[0] ?? "") && stdinOnly(s.words))) return null;
+  return `workit --cwd ${dir} ${rest.slice("workit".length).trimStart()}`.trimEnd();
+};

package/src/hooks/handle.ts

@@ -9,6 +9,7 @@ import type { HostDescriptor, Support } from "./descriptor";
 import { branchGuidance } from "../core/branch";
 import { workspaceTrailers } from "../core/workspaces";
 import { judgeBranch, recordIssuedSession, verdictCommand } from "../host-session";
+import { cwdRewrite } from "./cwd-normalize";
 import { heavyDenial, heavyGate, rewriteNote, splitDenial } from "./heavy-gate";
 import { shellPolicy } from "./policy";
 import {
@@ -204,6 +205,10 @@ function decide(input: HookInput, deps: HookDeps): HookDecision {
       const rewrites = usable(descriptor.shellPolicy.rewrite);
       if (plan.kind === "rewrite" && !rewrites && canDeny) return heavyDenial(event.command, plan);
       const lease = plan.kind === "rewrite" && rewrites ? plan : null;
+      // `cd <dir> && workit …` becomes `workit --cwd <dir> …` (issue #388). A
+      // workit command is never heavy itself, so the lease plan wins when set.
+      const cwdCommand =
+        !lease && rewrites && input.host === "claude_code" ? cwdRewrite(event.command) : null;
       const aside = plan.kind === "passthrough" ? plan.note : null;
       // The command will run: note HEAD so the post-tool hook (or the next
       // command, without one) can tell whether a raw commit moved it.
@@ -212,12 +217,13 @@ function decide(input: HookInput, deps: HookDeps): HookDecision {
         event.command,
         postTool ? callKey(event.toolUseId, event.command) : NEXT_COMMAND,
       );
+      const rewrittenTo = lease?.command ?? cwdCommand;
       const rewritten = (text: string | null): HookDecision =>
-        lease
+        rewrittenTo
           ? {
               kind: "rewrite",
-              command: lease.command,
-              input: event.toolInput ? { ...event.toolInput, command: lease.command } : null,
+              command: rewrittenTo,
+              input: event.toolInput ? { ...event.toolInput, command: rewrittenTo } : null,
               text,
             }
           : NONE;
@@ -228,7 +234,11 @@ function decide(input: HookInput, deps: HookDeps): HookDecision {
         withContextLine(canDeny ? rawGitPre(input, event.command) : NONE, aside),
         shipNudge(input, event.command),
       );
-      if (!lease) return nudged;
+      // A deny always wins over the cwd rewrite.
+      if (!lease)
+        return cwdCommand && nudged.kind !== "deny"
+          ? rewritten(nudged.kind === "context" ? nudged.text : null)
+          : nudged;
       return rewritten(
         [rewriteNote(lease), nudged.kind === "context" ? nudged.text : null]
           .filter(Boolean)

package/src/stack.ts

@@ -1494,7 +1494,7 @@ export function syncStack(
           return stackFail(
             "blocked",
             `a rebase is in progress in ${owner}`,
-            `cd ${owner} && git rebase --continue  # or --abort; then workit stack sync`,
+            `git -C ${owner} rebase --continue  # or --abort; then workit --cwd ${owner} stack sync`,
             { conflict: entry.branch, worktree: owner, progress: outcome },
           );
         if (owner && trackedDirt(owner))