@tech-leads-club/harness-toolkit 0.10.0 → 0.10.2

package/src/core/rules/rules.trigger.ts

@@ -27,13 +27,24 @@ export type TriggerContext = {
  * every repository, or a rule copied between them silently stops firing. An operator who wants their own shape
  * writes `command(<pattern>)`.
  */
-const SHELL_SHAPES: Record<"pr-open" | "commit" | "push", readonly string[][]> = {
+type ShellShape = {
+  readonly prefix: readonly string[];
+  /**
+   * why this exists only on `gh pr create`: a draft is not yet open for review, so a rule gating `pr-open`
+   * has no work to demand proof of. It is also the only way a proof that itself depends on the pull request
+   * existing — `gh pr view`, for one — can ever run: open the draft, produce the proof against it, then
+   * `gh pr ready`, which keeps its own gate ([/decisions/ad-118.md](/decisions/ad-118.md)).
+   */
+  readonly excludeIfAny?: readonly string[];
+};
+
+const SHELL_SHAPES: Record<"pr-open" | "commit" | "push", readonly ShellShape[]> = {
   "pr-open": [
-    ["gh", "pr", "create"],
-    ["gh", "pr", "ready"],
+    { prefix: ["gh", "pr", "create"], excludeIfAny: ["--draft", "-d"] },
+    { prefix: ["gh", "pr", "ready"] },
   ],
-  commit: [["git", "commit"]],
-  push: [["git", "push"]],
+  commit: [{ prefix: ["git", "commit"] }],
+  push: [{ prefix: ["git", "push"] }],
 };
 
 /**
@@ -53,8 +64,15 @@ function subCommands(command: string): string[][] {
 }
 
 /** why prefix rather than equality: `gh pr create --fill --base main` is the same act as `gh pr create`. */
-function startsWithShape(words: readonly string[], shape: readonly string[]): boolean {
-  return shape.every((token, index) => words[index] === token);
+function startsWithShape(words: readonly string[], prefix: readonly string[]): boolean {
+  return prefix.every((token, index) => words[index] === token);
+}
+
+function matchesShape(words: readonly string[], shape: ShellShape): boolean {
+  if (!startsWithShape(words, shape.prefix)) {
+    return false;
+  }
+  return !shape.excludeIfAny?.some((flag) => words.includes(flag));
 }
 
 /**
@@ -82,9 +100,7 @@ export function triggerMatches(trigger: RuleTrigger, context: TriggerContext): b
         return false;
       }
       const shapes = SHELL_SHAPES[trigger.kind];
-      return subCommands(context.command).some((words) =>
-        shapes.some((shape) => startsWithShape(words, shape)),
-      );
+      return subCommands(context.command).some((words) => shapes.some((shape) => matchesShape(words, shape)));
     }
     default: {
       if (context.command === undefined) {

package/src/entrypoints/prompt-submit.ts

@@ -2,7 +2,7 @@ import type { HarnessEvent } from "../contracts/index.ts";
 import { coreFacade } from "../core/index.ts";
 import type { Handler, HandlerContext } from "./run.ts";
 import { main } from "./run.ts";
-import { currentGitSha, obsConfigFor } from "./support.ts";
+import { currentGitSha, obsConfigFor, shaScopeRoot } from "./support.ts";
 
 export const promptSubmitHandler: Handler = async (event: HarnessEvent, ctx: HandlerContext) => {
   coreFacade.observability.recordFromEvent(event.projectDir, obsConfigFor(ctx.policy), event);
@@ -11,7 +11,10 @@ export const promptSubmitHandler: Handler = async (event: HarnessEvent, ctx: Han
   coreFacade.untrusted.clearRecall(event.projectDir, event.sessionKey);
   // why: every stop-time gate diffs against this, not against HEAD. A turn that commits moves HEAD past its
   // own changes, and each gate then read an empty diff and skipped ([/decisions/ad-058.md](/decisions/ad-058.md)).
-  const sha = await currentGitSha(event.projectDir);
+  // why: the exact AD-114 divergence, now against turn_base_sha instead of a rule's proof sha — a worktree
+  // session recorded the main checkout's HEAD as the turn's start, so every gate diffing against it saw a
+  // whole untouched file read as "added this turn" ([/decisions/ad-117.md](/decisions/ad-117.md)).
+  const sha = await currentGitSha(shaScopeRoot(event));
   if (sha) {
     await coreFacade.handoff.patchHandoff(event.projectDir, event.provider, {
       slice: { turn_base_sha: sha },