@primeinc/swarm 0.57.8-beta.0 → 0.57.10-beta.0

package/dist/plugin.js

@@ -12774,7 +12774,7 @@ __export(exports_util2, {
   promiseAllObject: () => promiseAllObject2,
   primitiveTypes: () => primitiveTypes2,
   prefixIssues: () => prefixIssues2,
-  pick: () => pick2,
+  pick: () => pick3,
   partial: () => partial2,
   optionalKeys: () => optionalKeys2,
   omit: () => omit2,
@@ -12925,10 +12925,10 @@ function mergeDefs2(...defs) {
 function cloneDef2(schema) {
   return mergeDefs2(schema._zod.def);
 }
-function getElementAtPath2(obj, path) {
-  if (!path)
+function getElementAtPath2(obj, path3) {
+  if (!path3)
     return obj;
-  return path.reduce((acc, key) => acc?.[key], obj);
+  return path3.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject2(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -13055,7 +13055,7 @@ function optionalKeys2(shape) {
     return shape[k]._zod.optin === "optional" && shape[k]._zod.optout === "optional";
   });
 }
-function pick2(schema, mask) {
+function pick3(schema, mask) {
   const currDef = schema._zod.def;
   const def = mergeDefs2(schema._zod.def, {
     get shape() {
@@ -13217,11 +13217,11 @@ function aborted2(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues2(path, issues) {
+function prefixIssues2(path3, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path);
+    iss.path.unshift(path3);
     return iss;
   });
 }
@@ -13444,7 +13444,7 @@ function treeifyError2(error45, _mapper) {
     return issue3.message;
   };
   const result = { errors: [] };
-  const processError = (error46, path = []) => {
+  const processError = (error46, path3 = []) => {
     var _a, _b;
     for (const issue3 of error46.issues) {
       if (issue3.code === "invalid_union" && issue3.errors.length) {
@@ -13454,7 +13454,7 @@ function treeifyError2(error45, _mapper) {
       } else if (issue3.code === "invalid_element") {
         processError({ issues: issue3.issues }, issue3.path);
       } else {
-        const fullpath = [...path, ...issue3.path];
+        const fullpath = [...path3, ...issue3.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue3));
           continue;
@@ -13486,8 +13486,8 @@ function treeifyError2(error45, _mapper) {
 }
 function toDotPath2(_path) {
   const segs = [];
-  const path = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path) {
+  const path3 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path3) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -25372,14 +25372,14 @@ __export(exports_eval_capture, {
 });
 import * as fs from "node:fs";
 import * as os from "node:os";
-import * as path from "node:path";
+import * as path3 from "node:path";
 import { getSwarmMailLibSQL } from "swarm-mail";
 function getEvalDataPath(projectPath) {
-  return path.join(projectPath, DEFAULT_EVAL_DATA_PATH);
+  return path3.join(projectPath, DEFAULT_EVAL_DATA_PATH);
 }
 function ensureEvalDataDir(projectPath) {
   const evalPath = getEvalDataPath(projectPath);
-  const dir = path.dirname(evalPath);
+  const dir = path3.dirname(evalPath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -25553,10 +25553,10 @@ function getEvalDataStats(projectPath) {
   };
 }
 function getSessionDir() {
-  return process.env.SWARM_SESSIONS_DIR || path.join(os.homedir(), ".config", "swarm-tools", "sessions");
+  return process.env.SWARM_SESSIONS_DIR || path3.join(os.homedir(), ".config", "swarm-tools", "sessions");
 }
 function getSessionPath(sessionId) {
-  return path.join(getSessionDir(), `${sessionId}.jsonl`);
+  return path3.join(getSessionDir(), `${sessionId}.jsonl`);
 }
 function ensureSessionDir() {
   const sessionDir = getSessionDir();
@@ -30318,7 +30318,7 @@ WD9f
 
 // ../../node_modules/ioredis/built/utils/index.js
 var require_utils2 = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/swarm-tools/swarm-tools/node_modules/ioredis/built/utils";
+  var __dirname = "/home/runner/work/swarm/swarm/node_modules/ioredis/built/utils";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.noop = exports.defaults = exports.Debug = exports.getPackageMeta = exports.zipMap = exports.CONNECTION_CLOSED_ERROR_MSG = exports.shuffle = exports.sample = exports.resolveTLSProfile = exports.parseURL = exports.optimizeErrorStack = exports.toArg = exports.convertMapToArray = exports.convertObjectToArray = exports.timeout = exports.packObject = exports.isInt = exports.wrapMultiResult = exports.convertBufferToString = undefined;
   var fs_1 = __require("fs");
@@ -30548,7 +30548,7 @@ var require_utils2 = __commonJS((exports) => {
 
 // ../../node_modules/ioredis/built/Command.js
 var require_Command = __commonJS((exports) => {
-  var __dirname = "/home/runner/work/swarm-tools/swarm-tools/node_modules/ioredis/built";
+  var __dirname = "/home/runner/work/swarm/swarm/node_modules/ioredis/built";
   Object.defineProperty(exports, "__esModule", { value: true });
   var commands_1 = require_built();
   var calculateSlot = require_lib();
@@ -39592,7 +39592,7 @@ import {
   dirname as dirname3,
   resolve,
   relative,
-  isAbsolute,
+  isAbsolute as isAbsolute2,
   sep
 } from "path";
 import { fileURLToPath } from "url";
@@ -40240,7 +40240,7 @@ Use this to access supplementary skill resources.`,
       if (!skill) {
         return `Skill '${args.skill}' not found.`;
       }
-      if (isAbsolute(args.file)) {
+      if (isAbsolute2(args.file)) {
         return "Invalid file path. Use a relative path.";
       }
       if (args.file.includes("..")) {
@@ -40454,7 +40454,7 @@ executed with skills_execute. Use for:
       if (!skill) {
         return `Skill '${args.skill}' not found.`;
       }
-      if (isAbsolute(args.script_name) || args.script_name.includes("..") || args.script_name.includes("/") || args.script_name.includes("\\") || basename(args.script_name) !== args.script_name) {
+      if (isAbsolute2(args.script_name) || args.script_name.includes("..") || args.script_name.includes("/") || args.script_name.includes("\\") || basename(args.script_name) !== args.script_name) {
         return "Invalid script name. Use simple filenames without paths.";
       }
       const scriptsDir = join6(skill.directory, "scripts");
@@ -42705,17 +42705,17 @@ var getKeysForIndexSignature = (input, parameter) => {
     done = true;
     return a;
   };
-}, isNonEmpty = (x) => Array.isArray(x), isSingle = (x) => !Array.isArray(x), formatPathKey = (key) => `[${formatPropertyKey(key)}]`, formatPath = (path3) => isNonEmpty(path3) ? path3.map(formatPathKey).join("") : formatPathKey(path3);
+}, isNonEmpty = (x) => Array.isArray(x), isSingle = (x) => !Array.isArray(x), formatPathKey = (key) => `[${formatPropertyKey(key)}]`, formatPath = (path5) => isNonEmpty(path5) ? path5.map(formatPathKey).join("") : formatPathKey(path5);
 var init_util3 = __esm(() => {
   init_Inspectable();
 });
 
 // ../../node_modules/effect/dist/esm/internal/schema/errors.js
-var getErrorMessage = (reason, details, path3, ast) => {
+var getErrorMessage = (reason, details, path5, ast) => {
   let out = reason;
-  if (path3 && isNonEmptyReadonlyArray(path3)) {
+  if (path5 && isNonEmptyReadonlyArray(path5)) {
     out += `
-at path: ${formatPath(path3)}`;
+at path: ${formatPath(path5)}`;
   }
   if (details !== undefined) {
     out += `
@@ -43728,7 +43728,7 @@ var TypeId3, BigDecimalProto, isBigDecimal = (u) => hasProperty(u, TypeId3), mak
   const o = make4(value, scale);
   o.normalized = o;
   return o;
-}, bigint0, bigint10, zero, normalize = (self) => {
+}, bigint0, bigint10, zero, normalize2 = (self) => {
   if (self.normalized === undefined) {
     if (self.value === bigint0) {
       self.normalized = zero;
@@ -43752,7 +43752,7 @@ var TypeId3, BigDecimalProto, isBigDecimal = (u) => hasProperty(u, TypeId3), mak
   }
   return self.normalized;
 }, scale, abs = (n) => n.value < bigint0 ? make4(-n.value, n.scale) : n, Equivalence, equals2, format2 = (n) => {
-  const normalized = normalize(n);
+  const normalized = normalize2(n);
   if (Math.abs(normalized.scale) >= 16) {
     return toExponential(normalized);
   }
@@ -43780,7 +43780,7 @@ var TypeId3, BigDecimalProto, isBigDecimal = (u) => hasProperty(u, TypeId3), mak
   if (isZero(n)) {
     return "0e+0";
   }
-  const normalized = normalize(n);
+  const normalized = normalize2(n);
   const digits = `${abs(normalized).value}`;
   const head2 = digits.slice(0, 1);
   const tail = digits.slice(1);
@@ -43803,7 +43803,7 @@ var init_BigDecimal = __esm(() => {
   BigDecimalProto = {
     [TypeId3]: TypeId3,
     [symbol3]() {
-      const normalized = normalize(this);
+      const normalized = normalize2(this);
       return pipe3(hash3(normalized.value), combine(number8(normalized.scale)), cached3(this));
     },
     [symbol4](that) {
@@ -48339,64 +48339,64 @@ var ConfigErrorSymbolKey = "effect/ConfigError", ConfigErrorTypeId, proto2, And
     }
   });
   return error89;
-}, InvalidData = (path3, message, options2 = {
+}, InvalidData = (path5, message, options2 = {
   pathDelim: "."
 }) => {
   const error89 = Object.create(proto2);
   error89._op = OP_INVALID_DATA;
-  error89.path = path3;
+  error89.path = path5;
   error89.message = message;
   Object.defineProperty(error89, "toString", {
     enumerable: false,
     value() {
-      const path4 = pipe3(this.path, join8(options2.pathDelim));
-      return `(Invalid data at ${path4}: "${this.message}")`;
+      const path6 = pipe3(this.path, join8(options2.pathDelim));
+      return `(Invalid data at ${path6}: "${this.message}")`;
     }
   });
   return error89;
-}, MissingData = (path3, message, options2 = {
+}, MissingData = (path5, message, options2 = {
   pathDelim: "."
 }) => {
   const error89 = Object.create(proto2);
   error89._op = OP_MISSING_DATA;
-  error89.path = path3;
+  error89.path = path5;
   error89.message = message;
   Object.defineProperty(error89, "toString", {
     enumerable: false,
     value() {
-      const path4 = pipe3(this.path, join8(options2.pathDelim));
-      return `(Missing data at ${path4}: "${this.message}")`;
+      const path6 = pipe3(this.path, join8(options2.pathDelim));
+      return `(Missing data at ${path6}: "${this.message}")`;
     }
   });
   return error89;
-}, SourceUnavailable = (path3, message, cause, options2 = {
+}, SourceUnavailable = (path5, message, cause, options2 = {
   pathDelim: "."
 }) => {
   const error89 = Object.create(proto2);
   error89._op = OP_SOURCE_UNAVAILABLE;
-  error89.path = path3;
+  error89.path = path5;
   error89.message = message;
   error89.cause = cause;
   Object.defineProperty(error89, "toString", {
     enumerable: false,
     value() {
-      const path4 = pipe3(this.path, join8(options2.pathDelim));
-      return `(Source unavailable at ${path4}: "${this.message}")`;
+      const path6 = pipe3(this.path, join8(options2.pathDelim));
+      return `(Source unavailable at ${path6}: "${this.message}")`;
     }
   });
   return error89;
-}, Unsupported = (path3, message, options2 = {
+}, Unsupported = (path5, message, options2 = {
   pathDelim: "."
 }) => {
   const error89 = Object.create(proto2);
   error89._op = OP_UNSUPPORTED;
-  error89.path = path3;
+  error89.path = path5;
   error89.message = message;
   Object.defineProperty(error89, "toString", {
     enumerable: false,
     value() {
-      const path4 = pipe3(this.path, join8(options2.pathDelim));
-      return `(Unsupported operation at ${path4}: "${this.message}")`;
+      const path6 = pipe3(this.path, join8(options2.pathDelim));
+      return `(Unsupported operation at ${path6}: "${this.message}")`;
     }
   });
   return error89;
@@ -48445,9 +48445,9 @@ var init_pathPatch = __esm(() => {
   empty20 = {
     _tag: "Empty"
   };
-  patch5 = /* @__PURE__ */ dual(2, (path3, patch6) => {
+  patch5 = /* @__PURE__ */ dual(2, (path5, patch6) => {
     let input = of3(patch6);
-    let output = path3;
+    let output = path5;
     while (isCons(input)) {
       const patch7 = input.head;
       switch (patch7._tag) {
@@ -48498,7 +48498,7 @@ var concat = (l, r) => [...l, ...r], ConfigProviderSymbolKey = "effect/ConfigPro
 }), makeFlat = (options2) => ({
   [FlatConfigProviderTypeId]: FlatConfigProviderTypeId,
   patch: options2.patch,
-  load: (path3, config3, split = true) => options2.load(path3, config3, split),
+  load: (path5, config3, split = true) => options2.load(path5, config3, split),
   enumerateChildren: options2.enumerateChildren
 }), fromFlat = (flat) => make22({
   load: (config3) => flatMap7(fromFlatLoop(flat, empty2(), config3, false), (chunk) => match3(head(chunk), {
@@ -48514,29 +48514,29 @@ var concat = (l, r) => [...l, ...r], ConfigProviderSymbolKey = "effect/ConfigPro
     pathDelim: "_",
     seqDelim: ","
   }, options2);
-  const makePathString = (path3) => pipe3(path3, join8(pathDelim));
+  const makePathString = (path5) => pipe3(path5, join8(pathDelim));
   const unmakePathString = (pathString) => pathString.split(pathDelim);
   const getEnv = () => typeof process !== "undefined" && ("env" in process) && typeof process.env === "object" ? process.env : {};
-  const load = (path3, primitive, split = true) => {
-    const pathString = makePathString(path3);
+  const load = (path5, primitive, split = true) => {
+    const pathString = makePathString(path5);
     const current = getEnv();
     const valueOpt = pathString in current ? some2(current[pathString]) : none2();
-    return pipe3(valueOpt, mapError(() => MissingData(path3, `Expected ${pathString} to exist in the process context`)), flatMap7((value) => parsePrimitive(value, path3, primitive, seqDelim, split)));
+    return pipe3(valueOpt, mapError(() => MissingData(path5, `Expected ${pathString} to exist in the process context`)), flatMap7((value) => parsePrimitive(value, path5, primitive, seqDelim, split)));
   };
-  const enumerateChildren = (path3) => sync(() => {
+  const enumerateChildren = (path5) => sync(() => {
     const current = getEnv();
     const keys3 = Object.keys(current);
     const keyPaths = keys3.map((value) => unmakePathString(value.toUpperCase()));
     const filteredKeyPaths = keyPaths.filter((keyPath) => {
-      for (let i = 0;i < path3.length; i++) {
-        const pathComponent = pipe3(path3, unsafeGet(i));
+      for (let i = 0;i < path5.length; i++) {
+        const pathComponent = pipe3(path5, unsafeGet(i));
         const currentElement = keyPath[i];
         if (currentElement === undefined || pathComponent !== currentElement) {
           return false;
         }
       }
       return true;
-    }).flatMap((keyPath) => keyPath.slice(path3.length, path3.length + 1));
+    }).flatMap((keyPath) => keyPath.slice(path5.length, path5.length + 1));
     return fromIterable5(filteredKeyPaths);
   });
   return fromFlat(makeFlat({
@@ -48550,17 +48550,17 @@ var concat = (l, r) => [...l, ...r], ConfigProviderSymbolKey = "effect/ConfigPro
   const leftExtension = concat(left3, leftPad);
   const rightExtension = concat(right3, rightPad);
   return [leftExtension, rightExtension];
-}, appendConfigPath = (path3, config3) => {
+}, appendConfigPath = (path5, config3) => {
   let op = config3;
   if (op._tag === "Nested") {
-    const out = path3.slice();
+    const out = path5.slice();
     while (op._tag === "Nested") {
       out.push(op.name);
       op = op.config;
     }
     return out;
   }
-  return path3;
+  return path5;
 }, fromFlatLoop = (flat, prefix, config3, split) => {
   const op = config3;
   switch (op._tag) {
@@ -48635,8 +48635,8 @@ var concat = (l, r) => [...l, ...r], ConfigProviderSymbolKey = "effect/ConfigPro
           return fail2(right3.left);
         }
         if (isRight2(left3) && isRight2(right3)) {
-          const path3 = pipe3(prefix, join8("."));
-          const fail3 = fromFlatLoopFail(prefix, path3);
+          const path5 = pipe3(prefix, join8("."));
+          const fail3 = fromFlatLoopFail(prefix, path5);
           const [lefts, rights] = extend3(fail3, fail3, pipe3(left3.right, map6(right2)), pipe3(right3.right, map6(right2)));
           return pipe3(lefts, zip(rights), forEachSequential(([left4, right4]) => pipe3(zip2(left4, right4), map12(([left5, right5]) => op.zip(left5, right5)))));
         }
@@ -48644,17 +48644,17 @@ var concat = (l, r) => [...l, ...r], ConfigProviderSymbolKey = "effect/ConfigPro
       })))));
     }
   }
-}, fromFlatLoopFail = (prefix, path3) => (index) => left2(MissingData(prefix, `The element at index ${index} in a sequence at path "${path3}" was missing`)), splitPathString = (text, delim) => {
+}, fromFlatLoopFail = (prefix, path5) => (index) => left2(MissingData(prefix, `The element at index ${index} in a sequence at path "${path5}" was missing`)), splitPathString = (text, delim) => {
   const split = text.split(new RegExp(`\\s*${escape2(delim)}\\s*`));
   return split;
-}, parsePrimitive = (text, path3, primitive, delimiter, split) => {
+}, parsePrimitive = (text, path5, primitive, delimiter, split) => {
   if (!split) {
     return pipe3(primitive.parse(text), mapBoth({
-      onFailure: prefixed(path3),
+      onFailure: prefixed(path5),
       onSuccess: of
     }));
   }
-  return pipe3(splitPathString(text, delimiter), forEachSequential((char) => primitive.parse(char.trim())), mapError(prefixed(path3)));
+  return pipe3(splitPathString(text, delimiter), forEachSequential((char) => primitive.parse(char.trim())), mapError(prefixed(path5)));
 }, transpose = (array5) => {
   return Object.keys(array5[0]).map((column) => array5.map((row) => row[column]));
 }, indicesFrom = (quotedIndices) => pipe3(forEachSequential(quotedIndices, parseQuotedIndex), mapBoth({
@@ -57031,8 +57031,8 @@ class Pointer {
   actual;
   issue;
   _tag = "Pointer";
-  constructor(path3, actual, issue3) {
-    this.path = path3;
+  constructor(path5, actual, issue3) {
+    this.path = path5;
     this.actual = actual;
     this.issue = issue3;
   }
@@ -58937,14 +58937,14 @@ var init_memory = __esm(() => {
 // src/memory-tools.ts
 import { getSwarmMailLibSQL as getSwarmMailLibSQL5, createEvent as createEvent4, appendEvent as appendEvent3 } from "swarm-mail";
 async function getMemoryAdapter(projectPath) {
-  const path3 = projectPath || process.cwd();
-  if (cachedAdapter && cachedProjectPath === path3) {
+  const path5 = projectPath || process.cwd();
+  if (cachedAdapter && cachedProjectPath === path5) {
     return cachedAdapter;
   }
-  const swarmMail = await getSwarmMailLibSQL5(path3);
+  const swarmMail = await getSwarmMailLibSQL5(path5);
   const dbAdapter = await swarmMail.getDatabase();
   cachedAdapter = await createMemoryAdapter(dbAdapter);
-  cachedProjectPath = path3;
+  cachedProjectPath = path5;
   return cachedAdapter;
 }
 var cachedAdapter = null, cachedProjectPath = null, semantic_memory_store, semantic_memory_find, semantic_memory_get, semantic_memory_remove, semantic_memory_validate, semantic_memory_list, semantic_memory_stats, semantic_memory_check, semantic_memory_upsert;
@@ -59748,17 +59748,17 @@ var require_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  function visit_(key, node, visitor, path3) {
-    const ctrl = callVisitor(key, node, visitor, path3);
+  function visit_(key, node, visitor, path5) {
+    const ctrl = callVisitor(key, node, visitor, path5);
     if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
-      replaceNode(key, path3, ctrl);
-      return visit_(key, ctrl, visitor, path3);
+      replaceNode(key, path5, ctrl);
+      return visit_(key, ctrl, visitor, path5);
     }
     if (typeof ctrl !== "symbol") {
       if (identity2.isCollection(node)) {
-        path3 = Object.freeze(path3.concat(node));
+        path5 = Object.freeze(path5.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = visit_(i, node.items[i], visitor, path3);
+          const ci = visit_(i, node.items[i], visitor, path5);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -59769,13 +59769,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity2.isPair(node)) {
-        path3 = Object.freeze(path3.concat(node));
-        const ck = visit_("key", node.key, visitor, path3);
+        path5 = Object.freeze(path5.concat(node));
+        const ck = visit_("key", node.key, visitor, path5);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = visit_("value", node.value, visitor, path3);
+        const cv = visit_("value", node.value, visitor, path5);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -59796,17 +59796,17 @@ var require_visit = __commonJS((exports) => {
   visitAsync.BREAK = BREAK;
   visitAsync.SKIP = SKIP;
   visitAsync.REMOVE = REMOVE;
-  async function visitAsync_(key, node, visitor, path3) {
-    const ctrl = await callVisitor(key, node, visitor, path3);
+  async function visitAsync_(key, node, visitor, path5) {
+    const ctrl = await callVisitor(key, node, visitor, path5);
     if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
-      replaceNode(key, path3, ctrl);
-      return visitAsync_(key, ctrl, visitor, path3);
+      replaceNode(key, path5, ctrl);
+      return visitAsync_(key, ctrl, visitor, path5);
     }
     if (typeof ctrl !== "symbol") {
       if (identity2.isCollection(node)) {
-        path3 = Object.freeze(path3.concat(node));
+        path5 = Object.freeze(path5.concat(node));
         for (let i = 0;i < node.items.length; ++i) {
-          const ci = await visitAsync_(i, node.items[i], visitor, path3);
+          const ci = await visitAsync_(i, node.items[i], visitor, path5);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -59817,13 +59817,13 @@ var require_visit = __commonJS((exports) => {
           }
         }
       } else if (identity2.isPair(node)) {
-        path3 = Object.freeze(path3.concat(node));
-        const ck = await visitAsync_("key", node.key, visitor, path3);
+        path5 = Object.freeze(path5.concat(node));
+        const ck = await visitAsync_("key", node.key, visitor, path5);
         if (ck === BREAK)
           return BREAK;
         else if (ck === REMOVE)
           node.key = null;
-        const cv = await visitAsync_("value", node.value, visitor, path3);
+        const cv = await visitAsync_("value", node.value, visitor, path5);
         if (cv === BREAK)
           return BREAK;
         else if (cv === REMOVE)
@@ -59850,23 +59850,23 @@ var require_visit = __commonJS((exports) => {
     }
     return visitor;
   }
-  function callVisitor(key, node, visitor, path3) {
+  function callVisitor(key, node, visitor, path5) {
     if (typeof visitor === "function")
-      return visitor(key, node, path3);
+      return visitor(key, node, path5);
     if (identity2.isMap(node))
-      return visitor.Map?.(key, node, path3);
+      return visitor.Map?.(key, node, path5);
     if (identity2.isSeq(node))
-      return visitor.Seq?.(key, node, path3);
+      return visitor.Seq?.(key, node, path5);
     if (identity2.isPair(node))
-      return visitor.Pair?.(key, node, path3);
+      return visitor.Pair?.(key, node, path5);
     if (identity2.isScalar(node))
-      return visitor.Scalar?.(key, node, path3);
+      return visitor.Scalar?.(key, node, path5);
     if (identity2.isAlias(node))
-      return visitor.Alias?.(key, node, path3);
+      return visitor.Alias?.(key, node, path5);
     return;
   }
-  function replaceNode(key, path3, node) {
-    const parent = path3[path3.length - 1];
+  function replaceNode(key, path5, node) {
+    const parent = path5[path5.length - 1];
     if (identity2.isCollection(parent)) {
       parent.items[key] = node;
     } else if (identity2.isPair(parent)) {
@@ -60423,10 +60423,10 @@ var require_Collection = __commonJS((exports) => {
   var createNode = require_createNode();
   var identity2 = require_identity();
   var Node = require_Node();
-  function collectionFromPath(schema, path3, value) {
+  function collectionFromPath(schema, path5, value) {
     let v = value;
-    for (let i = path3.length - 1;i >= 0; --i) {
-      const k = path3[i];
+    for (let i = path5.length - 1;i >= 0; --i) {
+      const k = path5[i];
       if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
         const a = [];
         a[k] = v;
@@ -60445,7 +60445,7 @@ var require_Collection = __commonJS((exports) => {
       sourceObjects: new Map
     });
   }
-  var isEmptyPath = (path3) => path3 == null || typeof path3 === "object" && !!path3[Symbol.iterator]().next().done;
+  var isEmptyPath = (path5) => path5 == null || typeof path5 === "object" && !!path5[Symbol.iterator]().next().done;
 
   class Collection extends Node.NodeBase {
     constructor(type, schema) {
@@ -60466,11 +60466,11 @@ var require_Collection = __commonJS((exports) => {
         copy3.range = this.range.slice();
       return copy3;
     }
-    addIn(path3, value) {
-      if (isEmptyPath(path3))
+    addIn(path5, value) {
+      if (isEmptyPath(path5))
         this.add(value);
       else {
-        const [key, ...rest] = path3;
+        const [key, ...rest] = path5;
         const node = this.get(key, true);
         if (identity2.isCollection(node))
           node.addIn(rest, value);
@@ -60480,8 +60480,8 @@ var require_Collection = __commonJS((exports) => {
           throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
       }
     }
-    deleteIn(path3) {
-      const [key, ...rest] = path3;
+    deleteIn(path5) {
+      const [key, ...rest] = path5;
       if (rest.length === 0)
         return this.delete(key);
       const node = this.get(key, true);
@@ -60490,8 +60490,8 @@ var require_Collection = __commonJS((exports) => {
       else
         throw new Error(`Expected YAML collection at ${key}. Remaining path: ${rest}`);
     }
-    getIn(path3, keepScalar) {
-      const [key, ...rest] = path3;
+    getIn(path5, keepScalar) {
+      const [key, ...rest] = path5;
       const node = this.get(key, true);
       if (rest.length === 0)
         return !keepScalar && identity2.isScalar(node) ? node.value : node;
@@ -60506,15 +60506,15 @@ var require_Collection = __commonJS((exports) => {
         return n == null || allowScalar && identity2.isScalar(n) && n.value == null && !n.commentBefore && !n.comment && !n.tag;
       });
     }
-    hasIn(path3) {
-      const [key, ...rest] = path3;
+    hasIn(path5) {
+      const [key, ...rest] = path5;
       if (rest.length === 0)
         return this.has(key);
       const node = this.get(key, true);
       return identity2.isCollection(node) ? node.hasIn(rest) : false;
     }
-    setIn(path3, value) {
-      const [key, ...rest] = path3;
+    setIn(path5, value) {
+      const [key, ...rest] = path5;
       if (rest.length === 0) {
         this.set(key, value);
       } else {
@@ -62896,9 +62896,9 @@ var require_Document = __commonJS((exports) => {
       if (assertCollection(this.contents))
         this.contents.add(value);
     }
-    addIn(path3, value) {
+    addIn(path5, value) {
       if (assertCollection(this.contents))
-        this.contents.addIn(path3, value);
+        this.contents.addIn(path5, value);
     }
     createAlias(node, name) {
       if (!node.anchor) {
@@ -62947,30 +62947,30 @@ var require_Document = __commonJS((exports) => {
     delete(key) {
       return assertCollection(this.contents) ? this.contents.delete(key) : false;
     }
-    deleteIn(path3) {
-      if (Collection.isEmptyPath(path3)) {
+    deleteIn(path5) {
+      if (Collection.isEmptyPath(path5)) {
         if (this.contents == null)
           return false;
         this.contents = null;
         return true;
       }
-      return assertCollection(this.contents) ? this.contents.deleteIn(path3) : false;
+      return assertCollection(this.contents) ? this.contents.deleteIn(path5) : false;
     }
     get(key, keepScalar) {
       return identity2.isCollection(this.contents) ? this.contents.get(key, keepScalar) : undefined;
     }
-    getIn(path3, keepScalar) {
-      if (Collection.isEmptyPath(path3))
+    getIn(path5, keepScalar) {
+      if (Collection.isEmptyPath(path5))
         return !keepScalar && identity2.isScalar(this.contents) ? this.contents.value : this.contents;
-      return identity2.isCollection(this.contents) ? this.contents.getIn(path3, keepScalar) : undefined;
+      return identity2.isCollection(this.contents) ? this.contents.getIn(path5, keepScalar) : undefined;
     }
     has(key) {
       return identity2.isCollection(this.contents) ? this.contents.has(key) : false;
     }
-    hasIn(path3) {
-      if (Collection.isEmptyPath(path3))
+    hasIn(path5) {
+      if (Collection.isEmptyPath(path5))
         return this.contents !== undefined;
-      return identity2.isCollection(this.contents) ? this.contents.hasIn(path3) : false;
+      return identity2.isCollection(this.contents) ? this.contents.hasIn(path5) : false;
     }
     set(key, value) {
       if (this.contents == null) {
@@ -62979,13 +62979,13 @@ var require_Document = __commonJS((exports) => {
         this.contents.set(key, value);
       }
     }
-    setIn(path3, value) {
-      if (Collection.isEmptyPath(path3)) {
+    setIn(path5, value) {
+      if (Collection.isEmptyPath(path5)) {
         this.contents = value;
       } else if (this.contents == null) {
-        this.contents = Collection.collectionFromPath(this.schema, Array.from(path3), value);
+        this.contents = Collection.collectionFromPath(this.schema, Array.from(path5), value);
       } else if (assertCollection(this.contents)) {
-        this.contents.setIn(path3, value);
+        this.contents.setIn(path5, value);
       }
     }
     setSchema(version3, options2 = {}) {
@@ -64874,9 +64874,9 @@ var require_cst_visit = __commonJS((exports) => {
   visit.BREAK = BREAK;
   visit.SKIP = SKIP;
   visit.REMOVE = REMOVE;
-  visit.itemAtPath = (cst, path3) => {
+  visit.itemAtPath = (cst, path5) => {
     let item = cst;
-    for (const [field, index] of path3) {
+    for (const [field, index] of path5) {
       const tok = item?.[field];
       if (tok && "items" in tok) {
         item = tok.items[index];
@@ -64885,23 +64885,23 @@ var require_cst_visit = __commonJS((exports) => {
     }
     return item;
   };
-  visit.parentCollection = (cst, path3) => {
-    const parent = visit.itemAtPath(cst, path3.slice(0, -1));
-    const field = path3[path3.length - 1][0];
+  visit.parentCollection = (cst, path5) => {
+    const parent = visit.itemAtPath(cst, path5.slice(0, -1));
+    const field = path5[path5.length - 1][0];
     const coll = parent?.[field];
     if (coll && "items" in coll)
       return coll;
     throw new Error("Parent collection not found");
   };
-  function _visit(path3, item, visitor) {
-    let ctrl = visitor(item, path3);
+  function _visit(path5, item, visitor) {
+    let ctrl = visitor(item, path5);
     if (typeof ctrl === "symbol")
       return ctrl;
     for (const field of ["key", "value"]) {
       const token = item[field];
       if (token && "items" in token) {
         for (let i = 0;i < token.items.length; ++i) {
-          const ci = _visit(Object.freeze(path3.concat([[field, i]])), token.items[i], visitor);
+          const ci = _visit(Object.freeze(path5.concat([[field, i]])), token.items[i], visitor);
           if (typeof ci === "number")
             i = ci - 1;
           else if (ci === BREAK)
@@ -64912,10 +64912,10 @@ var require_cst_visit = __commonJS((exports) => {
           }
         }
         if (typeof ctrl === "function" && field === "key")
-          ctrl = ctrl(item, path3);
+          ctrl = ctrl(item, path5);
       }
     }
-    return typeof ctrl === "function" ? ctrl(item, path3) : ctrl;
+    return typeof ctrl === "function" ? ctrl(item, path5) : ctrl;
   }
   exports.visit = visit;
 });
@@ -66832,8 +66832,8 @@ var require_req = __commonJS((exports, module) => {
     if (req.originalUrl) {
       _req.url = req.originalUrl;
     } else {
-      const path4 = req.path;
-      _req.url = typeof path4 === "string" ? path4 : req.url ? req.url.path || req.url : undefined;
+      const path6 = req.path;
+      _req.url = typeof path6 === "string" ? path6 : req.url ? req.url.path || req.url : undefined;
     }
     if (req.query) {
       _req.query = req.query;
@@ -66989,14 +66989,14 @@ var require_redact = __commonJS((exports, module) => {
     }
     return obj;
   }
-  function parsePath(path4) {
+  function parsePath(path6) {
     const parts2 = [];
     let current = "";
     let inBrackets = false;
     let inQuotes = false;
     let quoteChar = "";
-    for (let i = 0;i < path4.length; i++) {
-      const char = path4[i];
+    for (let i = 0;i < path6.length; i++) {
+      const char = path6[i];
       if (!inBrackets && char === ".") {
         if (current) {
           parts2.push(current);
@@ -67127,10 +67127,10 @@ var require_redact = __commonJS((exports, module) => {
     return current;
   }
   function redactPaths(obj, paths, censor, remove7 = false) {
-    for (const path4 of paths) {
-      const parts2 = parsePath(path4);
+    for (const path6 of paths) {
+      const parts2 = parsePath(path6);
       if (parts2.includes("*")) {
-        redactWildcardPath(obj, parts2, censor, path4, remove7);
+        redactWildcardPath(obj, parts2, censor, path6, remove7);
       } else {
         if (remove7) {
           removeKey(obj, parts2);
@@ -67217,8 +67217,8 @@ var require_redact = __commonJS((exports, module) => {
         }
       } else {
         if (afterWildcard.includes("*")) {
-          const wrappedCensor = typeof censor === "function" ? (value, path4) => {
-            const fullPath = [...pathArray.slice(0, pathLength), ...path4];
+          const wrappedCensor = typeof censor === "function" ? (value, path6) => {
+            const fullPath = [...pathArray.slice(0, pathLength), ...path6];
             return censor(value, fullPath);
           } : censor;
           redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove7);
@@ -67255,8 +67255,8 @@ var require_redact = __commonJS((exports, module) => {
       return null;
     }
     const pathStructure = new Map;
-    for (const path4 of pathsToClone) {
-      const parts2 = parsePath(path4);
+    for (const path6 of pathsToClone) {
+      const parts2 = parsePath(path6);
       let current = pathStructure;
       for (let i = 0;i < parts2.length; i++) {
         const part = parts2[i];
@@ -67308,24 +67308,24 @@ var require_redact = __commonJS((exports, module) => {
     }
     return cloneSelectively(obj, pathStructure);
   }
-  function validatePath(path4) {
-    if (typeof path4 !== "string") {
+  function validatePath(path6) {
+    if (typeof path6 !== "string") {
       throw new Error("Paths must be (non-empty) strings");
     }
-    if (path4 === "") {
+    if (path6 === "") {
       throw new Error("Invalid redaction path ()");
     }
-    if (path4.includes("..")) {
-      throw new Error(`Invalid redaction path (${path4})`);
+    if (path6.includes("..")) {
+      throw new Error(`Invalid redaction path (${path6})`);
     }
-    if (path4.includes(",")) {
-      throw new Error(`Invalid redaction path (${path4})`);
+    if (path6.includes(",")) {
+      throw new Error(`Invalid redaction path (${path6})`);
     }
     let bracketCount = 0;
     let inQuotes = false;
     let quoteChar = "";
-    for (let i = 0;i < path4.length; i++) {
-      const char = path4[i];
+    for (let i = 0;i < path6.length; i++) {
+      const char = path6[i];
       if ((char === '"' || char === "'") && bracketCount > 0) {
         if (!inQuotes) {
           inQuotes = true;
@@ -67339,20 +67339,20 @@ var require_redact = __commonJS((exports, module) => {
       } else if (char === "]" && !inQuotes) {
         bracketCount--;
         if (bracketCount < 0) {
-          throw new Error(`Invalid redaction path (${path4})`);
+          throw new Error(`Invalid redaction path (${path6})`);
         }
       }
     }
     if (bracketCount !== 0) {
-      throw new Error(`Invalid redaction path (${path4})`);
+      throw new Error(`Invalid redaction path (${path6})`);
     }
   }
   function validatePaths(paths) {
     if (!Array.isArray(paths)) {
       throw new TypeError("paths must be an array");
     }
-    for (const path4 of paths) {
-      validatePath(path4);
+    for (const path6 of paths) {
+      validatePath(path6);
     }
   }
   function slowRedact(options2 = {}) {
@@ -67514,8 +67514,8 @@ var require_redaction = __commonJS((exports, module) => {
       if (shape[k] === null) {
         o[k] = (value) => topCensor(value, [k]);
       } else {
-        const wrappedCensor = typeof censor === "function" ? (value, path4) => {
-          return censor(value, [k, ...path4]);
+        const wrappedCensor = typeof censor === "function" ? (value, path6) => {
+          return censor(value, [k, ...path6]);
         } : censor;
         o[k] = Redact({
           paths: shape[k],
@@ -67726,7 +67726,7 @@ var require_sonic_boom = __commonJS((exports, module) => {
   var fs2 = __require("fs");
   var EventEmitter = __require("events");
   var inherits = __require("util").inherits;
-  var path4 = __require("path");
+  var path6 = __require("path");
   var sleep5 = require_atomic_sleep();
   var assert3 = __require("assert");
   var BUSY_WRITE_TIMEOUT = 100;
@@ -67781,7 +67781,7 @@ var require_sonic_boom = __commonJS((exports, module) => {
     if (sonic.sync) {
       try {
         if (sonic.mkdir)
-          fs2.mkdirSync(path4.dirname(file3), { recursive: true });
+          fs2.mkdirSync(path6.dirname(file3), { recursive: true });
         const fd = fs2.openSync(file3, flags, mode);
         fileOpened(null, fd);
       } catch (err) {
@@ -67789,7 +67789,7 @@ var require_sonic_boom = __commonJS((exports, module) => {
         throw err;
       }
     } else if (sonic.mkdir) {
-      fs2.mkdir(path4.dirname(file3), { recursive: true }, (err) => {
+      fs2.mkdir(path6.dirname(file3), { recursive: true }, (err) => {
         if (err)
           return fileOpened(err);
         fs2.open(file3, flags, mode, fileOpened);
@@ -68515,7 +68515,7 @@ var require_indexes = __commonJS((exports, module) => {
 
 // ../../node_modules/thread-stream/index.js
 var require_thread_stream = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/swarm-tools/swarm-tools/node_modules/thread-stream";
+  var __dirname = "/home/runner/work/swarm/swarm/node_modules/thread-stream";
   var { version: version3 } = require_package();
   var { EventEmitter } = __require("events");
   var { Worker } = __require("worker_threads");
@@ -68936,10 +68936,10 @@ var require_thread_stream = __commonJS((exports, module) => {
 
 // ../../node_modules/pino/lib/transport.js
 var require_transport = __commonJS((exports, module) => {
-  var __dirname = "/home/runner/work/swarm-tools/swarm-tools/node_modules/pino/lib";
+  var __dirname = "/home/runner/work/swarm/swarm/node_modules/pino/lib";
   var { createRequire: createRequire2 } = __require("module");
   var getCallers = require_caller();
-  var { join: join13, isAbsolute: isAbsolute2, sep: sep4 } = __require("node:path");
+  var { join: join13, isAbsolute: isAbsolute3, sep: sep4 } = __require("node:path");
   var sleep5 = require_atomic_sleep();
   var onExit4 = require_on_exit_leak_free();
   var ThreadStream = require_thread_stream();
@@ -69037,7 +69037,7 @@ var require_transport = __commonJS((exports, module) => {
     return buildStream(fixTarget(target), options2, worker, sync4);
     function fixTarget(origin) {
       origin = bundlerOverrides[origin] || origin;
-      if (isAbsolute2(origin) || origin.indexOf("file://") === 0) {
+      if (isAbsolute3(origin) || origin.indexOf("file://") === 0) {
         return origin;
       }
       if (origin === "pino/file") {
@@ -70642,11 +70642,11 @@ var require_pino = __commonJS((exports, module) => {
     depthLimit: 5,
     edgeLimit: 100
   };
-  var normalize2 = createArgsNormalizer(defaultOptions);
+  var normalize3 = createArgsNormalizer(defaultOptions);
   var serializers = Object.assign(Object.create(null), stdSerializers);
   function pino(...args2) {
     const instance = {};
-    const { opts, stream } = normalize2(instance, caller(), ...args2);
+    const { opts, stream } = normalize3(instance, caller(), ...args2);
     if (opts.level && typeof opts.level === "string" && DEFAULT_LEVELS[opts.level.toLowerCase()] !== undefined)
       opts.level = opts.level.toLowerCase();
     const {
@@ -70779,32 +70779,401 @@ import {
   findCellsByPartialId
 } from "swarm-mail";
 
-// src/utils/normalize-path.ts
-function normalizePath(inputPath) {
-  if (!inputPath) {
-    return "";
+// ../cross-path/dist/normalize.js
+import path2 from "node:path";
+
+// ../cross-path/dist/detect.js
+var cachedEnvironment = null;
+function detectEnvironment() {
+  if (cachedEnvironment !== null) {
+    return cachedEnvironment;
+  }
+  const platform = process.platform;
+  if (platform === "win32") {
+    cachedEnvironment = "windows";
+    return cachedEnvironment;
+  }
+  if (platform === "darwin") {
+    cachedEnvironment = "darwin";
+    return cachedEnvironment;
+  }
+  if (platform === "linux") {
+    if (process.env.WSL_DISTRO_NAME || process.env.WSLENV) {
+      cachedEnvironment = "wsl";
+      return cachedEnvironment;
+    }
+    const msystem = process.env.MSYSTEM;
+    if (msystem && (msystem.includes("MINGW") || msystem.includes("MSYS"))) {
+      cachedEnvironment = "git-bash";
+      return cachedEnvironment;
+    }
+    if (process.env.CYGWIN) {
+      cachedEnvironment = "cygwin";
+      return cachedEnvironment;
+    }
+    cachedEnvironment = "linux";
+    return cachedEnvironment;
+  }
+  cachedEnvironment = "linux";
+  return cachedEnvironment;
+}
+
+// ../cross-path/dist/validate.js
+import path from "node:path";
+function isAbsolute(inputPath) {
+  return path.win32.isAbsolute(inputPath) || path.posix.isAbsolute(inputPath);
+}
+function isUNC(inputPath) {
+  const normalized = inputPath.replace(/\\/g, "/");
+  if (normalized.length < 3) {
+    return false;
+  }
+  if (!normalized.startsWith("//")) {
+    return false;
+  }
+  if (normalized[2] === "/") {
+    return false;
   }
-  let normalized = convertBackslashes(inputPath);
-  normalized = sanitizeDriveLetter(normalized);
-  normalized = removeDoubleSlashes(normalized);
-  return normalized;
+  const afterPrefix = normalized.substring(2);
+  const hasValidServerPart = /^[^\s\/]+/.test(afterPrefix);
+  return hasValidServerPart;
 }
-function convertBackslashes(path) {
-  return path.replace(/\\/g, "/");
+function isWSLMount(inputPath) {
+  const wslMountPattern = /^\/mnt\/[a-z](\/|$)/i;
+  return wslMountPattern.test(inputPath);
 }
-function sanitizeDriveLetter(path) {
-  return path.replace(/^([A-Za-z]:)(?=[^/]|$)/, "$1/");
+function isGitBashMount(inputPath) {
+  const gitBashPattern = /^\/[a-z]\//i;
+  return gitBashPattern.test(inputPath);
 }
-function removeDoubleSlashes(path) {
-  const isUncPath = path.startsWith("//") && path[2] !== "/";
-  if (isUncPath) {
-    return "//" + path.slice(2).replace(/\/+/g, "/");
+function hasDriveLetter(inputPath) {
+  const driveLetterPattern = /^[A-Za-z]:/;
+  return driveLetterPattern.test(inputPath);
+}
+function parseWSLUNC(inputPath) {
+  const normalized = inputPath.replace(/\\/g, "/");
+  const wslUNCPattern = /^\/\/(wsl\.localhost|wsl\$)\/([^/]+)(\/.*)?$/i;
+  const match = normalized.match(wslUNCPattern);
+  if (!match) {
+    return null;
+  }
+  const distro = match[2];
+  const restPath = match[3] || "/";
+  return { distro, path: restPath };
+}
+function isDriveRelative(inputPath) {
+  if (inputPath.length < 3) {
+    return false;
+  }
+  const hasLetter = /^[A-Za-z]$/.test(inputPath[0]);
+  const hasColon = inputPath[1] === ":";
+  const notSlash = inputPath[2] !== "/" && inputPath[2] !== "\\";
+  return hasLetter && hasColon && notSlash;
+}
+
+// ../cross-path/dist/normalize.js
+function normalize(inputPath, options2) {
+  if (inputPath === null || inputPath === undefined) {
+    throw new TypeError("Path cannot be null or undefined");
+  }
+  if (typeof inputPath !== "string") {
+    throw new TypeError(`Path must be a string, received ${typeof inputPath}`);
+  }
+  if (inputPath.length === 0) {
+    throw new TypeError("Path cannot be empty");
+  }
+  if (inputPath.includes("\x00")) {
+    throw new TypeError("Path cannot contain null bytes");
+  }
+  const env = options2?.env ?? detectEnvironment();
+  const wslUNCInfo = parseWSLUNC(inputPath);
+  if (wslUNCInfo) {
+    const currentDistro = process.env.WSL_DISTRO_NAME;
+    if (env === "wsl" && currentDistro && wslUNCInfo.distro.toLowerCase() === currentDistro.toLowerCase()) {
+      return path2.posix.normalize(wslUNCInfo.path);
+    }
+  }
+  let intermediate = inputPath.replace(/\\/g, "/");
+  const originalIsUNC = isUNC(intermediate);
+  if (isWSLMount(intermediate)) {
+    const driveLetter = intermediate.charAt(5).toLowerCase();
+    intermediate = `${driveLetter}:${intermediate.substring(6)}`;
+    if (intermediate.length === 2) {
+      intermediate = `${driveLetter}:/`;
+    }
+  } else if (isGitBashMount(intermediate)) {
+    const driveLetter = intermediate.charAt(1).toLowerCase();
+    intermediate = `${driveLetter}:${intermediate.substring(2)}`;
+  }
+  const hasWindowsDrive = hasDriveLetter(intermediate);
+  const isAbsolutePath = isAbsolute(intermediate);
+  const driveRelative = isDriveRelative(intermediate);
+  if (!isAbsolutePath && !hasWindowsDrive) {
+    const basePath = options2?.basePath ?? process.cwd();
+    const normalizedBase = basePath.replace(/\\/g, "/");
+    if (hasDriveLetter(normalizedBase)) {
+      const drive = normalizedBase.substring(0, 2);
+      const baseRest = normalizedBase.substring(2) || "/";
+      const resolved = path2.posix.resolve(baseRest, intermediate);
+      intermediate = drive + resolved;
+    } else {
+      intermediate = path2.posix.resolve(normalizedBase, intermediate);
+    }
+  } else if (driveRelative) {
+    const pathDrive = intermediate.substring(0, 2).toLowerCase();
+    const pathRest = intermediate.substring(2);
+    const basePath = options2?.basePath ?? process.cwd();
+    const normalizedBase = basePath.replace(/\\/g, "/");
+    if (hasDriveLetter(normalizedBase)) {
+      const baseDrive = normalizedBase.substring(0, 2).toLowerCase();
+      if (baseDrive === pathDrive) {
+        const baseRest = normalizedBase.substring(2) || "/";
+        const resolved = path2.posix.resolve(baseRest, pathRest);
+        intermediate = pathDrive + resolved;
+      } else {
+        intermediate = pathDrive + "/" + pathRest;
+      }
+    } else {
+      intermediate = pathDrive + "/" + pathRest;
+    }
+  }
+  if (originalIsUNC || isUNC(intermediate)) {
+    const withoutPrefix = intermediate.substring(2);
+    const normalizedRest = path2.posix.normalize(withoutPrefix);
+    intermediate = "//" + normalizedRest;
+  } else if (hasWindowsDrive || hasDriveLetter(intermediate)) {
+    const drive = intermediate.substring(0, 2);
+    let rest = intermediate.substring(2);
+    if (!rest.startsWith("/")) {
+      rest = "/" + rest;
+    }
+    const normalizedRest = path2.posix.normalize(rest);
+    intermediate = drive + normalizedRest;
   } else {
-    return path.replace(/\/+/g, "/");
+    intermediate = path2.posix.normalize(intermediate);
+  }
+  const finalHasDrive = hasDriveLetter(intermediate);
+  const finalIsUNC = isUNC(intermediate);
+  if (finalHasDrive || finalIsUNC) {
+    intermediate = intermediate.toLowerCase();
+    const segments = intermediate.split("/");
+    const normalizedSegments = segments.map((segment, index) => {
+      if (index === 0 || segment === "") {
+        return segment;
+      }
+      return segment.replace(/[\s.]+$/, "");
+    });
+    intermediate = normalizedSegments.join("/");
+  }
+  if (intermediate.length > 1 && intermediate.endsWith("/")) {
+    const isWindowsRoot = finalHasDrive && intermediate.length === 3;
+    const isPosixRoot = intermediate === "/";
+    const isUNCRoot = finalIsUNC && intermediate.split("/").filter(Boolean).length <= 2;
+    if (!isWindowsRoot && !isPosixRoot && !isUNCRoot) {
+      intermediate = intermediate.slice(0, -1);
+    }
+  }
+  if (finalHasDrive && intermediate.length === 2) {
+    intermediate = intermediate + "/";
+  }
+  return intermediate;
+}
+function normalizePaths(paths, options2) {
+  return paths.map((p) => normalize(p, options2));
+}
+// src/utils/arg-normalizer.ts
+function toPlainObject(value) {
+  if (typeof value === "string") {
+    try {
+      const parsed = JSON.parse(value);
+      if (parsed && typeof parsed === "object")
+        return parsed;
+    } catch {
+      return { title: value };
+    }
+  }
+  if (value && typeof value === "object")
+    return value;
+  return {};
+}
+function coerceBoolean(v) {
+  if (typeof v === "boolean")
+    return v;
+  if (typeof v === "string") {
+    const s = v.trim().toLowerCase();
+    if (["true", "t", "1", "yes", "y"].includes(s))
+      return true;
+    if (["false", "f", "0", "no", "n"].includes(s))
+      return false;
   }
+  if (typeof v === "number")
+    return v !== 0;
+  return;
 }
-function normalizePaths(paths) {
-  return paths.map(normalizePath);
+function coerceNumber(v) {
+  if (typeof v === "number" && Number.isFinite(v))
+    return v;
+  if (typeof v === "string") {
+    const n = Number(v);
+    if (!Number.isNaN(n))
+      return n;
+  }
+  return;
+}
+function normalizeStatus(v) {
+  if (typeof v !== "string")
+    return;
+  const s = v.trim().toLowerCase().replace(/\s+/g, "_").replace(/-+/g, "_");
+  const allowed = new Set(["open", "in_progress", "blocked", "closed"]);
+  if (allowed.has(s))
+    return s;
+  return;
+}
+function normalizeType(v) {
+  if (typeof v !== "string")
+    return;
+  const s = v.trim().toLowerCase();
+  const allowed = new Set(["bug", "feature", "task", "epic", "chore"]);
+  if (allowed.has(s))
+    return s;
+  return;
+}
+function pick2(obj, keys) {
+  const out = {};
+  for (const k of keys)
+    if (k in obj)
+      out[k] = obj[k];
+  return out;
+}
+function aliasCommonKeys(obj) {
+  const out = { ...obj };
+  const move = (from, to) => {
+    if (out[from] !== undefined && out[to] === undefined) {
+      out[to] = out[from];
+      delete out[from];
+    }
+  };
+  move("cell_id", "id");
+  move("bead_id", "id");
+  move("beadId", "id");
+  move("parentId", "parent_id");
+  move("issue_type", "type");
+  move("issueType", "type");
+  move("kind", "type");
+  move("epicTitle", "epic_title");
+  move("epicDescription", "epic_description");
+  move("subTasks", "subtasks");
+  move("tasks", "subtasks");
+  move("items", "subtasks");
+  move("idSuffix", "id_suffix");
+  return out;
+}
+function normalizeCreateArgs(raw) {
+  const obj = aliasCommonKeys(toPlainObject(raw));
+  if (typeof raw === "string" && !obj.title)
+    obj.title = String(raw);
+  if (obj.priority !== undefined)
+    obj.priority = coerceNumber(obj.priority);
+  if (obj.type !== undefined)
+    obj.type = normalizeType(obj.type) ?? obj.type;
+  if (obj.parent_id !== undefined)
+    obj.parent_id = String(obj.parent_id);
+  return pick2(obj, ["title", "type", "priority", "description", "parent_id"]);
+}
+function normalizeUpdateArgs(raw) {
+  const obj = aliasCommonKeys(toPlainObject(raw));
+  if (obj.status !== undefined)
+    obj.status = normalizeStatus(obj.status) ?? obj.status;
+  if (obj.priority !== undefined)
+    obj.priority = coerceNumber(obj.priority);
+  if (obj.description !== undefined && obj.description != null)
+    obj.description = String(obj.description);
+  if (obj.id !== undefined)
+    obj.id = String(obj.id);
+  return pick2(obj, ["id", "status", "description", "priority"]);
+}
+function normalizeCloseArgs(raw) {
+  const obj = aliasCommonKeys(toPlainObject(raw));
+  if (obj.id !== undefined)
+    obj.id = String(obj.id);
+  if (obj.reason !== undefined)
+    obj.reason = String(obj.reason);
+  return pick2(obj, ["id", "reason"]);
+}
+function normalizeQueryArgs(raw) {
+  const obj = aliasCommonKeys(toPlainObject(raw));
+  if (obj.status !== undefined)
+    obj.status = normalizeStatus(obj.status) ?? obj.status;
+  if (obj.type !== undefined)
+    obj.type = normalizeType(obj.type) ?? obj.type;
+  if (obj.ready !== undefined)
+    obj.ready = coerceBoolean(obj.ready);
+  if (obj.parent_id !== undefined)
+    obj.parent_id = String(obj.parent_id);
+  if (obj.limit !== undefined)
+    obj.limit = coerceNumber(obj.limit);
+  return pick2(obj, ["status", "type", "ready", "parent_id", "limit"]);
+}
+function normalizeCellsArgs(raw) {
+  const obj = aliasCommonKeys(toPlainObject(raw));
+  if (obj.id !== undefined)
+    obj.id = String(obj.id);
+  if (obj.status !== undefined)
+    obj.status = normalizeStatus(obj.status) ?? obj.status;
+  if (obj.type !== undefined)
+    obj.type = normalizeType(obj.type) ?? obj.type;
+  if (obj.parent_id !== undefined)
+    obj.parent_id = String(obj.parent_id);
+  if (obj.ready !== undefined)
+    obj.ready = coerceBoolean(obj.ready);
+  if (obj.limit !== undefined)
+    obj.limit = coerceNumber(obj.limit);
+  return pick2(obj, ["id", "status", "type", "parent_id", "ready", "limit"]);
+}
+function normalizeEpicCreateArgs(raw) {
+  const obj0 = aliasCommonKeys(toPlainObject(raw));
+  const obj = { ...obj0 };
+  if (obj.subtasks !== undefined && !Array.isArray(obj.subtasks)) {
+    if (typeof obj.subtasks === "string")
+      obj.subtasks = obj.subtasks.split(/[,\n]/).map((s) => ({ title: s.trim() })).filter((x) => x.title);
+    else if (obj.subtasks && typeof obj.subtasks === "object")
+      obj.subtasks = [obj.subtasks];
+  }
+  if (Array.isArray(obj.subtasks)) {
+    obj.subtasks = obj.subtasks.map((st) => {
+      if (typeof st === "string")
+        return { title: st };
+      const s = aliasCommonKeys(toPlainObject(st));
+      if (s.priority !== undefined)
+        s.priority = coerceNumber(s.priority);
+      if (s.files && !Array.isArray(s.files))
+        s.files = [String(s.files)];
+      if (Array.isArray(s.files))
+        s.files = s.files.map((p) => String(p));
+      return pick2(s, ["title", "priority", "files", "id_suffix"]);
+    });
+  }
+  if (obj.epic_title === undefined && typeof raw === "string")
+    obj.epic_title = String(raw);
+  if (obj.epic_description !== undefined)
+    obj.epic_description = String(obj.epic_description);
+  return pick2(obj, ["epic_title", "epic_description", "epic_id", "subtasks", "strategy", "task", "project_key", "recovery_context"]);
+}
+function formatZodError(toolName, err, example) {
+  const issues = err.issues.map((i) => `- ${i.path.join(".") || "<root>"}: ${i.message}`).join(`
+`);
+  const guidance = `How to fix:
+1) Check field names (snake_case expected).
+2) Coercions allowed: booleans as 'true/false', numbers as strings, status 'in-progress' -> 'in_progress'.
+3) Remove unknown fields or typos.`;
+  const sample = example ? `
+
+Example:
+${example}` : "";
+  return `${toolName}: Invalid arguments.
+${issues}
+
+${guidance}${sample}`;
 }
 
 // src/hive.ts
@@ -71394,6 +71763,25 @@ async function runGitCommand(args) {
   const exitCode = await proc.exited;
   return { exitCode, stdout, stderr };
 }
+async function withRetry(operation, retries = 3, delayMs = 100) {
+  let lastError;
+  for (let attempt = 0;attempt <= retries; attempt++) {
+    try {
+      return await operation();
+    } catch (err) {
+      lastError = err;
+      const message = err instanceof Error ? err.message : String(err);
+      if (attempt < retries && (message.includes("SQLITE_BUSY") || message.includes("SQLITE_BUSY_RECOVERY") || message.includes("database is locked"))) {
+        await new Promise((r) => setTimeout(r, delayMs * (attempt + 1)));
+        continue;
+      }
+      break;
+    }
+  }
+  if (lastError instanceof Error)
+    throw lastError;
+  throw new Error(String(lastError));
+}
 
 class HiveError extends Error {
   command;
@@ -71407,8 +71795,16 @@ class HiveError extends Error {
     this.name = "HiveError";
   }
 }
+class HiveValidationError extends Error {
+  zodError;
+  constructor(message, zodError) {
+    super(message);
+    this.zodError = zodError;
+    this.name = "HiveValidationError";
+  }
+}
 function ensureHiveDirectory(projectPath) {
-  const hiveDir = normalizePath(join2(projectPath, ".hive"));
+  const hiveDir = normalize(join2(projectPath, ".hive"));
   if (!existsSync2(hiveDir)) {
     const { mkdirSync: mkdirSync2 } = __require("node:fs");
     mkdirSync2(hiveDir, { recursive: true });
@@ -71515,7 +71911,19 @@ var hive_create = tool({
     parent_id: tool.schema.string().optional().describe("Parent cell ID for epic children")
   },
   async execute(args, ctx) {
-    const validated = CellCreateArgsSchema.parse(args);
+    const normalized = normalizeCreateArgs(args);
+    const parsed = CellCreateArgsSchema.safeParse(normalized);
+    if (!parsed.success) {
+      const message = formatZodError("hive_create", parsed.error, `{
+  "title": "Fix login bug",
+  "type": "bug",
+  "priority": 2,
+  "description": "Null check on session token",
+  "parent_id": "project-abc12"
+}`);
+      throw new HiveValidationError(message, parsed.error);
+    }
+    const validated = parsed.data;
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
     try {
@@ -71571,7 +71979,20 @@ var hive_create_epic = tool({
     }).optional().describe("Recovery context from checkpoint compaction")
   },
   async execute(args, ctx) {
-    const validated = EpicCreateArgsSchema.parse(args);
+    const normalized = normalizeEpicCreateArgs(args);
+    const parsed = EpicCreateArgsSchema.safeParse(normalized);
+    if (!parsed.success) {
+      const message = formatZodError("hive_create_epic", parsed.error, `{
+  "epic_title": "Ship new Auth",
+  "epic_description": "Auth overhaul with passwordless",
+  "subtasks": [
+    { "title": "DB migration", "priority": 1 },
+    { "title": "Add magic links", "priority": 2 }
+  ]
+}`);
+      throw new HiveValidationError(message, parsed.error);
+    }
+    const validated = parsed.data;
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
     const created = [];
@@ -71594,12 +72015,21 @@ var hive_create_epic = tool({
         await adapter.markDirty(projectKey, subtaskCell.id);
         created.push(subtaskCell);
       }
+      try {
+        const children = await adapter.queryCells(projectKey, { parent_id: epic.id });
+        if (children.length !== validated.subtasks.length) {
+          throw new Error(`Post-create validation failed: expected ${validated.subtasks.length} subtasks, found ${children.length}`);
+        }
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        throw new Error(`Epic integrity check failed: ${msg}`);
+      }
       const result = {
         success: true,
         epic: formatCellForOutput(epic),
         subtasks: created.slice(1).map((c) => formatCellForOutput(c))
       };
-      const effectiveProjectKey = args.project_key || projectKey;
+      const effectiveProjectKey = normalized.project_key || projectKey;
       try {
         const epicCreatedEvent = createEvent("epic_created", {
           project_key: effectiveProjectKey,
@@ -71617,16 +72047,16 @@ var hive_create_epic = tool({
         const event = createEvent("decomposition_generated", {
           project_key: effectiveProjectKey,
           epic_id: epic.id,
-          task: args.task || validated.epic_title,
+          task: normalized.task || validated.epic_title,
           context: validated.epic_description,
-          strategy: args.strategy || "feature-based",
+          strategy: normalized.strategy || "feature-based",
           epic_title: validated.epic_title,
           subtasks: validated.subtasks.map((st) => ({
             title: st.title,
             files: st.files || [],
             priority: st.priority
           })),
-          recovery_context: args.recovery_context
+          recovery_context: normalized.recovery_context
         });
         await appendEvent(event, effectiveProjectKey);
       } catch (error89) {
@@ -71638,7 +72068,7 @@ var hive_create_epic = tool({
           project_key: effectiveProjectKey,
           epic_id: epic.id,
           epic_title: validated.epic_title,
-          strategy: args.strategy || "feature-based",
+          strategy: normalized.strategy || "feature-based",
           subtask_count: validated.subtasks.length,
           total_files: totalFiles,
           coordinator_agent: "coordinator"
@@ -71663,10 +72093,10 @@ var hive_create_epic = tool({
           decision_type: "decomposition_complete",
           payload: {
             subtask_count: validated.subtasks.length,
-            strategy_used: args.strategy || "feature-based",
+            strategy_used: normalized.strategy || "feature-based",
             files_per_subtask: filesPerSubtask,
             epic_title: validated.epic_title,
-            task: args.task
+            task: normalized.task
           }
         });
       } catch (error89) {
@@ -71722,7 +72152,18 @@ var hive_query = tool({
     limit: tool.schema.number().optional().describe("Max results to return (default: 20)")
   },
   async execute(args, ctx) {
-    const validated = CellQueryArgsSchema.parse(args);
+    const normalized = normalizeQueryArgs(args);
+    const parsed = CellQueryArgsSchema.safeParse(normalized);
+    if (!parsed.success) {
+      const message = formatZodError("hive_query", parsed.error, `{
+  "status": "in_progress",
+  "type": "task",
+  "parent_id": "project-abc12",
+  "limit": 10
+}`);
+      throw new HiveValidationError(message, parsed.error);
+    }
+    const validated = parsed.data;
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
     try {
@@ -71755,20 +72196,32 @@ var hive_update = tool({
     priority: tool.schema.number().min(0).max(3).optional().describe("New priority")
   },
   async execute(args, ctx) {
-    const validated = CellUpdateArgsSchema.parse(args);
+    const normalized = normalizeUpdateArgs(args);
+    const parsed = CellUpdateArgsSchema.safeParse(normalized);
+    if (!parsed.success) {
+      const message = formatZodError("hive_update", parsed.error, `{
+  "id": "project-abc12",
+  "status": "in_progress",
+  "priority": 1,
+  "description": "Ready for review"
+}`);
+      throw new HiveValidationError(message, parsed.error);
+    }
+    const validated = parsed.data;
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
     try {
       const cellId = await resolvePartialId(adapter, projectKey, validated.id) || validated.id;
       let cell;
-      if (validated.status) {
-        cell = await adapter.changeCellStatus(projectKey, cellId, validated.status);
+      if (validated.status !== undefined) {
+        const newStatus = validated.status;
+        cell = await withRetry(() => adapter.changeCellStatus(projectKey, cellId, newStatus));
       }
       if (validated.description !== undefined || validated.priority !== undefined) {
-        cell = await adapter.updateCell(projectKey, cellId, {
+        cell = await withRetry(() => adapter.updateCell(projectKey, cellId, {
           description: validated.description,
           priority: validated.priority
-        });
+        }));
       } else if (!validated.status) {
         const existingCell = await adapter.getCell(projectKey, cellId);
         if (!existingCell) {
@@ -71815,14 +72268,23 @@ var hive_close = tool({
     reason: tool.schema.string().describe("Completion reason")
   },
   async execute(args, ctx) {
-    const validated = CellCloseArgsSchema.parse(args);
+    const normalized = normalizeCloseArgs(args);
+    const parsed = CellCloseArgsSchema.safeParse(normalized);
+    if (!parsed.success) {
+      const message = formatZodError("hive_close", parsed.error, `{
+  "id": "project-abc12",
+  "reason": "Merged in main"
+}`);
+      throw new HiveValidationError(message, parsed.error);
+    }
+    const validated = parsed.data;
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
     try {
       const cellId = await resolvePartialId(adapter, projectKey, validated.id) || validated.id;
       const cellBeforeClose = await adapter.getCell(projectKey, cellId);
       const isEpic = cellBeforeClose?.type === "epic";
-      const cell = await adapter.closeCell(projectKey, cellId, validated.reason);
+      const cell = await withRetry(() => adapter.closeCell(projectKey, cellId, validated.reason));
       await adapter.markDirty(projectKey, cellId);
       if (isEpic && cellBeforeClose) {
         try {
@@ -71943,7 +72405,7 @@ var hive_start = tool({
     const adapter = await getHiveAdapter(projectKey);
     try {
       const cellId = await resolvePartialId(adapter, projectKey, args.id) || args.id;
-      const cell = await adapter.changeCellStatus(projectKey, cellId, "in_progress");
+      const cell = await withRetry(() => adapter.changeCellStatus(projectKey, cellId, "in_progress"));
       await adapter.markDirty(projectKey, cellId);
       try {
         const event = createEvent("cell_status_changed", {
@@ -72018,16 +72480,17 @@ PREFER THIS OVER hive_query when you need to:
   async execute(args, ctx) {
     const projectKey = getHiveWorkingDirectory();
     const adapter = await getHiveAdapter(projectKey);
+    const normalized = normalizeCellsArgs(args);
     try {
-      if (args.id) {
-        const matchingCells = await findCellsByPartialId(adapter, projectKey, args.id);
+      if (normalized.id) {
+        const matchingCells = await findCellsByPartialId(adapter, projectKey, normalized.id);
         if (matchingCells.length === 0) {
-          throw new HiveError(`No cell found matching ID '${args.id}'`, "hive_cells");
+          throw new HiveError(`No cell found matching ID '${normalized.id}'`, "hive_cells");
         }
         const formatted2 = matchingCells.map((c) => formatCellForOutput(c));
         return JSON.stringify(formatted2, null, 2);
       }
-      if (args.ready) {
+      if (normalized.ready) {
         const ready = await adapter.getNextReadyCell(projectKey);
         if (!ready) {
           return JSON.stringify([], null, 2);
@@ -72036,10 +72499,10 @@ PREFER THIS OVER hive_query when you need to:
         return JSON.stringify([formatted2], null, 2);
       }
       const cells = await adapter.queryCells(projectKey, {
-        status: args.status,
-        type: args.type,
-        parent_id: args.parent_id,
-        limit: args.limit || 20
+        status: normalized.status,
+        type: normalized.type,
+        parent_id: normalized.parent_id,
+        limit: normalized.limit || 20
       });
       const formatted = cells.map((c) => formatCellForOutput(c));
       return JSON.stringify(formatted, null, 2);
@@ -72049,7 +72512,7 @@ PREFER THIS OVER hive_query when you need to:
       }
       const message = error89 instanceof Error ? error89.message : String(error89);
       if (message.includes("Bead not found") || message.includes("Cell not found")) {
-        throw new HiveError(`No cell found matching ID '${args.id || "unknown"}'`, "hive_cells");
+        throw new HiveError(`No cell found matching ID '${normalized.id || "unknown"}'`, "hive_cells");
       }
       throw new HiveError(`Failed to query cells: ${message}`, "hive_cells");
     }
@@ -72118,6 +72581,14 @@ var hive_sync = tool({
       const remoteCheckResult2 = await runGitCommand(["remote"]);
       const hasRemote2 = remoteCheckResult2.stdout.trim() !== "";
       if (hasRemote2) {
+        await withTimeout(runGitCommand(["fetch", "--all", "--prune"]), TIMEOUT_MS, "git fetch");
+        const upstreamResult = await runGitCommand([
+          "rev-parse",
+          "--abbrev-ref",
+          "--symbolic-full-name",
+          "@{u}"
+        ]);
+        const hasUpstream = upstreamResult.exitCode === 0;
         const statusResult = await runGitCommand(["status", "--porcelain"]);
         const hasUnstagedChanges = statusResult.stdout.trim() !== "";
         let didStash = false;
@@ -72128,9 +72599,13 @@ var hive_sync = tool({
           }
         }
         try {
-          const pullResult = await withTimeout(runGitCommand(["pull", "--rebase"]), TIMEOUT_MS, "git pull --rebase");
-          if (pullResult.exitCode !== 0) {
-            throw new HiveError(`Failed to pull: ${pullResult.stderr}`, "git pull --rebase", pullResult.exitCode);
+          if (hasUpstream) {
+            const pullResult = await withTimeout(runGitCommand(["pull", "--rebase"]), TIMEOUT_MS, "git pull --rebase");
+            if (pullResult.exitCode !== 0) {
+              throw new HiveError(`Failed to pull: ${pullResult.stderr}`, "git pull --rebase", pullResult.exitCode);
+            }
+          } else {
+            console.warn("[hive_sync] No upstream configured for current branch. Skipping pull.");
           }
         } finally {
           if (didStash) {
@@ -72629,7 +73104,7 @@ var createDatabase = null;
 try {
   if (typeof globalThis.Bun !== "undefined") {
     const bunSqlite = await import("bun:sqlite");
-    createDatabase = (path2) => new bunSqlite.Database(path2);
+    createDatabase = (path4) => new bunSqlite.Database(path4);
     sqliteAvailable = true;
   }
 } catch {
@@ -72979,10 +73454,10 @@ function getSessionStatePath(sessionID) {
   return join4(SESSION_STATE_DIR, `${safeID}.json`);
 }
 function loadSessionState(sessionID) {
-  const path2 = getSessionStatePath(sessionID);
+  const path4 = getSessionStatePath(sessionID);
   try {
-    if (existsSync4(path2)) {
-      const data = readFileSync3(path2, "utf-8");
+    if (existsSync4(path4)) {
+      const data = readFileSync3(path4, "utf-8");
       return JSON.parse(data);
     }
   } catch (error89) {
@@ -72995,8 +73470,8 @@ function saveSessionState(sessionID, state) {
     if (!existsSync4(SESSION_STATE_DIR)) {
       mkdirSync3(SESSION_STATE_DIR, { recursive: true });
     }
-    const path2 = getSessionStatePath(sessionID);
-    writeFileSync2(path2, JSON.stringify(state, null, 2));
+    const path4 = getSessionStatePath(sessionID);
+    writeFileSync2(path4, JSON.stringify(state, null, 2));
     return true;
   } catch (error89) {
     console.error(`[agent-mail] CRITICAL: Could not save session state: ${error89}`);
@@ -73133,11 +73608,11 @@ async function restartServer() {
       `${process.env.HOME}/mcp_agent_mail`
     ];
     let serverDir = null;
-    for (const path2 of possiblePaths) {
+    for (const path4 of possiblePaths) {
       try {
-        const stat = await Bun.file(`${path2}/pyproject.toml`).exists();
+        const stat = await Bun.file(`${path4}/pyproject.toml`).exists();
         if (stat) {
-          serverDir = path2;
+          serverDir = path4;
           break;
         }
       } catch {
@@ -73963,10 +74438,10 @@ function getSessionStatePath2(sessionID) {
   return join5(SESSION_STATE_DIR2, `${safeID}.json`);
 }
 function loadSessionState2(sessionID) {
-  const path2 = getSessionStatePath2(sessionID);
+  const path4 = getSessionStatePath2(sessionID);
   try {
-    if (existsSync5(path2)) {
-      const data = readFileSync4(path2, "utf-8");
+    if (existsSync5(path4)) {
+      const data = readFileSync4(path4, "utf-8");
       return JSON.parse(data);
     }
   } catch (error89) {
@@ -73979,14 +74454,22 @@ function saveSessionState2(sessionID, state) {
     if (!existsSync5(SESSION_STATE_DIR2)) {
       mkdirSync4(SESSION_STATE_DIR2, { recursive: true });
     }
-    const path2 = getSessionStatePath2(sessionID);
-    writeFileSync3(path2, JSON.stringify(state, null, 2));
+    const path4 = getSessionStatePath2(sessionID);
+    writeFileSync3(path4, JSON.stringify(state, null, 2));
     return true;
   } catch (error89) {
     console.warn(`[swarm-mail] Could not save session state: ${error89}`);
     return false;
   }
 }
+function clearSessionState(sessionID) {
+  const path4 = getSessionStatePath2(sessionID);
+  try {
+    if (existsSync5(path4)) {
+      unlinkSync2(path4);
+    }
+  } catch {}
+}
 function hasCoordinatorOverride(sessionID) {
   return isInCoordinatorContext(sessionID) || isInCoordinatorContext();
 }
@@ -74014,12 +74497,27 @@ var swarmmail_init = tool({
     const sessionID = ctx.sessionID || "default";
     const existingState = loadSessionState2(sessionID);
     if (existingState) {
-      return JSON.stringify({
-        agent_name: existingState.agentName,
-        project_key: existingState.projectKey,
-        message: `Session already initialized as ${existingState.agentName}`,
-        already_initialized: true
-      }, null, 2);
+      const requestedAgent = args.agent_name;
+      const projectMismatch = existingState.projectKey !== projectPath;
+      const agentMismatch = Boolean(requestedAgent && requestedAgent !== existingState.agentName);
+      if (args.force_reinit) {
+        clearSessionState(sessionID);
+      } else {
+        return JSON.stringify({
+          agent_name: existingState.agentName,
+          project_key: existingState.projectKey,
+          message: `Session already initialized as ${existingState.agentName}`,
+          already_initialized: true,
+          session_id: sessionID,
+          project_mismatch: projectMismatch || undefined,
+          agent_mismatch: agentMismatch || undefined,
+          note: projectMismatch || agentMismatch ? "To switch project/agent, call swarmmail_init again with force_reinit: true (or end the session)." : undefined,
+          requested: requestedAgent || args.project_path ? {
+            agent_name: requestedAgent,
+            project_key: args.project_path
+          } : undefined
+        }, null, 2);
+      }
     }
     try {
       const result = await initSwarmAgent({
@@ -74233,7 +74731,7 @@ var swarmmail_release = tool({
       } else if (args.reservation_ids) {
         state.reservations = state.reservations.filter((id) => !args.reservation_ids.includes(id));
       } else if (normalizedPaths) {
-        const releasedIds = currentReservations.filter((r) => normalizedPaths.includes(r.path_pattern)).map((r) => r.id);
+        const releasedIds = currentReservations.filter((r) => normalizedPaths.some((p) => p === r.path_pattern)).map((r) => r.id);
         state.reservations = state.reservations.filter((id) => !releasedIds.includes(id));
       }
       saveSessionState2(sessionID, state);
@@ -74406,8 +74904,8 @@ class JsonExtractionError extends Error {
 }
 function formatZodErrors(error89) {
   return error89.issues.map((issue3) => {
-    const path2 = issue3.path.length > 0 ? `${issue3.path.join(".")}: ` : "";
-    return `${path2}${issue3.message}`;
+    const path4 = issue3.path.length > 0 ? `${issue3.path.join(".")}: ` : "";
+    return `${path4}${issue3.message}`;
   });
 }
 var SCHEMA_REGISTRY = {
@@ -76551,11 +77049,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path2 = {
+var path4 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep2 = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
+var sep2 = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
 minimatch.sep = sep2;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -76701,9 +77199,9 @@ class Minimatch {
     this.debug(this.pattern, this.globParts);
     let set3 = this.globParts.map((s, _, __) => {
       if (this.isWindows && this.windowsNoMagicRoot) {
-        const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]);
+        const isUNC2 = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]);
         const isDrive = /^[a-z]:/i.test(s[0]);
-        if (isUNC) {
+        if (isUNC2) {
           return [...s.slice(0, 4), ...s.slice(4).map((ss) => this.parse(ss))];
         } else if (isDrive) {
           return [s[0], ...s.slice(1).map((ss) => this.parse(ss))];
@@ -77205,10 +77703,10 @@ import { existsSync as existsSync6 } from "node:fs";
 var WORKTREE_DIR = ".swarm/worktrees";
 function getWorktreePath(projectPath, taskId) {
   const safeTaskId = taskId.replace(/[^a-zA-Z0-9.-]/g, "_");
-  return normalizePath(join7(projectPath, WORKTREE_DIR, safeTaskId));
+  return normalize(join7(projectPath, WORKTREE_DIR, safeTaskId));
 }
 function parseTaskIdFromPath(worktreePath) {
-  const normalized = normalizePath(worktreePath);
+  const normalized = normalize(worktreePath);
   const parts = normalized.split("/");
   const worktreesIdx = parts.indexOf("worktrees");
   if (worktreesIdx >= 0 && worktreesIdx < parts.length - 1) {
@@ -77216,18 +77714,18 @@ function parseTaskIdFromPath(worktreePath) {
   }
   return null;
 }
-async function isGitRepo(path3) {
-  const result = await Bun.$`git -C ${path3} rev-parse --git-dir`.quiet().nothrow();
+async function isGitRepo(path5) {
+  const result = await Bun.$`git -C ${path5} rev-parse --git-dir`.quiet().nothrow();
   return result.exitCode === 0;
 }
-async function hasUncommittedChanges(path3) {
-  const result = await Bun.$`git -C ${path3} status --porcelain`.quiet().nothrow();
+async function hasUncommittedChanges(path5) {
+  const result = await Bun.$`git -C ${path5} status --porcelain`.quiet().nothrow();
   if (result.exitCode !== 0)
     return true;
   return result.stdout.toString().trim().length > 0;
 }
-async function getCurrentCommit(path3) {
-  const result = await Bun.$`git -C ${path3} rev-parse HEAD`.quiet().nothrow();
+async function getCurrentCommit(path5) {
+  const result = await Bun.$`git -C ${path5} rev-parse HEAD`.quiet().nothrow();
   if (result.exitCode !== 0)
     return null;
   return result.stdout.toString().trim();
@@ -77240,7 +77738,7 @@ async function getWorktreeCommits(worktreePath, startCommit) {
 `).filter((c) => c.length > 0);
 }
 async function ensureWorktreeDir(projectPath) {
-  const worktreeDir = normalizePath(join7(projectPath, WORKTREE_DIR));
+  const worktreeDir = normalize(join7(projectPath, WORKTREE_DIR));
   await Bun.$`mkdir -p ${worktreeDir}`.quiet().nothrow();
 }
 var swarm_worktree_create = tool({
@@ -77452,12 +77950,12 @@ var swarm_worktree_list = tool({
       const commitMatch = block.match(/^HEAD ([a-f0-9]+)$/m);
       const branchMatch = block.match(/^branch (.+)$/m);
       if (pathMatch && pathMatch[1].includes(worktreeDir)) {
-        const path3 = pathMatch[1];
-        const taskId = parseTaskIdFromPath(path3);
+        const path5 = pathMatch[1];
+        const taskId = parseTaskIdFromPath(path5);
         if (taskId) {
           worktrees.push({
             task_id: taskId,
-            path: path3,
+            path: path5,
             commit: commitMatch ? commitMatch[1] : "unknown",
             branch: branchMatch ? branchMatch[1] : undefined
           });
@@ -81062,11 +81560,6 @@ var TOOL_DEFINITIONS = [
     name: "fetch",
     type: "mcp",
     capabilities: ["http-fetch", "markdown-conversion"]
-  },
-  {
-    name: "pdf-brain",
-    type: "mcp",
-    capabilities: ["knowledge-base-search", "internal-docs"]
   }
 ];
 function stripSemverConstraint(versionStr) {
@@ -82460,28 +82953,28 @@ import {
   makeOllamaLive as makeOllamaLive2
 } from "swarm-mail";
 import * as os2 from "node:os";
-import * as path3 from "node:path";
+import * as path5 from "node:path";
 import { join as join12 } from "node:path";
 var cachedAdapter2 = null;
 var cachedIndexer = null;
 var cachedProjectPath2 = null;
 async function getMemoryAdapter2(projectPath) {
-  const path4 = projectPath || process.cwd();
-  if (cachedAdapter2 && cachedProjectPath2 === path4) {
+  const path6 = projectPath || process.cwd();
+  if (cachedAdapter2 && cachedProjectPath2 === path6) {
     return cachedAdapter2;
   }
-  const swarmMail = await getSwarmMailLibSQL6(path4);
+  const swarmMail = await getSwarmMailLibSQL6(path6);
   const dbAdapter = await swarmMail.getDatabase();
   cachedAdapter2 = await createMemoryAdapter(dbAdapter);
-  cachedProjectPath2 = path4;
+  cachedProjectPath2 = path6;
   return cachedAdapter2;
 }
 async function getSessionIndexer(projectPath) {
-  const path4 = projectPath || process.cwd();
-  if (cachedIndexer && cachedProjectPath2 === path4) {
+  const path6 = projectPath || process.cwd();
+  if (cachedIndexer && cachedProjectPath2 === path6) {
     return cachedIndexer;
   }
-  const swarmMail = await getSwarmMailLibSQL6(path4);
+  const swarmMail = await getSwarmMailLibSQL6(path6);
   const dbAdapter = await swarmMail.getDatabase();
   const db = toSwarmDb2(dbAdapter);
   const ollamaLayer = makeOllamaLive2({
@@ -82489,7 +82982,7 @@ async function getSessionIndexer(projectPath) {
     ollamaModel: process.env.OLLAMA_MODEL || "mxbai-embed-large"
   });
   cachedIndexer = new SessionIndexer(db, ollamaLayer);
-  cachedProjectPath2 = path4;
+  cachedProjectPath2 = path6;
   return cachedIndexer;
 }
 var getHivemindAdapter = getMemoryAdapter2;
@@ -82505,11 +82998,11 @@ async function emitEvent(eventType, data) {
   } catch {}
 }
 var AGENT_DIRECTORIES = [
-  path3.join(os2.homedir(), ".config", "swarm-tools", "sessions"),
-  path3.join(os2.homedir(), ".opencode"),
-  path3.join(os2.homedir(), "Cursor", "User", "History"),
-  path3.join(os2.homedir(), ".local", "share", "Claude"),
-  path3.join(os2.homedir(), ".aider")
+  path5.join(os2.homedir(), ".config", "swarm-tools", "sessions"),
+  path5.join(os2.homedir(), ".opencode"),
+  path5.join(os2.homedir(), "Cursor", "User", "History"),
+  path5.join(os2.homedir(), ".local", "share", "Claude"),
+  path5.join(os2.homedir(), ".aider")
 ];
 var hivemind_store = tool({
   description: "Store a memory (learning, decision, pattern) with semantic embedding. Memories are searchable by semantic similarity and organized into collections. Use collection='default' for manual learnings.",
@@ -84480,13 +84973,13 @@ import {
   getSwarmMailLibSQL as getSwarmMailLibSQL8
 } from "swarm-mail";
 import * as os3 from "node:os";
-import * as path4 from "node:path";
+import * as path6 from "node:path";
 var AGENT_DIRECTORIES2 = [
-  path4.join(os3.homedir(), ".config", "swarm-tools", "sessions"),
-  path4.join(os3.homedir(), ".opencode"),
-  path4.join(os3.homedir(), "Cursor", "User", "History"),
-  path4.join(os3.homedir(), ".local", "share", "Claude"),
-  path4.join(os3.homedir(), ".aider")
+  path6.join(os3.homedir(), ".config", "swarm-tools", "sessions"),
+  path6.join(os3.homedir(), ".opencode"),
+  path6.join(os3.homedir(), "Cursor", "User", "History"),
+  path6.join(os3.homedir(), ".local", "share", "Claude"),
+  path6.join(os3.homedir(), ".aider")
 ];
 async function getSessionIndexer2() {
   const db = await getDb();