threadnote 1.1.3 → 1.1.5

package/dist/mcp_server.cjs

@@ -33081,7 +33081,6 @@ var StreamableHTTPClientTransport = class {
 
 // src/mcp_server.ts
 var import_promises5 = require("node:fs/promises");
-var import_node_os3 = require("node:os");
 var import_node_path5 = require("node:path");
 
 // src/constants.ts
@@ -35724,6 +35723,7 @@ var jsYaml = {
 // src/utils.ts
 var import_node_child_process = require("node:child_process");
 var import_node_crypto = require("node:crypto");
+var import_node_fs = require("node:fs");
 var import_promises = require("node:fs/promises");
 var import_node_os = require("node:os");
 var import_node_path = require("node:path");
@@ -35778,18 +35778,57 @@ function redactText(content) {
   ).replace(/Bearer\s+[A-Za-z0-9._~+/=-]+/gi, "Bearer [REDACTED]").replace(/sk-[A-Za-z0-9_-]{16,}/g, "sk-[REDACTED]").replace(/gh[pousr]_[A-Za-z0-9_]{16,}/g, "gh_[REDACTED]");
 }
 async function requiredOpenVikingCli() {
-  const command2 = await findExecutable(["ov", "openviking"]);
+  const command2 = await findOpenVikingCli();
   if (!command2) {
-    throw new Error("Neither ov nor openviking was found in PATH. Run threadnote install first.");
+    throw new Error(
+      "Neither ov nor openviking was found in PATH, uv tool bin dir, $UV_TOOL_BIN_DIR, or ~/.local/bin. Run threadnote install first."
+    );
   }
   return command2;
 }
 async function openVikingCliForMode(dryRun) {
   if (dryRun) {
-    return await findExecutable(["ov", "openviking"]) ?? "ov";
+    return await findOpenVikingCli() ?? "ov";
   }
   return requiredOpenVikingCli();
 }
+async function findOpenVikingCli() {
+  const override = process.env.THREADNOTE_OV?.trim();
+  if (override) {
+    return override;
+  }
+  const onPath = await findExecutable(["ov", "openviking"]);
+  if (onPath) {
+    return onPath;
+  }
+  for (const candidateDir of await openVikingToolCandidateDirs()) {
+    for (const command2 of ["ov", "openviking"]) {
+      const candidate = (0, import_node_path.join)(candidateDir, command2);
+      if (await isExecutable(candidate)) {
+        return candidate;
+      }
+    }
+  }
+  return void 0;
+}
+async function openVikingToolCandidateDirs() {
+  const dirs = [];
+  const uv = await findExecutable(["uv"]);
+  if (uv) {
+    const result = await runCommand(uv, ["tool", "dir", "--bin"], { allowFailure: true });
+    if (result.exitCode === 0) {
+      const dir = result.stdout.trim();
+      if (dir) {
+        dirs.push(dir);
+      }
+    }
+  }
+  if (process.env.UV_TOOL_BIN_DIR) {
+    dirs.push(process.env.UV_TOOL_BIN_DIR);
+  }
+  dirs.push((0, import_node_path.join)((0, import_node_os.homedir)(), ".local", "bin"));
+  return Array.from(new Set(dirs));
+}
 async function requiredExecutable(command2) {
   const executable = await findExecutable([command2]);
   if (!executable) {
@@ -35946,6 +35985,14 @@ async function exists(path) {
     return false;
   }
 }
+async function isExecutable(path) {
+  try {
+    await (0, import_promises.access)(path, import_node_fs.constants.X_OK);
+    return true;
+  } catch (_err) {
+    return false;
+  }
+}
 async function isFile(path) {
   try {
     return (await (0, import_promises.stat)(path)).isFile();
@@ -40006,23 +40053,12 @@ function withIdentity2(config2, args) {
   return [...args, "--account", config2.account, "--user", config2.user, "--agent-id", config2.agentId];
 }
 async function requiredOpenVikingCli2() {
-  const command2 = process.env.THREADNOTE_OV ?? await findExecutable(["ov", "openviking"]) ?? await firstExistingPath([(0, import_node_path5.join)((0, import_node_os3.homedir)(), ".local", "bin", "ov"), (0, import_node_path5.join)((0, import_node_os3.homedir)(), ".local", "bin", "openviking")]);
+  const command2 = await findOpenVikingCli();
   if (!command2) {
     throw new Error("Neither ov nor openviking was found. Run threadnote install first.");
   }
   return command2;
 }
-async function firstExistingPath(paths) {
-  for (const path of paths) {
-    try {
-      await (0, import_promises5.access)(path);
-      return await (0, import_promises5.realpath)(path);
-    } catch (_err) {
-      continue;
-    }
-  }
-  return void 0;
-}
 main().catch((err) => {
   process.stderr.write(`${errorMessage(err)}
 `);