@devicelink/dlink 0.3.0 → 0.3.2

package/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // agent/src/cli/core/engine.ts
-import crypto4 from "node:crypto";
+import crypto5 from "node:crypto";
 
 // agent/src/cli/core/types.ts
 var RuntimeFlags = class {
@@ -48,8 +48,8 @@ var Deferred = class {
     };
     this.rejectFn = () => {
     };
-    this.promise = new Promise((resolve, reject) => {
-      this.resolveFn = resolve;
+    this.promise = new Promise((resolve3, reject) => {
+      this.resolveFn = resolve3;
       this.rejectFn = reject;
     });
   }
@@ -272,8 +272,8 @@ var ConfigurationContext = class {
 };
 
 // agent/src/cli/utils/config.builder.ts
-import path2 from "node:path";
-import os2 from "node:os";
+import path4 from "node:path";
+import os3 from "node:os";
 import fs2 from "node:fs";
 import dotenv from "dotenv";
 import get2 from "lodash/get.js";
@@ -524,8 +524,8 @@ function canonicalizePath(input) {
   out = out.toLowerCase();
   return out;
 }
-function getDirectoryTag(path11, groups = [3, 3, 3, 3]) {
-  const canonical = canonicalizePath(path11);
+function getDirectoryTag(path13, groups = [3, 3, 3, 3]) {
+  const canonical = canonicalizePath(path13);
   const hash = crypto3.createHash("sha256").update(canonical, "utf8").digest("base64url");
   const clean = hash.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
   const needed = groups.reduce((a, b) => a + b, 0);
@@ -533,8 +533,8 @@ function getDirectoryTag(path11, groups = [3, 3, 3, 3]) {
   let i = 0;
   return groups.map((len) => padded.slice(i, i += len)).join("-");
 }
-function pathToUuidLikeSha256(path11) {
-  const canonical = canonicalizePath(path11);
+function pathToUuidLikeSha256(path13) {
+  const canonical = canonicalizePath(path13);
   const hex = crypto3.createHash("sha256").update(canonical, "utf8").digest("hex");
   const h = hex.slice(0, 32);
   const part1 = h.slice(0, 8);
@@ -545,6 +545,118 @@ function pathToUuidLikeSha256(path11) {
   return `${part1}-${part2}-${part3}-${part4}-${part5}`;
 }
 
+// common/src/lib/utils/crypto.utils.ts
+import * as crypto4 from "node:crypto";
+function fingerprintFromPublicKeyPem(publicKeyPem) {
+  const keyObj = crypto4.createPublicKey(publicKeyPem);
+  if (keyObj.asymmetricKeyType !== "ed25519") {
+    throw new Error(`Unexpected key type: ${keyObj.asymmetricKeyType}`);
+  }
+  const spkiDer = keyObj.export({ format: "der", type: "spki" });
+  const hash = crypto4.createHash("sha256").update(spkiDer).digest("base64url");
+  return hash.slice(0, 16).toUpperCase();
+}
+function signConnect(params) {
+  const payload = Buffer.from(`${params.deviceId}|${params.ts}|${params.nonce}`, "utf8");
+  const key = crypto4.createPrivateKey(params.privateKeyPem);
+  const sig = crypto4.sign(null, payload, key);
+  return sig.toString("base64");
+}
+function signRefresh(params) {
+  const hash = crypto4.createHash("sha256").update(params.refreshToken, "utf8").digest("hex");
+  const payload = Buffer.from(`${params.deviceId}|${params.ts}|${params.nonce}|${hash}`, "utf8");
+  const key = crypto4.createPrivateKey(params.privateKeyPem);
+  const sig = crypto4.sign(null, payload, key);
+  return sig.toString("base64");
+}
+
+// common/src/lib/utils/async.utils.ts
+function sleep(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+
+// common/src/lib/utils/path.utils.ts
+import * as path2 from "node:path";
+var isCaseInsensitiveFS = process.platform === "win32";
+function pathDedupeKey(p) {
+  const resolved = path2.resolve(p);
+  return isCaseInsensitiveFS ? resolved.toLowerCase() : resolved;
+}
+
+// common/src/lib/utils/path-display.utils.ts
+import * as path3 from "node:path";
+import * as os2 from "node:os";
+function normalizeSlashes(s) {
+  return s.replace(/\\/g, "/");
+}
+function looksLikeWindowsDrivePath(s) {
+  return /^[A-Za-z]:[\\/]/.test(s) || /^[A-Za-z]:$/.test(s.trim());
+}
+function normalizeWindowsSeparatorsForMatch(s) {
+  if (!looksLikeWindowsDrivePath(s))
+    return s;
+  return s.replace(/\//g, "\\");
+}
+function toTildeHomePath(absolutePath) {
+  if (absolutePath == null)
+    return void 0;
+  const raw = String(absolutePath).trim();
+  if (raw === "")
+    return void 0;
+  if (raw.startsWith("~")) {
+    return normalizeSlashes(raw);
+  }
+  if (!looksLikeWindowsDrivePath(raw)) {
+    try {
+      const abs = path3.resolve(raw);
+      const home = path3.resolve(os2.homedir());
+      const rel = path3.relative(home, abs);
+      if (!rel.startsWith("..") && !path3.isAbsolute(rel)) {
+        if (rel === "")
+          return "~";
+        return "~/" + normalizeSlashes(rel);
+      }
+    } catch {
+    }
+  }
+  const win = normalizeWindowsSeparatorsForMatch(raw);
+  const winUsers = win.match(/^([A-Za-z]:)\\(?:[Uu][Ss][Ee][Rr][Ss])\\([^\\]+)(\\.*)?$/);
+  if (winUsers) {
+    const rest = (winUsers[3] ?? "").replace(/\\/g, "/");
+    return rest ? "~" + rest : "~";
+  }
+  const wsl = raw.match(/^\/mnt\/[a-z]\/(?:[Uu][Ss][Ee][Rr][Ss])\/[^/]+(\/.*)?$/i);
+  if (wsl) {
+    const rest = wsl[1] ?? "";
+    return rest ? "~" + normalizeSlashes(rest) : "~";
+  }
+  const mac = raw.match(/^\/Users\/[^/]+(\/.*)?$/);
+  if (mac) {
+    const rest = mac[1] ?? "";
+    return rest ? "~" + normalizeSlashes(rest) : "~";
+  }
+  const lin = raw.match(/^\/home\/[^/]+(\/.*)?$/);
+  if (lin) {
+    const rest = lin[1] ?? "";
+    return rest ? "~" + normalizeSlashes(rest) : "~";
+  }
+  const fbsd = raw.match(/^\/usr\/home\/[^/]+(\/.*)?$/);
+  if (fbsd) {
+    const rest = fbsd[1] ?? "";
+    return rest ? "~" + normalizeSlashes(rest) : "~";
+  }
+  const exp = raw.match(/^\/export\/home\/[^/]+(\/.*)?$/);
+  if (exp) {
+    const rest = exp[1] ?? "";
+    return rest ? "~" + normalizeSlashes(rest) : "~";
+  }
+  try {
+    return path3.basename(path3.resolve(raw));
+  } catch {
+    return raw.split(/[/\\]/).pop() ?? raw;
+  }
+}
+
 // agent/src/cli/utils/config.builder.ts
 var DEFAULT_CONFIG = {
   version: 1,
@@ -576,9 +688,9 @@ var ConfigLoader = class {
   loadProductionEnv() {
     const candidates = [
       // npm install: .env.production alongside index.js
-      path2.resolve(path2.dirname(process.argv[1] ?? "."), ".env.production"),
+      path4.resolve(path4.dirname(process.argv[1] ?? "."), ".env.production"),
       // monorepo dev: agent/.env.production
-      path2.resolve(process.cwd(), ".env.production")
+      path4.resolve(process.cwd(), ".env.production")
     ];
     for (const candidate of candidates) {
       try {
@@ -626,7 +738,7 @@ var ConfigLoader = class {
   withConfigFile(filename) {
     try {
       const configFolder = this.getApplicationConfigFolder();
-      const configPath = path2.join(configFolder, filename);
+      const configPath = path4.join(configFolder, filename);
       if (fs2.existsSync(configPath)) {
         const raw = fs2.readFileSync(configPath, "utf8");
         const parsed = JSON.parse(raw);
@@ -664,36 +776,49 @@ var ConfigLoader = class {
     return this.argv?.bridgeWsUrl ?? this.safeGetEnvValue("DLINK_BRIDGE_URL") ?? this.safeGetConfigValue("bridgeWsUrl") ?? this.processEnv["DLINK_BRIDGE_URL"] ?? this.productionEnv["DLINK_BRIDGE_URL"] ?? void 0;
   }
   getDirectories() {
+    const collected = [];
+    collected.push(this.createDirectoryFromPath(process.cwd()));
     if (this.argv?.rootPath) {
       try {
-        return this.parseDirectoriesFromString(this.argv.rootPath);
+        collected.push(...this.parseDirectoriesFromString(this.argv.rootPath));
       } catch {
-        return [this.createDirectoryFromPath(this.argv.rootPath)];
+        collected.push(this.createDirectoryFromPath(this.argv.rootPath));
       }
     }
     const envDirs = this.safeGetEnvValue("DLINK_DIRECTORIES") ?? this.safeGetEnvValue("DLINK_ROOTS");
     if (envDirs) {
       try {
-        return this.parseDirectoriesFromString(envDirs);
+        collected.push(...this.parseDirectoriesFromString(envDirs));
       } catch {
       }
     }
     const configDirs = this.safeGetConfigValue("directories") ?? this.safeGetConfigValue("roots");
     if (configDirs) {
       try {
-        return this.parseDirectoriesFromValue(configDirs);
+        collected.push(...this.parseDirectoriesFromValue(configDirs));
       } catch {
       }
     }
     const processDirs = this.processEnv["DLINK_DIRECTORIES"] ?? this.processEnv["DLINK_ROOTS"];
     if (processDirs) {
       try {
-        return this.parseDirectoriesFromString(processDirs);
+        collected.push(...this.parseDirectoriesFromString(processDirs));
       } catch {
       }
     }
-    const cwd = process.cwd();
-    return [this.createDirectoryFromPath(cwd)];
+    return this.deduplicateDirectories(collected);
+  }
+  deduplicateDirectories(dirs) {
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const dir of dirs) {
+      const key = pathDedupeKey(dir.path);
+      if (seen.has(key))
+        continue;
+      seen.add(key);
+      result.push(dir);
+    }
+    return result;
   }
   getDevice() {
     const deviceId = this.getDeviceId();
@@ -703,7 +828,7 @@ var ConfigLoader = class {
     }
     let deviceName = this.getDeviceName();
     if (!deviceName) {
-      deviceName = os2.hostname() || "Unknown Device";
+      deviceName = os3.hostname() || "Unknown Device";
     }
     const deviceTag = this.getDeviceTag();
     const keyBuilder = new KeyBuilder({
@@ -767,7 +892,7 @@ var ConfigLoader = class {
     const processName = this.processEnv["DLINK_DEVICE_NAME"];
     if (processName && !isEmpty2(processName))
       return processName;
-    const hostname = os2.hostname();
+    const hostname = os3.hostname();
     if (hostname && !isEmpty2(hostname))
       return hostname;
     return void 0;
@@ -842,7 +967,7 @@ var ConfigLoader = class {
       const directoryPath = get2(obj, "path");
       const name = defaultTo(
         get2(obj, "name"),
-        directoryPath ? path2.basename(directoryPath) : ""
+        directoryPath ? path4.basename(directoryPath) : ""
       );
       if (!isEmpty2(id) && !isEmpty2(directoryPath)) {
         const tag = getDirectoryTag(directoryPath);
@@ -857,18 +982,18 @@ var ConfigLoader = class {
     return null;
   }
   createDirectoryFromPath(directoryPath) {
-    const normalizedPath = path2.resolve(directoryPath);
+    const normalizedPath = path4.resolve(directoryPath);
     const id = pathToUuidLikeSha256(normalizedPath);
-    const name = path2.basename(normalizedPath);
+    const name = path4.basename(normalizedPath);
     const tag = getDirectoryTag(normalizedPath);
     return { id, name, path: normalizedPath, tag };
   }
   getApplicationConfigFolder() {
     const appData = defaultTo(
       this.processEnv["APPDATA"],
-      path2.join(os2.homedir(), "AppData", "Roaming")
+      path4.join(os3.homedir(), "AppData", "Roaming")
     );
-    return path2.join(appData, "DeviceLink");
+    return path4.join(appData, "DeviceLink");
   }
 };
 
@@ -1131,7 +1256,7 @@ var Engine2 = class {
         await this.loopOnce();
       } catch (err) {
         this.notifier.error(`Engine loop error: ${String(err)}`, { scope: "system" /* System */ });
-        await new Promise((resolve) => setTimeout(resolve, 250));
+        await new Promise((resolve3) => setTimeout(resolve3, 250));
       }
     }
   }
@@ -1414,12 +1539,12 @@ var Engine2 = class {
       this.wakeFn();
   }
   resetWake() {
-    return new Promise((resolve) => {
-      this.wakeFn = resolve;
+    return new Promise((resolve3) => {
+      this.wakeFn = resolve3;
     });
   }
   newId() {
-    return crypto4.randomBytes(8).toString("hex");
+    return crypto5.randomBytes(8).toString("hex");
   }
 };
 function backoffMs(attempt) {
@@ -1462,10 +1587,10 @@ var EventBus = class {
 };
 
 // agent/src/storage/index.ts
-import * as crypto5 from "node:crypto";
+import * as crypto6 from "node:crypto";
 import * as fs3 from "node:fs/promises";
-import * as path3 from "node:path";
-import * as os3 from "node:os";
+import * as path5 from "node:path";
+import * as os4 from "node:os";
 import defaultTo2 from "lodash/defaultTo.js";
 var SALT = "DeviceLink-SecretStorage-v1";
 var IV_LENGTH = 12;
@@ -1475,12 +1600,12 @@ var SECRETS_FILENAME = "secrets.enc.json";
 function getSecretsPath() {
   const appData = defaultTo2(
     process.env["APPDATA"],
-    path3.join(os3.homedir(), "AppData", "Roaming")
+    path5.join(os4.homedir(), "AppData", "Roaming")
   );
-  return path3.join(appData, "DeviceLink", SECRETS_FILENAME);
+  return path5.join(appData, "DeviceLink", SECRETS_FILENAME);
 }
 function deriveKey(machineId) {
-  return crypto5.pbkdf2Sync(
+  return crypto6.pbkdf2Sync(
     machineId,
     SALT,
     1e5,
@@ -1510,7 +1635,7 @@ var EncryptedFileStorage = class {
     this.loaded = true;
   }
   async save() {
-    await fs3.mkdir(path3.dirname(this.secretsPath), { recursive: true });
+    await fs3.mkdir(path5.dirname(this.secretsPath), { recursive: true });
     const plain = JSON.stringify(this.cache);
     const encrypted = this.encrypt(plain);
     const tmp = this.secretsPath + ".tmp";
@@ -1518,8 +1643,8 @@ var EncryptedFileStorage = class {
     await fs3.rename(tmp, this.secretsPath);
   }
   encrypt(plain) {
-    const iv = crypto5.randomBytes(IV_LENGTH);
-    const cipher = crypto5.createCipheriv("aes-256-gcm", this.key, iv, {
+    const iv = crypto6.randomBytes(IV_LENGTH);
+    const cipher = crypto6.createCipheriv("aes-256-gcm", this.key, iv, {
       authTagLength: TAG_LENGTH
     });
     const enc = Buffer.concat([
@@ -1534,7 +1659,7 @@ var EncryptedFileStorage = class {
     const iv = buf.subarray(0, IV_LENGTH);
     const tag = buf.subarray(IV_LENGTH, IV_LENGTH + TAG_LENGTH);
     const enc = buf.subarray(IV_LENGTH + TAG_LENGTH);
-    const decipher = crypto5.createDecipheriv("aes-256-gcm", this.key, iv, {
+    const decipher = crypto6.createDecipheriv("aes-256-gcm", this.key, iv, {
       authTagLength: TAG_LENGTH
     });
     decipher.setAuthTag(tag);
@@ -1655,7 +1780,7 @@ var ConsoleCommandJob = class extends JobType {
   }
   async run(input, ctx) {
     ctx.notifier.info(`Executing console command: ${input.kind}`);
-    await new Promise((resolve) => setTimeout(resolve, 2e3));
+    await new Promise((resolve3) => setTimeout(resolve3, 2e3));
     ctx.notifier.info(`Console command executed: ${input.kind}`);
     ctx.notifier.success(`Console command executed: ${input.kind}`);
     return new ConsoleCommandOutput(true);
@@ -1685,7 +1810,7 @@ var ContactServerJob = class extends JobType {
   }
   async run(input, ctx) {
     ctx.notifier.info(`contact server mode=${input.mode}`, { scope: "system" /* System */ });
-    await new Promise((resolve) => setTimeout(resolve, 200));
+    await new Promise((resolve3) => setTimeout(resolve3, 200));
     return new ContactServerOutput(true);
   }
 };
@@ -1713,7 +1838,7 @@ var SendServerResultJob = class extends JobType {
   }
   async run(input, ctx) {
     ctx.notifier.info(`send result requestId=${input.requestId}`, { scope: "system" /* System */ });
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    await new Promise((resolve3) => setTimeout(resolve3, 10));
     return new SendServerResultOutput(true);
   }
 };
@@ -1732,8 +1857,8 @@ var ApiCall = class {
     return this.handler(this.context, input);
   }
 };
-async function fetchJson(context, path11, init) {
-  const url = `${context.configuration.controlBaseUrl}${path11}`;
+async function fetchJson(context, path13, init) {
+  const url = `${context.configuration.controlBaseUrl}${path13}`;
   const res = await fetch(url, init);
   if (!res.ok) {
     const text = await res.text().catch(() => "");
@@ -1990,36 +2115,6 @@ var Api = class {
   }
 };
 
-// common/src/lib/utils/crypto.utils.ts
-import * as crypto6 from "node:crypto";
-function fingerprintFromPublicKeyPem(publicKeyPem) {
-  const keyObj = crypto6.createPublicKey(publicKeyPem);
-  if (keyObj.asymmetricKeyType !== "ed25519") {
-    throw new Error(`Unexpected key type: ${keyObj.asymmetricKeyType}`);
-  }
-  const spkiDer = keyObj.export({ format: "der", type: "spki" });
-  const hash = crypto6.createHash("sha256").update(spkiDer).digest("base64url");
-  return hash.slice(0, 16).toUpperCase();
-}
-function signConnect(params) {
-  const payload = Buffer.from(`${params.deviceId}|${params.ts}|${params.nonce}`, "utf8");
-  const key = crypto6.createPrivateKey(params.privateKeyPem);
-  const sig = crypto6.sign(null, payload, key);
-  return sig.toString("base64");
-}
-function signRefresh(params) {
-  const hash = crypto6.createHash("sha256").update(params.refreshToken, "utf8").digest("hex");
-  const payload = Buffer.from(`${params.deviceId}|${params.ts}|${params.nonce}|${hash}`, "utf8");
-  const key = crypto6.createPrivateKey(params.privateKeyPem);
-  const sig = crypto6.sign(null, payload, key);
-  return sig.toString("base64");
-}
-
-// common/src/lib/utils/async.utils.ts
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // agent/src/cli/jobs/refreshTokens.ts
 function isWrappedOk(x) {
   if (typeof x !== "object" || x === null)
@@ -3578,7 +3673,7 @@ var RecoverableSocket = class {
   }
   async connectWebSocketOnce() {
     const myConnId = ++this.connId;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve3, reject) => {
       if (this.stopped) {
         reject(new Error("Socket is stopped"));
         return;
@@ -3596,7 +3691,7 @@ var RecoverableSocket = class {
           return;
         settled = true;
         cleanup();
-        resolve();
+        resolve3();
       };
       const settleReject = (error, ws2) => {
         if (settled)
@@ -4017,8 +4112,8 @@ var WebSocketOrchestrator = class {
 
 // agent/src/cli/utils/configuration.writer.ts
 import fs4 from "node:fs";
-import path4 from "node:path";
-import os4 from "node:os";
+import path6 from "node:path";
+import os5 from "node:os";
 import defaultTo3 from "lodash/defaultTo.js";
 var ConfigurationWriter = class {
   /**
@@ -4027,7 +4122,7 @@ var ConfigurationWriter = class {
    */
   static save(config) {
     const configDir = this.getApplicationConfigFolder();
-    const configPath = path4.join(configDir, "config.json");
+    const configPath = path6.join(configDir, "config.json");
     const safe = this.stripSecrets(config);
     fs4.mkdirSync(configDir, { recursive: true });
     fs4.writeFileSync(configPath, JSON.stringify(safe, null, 2), "utf8");
@@ -4054,9 +4149,9 @@ var ConfigurationWriter = class {
   static getApplicationConfigFolder() {
     const appData = defaultTo3(
       process.env["APPDATA"],
-      path4.join(os4.homedir(), "AppData", "Roaming")
+      path6.join(os5.homedir(), "AppData", "Roaming")
     );
-    return path4.join(appData, "DeviceLink");
+    return path6.join(appData, "DeviceLink");
   }
 };
 
@@ -5526,7 +5621,7 @@ var AuthOrchestrator = class {
 
 // agent/src/cli/orchestrators/tools/executers/fs-list.ts
 import fs7 from "node:fs/promises";
-import path7 from "node:path";
+import path9 from "node:path";
 
 // agent/src/cli/orchestrators/tools/executers/base-executer.ts
 var BaseExecuter = class {
@@ -5562,7 +5657,7 @@ var BaseExecuter = class {
 };
 
 // agent/src/cli/orchestrators/tools/util/ignore.ts
-import path5 from "node:path";
+import path7 from "node:path";
 import fs5 from "node:fs";
 function matchesDefaultDenylist(relPath) {
   const normalized = relPath.replace(/\\/g, "/");
@@ -5613,7 +5708,7 @@ function loadIgnoreRules(cfg, directory_id, workspace_id) {
     return DEFAULT_IGNORE_PATTERNS;
   }
   const rules = [];
-  const ignoreFilePath = path5.join(directory.path, ".devicelinkignore");
+  const ignoreFilePath = path7.join(directory.path, ".devicelinkignore");
   if (fs5.existsSync(ignoreFilePath)) {
     try {
       const content = fs5.readFileSync(ignoreFilePath, "utf-8");
@@ -5661,7 +5756,7 @@ function shouldIgnore(relPath, isDir, ctx, cfg) {
   }
   return { shouldIgnore: false };
 }
-function matchesGlob(path11, pattern, isDir) {
+function matchesGlob(path13, pattern, isDir) {
   let regexStr = "^";
   let i = 0;
   while (i < pattern.length) {
@@ -5688,15 +5783,15 @@ function matchesGlob(path11, pattern, isDir) {
   regexStr += "$";
   try {
     const regex = new RegExp(regexStr, "i");
-    return regex.test(path11);
+    return regex.test(path13);
   } catch {
-    return path11.toLowerCase().includes(pattern.toLowerCase());
+    return path13.toLowerCase().includes(pattern.toLowerCase());
   }
 }
 
 // agent/src/cli/orchestrators/tools/util/_util.ts
 import fs6 from "node:fs/promises";
-import path6 from "node:path";
+import path8 from "node:path";
 function normalizeRelPath(input) {
   const raw = (input ?? "").trim();
   if (!raw)
@@ -5715,7 +5810,7 @@ function normalizeRelPath(input) {
     });
   }
   const posixish = raw.replace(/\\/g, "/");
-  const norm = path6.posix.normalize(posixish);
+  const norm = path8.posix.normalize(posixish);
   if (norm === ".." || norm.startsWith("../")) {
     throw toolErr("PATH_ESCAPE", "Path escapes the root.", {
       hint: 'Paths cannot use ".." to escape the configured root directory. Use paths relative to the root, like "src/file.ts" or "subdir/file.ts".'
@@ -5730,19 +5825,19 @@ function normalizeRelPath(input) {
 }
 async function resolveInRoot(rootPath, inputRel) {
   const rel = normalizeRelPath(inputRel);
-  const absRoot = path6.resolve(rootPath);
+  const absRoot = path8.resolve(rootPath);
   const realRoot = await fs6.realpath(absRoot);
-  const candidate = path6.resolve(realRoot, rel === "." ? "" : rel);
-  const relToRoot = path6.relative(realRoot, candidate);
-  if (relToRoot.startsWith("..") || path6.isAbsolute(relToRoot)) {
+  const candidate = path8.resolve(realRoot, rel === "." ? "" : rel);
+  const relToRoot = path8.relative(realRoot, candidate);
+  if (relToRoot.startsWith("..") || path8.isAbsolute(relToRoot)) {
     throw toolErr("PATH_ESCAPE", "Path escapes the root.", {
       hint: "The resolved path escapes the configured root directory. Ensure the path stays within the root boundaries."
     });
   }
   try {
     const realCandidate = await fs6.realpath(candidate);
-    const rel2 = path6.relative(realRoot, realCandidate);
-    if (rel2.startsWith("..") || path6.isAbsolute(rel2)) {
+    const rel2 = path8.relative(realRoot, realCandidate);
+    if (rel2.startsWith("..") || path8.isAbsolute(rel2)) {
       throw toolErr("PATH_ESCAPE", "Symlink/junction escape detected.", {
         hint: "A symlink or junction in the path resolves outside the configured root directory. Ensure all symlinks stay within the root boundaries."
       });
@@ -5755,16 +5850,16 @@ async function resolveInRoot(rootPath, inputRel) {
     for (let i = parts.length; i > 0; i--) {
       const parentRel = parts.slice(0, i).join("/");
       const restRel = parts.slice(i).join("/");
-      const parentCandidate = path6.resolve(realRoot, parentRel);
+      const parentCandidate = path8.resolve(realRoot, parentRel);
       try {
         const realParent = await fs6.realpath(parentCandidate);
-        const relParent = path6.relative(realRoot, realParent);
-        if (relParent.startsWith("..") || path6.isAbsolute(relParent)) {
+        const relParent = path8.relative(realRoot, realParent);
+        if (relParent.startsWith("..") || path8.isAbsolute(relParent)) {
           throw toolErr("PATH_ESCAPE", "Symlink/junction escape detected.", {
             hint: "A symlink or junction in the path resolves outside the configured root directory. Ensure all symlinks stay within the root boundaries."
           });
         }
-        return { absTarget: restRel ? path6.join(realParent, restRel) : realParent, rel };
+        return { absTarget: restRel ? path8.join(realParent, restRel) : realParent, rel };
       } catch (err) {
         if (err?.code === "ENOENT")
           continue;
@@ -5946,8 +6041,8 @@ var FsListExecuter = class extends BaseExecuter {
       directory_path: directory.path
     };
     for (const d of visibleDirents) {
-      const full = path7.join(absTarget, d.name);
-      const rawRelPath = rel === "." ? d.name : path7.posix.join(rel, d.name);
+      const full = path9.join(absTarget, d.name);
+      const rawRelPath = rel === "." ? d.name : path9.posix.join(rel, d.name);
       const entryRelPath = rawRelPath.replace(/\\/g, "/");
       let type = "other";
       if (d.isDirectory())
@@ -5985,7 +6080,7 @@ var FsListExecuter = class extends BaseExecuter {
         } catch {
         }
       }
-      const ext = type === "file" ? path7.extname(d.name).slice(1) : void 0;
+      const ext = type === "file" ? path9.extname(d.name).slice(1) : void 0;
       if (ext && (detail === "stat" || detail === "digest")) {
         extCounts.set(ext, (extCounts.get(ext) ?? 0) + 1);
       }
@@ -6197,11 +6292,11 @@ var FsInfoExecuter = class extends BaseExecuter {
 
 // agent/src/cli/orchestrators/tools/executers/fs-tree.ts
 import fs11 from "node:fs/promises";
-import path9 from "node:path";
+import path11 from "node:path";
 
 // agent/src/cli/orchestrators/tools/executers/fs-grep.ts
 import fs10 from "node:fs/promises";
-import path8 from "node:path";
+import path10 from "node:path";
 function matchesFileGlob(relPath, fileGlob) {
   let regexStr = "^";
   let i = 0;
@@ -6297,8 +6392,8 @@ async function grepDirectory(absPath, relPath, rootPath, query, mode, fileGlob,
   for (const entry of entries) {
     if (filesScanned.value >= maxFiles || matches.length >= maxMatches)
       break;
-    const entryAbsPath = path8.join(absPath, entry.name);
-    const entryRelPath = relPath === "." ? entry.name : path8.posix.join(relPath, entry.name);
+    const entryAbsPath = path10.join(absPath, entry.name);
+    const entryRelPath = relPath === "." ? entry.name : path10.posix.join(relPath, entry.name);
     const ignoreResult = shouldIgnore(entryRelPath, entry.isDirectory(), ignoreCtx, cfg);
     if (ignoreResult.shouldIgnore) {
       ignoredCount.value++;
@@ -6591,10 +6686,10 @@ async function buildTree(absPath, relPath, depth, maxDepth, only, includeHidden,
     const errorMessage = toolError2?.message ?? e?.message ?? String(e) ?? "Unknown error";
     summary.total_entries++;
     const node2 = {
-      name: path9.basename(relPath) || relPath,
+      name: path11.basename(relPath) || relPath,
       type: "other",
       path: entryRel,
-      hidden: path9.basename(relPath)?.startsWith("."),
+      hidden: path11.basename(relPath)?.startsWith("."),
       ignored: false
     };
     if (errorMap) {
@@ -6628,10 +6723,10 @@ async function buildTree(absPath, relPath, depth, maxDepth, only, includeHidden,
     summary.dirs++;
   else if (type === "symlink")
     summary.symlinks++;
-  const isHidden = path9.basename(relPath)?.startsWith(".");
+  const isHidden = path11.basename(relPath)?.startsWith(".");
   if (isHidden)
     summary.hidden++;
-  const ext = type === "file" ? path9.extname(path9.basename(relPath) || relPath).slice(1) : void 0;
+  const ext = type === "file" ? path11.extname(path11.basename(relPath) || relPath).slice(1) : void 0;
   if (ext && (detail === "stat" || detail === "digest")) {
     extCounts.set(ext, (extCounts.get(ext) ?? 0) + 1);
   }
@@ -6639,7 +6734,7 @@ async function buildTree(absPath, relPath, depth, maxDepth, only, includeHidden,
     summary.total_file_bytes = (summary.total_file_bytes ?? 0) + (stat.size ?? 0);
   }
   const node = {
-    name: path9.basename(relPath) || relPath,
+    name: path11.basename(relPath) || relPath,
     type,
     path: entryRel,
     size: (detail === "stat" || detail === "digest") && stat.isFile() ? stat.size : void 0,
@@ -6686,8 +6781,8 @@ async function buildTree(absPath, relPath, depth, maxDepth, only, includeHidden,
     for (const entry of filtered) {
       if (currentCount.value >= maxEntries)
         break;
-      const childAbs = path9.join(absPath, entry.name);
-      const childRelPath = relPath === "." ? entry.name : path9.posix.join(relPath, entry.name);
+      const childAbs = path11.join(absPath, entry.name);
+      const childRelPath = relPath === "." ? entry.name : path11.posix.join(relPath, entry.name);
       const childRel = childRelPath.replace(/\\/g, "/");
       const preIgnore = shouldIgnore(childRel, entry.isDirectory(), ignoreCtx, cfg);
       if (preIgnore.shouldIgnore) {
@@ -6728,10 +6823,10 @@ async function buildTree(absPath, relPath, depth, maxDepth, only, includeHidden,
         }
         summary.total_entries++;
         const errorNode = {
-          name: path9.basename(childRelPath) || childRelPath,
+          name: path11.basename(childRelPath) || childRelPath,
           type: "other",
           path: childRel,
-          hidden: path9.basename(childRelPath)?.startsWith("."),
+          hidden: path11.basename(childRelPath)?.startsWith("."),
           ignored: false
         };
         if (only === "files" || only === "dirs") {
@@ -6918,7 +7013,7 @@ var FsTreeExecuter = class extends BaseExecuter {
 
 // agent/src/cli/orchestrators/tools/executers/fs-search.ts
 import fs12 from "node:fs/promises";
-import path10 from "node:path";
+import path12 from "node:path";
 function matchesGlob2(name, pattern) {
   let regexStr = "^";
   let i = 0;
@@ -7040,8 +7135,8 @@ async function searchDirectory(absPath, relPath, rootPath, query, mode, recursiv
   for (const entry of visibleEntries) {
     if (results.length >= maxResults)
       break;
-    const entryAbsPath = path10.join(absPath, entry.name);
-    const entryRelPath = relPath === "." ? entry.name : path10.posix.join(relPath, entry.name);
+    const entryAbsPath = path12.join(absPath, entry.name);
+    const entryRelPath = relPath === "." ? entry.name : path12.posix.join(relPath, entry.name);
     const ignoreResult = shouldIgnore(entryRelPath, entry.isDirectory(), ignoreCtx, cfg);
     if (ignoreResult.shouldIgnore) {
       ignoredCount.value++;
@@ -7091,7 +7186,7 @@ async function searchDirectory(absPath, relPath, rootPath, query, mode, recursiv
         } catch {
         }
       }
-      const ext = type === "file" ? path10.extname(entry.name).slice(1) : void 0;
+      const ext = type === "file" ? path12.extname(entry.name).slice(1) : void 0;
       const score = calculateScore({ name: entry.name, path: entryRelPath }, preferPaths, avoidPaths);
       results.push({
         name: entry.name,
@@ -7159,8 +7254,8 @@ var FsSearchExecuter = class extends BaseExecuter {
         const st = await fs12.stat(absTarget);
         if (!st.isDirectory()) {
           if (st.isFile()) {
-            searchPath = path10.dirname(absTarget);
-            const parentRelPath = path10.posix.dirname(rel);
+            searchPath = path12.dirname(absTarget);
+            const parentRelPath = path12.posix.dirname(rel);
             searchRelPath = parentRelPath === "." ? "." : parentRelPath;
             messages.push({
               type: "warning",
@@ -7455,7 +7550,7 @@ var FsListResult = class extends BaseToolResult {
     const itemCount = items?.length ?? 0;
     const totalCount = meta?.count ?? 0;
     const ignoredCount = filtered?.ignored_count ?? 0;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const parts = [];
     if (itemCount > 0) {
       parts.push(`${itemCount} item${itemCount !== 1 ? "s" : ""}`);
@@ -7467,7 +7562,7 @@ var FsListResult = class extends BaseToolResult {
       parts.push("has_more");
     }
     const description = parts.length > 0 ? parts.join(", ") : "empty";
-    return `path=${path11}, ${description}`;
+    return `path=${path13}, ${description}`;
   }
 };
 
@@ -7490,10 +7585,10 @@ var FsReadResult = class extends BaseToolResult {
       return "no result";
     }
     const { bytes_read, eof, context } = this.output;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const size = bytes_read ?? 0;
     const truncated = !eof;
-    const parts = [`path=${path11}`, `${size} bytes`];
+    const parts = [`path=${path13}`, `${size} bytes`];
     if (truncated) {
       parts.push("truncated");
     }
@@ -7520,9 +7615,9 @@ var FsInfoResult = class extends BaseToolResult {
       return "no result";
     }
     const { type, size, context } = this.output;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const sizeStr = size !== void 0 ? `${size} bytes` : "no size";
-    return `path=${path11}, type=${type}, ${sizeStr}`;
+    return `path=${path13}, type=${type}, ${sizeStr}`;
   }
 };
 
@@ -7545,9 +7640,9 @@ var FsTreeResult = class extends BaseToolResult {
       return "no result";
     }
     const { tree, filtered, summary, context } = this.output;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const ignoredCount = filtered?.ignored_count ?? 0;
-    const parts = [`path=${path11}`];
+    const parts = [`path=${path13}`];
     if (summary) {
       const { total_entries, files, dirs } = summary;
       if (total_entries !== void 0) {
@@ -7601,10 +7696,10 @@ var FsSearchResult = class extends BaseToolResult {
       return "no result";
     }
     const { results, meta, filtered, context } = this.output;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const resultCount = results?.length ?? 0;
     const ignoredCount = filtered?.ignored_count ?? 0;
-    const parts = [`path=${path11}`, `${resultCount} result${resultCount !== 1 ? "s" : ""}`];
+    const parts = [`path=${path13}`, `${resultCount} result${resultCount !== 1 ? "s" : ""}`];
     if (ignoredCount > 0) {
       parts.push(`${ignoredCount} ignored`);
     }
@@ -7634,12 +7729,12 @@ var FsGrepResult = class extends BaseToolResult {
       return "no result";
     }
     const { matches, meta, filtered, context } = this.output;
-    const path11 = context?.path ?? "unknown";
+    const path13 = context?.path ?? "unknown";
     const matchCount = matches?.length ?? 0;
     const filesScanned = meta?.files_scanned ?? 0;
     const ignoredCount = filtered?.ignored_count ?? 0;
     const parts = [
-      `path=${path11}`,
+      `path=${path13}`,
       `${matchCount} match${matchCount !== 1 ? "es" : ""}`,
       `${filesScanned} file${filesScanned !== 1 ? "s" : ""} scanned`
     ];
@@ -8004,7 +8099,7 @@ var DirectoriesJob = class extends JobType {
       return {
         id: r.id,
         name: r.name,
-        path: r.path,
+        path: toTildeHomePath(r.path) ?? r.name,
         path_hint: r.tag || void 0
       };
     });