@docyrus/docyrus 0.0.23 → 0.0.25

package/main.js

@@ -87851,7 +87851,7 @@ var require_snapshot_recorder = __commonJS({
   "../../node_modules/.pnpm/undici@7.22.0/node_modules/undici/lib/mock/snapshot-recorder.js"(exports2, module2) {
     "use strict";
     var { writeFile: writeFile5, readFile: readFile6, mkdir: mkdir5 } = require("node:fs/promises");
-    var { dirname: dirname6, resolve } = require("node:path");
+    var { dirname: dirname7, resolve } = require("node:path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors3();
     var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -88082,7 +88082,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         const resolvedPath = resolve(path3);
-        await mkdir5(dirname6(resolvedPath), { recursive: true });
+        await mkdir5(dirname7(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash3, snapshot]) => ({
           hash: hash3,
           snapshot
@@ -92068,10 +92068,10 @@ var require_headers = __commonJS({
         const lowercaseName = isLowerCase ? name : name.toLowerCase();
         const exists = this.headersMap.get(lowercaseName);
         if (exists) {
-          const delimiter = lowercaseName === "cookie" ? "; " : ", ";
+          const delimiter2 = lowercaseName === "cookie" ? "; " : ", ";
           this.headersMap.set(lowercaseName, {
             name: exists.name,
-            value: `${exists.value}${delimiter}${value}`
+            value: `${exists.value}${delimiter2}${value}`
           });
         } else {
           this.headersMap.set(lowercaseName, { name, value });
@@ -100413,8 +100413,8 @@ function emoji() {
 }
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+var mac = (delimiter2) => {
+  const escapedDelim = escapeRegex(delimiter2 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -112755,7 +112755,7 @@ function isValidUnquotedKey(key) {
 function isIdentifierSegment(key) {
   return /^[A-Z_]\w*$/i.test(key);
 }
-function isSafeUnquoted(value, delimiter = DEFAULT_DELIMITER) {
+function isSafeUnquoted(value, delimiter2 = DEFAULT_DELIMITER) {
   if (!value) return false;
   if (value !== value.trim()) return false;
   if (isBooleanOrNullLiteral(value) || isNumericLike(value)) return false;
@@ -112763,7 +112763,7 @@ function isSafeUnquoted(value, delimiter = DEFAULT_DELIMITER) {
   if (value.includes('"') || value.includes("\\")) return false;
   if (/[[\]{}]/.test(value)) return false;
   if (/[\n\r\t]/.test(value)) return false;
-  if (value.includes(delimiter)) return false;
+  if (value.includes(delimiter2)) return false;
   if (value.startsWith(LIST_ITEM_MARKER)) return false;
   return true;
 }
@@ -112813,33 +112813,33 @@ function collectSingleKeyChain(startKey, startValue, maxDepth) {
 function buildFoldedKey(segments) {
   return segments.join(DOT);
 }
-function encodePrimitive(value, delimiter) {
+function encodePrimitive(value, delimiter2) {
   if (value === null) return NULL_LITERAL;
   if (typeof value === "boolean") return String(value);
   if (typeof value === "number") return String(value);
-  return encodeStringLiteral(value, delimiter);
+  return encodeStringLiteral(value, delimiter2);
 }
-function encodeStringLiteral(value, delimiter = DEFAULT_DELIMITER) {
-  if (isSafeUnquoted(value, delimiter)) return value;
+function encodeStringLiteral(value, delimiter2 = DEFAULT_DELIMITER) {
+  if (isSafeUnquoted(value, delimiter2)) return value;
   return `${DOUBLE_QUOTE}${escapeString(value)}${DOUBLE_QUOTE}`;
 }
 function encodeKey(key) {
   if (isValidUnquotedKey(key)) return key;
   return `${DOUBLE_QUOTE}${escapeString(key)}${DOUBLE_QUOTE}`;
 }
-function encodeAndJoinPrimitives(values, delimiter = DEFAULT_DELIMITER) {
-  return values.map((v) => encodePrimitive(v, delimiter)).join(delimiter);
+function encodeAndJoinPrimitives(values, delimiter2 = DEFAULT_DELIMITER) {
+  return values.map((v) => encodePrimitive(v, delimiter2)).join(delimiter2);
 }
 function formatHeader(length, options2) {
   const key = options2?.key;
   const fields = options2?.fields;
-  const delimiter = options2?.delimiter ?? COMMA;
+  const delimiter2 = options2?.delimiter ?? COMMA;
   let header = "";
   if (key) header += encodeKey(key);
-  header += `[${length}${delimiter !== DEFAULT_DELIMITER ? delimiter : ""}]`;
+  header += `[${length}${delimiter2 !== DEFAULT_DELIMITER ? delimiter2 : ""}]`;
   if (fields) {
     const quotedFields = fields.map((f) => encodeKey(f));
-    header += `{${quotedFields.join(delimiter)}}`;
+    header += `{${quotedFields.join(delimiter2)}}`;
   }
   header += ":";
   return header;
@@ -112932,12 +112932,12 @@ function* encodeArrayOfArraysAsListItemsLines(prefix, values, depth, options2) {
     yield indentedListItem(depth + 1, arrayLine, options2.indent);
   }
 }
-function encodeInlineArrayLine(values, delimiter, prefix) {
+function encodeInlineArrayLine(values, delimiter2, prefix) {
   const header = formatHeader(values.length, {
     key: prefix,
-    delimiter
+    delimiter: delimiter2
   });
-  const joinedValue = encodeAndJoinPrimitives(values, delimiter);
+  const joinedValue = encodeAndJoinPrimitives(values, delimiter2);
   if (values.length === 0) return header;
   return `${header} ${joinedValue}`;
 }
@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.23",
+  version: "0.0.25",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -125757,12 +125757,12 @@ function summarizeFailure(result) {
 }
 function resolveChromeToolsResourceRoot(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const fileExists = options2.existsSyncFn ?? import_node_fs3.existsSync;
   const candidates = options2.candidatePaths ?? [
     (0, import_node_path4.resolve)(cwd, "apps/api-cli/resources/chrome-tools"),
-    (0, import_node_path4.resolve)(dirname6, "../resources/chrome-tools"),
-    (0, import_node_path4.resolve)(dirname6, "resources/chrome-tools"),
+    (0, import_node_path4.resolve)(dirname7, "../resources/chrome-tools"),
+    (0, import_node_path4.resolve)(dirname7, "resources/chrome-tools"),
     (0, import_node_path4.resolve)(cwd, "dist/apps/api-cli/resources/chrome-tools")
   ];
   const resolved = candidates.find((candidate) => fileExists(candidate));
@@ -127935,16 +127935,16 @@ function resolveCliScriptPath() {
 }
 function resolveOpenTuiEntryPath(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const fileExists = options2.existsSyncFn ?? import_node_fs4.existsSync;
   const candidates = [
     // Source/dev mode in monorepo. Prefer this first so Bun resolves deps via
     // apps/api-cli/node_modules in workspace runs (e.g. `pnpm docyrus tui`).
     (0, import_node_path7.resolve)(cwd, "apps/api-cli/src/tui/opentuiMain.tsx"),
-    (0, import_node_path7.resolve)(dirname6, "../tui/opentuiMain.tsx"),
+    (0, import_node_path7.resolve)(dirname7, "../tui/opentuiMain.tsx"),
     // Dist mode (bundled command runtime)
-    (0, import_node_path7.resolve)(dirname6, "tui.mjs"),
-    (0, import_node_path7.resolve)(dirname6, "../tui.mjs"),
+    (0, import_node_path7.resolve)(dirname7, "tui.mjs"),
+    (0, import_node_path7.resolve)(dirname7, "../tui.mjs"),
     (0, import_node_path7.resolve)(cwd, "dist/apps/api-cli/tui.mjs")
   ];
   const resolved = candidates.find((candidate) => fileExists(candidate));
@@ -129238,6 +129238,7 @@ var DOCYRUS_EXTERNAL_SKILL_AGENT_IDS = [
   "windsurf"
 ];
 var DOCYRUS_EXTERNAL_SKILL_MARKER_FILE = ".docyrus-external-skills-installed.json";
+var DOCYRUS_DIFFITY_PACKAGE_SPEC = "diffity@0.5.3";
 function summarizeFailure3(result) {
   const stderr = result.stderr?.toString().trim();
   if (stderr && stderr.length > 0) {
@@ -129253,12 +129254,12 @@ function summarizeFailure3(result) {
 }
 function resolvePackagedPiResourceRoot(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const fileExists = options2.existsSyncFn ?? import_node_fs5.existsSync;
   const candidates = [
     (0, import_node_path10.resolve)(cwd, "apps/api-cli/resources/pi-agent"),
-    (0, import_node_path10.resolve)(dirname6, "../resources/pi-agent"),
-    (0, import_node_path10.resolve)(dirname6, "resources/pi-agent"),
+    (0, import_node_path10.resolve)(dirname7, "../resources/pi-agent"),
+    (0, import_node_path10.resolve)(dirname7, "resources/pi-agent"),
     (0, import_node_path10.resolve)(cwd, "dist/apps/api-cli/resources/pi-agent")
   ];
   const resolved = candidates.find((candidate) => fileExists(candidate));
@@ -129269,7 +129270,7 @@ function resolvePackagedPiResourceRoot(options2 = {}) {
 }
 function resolveDocyrusPiLoaderEntryPath(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const fileExists = options2.existsSyncFn ?? import_node_fs5.existsSync;
   const seen = /* @__PURE__ */ new Set();
   const candidates = options2.candidatePaths ?? [];
@@ -129295,10 +129296,10 @@ function resolveDocyrusPiLoaderEntryPath(options2 = {}) {
     }
   };
   addCandidate((0, import_node_path10.resolve)(cwd, "dist/apps/api-cli/agent-loader.js"));
-  addCandidate((0, import_node_path10.resolve)(dirname6, "../agent-loader.js"));
-  addCandidate((0, import_node_path10.resolve)(dirname6, "agent-loader.js"));
+  addCandidate((0, import_node_path10.resolve)(dirname7, "../agent-loader.js"));
+  addCandidate((0, import_node_path10.resolve)(dirname7, "agent-loader.js"));
   collectAncestorCandidates(cwd);
-  collectAncestorCandidates(dirname6);
+  collectAncestorCandidates(dirname7);
   const resolved = candidates.find((candidate) => fileExists(candidate));
   if (!resolved) {
     throw new UserInputError(`Unable to locate Docyrus pi loader entry file. Checked: ${candidates.join(", ")}`);
@@ -129307,7 +129308,7 @@ function resolveDocyrusPiLoaderEntryPath(options2 = {}) {
 }
 function resolveDocyrusCliEntryPath(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const argv = options2.argv ?? process.argv;
   const fileExists = options2.existsSyncFn ?? import_node_fs5.existsSync;
   const seen = /* @__PURE__ */ new Set();
@@ -129328,8 +129329,8 @@ function resolveDocyrusCliEntryPath(options2 = {}) {
     addCandidate(normalizedArgvScript);
   }
   addCandidate((0, import_node_path10.resolve)(cwd, "dist/apps/api-cli/main.js"));
-  addCandidate((0, import_node_path10.resolve)(dirname6, "../main.js"));
-  addCandidate((0, import_node_path10.resolve)(dirname6, "main.js"));
+  addCandidate((0, import_node_path10.resolve)(dirname7, "../main.js"));
+  addCandidate((0, import_node_path10.resolve)(dirname7, "main.js"));
   if (normalizedArgvScript) {
     addCandidate(normalizedArgvScript);
   }
@@ -129341,7 +129342,7 @@ function resolveDocyrusCliEntryPath(options2 = {}) {
 }
 function resolveInstalledPiPackageRootPath(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
-  const dirname6 = options2.dirname ?? __dirname;
+  const dirname7 = options2.dirname ?? __dirname;
   const fileExists = options2.existsSyncFn ?? import_node_fs5.existsSync;
   const seen = /* @__PURE__ */ new Set();
   const candidates = options2.candidatePaths ?? [];
@@ -129366,8 +129367,9 @@ function resolveInstalledPiPackageRootPath(options2 = {}) {
     }
   };
   addCandidate((0, import_node_path10.resolve)(cwd, "apps/api-cli/node_modules/@mariozechner/pi-coding-agent/package.json"));
+  addCandidate((0, import_node_path10.resolve)(dirname7, "../../../apps/api-cli/node_modules/@mariozechner/pi-coding-agent/package.json"));
   collectAncestorCandidates(cwd);
-  collectAncestorCandidates(dirname6);
+  collectAncestorCandidates(dirname7);
   const resolvedPackageJson = candidates.find((candidate) => fileExists(candidate));
   if (!resolvedPackageJson) {
     throw new UserInputError(`Unable to locate the installed pi package root. Checked: ${candidates.join(", ")}`);
@@ -129456,6 +129458,26 @@ async function writeRuntimeSkill(params) {
 function resolveNpxCommand() {
   return process.platform === "win32" ? "npx.cmd" : "npx";
 }
+function resolveNpmCommand() {
+  return process.platform === "win32" ? "npm.cmd" : "npm";
+}
+function resolveManagedDiffityInstallRoot(agentRootPath) {
+  return (0, import_node_path10.join)(agentRootPath, "tools", "diffity");
+}
+function resolveManagedDiffityExecutablePath(agentRootPath) {
+  return (0, import_node_path10.join)(
+    resolveManagedDiffityInstallRoot(agentRootPath),
+    "node_modules",
+    ".bin",
+    process.platform === "win32" ? "diffity.cmd" : "diffity"
+  );
+}
+function prependPathEntry(entry, existingPath) {
+  const values = existingPath ? existingPath.split(import_node_path10.delimiter).filter((value) => value.trim().length > 0) : [];
+  const normalizedEntry = entry.trim();
+  const remaining = values.filter((value) => value !== normalizedEntry);
+  return [normalizedEntry, ...remaining].join(import_node_path10.delimiter);
+}
 function createDocyrusSkillsInstallArgs(scope) {
   const args = [
     "skills",
@@ -129523,6 +129545,46 @@ async function installExternalDocyrusSkillsOnce(params) {
     mode: 384
   });
 }
+async function ensureManagedDiffityInstalled(params) {
+  const executablePath = resolveManagedDiffityExecutablePath(params.agentRootPath);
+  const binDir = (0, import_node_path10.dirname)(executablePath);
+  if ((0, import_node_fs5.existsSync)(executablePath)) {
+    return {
+      available: true,
+      executablePath,
+      binDir
+    };
+  }
+  const installRoot = resolveManagedDiffityInstallRoot(params.agentRootPath);
+  const result = params.spawnCommand(
+    resolveNpmCommand(),
+    ["install", "--prefix", installRoot, DOCYRUS_DIFFITY_PACKAGE_SPEC],
+    {
+      stdio: ["ignore", "pipe", "pipe"],
+      encoding: "utf8",
+      cwd: params.cwd,
+      env: {
+        ...process.env
+      }
+    }
+  );
+  if (result.error || result.status !== 0) {
+    process.stderr.write(
+      `[docyrus] Automatic diffity install failed. Continuing without it: ${result.error?.message || summarizeFailure3(result)}
+`
+    );
+    return {
+      available: false,
+      executablePath,
+      binDir
+    };
+  }
+  return {
+    available: true,
+    executablePath,
+    binDir
+  };
+}
 function resolvePackagedDocyrusPlatformSkillPath(resourceRoot) {
   return (0, import_node_path10.join)(resourceRoot, "skills", DOCYRUS_PACKAGED_PLATFORM_SKILL_NAME);
 }
@@ -129607,6 +129669,11 @@ function createPiAgentLauncher(options2) {
       scope: options2.settingsPaths.scope,
       spawnCommand
     });
+    const diffity = await ensureManagedDiffityInstalled({
+      agentRootPath,
+      cwd,
+      spawnCommand
+    });
     const loaderEntryPath = resolveLoaderPath({ cwd });
     const cliEntryPath = resolveCliEntryPath({ cwd });
     const piPackageRoot = resolvePiPackageRoot({ cwd });
@@ -129622,7 +129689,8 @@ function createPiAgentLauncher(options2) {
         DOCYRUS_PI_VERSION: options2.version || "dev",
         DOCYRUS_CLI_EXECUTABLE: processExecPath,
         DOCYRUS_CLI_ENTRY: cliEntryPath,
-        DOCYRUS_CLI_SCOPE: options2.settingsPaths.scope
+        DOCYRUS_CLI_SCOPE: options2.settingsPaths.scope,
+        PATH: diffity.available ? prependPathEntry(diffity.binDir, process.env.PATH) : process.env.PATH
       }
     });
     if (result.error) {
@@ -129641,7 +129709,7 @@ var import_node_child_process5 = require("node:child_process");
 var import_node_fs6 = require("node:fs");
 var import_node_path11 = require("node:path");
 var import_node_child_process6 = require("node:child_process");
-function resolveServerLoaderEntryPath(cwd, dirname6) {
+function resolveServerLoaderEntryPath(cwd, dirname7) {
   const seen = /* @__PURE__ */ new Set();
   const candidates = [];
   const addCandidate = (candidate) => {
@@ -129666,10 +129734,10 @@ function resolveServerLoaderEntryPath(cwd, dirname6) {
     }
   };
   addCandidate((0, import_node_path11.resolve)(cwd, "dist/apps/api-cli/server-loader.js"));
-  addCandidate((0, import_node_path11.resolve)(dirname6, "../server-loader.js"));
-  addCandidate((0, import_node_path11.resolve)(dirname6, "server-loader.js"));
+  addCandidate((0, import_node_path11.resolve)(dirname7, "../server-loader.js"));
+  addCandidate((0, import_node_path11.resolve)(dirname7, "server-loader.js"));
   collectAncestorCandidates(cwd);
-  collectAncestorCandidates(dirname6);
+  collectAncestorCandidates(dirname7);
   const resolved = candidates.find((candidate) => (0, import_node_fs6.existsSync)(candidate));
   if (!resolved) {
     throw new UserInputError(`Unable to locate Docyrus pi server loader entry file. Checked: ${candidates.join(", ")}`);