@getpochi/cli 0.5.34 → 0.5.35

package/dist/cli.js

@@ -346497,6 +346497,24 @@ var WebsiteTaskCreateEvent = exports_external2.object({
     githubTemplateUrl: exports_external2.string().optional()
   })
 });
+// ../common/src/base/error.ts
+function toErrorMessage(error40) {
+  if (error40 == null) {
+    return "unknown error";
+  }
+  if (typeof error40 === "string") {
+    return error40;
+  }
+  if (error40 instanceof Error) {
+    return error40.message;
+  }
+  return JSON.stringify(error40);
+}
+// ../common/src/vscode-webui-bridge/types/custom-agent.ts
+var isValidCustomAgentFile = (agent) => {
+  return agent.name !== undefined && agent.description !== undefined && agent.systemPrompt !== undefined && !agent.error;
+};
+
 // ../common/src/vscode-webui-bridge/index.ts
 var isPochiDev = process.env.POCHI_LOCAL_SERVER === "true";
 var isSyncDev = process.env.POCHI_LOCAL_SYNC_SERVER === "true";
@@ -355562,7 +355580,7 @@ var {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.5.34",
+  version: "0.5.35",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -367108,34 +367126,72 @@ function matter2(file2, options) {
   }
 }
 // ../common/src/tool-utils/agent-parser.ts
-async function parseAgentFile(filePath, content3) {
-  const file2 = await remark().use(remarkFrontmatter, [{ type: "yaml", marker: "-" }]).use(() => (_tree, file3) => matter2(file3)).process(content3);
-  const parseResult = CustomAgentFrontmatter.safeParse(file2.data.matter);
+var CustomAgentFrontmatter = v4_default.object({
+  name: v4_default.string().optional(),
+  description: v4_default.string(),
+  tools: v4_default.union([v4_default.string(), v4_default.array(v4_default.string())]).optional()
+});
+async function parseAgentFile(filePath, readFileContent) {
+  const defaultName = path8.basename(filePath, path8.extname(filePath));
+  let content3;
+  try {
+    content3 = await readFileContent(filePath);
+  } catch (error40) {
+    return {
+      name: defaultName,
+      filePath,
+      error: "readError",
+      message: toErrorMessage(error40)
+    };
+  }
+  let vfile2;
+  try {
+    vfile2 = await remark().use(remarkFrontmatter, [{ type: "yaml", marker: "-" }]).use(() => (_tree, file2) => matter2(file2)).process(content3);
+  } catch (error40) {
+    return {
+      name: defaultName,
+      filePath,
+      error: "parseError",
+      message: toErrorMessage(error40)
+    };
+  }
+  const systemPrompt = vfile2.value.toString().trim();
+  if (!vfile2.data.matter || Object.keys(vfile2.data.matter).length === 0) {
+    return {
+      name: defaultName,
+      filePath,
+      error: "parseError",
+      message: "No agent definition found in the frontmatter of the file.",
+      systemPrompt
+    };
+  }
+  const parseResult = CustomAgentFrontmatter.safeParse(vfile2.data.matter);
   if (!parseResult.success) {
-    return;
+    return {
+      name: defaultName,
+      filePath,
+      error: "validationError",
+      message: parseResult.error.issues.map((i3) => `Field \`${i3.path}\` parse error, ${i3.message}`).join("; "),
+      systemPrompt
+    };
   }
   const frontmatterData = parseResult.data;
-  const systemPrompt = file2.value.toString().trim();
-  const defaultName = path8.basename(filePath, path8.extname(filePath));
   const toolsRaw = frontmatterData.tools;
   let tools;
   if (typeof toolsRaw === "string") {
-    tools = toolsRaw ? toolsRaw.split(",").map((tool3) => tool3.trim()) : [];
+    const toolsRawStr = toolsRaw.trim();
+    tools = toolsRawStr.length > 0 ? toolsRawStr.split(",").map((tool3) => tool3.trim()) : [];
   } else if (Array.isArray(toolsRaw)) {
-    tools = toolsRaw;
+    tools = toolsRaw.map((tool3) => tool3.trim()).filter((tool3) => tool3.length > 0);
   }
   return {
+    filePath,
     name: frontmatterData.name || defaultName,
     tools,
     description: frontmatterData.description,
     systemPrompt
   };
 }
-var CustomAgentFrontmatter = v4_default.object({
-  name: v4_default.string().optional(),
-  description: v4_default.string(),
-  tools: v4_default.union([v4_default.string(), v4_default.array(v4_default.string())]).optional()
-});
 // src/lib/load-agents.ts
 var logger13 = getLogger("CustomAgentManager");
 async function readAgentsFromDir(dir) {
@@ -367148,15 +367204,9 @@ async function readAgentsFromDir(dir) {
     for (const fileName of files) {
       if (fileName.endsWith(".md")) {
         const filePath = path9.join(dir, fileName);
-        try {
-          const contentStr = await fs5.readFile(filePath, "utf-8");
-          const agent = await parseAgentFile(filePath, contentStr);
-          if (agent) {
-            agents.push({ ...agent, filePath });
-          }
-        } catch (error40) {
-          logger13.debug(`Could not read agent file ${filePath}:`, error40);
-        }
+        const readFileContent = async (filePath2) => await fs5.readFile(filePath2, "utf-8");
+        const agent = await parseAgentFile(filePath, readFileContent);
+        agents.push({ ...agent, filePath });
       }
     }
   } catch (error40) {
@@ -367173,8 +367223,15 @@ async function loadAgents(workingDirectory) {
     }
     const systemAgentsDir = path9.join(os6.homedir(), ".pochi", "agents");
     allAgents.push(...await readAgentsFromDir(systemAgentsDir));
-    logger13.debug(`Loaded ${allAgents.length} custom agents`);
-    return allAgents;
+    const validAgents = allAgents.filter((agent) => {
+      if (isValidCustomAgentFile(agent)) {
+        return true;
+      }
+      logger13.warn(`Ignoring invalid custom agent file ${agent.filePath}: [${agent.error}] ${agent.message}`);
+      return false;
+    });
+    logger13.debug(`Loaded ${allAgents.length} custom agents (${validAgents.length} valid, ${allAgents.length - validAgents.length} invalid)`);
+    return validAgents;
   } catch (error40) {
     logger13.error("Failed to load custom agents", error40);
     return [];
@@ -372750,6 +372807,7 @@ class McpConnection {
             command: this.config.command,
             args: this.config.args,
             cwd: this.config.cwd,
+            stderr: "ignore",
             env: {
               ...getDefaultEnvironment(),
               ...this.config.env
@@ -398788,7 +398846,7 @@ async function executeToolCall(tool3, options4, abortSignal) {
       });
     } catch (e11) {
       return {
-        error: toErrorString(e11)
+        error: toErrorMessage(e11)
       };
     }
   }
@@ -398805,7 +398863,7 @@ async function executeToolCall(tool3, options4, abortSignal) {
         return result2;
       } catch (e11) {
         return {
-          error: toErrorString(e11)
+          error: toErrorMessage(e11)
         };
       }
     }
@@ -398814,15 +398872,6 @@ async function executeToolCall(tool3, options4, abortSignal) {
     error: `Tool ${toolName} not found.`
   };
 }
-function toErrorString(e11) {
-  if (e11 instanceof Error) {
-    return e11.message;
-  }
-  if (typeof e11 === "string") {
-    return e11;
-  }
-  return JSON.stringify(e11);
-}
 
 // src/task-runner.ts
 var logger28 = getLogger("TaskRunner");
@@ -399226,7 +399275,7 @@ async function downloadAndInstall(program5, release2) {
 // package.json
 var package_default2 = {
   name: "@getpochi/cli",
-  version: "0.5.34",
+  version: "0.5.35",
   type: "module",
   bin: {
     pochi: "src/cli.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpochi/cli",
-  "version": "0.5.34",
+  "version": "0.5.35",
   "type": "module",
   "bin": {
     "pochi": "dist/cli.js"