@love-moon/conductor-cli 0.2.22 → 0.2.23

package/bin/conductor-config.js

@@ -12,9 +12,10 @@ import { RUNTIME_SUPPORTED_BACKENDS } from "../src/runtime-backends.js";
 
 const CONFIG_DIR = path.join(os.homedir(), ".conductor");
 const CONFIG_FILE = path.join(CONFIG_DIR, "config.yaml");
+const packageJson = JSON.parse(
+  fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
+);
 
-// 市面上主流 Coding CLI 配置
-// 格式: { name: { command: string, description: string, execArgs?: string } }
 const DEFAULT_CLIs = {
   claude: {
     command: "claude",
@@ -26,21 +27,11 @@ const DEFAULT_CLIs = {
     execArgs: "--dangerously-bypass-approvals-and-sandbox --ask-for-approval never",
     description: "OpenAI Codex CLI"
   },
-  // gemini: {
-  //   command: "gemini",
-  //   execArgs: "",
-  //   description: "Google Gemini CLI"
-  // },
   opencode: {
     command: "opencode",
     execArgs: "",
     description: "OpenCode CLI (Conductor runs opencode serve with permission=allow)"
   },
-  // kimi: {
-  //   command: "kimi",
-  //   execArgs: "--yolo --print --prompt",
-  //   description: "Kimi CLI"
-  // },
 };
 
 const backendUrl =
@@ -48,8 +39,8 @@ const backendUrl =
   process.env.BACKEND_URL ||
   "https://conductor-ai.top";
 const defaultDaemonName = os.hostname() || "my-daemon";
+const cliVersion = packageJson.version || "unknown";
 
-// ANSI 颜色代码
 const COLORS = {
   yellow: "\x1b[33m",
   green: "\x1b[32m",
@@ -58,6 +49,8 @@ const COLORS = {
   bold: "\x1b[1m"
 };
 
+let lastDeviceAuthConfig = null;
+
 function colorize(text, color) {
   return `${COLORS[color] || ""}${text}${COLORS.reset}`;
 }
@@ -79,11 +72,15 @@ function buildConfigEntryLines(cli, info, { commented = false } = {}) {
 }
 
 async function main() {
-  // 解析命令行参数
   const argv = yargs(hideBin(process.argv))
     .option("token", {
       type: "string",
-      description: "Conductor token (optional, will prompt if not provided)"
+      description: "Conductor token"
+    })
+    .option("manual", {
+      type: "boolean",
+      default: false,
+      description: "Enter token manually instead of browser device authorization"
     })
     .option("force", {
       type: "boolean",
@@ -96,13 +93,13 @@ async function main() {
       description: "Show help"
     })
     .usage("Usage: conductor config [options]")
-    .example("conductor config", "Interactive configuration")
-    .example("conductor config --token <your-token>", "Configure with token")
+    .example("conductor config", "Authorize this device in the browser and write config")
+    .example("conductor config --manual", "Enter token manually")
+    .example("conductor config --token <token>", "Configure with token")
     .example("conductor config --token <token> --force", "Force overwrite existing config")
     .help()
     .argv;
 
-  // 检查配置文件是否存在
   if (fs.existsSync(CONFIG_FILE) && !argv.force) {
     process.stderr.write(
       colorize(`Config already exists at ${CONFIG_FILE}. Use --force to overwrite.\n`, "yellow")
@@ -110,66 +107,68 @@ async function main() {
     process.exit(1);
   }
 
-  // 获取 token
-  let token = argv.token;
-  if (!token) {
-    token = await promptForToken();
-    if (!token) {
-      process.stderr.write(colorize("No token provided. Aborting.\n", "yellow"));
-      process.exit(1);
-    }
-  }
-
-  // 检测已安装的 CLI
+  let resolvedBackendUrl = backendUrl;
+  let resolvedWebsocketUrl = null;
   const detectedCLIs = detectInstalledCLIs();
 
-  // 如果没有检测到任何 CLI，显示警告
   if (detectedCLIs.length === 0) {
     console.log("");
     console.log(colorize("=".repeat(70), "yellow"));
     console.log(colorize("⚠️  WARNING: No coding CLI detected!", "yellow"));
     console.log(colorize("=".repeat(70), "yellow"));
-    console.log(colorize("", "yellow"));
+    console.log("");
     console.log(colorize("Conductor requires at least one coding CLI to work properly.", "yellow"));
-    console.log(colorize("", "yellow"));
+    console.log("");
     console.log(colorize("Please install one of the following CLIs first:", "yellow"));
     console.log("");
-    
-    Object.entries(DEFAULT_CLIs).forEach(([key, info]) => {
+
+    Object.entries(DEFAULT_CLIs).forEach(([, info]) => {
       console.log(`  • ${colorize(info.command, "cyan")} - ${info.description}`);
     });
-    
+
     console.log("");
     console.log(colorize("After installing a CLI, run 'conductor config' again.", "yellow"));
     console.log(colorize("=".repeat(70), "yellow"));
     console.log("");
-    
-    // 询问是否继续创建配置
+
     const shouldContinue = await promptYesNo(
       "Do you want to continue creating the config anyway? (y/N): "
     );
-    
+
     if (!shouldContinue) {
       process.exit(1);
     }
   } else {
-    // 显示检测到的 CLI
     console.log("");
     console.log(colorize("✓ Detected the following coding CLIs:", "green"));
-    detectedCLIs.forEach(cli => {
+    detectedCLIs.forEach((cli) => {
       const info = DEFAULT_CLIs[cli];
       console.log(`  • ${colorize(info.command, "cyan")} - ${info.description}`);
     });
     console.log("");
   }
 
-  // 创建配置目录
+  let token = argv.token;
+  if (!token) {
+    if (argv.manual) {
+      token = await promptForToken();
+      if (!token) {
+        process.stderr.write(colorize("No token provided. Aborting.\n", "yellow"));
+        process.exit(1);
+      }
+    } else {
+      const authResult = await authorizeDeviceAndGetToken();
+      token = authResult.agentToken;
+      resolvedBackendUrl = authResult.backendUrl || resolvedBackendUrl;
+      resolvedWebsocketUrl = authResult.websocketUrl || null;
+    }
+  }
+
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
 
-  // 构建配置内容
   const lines = [
     `agent_token: ${yamlQuote(token)}`,
-    `backend_url: ${yamlQuote(backendUrl)}`,
+    `backend_url: ${yamlQuote(resolvedBackendUrl)}`,
     `daemon_name: ${yamlQuote(defaultDaemonName)}`,
     "log_level: debug",
     "workspace: '~/ws/fires'",
@@ -178,14 +177,16 @@ async function main() {
     "allow_cli_list:"
   ];
 
-  // 添加检测到的 CLI 到配置
+  if (resolvedWebsocketUrl) {
+    lines.splice(2, 0, `websocket_url: ${yamlQuote(resolvedWebsocketUrl)}`);
+  }
+
   if (detectedCLIs.length > 0) {
-    detectedCLIs.forEach(cli => {
+    detectedCLIs.forEach((cli) => {
       const info = DEFAULT_CLIs[cli];
       lines.push(...buildConfigEntryLines(cli, info));
     });
   } else {
-    // 如果没有检测到任何 CLI，添加示例注释
     lines.push("  # No CLI detected. Add your installed CLI here:");
     Object.entries(DEFAULT_CLIs).forEach(([key, info]) => {
       lines.push(...buildConfigEntryLines(key, info, { commented: true }));
@@ -202,22 +203,18 @@ async function main() {
   );
 
   fs.writeFileSync(CONFIG_FILE, lines.join("\n"), "utf-8");
-  
+
   console.log(colorize(`✓ Wrote Conductor config to ${CONFIG_FILE}`, "green"));
-  
+
   if (detectedCLIs.length === 0) {
     console.log("");
     console.log(colorize("⚠️  Remember to install a coding CLI before using Conductor!", "yellow"));
   }
 }
 
-/**
- * 检测系统中已安装的 CLI
- * @returns {string[]} 已安装的 CLI key 列表
- */
 function detectInstalledCLIs() {
   const detected = [];
-  
+
   for (const [key, info] of Object.entries(DEFAULT_CLIs)) {
     if (!RUNTIME_SUPPORTED_BACKENDS.includes(key)) {
       continue;
@@ -226,52 +223,29 @@ function detectInstalledCLIs() {
       detected.push(key);
     }
   }
-  
+
   return detected;
 }
 
-/**
- * 检查命令是否在系统 PATH 中可用
- * @param {string} command - 命令名称
- * @returns {boolean}
- */
 function isCommandAvailable(command) {
   try {
     const platform = os.platform();
-    let checkCmd;
-    
-    if (platform === "win32") {
-      // Windows: 使用 where 命令
-      checkCmd = `where ${command}`;
-    } else {
-      // Unix/Linux/macOS: 使用 which 或 command -v
-      checkCmd = `command -v ${command}`;
-    }
-    
-    execSync(checkCmd, { 
+    const checkCmd = platform === "win32" ? `where ${command}` : `command -v ${command}`;
+    execSync(checkCmd, {
       stdio: "pipe",
-      timeout: 5000 
+      timeout: 5000
     });
     return true;
-  } catch (error) {
-    // 对于某些 CLI，可能有特定的检测方式
-    // 例如检查特定的配置文件或目录
+  } catch {
     return checkAlternativeInstallations(command);
   }
 }
 
-/**
- * 检查 CLI 的替代安装方式
- * @param {string} command - 命令名称
- * @returns {boolean}
- */
 function checkAlternativeInstallations(command) {
-  // 检查常见的全局安装路径
   const homeDir = os.homedir();
   const platform = os.platform();
-  
   const commonPaths = [];
-  
+
   if (platform === "win32") {
     commonPaths.push(
       path.join(homeDir, "AppData", "Roaming", "npm", `${command}.cmd`),
@@ -290,15 +264,89 @@ function checkAlternativeInstallations(command) {
       `/opt/${command}/bin/${command}`
     );
   }
-  
-  // 检查文件是否存在
-  for (const checkPath of commonPaths) {
-    if (fs.existsSync(checkPath)) {
-      return true;
+
+  return commonPaths.some((checkPath) => fs.existsSync(checkPath));
+}
+
+async function authorizeDeviceAndGetToken() {
+  const startResponse = await fetch(new URL("/api/auth/device/start", backendUrl), {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      cli_version: cliVersion,
+      hostname: defaultDaemonName,
+      platform: os.platform(),
+      backend_url: backendUrl,
+    }),
+  });
+  const startData = await parseJsonResponse(startResponse);
+  if (!startResponse.ok) {
+    throw new Error(startData.error || `Failed to start device authorization (${startResponse.status})`);
+  }
+
+  console.log("");
+  console.log(colorize("Open this link in your browser to authorize this device:", "cyan"));
+  console.log("");
+  console.log(`Device code: ${colorize(startData.user_code, "bold")}`);
+  console.log(`Direct link: ${startData.verification_uri_complete}`);
+  console.log("");
+  console.log("Only approve the request if the web page shows the same device code.");
+  console.log("");
+  console.log("Waiting for authorization...");
+
+  const intervalSeconds =
+    typeof startData.interval === "number" && Number.isFinite(startData.interval)
+      ? Math.max(1, startData.interval)
+      : 3;
+  const expiresInSeconds =
+    typeof startData.expires_in === "number" && Number.isFinite(startData.expires_in)
+      ? Math.max(intervalSeconds, startData.expires_in)
+      : 600;
+  const deadlineAt = Date.now() + expiresInSeconds * 1000;
+
+  while (Date.now() <= deadlineAt) {
+    await sleep(intervalSeconds * 1000);
+
+    const pollResponse = await fetch(new URL("/api/auth/device/poll", backendUrl), {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ device_code: startData.device_code }),
+    });
+    const pollData = await parseJsonResponse(pollResponse);
+    if (!pollResponse.ok) {
+      throw new Error(pollData.error || `Failed to poll device authorization (${pollResponse.status})`);
     }
+
+    if (pollData.status === "pending") {
+      continue;
+    }
+    if (pollData.status === "approved") {
+      const result = {
+        agentToken: pollData.agent_token,
+        backendUrl: pollData.backend_url || backendUrl,
+        websocketUrl: pollData.websocket_url || null,
+      };
+      lastDeviceAuthConfig = result;
+      console.log(colorize("✓ Device authorized", "green"));
+      return result;
+    }
+    if (pollData.status === "denied" || pollData.status === "expired" || pollData.status === "consumed") {
+      throw new Error(pollData.message || `Device authorization ${pollData.status}`);
+    }
+    if (pollData.error) {
+      throw new Error(pollData.error);
+    }
+  }
+
+  throw new Error("Device authorization timed out");
+}
+
+async function parseJsonResponse(response) {
+  try {
+    return await response.json();
+  } catch {
+    return {};
   }
-  
-  return false;
 }
 
 async function promptForToken() {
@@ -330,6 +378,12 @@ async function promptYesNo(question) {
   }
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
 function yamlQuote(value) {
   return JSON.stringify(value);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@love-moon/conductor-cli",
-  "version": "0.2.22",
-  "gitCommitId": "d04b18c",
+  "version": "0.2.23",
+  "gitCommitId": "e1d19e3",
   "type": "module",
   "bin": {
     "conductor": "bin/conductor.js"
@@ -17,8 +17,8 @@
     "test": "node --test test/*.test.js"
   },
   "dependencies": {
-    "@love-moon/ai-sdk": "0.2.22",
-    "@love-moon/conductor-sdk": "0.2.22",
+    "@love-moon/ai-sdk": "0.2.23",
+    "@love-moon/conductor-sdk": "0.2.23",
     "dotenv": "^16.4.5",
     "enquirer": "^2.4.1",
     "js-yaml": "^4.1.1",

package/src/daemon.js

@@ -284,6 +284,15 @@ export function startDaemon(config = {}, deps = {}) {
   let requestShutdown = async () => {};
   let shutdownSignalHandled = false;
   let forcedSignalExitHandled = false;
+  let processHandlersAttached = false;
+
+  const removeProcessListener = (eventName, handler) => {
+    if (typeof process.off === "function") {
+      process.off(eventName, handler);
+      return;
+    }
+    process.removeListener(eventName, handler);
+  };
 
   const exitAndReturn = (code) => {
     exitFn(code);
@@ -597,7 +606,6 @@ export function startDaemon(config = {}, deps = {}) {
     );
   };
 
-  process.on("exit", cleanupLock);
   const signalExitCode = (signal) => (signal === "SIGINT" ? 130 : 143);
   const handleSignal = (signal) => {
     if (shutdownSignalHandled) {
@@ -621,17 +629,33 @@ export function startDaemon(config = {}, deps = {}) {
       }
     })();
   };
-  process.on("SIGINT", () => {
+  const onSigInt = () => {
     handleSignal("SIGINT");
-  });
-  process.on("SIGTERM", () => {
+  };
+  const onSigTerm = () => {
     handleSignal("SIGTERM");
-  });
-  process.on("uncaughtException", (err) => {
+  };
+  const onUncaughtException = (err) => {
     logError(`Uncaught exception: ${err}`);
     cleanupLock();
     exitFn(1);
-  });
+  };
+  const detachProcessHandlers = () => {
+    if (!processHandlersAttached) {
+      return;
+    }
+    processHandlersAttached = false;
+    removeProcessListener("exit", cleanupLock);
+    removeProcessListener("SIGINT", onSigInt);
+    removeProcessListener("SIGTERM", onSigTerm);
+    removeProcessListener("uncaughtException", onUncaughtException);
+  };
+
+  process.on("exit", cleanupLock);
+  process.on("SIGINT", onSigInt);
+  process.on("SIGTERM", onSigTerm);
+  process.on("uncaughtException", onUncaughtException);
+  processHandlersAttached = true;
 
   if (config.CLEAN_ALL) {
     cleanAllAgents(BACKEND_HTTP, AGENT_TOKEN, fetchFn)
@@ -641,8 +665,11 @@ export function startDaemon(config = {}, deps = {}) {
       .catch((err) => {
         log(`Failed to clean daemons: ${err.message}`);
       })
-      .finally(() => exitFn(0));
-    return { close: () => {} };
+      .finally(() => {
+        detachProcessHandlers();
+        exitFn(0);
+      });
+    return { close: detachProcessHandlers };
   }
 
   log("Daemon starting...");
@@ -2946,6 +2973,7 @@ export function startDaemon(config = {}, deps = {}) {
 
   return {
     close: () => {
+      detachProcessHandlers();
       void shutdownDaemon();
     },
   };