nolo-cli 0.1.41 → 0.1.43

package/ai/agent/cliExecutor.ts

@@ -1,7 +1,7 @@
 /**
  * CLI Executor - 通过命令行工具执行 AI 任务
  *
- * 设计为可扩展：当前支持 Copilot CLI、Gemini CLI、Codex CLI、Claude CLI 与 Antigravity CLI。
+ * 设计为可扩展：当前支持 Copilot CLI、Gemini CLI、Codex CLI、Claude CLI、Antigravity CLI 与 Qoder CLI。
  *
  * 注意：
  * - CLI provider 与普通 model 路由共享 prompt / model / 最近文本上下文这些能力面
@@ -18,13 +18,14 @@ import { randomUUID } from "node:crypto";
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
 import { tmpdir } from "node:os";
+import { StringDecoder } from "node:string_decoder";
 import { resolveLaunchableCodexCommand } from "../../connector-experimental/codexBinary";
 import { buildCliPrompt } from "./cliPrompt";
 
 // ── 类型定义 ──────────────────────────────────────────────────────────────────
 
 /** 已支持的 CLI 工具。新增时在此联合类型追加，并在 EXECUTORS 里注册实现 */
-export type CliProvider = "copilot" | "gemini" | "codex" | "claude" | "agy";
+export type CliProvider = "copilot" | "gemini" | "codex" | "claude" | "agy" | "qoder";
 
 /**
  * CLI provider 图片输入。
@@ -71,6 +72,16 @@ type CliSessionMessage = {
 };
 
 const DEFAULT_AGY_TIMEOUT_MS = 600_000;
+const BUFFERED_STREAMING_PROVIDERS = new Set<CliProvider>([
+  "codex",
+  "claude",
+  "agy",
+  "qoder",
+]);
+
+export function isBufferedCliStreamingProvider(provider: CliProvider): boolean {
+  return BUFFERED_STREAMING_PROVIDERS.has(provider);
+}
 
 export interface CliSessionHandle {
   sessionId: string;
@@ -159,12 +170,39 @@ function normalizeProxyEnv(env: Record<string, string | undefined>): Record<stri
 }
 
 function buildCliProcessEnv(extraEnv?: Record<string, string | undefined>) {
+  const baseEnv = {
+    ...process.env,
+    ...extraEnv,
+    NO_COLOR: "1",
+  };
+
+  // Enhance PATH on macOS so GUI-launched app can find brew/local tools
+  if (process.platform === "darwin") {
+    const defaultMacPaths = [
+      `${process.env.HOME || ""}/.local/bin`,
+      "/opt/homebrew/bin",
+      "/opt/homebrew/sbin",
+      "/usr/local/bin",
+      "/usr/local/sbin",
+      `${process.env.HOME || ""}/.bun/bin`,
+      `${process.env.HOME || ""}/Library/pnpm`,
+      `${process.env.HOME || ""}/.npm-global/bin`,
+      `${process.env.HOME || ""}/bin`,
+    ];
+    const existingPath = baseEnv.PATH || "/usr/bin:/bin:/usr/sbin:/sbin";
+    const paths = existingPath.split(":");
+    for (const p of defaultMacPaths) {
+      if (p && !paths.includes(p)) {
+        paths.unshift(p); // Put brew/local paths at the front
+      }
+    }
+    baseEnv.PATH = paths.join(":");
+  }
+
   return Object.fromEntries(
-    Object.entries(normalizeProxyEnv({
-      ...process.env,
-      ...extraEnv,
-      NO_COLOR: "1",
-    })).filter((entry): entry is [string, string] => typeof entry[1] === "string")
+    Object.entries(normalizeProxyEnv(baseEnv)).filter(
+      (entry): entry is [string, string] => typeof entry[1] === "string"
+    )
   );
 }
 
@@ -178,6 +216,8 @@ function getCliProviderLabel(provider: CliProvider): string {
       return "Copilot CLI";
     case "agy":
       return "Antigravity CLI";
+    case "qoder":
+      return "Qoder CLI";
     case "gemini":
       return "Gemini CLI";
   }
@@ -194,7 +234,7 @@ function supportsModel(provider: CliProvider): boolean {
 }
 
 function supportsReasoningEffort(provider: CliProvider): boolean {
-  return provider === "claude" || provider === "copilot";
+  return provider === "claude" || provider === "copilot" || provider === "qoder";
 }
 
 function shouldPassClaudeModel(options: CliExecuteOptions): boolean {
@@ -626,8 +666,8 @@ function executeCodex(
       env: buildCliProcessEnv(options.env),
       stdio: ["ignore", "pipe", "pipe"],
     });
-    let stdout = "";
-    let stderr = "";
+    const stdout = createUtf8Collector();
+    const stderr = createUtf8Collector();
     let timer: ReturnType<typeof setTimeout> | undefined;
 
     if (timeout > 0) {
@@ -638,22 +678,24 @@ function executeCodex(
     }
 
     proc.stdout.on("data", (data: Buffer) => {
-      stdout += data.toString();
+      stdout.write(data);
     });
 
     proc.stderr.on("data", (data: Buffer) => {
-      stderr += data.toString();
+      stderr.write(data);
     });
 
     proc.on("close", (code) => {
       if (timer) clearTimeout(timer);
+      const stdoutText = stdout.end();
+      const stderrText = stderr.end();
       if (code !== 0 && code !== null) {
         rmSync(tempDir, { recursive: true, force: true });
-        reject(new Error(`Codex CLI exited with code ${code}\nstderr: ${stderr}`));
+        reject(new Error(`Codex CLI exited with code ${code}\nstderr: ${stderrText}`));
         return;
       }
 
-      let text = stdout.trim();
+      let text = stdoutText.trim();
       try {
         const lastMessage = readFileSync(outputFile, "utf8").trim();
         if (lastMessage) text = lastMessage;
@@ -665,7 +707,7 @@ function executeCodex(
 
       resolve({
         text,
-        raw: stdout,
+        raw: stdoutText,
         elapsed: Date.now() - start,
       });
     });
@@ -716,8 +758,8 @@ function executeClaude(
       env: buildCliProcessEnv(options.env),
       stdio: ["ignore", "pipe", "pipe"],
     });
-    let stdout = "";
-    let stderr = "";
+    const stdout = createUtf8Collector();
+    const stderr = createUtf8Collector();
     let timer: ReturnType<typeof setTimeout> | undefined;
 
     if (timeout > 0) {
@@ -728,23 +770,25 @@ function executeClaude(
     }
 
     proc.stdout.on("data", (data: Buffer) => {
-      stdout += data.toString();
+      stdout.write(data);
     });
 
     proc.stderr.on("data", (data: Buffer) => {
-      stderr += data.toString();
+      stderr.write(data);
     });
 
     proc.on("close", (code) => {
       if (timer) clearTimeout(timer);
+      const stdoutText = stdout.end();
+      const stderrText = stderr.end();
       if (code !== 0 && code !== null) {
-        reject(new Error(`Claude CLI exited with code ${code}\nstderr: ${stderr}`));
+        reject(new Error(`Claude CLI exited with code ${code}\nstderr: ${stderrText}`));
         return;
       }
 
       resolve({
-        text: stdout.trim(),
-        raw: stdout,
+        text: stdoutText.trim(),
+        raw: stdoutText,
         elapsed: Date.now() - start,
       });
     });
@@ -765,6 +809,35 @@ function tailText(value: string, maxChars = 1200): string {
   return value.slice(value.length - maxChars);
 }
 
+function createUtf8Collector() {
+  const decoder = new StringDecoder("utf8");
+  let text = "";
+  let ended = false;
+  const finish = () => {
+    if (ended) return "";
+    ended = true;
+    const chunk = decoder.end();
+    if (chunk) text += chunk;
+    return chunk;
+  };
+  return {
+    write(data: Buffer): string {
+      if (ended) return "";
+      const chunk = decoder.write(data);
+      text += chunk;
+      return chunk;
+    },
+    finish,
+    end(): string {
+      finish();
+      return text;
+    },
+    get text() {
+      return text;
+    },
+  };
+}
+
 function terminateCliProcessGroup(
   proc: ReturnType<typeof spawn>,
   signal: NodeJS.Signals
@@ -827,8 +900,8 @@ function executeAgy(
       stdio: ["ignore", "pipe", "pipe"],
       detached: process.platform !== "win32",
     });
-    let stdout = "";
-    let stderr = "";
+    const stdout = createUtf8Collector();
+    const stderr = createUtf8Collector();
     let timer: ReturnType<typeof setTimeout> | undefined;
     let forceTimer: ReturnType<typeof setTimeout> | undefined;
     let settled = false;
@@ -846,16 +919,16 @@ function executeAgy(
         forceTimer = setTimeout(() => {
           terminateCliProcessGroup(proc, "SIGKILL");
         }, 3_000);
-        reject(buildAgyTimeoutError(timeout, stdout, stderr));
+        reject(buildAgyTimeoutError(timeout, stdout.end(), stderr.end()));
       }, timeout + 1_000);
     }
 
     proc.stdout.on("data", (data: Buffer) => {
-      stdout += data.toString();
+      stdout.write(data);
     });
 
     proc.stderr.on("data", (data: Buffer) => {
-      stderr += data.toString();
+      stderr.write(data);
     });
 
     proc.on("close", (code) => {
@@ -865,14 +938,17 @@ function executeAgy(
       }
       settled = true;
       clearTimers();
+      const stdoutText = stdout.end();
+      const stderrText = stderr.end();
       if (code !== 0 && code !== null) {
-        reject(new Error(`Antigravity CLI exited with code ${code}\nstderr: ${stderr}`));
+        console.error("[cliExecutor] agy process exited with non-zero code:", code, "stderr:", stderrText);
+        reject(new Error(`Antigravity CLI exited with code ${code}\nstderr: ${stderrText}`));
         return;
       }
 
       resolve({
-        text: stdout.trim(),
-        raw: stdout,
+        text: stdoutText.trim(),
+        raw: stdoutText,
         elapsed: Date.now() - start,
       });
     });
@@ -881,6 +957,83 @@ function executeAgy(
       if (settled) return;
       settled = true;
       clearTimers();
+      console.error("[cliExecutor] agy process error event:", err);
+      reject(err);
+    });
+  });
+}
+
+function executeQoder(
+  prompt: string,
+  options: CliExecuteOptions
+): Promise<CliExecuteResult> {
+  const {
+    model,
+    reasoningEffort,
+    timeout = 120_000,
+    cwd = process.cwd(),
+    yolo = true,
+  } = options;
+
+  return new Promise((resolve, reject) => {
+    const args = ["-p", prompt, "--cwd", cwd];
+    if (model) {
+      args.push("--model");
+      args.push(model);
+    }
+    if (reasoningEffort) {
+      args.push("--reasoning-effort");
+      args.push(reasoningEffort);
+    }
+    if (yolo) {
+      args.push("--dangerously-skip-permissions");
+    }
+
+    const start = Date.now();
+    const proc = spawn("qoder", args, {
+      cwd,
+      env: buildCliProcessEnv(options.env),
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    const stdout = createUtf8Collector();
+    const stderr = createUtf8Collector();
+    let timer: ReturnType<typeof setTimeout> | undefined;
+
+    if (timeout > 0) {
+      timer = setTimeout(() => {
+        proc.kill("SIGTERM");
+        reject(new Error(`Qoder CLI timed out after ${timeout}ms`));
+      }, timeout);
+    }
+
+    proc.stdout.on("data", (data: Buffer) => {
+      stdout.write(data);
+    });
+
+    proc.stderr.on("data", (data: Buffer) => {
+      stderr.write(data);
+    });
+
+    proc.on("close", (code) => {
+      if (timer) clearTimeout(timer);
+      const stdoutText = stdout.end();
+      const stderrText = stderr.end();
+      if (code !== 0 && code !== null) {
+        console.error("[cliExecutor] qoder process exited with non-zero code:", code, "stderr:", stderrText);
+        reject(new Error(`Qoder CLI exited with code ${code}\nstderr: ${stderrText}`));
+        return;
+      }
+
+      resolve({
+        text: stdoutText.trim(),
+        raw: stdoutText,
+        elapsed: Date.now() - start,
+      });
+    });
+
+    proc.on("error", (err) => {
+      if (timer) clearTimeout(timer);
+      console.error("[cliExecutor] qoder process error event:", err);
       reject(err);
     });
   });
@@ -897,6 +1050,7 @@ const EXECUTORS: Record<
   codex: executeCodex,
   claude: executeClaude,
   agy: executeAgy,
+  qoder: executeQoder,
 };
 
 function formatCliSessionTask(messages: CliSessionMessage[]): string {
@@ -933,7 +1087,7 @@ function getCliSessionOrThrow(sessionId: string): CliSessionState {
 /**
  * 执行 CLI 任务
  *
- * @param provider  CLI 工具类型（如 "copilot" | "gemini" | "codex" | "claude" | "agy"）
+ * @param provider  CLI 工具类型（如 "copilot" | "gemini" | "codex" | "claude" | "agy" | "qoder"）
  * @param prompt    完整 prompt（system prompt 已由调用方拼好）
  * @param options   执行选项
  */
@@ -1119,7 +1273,7 @@ export function executeCliStreaming(
       })
     );
   }
-  if (provider === "agy") {
+  if (provider === "agy" || provider === "qoder") {
     return withCleanup(
       executor(resolved.prompt, resolved.options).then((result) => {
         const merged = { ...result, warnings: [...resolved.warnings, ...(result.warnings ?? [])] };
@@ -1158,10 +1312,10 @@ export function executeCliStreaming(
     const start = Date.now();
     const proc = spawn("gh", args, {
       cwd,
-      env: { ...process.env, NO_COLOR: "1" },
+      env: buildCliProcessEnv(resolved.options.env),
     });
 
-    let raw = "";
+    const stdout = createUtf8Collector();
     let timer: ReturnType<typeof setTimeout> | undefined;
 
     if (timeout > 0) {
@@ -1172,8 +1326,7 @@ export function executeCliStreaming(
     }
 
     proc.stdout.on("data", (data: Buffer) => {
-      const chunk = data.toString();
-      raw += chunk;
+      const chunk = stdout.write(data);
       // 过滤噪音行后再推送
       const cleaned = chunk
         .split("\n")
@@ -1184,6 +1337,7 @@ export function executeCliStreaming(
 
     proc.on("close", (code) => {
       if (timer) clearTimeout(timer);
+      const raw = stdout.end();
       if (code !== 0 && code !== null) {
         reject(new Error(`Copilot CLI exited with code ${code}`));
         return;
@@ -1228,11 +1382,14 @@ function executeGeminiStreaming(
     const start = Date.now();
     const proc = spawn("gemini", args, {
       cwd,
-      env: { ...process.env, NO_COLOR: "1", NODE_OPTIONS: "--no-deprecation" },
+      env: buildCliProcessEnv({
+        ...options.env,
+        NODE_OPTIONS: "--no-deprecation",
+      }),
     });
 
-    let raw = "";
-    let stderr = "";
+    const stdout = createUtf8Collector();
+    const stderr = createUtf8Collector();
     let lineBuffer = "";
     let timer: ReturnType<typeof setTimeout> | undefined;
 
@@ -1257,8 +1414,7 @@ function executeGeminiStreaming(
     }
 
     proc.stdout.on("data", (data: Buffer) => {
-      const chunk = data.toString();
-      raw += chunk;
+      const chunk = stdout.write(data);
       lineBuffer += chunk;
 
       let newlineIndex = lineBuffer.indexOf("\n");
@@ -1279,15 +1435,18 @@ function executeGeminiStreaming(
     });
 
     proc.stderr.on("data", (data: Buffer) => {
-      stderr += data.toString();
+      stderr.write(data);
     });
 
     proc.on("close", (code) => {
       if (timer) clearTimeout(timer);
+      lineBuffer += stdout.finish();
+      const raw = stdout.text;
+      const stderrText = stderr.end();
       flushLineBuffer();
 
       if (code !== 0 && code !== null) {
-        reject(new Error(`Gemini CLI exited with code ${code}\nstderr: ${stderr}`));
+        reject(new Error(`Gemini CLI exited with code ${code}\nstderr: ${stderrText}`));
         return;
       }
 

package/ai/agent/createAgentSchema.ts

@@ -89,10 +89,10 @@ export const getCreateAgentSchema = (t: TFunction) =>
       }).optional(),
 
       /**
-       * CLI provider（apiSource=cli 时有效）：支持 "copilot" | "gemini" | "codex" | "claude" | "agy"
+       * CLI provider（apiSource=cli 时有效）：支持 "copilot" | "gemini" | "codex" | "claude" | "agy" | "qoder"
        */
       cliProvider: z
-        .enum(["copilot", "gemini", "codex", "claude", "agy"])
+        .enum(["copilot", "gemini", "codex", "claude", "agy", "qoder"])
         .optional()
         .or(z.literal("")),
 

package/ai/agent/liveAudioModel.ts

@@ -1,2 +1,2 @@
 export const DEFAULT_GOOGLE_LIVE_AUDIO_MODEL =
-  "gemini-2.5-flash-native-audio-preview-12-2025";
+  "gemini-3.1-flash-live-preview";