@jixo/cli 0.11.0 → 0.13.0

package/dist/commands/tasks/run.js

@@ -1,90 +1,44 @@
-import { FileEntry, findChangedFilesSinceTime, Ignore, normalizeFilePath, walkFiles } from "@gaubee/nodekit";
-import { iter_map_not_null } from "@gaubee/util";
-import fs from "node:fs";
-import path from "node:path";
-import { loadConfig } from "../../config.js";
-import { loadJixoEnv } from "../../env.js";
-import { resolveAiTasks } from "../../helper/resolve-ai-tasks.js";
-import { runAiTask } from "./run-ai-task.js";
-export const run = async (_cwd, options) => {
-    const cwd = normalizeFilePath(_cwd);
-    const config = await loadConfig(cwd);
-    const nameMatcher = options.nameFilter.length ? new Ignore(options.nameFilter, cwd) : { isMatch: () => true };
-    const dirMatcher = options.dirFilter.length ? new Ignore(options.dirFilter, cwd) : { isMatch: () => true };
-    const cwdIgnoreFilepath = path.join(cwd, ".gitignore");
-    const ignore = [".git"];
-    if (fs.existsSync(cwdIgnoreFilepath)) {
-        ignore.push(...fs.readFileSync(cwdIgnoreFilepath, "utf-8").split("\n"));
-    }
-    const exitedTasks = new Set();
-    let { force = false } = options;
-    const { loopTimes: MAX_LOOP_TIMES = Infinity } = options;
-    let currentTimes = 1;
-    let retryTimes = 0;
-    const MAX_RETRY_TIMES = 3;
-    while (currentTimes <= MAX_LOOP_TIMES) {
-        const ai_tasks = resolveAiTasks(cwd, config.tasks);
-        const allFiles = [...walkFiles(cwd, { ignore })];
-        let allDone = true;
-        try {
-            for (const ai_task of ai_tasks) {
-                // 如果进度已经满了，并且没有任何依赖文件的变更，那么跳过这个任务
-                if (!force) {
-                    if (ai_task.log.preProgress >= 1) {
-                        continue;
-                    }
-                }
-                if (exitedTasks.has(ai_task.name)) {
-                    continue;
-                }
-                const { dirs: task_dirs } = ai_task;
-                if (!task_dirs.some((dir) => dirMatcher.isMatch(dir))) {
-                    continue;
-                }
-                if (!nameMatcher.isMatch(ai_task.name)) {
-                    continue;
-                }
-                const isCwdTask = cwd === task_dirs[0] && task_dirs.length === 1;
-                const changedFiles = (await findChangedFilesSinceTime(ai_task.log.preUpdateTime, cwd)) ?? allFiles;
-                const task_changedFiles = isCwdTask
-                    ? { [cwd]: changedFiles }
-                    : task_dirs.reduce((tree, task_dir) => {
-                        tree[task_dir] = iter_map_not_null(changedFiles, (file) => {
-                            if (file.path.startsWith(task_dirs + "/")) {
-                                return new FileEntry(file.path, { cwd: task_dir, state: file.stats });
-                            }
-                        });
-                        return tree;
-                    }, {});
-                const task_allFiles = isCwdTask ? allFiles : task_dirs.map((task_dir) => [...walkFiles(task_dir, { ignore })]).flat();
-                loadJixoEnv(cwd);
-                /// 只要有一个任务执行了，那么allDone就要标记成false，进入下一次循环来判断
-                allDone = false;
-                await runAiTask(ai_task, currentTimes, task_allFiles, task_changedFiles);
-                if (ai_task.exited) {
-                    exitedTasks.add(ai_task.name);
-                }
-            }
+import { cyan, green, red, yellow } from "@gaubee/nodekit";
+import { safeEnv } from "../../env.js";
+export const run = async (options) => {
+    const { jobGoal, workDir, maxLoops, jobName, gitCommit } = options;
+    const coreUrl = safeEnv.JIXO_CORE_URL;
+    const apiKey = safeEnv.JIXO_API_KEY;
+    console.log(cyan(`🚀 Starting JIXO job...`));
+    console.log(`   - Goal: ${jobGoal}`);
+    console.log(`   - Target: ${coreUrl}`);
+    try {
+        const response = await fetch(`${coreUrl}/jixo/v1/jobs`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${apiKey}`,
+            },
+            body: JSON.stringify({
+                jobGoal,
+                workspaceDir: workDir, // Updated field name
+                maxLoops,
+                jobName,
+                gitCommit,
+            }),
+        });
+        if (!response.ok) {
+            const errorBody = await response.text();
+            throw new Error(`Failed to start job. Server responded with ${response.status}: ${errorBody}`);
         }
-        catch {
-            // 遇到异常，那么重试
-            if (retryTimes < MAX_RETRY_TIMES) {
-                retryTimes += 1;
-                continue;
-            }
-            else {
-                break;
-            }
+        const result = await response.json();
+        console.log(green(`✅ Job successfully started with Run ID: ${result.runId}`));
+    }
+    catch (error) {
+        if (error instanceof TypeError && error.message.includes("fetch failed")) {
+            console.error(red("\n❌ Error: Could not connect to the JIXO Core service."));
+            console.error(yellow(`   Please ensure the core service is running at ${coreUrl}.`));
+            console.error(yellow(`   You can start it by running 'jixo daemon start' or running the core package directly.`));
         }
-        // force 只能生效一次，避免无限循环
-        force = false;
-        currentTimes += 1;
-        /// 成功一次后，retry计数就重制
-        retryTimes = 0;
-        /// 如果没有任务执行了，那么退出循环
-        if (allDone) {
-            break;
+        else {
+            console.error(red("\n❌ An unexpected error occurred:"), error);
         }
+        process.exit(1);
     }
 };
 //# sourceMappingURL=run.js.map

package/dist/commands/tasks/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tasks/run.ts"],"names":[],"mappings":"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","sourcesContent":["import {FileEntry, findChangedFilesSinceTime, Ignore, normalizeFilePath, walkFiles} from \"@gaubee/nodekit\";\nimport {iter_map_not_null} from \"@gaubee/util\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport {loadConfig} from \"../../config.js\";\nimport {loadJixoEnv} from \"../../env.js\";\nimport {resolveAiTasks} from \"../../helper/resolve-ai-tasks.js\";\nimport {runAiTask} from \"./run-ai-task.js\";\n\nexport const run = async (\n  _cwd: string,\n  options: {\n    nameFilter: string[];\n    dirFilter: string[];\n    force?: boolean;\n    loopTimes?: number;\n  },\n) => {\n  const cwd = normalizeFilePath(_cwd);\n  const config = await loadConfig(cwd);\n\n  const nameMatcher = options.nameFilter.length ? new Ignore(options.nameFilter, cwd) : {isMatch: () => true};\n  const dirMatcher = options.dirFilter.length ? new Ignore(options.dirFilter, cwd) : {isMatch: () => true};\n  const cwdIgnoreFilepath = path.join(cwd, \".gitignore\");\n  const ignore = [\".git\"];\n  if (fs.existsSync(cwdIgnoreFilepath)) {\n    ignore.push(...fs.readFileSync(cwdIgnoreFilepath, \"utf-8\").split(\"\\n\"));\n  }\n  const exitedTasks = new Set<string>();\n\n  let {force = false} = options;\n  const {loopTimes: MAX_LOOP_TIMES = Infinity} = options;\n  let currentTimes = 1;\n  let retryTimes = 0;\n  const MAX_RETRY_TIMES = 3;\n  while (currentTimes <= MAX_LOOP_TIMES) {\n    const ai_tasks = resolveAiTasks(cwd, config.tasks);\n\n    const allFiles = [...walkFiles(cwd, {ignore})];\n    let allDone = true;\n\n    try {\n      for (const ai_task of ai_tasks) {\n        // 如果进度已经满了，并且没有任何依赖文件的变更，那么跳过这个任务\n        if (!force) {\n          if (ai_task.log.preProgress >= 1) {\n            continue;\n          }\n        }\n        if (exitedTasks.has(ai_task.name)) {\n          continue;\n        }\n\n        const {dirs: task_dirs} = ai_task;\n        if (!task_dirs.some((dir) => dirMatcher.isMatch(dir))) {\n          continue;\n        }\n        if (!nameMatcher.isMatch(ai_task.name)) {\n          continue;\n        }\n        const isCwdTask = cwd === task_dirs[0] && task_dirs.length === 1;\n\n        const changedFiles = (await findChangedFilesSinceTime(ai_task.log.preUpdateTime, cwd)) ?? allFiles;\n\n        const task_changedFiles = isCwdTask\n          ? {[cwd]: changedFiles}\n          : task_dirs.reduce(\n              (tree, task_dir) => {\n                tree[task_dir] = iter_map_not_null(changedFiles, (file) => {\n                  if (file.path.startsWith(task_dirs + \"/\")) {\n                    return new FileEntry(file.path, {cwd: task_dir, state: file.stats});\n                  }\n                });\n                return tree;\n              },\n              {} as Record<string, FileEntry[]>,\n            );\n\n        const task_allFiles = isCwdTask ? allFiles : task_dirs.map((task_dir) => [...walkFiles(task_dir, {ignore})]).flat();\n\n        loadJixoEnv(cwd);\n\n        /// 只要有一个任务执行了，那么allDone就要标记成false，进入下一次循环来判断\n        allDone = false;\n        await runAiTask(ai_task, currentTimes, task_allFiles, task_changedFiles);\n\n        if (ai_task.exited) {\n          exitedTasks.add(ai_task.name);\n        }\n      }\n    } catch {\n      // 遇到异常，那么重试\n      if (retryTimes < MAX_RETRY_TIMES) {\n        retryTimes += 1;\n        continue;\n      } else {\n        break;\n      }\n    }\n    // force 只能生效一次，避免无限循环\n    force = false;\n    currentTimes += 1;\n    /// 成功一次后，retry计数就重制\n    retryTimes = 0;\n\n    /// 如果没有任务执行了，那么退出循环\n    if (allDone) {\n      break;\n    }\n  }\n};\n"]}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tasks/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAUrC,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAE,EAAE;IAC/C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAC,GAAG,OAAO,CAAC;IACjE,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IACtC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAEpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,eAAe,EAAE;YACtD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,MAAM,EAAE;aAClC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO;gBACP,YAAY,EAAE,OAAO,EAAE,qBAAqB;gBAC5C,QAAQ;gBACR,OAAO;gBACP,SAAS;aACV,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,8CAA8C,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC,CAAC;QACjG,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACzE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,mDAAmD,OAAO,GAAG,CAAC,CAAC,CAAC;YACrF,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,0FAA0F,CAAC,CAAC,CAAC;QACpH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,mCAAmC,CAAC,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC","sourcesContent":["import {cyan, green, red, yellow} from \"@gaubee/nodekit\";\nimport {safeEnv} from \"../../env.js\";\n\ninterface RunOptions {\n  jobGoal: string;\n  workDir: string;\n  maxLoops: number;\n  jobName?: string;\n  gitCommit?: boolean;\n}\n\nexport const run = async (options: RunOptions) => {\n  const {jobGoal, workDir, maxLoops, jobName, gitCommit} = options;\n  const coreUrl = safeEnv.JIXO_CORE_URL;\n  const apiKey = safeEnv.JIXO_API_KEY;\n\n  console.log(cyan(`🚀 Starting JIXO job...`));\n  console.log(`   - Goal: ${jobGoal}`);\n  console.log(`   - Target: ${coreUrl}`);\n\n  try {\n    const response = await fetch(`${coreUrl}/jixo/v1/jobs`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        Authorization: `Bearer ${apiKey}`,\n      },\n      body: JSON.stringify({\n        jobGoal,\n        workspaceDir: workDir, // Updated field name\n        maxLoops,\n        jobName,\n        gitCommit,\n      }),\n    });\n\n    if (!response.ok) {\n      const errorBody = await response.text();\n      throw new Error(`Failed to start job. Server responded with ${response.status}: ${errorBody}`);\n    }\n\n    const result = await response.json();\n    console.log(green(`✅ Job successfully started with Run ID: ${result.runId}`));\n  } catch (error) {\n    if (error instanceof TypeError && error.message.includes(\"fetch failed\")) {\n      console.error(red(\"\\n❌ Error: Could not connect to the JIXO Core service.\"));\n      console.error(yellow(`   Please ensure the core service is running at ${coreUrl}.`));\n      console.error(yellow(`   You can start it by running 'jixo daemon start' or running the core package directly.`));\n    } else {\n      console.error(red(\"\\n❌ An unexpected error occurred:\"), error);\n    }\n    process.exit(1);\n  }\n};\n"]}

package/dist/config.d.ts

@@ -1,206 +1,15 @@
 import z from "zod";
-declare const zJixoTask: z.ZodUnion<[z.ZodString, z.ZodObject<{
-    type: z.ZodLiteral<"file">;
-    name: z.ZodOptional<z.ZodString>;
-    filename: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    filename: string;
-    type: "file";
-    name?: string | undefined;
-}, {
-    filename: string;
-    type: "file";
-    name?: string | undefined;
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"dir">;
-    dirname: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    type: "dir";
-    dirname: string;
-}, {
-    type: "dir";
-    dirname: string;
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"prompt">;
-    name: z.ZodOptional<z.ZodString>;
-    content: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    type: "prompt";
-    content: string;
-    name?: string | undefined;
-}, {
-    type: "prompt";
-    content: string;
-    name?: string | undefined;
-}>]>;
 declare const zJixoConfig: z.ZodObject<{
-    tasks: z.ZodUnion<[z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
-        type: z.ZodLiteral<"file">;
-        name: z.ZodOptional<z.ZodString>;
-        filename: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    }, {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"dir">;
-        dirname: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "dir";
-        dirname: string;
-    }, {
-        type: "dir";
-        dirname: string;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"prompt">;
-        name: z.ZodOptional<z.ZodString>;
-        content: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    }, {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    }>]>, "many">, z.ZodUnion<[z.ZodString, z.ZodObject<{
-        type: z.ZodLiteral<"file">;
-        name: z.ZodOptional<z.ZodString>;
-        filename: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    }, {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"dir">;
-        dirname: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "dir";
-        dirname: string;
-    }, {
-        type: "dir";
-        dirname: string;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"prompt">;
-        name: z.ZodOptional<z.ZodString>;
-        content: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    }, {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    }>]>]>;
+    coreUrl: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
-    tasks: string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    } | (string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    })[];
+    coreUrl: string;
 }, {
-    tasks: string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    } | (string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    })[];
+    coreUrl?: string | undefined;
 }>;
-export type JixoTask = z.output<typeof zJixoTask>;
 export type JixoConfig = z.output<typeof zJixoConfig>;
 export declare const defineConfig: (config: Partial<JixoConfig>) => {
-    tasks: string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    } | (string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    })[];
+    coreUrl: string;
 };
-export declare const loadConfig: (dir: string) => Promise<{
-    tasks: string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    } | (string | {
-        filename: string;
-        type: "file";
-        name?: string | undefined;
-    } | {
-        type: "dir";
-        dirname: string;
-    } | {
-        type: "prompt";
-        content: string;
-        name?: string | undefined;
-    })[];
-}>;
+export declare const loadConfig: (dir: string) => Promise<JixoConfig>;
 export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgBb,CAAC;AACH,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAEf,CAAC;AAKH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AACtD,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAEvD,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;EAI3C,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,QAAA,MAAM,WAAW;;;;;;EAEf,CAAC;AAMH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEtD,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,CAAC,UAAU,CAAC;;CAEvD,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,UAAU,CAOhE,CAAC"}

package/dist/config.js

@@ -1,35 +1,23 @@
 import { cosmiconfig } from "cosmiconfig";
 import { defu } from "defu";
 import z from "zod";
-const zJixoTask = z.union([
-    z.string(),
-    z.object({
-        type: z.literal("file"),
-        name: z.string().optional(),
-        filename: z.string(),
-    }),
-    z.object({
-        type: z.literal("dir"),
-        dirname: z.string(),
-    }),
-    z.object({
-        type: z.literal("prompt"),
-        name: z.string().optional(),
-        content: z.string(),
-    }),
-]);
+const DEFAULT_CORE_URL = "http://localhost:4111";
 const zJixoConfig = z.object({
-    tasks: z.union([z.array(zJixoTask), zJixoTask]),
+    coreUrl: z.string().url().optional().default(DEFAULT_CORE_URL),
 });
 const defaultConfig = {
-    tasks: { type: "dir", dirname: ".jixo" },
+    coreUrl: DEFAULT_CORE_URL,
 };
 export const defineConfig = (config) => {
     return zJixoConfig.parse(config);
 };
 export const loadConfig = async (dir) => {
-    const explorer = cosmiconfig("jixo");
+    const explorer = cosmiconfig("jixo", {
+        searchStrategy: "global",
+    });
     const loaded = await explorer.search(dir);
-    return defu(loaded?.config, defaultConfig);
+    // Use Zod to parse the loaded config, which applies defaults if properties are missing.
+    return defu(zJixoConfig.parse(loaded?.config || {}), defaultConfig);
 };
+console.log(defineConfig({}));
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC;IACxB,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACvB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;KACrB,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QACtB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACzB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;CACH,CAAC,CAAC;AACH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;CAChD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAe;IAChC,KAAK,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAC;CACvC,CAAC;AAGF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAA2B,EAAE,EAAE;IAC1D,OAAO,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IAC9C,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC,MAAM,EAAE,MAAoB,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC,CAAC","sourcesContent":["import {cosmiconfig} from \"cosmiconfig\";\nimport {defu} from \"defu\";\nimport z from \"zod\";\n\nconst zJixoTask = z.union([\n  z.string(),\n  z.object({\n    type: z.literal(\"file\"),\n    name: z.string().optional(),\n    filename: z.string(),\n  }),\n  z.object({\n    type: z.literal(\"dir\"),\n    dirname: z.string(),\n  }),\n  z.object({\n    type: z.literal(\"prompt\"),\n    name: z.string().optional(),\n    content: z.string(),\n  }),\n]);\nconst zJixoConfig = z.object({\n  tasks: z.union([z.array(zJixoTask), zJixoTask]),\n});\n\nconst defaultConfig: JixoConfig = {\n  tasks: {type: \"dir\", dirname: \".jixo\"},\n};\nexport type JixoTask = z.output<typeof zJixoTask>;\nexport type JixoConfig = z.output<typeof zJixoConfig>;\nexport const defineConfig = (config: Partial<JixoConfig>) => {\n  return zJixoConfig.parse(config);\n};\n\nexport const loadConfig = async (dir: string) => {\n  const explorer = cosmiconfig(\"jixo\");\n  const loaded = await explorer.search(dir);\n  return defu(loaded?.config as JixoConfig, defaultConfig);\n};\n"]}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAC1B,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AACjD,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC;CAC/D,CAAC,CAAC;AAEH,MAAM,aAAa,GAAe;IAChC,OAAO,EAAE,gBAAgB;CAC1B,CAAC;AAIF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAA2B,EAAE,EAAE;IAC1D,OAAO,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,GAAW,EAAuB,EAAE;IACnE,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE;QACnC,cAAc,EAAE,QAAQ;KACzB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1C,wFAAwF;IACxF,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;AACtE,CAAC,CAAC;AACF,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC","sourcesContent":["import {cosmiconfig} from \"cosmiconfig\";\nimport {defu} from \"defu\";\nimport z from \"zod\";\nconst DEFAULT_CORE_URL = \"http://localhost:4111\";\nconst zJixoConfig = z.object({\n  coreUrl: z.string().url().optional().default(DEFAULT_CORE_URL),\n});\n\nconst defaultConfig: JixoConfig = {\n  coreUrl: DEFAULT_CORE_URL,\n};\n\nexport type JixoConfig = z.output<typeof zJixoConfig>;\n\nexport const defineConfig = (config: Partial<JixoConfig>) => {\n  return zJixoConfig.parse(config);\n};\n\nexport const loadConfig = async (dir: string): Promise<JixoConfig> => {\n  const explorer = cosmiconfig(\"jixo\", {\n    searchStrategy: \"global\",\n  });\n  const loaded = await explorer.search(dir);\n  // Use Zod to parse the loaded config, which applies defaults if properties are missing.\n  return defu(zJixoConfig.parse(loaded?.config || {}), defaultConfig);\n};\nconsole.log(defineConfig({}));\n"]}

package/dist/env.d.ts

@@ -1,17 +1,6 @@
 export declare const loadJixoEnv: (dir: string) => void;
 export declare const safeEnv: import("@gaubee/node").DefineEnvChain<"JIXO", import("@gaubee/node").DefineEnv<"JIXO", {
-    DEEPSEEK_API_KEY: string;
-    DEEPSEEK_BASE_URL: string;
-    ANTHROPIC_API_KEY: string;
-    ANTHROPIC_BASE_URL: string;
-    OPENAI_API_KEY: string;
-    OPENAI_BASE_URL: string;
-    OPENAI_ORGANIZATION: string;
-    GOOGLE_API_KEY: string;
-    GOOGLE_BASE_URL: string;
-    XAI_BASE_URL: string;
-    XAI_API_KEY: string;
-    DEEPINFRA_BASE_URL: string;
-    DEEPINFRA_API_KEY: string;
+    CORE_URL: string;
+    API_KEY: string;
 }>>;
 //# sourceMappingURL=env.d.ts.map

package/dist/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,SAKtC,CAAC;AAGF,eAAO,MAAM,OAAO;;;;;;;;;;;;;;GAmBlB,CAAC"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,SAKtC,CAAC;AAKF,eAAO,MAAM,OAAO;;;GAGlB,CAAC"}

package/dist/env.js

@@ -7,20 +7,10 @@ export const loadJixoEnv = (dir) => {
         process.loadEnvFile(cwdJixoEnvFilepath);
     }
 };
+// Load environment from the current working directory when the module is imported.
 loadJixoEnv(process.cwd());
 export const safeEnv = defineEnv("JIXO", {
-    DEEPSEEK_API_KEY: "",
-    DEEPSEEK_BASE_URL: "",
-    ANTHROPIC_API_KEY: "",
-    ANTHROPIC_BASE_URL: "",
-    OPENAI_API_KEY: "",
-    OPENAI_BASE_URL: "",
-    OPENAI_ORGANIZATION: "",
-    GOOGLE_API_KEY: "",
-    GOOGLE_BASE_URL: "",
-    XAI_BASE_URL: "",
-    XAI_API_KEY: "",
-    DEEPINFRA_BASE_URL: "",
-    DEEPINFRA_API_KEY: "",
+    CORE_URL: "http://localhost:4111",
+    API_KEY: "",
 });
 //# sourceMappingURL=env.js.map

package/dist/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;IACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACvD,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtC,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC,CAAC;AACF,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAE3B,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE;IACvC,gBAAgB,EAAE,EAAE;IACpB,iBAAiB,EAAE,EAAE;IAErB,iBAAiB,EAAE,EAAE;IACrB,kBAAkB,EAAE,EAAE;IAEtB,cAAc,EAAE,EAAE;IAClB,eAAe,EAAE,EAAE;IACnB,mBAAmB,EAAE,EAAE;IAEvB,cAAc,EAAE,EAAE;IAClB,eAAe,EAAE,EAAE;IAEnB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,EAAE;IAEf,kBAAkB,EAAE,EAAE;IACtB,iBAAiB,EAAE,EAAE;CACtB,CAAC,CAAC","sourcesContent":["import {defineEnv} from \"@gaubee/node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\n\nexport const loadJixoEnv = (dir: string) => {\n  const cwdJixoEnvFilepath = path.join(dir, \".jixo.env\");\n  if (fs.existsSync(cwdJixoEnvFilepath)) {\n    process.loadEnvFile(cwdJixoEnvFilepath);\n  }\n};\nloadJixoEnv(process.cwd());\n\nexport const safeEnv = defineEnv(\"JIXO\", {\n  DEEPSEEK_API_KEY: \"\",\n  DEEPSEEK_BASE_URL: \"\",\n\n  ANTHROPIC_API_KEY: \"\",\n  ANTHROPIC_BASE_URL: \"\",\n\n  OPENAI_API_KEY: \"\",\n  OPENAI_BASE_URL: \"\",\n  OPENAI_ORGANIZATION: \"\",\n\n  GOOGLE_API_KEY: \"\",\n  GOOGLE_BASE_URL: \"\",\n\n  XAI_BASE_URL: \"\",\n  XAI_API_KEY: \"\",\n\n  DEEPINFRA_BASE_URL: \"\",\n  DEEPINFRA_API_KEY: \"\",\n});\n"]}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;IACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACvD,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtC,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC,CAAC;AAEF,mFAAmF;AACnF,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAE3B,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE;IACvC,QAAQ,EAAE,uBAAuB;IACjC,OAAO,EAAE,EAAE;CACZ,CAAC,CAAC","sourcesContent":["import {defineEnv} from \"@gaubee/node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\n\nexport const loadJixoEnv = (dir: string) => {\n  const cwdJixoEnvFilepath = path.join(dir, \".jixo.env\");\n  if (fs.existsSync(cwdJixoEnvFilepath)) {\n    process.loadEnvFile(cwdJixoEnvFilepath);\n  }\n};\n\n// Load environment from the current working directory when the module is imported.\nloadJixoEnv(process.cwd());\n\nexport const safeEnv = defineEnv(\"JIXO\", {\n  CORE_URL: \"http://localhost:4111\",\n  API_KEY: \"\",\n});\n"]}

package/dist/helper/handle-ai-error.js

@@ -29,7 +29,7 @@ const handleAPICallError = async (error, loading) => {
     }
     try {
         if (error.isRetryable) {
-            const safeData = geminiErrorSchema.safeParse(error.data);
+            const safeData = geminiErrorSchema.safeParse(JSON.parse(error.responseBody));
             if (!safeData.success) {
                 throw safeData.error;
             }

package/dist/helper/handle-ai-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-ai-error.js","sourceRoot":"","sources":["../../src/helper/handle-ai-error.ts"],"names":[],"mappings":"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","sourcesContent":["import {gray, red, yellow, type Spinner} from \"@gaubee/nodekit\";\r\nimport {delay} from \"@gaubee/util\";\r\nimport {APICallError, RetryError} from \"ai\";\r\nimport ms from \"ms\";\r\nimport {match} from \"ts-pattern\";\r\nimport z from \"zod\";\r\ntype Loading = Pick<Spinner, \"prefixText\" | \"text\">;\r\n\r\nexport const handleError = async (error: unknown, loading: Loading) => {\r\n  for (const handle of [handleAPICallError, handleRetryError]) {\r\n    const matched = await handle(error, loading);\r\n    if (matched) {\r\n      return true;\r\n    }\r\n  }\r\n};\r\n\r\nconst handleRetryError = async (error: unknown, loading: Loading) => {\r\n  if (!RetryError.isInstance(error)) {\r\n    return;\r\n  }\r\n  for (const inner_error of error.errors) {\r\n    const matched = await handleAPICallError(inner_error, loading);\r\n    if (matched) {\r\n      return true;\r\n    }\r\n  }\r\n};\r\n\r\nconst handleAPICallError = async (error: unknown, loading: Loading) => {\r\n  if (!APICallError.isInstance(error)) {\r\n    return;\r\n  }\r\n  try {\r\n    if (error.isRetryable) {\r\n      const safeData = geminiErrorSchema.safeParse(error.data);\r\n      if (!safeData.success) {\r\n        throw safeData.error;\r\n      }\r\n      const retryDetail = safeData.data.error.details.find((d) => \"retryDelay\" in d);\r\n      if (retryDetail) {\r\n        const retryDelay = ms(retryDetail.retryDelay as ms.StringValue);\r\n\r\n        if (typeof retryDelay === \"number\") {\r\n          await waitRetryDelay(loading, retryDelay, (loading.text = yellow(error.message)));\r\n          return true;\r\n        }\r\n      }\r\n    } else {\r\n      const safeData = commonErrorSchema.safeParse(error.data);\r\n      if (!safeData.success) {\r\n        throw safeData.error;\r\n      }\r\n      await match(safeData.data.error)\r\n        /// 余额不足\r\n        .with({message: \"Insufficient Balance\"}, async () => {\r\n          /// 30s重试\r\n          await waitRetryDelay(loading, 1000 * 30, (loading.text = red(\"Insufficient Balance\") + \"\\n\" + red(error.url)));\r\n        })\r\n        .otherwise(() => {\r\n          throw error;\r\n        });\r\n      return true;\r\n    }\r\n  } catch {\r\n    console.error(\"\\nQAQ unknown error\", error);\r\n  }\r\n};\r\n\r\nconst commonErrorSchema = z.object({\r\n  error: z.object({\r\n    message: z.string(),\r\n    type: z.string(),\r\n    param: z.any(),\r\n    code: z.string(),\r\n  }),\r\n});\r\n\r\nconst geminiErrorSchema = z.object({\r\n  error: z.object({\r\n    code: z.number(),\r\n    message: z.string(),\r\n    status: z.string(),\r\n    details: z.array(\r\n      z.union([\r\n        z.object({\r\n          \"@type\": z.string(),\r\n          violations: z.array(\r\n            z.object({\r\n              quotaMetric: z.string(),\r\n              quotaId: z.string(),\r\n              quotaDimensions: z.object({\r\n                location: z.string(),\r\n                model: z.string(),\r\n              }),\r\n              quotaValue: z.string(),\r\n            }),\r\n          ),\r\n        }),\r\n        z.object({\r\n          \"@type\": z.string(),\r\n          links: z.array(z.object({description: z.string(), url: z.string()})),\r\n        }),\r\n        z.object({\"@type\": z.string(), retryDelay: z.string()}),\r\n      ]),\r\n    ),\r\n  }),\r\n});\r\n\r\nconst waitRetryDelay = async (loading: Loading, retryDelay: number, message: string) => {\r\n  const {prefixText, text} = loading;\r\n  let remainingDelay = retryDelay;\r\n  const tickInterval = 1000;\r\n  const tick = () => {\r\n    loading.prefixText = \"⏲️ \";\r\n    loading.text = [\r\n      //\r\n      message,\r\n      \" \" + gray(\"─\".repeat(Math.max(4, process.stdout.columns - 2))),\r\n      `Retrying in ${ms(remainingDelay)}...`,\r\n    ].join(\"\\n\");\r\n    remainingDelay -= tickInterval;\r\n  };\r\n  tick();\r\n\r\n  const ti = setInterval(tick, tickInterval);\r\n  await delay(retryDelay);\r\n  clearInterval(ti);\r\n\r\n  // 回滚\r\n  loading.prefixText = prefixText;\r\n  loading.text = text;\r\n};\r\n"]}
+{"version":3,"file":"handle-ai-error.js","sourceRoot":"","sources":["../../src/helper/handle-ai-error.ts"],"names":[],"mappings":"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","sourcesContent":["import {gray, red, yellow, type Spinner} from \"@gaubee/nodekit\";\r\nimport {delay} from \"@gaubee/util\";\r\nimport {APICallError, RetryError} from \"ai\";\r\nimport ms from \"ms\";\r\nimport {match} from \"ts-pattern\";\r\nimport z from \"zod\";\r\ntype Loading = Pick<Spinner, \"prefixText\" | \"text\">;\r\n\r\nexport const handleError = async (error: unknown, loading: Loading) => {\r\n  for (const handle of [handleAPICallError, handleRetryError]) {\r\n    const matched = await handle(error, loading);\r\n    if (matched) {\r\n      return true;\r\n    }\r\n  }\r\n};\r\n\r\nconst handleRetryError = async (error: unknown, loading: Loading) => {\r\n  if (!RetryError.isInstance(error)) {\r\n    return;\r\n  }\r\n  for (const inner_error of error.errors) {\r\n    const matched = await handleAPICallError(inner_error, loading);\r\n    if (matched) {\r\n      return true;\r\n    }\r\n  }\r\n};\r\n\r\nconst handleAPICallError = async (error: unknown, loading: Loading) => {\r\n  if (!APICallError.isInstance(error)) {\r\n    return;\r\n  }\r\n  try {\r\n    if (error.isRetryable) {\r\n      const safeData = geminiErrorSchema.safeParse(JSON.parse(error.responseBody!));\r\n      if (!safeData.success) {\r\n        throw safeData.error;\r\n      }\r\n      const retryDetail = safeData.data.error.details.find((d) => \"retryDelay\" in d);\r\n      if (retryDetail) {\r\n        const retryDelay = ms(retryDetail.retryDelay as ms.StringValue);\r\n\r\n        if (typeof retryDelay === \"number\") {\r\n          await waitRetryDelay(loading, retryDelay, (loading.text = yellow(error.message)));\r\n          return true;\r\n        }\r\n      }\r\n    } else {\r\n      const safeData = commonErrorSchema.safeParse(error.data);\r\n      if (!safeData.success) {\r\n        throw safeData.error;\r\n      }\r\n      await match(safeData.data.error)\r\n        /// 余额不足\r\n        .with({message: \"Insufficient Balance\"}, async () => {\r\n          /// 30s重试\r\n          await waitRetryDelay(loading, 1000 * 30, (loading.text = red(\"Insufficient Balance\") + \"\\n\" + red(error.url)));\r\n        })\r\n        .otherwise(() => {\r\n          throw error;\r\n        });\r\n      return true;\r\n    }\r\n  } catch {\r\n    console.error(\"\\nQAQ unknown error\", error);\r\n  }\r\n};\r\n\r\nconst commonErrorSchema = z.object({\r\n  error: z.object({\r\n    message: z.string(),\r\n    type: z.string(),\r\n    param: z.any(),\r\n    code: z.string(),\r\n  }),\r\n});\r\n\r\nconst geminiErrorSchema = z.object({\r\n  error: z.object({\r\n    code: z.number(),\r\n    message: z.string(),\r\n    status: z.string(),\r\n    details: z.array(\r\n      z.union([\r\n        z.object({\r\n          \"@type\": z.string(),\r\n          violations: z.array(\r\n            z.object({\r\n              quotaMetric: z.string(),\r\n              quotaId: z.string(),\r\n              quotaDimensions: z.object({\r\n                location: z.string(),\r\n                model: z.string(),\r\n              }),\r\n              quotaValue: z.string(),\r\n            }),\r\n          ),\r\n        }),\r\n        z.object({\r\n          \"@type\": z.string(),\r\n          links: z.array(z.object({description: z.string(), url: z.string()})),\r\n        }),\r\n        z.object({\"@type\": z.string(), retryDelay: z.string()}),\r\n      ]),\r\n    ),\r\n  }),\r\n});\r\n\r\nconst waitRetryDelay = async (loading: Loading, retryDelay: number, message: string) => {\r\n  const {prefixText, text} = loading;\r\n  let remainingDelay = retryDelay;\r\n  const tickInterval = 1000;\r\n  const tick = () => {\r\n    loading.prefixText = \"⏲️ \";\r\n    loading.text = [\r\n      //\r\n      message,\r\n      \" \" + gray(\"─\".repeat(Math.max(4, process.stdout.columns - 2))),\r\n      `Retrying in ${ms(remainingDelay)}...`,\r\n    ].join(\"\\n\");\r\n    remainingDelay -= tickInterval;\r\n  };\r\n  tick();\r\n\r\n  const ti = setInterval(tick, tickInterval);\r\n  await delay(retryDelay);\r\n  clearInterval(ti);\r\n\r\n  // 回滚\r\n  loading.prefixText = prefixText;\r\n  loading.text = text;\r\n};\r\n"]}

package/dist/helper/logger.d.ts

@@ -0,0 +1,3 @@
+import createDebug from "debug";
+export { createDebug };
+//# sourceMappingURL=logger.d.ts.map

package/dist/helper/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/helper/logger.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,MAAM,OAAO,CAAC;AAuBhC,OAAO,EAAC,WAAW,EAAC,CAAC"}

package/dist/helper/logger.js

@@ -0,0 +1,26 @@
+import { gray, red } from "@gaubee/nodekit";
+import { AISDKError } from "ai";
+import createDebug from "debug";
+createDebug.formatters.y = (v) => {
+    return JSON.stringify(v, (_k, v) => {
+        if (typeof v === "string") {
+            let slice_len = 0;
+            if (v.length > 200) {
+                slice_len = 50;
+            }
+            if (v.length > 100) {
+                slice_len = 30;
+            }
+            if (slice_len > 0) {
+                return `<string:${v.length}>${v.slice(0, slice_len)}${gray("...")}${v.slice(-slice_len)}`;
+            }
+            return v;
+        }
+        if (AISDKError.isInstance(v)) {
+            return red(v.message);
+        }
+        return v;
+    });
+};
+export { createDebug };
+//# sourceMappingURL=logger.js.map

package/dist/helper/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helper/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,IAAI,CAAC;AAC9B,OAAO,WAAW,MAAM,OAAO,CAAC;AAEhC,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE;IAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,IAAI,SAAS,GAAG,CAAC,CAAC;YAClB,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACnB,SAAS,GAAG,EAAE,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACnB,SAAS,GAAG,EAAE,CAAC;YACjB,CAAC;YACD,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAClB,OAAO,WAAW,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5F,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AACF,OAAO,EAAC,WAAW,EAAC,CAAC","sourcesContent":["import {gray, red} from \"@gaubee/nodekit\";\nimport {AISDKError} from \"ai\";\nimport createDebug from \"debug\";\n\ncreateDebug.formatters.y = (v) => {\n  return JSON.stringify(v, (_k, v) => {\n    if (typeof v === \"string\") {\n      let slice_len = 0;\n      if (v.length > 200) {\n        slice_len = 50;\n      }\n      if (v.length > 100) {\n        slice_len = 30;\n      }\n      if (slice_len > 0) {\n        return `<string:${v.length}>${v.slice(0, slice_len)}${gray(\"...\")}${v.slice(-slice_len)}`;\n      }\n      return v;\n    }\n    if (AISDKError.isInstance(v)) {\n      return red(v.message);\n    }\n    return v;\n  });\n};\nexport {createDebug};\n"]}

package/dist/helper/resolve-ai-tasks.d.ts

@@ -5,25 +5,26 @@ import { type JixoConfig } from "../config.js";
  * @param config_tasks
  * @returns
  */
-export declare const resolveAiTasks: (cwd: string, config_tasks: JixoConfig["tasks"]) => ({
+export declare const resolveAiTasks: (cwd: string, config_tasks: JixoConfig["tasks"], current_job_loop_count: number) => ({
     data: {
         [key: string]: any;
     };
     content: string;
 } & Readonly<{
-    name: string;
+    runner: string;
+    jobName: string;
+    loopCount: number;
     filepath: string;
-    exited: boolean;
+    exitCode: number | null;
     exitReason: string;
-    exit: (reason: string) => void;
+    exit: (code: number, reason: string) => void;
     cwd: string;
     dirs: string[];
     agents: string[];
     model: string;
     startTime: string;
     maxTurns: number;
-    executor: string;
-    allExecutors: string[];
+    otherRunners: string[];
     log: Readonly<{
         name: string;
         filepath: string;