@docyrus/docyrus 0.0.17 → 0.0.19

package/main.js

@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.17",
+  version: "0.0.19",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -124686,12 +124686,15 @@ var package_default = {
     docyrus: "main.js"
   },
   dependencies: {
-    "@mariozechner/pi-coding-agent": "0.58.4",
+    "@clack/prompts": "^0.11.0",
+    "@mariozechner/pi-ai": "0.60.0",
+    "@mariozechner/pi-coding-agent": "0.60.0",
     "@opentui/core": "^0.1.85",
     "@opentui/react": "^0.1.85",
     incur: "^0.1.6",
     marked: "^15.0.12",
     "marked-terminal": "^7.3.0",
+    picocolors: "^1.1.1",
     react: "^19.1.1",
     undici: "^7.16.0"
   },
@@ -128921,12 +128924,12 @@ function summarizeFailure2(result) {
     return stderr;
   }
   if (typeof result.status === "number") {
-    return `pi process exited with code ${result.status}.`;
+    return `Docyrus pi loader exited with code ${result.status}.`;
   }
   if (result.signal) {
-    return `pi process exited due to signal ${result.signal}.`;
+    return `Docyrus pi loader exited due to signal ${result.signal}.`;
   }
-  return "pi process terminated unexpectedly.";
+  return "Docyrus pi loader terminated unexpectedly.";
 }
 function resolvePackagedPiResourceRoot(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
@@ -128940,17 +128943,14 @@ function resolvePackagedPiResourceRoot(options2 = {}) {
   ];
   const resolved = candidates.find((candidate) => fileExists(candidate));
   if (!resolved) {
-    throw new UserInputError(
-      `Unable to locate pi agent resources. Checked: ${candidates.join(", ")}`
-    );
+    throw new UserInputError(`Unable to locate pi agent resources. Checked: ${candidates.join(", ")}`);
   }
   return resolved;
 }
-function resolveInstalledPiCliEntryPath(options2 = {}) {
-  const fileExists = options2.existsSyncFn ?? import_node_fs4.existsSync;
+function resolveDocyrusPiLoaderEntryPath(options2 = {}) {
   const cwd = options2.cwd ?? process.cwd();
   const dirname6 = options2.dirname ?? __dirname;
-  const packageSegments = ["@mariozechner", "pi-coding-agent", "dist", "cli.js"];
+  const fileExists = options2.existsSyncFn ?? import_node_fs4.existsSync;
   const seen = /* @__PURE__ */ new Set();
   const candidates = options2.candidatePaths ?? [];
   const addCandidate = (candidate) => {
@@ -128962,9 +128962,10 @@ function resolveInstalledPiCliEntryPath(options2 = {}) {
   const collectAncestorCandidates = (startDir) => {
     let currentDir = (0, import_node_path9.resolve)(startDir);
     while (true) {
-      addCandidate((0, import_node_path9.join)(currentDir, "node_modules", ...packageSegments));
-      if ((0, import_node_path9.basename)(currentDir) === "node_modules") {
-        addCandidate((0, import_node_path9.join)(currentDir, ...packageSegments));
+      addCandidate((0, import_node_path9.join)(currentDir, "dist", "apps", "api-cli", "agent-loader.js"));
+      addCandidate((0, import_node_path9.join)(currentDir, "agent-loader.js"));
+      if ((0, import_node_path9.basename)(currentDir) === "dist") {
+        addCandidate((0, import_node_path9.join)(currentDir, "apps", "api-cli", "agent-loader.js"));
       }
       const parentDir = (0, import_node_path9.resolve)(currentDir, "..");
       if (parentDir === currentDir) {
@@ -128973,78 +128974,51 @@ function resolveInstalledPiCliEntryPath(options2 = {}) {
       currentDir = parentDir;
     }
   };
-  addCandidate((0, import_node_path9.resolve)(cwd, "apps/api-cli/node_modules", ...packageSegments));
+  addCandidate((0, import_node_path9.resolve)(cwd, "dist/apps/api-cli/agent-loader.js"));
+  addCandidate((0, import_node_path9.resolve)(dirname6, "../agent-loader.js"));
+  addCandidate((0, import_node_path9.resolve)(dirname6, "agent-loader.js"));
   collectAncestorCandidates(cwd);
   collectAncestorCandidates(dirname6);
-  const cliEntryPath = candidates.find((candidate) => fileExists(candidate));
-  if (!cliEntryPath) {
-    throw new UserInputError(`Unable to locate pi CLI entry file. Checked: ${candidates.join(", ")}`);
+  const resolved = candidates.find((candidate) => fileExists(candidate));
+  if (!resolved) {
+    throw new UserInputError(`Unable to locate Docyrus pi loader entry file. Checked: ${candidates.join(", ")}`);
   }
-  return cliEntryPath;
+  return resolved;
 }
-function normalizePiPromptPath(resourceRoot, profile) {
-  if (profile === "agent") {
-    return {
-      tools: ["read", "bash", "grep", "find", "ls"],
-      promptPath: (0, import_node_path9.join)(resourceRoot, "prompts", "agent-system.md"),
-      promptFlag: "--system-prompt"
-    };
-  }
-  return {
-    tools: ["read", "bash", "edit", "write", "grep", "find", "ls"],
-    promptPath: (0, import_node_path9.join)(resourceRoot, "prompts", "coder-append-system.md"),
-    promptFlag: "--append-system-prompt"
+function resolveInstalledPiPackageRootPath(options2 = {}) {
+  const cwd = options2.cwd ?? process.cwd();
+  const dirname6 = options2.dirname ?? __dirname;
+  const fileExists = options2.existsSyncFn ?? import_node_fs4.existsSync;
+  const seen = /* @__PURE__ */ new Set();
+  const candidates = options2.candidatePaths ?? [];
+  const addCandidate = (candidate) => {
+    if (!seen.has(candidate)) {
+      seen.add(candidate);
+      candidates.push(candidate);
+    }
   };
-}
-function toPiMode(mode) {
-  return mode;
-}
-function buildPiAgentCliArgs(params) {
-  const profile = normalizePiPromptPath(params.resourceRoot, params.request.profile);
-  const args = [
-    "--tools",
-    profile.tools.join(","),
-    profile.promptFlag,
-    profile.promptPath
-  ];
-  if (params.request.print) {
-    args.push("--print");
-  }
-  const mode = toPiMode(params.request.mode);
-  if (mode) {
-    args.push("--mode", mode);
-  }
-  if (params.request.continue) {
-    args.push("--continue");
-  }
-  if (params.request.resume) {
-    args.push("--resume");
-  }
-  if (params.request.provider) {
-    args.push("--provider", params.request.provider);
-  }
-  if (params.request.model) {
-    args.push("--model", params.request.model);
-  }
-  if (params.request.thinking) {
-    args.push("--thinking", params.request.thinking);
-  }
-  if (params.request.session) {
-    args.push("--session", params.request.session);
-  }
-  if (params.request.sessionDir) {
-    args.push("--session-dir", params.request.sessionDir);
-  }
-  if (params.request.apiKey) {
-    args.push("--api-key", params.request.apiKey);
-  }
-  if (params.request.verbose) {
-    args.push("--verbose");
-  }
-  if (params.request.prompt) {
-    args.push(params.request.prompt);
+  const collectAncestorCandidates = (startDir) => {
+    let currentDir = (0, import_node_path9.resolve)(startDir);
+    while (true) {
+      addCandidate((0, import_node_path9.join)(currentDir, "node_modules", "@mariozechner", "pi-coding-agent", "package.json"));
+      if ((0, import_node_path9.basename)(currentDir) === "node_modules") {
+        addCandidate((0, import_node_path9.join)(currentDir, "@mariozechner", "pi-coding-agent", "package.json"));
+      }
+      const parentDir = (0, import_node_path9.resolve)(currentDir, "..");
+      if (parentDir === currentDir) {
+        break;
+      }
+      currentDir = parentDir;
+    }
+  };
+  addCandidate((0, import_node_path9.resolve)(cwd, "apps/api-cli/node_modules/@mariozechner/pi-coding-agent/package.json"));
+  collectAncestorCandidates(cwd);
+  collectAncestorCandidates(dirname6);
+  const resolvedPackageJson = candidates.find((candidate) => fileExists(candidate));
+  if (!resolvedPackageJson) {
+    throw new UserInputError(`Unable to locate the installed pi package root. Checked: ${candidates.join(", ")}`);
   }
-  return args;
+  return (0, import_node_path9.resolve)(resolvedPackageJson, "..");
 }
 function createPiAgentRuntimeSkill(params) {
   const commandPrefix = params.scope === "global" ? "docyrus -g" : "docyrus";
@@ -129054,7 +129028,7 @@ function createPiAgentRuntimeSkill(params) {
     `- userId: \`${params.activeProfile.userId}\``,
     `- tenantId: \`${params.activeProfile.tenantId}\``
   ] : [
-    `- No active Docyrus auth session is available.`,
+    "- No active Docyrus auth session is available.",
     `- Authenticate first with \`${commandPrefix} auth login\` before making Docyrus API calls.`
   ];
   return [
@@ -129101,14 +129075,10 @@ async function syncPackagedSkills(params) {
     withFileTypes: true
   });
   await Promise.all(entries.map(async (entry) => {
-    await (0, import_promises7.cp)(
-      (0, import_node_path9.join)(sourceSkillsRoot, entry.name),
-      (0, import_node_path9.join)(targetSkillsRoot, entry.name),
-      {
-        recursive: true,
-        force: true
-      }
-    );
+    await (0, import_promises7.cp)((0, import_node_path9.join)(sourceSkillsRoot, entry.name), (0, import_node_path9.join)(targetSkillsRoot, entry.name), {
+      recursive: true,
+      force: true
+    });
   }));
 }
 async function writeRuntimeSkill(params) {
@@ -129137,7 +129107,8 @@ function createPiAgentLauncher(options2) {
   const spawnCommand = options2.spawnSyncFn ?? import_node_child_process3.spawnSync;
   const processExecPath = options2.processExecPath ?? process.execPath;
   const resolveResourceRoot = options2.resolvePackagedPiResourceRootFn ?? resolvePackagedPiResourceRoot;
-  const resolvePiCliEntry = options2.resolveInstalledPiCliEntryPathFn ?? resolveInstalledPiCliEntryPath;
+  const resolveLoaderPath = options2.resolveDocyrusPiLoaderEntryPathFn ?? resolveDocyrusPiLoaderEntryPath;
+  const resolvePiPackageRoot = options2.resolveInstalledPiPackageRootPathFn ?? resolveInstalledPiPackageRootPath;
   return async (request) => {
     validatePiAgentLaunchRequest({
       request,
@@ -129147,9 +129118,7 @@ function createPiAgentLauncher(options2) {
     const activeProfile = await options2.authStore.getActiveProfile(activeEnvironment.apiBaseUrl);
     const settingsRootPath = options2.settingsPaths.rootPath;
     const agentRootPath = resolveDocyrusPiAgentRootPath(settingsRootPath);
-    const resourceRoot = resolveResourceRoot({
-      cwd
-    });
+    const resourceRoot = resolveResourceRoot({ cwd });
     await syncPackagedSkills({
       resourceRoot,
       agentRootPath
@@ -129164,31 +129133,27 @@ function createPiAgentLauncher(options2) {
         settingsRootPath
       })
     });
-    const piCliEntryPath = resolvePiCliEntry();
-    const args = buildPiAgentCliArgs({
-      request,
-      resourceRoot
-    });
-    const promptProfile = normalizePiPromptPath(resourceRoot, request.profile);
-    if (!(0, import_node_fs4.existsSync)(promptProfile.promptPath)) {
-      throw new UserInputError(`Unable to locate pi prompt asset at ${promptProfile.promptPath}.`);
-    }
-    const result = spawnCommand(processExecPath, [piCliEntryPath, ...args], {
-      stdio: ["inherit", "inherit", "pipe"],
+    const loaderEntryPath = resolveLoaderPath({ cwd });
+    const piPackageRoot = resolvePiPackageRoot({ cwd });
+    const result = spawnCommand(processExecPath, [loaderEntryPath], {
+      stdio: ["inherit", "inherit", "inherit"],
       encoding: "utf8",
       cwd,
       env: {
         ...process.env,
-        PI_CODING_AGENT_DIR: agentRootPath
+        PI_CODING_AGENT_DIR: agentRootPath,
+        PI_PACKAGE_DIR: piPackageRoot,
+        DOCYRUS_PI_REQUEST: JSON.stringify(request),
+        DOCYRUS_PI_VERSION: options2.version || "dev"
       }
     });
     if (result.error) {
-      throw new UserInputError(`Unable to start pi agent: ${result.error.message}`, {
+      throw new UserInputError(`Unable to start Docyrus pi loader: ${result.error.message}`, {
         cause: result.error
       });
     }
     if (result.status !== 0) {
-      throw new UserInputError(`pi agent failed: ${summarizeFailure2(result)}`);
+      throw new UserInputError(`Docyrus pi loader failed: ${summarizeFailure2(result)}`);
     }
   };
 }
@@ -129358,7 +129323,8 @@ function createDocyrusCli(params) {
     settingsPaths,
     environmentConfigService,
     authStore,
-    cwd: params?.cwd
+    cwd: params?.cwd,
+    version: package_default.version
   });
   const createAuthSessionService = (apiBaseUrl) => {
     return new AuthSessionService({