@brierb/brier-cli 0.0.4 → 0.0.6

package/dist/config.js

@@ -1,11 +1,23 @@
-import { hostname as getHostname, type as osType, arch, platform } from 'node:os';
+import { hostname as getHostname, type as osType, arch, platform, homedir } from 'node:os';
 import { execSync } from 'node:child_process';
-import { homedir } from 'node:os';
+import { accessSync, constants, readFileSync } from 'node:fs';
 import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { 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');
+/** CLI 自身版本（读取 dist 同级的 package.json）。 */
+const readCliVersion = () => {
+    try {
+        const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url));
+        const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+        return pkg.version ?? 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+};
 export const loadConfig = (options) => {
     const serverUrl = options.serverUrl ?? process.env.BRIER_SERVER_URL;
     const token = options.token ?? process.env.BRIER_TOKEN;
@@ -21,6 +33,7 @@ export const loadConfig = (options) => {
         hostname: getHostname(),
         os: `${osType()} ${platform()} ${arch()}`,
         runtimes: detectRuntimes(),
+        version: readCliVersion(),
     };
 };
 export const toWsUrl = (serverUrl) => {
@@ -29,16 +42,40 @@ 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 } of RUNTIME_REGISTRY) {
+    for (const { name, command, fallbacks } of RUNTIME_REGISTRY) {
+        let found = false;
         try {
-            execSync(`command -v ${command}`, { stdio: 'pipe' });
-            runtimes.push(name);
+            const hit = execSync(`command -v ${command}`, { stdio: 'pipe' }).toString().trim();
+            found = isRealExecutablePath(hit);
         }
         catch {
-            // not installed
+            // 不在 PATH
         }
+        if (!found) {
+            const candidates = fallbacks ?? [`~/.local/bin/${command}`];
+            found = candidates.some((p) => isExecutable(expandHome(p)));
+        }
+        if (found)
+            runtimes.push(name);
     }
     return runtimes;
 };

package/dist/daemon/TaskExecutor.js

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 import { logger } from '../logger.js';
-import { RUNTIME_COMMANDS } from '../runtimes.js';
+import { RUNTIME_COMMANDS, RUNTIME_PROMPT_FLAGS } from '../runtimes.js';
 const MAX_CONCURRENT = 3;
 export const createTaskExecutor = (callbacks) => {
     const processes = new Map();
@@ -8,9 +8,19 @@ export const createTaskExecutor = (callbacks) => {
         if (task.command)
             return task.command;
         const mapped = RUNTIME_COMMANDS[task.runtime];
-        if (mapped)
-            return mapped;
-        throw new Error(`Cannot resolve command for runtime: ${task.runtime}`);
+        return mapped ?? null;
+    };
+    /**
+     * 拼执行参数：
+     * - prompt 模式（AI runtime）：命令前缀 flags + prompt 原文
+     * - 命令模式：透传服务端给的 args
+     */
+    const buildArgs = (task) => {
+        if (task.prompt) {
+            const flags = RUNTIME_PROMPT_FLAGS[task.runtime] ?? [];
+            return [...flags, task.prompt];
+        }
+        return task.args ?? [];
     };
     const execute = (task) => {
         if (processes.has(task.taskId)) {
@@ -22,11 +32,16 @@ export const createTaskExecutor = (callbacks) => {
             return;
         }
         const cmd = resolveCommand(task);
+        if (!cmd) {
+            callbacks.onError(task.taskId, `Cannot resolve command for runtime: ${task.runtime} (no command provided)`);
+            return;
+        }
+        const args = buildArgs(task);
         const childEnv = task.env ? { ...process.env, ...task.env } : process.env;
-        logger.info(`Task ${task.taskId} starting: ${cmd} ${task.args.join(' ')}`, task.runtime);
+        logger.info(`Task ${task.taskId} starting: ${cmd} ${args.join(' ')}`, task.runtime);
         let child;
         try {
-            child = spawn(cmd, task.args, {
+            child = spawn(cmd, args, {
                 cwd: task.cwd,
                 env: childEnv,
                 stdio: ['pipe', 'pipe', 'pipe'],

package/dist/runtimes.js

@@ -1,10 +1,29 @@
 export const RUNTIME_REGISTRY = [
-    { name: 'Claude Code', command: 'claude' },
+    { name: 'Claude Code', command: 'claude', fallbacks: ['~/.claude/bin/claude'] },
     { name: 'Codex CLI', command: 'codex' },
-    { name: 'GPT-4o CLI', command: 'gpt' },
+    { name: 'OpenAI CLI', command: 'openai' },
     { name: 'Gemini CLI', command: 'gemini' },
     { name: 'Cursor CLI', command: 'cursor' },
-    { name: 'Node.js', command: 'node' },
-    { name: 'Python', command: 'python3' },
+    {
+        name: 'OpenCode',
+        command: 'opencode',
+        fallbacks: ['~/.opencode/bin/opencode', '~/.local/bin/opencode'],
+    },
+    { name: 'Aider', command: 'aider', fallbacks: ['~/.local/bin/aider'] },
+    { name: 'Goose', command: 'goose', fallbacks: ['~/.local/bin/goose'] },
+    { name: 'Cody', command: 'cody', fallbacks: ['~/.local/bin/cody'] },
 ];
 export const RUNTIME_COMMANDS = Object.fromEntries(RUNTIME_REGISTRY.map((r) => [r.name, r.command]));
+/**
+ * AI runtime 单次（非交互）执行参数模板：命令前缀 flags，后面紧跟 prompt。
+ * 服务端 task-start 携带 prompt 时，CLI 用它拼出
+ * `spawn(<command>, [...flags, prompt])`；未列出的 runtime 按裸参数执行。
+ */
+export const RUNTIME_PROMPT_FLAGS = {
+    'OpenCode': ['run'],
+    'Claude Code': ['-p'],
+    'Codex CLI': ['exec'],
+    'Gemini CLI': ['-p'],
+    'Aider': ['--message'],
+    'Goose': ['run'],
+};

package/dist/tunnel/TunnelClient.js

@@ -84,6 +84,7 @@ export const createTunnelClient = (config, taskExecutor) => {
                     args: message.args,
                     cwd: message.cwd,
                     env: message.env,
+                    prompt: message.prompt,
                 });
                 break;
             case 'task-cancel':
@@ -138,6 +139,7 @@ export const createTunnelClient = (config, taskExecutor) => {
                 hostname: config.hostname,
                 os: config.os,
                 runtimes: config.runtimes,
+                version: config.version,
             });
         });
         ws.on('message', (data) => {

package/package.json

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

package/types/runtimes.d.ts

@@ -1,6 +1,14 @@
 export interface RuntimeEntry {
     name: string;
     command: string;
+    /** 命令不在 PATH 时的兜底可执行文件（~ 开头表示用户主目录），存在即视为已安装 */
+    fallbacks?: readonly string[];
 }
 export declare const RUNTIME_REGISTRY: readonly RuntimeEntry[];
 export declare const RUNTIME_COMMANDS: Record<string, string>;
+/**
+ * AI runtime 单次（非交互）执行参数模板：命令前缀 flags，后面紧跟 prompt。
+ * 服务端 task-start 携带 prompt 时，CLI 用它拼出
+ * `spawn(<command>, [...flags, prompt])`；未列出的 runtime 按裸参数执行。
+ */
+export declare const RUNTIME_PROMPT_FLAGS: Record<string, readonly string[]>;

package/types/types.d.ts

@@ -7,6 +7,7 @@ export type ClientMessage = {
     hostname: string;
     os: string;
     runtimes: string[];
+    version?: string;
 } | {
     type: 'heartbeat';
     timestamp: number;
@@ -44,6 +45,7 @@ export type ServerMessage = {
     args: string[];
     cwd?: string;
     env?: Record<string, string>;
+    prompt?: string;
 } | {
     type: 'task-cancel';
     taskId: string;
@@ -57,6 +59,8 @@ export interface TaskInfo {
     args: string[];
     cwd?: string;
     env?: Record<string, string>;
+    /** 自然语言指令（AI runtime 模式：拼到 runtime 命令参数中执行） */
+    prompt?: string;
 }
 export interface DaemonConfig {
     serverUrl: string;
@@ -64,6 +68,8 @@ export interface DaemonConfig {
     hostname: string;
     os: string;
     runtimes: string[];
+    /** CLI 自身版本（package.json），Auth 时上报给服务端展示。 */
+    version: string;
 }
 export interface PidFileData {
     pid: number;