@agentbean/daemon 0.1.4 → 0.1.5

package/README.md

@@ -14,7 +14,7 @@ npm test       # 运行测试
 ### 带配置文件启动
 
 ```bash
-npx tsx src/index.ts ~/.agentbean/device-agent.yaml
+npx tsx src/bin.ts ~/.agentbean/device-agent.yaml
 ```
 
 ### 自动扫描模式
@@ -22,7 +22,7 @@ npx tsx src/index.ts ~/.agentbean/device-agent.yaml
 如果不提供配置文件，或配置文件中 `agents` 数组为空，Daemon 会自动扫描本机 Agent：
 
 ```bash
-npx tsx src/index.ts
+npx tsx src/bin.ts
 # 扫描 Coding Agent (which claude-code, codex, kimi...)
 # 扫描 AgentOS Gateway (localhost:PORT)
 # 扫描 ~/.agentbean/agents/ 目录
@@ -34,7 +34,7 @@ npx tsx src/index.ts
 
 ```yaml
 deviceId: my-macbook-pro      # 设备标识
-networkId: default            # 所属网络
+networkId: default            # 所属团队
 server:
   url: http://localhost:3000/agent    # Server Socket.IO 地址
   token: default:default:dev-token-change-me    # 三截 token
@@ -155,4 +155,4 @@ interface CliAdapter {
 | `SERVER_URL` | Server WebSocket 地址 |
 | `SERVER_TOKEN` | 接入令牌 |
 | `DEVICE_ID` | 设备标识 |
-| `NETWORK_ID` | 所属网络 |
+| `NETWORK_ID` | 所属团队 |

package/dist/adapters/hermes.js

@@ -25,6 +25,40 @@ function buildPrompt(input, systemPrompt) {
     parts.push(input.prompt);
     return parts.join('\n\n---\n\n');
 }
+const ANSI_RE = /\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+const BOX_ONLY_RE = /^[\s─━═╭╮╰╯│┃┌┐└┘├┤┬┴┼]+$/;
+export function extractHermesReply(output) {
+    const lines = output
+        .replace(ANSI_RE, '')
+        .replace(/\r\n?/g, '\n')
+        .split('\n');
+    const cleaned = lines
+        .map((line) => line.trimEnd())
+        .filter((line) => {
+        const trimmed = line.trim();
+        if (!trimmed)
+            return true;
+        if (trimmed.startsWith('Query:'))
+            return false;
+        if (trimmed === 'Initializing agent...' || trimmed === 'Initializing agent…')
+            return false;
+        if (trimmed.startsWith('Resume this session with:'))
+            return false;
+        if (/^hermes\s+--resume\b/.test(trimmed))
+            return false;
+        if (/^(Session|Duration|Messages):\s+/.test(trimmed))
+            return false;
+        if (trimmed.startsWith('╭') || trimmed.startsWith('╰'))
+            return false;
+        if (BOX_ONLY_RE.test(trimmed))
+            return false;
+        return true;
+    })
+        .map((line) => line.replace(/^[│┃]\s?/, '').replace(/\s?[│┃]$/, '').replace(/^\s{2,}/, ''))
+        .join('\n')
+        .trim();
+    return cleaned || output.trim();
+}
 export class HermesAdapter {
     opts;
     kind = 'hermes';
@@ -85,7 +119,7 @@ export class HermesAdapter {
                     const detail = stderr.length > 0 ? stderr.slice(0, 400) : 'no stderr';
                     return reject(new Error(`hermes exit ${code}: ${detail}`));
                 }
-                const reply = stdout || stderr;
+                const reply = extractHermesReply(stdout || stderr);
                 if (!reply) {
                     return reject(new Error('hermes produced empty output'));
                 }

package/dist/bin.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
+import { pathToFileURL } from 'node:url';
 import { main } from './index.js';
-main().catch((err) => {
-    console.error('fatal:', err.message);
-    process.exit(1);
-});
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+    main().catch((err) => {
+        console.error('fatal:', err.message);
+        process.exit(1);
+    });
+}

package/dist/device-daemon.js

@@ -201,6 +201,9 @@ export function createDeviceDaemon(cfg, agents) {
                     networkId: cfg.networkId,
                     agents: publicAgents,
                     systemInfo,
+                    capabilities: {
+                        customAgentDispatch: true,
+                    },
                 },
                 transports: ['websocket'],
                 reconnection: true,
@@ -234,7 +237,33 @@ export function createDeviceDaemon(cfg, agents) {
                 logger.error({ err: err.message }, 'connect_error');
             });
             socket.on('dispatch', (req) => {
-                const agent = agents.get(req.agentId);
+                let agent = agents.get(req.agentId);
+                if (!agent && req.customAgent) {
+                    const custom = req.customAgent;
+                    const entry = {
+                        id: custom.id,
+                        name: custom.name,
+                        role: custom.role ?? 'executor-agent',
+                        category: 'executor-hosted',
+                        adapter: {
+                            kind: custom.adapterKind,
+                            command: custom.command,
+                            args: custom.args ?? [],
+                            cwd: custom.cwd ?? undefined,
+                            workspace: custom.cwd ?? undefined,
+                            systemPrompt: custom.description ?? undefined,
+                        },
+                        visibility: 'public',
+                    };
+                    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');
+                    }
+                    catch (err) {
+                        logger.warn({ agentId: req.agentId, err: errorMessage(err) }, 'failed to create custom dispatch agent');
+                    }
+                }
                 if (!agent) {
                     logger.warn({ agentId: req.agentId, requestId: req.requestId }, 'dispatch for unknown agent');
                     socket?.emit('error_event', {

package/dist/index.js

@@ -1,4 +1,5 @@
 import { parseArgs } from 'node:util';
+import { pathToFileURL } from 'node:url';
 import { loadConfig, loadDeviceConfig } from './config.js';
 import { createConnection } from './connection.js';
 import { createDeviceDaemon } from './device-daemon.js';
@@ -134,7 +135,7 @@ Options:
   --server-url   AgentBean Server URL (required)
   --token        Authentication token (required)
   --device-id    Device ID (default: auto-detected from hardware)
-  --network-id   Network ID (default: default)
+  --network-id   Team ID (default: default)
 `);
         process.exit(0);
     }
@@ -263,3 +264,9 @@ export async function main() {
         }
     }
 }
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+    main().catch((err) => {
+        console.error('fatal:', err.message);
+        process.exit(1);
+    });
+}

package/dist/scanner.js

@@ -4,14 +4,35 @@ import { join } from "node:path";
 import { createHash } from "node:crypto";
 import * as os from "node:os";
 import { logger } from "./log.js";
-function which(bin) {
+function isExecutableFile(path) {
+    try {
+        return existsSync(path) && statSync(path).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+function getExtraPathEntries() {
+    return [
+        '/usr/local/bin',
+        '/opt/homebrew/bin',
+        join(os.homedir(), '.local/bin'),
+        join(os.homedir(), '.bun/bin'),
+        join(os.homedir(), '.npm-global/bin'),
+        join(os.homedir(), '.asdf/shims'),
+        join(os.homedir(), '.local/share/mise/shims'),
+        ...getAllNodeVersions().map((version) => join(os.homedir(), '.nvm/versions/node', version, 'bin')),
+    ];
+}
+function which(bin, candidatePaths = []) {
     return new Promise((resolve) => {
-        const child = execFile('which', [bin], { timeout: 5_000, env: { ...process.env, PATH: [
-                    process.env.PATH,
-                    '/usr/local/bin',
-                    '/opt/homebrew/bin',
-                    join(os.homedir(), '.nvm/versions/node', ...getAllNodeVersions(), 'bin'),
-                ].filter(Boolean).join(':') } }, (err, stdout) => {
+        for (const candidate of candidatePaths) {
+            if (isExecutableFile(candidate)) {
+                resolve(candidate);
+                return;
+            }
+        }
+        const child = execFile('which', [bin], { timeout: 5_000, env: { ...process.env, PATH: [process.env.PATH, ...getExtraPathEntries()].filter(Boolean).join(':') } }, (err, stdout) => {
             if (err) {
                 resolve(null);
                 return;
@@ -33,6 +54,30 @@ function getAllNodeVersions() {
         return [];
     }
 }
+function getClaudeCodeCandidates() {
+    const latestDir = join(os.homedir(), '.local/share/claude-latest');
+    const legacyDir = join(os.homedir(), '.local/share/claude');
+    const candidates = [
+        join(latestDir, 'current/claude'),
+        join(legacyDir, 'current/claude'),
+        '/opt/homebrew/lib/node_modules/@anthropic-ai/claude-code/cli.js',
+        '/usr/local/lib/node_modules/@anthropic-ai/claude-code/cli.js',
+    ];
+    for (const base of [latestDir, legacyDir]) {
+        const versionsDir = join(base, 'versions');
+        try {
+            if (!existsSync(versionsDir))
+                continue;
+            const versions = readdirSync(versionsDir).sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
+            for (const version of versions)
+                candidates.push(join(versionsDir, version, 'claude'));
+        }
+        catch {
+            // Ignore unreadable version directories and continue with other candidates.
+        }
+    }
+    return candidates;
+}
 function run(bin, args) {
     return new Promise((resolve) => {
         const child = execFile(bin, args, { timeout: 10_000 }, (err, stdout) => {
@@ -154,19 +199,21 @@ export async function scanRuntimes() {
             bin: "claude",
             name: "Claude Code",
             adapterKind: "claude-code",
+            candidates: getClaudeCodeCandidates(),
         },
-        { bin: "codex", name: "Codex CLI", adapterKind: "codex" },
+        { bin: "codex", name: "Codex CLI", adapterKind: "codex", candidates: [] },
         {
             bin: "kimi-cli",
             name: "Kimi CLI",
             adapterKind: "Kimi-cli",
+            candidates: [],
         },
     ];
     const results = [];
     for (const s of checks) {
-        const path = await which(s.bin);
+        const path = await which(s.bin, s.candidates);
         results.push({
-            name: s.name.replace(/\s+/g, "-"),
+            name: s.name,
             adapterKind: s.adapterKind,
             command: path ?? "",
             installed: path !== null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agentbean/daemon",
   "private": false,
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {
@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "dev": "tsx watch src/index.ts",
+    "dev": "tsx watch src/bin.ts",
     "start": "node dist/bin.js",
     "test": "vitest run",
     "test:watch": "vitest",