@getpochi/cli 0.5.92 → 0.5.93

package/dist/cli.js

@@ -127436,7 +127436,7 @@ var require_snapshot_utils = __commonJS((exports, module) => {
 
 // ../../node_modules/@effect/platform-node/node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = __commonJS((exports, module) => {
-  var { writeFile: writeFile2, readFile: readFile7, mkdir: mkdir2 } = __require("node:fs/promises");
+  var { writeFile: writeFile2, readFile: readFile6, mkdir: mkdir2 } = __require("node:fs/promises");
   var { dirname: dirname2, resolve: resolve5 } = __require("node:path");
   var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
   var { InvalidArgumentError: InvalidArgumentError5, UndiciError } = require_errors2();
@@ -127606,7 +127606,7 @@ var require_snapshot_recorder = __commonJS((exports, module) => {
         throw new InvalidArgumentError5("Snapshot path is required");
       }
       try {
-        const data = await readFile7(resolve5(path14), "utf8");
+        const data = await readFile6(resolve5(path14), "utf8");
         const parsed = JSON.parse(data);
         if (Array.isArray(parsed)) {
           this.#snapshots.clear();
@@ -139587,7 +139587,7 @@ var handleBadArgument = (method) => (cause3) => new BadArgument({
 }, makeTempFile, makeTempFileScoped, readDirectory = (path14, options4) => tryPromise2({
   try: () => NFS2.promises.readdir(path14, options4),
   catch: (err) => handleErrnoException("FileSystem", "readDirectory")(err, [path14])
-}), readFile8 = (path14) => async((resume2, signal2) => {
+}), readFile7 = (path14) => async((resume2, signal2) => {
   try {
     NFS2.readFile(path14, {
       signal: signal2
@@ -139895,7 +139895,7 @@ var init_fileSystem2 = __esm(() => {
     makeTempFileScoped,
     open: open3,
     readDirectory,
-    readFile: readFile8,
+    readFile: readFile7,
     readLink,
     realPath,
     remove: remove21,
@@ -361184,8 +361184,11 @@ var isVSCodeEnvironment = () => {
 };
 
 // ../common/src/base/logger.ts
+function isNodeEnvironment() {
+  return typeof process !== "undefined" && typeof process.stderr !== "undefined";
+}
 var mainLogger = new Logger({
-  type: "hidden"
+  type: isNodeEnvironment() ? "hidden" : "pretty"
 });
 function stringToLogLevel(level) {
   switch (level) {
@@ -389871,17 +389874,20 @@ var OpenAIResponsesModelSettings = ExtendedModelSettings.extend({
 var AnthropicModelSettings = ExtendedModelSettings.extend({
   kind: v4_default.literal("anthropic")
 });
-var GoogleVertexModel = v4_default.union([
+var GoogleVertexModel = v4_default.discriminatedUnion("type", [
   v4_default.object({
+    type: v4_default.literal("service-account"),
     serviceAccountKey: v4_default.string().default(process.env.POCHI_VERTEX_SERVICE_ACCOUNT_KEY ?? ""),
     location: v4_default.string().default(process.env.POCHI_VERTEX_LOCATION ?? "")
   }),
   v4_default.object({
+    type: v4_default.literal("access-token"),
     accessToken: v4_default.string().default(process.env.POCHI_VERTEX_ACCESS_TOKEN ?? ""),
     projectId: v4_default.string().default(process.env.POCHI_VERTEX_PROJECT_ID ?? ""),
     location: v4_default.string().default(process.env.POCHI_VERTEX_LOCATION ?? "")
   }),
   v4_default.object({
+    type: v4_default.literal("model-url"),
     issueUrl: v4_default.string().default(process.env.POCHI_VERTEX_ISSUE_URL ?? ""),
     modelUrl: v4_default.string().default(process.env.POCHI_VERTEX_MODEL_URL ?? ""),
     timeout: v4_default.number().default(Number.parseInt(process.env.POCHI_VERTEX_MODEL_TIMEOUT ?? "900000")).describe("Timeout in milliseconds when requesting model api")
@@ -392234,6 +392240,58 @@ function decodeJwt(jwt2) {
     throw new JWTInvalid("Invalid JWT Claims Set");
   return result2;
 }
+// ../vendor-pochi/src/content-type.ts
+var ContentType = {
+  gemini: [
+    "image/png",
+    "image/jpeg",
+    "image/webp",
+    "image/heic",
+    "image/heif",
+    "video/mp4",
+    "video/mpeg",
+    "video/mov",
+    "video/avi",
+    "video/x-flv",
+    "video/mpg",
+    "video/webm",
+    "video/wmv",
+    "video/3gpp",
+    "audio/wav",
+    "audio/mp3",
+    "audio/aiff",
+    "audio/aac",
+    "audio/ogg",
+    "audio/flac",
+    "application/pdf"
+  ],
+  claude: [
+    "image/png",
+    "image/jpeg",
+    "image/gif",
+    "image/webp",
+    "application/pdf"
+  ],
+  gpt: [
+    "image/png",
+    "image/jpeg",
+    "image/gif",
+    "image/webp",
+    "application/pdf"
+  ]
+};
+var getContentTypesForModel = (modelId) => {
+  if (modelId.includes("google/gemini")) {
+    return ContentType.gemini;
+  }
+  if (modelId.includes("anthropic/claude")) {
+    return ContentType.claude;
+  }
+  if (modelId.includes("openai/gpt")) {
+    return ContentType.gpt;
+  }
+};
+
 // ../vendor-pochi/src/credentials.ts
 function getPochiCredentials() {
   return config2.value.vendors?.pochi?.credentials;
@@ -392354,31 +392412,9 @@ class Pochi extends VendorBase {
         x.id,
         {
           contextWindow: x.contextWindow,
-          useToolCallMiddleware: x.id.includes("google/"),
+          useToolCallMiddleware: x.id.includes("google"),
           label: x.costType === "basic" ? "swift" : "super",
-          contentType: x.id.includes("google/") ? [
-            "image/png",
-            "image/jpeg",
-            "image/webp",
-            "image/heic",
-            "image/heif",
-            "video/mp4",
-            "video/mpeg",
-            "video/mov",
-            "video/avi",
-            "video/x-flv",
-            "video/mpg",
-            "video/webm",
-            "video/wmv",
-            "video/3gpp",
-            "audio/wav",
-            "audio/mp3",
-            "audio/aiff",
-            "audio/aac",
-            "audio/ogg",
-            "audio/flac",
-            "application/pdf"
-          ] : undefined
+          contentType: getContentTypesForModel(x.id)
         }
       ]));
     }
@@ -404241,7 +404277,7 @@ function createPatchedFetch3(getCredentials) {
 registerModel(VendorId7, createQwenModel);
 
 // src/cli.ts
-import fs18 from "fs/promises";
+import fs19 from "fs/promises";
 import path28 from "path";
 
 // ../../node_modules/@commander-js/extra-typings/esm.mjs
@@ -406533,7 +406569,7 @@ var {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.5.92",
+  version: "0.5.93",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -408659,7 +408695,6 @@ async function parseWorktreeGitdir(cwd) {
   }
 }
 // ../common/src/tool-utils/custom-rules.ts
-import { readFile as readFile4 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path8 from "node:path";
 var WorkspaceRulesFilePaths = ["README.pochi.md", "AGENTS.md"];
@@ -408672,31 +408707,65 @@ function makeGlobalRule(filePath) {
 var GlobalRules = [
   makeGlobalRule(path8.join(homedir2(), ".pochi", "README.pochi.md"))
 ];
-async function collectCustomRules(cwd, customRuleFiles = [], includeDefaultRules = true, includeGlobalRules = true) {
-  let rules = "";
-  const allRules = [];
+async function collectAllRuleFiles(cwd, readFileContent, options4 = {}) {
+  const {
+    includeDefaultRules = true,
+    includeGlobalRules = true,
+    customRuleFiles = []
+  } = options4;
+  const allRuleFiles = new Map;
+  const visited = new Set;
+  const processFile = async (filePath, isGlobal) => {
+    if (visited.has(filePath)) {
+      return;
+    }
+    if (!filePath.endsWith(".md") || !await isFileExists(filePath)) {
+      return;
+    }
+    visited.add(filePath);
+    let content = "";
+    try {
+      content = await readFileContent(filePath) ?? "";
+      if (!allRuleFiles.has(filePath)) {
+        const label = isGlobal ? filePath.replace(homedir2(), "~") : path8.relative(cwd, filePath);
+        allRuleFiles.set(filePath, { filePath, label });
+      }
+    } catch {
+      return;
+    }
+    const dir2 = path8.dirname(filePath);
+    const importRegex = /@([./\\\w-]+.md)/gm;
+    for (const match30 of content.matchAll(importRegex)) {
+      const importPath = path8.resolve(dir2, match30[1]);
+      await processFile(importPath, isGlobal);
+    }
+  };
   if (includeGlobalRules) {
-    allRules.push(...GlobalRules);
+    for (const rule of GlobalRules) {
+      await processFile(rule.filePath, true);
+    }
   }
   if (includeDefaultRules) {
     for (const fileName of WorkspaceRulesFilePaths) {
-      const defaultRulesPath = path8.join(cwd, fileName);
-      allRules.push({
-        filePath: defaultRulesPath,
-        label: fileName
-      });
+      const filePath = path8.join(cwd, fileName);
+      await processFile(filePath, false);
     }
   }
-  allRules.push(...customRuleFiles.map((rulePath) => {
-    const relativePath = path8.relative(cwd, rulePath);
-    return {
-      filePath: rulePath,
-      label: relativePath
-    };
-  }));
+  for (const rulePath of customRuleFiles) {
+    await processFile(rulePath, false);
+  }
+  return Array.from(allRuleFiles.values());
+}
+async function collectCustomRules(cwd, readFileContent, customRuleFiles = [], includeDefaultRules = true, includeGlobalRules = true) {
+  let rules = "";
+  const allRules = await collectAllRuleFiles(cwd, readFileContent, {
+    customRuleFiles,
+    includeDefaultRules,
+    includeGlobalRules
+  });
   for (const rule of allRules) {
     try {
-      const content = await readFile4(rule.filePath, "utf-8");
+      const content = await readFileContent(rule.filePath) ?? "";
       if (content.trim().length > 0) {
         rules += `# Rules from ${rule.label}
 ${content}
@@ -448746,7 +448815,7 @@ function createPatchedFetchForFinetune(accessToken) {
 }
 function createVertexModel(vertex2, modelId) {
   const getBaseURL2 = (location3, projectId) => `https://${location3}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location3}/publishers/google`;
-  if ("serviceAccountKey" in vertex2 && vertex2.serviceAccountKey) {
+  if (vertex2.type === "service-account") {
     const service_account_key = JSON.parse(vertex2.serviceAccountKey);
     const location3 = vertex2.location;
     const project3 = service_account_key.project_id;
@@ -448762,7 +448831,7 @@ function createVertexModel(vertex2, modelId) {
       fetch: createPatchedFetchForFinetune()
     })(modelId);
   }
-  if ("accessToken" in vertex2 && vertex2.accessToken) {
+  if (vertex2.type === "access-token") {
     const { location: location3, projectId, accessToken } = vertex2;
     return createVertex({
       project: projectId,
@@ -448771,7 +448840,7 @@ function createVertexModel(vertex2, modelId) {
       fetch: createPatchedFetchForFinetune(accessToken)
     })(modelId);
   }
-  if ("issueUrl" in vertex2 && vertex2.issueUrl) {
+  if (vertex2.type === "model-url") {
     const { issueUrl, modelUrl, timeout: timeout5 } = vertex2;
     return createVertex({
       project: "placeholder",
@@ -449096,9 +449165,9 @@ async function resolvePromise(o10) {
   }
   return resolved;
 }
-function handleReadFileOutput(store, readFile10) {
+function handleReadFileOutput(store, readFile9) {
   return tool({
-    ...readFile10,
+    ...readFile9,
     toModelOutput: (output2) => {
       if (output2.type === "media") {
         const blob3 = findBlob(store, new URL(output2.data), output2.mimeType);
@@ -449338,6 +449407,7 @@ class LiveChatKit {
   };
 }
 // src/lib/read-environment.ts
+import fs11 from "node:fs/promises";
 var readEnvironment = async (context15) => {
   const { cwd: cwd2 } = context15;
   const { files, isTruncated } = await listWorkspaceFiles({
@@ -449345,7 +449415,8 @@ var readEnvironment = async (context15) => {
     recursive: true,
     maxItems: 500
   });
-  const customRules = await collectCustomRules(cwd2);
+  const readFileContent = async (filePath) => await fs11.readFile(filePath, "utf-8");
+  const customRules = await collectCustomRules(cwd2, readFileContent);
   const systemInfo = getSystemInfo2(cwd2);
   const gitStatusReader = new GitStatusReader({ cwd: cwd2 });
   const gitStatus = await gitStatusReader.readGitStatus();
@@ -449423,9 +449494,11 @@ class StepCount {
       throw new MaxRetryReachedError(this.maxRetries);
     }
   }
-  nextRetry() {
+  async nextRetry() {
     this.throwIfReachedMaxRetries();
+    const baseRetryWaitMs = 3000;
     this.retry++;
+    await new Promise((resolve11) => setTimeout(resolve11, baseRetryWaitMs * 2 ** this.retry));
   }
   toString() {
     return stepToString(this);
@@ -449540,7 +449613,7 @@ function executeBashCommand(cwd2, command) {
 }
 
 // src/tools/apply-diff.ts
-import * as fs12 from "node:fs/promises";
+import * as fs13 from "node:fs/promises";
 
 // ../common/src/diff-utils.ts
 var import_fast_levenshtein = __toESM(require_levenshtein(), 1);
@@ -449753,36 +449826,36 @@ var replaceMatches = (originalContent, matches2, replaceContent) => {
 };
 
 // src/lib/fs.ts
-import * as fs11 from "node:fs/promises";
+import * as fs12 from "node:fs/promises";
 import * as path26 from "node:path";
 async function ensureFileDirectoryExists(fileUri) {
   const dirUri = path26.join(fileUri, "..");
-  await fs11.mkdir(dirUri, { recursive: true });
+  await fs12.mkdir(dirUri, { recursive: true });
 }
 
 // src/tools/apply-diff.ts
 var applyDiff2 = () => async ({ path: path27, searchContent, replaceContent, expectedReplacements }, { cwd: cwd2 }) => {
   const fileUri = resolvePath(path27, cwd2);
   await ensureFileDirectoryExists(fileUri);
-  const fileBuffer = await fs12.readFile(fileUri);
+  const fileBuffer = await fs13.readFile(fileUri);
   validateTextFile(fileBuffer);
   const fileContent3 = fileBuffer.toString();
   const updatedContent = await parseDiffAndApply(fileContent3, searchContent, replaceContent, expectedReplacements);
-  await fs12.writeFile(fileUri, updatedContent);
+  await fs13.writeFile(fileUri, updatedContent);
   return { success: true };
 };
 
 // src/tools/edit-notebook.ts
-import * as fs13 from "node:fs/promises";
+import * as fs14 from "node:fs/promises";
 var editNotebook2 = () => async ({ path: filePath, cellId, content: content3 }, { cwd: cwd2 }) => {
   try {
     const absolutePath = resolvePath(filePath, cwd2);
     validateNotebookPath(absolutePath);
-    const fileContent3 = await fs13.readFile(absolutePath, "utf-8");
+    const fileContent3 = await fs14.readFile(absolutePath, "utf-8");
     const notebook = parseNotebook(fileContent3);
     const updatedNotebook = editNotebookCell(notebook, cellId, content3);
     const serialized = serializeNotebook(updatedNotebook);
-    await fs13.writeFile(absolutePath, serialized, "utf-8");
+    await fs14.writeFile(absolutePath, serialized, "utf-8");
     return { success: true };
   } catch (error46) {
     return { success: false };
@@ -449895,15 +449968,15 @@ var listFiles3 = () => async ({ path: dirPath, recursive }, { abortSignal, cwd:
 };
 
 // src/tools/multi-apply-diff.ts
-import * as fs14 from "node:fs/promises";
+import * as fs15 from "node:fs/promises";
 var multiApplyDiff2 = () => async ({ path: path28, edits }, { cwd: cwd2 }) => {
   const fileUri = resolvePath(path28, cwd2);
   await ensureFileDirectoryExists(fileUri);
-  const fileBuffer = await fs14.readFile(fileUri);
+  const fileBuffer = await fs15.readFile(fileUri);
   validateTextFile(fileBuffer);
   const fileContent3 = fileBuffer.toString();
   const updatedContent = await processMultipleDiffs(fileContent3, edits);
-  await fs14.writeFile(fileUri, updatedContent);
+  await fs15.writeFile(fileUri, updatedContent);
   return { success: true };
 };
 
@@ -449941,10 +450014,10 @@ var newTask = (options6) => async ({ _meta, agentType }) => {
 };
 
 // src/tools/read-file.ts
-import * as fs15 from "node:fs/promises";
-var readFile14 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2, contentType }) => {
+import * as fs16 from "node:fs/promises";
+var readFile13 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2, contentType }) => {
   const resolvedPath = resolvePath(path28, cwd2);
-  const fileBuffer = await fs15.readFile(resolvedPath);
+  const fileBuffer = await fs16.readFile(resolvedPath);
   const isPlainTextFile2 = isPlainText(fileBuffer);
   if (contentType && contentType.length > 0 && !isPlainTextFile2) {
     return readMediaFile(resolvedPath, fileBuffer, contentType);
@@ -449962,11 +450035,11 @@ var readFile14 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2,
 };
 
 // src/tools/search-files.ts
-import * as fs16 from "node:fs";
+import * as fs17 from "node:fs";
 var logger25 = getLogger("searchFiles");
 var searchFiles2 = (context15) => async ({ path: path28, regex: regex3, filePattern }, { abortSignal, cwd: cwd2 }) => {
   const rgPath = context15.rg;
-  if (!rgPath || !fs16.existsSync(rgPath)) {
+  if (!rgPath || !fs17.existsSync(rgPath)) {
     logger25.error("Ripgrep not found at path", rgPath);
     throw new Error(`Ripgrep not found at path: ${rgPath}`);
   }
@@ -449981,22 +450054,22 @@ var todoWrite2 = (_options) => async () => {
 };
 
 // src/tools/write-to-file.ts
-import * as fs17 from "node:fs/promises";
+import * as fs18 from "node:fs/promises";
 import * as nodePath from "node:path";
 var writeToFile2 = () => async ({ path: path28, content: content3 }, { cwd: cwd2 }) => {
   const filePath = resolvePath(path28, cwd2);
   if (!await isFileExists(filePath)) {
     const dirPath = nodePath.dirname(filePath);
-    await fs17.mkdir(dirPath, { recursive: true });
+    await fs18.mkdir(dirPath, { recursive: true });
   }
   const processedContent = fixCodeGenerationOutput(content3);
-  await fs17.writeFile(filePath, processedContent);
+  await fs18.writeFile(filePath, processedContent);
   return { success: true };
 };
 
 // src/tools/index.ts
 var ToolMap = {
-  readFile: readFile14,
+  readFile: readFile13,
   applyDiff: applyDiff2,
   editNotebook: editNotebook2,
   globFiles: globFiles3,
@@ -450139,7 +450212,7 @@ class TaskRunner {
           break;
         }
         if (stepResult === "retry") {
-          this.stepCount.nextRetry();
+          await this.stepCount.nextRetry();
         } else {
           this.stepCount.nextStep();
         }
@@ -450557,7 +450630,7 @@ var program5 = new Command().name("pochi").description(`${source_default.bold("P
     for (const attachmentPath of attachments) {
       try {
         const absolutePath = path28.resolve(process.cwd(), attachmentPath);
-        const buffer4 = await fs18.readFile(absolutePath);
+        const buffer4 = await fs19.readFile(absolutePath);
         const mimeType = getMimeType(attachmentPath);
         const dataUrl = await fileToUri(store, new File([buffer4], attachmentPath, {
           type: mimeType

package/package.json

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