@fro.bot/systematic 3.5.8 → 3.5.9

package/dist/index.js

@@ -11194,8 +11194,69 @@ function stableSerialize(value, depth = 0, budget = 8192) {
     return;
   return serializeStableRecord(value, depth, budget);
 }
-function argsFingerprint(ledger, args2) {
-  const serialized = stableSerialize(args2);
+function canonicalPatchText(patchText, sessionLocation) {
+  if (patchTextFileTargets(patchText) === undefined)
+    return;
+  const segments = patchText.split(/(\r?\n)/);
+  for (let index = 0;index < segments.length; index += 1) {
+    const line = segments[index];
+    if (line === `
+` || line === `\r
+`)
+      continue;
+    const prefix = PATCH_FILE_PREFIXES.find((candidate) => line.startsWith(candidate));
+    if (!prefix)
+      continue;
+    const filePath = line.slice(prefix.length).trim();
+    if (!filePath)
+      return;
+    segments[index] = `${prefix}${path9.resolve(sessionLocation, filePath)}`;
+  }
+  return segments.join("");
+}
+function canonicalHunks(value, sessionLocation) {
+  if (!Array.isArray(value))
+    return;
+  const hunks = [];
+  for (const hunk of value) {
+    if (!isRecord7(hunk) || typeof hunk.path !== "string" || !hunk.path) {
+      return;
+    }
+    const canonical = {
+      ...hunk,
+      path: path9.resolve(sessionLocation, hunk.path)
+    };
+    if (hunk.move_path !== undefined) {
+      if (typeof hunk.move_path !== "string" || !hunk.move_path) {
+        return;
+      }
+      canonical.move_path = path9.resolve(sessionLocation, hunk.move_path);
+    }
+    hunks.push(canonical);
+  }
+  return hunks;
+}
+function canonicalOperationArgs(tool, args2, sessionLocation) {
+  if (tool !== "apply_patch" || !isRecord7(args2))
+    return args2;
+  const patchPaths = patchFileTargets(args2);
+  if (patchPaths === undefined)
+    return args2;
+  const patchValue = args2.patchText ?? args2.patch;
+  if (typeof patchValue === "string") {
+    const canonical = canonicalPatchText(patchValue, sessionLocation);
+    if (canonical === undefined)
+      return args2;
+    const patchKey = typeof args2.patchText === "string" ? "patchText" : "patch";
+    return { ...args2, [patchKey]: canonical };
+  }
+  if (patchPaths.length === 0)
+    return args2;
+  const hunks = canonicalHunks(args2.hunks, sessionLocation);
+  return hunks === undefined ? args2 : { ...args2, hunks };
+}
+function argsFingerprint(ledger, tool, args2, sessionLocation) {
+  const serialized = stableSerialize(canonicalOperationArgs(tool, args2, sessionLocation));
   return serialized === undefined ? undefined : ledger.digestIdentity("call", serialized);
 }
 function bashCommand(args2) {
@@ -11441,6 +11502,13 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
   const pendingQuestionChallenges = new Map;
   const blockedQuestionCalls = new Map;
   const consumedQuestionTargets = new Set;
+  function effectiveTargetContext() {
+    const parentTargetRoot = options.targetDirectory ?? process.cwd();
+    return {
+      parentTargetRoot,
+      sessionLocation: options.sessionLocation ?? parentTargetRoot
+    };
+  }
   function rememberOperationObserver(registration) {
     const existing = operationObservers.get(registration.observer.targetDigest);
     if (existing && existing.targetRoot !== registration.targetRoot)
@@ -12368,7 +12436,8 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
   async function prepareOperation(host, args2) {
     if (!options.observer || !isLocalOperationTool(host.tool))
       return;
-    const fingerprint = argsFingerprint(ledger, args2);
+    const { parentTargetRoot, sessionLocation } = effectiveTargetContext();
+    const fingerprint = argsFingerprint(ledger, host.tool, args2, sessionLocation);
     if (!fingerprint) {
       markUnavailable();
       return;
@@ -12377,8 +12446,6 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
     if (bindCall(callDigest, "operation", `${host.tool}:${fingerprint}`) !== "new") {
       return;
     }
-    const parentTargetRoot = options.targetDirectory ?? process.cwd();
-    const sessionLocation = options.sessionLocation ?? parentTargetRoot;
     const target = deriveOpencodeOperationTarget(host.tool, args2, {
       parentTargetRoot,
       sessionLocation,
@@ -13108,7 +13175,8 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
     if (!options.observer || !isLocalOperationTool(host.tool))
       return;
     const callDigest = digestCall(ledger, host.callID);
-    const fingerprint = argsFingerprint(ledger, host.args);
+    const { sessionLocation } = effectiveTargetContext();
+    const fingerprint = argsFingerprint(ledger, host.tool, host.args, sessionLocation);
     if (isSealedOperationReplay(callDigest, host, fingerprint))
       return;
     const pending = takePendingOperation(callDigest, host, fingerprint);
@@ -13119,19 +13187,19 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
       markUnavailable();
       return;
     }
-    if (result.status === "accepted") {
-      const receipt = receiptForOperation(host.callID, result.operation);
-      if (receipt) {
-        if (localOperation(result.operation)) {
-          recoveredOperationContexts.set(receipt.canonical.receiptId, {
-            targetIdentity: pending.targetIdentity,
-            before: pending.before,
-            after: result.after
-          });
-        }
-        mergeReceiptMarker(output, receipt);
-      }
+    if (result.status !== "accepted")
+      return;
+    const receipt = receiptForOperation(host.callID, result.operation);
+    if (!receipt)
+      return;
+    if (localOperation(result.operation)) {
+      recoveredOperationContexts.set(receipt.canonical.receiptId, {
+        targetIdentity: pending.targetIdentity,
+        before: pending.before,
+        after: result.after
+      });
     }
+    mergeReceiptMarker(output, receipt);
   }
   async function after(input, output) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fro.bot/systematic",
-  "version": "3.5.8",
+  "version": "3.5.9",
   "description": "Compound-engineering loops for OpenCode, Pi, and Claude Code",
   "type": "module",
   "homepage": "https://fro.bot/systematic",
@@ -108,7 +108,7 @@
     "rimraf": "6.1.3",
     "semantic-release": "25.0.8",
     "semantic-release-export-data": "1.2.0",
-    "typebox": "1.3.8",
+    "typebox": "1.3.9",
     "typescript": "7.0.2"
   },
   "dependencies": {