@tech-leads-club/harness-toolkit 0.16.0 → 0.16.1

package/dist/tool-failure.mjs

@@ -157,6 +157,6 @@ description: Harness-learned lessons (auto-synced from gate failures)
 alwaysApply: true
 ---
 
-${J}`;return WV(Q,q,"utf8"),Q}function u3($,Z){let J={permission:$};if(Z.userNote!==void 0)J.user_message=Z.userNote;return J.agent_message=Z.reason,JSON.stringify(J)}function h3($,Z){switch($.kind){case"abstain":return{stdout:"{}",exitCode:0};case"allow":return{stdout:JSON.stringify({permission:"allow"}),exitCode:0};case"deny":return{stdout:u3("deny",$),exitCode:0};case"ask":return{stdout:u3("ask",$),exitCode:0};case"context":{let J={};if($.env!==void 0)J.env=$.env;return J.additional_context=$.text,{stdout:JSON.stringify(J),exitCode:0}}case"continue":return{stdout:JSON.stringify({followup_message:$.text}),exitCode:0};case"rewriteInput":return{stdout:JSON.stringify({updated_input:$.input}),exitCode:0};case"rewriteOutput":return{stdout:JSON.stringify({updated_mcp_tool_output:{result_json:$.output}}),exitCode:0};default:throw Error(`unreachable decision kind: ${JSON.stringify($)}`)}}function p3(){return{blockedPatterns:["-fast(?:$|[^a-z0-9])","/fast(?:$|[^a-z0-9])","composer-2\\.5-fast"],minEffort:null,untrustedTools:["Fetch","WebSearch"]}}import{join as VV}from"node:path";function c3(){return VV(J9(),"hooks.json")}function d3(){return[c3()]}var GV=[{hookEvent:"sessionStart",handler:"session-start",timeoutSeconds:10},{hookEvent:"sessionEnd",handler:"session-end",timeoutSeconds:10},{hookEvent:"beforeSubmitPrompt",handler:"prompt-submit",timeoutSeconds:5},{hookEvent:"afterAgentThought",handler:"tool-after",timeoutSeconds:5},{hookEvent:"preCompact",handler:"compact-before",timeoutSeconds:5},{hookEvent:"subagentStart",handler:"subagent-start",timeoutSeconds:5,failClosed:!0},{hookEvent:"subagentStop",handler:"subagent-stop",timeoutSeconds:5},{hookEvent:"preToolUse",handler:"tool-before",timeoutSeconds:5,failClosed:!0},{hookEvent:"postToolUse",handler:"tool-after",timeoutSeconds:5},{hookEvent:"postToolUseFailure",handler:"tool-failure",timeoutSeconds:5},{hookEvent:"beforeShellExecution",handler:"tool-before",timeoutSeconds:10,failClosed:!0},{hookEvent:"afterShellExecution",handler:"tool-after",timeoutSeconds:10},{hookEvent:"beforeMCPExecution",handler:"tool-before",timeoutSeconds:10},{hookEvent:"afterMCPExecution",handler:"tool-after",timeoutSeconds:5},{hookEvent:"beforeReadFile",handler:"tool-before",timeoutSeconds:5},{hookEvent:"afterFileEdit",handler:"tool-after",timeoutSeconds:30,matcher:"Write"},{hookEvent:"stop",handler:"stop",timeoutSeconds:120,loopLimit:5},{hookEvent:"afterAgentResponse",handler:"response-after",timeoutSeconds:5,matcher:"AgentResponse"}];function l3($){let J=[$.launcherPath],Q=GV.map((q)=>({hookEvent:q.hookEvent,handler:q.handler,command:"node",args:[...J,q.handler],timeoutSeconds:q.timeoutSeconds,...q.failClosed!==void 0?{failClosed:q.failClosed}:{},...q.matcher!==void 0?{matcher:q.matcher}:{},...q.loopLimit!==void 0?{loopLimit:q.loopLimit}:{}}));return{target:c3(),strategy:"replace",entries:Q}}var i3={name:"cursor",detect:f3,capabilities:b3,policyDefaults:p3,toEvent:w3,render:h3,wiring:l3,wiringTargets:d3,lessonsView:g3};var y$=[i3,S3];function s5($,Z){let J=Z.filter((Q)=>Q.detect($));if(J.length===0)return{provider:null,ambiguous:!1,matchedNames:[]};return{provider:J[0]??null,ambiguous:J.length>1,matchedNames:J.map((Q)=>Q.name)}}var n3=D.observability.DEFAULT_OBS,a3={...n3,debugEnabled:!0};function l8($,Z=n3){return{...Z,globalSpool:$.obs.globalSpool,includePayloads:$.obs.includePayloads,maxAttrChars:$.obs.maxAttrChars,sessionCostAlertUsd:$.obs.sessionCostAlertUsd,retentionDays:$.obs.retentionDays}}function r3($){let Z=`${$.provider}-`;return $.sessionKey.startsWith(Z)?$.sessionKey.slice(Z.length):$.sessionKey}function s3($,Z){return[...D.policy.forProvider($,Z.name)??[],...Z.policyDefaults().blockedPatterns]}var UV=6000;function HV($){if($.filePath===void 0)return!1;if($.event==="edit.after")return!0;return _8($.toolName)}function MV($){return $ instanceof Error?$.message:String($)}function r($,Z,J,Q="unknown",q={}){try{L(BV(H($),"obs.jsonl"),{schema:"harness.observability.v1",provider:Q,kind:Z,level:"signal",ts:new Date().toISOString(),...q,attrs:J})}catch{}}function KV($){return $.event==="shell.before"||$.event==="mcp.before"}function FV($){if(!KV($))return;r($.projectDir,"hook.enter",{event:$.event,toolName:$.toolName??"none",sessionKey:$.sessionKey},$.provider,{trace_id:D.observability.deriveTraceId($.sessionKey),session_id:$.sessionKey})}function CV($,Z,J){if(J.kind!=="deny"&&J.kind!=="ask")return;if($.event==="shell.before")return;D.observability.recordObs($.projectDir,l8(Z),{provider:$.provider,kind:"policy.deny",sessionKey:$.sessionKey,attrs:{event:$.event,tool_name:$.toolName,permission:J.kind,rule:J.rule??"none",diagnostic:J.diagnostic??"none"}})}function OV($){return $!==null&&typeof $==="object"&&!Array.isArray($)?$:{}}async function _V($,Z={}){let J=Z.readStdin??R9,Q=Z.now?Z.now():new Date,q={stdout:null,exitCode:0},W=(await J()).trim();if(!W)return r(process.cwd(),"adapter.unrecognized",{reason:"empty-stdin"}),{event:null,decision:{kind:"abstain"},rendered:q};let Y;try{Y=JSON.parse(W)}catch{return r(process.cwd(),"adapter.unrecognized",{reason:"invalid-json"}),{event:null,decision:{kind:"abstain"},rendered:q}}let z=s5(Y,y$);if(!z.provider)return r(process.cwd(),"adapter.unrecognized",{reason:"no-provider-match"}),{event:null,decision:{kind:"abstain"},rendered:q};if(z.ambiguous)r(process.cwd(),"adapter.ambiguous",{matched:z.matchedNames});let V=z.provider,G=V.toEvent(OV(Y));if(!G)return r(process.cwd(),"adapter.unrecognized",{reason:"unrecognized-event",provider:V.name}),{event:null,decision:{kind:"abstain"},rendered:q};let U=V.capabilities();FV(G);try{let M=D.policy.loadPolicy(G.projectDir);if(G.model)D.subagentPolicy.upsertParentModelState(G.projectDir,G.sessionKey,{model:G.model},s3(M.subagents.blockedPatterns,V));D.presence.heartbeat(G.projectDir,{provider:G.provider,session:r3(G),...HV(G)?{file:G.filePath}:{},now:Q});let B=y$.flatMap((E)=>E.wiringTargets()),T=await $(G,{policy:M,capabilities:U,provider:V,now:Q,protectedPaths:B}),S=d8(T,G,U,{contextBudgetChars:UV});CV(G,M,S);let d=V.render(S,G);return{event:G,decision:S,rendered:d}}catch(M){r(G.projectDir,"adapter.error",{provider:G.provider,event:G.event,message:MV(M)});let B={kind:"abstain"};return{event:G,decision:B,rendered:V.render(B,G)}}}async function o3($){let Z=await _V($);if(Z.rendered.stdout!==null){let J=Z.rendered.stdout;process.stdout.write(J.endsWith(`
+${J}`;return WV(Q,q,"utf8"),Q}function u3($,Z){let J={permission:$};if(Z.userNote!==void 0)J.user_message=Z.userNote;return J.agent_message=Z.reason,JSON.stringify(J)}function h3($,Z){switch($.kind){case"abstain":return{stdout:"{}",exitCode:0};case"allow":return{stdout:JSON.stringify({permission:"allow"}),exitCode:0};case"deny":return{stdout:u3("deny",$),exitCode:0};case"ask":return{stdout:u3("ask",$),exitCode:0};case"context":{let J={};if($.env!==void 0)J.env=$.env;return J.additional_context=$.text,{stdout:JSON.stringify(J),exitCode:0}}case"continue":return{stdout:JSON.stringify({followup_message:$.text}),exitCode:0};case"rewriteInput":return{stdout:JSON.stringify({updated_input:$.input}),exitCode:0};case"rewriteOutput":return{stdout:JSON.stringify({updated_mcp_tool_output:{result_json:$.output}}),exitCode:0};default:throw Error(`unreachable decision kind: ${JSON.stringify($)}`)}}function p3(){return{blockedPatterns:["-fast(?:$|[^a-z0-9])","/fast(?:$|[^a-z0-9])","composer-2\\.5-fast"],minEffort:null,untrustedTools:["Fetch","WebSearch"]}}import{join as VV}from"node:path";function c3(){return VV(J9(),"hooks.json")}function d3(){return[c3()]}var GV=[{hookEvent:"sessionStart",handler:"session-start",timeoutSeconds:10},{hookEvent:"sessionEnd",handler:"session-end",timeoutSeconds:10},{hookEvent:"beforeSubmitPrompt",handler:"prompt-submit",timeoutSeconds:5},{hookEvent:"afterAgentThought",handler:"tool-after",timeoutSeconds:5},{hookEvent:"preCompact",handler:"compact-before",timeoutSeconds:5},{hookEvent:"subagentStart",handler:"subagent-start",timeoutSeconds:5,failClosed:!0},{hookEvent:"subagentStop",handler:"subagent-stop",timeoutSeconds:5},{hookEvent:"preToolUse",handler:"tool-before",timeoutSeconds:10,failClosed:!0},{hookEvent:"postToolUse",handler:"tool-after",timeoutSeconds:5},{hookEvent:"postToolUseFailure",handler:"tool-failure",timeoutSeconds:5},{hookEvent:"beforeShellExecution",handler:"tool-before",timeoutSeconds:10,failClosed:!0},{hookEvent:"afterShellExecution",handler:"tool-after",timeoutSeconds:10},{hookEvent:"beforeMCPExecution",handler:"tool-before",timeoutSeconds:10},{hookEvent:"afterMCPExecution",handler:"tool-after",timeoutSeconds:5},{hookEvent:"beforeReadFile",handler:"tool-before",timeoutSeconds:5},{hookEvent:"afterFileEdit",handler:"tool-after",timeoutSeconds:30,matcher:"Write"},{hookEvent:"stop",handler:"stop",timeoutSeconds:120,loopLimit:5},{hookEvent:"afterAgentResponse",handler:"response-after",timeoutSeconds:5,matcher:"AgentResponse"}];function l3($){let J=[$.launcherPath],Q=GV.map((q)=>({hookEvent:q.hookEvent,handler:q.handler,command:"node",args:[...J,q.handler],timeoutSeconds:q.timeoutSeconds,...q.failClosed!==void 0?{failClosed:q.failClosed}:{},...q.matcher!==void 0?{matcher:q.matcher}:{},...q.loopLimit!==void 0?{loopLimit:q.loopLimit}:{}}));return{target:c3(),strategy:"replace",entries:Q}}var i3={name:"cursor",detect:f3,capabilities:b3,policyDefaults:p3,toEvent:w3,render:h3,wiring:l3,wiringTargets:d3,lessonsView:g3};var y$=[i3,S3];function s5($,Z){let J=Z.filter((Q)=>Q.detect($));if(J.length===0)return{provider:null,ambiguous:!1,matchedNames:[]};return{provider:J[0]??null,ambiguous:J.length>1,matchedNames:J.map((Q)=>Q.name)}}var n3=D.observability.DEFAULT_OBS,a3={...n3,debugEnabled:!0};function l8($,Z=n3){return{...Z,globalSpool:$.obs.globalSpool,includePayloads:$.obs.includePayloads,maxAttrChars:$.obs.maxAttrChars,sessionCostAlertUsd:$.obs.sessionCostAlertUsd,retentionDays:$.obs.retentionDays}}function r3($){let Z=`${$.provider}-`;return $.sessionKey.startsWith(Z)?$.sessionKey.slice(Z.length):$.sessionKey}function s3($,Z){return[...D.policy.forProvider($,Z.name)??[],...Z.policyDefaults().blockedPatterns]}var UV=6000;function HV($){if($.filePath===void 0)return!1;if($.event==="edit.after")return!0;return _8($.toolName)}function MV($){return $ instanceof Error?$.message:String($)}function r($,Z,J,Q="unknown",q={}){try{L(BV(H($),"obs.jsonl"),{schema:"harness.observability.v1",provider:Q,kind:Z,level:"signal",ts:new Date().toISOString(),...q,attrs:J})}catch{}}function KV($){return $.event==="shell.before"||$.event==="mcp.before"}function FV($){if(!KV($))return;r($.projectDir,"hook.enter",{event:$.event,toolName:$.toolName??"none",sessionKey:$.sessionKey},$.provider,{trace_id:D.observability.deriveTraceId($.sessionKey),session_id:$.sessionKey})}function CV($,Z,J){if(J.kind!=="deny"&&J.kind!=="ask")return;if($.event==="shell.before")return;D.observability.recordObs($.projectDir,l8(Z),{provider:$.provider,kind:"policy.deny",sessionKey:$.sessionKey,attrs:{event:$.event,tool_name:$.toolName,permission:J.kind,rule:J.rule??"none",diagnostic:J.diagnostic??"none"}})}function OV($){return $!==null&&typeof $==="object"&&!Array.isArray($)?$:{}}async function _V($,Z={}){let J=Z.readStdin??R9,Q=Z.now?Z.now():new Date,q={stdout:null,exitCode:0},W=(await J()).trim();if(!W)return r(process.cwd(),"adapter.unrecognized",{reason:"empty-stdin"}),{event:null,decision:{kind:"abstain"},rendered:q};let Y;try{Y=JSON.parse(W)}catch{return r(process.cwd(),"adapter.unrecognized",{reason:"invalid-json"}),{event:null,decision:{kind:"abstain"},rendered:q}}let z=s5(Y,y$);if(!z.provider)return r(process.cwd(),"adapter.unrecognized",{reason:"no-provider-match"}),{event:null,decision:{kind:"abstain"},rendered:q};if(z.ambiguous)r(process.cwd(),"adapter.ambiguous",{matched:z.matchedNames});let V=z.provider,G=V.toEvent(OV(Y));if(!G)return r(process.cwd(),"adapter.unrecognized",{reason:"unrecognized-event",provider:V.name}),{event:null,decision:{kind:"abstain"},rendered:q};let U=V.capabilities();FV(G);try{let M=D.policy.loadPolicy(G.projectDir);if(G.model)D.subagentPolicy.upsertParentModelState(G.projectDir,G.sessionKey,{model:G.model},s3(M.subagents.blockedPatterns,V));D.presence.heartbeat(G.projectDir,{provider:G.provider,session:r3(G),...HV(G)?{file:G.filePath}:{},now:Q});let B=y$.flatMap((E)=>E.wiringTargets()),T=await $(G,{policy:M,capabilities:U,provider:V,now:Q,protectedPaths:B}),S=d8(T,G,U,{contextBudgetChars:UV});CV(G,M,S);let d=V.render(S,G);return{event:G,decision:S,rendered:d}}catch(M){r(G.projectDir,"adapter.error",{provider:G.provider,event:G.event,message:MV(M)});let B={kind:"abstain"};return{event:G,decision:B,rendered:V.render(B,G)}}}async function o3($){let Z=await _V($);if(Z.rendered.stdout!==null){let J=Z.rendered.stdout;process.stdout.write(J.endsWith(`
 `)?J:`${J}
 `)}process.exit(Z.rendered.exitCode)}var IV=($,Z)=>{return D.observability.recordAudit($.projectDir,$.event,$.raw,Z.policy.obs.globalSpool),D.observability.recordObs($.projectDir,l8(Z.policy,a3),{provider:$.provider,kind:"tool.fail",sessionKey:$.sessionKey,model:$.model,attrs:{tool_name:$.toolName,file_path:$.filePath,status:$.status}}),{kind:"abstain"}};if(t5.main==t5.module)await o3(IV);export{IV as toolFailureHandler};

package/docs/log.md

@@ -13,6 +13,10 @@ Generated from `docs/decisions/` — do not edit by hand. Run `node tools/render
 A reserved file of the [OKF v0.1](/decisions/ad-013.md) bundle: entries grouped under ISO 8601 headings,
 newest first. For what landed in which npm release, see `CHANGELOG.md` at the repository root.
 
+## 2026-09-16
+
+- **AD-144** — turn_base_sha records the git root it came from, and a mismatch falls back to HEAD ([/decisions/ad-144.md](/decisions/ad-144.md))
+
 ## 2026-09-12
 
 - **AD-139** — lessonsView joins ProviderPort, closing the one dispatcher that bypassed it ([/decisions/ad-139.md](/decisions/ad-139.md))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tech-leads-club/harness-toolkit",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "type": "module",
   "description": "Multi-provider agent steering: gates, follow-up, handoff, policy",
   "keywords": [

package/src/core/handoff/handoff.types.ts

@@ -36,6 +36,13 @@ export type HandoffProviderSlice = {
    * ([/decisions/ad-058.md](/decisions/ad-058.md)).
    */
   turn_base_sha?: string;
+  /**
+   * why: the git root `turn_base_sha` was captured from. A session that moves between independent
+   * worktrees can submit one turn's prompt from one root and stop it from another; without this, the
+   * stale sha from the first root gets diffed against the second, reading months of someone else's
+   * history as "added this turn" ([/decisions/ad-144.md](/decisions/ad-144.md)).
+   */
+  turn_base_root?: string;
   plan_paths?: string[];
   plan_at?: string;
   plan_snippet?: string;

package/src/entrypoints/prompt-submit.ts

@@ -1,5 +1,6 @@
 import type { HarnessEvent } from "../contracts/index.ts";
 import { coreFacade } from "../core/index.ts";
+import { gitRootOf } from "../platform/git.ts";
 import type { Handler, HandlerContext } from "./run.ts";
 import { main } from "./run.ts";
 import { currentGitSha, obsConfigFor, shaScopeRoot } from "./support.ts";
@@ -14,10 +15,14 @@ export const promptSubmitHandler: Handler = async (event: HarnessEvent, ctx: Han
   // 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) {
+  const shaRoot = shaScopeRoot(event);
+  const [sha, gitRoot] = await Promise.all([currentGitSha(shaRoot), gitRootOf(shaRoot)]);
+  // why: a sha with no recorded root cannot later be told apart from one captured in a different git root
+  // entirely — `resolveTurnBase` treats that ambiguity as unsafe, so both are written together or neither is
+  // ([/decisions/ad-144.md](/decisions/ad-144.md)).
+  if (sha && gitRoot) {
     await coreFacade.handoff.patchHandoff(event.projectDir, event.provider, event.sessionKey, {
-      slice: { turn_base_sha: sha },
+      slice: { turn_base_sha: sha, turn_base_root: gitRoot },
     });
   }
   return { kind: "abstain" };

package/src/entrypoints/stop.ts

@@ -18,6 +18,7 @@ import {
   currentGitSha,
   formatLessonsBlock,
   obsConfigFor,
+  resolveTurnBase,
   sessionIdFromKey,
   shaScopeRoot,
 } from "./support.ts";
@@ -489,8 +490,9 @@ export const stopHandler: Handler = async (event: HarnessEvent, ctx: HandlerCont
   // past its own changes, and every gate below then saw an empty diff and skipped — the comment gate in a repo
   // whose task was "schema v2 + tests + commit" ([/decisions/ad-058.md](/decisions/ad-058.md)).
   //
-  // invariant: absent, this is the string `HEAD`, which is exactly the previous behaviour.
-  const turnBase = handoff.turn_base_sha ?? "HEAD";
+  // invariant: absent, or captured from a different git root than `shaRoot`, this is the string `HEAD`,
+  // which is exactly the previous behaviour for the absent case ([/decisions/ad-144.md](/decisions/ad-144.md)).
+  const turnBase = await resolveTurnBase(handoff, shaRoot);
   /**
    * why: collected rather than returned. A turn may defer more than one gate to the same neighbour, and the reply
    * says so once at the end instead of three times ([/decisions/ad-073.md](/decisions/ad-073.md)).

package/src/entrypoints/support.ts

@@ -92,8 +92,9 @@ export type TurnScope = {
  * at `stop` or, since AD-116, before `commit`/`push`/`pr-open` ships it. A second, differently-scoped
  * answer to the same question is the drift AD-071 already named once ([/decisions/ad-116.md](/decisions/ad-116.md)).
  *
- * invariant: `turn_base_sha` falls back to `HEAD` when the handoff is absent or its seal diverged —
- * identical to `stop.ts`'s own fallback.
+ * invariant: `turn_base_sha` falls back to `HEAD` when the handoff is absent, its seal diverged, or
+ * `resolveTurnBase` finds a different git root — identical to `stop.ts`'s own fallback
+ * ([/decisions/ad-144.md](/decisions/ad-144.md)).
  * why: `root` is state (worktree-stable, AD-114); `gitRoot` is where the turn's files actually are
  * (`shaScopeRoot(event)`) — diffing a worktree-valid sha from the wrong directory read a whole unrelated
  * branch as added ([/decisions/ad-129.md](/decisions/ad-129.md)).
@@ -107,7 +108,7 @@ export async function computeTurnScope(
 ): Promise<TurnScope> {
   const seal = coreFacade.handoff.handoffInjectable(root, sessionKey);
   const handoff = seal.ok ? coreFacade.handoff.readHandoff(root, provider, sessionKey) : undefined;
-  const turnBase = handoff?.turn_base_sha ?? "HEAD";
+  const turnBase = await resolveTurnBase(handoff, gitRoot);
   const rawChangedFiles = await listChangedRepoFiles(gitRoot, turnBase);
   const otherSessionFiles = await coreFacade.presence.filesClaimedByOtherLiveSessions(
     root,
@@ -159,6 +160,27 @@ export async function pendingCommentViolations(
   );
 }
 
+/**
+ * why: `turn_base_sha` alone cannot tell "this session's own HEAD" from "the HEAD of a worktree the shell
+ * was sitting in three turns ago" — both are just a sha. Comparing the git root it was captured from
+ * against the root being diffed against is what tells the two apart, the same way an absent
+ * `turn_base_sha` already falls back to `HEAD` rather than diffing against nothing, instead of diffing one
+ * repository's turn against an unrelated one's entire history ([/decisions/ad-144.md](/decisions/ad-144.md)).
+ *
+ * invariant: a slice with a sha but no recorded root (state written before this existed) resolves to
+ * `HEAD`, the same as no slice at all — safe by default, and self-healing on the next `prompt.submit`.
+ */
+export async function resolveTurnBase(
+  slice: { turn_base_sha?: string; turn_base_root?: string } | undefined,
+  gitRoot: string,
+): Promise<string> {
+  if (!slice?.turn_base_sha || !slice.turn_base_root) {
+    return "HEAD";
+  }
+  const currentRoot = await gitRootOf(gitRoot);
+  return currentRoot !== null && currentRoot === slice.turn_base_root ? slice.turn_base_sha : "HEAD";
+}
+
 export async function currentGitSha(root: string): Promise<string | null> {
   const gitRoot = await gitRootOf(root);
   if (gitRoot === null) {

package/src/entrypoints/tool-after.ts

@@ -6,7 +6,7 @@ import { normalizeSeparators } from "../platform/sanitize.ts";
 import { readClaudeUsage } from "../providers/index.ts";
 import type { Handler, HandlerContext } from "./run.ts";
 import { main } from "./run.ts";
-import { OBS_CONFIG_AUDIT, obsConfigFor, observeForRules } from "./support.ts";
+import { OBS_CONFIG_AUDIT, obsConfigFor, observeForRules, resolveTurnBase } from "./support.ts";
 
 const OBS_KIND_BY_EVENT: Partial<Record<HarnessEventKind, ObsKind>> = {
   "tool.after": "tool.end",
@@ -73,7 +73,7 @@ async function commentEditAdvisory(event: HarnessEvent, ctx: HandlerContext): Pr
     event.projectDir,
     targets,
     policy.comments.mode,
-    handoff.turn_base_sha ?? "HEAD",
+    await resolveTurnBase(handoff, event.projectDir),
   );
   if (hits.length === 0) {
     return null;

package/src/providers/cursor/cursor.wiring.ts

@@ -28,7 +28,7 @@ const ENTRY_SPECS: readonly EntrySpec[] = [
   { hookEvent: "preCompact", handler: "compact-before", timeoutSeconds: 5 },
   { hookEvent: "subagentStart", handler: "subagent-start", timeoutSeconds: 5, failClosed: true },
   { hookEvent: "subagentStop", handler: "subagent-stop", timeoutSeconds: 5 },
-  { hookEvent: "preToolUse", handler: "tool-before", timeoutSeconds: 5, failClosed: true },
+  { hookEvent: "preToolUse", handler: "tool-before", timeoutSeconds: 10, failClosed: true },
   { hookEvent: "postToolUse", handler: "tool-after", timeoutSeconds: 5 },
   { hookEvent: "postToolUseFailure", handler: "tool-failure", timeoutSeconds: 5 },
   { hookEvent: "beforeShellExecution", handler: "tool-before", timeoutSeconds: 10, failClosed: true },