@agentbean/daemon 0.1.28 → 0.1.31

package/dist/adapters/claude-code.js

@@ -11,6 +11,10 @@ function buildPrompt(input, systemPrompt) {
     parts.push(input.prompt);
     return parts.join('\n\n---\n\n');
 }
+function normalizeClaudeArgs(args) {
+    const filtered = (args ?? []).filter((arg) => arg !== '--bare');
+    return ['-p', ...filtered];
+}
 export class ClaudeCodeAdapter {
     opts;
     kind = 'claude-code';
@@ -21,7 +25,7 @@ export class ClaudeCodeAdapter {
         return new Promise((resolve, reject) => {
             const prompt = buildPrompt(input, this.opts.systemPrompt ?? input.systemPrompt);
             const cwd = input.workspace ?? this.opts.cwd ?? process.cwd();
-            const baseArgs = ['-p', '--bare', ...(this.opts.args ?? [])];
+            const baseArgs = normalizeClaudeArgs(this.opts.args);
             if (input.workspace)
                 baseArgs.push('--add-dir', input.workspace);
             baseArgs.push('--add-dir', join(homedir(), '.codex', 'generated_images'));

package/dist/adapters/codex.js

@@ -1,4 +1,6 @@
 import { spawn } from 'node-pty';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 function renderPayload(input, systemPrompt) {
     const parts = [];
     if (systemPrompt)
@@ -52,6 +54,19 @@ function adapterTimeoutMs() {
     const fromEnv = Number.parseInt(process.env.AGENTBEAN_CODEX_TIMEOUT_MS ?? '', 10);
     return Number.isFinite(fromEnv) && fromEnv > 0 ? fromEnv : 900_000;
 }
+function buildRuntimeEnv(extra) {
+    const pathEntries = [
+        process.env.PATH,
+        '/opt/homebrew/bin',
+        '/usr/local/bin',
+        join(homedir(), '.local/bin'),
+        join(homedir(), '.bun/bin'),
+        join(homedir(), '.npm-global/bin'),
+        join(homedir(), '.asdf/shims'),
+        join(homedir(), '.local/share/mise/shims'),
+    ].filter(Boolean).join(':');
+    return { ...process.env, PATH: pathEntries, ...(extra ?? {}) };
+}
 export class CodexAdapter {
     opts;
     kind = 'codex';
@@ -74,7 +89,7 @@ export class CodexAdapter {
                 cols: 80,
                 rows: 30,
                 cwd,
-                env: { ...process.env, ...(input.env ?? {}) },
+                env: buildRuntimeEnv(input.env),
             });
             const chunks = [];
             let finished = false;
@@ -128,7 +143,7 @@ export class CodexAdapter {
                 const pty = spawn('bash', ['-c', 'codex --version'], {
                     name: 'xterm-color', cols: 80, rows: 30,
                     cwd: this.opts.cwd ?? process.cwd(),
-                    env: process.env,
+                    env: buildRuntimeEnv(),
                 });
                 pty.onExit(({ exitCode }) => resolve({ ok: exitCode === 0, detail: exitCode === 0 ? undefined : `exit ${exitCode}` }));
             }

package/dist/device-daemon.js

@@ -1,7 +1,7 @@
 import { io } from 'socket.io-client';
 import { execFile } from 'node:child_process';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { basename, isAbsolute, join } from 'node:path';
 import { homedir } from 'node:os';
 import { promisify } from 'node:util';
 import { logger } from './log.js';
@@ -29,6 +29,58 @@ function agentSlug(name) {
 function scannedAgentId(deviceId, name) {
     return `scan-${deviceId}-${agentSlug(name)}`;
 }
+function normalizeAdapterKind(kind) {
+    const normalized = (kind ?? '').trim().toLowerCase().replace(/[_\s]+/g, '-');
+    if (normalized === 'claude' || normalized === 'claude-code')
+        return 'claude-code';
+    if (normalized === 'codex' || normalized === 'codex-cli')
+        return 'codex';
+    if (normalized === 'kimi' || normalized === 'kimi-cli')
+        return 'kimi-cli';
+    return normalized;
+}
+function runtimeScoreForCustomAgent(runtime, custom) {
+    if (!runtime.installed || !runtime.command?.trim())
+        return 0;
+    const runtimeCommand = runtime.command.trim();
+    const customCommand = custom.command?.trim() ?? '';
+    if (runtimeCommand && customCommand && runtimeCommand === customCommand)
+        return 100;
+    const runtimeBase = basename(runtimeCommand).toLowerCase();
+    const customBase = customCommand ? basename(customCommand).toLowerCase() : '';
+    if (runtimeBase && customBase && runtimeBase === customBase)
+        return 90;
+    const runtimeKind = normalizeAdapterKind(runtime.adapterKind);
+    const customKind = normalizeAdapterKind(custom.adapterKind);
+    if (runtimeKind === 'kimi-cli' && customKind === 'codex' && customCommand.toLowerCase().includes('kimi'))
+        return 85;
+    if (runtimeKind && customKind && runtimeKind === customKind)
+        return 70;
+    return 0;
+}
+export function resolveCustomAgentRuntime(custom, runtimes) {
+    const configured = custom.command?.trim() ?? '';
+    const configuredAbsoluteExists = configured && isAbsolute(configured) && existsSync(configured);
+    const bestRuntime = [...runtimes]
+        .map((runtime) => ({ runtime, score: runtimeScoreForCustomAgent(runtime, custom) }))
+        .filter((candidate) => candidate.score > 0)
+        .sort((a, b) => b.score - a.score)[0]?.runtime;
+    if (configuredAbsoluteExists) {
+        return { command: configured, runtime: bestRuntime };
+    }
+    if (bestRuntime?.command?.trim()) {
+        return { command: bestRuntime.command.trim(), runtime: bestRuntime };
+    }
+    if (configured && isAbsolute(configured) && !configuredAbsoluteExists) {
+        const fallback = basename(configured).trim();
+        if (fallback)
+            return { command: fallback };
+    }
+    if (!configured && normalizeAdapterKind(custom.adapterKind) === 'codex') {
+        return { command: 'codex' };
+    }
+    return { command: configured };
+}
 export function nativeDirectoryPickerCommands(platform = process.platform) {
     if (platform === 'darwin') {
         return [{ command: 'osascript', args: ['-e', 'POSIX path of (choose folder with prompt "选择项目目录")'] }];
@@ -184,10 +236,12 @@ export function createDeviceDaemon(cfg, agents) {
     const httpBase = cfg.server.url.replace(/\/agent$/, '');
     let firstConnect = true;
     const systemInfo = collectSystemInfo();
+    let latestRuntimes = [];
     const publicAgents = Array.from(agents.values())
         .filter((a) => a.visibility === 'public')
         .map((a) => a.publicMeta);
     function emitRegister(sock, payload) {
+        latestRuntimes = payload.runtimes.filter((runtime) => runtime.installed);
         if (payload.runtimes.length > 0) {
             sock.emit('device:register-runtimes', { runtimes: payload.runtimes }, (ack) => {
                 if (!ack?.ok)
@@ -323,8 +377,9 @@ export function createDeviceDaemon(cfg, agents) {
             });
             socket.on('dispatch', (req) => {
                 let agent = agents.get(req.agentId);
-                if (!agent && req.customAgent) {
+                if (req.customAgent) {
                     const custom = req.customAgent;
+                    const resolvedRuntime = resolveCustomAgentRuntime(custom, latestRuntimes);
                     const entry = {
                         id: custom.id,
                         name: custom.name,
@@ -332,7 +387,7 @@ export function createDeviceDaemon(cfg, agents) {
                         category: 'executor-hosted',
                         adapter: {
                             kind: custom.adapterKind,
-                            command: custom.command,
+                            command: resolvedRuntime.command,
                             args: custom.args ?? [],
                             cwd: custom.cwd ?? undefined,
                             workspace: custom.cwd ?? undefined,
@@ -343,7 +398,14 @@ export function createDeviceDaemon(cfg, agents) {
                     try {
                         agent = new AgentInstance(entry, pickAdapter(entry.adapter));
                         agents.set(req.agentId, agent);
-                        logger.info({ agentId: req.agentId, kind: entry.adapter.kind, cwd: entry.adapter.cwd }, 'custom agent instance created for dispatch');
+                        logger.info({
+                            agentId: req.agentId,
+                            kind: entry.adapter.kind,
+                            command: entry.adapter.command,
+                            configuredCommand: custom.command,
+                            runtimeCommand: resolvedRuntime.runtime?.command,
+                            cwd: entry.adapter.cwd,
+                        }, 'custom agent instance created for dispatch');
                     }
                     catch (err) {
                         logger.warn({ agentId: req.agentId, err: errorMessage(err) }, 'failed to create custom dispatch agent');

package/dist/scanner.js

@@ -285,14 +285,14 @@ async function checkOpenClawGateway() {
         return null;
     const status = await run(path, ["gateway", "status"]);
     const running = status.includes("running") || status.includes("✓");
-    if (running) {
-        const agentId = parseOpenClawAgentId(await run(path, ["agents", "list", "--json"])) ?? "main";
+    const agentId = parseOpenClawAgentId(await run(path, ["agents", "list", "--json"]));
+    if (running || agentId) {
         return {
             category: "agentos-hosted",
             name: "OpenClaw-Agent",
             adapterKind: "openclaw",
             command: path,
-            args: ["agent", "--agent", agentId],
+            args: ["agent", "--agent", agentId ?? "main"],
             source: "gateway",
         };
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agentbean/daemon",
   "private": false,
-  "version": "0.1.28",
+  "version": "0.1.31",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {