@brierb/brier-cli 0.0.6 → 0.0.7

package/dist/config.js

@@ -1,9 +1,8 @@
 import { hostname as getHostname, type as osType, arch, platform, homedir } from 'node:os';
-import { execSync } from 'node:child_process';
-import { accessSync, constants, readFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { RUNTIME_REGISTRY } from './runtimes.js';
+import { resolveRuntimeExecutable, RUNTIME_REGISTRY } from './runtimes.js';
 export const BRIER_DIR = join(homedir(), '.brier');
 export const PID_FILE = join(BRIER_DIR, 'daemon.pid');
 export const LOG_FILE = join(BRIER_DIR, 'daemon.log');
@@ -42,40 +41,5 @@ export const toWsUrl = (serverUrl) => {
         .replace(/^http:\/\//, 'ws://')
         .replace(/\/$/, '') + '/tunnel');
 };
-// macOS 自带磁盘分区工具 gpt(8) 位于 /usr/sbin/gpt，会与 OpenAI 的 gpt CLI 同名，
-// macOS 自带磁盘分区工具 gpt(8) 位于 /usr/sbin/gpt，会与 OpenAI CLI 同名；
-// 命中 /sbin、/usr/sbin 视为「未安装」，避免误报。
-const SYSTEM_SBIN_RE = /^\/(usr\/)?sbin\//;
-// shell 内建命令（如 continue、cd、type）会被 `command -v` 返回为无路径的裸名，
-// 不是真实可执行文件，需排除。
-const isRealExecutablePath = (hit) => Boolean(hit) && hit.includes('/') && !SYSTEM_SBIN_RE.test(hit);
-const isExecutable = (file) => {
-    try {
-        accessSync(file, constants.X_OK);
-        return true;
-    }
-    catch {
-        return false;
-    }
-};
-const expandHome = (p) => (p.startsWith('~/') ? join(homedir(), p.slice(2)) : p);
-const detectRuntimes = () => {
-    const runtimes = [];
-    for (const { name, command, fallbacks } of RUNTIME_REGISTRY) {
-        let found = false;
-        try {
-            const hit = execSync(`command -v ${command}`, { stdio: 'pipe' }).toString().trim();
-            found = isRealExecutablePath(hit);
-        }
-        catch {
-            // 不在 PATH
-        }
-        if (!found) {
-            const candidates = fallbacks ?? [`~/.local/bin/${command}`];
-            found = candidates.some((p) => isExecutable(expandHome(p)));
-        }
-        if (found)
-            runtimes.push(name);
-    }
-    return runtimes;
-};
+/** 探测本机已安装的 AI runtime（与执行共用同一可执行文件解析）。 */
+const detectRuntimes = () => RUNTIME_REGISTRY.filter((r) => resolveRuntimeExecutable(r.name) !== null).map((r) => r.name);

package/dist/daemon/TaskExecutor.js

@@ -1,14 +1,19 @@
 import { spawn } from 'node:child_process';
 import { logger } from '../logger.js';
-import { RUNTIME_COMMANDS, RUNTIME_PROMPT_FLAGS } from '../runtimes.js';
+import { resolveRuntimeExecutable, RUNTIME_PROMPT_FLAGS } from '../runtimes.js';
 const MAX_CONCURRENT = 3;
 export const createTaskExecutor = (callbacks) => {
     const processes = new Map();
+    /**
+     * 解析要执行的命令：
+     * - 显式 command：直接用（调用方负责其可执行性）
+     * - runtime 模式：解析为**绝对路径**（PATH 或官方安装目录），
+     *   避免 daemon 进程 PATH 不含 runtime 目录时 spawn ENOENT
+     */
     const resolveCommand = (task) => {
         if (task.command)
             return task.command;
-        const mapped = RUNTIME_COMMANDS[task.runtime];
-        return mapped ?? null;
+        return resolveRuntimeExecutable(task.runtime);
     };
     /**
      * 拼执行参数：

package/dist/runtimes.js

@@ -1,3 +1,7 @@
+import { execSync } from 'node:child_process';
+import { accessSync, constants } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 export const RUNTIME_REGISTRY = [
     { name: 'Claude Code', command: 'claude', fallbacks: ['~/.claude/bin/claude'] },
     { name: 'Codex CLI', command: 'codex' },
@@ -20,10 +24,45 @@ export const RUNTIME_COMMANDS = Object.fromEntries(RUNTIME_REGISTRY.map((r) => [
  * `spawn(<command>, [...flags, prompt])`；未列出的 runtime 按裸参数执行。
  */
 export const RUNTIME_PROMPT_FLAGS = {
-    'OpenCode': ['run'],
+    OpenCode: ['run'],
     'Claude Code': ['-p'],
     'Codex CLI': ['exec'],
     'Gemini CLI': ['-p'],
-    'Aider': ['--message'],
-    'Goose': ['run'],
+    Aider: ['--message'],
+    Goose: ['run'],
+};
+// macOS 自带磁盘分区工具 gpt(8) 位于 /usr/sbin/gpt，命中系统目录视为未安装。
+const SYSTEM_SBIN_RE = /^\/(usr\/)?sbin\//;
+const isExecutable = (file) => {
+    try {
+        accessSync(file, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+const expandHome = (p) => (p.startsWith('~/') ? join(homedir(), p.slice(2)) : p);
+/**
+ * 解析 runtime 的可执行文件**绝对路径**：
+ * 1. PATH 中查找（排除系统目录误报，如 /usr/sbin/gpt）
+ * 2. 未命中则检查官方安装目录（如 opencode → ~/.opencode/bin/opencode）
+ *
+ * 探测（runtimes 上报）与执行（spawn 任务）都走这里，保证"探测到"的
+ * runtime 一定可被执行，不依赖 daemon 进程的 PATH。
+ */
+export const resolveRuntimeExecutable = (runtime) => {
+    const entry = RUNTIME_REGISTRY.find((r) => r.name === runtime);
+    if (!entry)
+        return null;
+    try {
+        const hit = execSync(`command -v ${entry.command}`, { stdio: 'pipe' }).toString().trim();
+        if (hit.includes('/') && !SYSTEM_SBIN_RE.test(hit))
+            return hit;
+    }
+    catch {
+        // 不在 PATH
+    }
+    const candidates = entry.fallbacks ?? [`~/.local/bin/${entry.command}`];
+    return candidates.map(expandHome).find(isExecutable) ?? null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brierb/brier-cli",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Brier 平台接入命令行工具：通过加密隧道将本机接入 Brier 远程编码池，接收并执行远程任务",
   "keywords": [
     "brier",

package/types/runtimes.d.ts

@@ -12,3 +12,12 @@ export declare const RUNTIME_COMMANDS: Record<string, string>;
  * `spawn(<command>, [...flags, prompt])`；未列出的 runtime 按裸参数执行。
  */
 export declare const RUNTIME_PROMPT_FLAGS: Record<string, readonly string[]>;
+/**
+ * 解析 runtime 的可执行文件**绝对路径**：
+ * 1. PATH 中查找（排除系统目录误报，如 /usr/sbin/gpt）
+ * 2. 未命中则检查官方安装目录（如 opencode → ~/.opencode/bin/opencode）
+ *
+ * 探测（runtimes 上报）与执行（spawn 任务）都走这里，保证"探测到"的
+ * runtime 一定可被执行，不依赖 daemon 进程的 PATH。
+ */
+export declare const resolveRuntimeExecutable: (runtime: string) => string | null;