opencode-swarm 7.164.6 → 7.164.8

package/dist/cli/{index-j3hsjynw.js → index-s3z936wh.js}

@@ -2,23 +2,27 @@
 import {
   computePlanStructureHash,
   derivePlanId
-} from "./index-j645xpsm.js";
+} from "./index-y6s0gpn3.js";
+import {
+  canonicalExistingFilesystemPath,
+  legacyCanonicalExistingFilesystemPath
+} from "./index-ry16d01s.js";
 import {
   appendCoreEventSync
-} from "./index-pvp5tnn2.js";
+} from "./index-3sv8t7ca.js";
 import {
   unsafePathTextReason
 } from "./index-556ja8an.js";
 import {
   PlanSchema
-} from "./index-ew99d4y6.js";
+} from "./index-apdp9bc1.js";
 import {
   assertProjectRoot
-} from "./index-fxxja498.js";
+} from "./index-2czt53wz.js";
 import {
   atomicWriteSwarmFile,
   atomicWriteSwarmFileSync
-} from "./index-cyhw0der.js";
+} from "./index-t1qzjhnj.js";
 import {
   require_proper_lockfile
 } from "./index-7g4c7s5r.js";
@@ -29,12 +33,11 @@ import {
 // src/scope/scope-persistence.ts
 var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
 import { createHash } from "crypto";
-import * as fs2 from "fs";
+import * as fs from "fs";
 import * as path2 from "path";
 
 // src/scope/scope-binding.ts
 import { randomUUID } from "crypto";
-import * as fs from "fs";
 import * as path from "path";
 var MAX_PENDING_SCOPE_BINDINGS = 256;
 var DEFAULT_SCOPE_BINDING_TTL_MS = 60 * 60 * 1000;
@@ -50,12 +53,7 @@ function isScopeBindingIdentity(value) {
   return typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f-]{27}$/i.test(value);
 }
 function canonicalWorkspaceIdentity(directory) {
-  try {
-    const real = fs.realpathSync(directory).replace(/\\/g, "/");
-    return process.platform === "win32" ? real.toLowerCase() : real;
-  } catch {
-    return null;
-  }
+  return canonicalExistingFilesystemPath(directory);
 }
 function normalizeScopePath(value) {
   if (typeof value !== "string")
@@ -346,14 +344,14 @@ function isSafeTaskId(taskId) {
 }
 function isScopesDirSafe(directory, scopesDir) {
   try {
-    const resolvedWorkspace = fs2.realpathSync(directory);
+    const resolvedWorkspace = fs.realpathSync(directory);
     const expectedSwarmDir = path2.join(resolvedWorkspace, ".swarm");
     const expectedScopesDir = path2.join(expectedSwarmDir, "scopes");
-    const swarmStat = fs2.lstatSync(expectedSwarmDir);
-    const scopesStat = fs2.lstatSync(expectedScopesDir);
+    const swarmStat = fs.lstatSync(expectedSwarmDir);
+    const scopesStat = fs.lstatSync(expectedScopesDir);
     if (!swarmStat.isDirectory() || swarmStat.isSymbolicLink() || !scopesStat.isDirectory() || scopesStat.isSymbolicLink())
       return false;
-    const resolvedScopes = fs2.realpathSync(scopesDir);
+    const resolvedScopes = fs.realpathSync(scopesDir);
     if (normalizePathForComparison(resolvedScopes) !== normalizePathForComparison(expectedScopesDir))
       return false;
     const rel = path2.relative(resolvedWorkspace, resolvedScopes);
@@ -364,24 +362,24 @@ function isScopesDirSafe(directory, scopesDir) {
 }
 function resolveSafeScopeFileForUnlink(directory, targetPath) {
   try {
-    const resolvedWorkspace = fs2.realpathSync(directory);
+    const resolvedWorkspace = fs.realpathSync(directory);
     const scopesDir = path2.join(resolvedWorkspace, SCOPES_DIR);
     if (!isScopesDirSafe(resolvedWorkspace, scopesDir))
       return null;
     const candidate = path2.resolve(targetPath);
-    const resolvedCandidate = fs2.realpathSync(candidate);
+    const resolvedCandidate = fs.realpathSync(candidate);
     if (normalizePathForComparison(path2.dirname(candidate)) !== normalizePathForComparison(scopesDir) || normalizePathForComparison(resolvedCandidate) !== normalizePathForComparison(candidate))
       return null;
     const relative2 = path2.relative(resolvedWorkspace, resolvedCandidate);
     if (relative2.length === 0 || relative2 === ".." || relative2.startsWith(`..${path2.sep}`) || path2.isAbsolute(relative2))
       return null;
-    const leafStat = fs2.lstatSync(candidate);
+    const leafStat = fs.lstatSync(candidate);
     if (!leafStat.isFile() || leafStat.isSymbolicLink())
       return null;
     if (!isScopesDirSafe(resolvedWorkspace, scopesDir))
       return null;
-    const finalResolvedCandidate = fs2.realpathSync(candidate);
-    const finalLeafStat = fs2.lstatSync(candidate);
+    const finalResolvedCandidate = fs.realpathSync(candidate);
+    const finalLeafStat = fs.lstatSync(candidate);
     if (normalizePathForComparison(finalResolvedCandidate) !== normalizePathForComparison(candidate) || !finalLeafStat.isFile() || finalLeafStat.isSymbolicLink() || finalLeafStat.dev !== leafStat.dev || finalLeafStat.ino !== leafStat.ino)
       return null;
     return candidate;
@@ -431,10 +429,10 @@ function ensureLockTargetSync(targetPath) {
     if (path2.basename(scopesDir) !== "scopes" || path2.basename(swarmDir) !== ".swarm")
       return false;
     assertProjectRoot(path2.dirname(swarmDir));
-    fs2.mkdirSync(path2.dirname(targetPath), { recursive: true });
-    const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
-    const fd = fs2.openSync(targetPath, fs2.constants.O_WRONLY | fs2.constants.O_CREAT | nofollow);
-    fs2.closeSync(fd);
+    fs.mkdirSync(path2.dirname(targetPath), { recursive: true });
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    const fd = fs.openSync(targetPath, fs.constants.O_WRONLY | fs.constants.O_CREAT | nofollow);
+    fs.closeSync(fd);
     return true;
   } catch {
     return false;
@@ -444,25 +442,25 @@ function exactBindingPrefix(taskId) {
   return `binding-${taskId}-`;
 }
 function readBoundedFile(filePath) {
-  const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
+  const nofollow = fs.constants.O_NOFOLLOW ?? 0;
   let fd;
   try {
-    fd = fs2.openSync(filePath, fs2.constants.O_RDONLY | nofollow);
+    fd = fs.openSync(filePath, fs.constants.O_RDONLY | nofollow);
   } catch {
     return null;
   }
   try {
-    const stat = fs2.fstatSync(fd);
+    const stat = fs.fstatSync(fd);
     if (!stat.isFile() || stat.size <= 0 || stat.size > MAX_SCOPE_BYTES)
       return null;
     const buffer = Buffer.alloc(stat.size);
-    fs2.readSync(fd, buffer, 0, stat.size, 0);
+    fs.readSync(fd, buffer, 0, stat.size, 0);
     return buffer.toString("utf8");
   } catch {
     return null;
   } finally {
     try {
-      fs2.closeSync(fd);
+      fs.closeSync(fd);
     } catch {}
   }
 }
@@ -472,8 +470,9 @@ function deterministicIdentity(value) {
 }
 function validateScopeBindingPayload(directory, parsed, options = {}) {
   const workspaceIdentity = canonicalWorkspaceIdentity(directory);
+  const legacyWorkspaceIdentity = legacyCanonicalExistingFilesystemPath(directory);
   const files = Array.isArray(parsed.files) ? normalizeScopeFiles(parsed.files.filter((file) => typeof file === "string")) : null;
-  if (parsed.version !== 2 || !workspaceIdentity || parsed.workspaceIdentity !== workspaceIdentity || !isSafeTaskId(parsed.taskId ?? "") || !files || typeof parsed.planId !== "string" || !parsed.planId || typeof parsed.planStructureHash !== "string" || !parsed.planStructureHash || typeof parsed.ownerSessionId !== "string" || !parsed.ownerSessionId.trim() || typeof parsed.ownerMessageId !== "string" || !parsed.ownerMessageId.trim() || !["declaration", "pending_child", "active"].includes(parsed.activation ?? "") || ![
+  if (parsed.version !== 2 || !workspaceIdentity || parsed.workspaceIdentity !== workspaceIdentity && parsed.workspaceIdentity !== legacyWorkspaceIdentity || !isSafeTaskId(parsed.taskId ?? "") || !files || typeof parsed.planId !== "string" || !parsed.planId || typeof parsed.planStructureHash !== "string" || !parsed.planStructureHash || typeof parsed.ownerSessionId !== "string" || !parsed.ownerSessionId.trim() || typeof parsed.ownerMessageId !== "string" || !parsed.ownerMessageId.trim() || !["declaration", "pending_child", "active"].includes(parsed.activation ?? "") || ![
     "declare_scope",
     "plan",
     "file_directive",
@@ -523,8 +522,8 @@ function validateScopeBindingPayload(directory, parsed, options = {}) {
     leaseStartedAt
   };
 }
-function exactFilenameMatches(filePath, binding) {
-  return normalizePathForComparison(filePath) === normalizePathForComparison(getBindingFilePath(binding.workspaceIdentity, binding));
+function exactFilenameMatches(directory, filePath, binding) {
+  return normalizePathForComparison(filePath) === normalizePathForComparison(getBindingFilePath(directory, binding));
 }
 function migrateLegacyBindingsSync(directory, scanCapacity = bindingFileScanCapacity) {
   try {
@@ -537,7 +536,7 @@ function migrateLegacyBindingsSync(directory, scanCapacity = bindingFileScanCapa
     return false;
   let names;
   try {
-    names = fs2.readdirSync(scopesDir).sort();
+    names = fs.readdirSync(scopesDir).sort();
   } catch {
     return true;
   }
@@ -568,14 +567,14 @@ function migrateLegacyBindingsSync(directory, scanCapacity = bindingFileScanCapa
       const ownerHash = binding ? createHash("sha256").update(binding.ownerSessionId).digest("hex").slice(0, 24) : "";
       const valid = binding && binding.taskId === match[1] && ownerHash.toLowerCase() === match[2].toLowerCase() && normalizePathForComparison(getLegacyBindingFilePath(directory, binding.taskId, binding.ownerSessionId)) === normalizePathForComparison(legacyPath);
       const archiveDir = path2.join(scopesDir, "archive");
-      fs2.mkdirSync(archiveDir, { recursive: true });
-      const archiveStat = fs2.lstatSync(archiveDir);
+      fs.mkdirSync(archiveDir, { recursive: true });
+      const archiveStat = fs.lstatSync(archiveDir);
       if (!archiveStat.isDirectory() || archiveStat.isSymbolicLink())
         return false;
       const archiveDigest = createHash("sha256").update(raw ?? name).digest("hex").slice(0, 32);
       if (valid && binding) {
         const exactPath = getBindingFilePath(directory, binding);
-        if (!fs2.existsSync(exactPath)) {
+        if (!fs.existsSync(exactPath)) {
           atomicWriteSwarmFileSync(exactPath, JSON.stringify(binding, null, 2));
         } else {
           const existingRaw = readBoundedFile(exactPath);
@@ -585,24 +584,24 @@ function migrateLegacyBindingsSync(directory, scanCapacity = bindingFileScanCapa
         }
       }
       const archivePath = path2.join(archiveDir, `${valid ? "migrated" : "quarantined"}-${archiveDigest}.json`);
-      if (!fs2.existsSync(archivePath))
-        fs2.renameSync(legacyPath, archivePath);
+      if (!fs.existsSync(archivePath))
+        fs.renameSync(legacyPath, archivePath);
       else
-        fs2.unlinkSync(legacyPath);
-      fs2.writeFileSync(`${archivePath}.receipt.json`, JSON.stringify({
+        fs.unlinkSync(legacyPath);
+      fs.writeFileSync(`${archivePath}.receipt.json`, JSON.stringify({
         version: 1,
         legacyName: name,
         result: valid ? "migrated" : "quarantined",
         bindingId: binding?.bindingId,
         generationId: binding?.generationId
       }, null, 2));
-      const archiveEntries = fs2.readdirSync(archiveDir).sort();
+      const archiveEntries = fs.readdirSync(archiveDir).sort();
       for (const stale of archiveEntries.slice(0, Math.max(0, archiveEntries.length - 2 * MAX_DURABLE_TOMBSTONES))) {
         const stalePath = path2.join(archiveDir, stale);
         try {
-          const stat = fs2.lstatSync(stalePath);
+          const stat = fs.lstatSync(stalePath);
           if (stat.isFile() && !stat.isSymbolicLink())
-            fs2.unlinkSync(stalePath);
+            fs.unlinkSync(stalePath);
         } catch {}
       }
     } catch {
@@ -630,7 +629,7 @@ async function writeScopeToDisk(directory, taskId, files, ttlMs = DEFAULT_TTL_MS
   const scopesDir = getScopesDir(directory);
   const scopePath = getScopeFilePath(directory, taskId);
   try {
-    fs2.mkdirSync(scopesDir, { recursive: true });
+    fs.mkdirSync(scopesDir, { recursive: true });
   } catch {
     return;
   }
@@ -646,10 +645,10 @@ async function writeScopeToDisk(directory, taskId, files, ttlMs = DEFAULT_TTL_MS
   };
   const content = JSON.stringify(payload, null, 2);
   try {
-    const flags = fs2.constants.O_WRONLY | fs2.constants.O_CREAT;
-    const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
-    const fd = fs2.openSync(scopePath, flags | nofollow);
-    fs2.closeSync(fd);
+    const flags = fs.constants.O_WRONLY | fs.constants.O_CREAT;
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    const fd = fs.openSync(scopePath, flags | nofollow);
+    fs.closeSync(fd);
   } catch {
     return;
   }
@@ -687,7 +686,7 @@ async function writeScopeBindingToDisk(directory, binding) {
   const scopesDir = getScopesDir(directory);
   const scopePath = getBindingFilePath(directory, binding);
   try {
-    fs2.mkdirSync(scopesDir, { recursive: true });
+    fs.mkdirSync(scopesDir, { recursive: true });
   } catch {
     return persistenceFailure("Could not create the durable scope store.");
   }
@@ -695,10 +694,10 @@ async function writeScopeBindingToDisk(directory, binding) {
     return persistenceFailure("The durable scope store failed containment checks.");
   const content = JSON.stringify({ ...binding, files }, null, 2);
   try {
-    const flags = fs2.constants.O_WRONLY | fs2.constants.O_CREAT;
-    const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
-    const fd = fs2.openSync(scopePath, flags | nofollow);
-    fs2.closeSync(fd);
+    const flags = fs.constants.O_WRONLY | fs.constants.O_CREAT;
+    const nofollow = fs.constants.O_NOFOLLOW ?? 0;
+    const fd = fs.openSync(scopePath, flags | nofollow);
+    fs.closeSync(fd);
   } catch {
     return persistenceFailure("Could not create the exact generation record.");
   }
@@ -791,7 +790,7 @@ function clearScopeBindingFromDisk(input) {
   }
   let release;
   try {
-    const resolvedWorkspace = fs2.realpathSync(input.directory);
+    const resolvedWorkspace = fs.realpathSync(input.directory);
     const scopePath = getBindingFilePath(resolvedWorkspace, input.binding);
     if (!isScopesDirSafe(resolvedWorkspace, getScopesDir(resolvedWorkspace)))
       return persistenceFailure("The durable scope store failed containment checks.");
@@ -810,7 +809,7 @@ function clearScopeBindingFromDisk(input) {
     const raw = readBoundedFile(scopePath);
     if (!raw) {
       try {
-        fs2.unlinkSync(retirementIntentPath);
+        fs.unlinkSync(retirementIntentPath);
       } catch {}
       return localRetirement ? { ok: true, value: localRetirement } : persistenceFailure("Exact generation disappeared before serialized retirement.");
     }
@@ -820,7 +819,7 @@ function clearScopeBindingFromDisk(input) {
     if (current.lifecycleState !== "live") {
       installScopeBindingTombstone(current);
       try {
-        fs2.unlinkSync(retirementIntentPath);
+        fs.unlinkSync(retirementIntentPath);
       } catch {}
       return { ok: true, value: current };
     }
@@ -839,7 +838,7 @@ function clearScopeBindingFromDisk(input) {
       return persistenceFailure("Serialized retirement verification failed.");
     installScopeBindingTombstone(verified);
     try {
-      fs2.unlinkSync(retirementIntentPath);
+      fs.unlinkSync(retirementIntentPath);
     } catch {}
     scheduleScopeBindingMaintenance(resolvedWorkspace);
     return { ok: true, value: verified };
@@ -924,7 +923,7 @@ async function refreshScopeBindingLease(input) {
     return persistenceFailure("Invalid refresh identity.");
   }
   const generationLockPath = getGenerationLockPath(scopePath);
-  const createdGenerationLockTarget = !fs2.existsSync(generationLockPath);
+  const createdGenerationLockTarget = !fs.existsSync(generationLockPath);
   if (!await ensureLockTarget(generationLockPath))
     return persistenceFailure("Could not prepare refresh lock.");
   let release;
@@ -976,9 +975,9 @@ async function refreshScopeBindingLease(input) {
       try {
         await release();
       } catch {}
-    if (createdGenerationLockTarget && !fs2.existsSync(scopePath)) {
+    if (createdGenerationLockTarget && !fs.existsSync(scopePath)) {
       try {
-        fs2.unlinkSync(generationLockPath);
+        fs.unlinkSync(generationLockPath);
       } catch {}
     }
   }
@@ -990,7 +989,7 @@ function claimBaseName(binding) {
 function readAllExactBindings(directory, options = {}) {
   const scopesDir = getScopesDir(directory);
   try {
-    fs2.lstatSync(scopesDir);
+    fs.lstatSync(scopesDir);
   } catch (error) {
     return error.code === "ENOENT" ? [] : null;
   }
@@ -1001,7 +1000,7 @@ function readAllExactBindings(directory, options = {}) {
     return null;
   let names;
   try {
-    names = fs2.readdirSync(scopesDir).sort();
+    names = fs.readdirSync(scopesDir).sort();
   } catch {
     return [];
   }
@@ -1017,7 +1016,7 @@ function readAllExactBindings(directory, options = {}) {
       continue;
     try {
       const binding = validateScopeBindingPayload(directory, JSON.parse(raw));
-      if (binding && exactFilenameMatches(filePath, binding)) {
+      if (binding && exactFilenameMatches(directory, filePath, binding)) {
         if (hasDurableRetirementIntent(filePath, binding)) {
           let createdAt = Date.now();
           try {
@@ -1134,7 +1133,7 @@ async function claimScopeBindingForChildDurably(input) {
       if (!receiptWinner)
         return persistenceFailure("Claim receipt has no verified successor; pending remains fail-closed for restart reconciliation.");
       if (receiptWinner.lifecycleState !== "live" || receiptWinner.expiresAt <= Date.now()) {
-        fs2.writeFileSync(claimPath, "");
+        fs.writeFileSync(claimPath, "");
         receipt = null;
       }
     }
@@ -1287,7 +1286,9 @@ async function replaceExistingScopeDeclaration(input) {
   }
 }
 function scheduleScopeBindingMaintenance(directory) {
-  const key = normalizePathForComparison(directory);
+  const key = canonicalExistingFilesystemPath(directory);
+  if (key === null)
+    return;
   if (maintenanceJobs.has(key))
     return;
   while (maintenanceJobs.size >= MAX_MAINTENANCE_JOBS) {
@@ -1304,7 +1305,9 @@ function scheduleScopeBindingMaintenance(directory) {
   maintenanceJobs.set(key, job);
 }
 async function flushScopeBindingMaintenance(directory) {
-  const key = directory ? normalizePathForComparison(directory) : undefined;
+  const key = directory ? canonicalExistingFilesystemPath(directory) : undefined;
+  if (directory && key === null)
+    return;
   const job = key ? maintenanceJobs.get(key) : undefined;
   await Promise.all(job ? [job] : [...maintenanceJobs.values()]);
 }
@@ -1336,7 +1339,7 @@ async function pruneScopeBindingTombstones(directory) {
       const finalized = await tombstoneScopeBinding(directory, binding, "revoked");
       if (finalized.ok)
         try {
-          fs2.unlinkSync(getRetirementIntentPath(filePath));
+          fs.unlinkSync(getRetirementIntentPath(filePath));
         } catch {}
     }
     all = readAllExactBindings(directory, {
@@ -1368,7 +1371,7 @@ async function pruneScopeBindingTombstones(directory) {
         const latest = latestRaw ? validateScopeBindingPayload(directory, JSON.parse(latestRaw)) : null;
         if (!latest || latest.generationId !== binding.generationId || latest.revision !== binding.revision || latest.lifecycleState === "live" && !hasDurableRetirementIntent(filePath, latest))
           continue;
-        fs2.unlinkSync(filePath);
+        fs.unlinkSync(filePath);
         removedExact = true;
         removed++;
       } catch {} finally {
@@ -1377,18 +1380,18 @@ async function pruneScopeBindingTombstones(directory) {
             await releaseExact();
           } catch {}
       }
-      if (removedExact && !fs2.existsSync(filePath)) {
+      if (removedExact && !fs.existsSync(filePath)) {
         try {
-          fs2.unlinkSync(exactLockPath);
+          fs.unlinkSync(exactLockPath);
         } catch {}
         try {
-          fs2.unlinkSync(getRetirementIntentPath(filePath));
+          fs.unlinkSync(getRetirementIntentPath(filePath));
         } catch {}
       }
     }
     let receiptNames = [];
     try {
-      receiptNames = fs2.readdirSync(getScopesDir(directory)).filter((name) => /^claim-[a-f0-9]{40}\.json$/i.test(name)).slice(0, MAX_BINDING_FILES_TO_SCAN);
+      receiptNames = fs.readdirSync(getScopesDir(directory)).filter((name) => /^claim-[a-f0-9]{40}\.json$/i.test(name)).slice(0, MAX_BINDING_FILES_TO_SCAN);
     } catch {}
     for (const name of receiptNames) {
       const receiptPath = path2.join(getScopesDir(directory), name);
@@ -1407,9 +1410,9 @@ async function pruneScopeBindingTombstones(directory) {
           receipt = JSON.parse(raw);
         } catch {}
         const winner = receipt ? all.find((binding) => binding.generationId === receipt?.winnerGenerationId) : undefined;
-        const old = Date.now() - fs2.statSync(receiptPath).mtimeMs > MAX_TOMBSTONE_AGE_MS;
+        const old = Date.now() - fs.statSync(receiptPath).mtimeMs > MAX_TOMBSTONE_AGE_MS;
         if (old || Boolean(winner && (winner.lifecycleState !== "live" || winner.expiresAt <= Date.now()))) {
-          fs2.unlinkSync(receiptPath);
+          fs.unlinkSync(receiptPath);
           removed++;
         }
       } catch {} finally {
@@ -1432,10 +1435,10 @@ async function pruneScopeBindingTombstones(directory) {
 function readCurrentPlan(directory) {
   try {
     const planPath = path2.join(directory, ".swarm", "plan.json");
-    const stat = fs2.statSync(planPath);
+    const stat = fs.statSync(planPath);
     if (!stat.isFile() || stat.size > MAX_PLAN_BYTES)
       return null;
-    const parsed = PlanSchema.safeParse(JSON.parse(fs2.readFileSync(planPath, "utf8")));
+    const parsed = PlanSchema.safeParse(JSON.parse(fs.readFileSync(planPath, "utf8")));
     return parsed.success ? parsed.data : null;
   } catch {
     return null;
@@ -1474,7 +1477,7 @@ function attemptIdleScopeBindingRevival(directory, resolution) {
     return null;
   let release;
   try {
-    const resolvedWorkspace = fs2.realpathSync(directory);
+    const resolvedWorkspace = fs.realpathSync(directory);
     assertProjectRoot(resolvedWorkspace);
     const scopePath = getBindingFilePath(resolvedWorkspace, candidate);
     if (!isScopesDirSafe(resolvedWorkspace, getScopesDir(resolvedWorkspace)))
@@ -1602,34 +1605,34 @@ function resolveAuthorizedScopeBindingForSessionDetailed(input) {
 }
 function readPrFeedbackBindingFile(directory, filePath, activeSessionId, taskId) {
   try {
-    const leaf = fs2.lstatSync(filePath);
+    const leaf = fs.lstatSync(filePath);
     if (!leaf.isFile() || leaf.isSymbolicLink())
       return null;
-    if (normalizePathForComparison(fs2.realpathSync(filePath)) !== normalizePathForComparison(filePath))
+    if (normalizePathForComparison(fs.realpathSync(filePath)) !== normalizePathForComparison(filePath))
       return null;
   } catch {
     return null;
   }
-  const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
+  const nofollow = fs.constants.O_NOFOLLOW ?? 0;
   let fd;
   try {
-    fd = fs2.openSync(filePath, fs2.constants.O_RDONLY | nofollow);
+    fd = fs.openSync(filePath, fs.constants.O_RDONLY | nofollow);
   } catch {
     return null;
   }
   let raw = "";
   try {
-    const stat = fs2.fstatSync(fd);
+    const stat = fs.fstatSync(fd);
     if (!stat.isFile() || stat.size > MAX_SCOPE_BYTES)
       return null;
     const buffer = Buffer.alloc(stat.size);
-    fs2.readSync(fd, buffer, 0, stat.size, 0);
+    fs.readSync(fd, buffer, 0, stat.size, 0);
     raw = buffer.toString("utf8");
   } catch {
     return null;
   } finally {
     try {
-      fs2.closeSync(fd);
+      fs.closeSync(fd);
     } catch {}
   }
   let parsed;
@@ -1663,7 +1666,7 @@ function resolveAuthorizedPrFeedbackScopeBindingFromDisk(input) {
     if (!isSafeTaskId(input.taskId))
       return null;
     try {
-      const names = fs2.readdirSync(scopesDir);
+      const names = fs.readdirSync(scopesDir);
       if (names.length > MAX_BINDING_FILES_TO_SCAN)
         return null;
       candidates = names.filter((name) => name.startsWith(exactBindingPrefix(input.taskId)) && name.endsWith(".json")).map((name) => path2.join(scopesDir, name));
@@ -1672,7 +1675,7 @@ function resolveAuthorizedPrFeedbackScopeBindingFromDisk(input) {
     }
   } else {
     try {
-      const names = fs2.readdirSync(scopesDir);
+      const names = fs.readdirSync(scopesDir);
       if (names.length > MAX_BINDING_FILES_TO_SCAN)
         return null;
       candidates = names.filter((name) => name.startsWith("binding-") && name.endsWith(".json")).map((name) => path2.join(scopesDir, name));
@@ -1719,28 +1722,28 @@ function readScopeFromDisk(directory, taskId) {
   if (!isScopesDirSafe(directory, scopesDir))
     return null;
   const scopePath = getScopeFilePath(directory, taskId);
-  const nofollow = fs2.constants.O_NOFOLLOW ?? 0;
+  const nofollow = fs.constants.O_NOFOLLOW ?? 0;
   let fd;
   try {
-    fd = fs2.openSync(scopePath, fs2.constants.O_RDONLY | nofollow);
+    fd = fs.openSync(scopePath, fs.constants.O_RDONLY | nofollow);
   } catch {
     return null;
   }
   let raw;
   try {
-    const stat = fs2.fstatSync(fd);
+    const stat = fs.fstatSync(fd);
     if (!stat.isFile())
       return null;
     if (stat.size > MAX_SCOPE_BYTES)
       return null;
     const buf = Buffer.alloc(stat.size);
-    fs2.readSync(fd, buf, 0, stat.size, 0);
+    fs.readSync(fd, buf, 0, stat.size, 0);
     raw = buf.toString("utf-8");
   } catch {
     return null;
   } finally {
     try {
-      fs2.closeSync(fd);
+      fs.closeSync(fd);
     } catch {}
   }
   if (!raw.trim())
@@ -1774,12 +1777,12 @@ function readPlanScope(directory, taskId) {
     return null;
   try {
     const planPath = path2.join(directory, ".swarm", "plan.json");
-    const stat = fs2.statSync(planPath);
+    const stat = fs.statSync(planPath);
     if (!stat.isFile())
       return null;
     if (stat.size > MAX_PLAN_BYTES)
       return null;
-    const raw = fs2.readFileSync(planPath, "utf-8");
+    const raw = fs.readFileSync(planPath, "utf-8");
     const plan = JSON.parse(raw);
     for (const phase of plan.phases ?? []) {
       for (const task of phase.tasks ?? []) {
@@ -1806,13 +1809,13 @@ function clearScopeForTask(directory, taskId) {
     return;
   try {
     assertProjectRoot(directory);
-    fs2.unlinkSync(getScopeFilePath(directory, taskId));
+    fs.unlinkSync(getScopeFilePath(directory, taskId));
   } catch {}
 }
 function clearAllScopes(directory) {
   try {
     assertProjectRoot(directory);
-    fs2.rmSync(getScopesDir(directory), { recursive: true, force: true });
+    fs.rmSync(getScopesDir(directory), { recursive: true, force: true });
   } catch {}
 }
 function resolveScopeWithFallbacks(input) {