@agentbean/daemon 0.1.15 → 0.1.17

package/dist/adapters/codex.js

@@ -12,10 +12,23 @@ function renderPayload(input, systemPrompt) {
 function stripAnsi(s) {
     return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
-function extractReply(output) {
-    const clean = stripAnsi(output).replace(/\r\n/g, '\n');
+function removeEchoedPayload(output, payload) {
+    if (!payload)
+        return output;
+    const normalizedPayload = payload.replace(/\r\n/g, '\n');
+    const idx = output.lastIndexOf(normalizedPayload);
+    if (idx < 0)
+        return output;
+    const boundaryBefore = idx === 0 || output[idx - 1] === '\n' || output[idx - 1] === '\r';
+    if (!boundaryBefore)
+        return output;
+    const tail = output.slice(idx + normalizedPayload.length).trim();
+    return tail || output;
+}
+export function extractCodexReply(output, payload) {
+    const clean = removeEchoedPayload(stripAnsi(output).replace(/\r\n/g, '\n'), payload);
     // Match "codex" label followed by reply content, ending before next hook or end
-    const match = clean.match(/\ncodex\n([\s\S]*?)(?:\nhook:|$)/i);
+    const match = clean.match(/(?:^|\n)codex\n([\s\S]*?)(?:\nhook:|$)/i);
     if (match)
         return match[1].trim();
     // Fallback: everything after last "user" prompt
@@ -35,6 +48,10 @@ function normalizeExecArgs(args) {
     }
     return baseArgs;
 }
+function adapterTimeoutMs() {
+    const fromEnv = Number.parseInt(process.env.AGENTBEAN_CODEX_TIMEOUT_MS ?? '', 10);
+    return Number.isFinite(fromEnv) && fromEnv > 0 ? fromEnv : 900_000;
+}
 export class CodexAdapter {
     opts;
     kind = 'codex';
@@ -61,7 +78,7 @@ export class CodexAdapter {
             });
             const chunks = [];
             let finished = false;
-            const MAX_EXEC_MS = 600_000;
+            const MAX_EXEC_MS = adapterTimeoutMs();
             const onAbort = () => {
                 if (finished)
                     return;
@@ -100,7 +117,7 @@ export class CodexAdapter {
                     const detail = stripAnsi(raw).trim();
                     return reject(new Error(detail ? `codex exit ${exitCode}: ${detail}` : `codex exit ${exitCode}`));
                 }
-                const reply = extractReply(raw);
+                const reply = extractCodexReply(raw, payload);
                 resolve(reply || '(Codex 已完成处理)');
             });
         });

package/dist/adapters/hermes.js

@@ -32,6 +32,35 @@ export function extractHermesReply(output) {
         .replace(ANSI_RE, '')
         .replace(/\r\n?/g, '\n')
         .split('\n');
+    let boxStart = -1;
+    for (let i = lines.length - 1; i >= 0; i -= 1) {
+        if (lines[i]?.trim().startsWith('╭')) {
+            boxStart = i;
+            break;
+        }
+    }
+    if (boxStart >= 0) {
+        const boxLines = [];
+        for (const line of lines.slice(boxStart + 1)) {
+            const trimmed = line.trim();
+            if (trimmed.startsWith('╰'))
+                break;
+            if (BOX_ONLY_RE.test(trimmed))
+                continue;
+            boxLines.push(line);
+        }
+        const boxedReply = boxLines
+            .map((line) => line.trimEnd())
+            .filter((line) => {
+            const trimmed = line.trim();
+            return !(trimmed.startsWith('╭') || trimmed.startsWith('╰') || BOX_ONLY_RE.test(trimmed));
+        })
+            .map((line) => line.replace(/^[│┃]\s?/, '').replace(/\s?[│┃]$/, '').replace(/^\s{2,}/, ''))
+            .join('\n')
+            .trim();
+        if (boxedReply)
+            return boxedReply;
+    }
     const cleaned = lines
         .map((line) => line.trimEnd())
         .filter((line) => {

package/dist/agent-instance.js

@@ -58,6 +58,7 @@ export class AgentInstance {
     name;
     role;
     visibility;
+    activeControllers = new Map();
     constructor(config, adapter) {
         this.config = config;
         this.adapter = adapter;
@@ -79,6 +80,7 @@ export class AgentInstance {
     async handleDispatch(opts) {
         const { socket, req, serverUrl, token, networkId, deviceId } = opts;
         const ctl = new AbortController();
+        this.activeControllers.set(req.requestId, ctl);
         const dispatchStart = Date.now();
         const teamId = req.teamId ?? req.networkId ?? networkId;
         const projectWorkspace = req.sandboxed ? getWorkspaceDir(this.id) : this.config.adapter.workspace;
@@ -109,7 +111,7 @@ export class AgentInstance {
                 outputDirs: [run.outputDir, run.intermediateDir],
             });
             archivedFiles = archiveOutputFiles(run, processed.outputFiles);
-            const replyText = formatWorkspaceReply(rawBody, archivedFiles);
+            const replyText = formatWorkspaceReply(rawBody, archivedFiles, { exposeLocalPaths: false });
             finishAgentWorkspaceRun(run, { replyText, files: archivedFiles, status: 'completed' });
             const artifactIds = [];
             if (archivedFiles.length > 0) {
@@ -161,5 +163,16 @@ export class AgentInstance {
                 requestId: req.requestId,
             });
         }
+        finally {
+            this.activeControllers.delete(req.requestId);
+        }
+    }
+    cancelDispatch(requestId) {
+        const entries = requestId
+            ? [...this.activeControllers.entries()].filter(([id]) => id === requestId)
+            : [...this.activeControllers.entries()];
+        for (const [, ctl] of entries)
+            ctl.abort();
+        return entries.length;
     }
 }

package/dist/connection.js

@@ -54,6 +54,7 @@ export function createConnection(cfg, adapter) {
     let socket = null;
     let heartbeatTimer = null;
     let queue = Promise.resolve();
+    const activeControllers = new Map();
     return {
         async start() {
             const agentUrl = cfg.server.url.endsWith('/agent') ? cfg.server.url : cfg.server.url + '/agent';
@@ -91,6 +92,7 @@ export function createConnection(cfg, adapter) {
                 }
                 queue = queue.then(async () => {
                     const ctl = new AbortController();
+                    activeControllers.set(req.requestId, ctl);
                     const dispatchStart = Date.now();
                     const teamId = 'default';
                     const run = beginAgentWorkspaceRun({
@@ -122,7 +124,7 @@ export function createConnection(cfg, adapter) {
                             outputDirs: [run.outputDir, run.intermediateDir],
                         });
                         archivedFiles = archiveOutputFiles(run, processed.outputFiles);
-                        const replyText = formatWorkspaceReply(rawBody, archivedFiles);
+                        const replyText = formatWorkspaceReply(rawBody, archivedFiles, { exposeLocalPaths: false });
                         finishAgentWorkspaceRun(run, { replyText, files: archivedFiles, status: 'completed' });
                         const artifactIds = [];
                         if (archivedFiles.length > 0) {
@@ -171,10 +173,21 @@ export function createConnection(cfg, adapter) {
                             requestId: req.requestId,
                         });
                     }
+                    finally {
+                        activeControllers.delete(req.requestId);
+                    }
                 }).catch((err) => {
                     logger.error({ err: err?.message, requestId: req.requestId }, 'dispatch queue error');
                 });
             });
+            socket.on('dispatch:cancel', (payload) => {
+                const entries = payload.requestId
+                    ? [...activeControllers.entries()].filter(([id]) => id === payload.requestId)
+                    : [...activeControllers.entries()];
+                for (const [, ctl] of entries)
+                    ctl.abort();
+                logger.info({ requestId: payload.requestId, cancelled: entries.length, reason: payload.reason }, 'dispatch cancel requested');
+            });
             socket.on('disconnect', (reason) => {
                 logger.warn({ reason }, 'disconnected');
                 if (heartbeatTimer) {

package/dist/device-daemon.js

@@ -315,6 +315,17 @@ export function createDeviceDaemon(cfg, agents) {
                 });
                 queues.set(req.agentId, next);
             });
+            socket.on('dispatch:cancel', (payload) => {
+                const targets = payload.agentId ? [payload.agentId] : [...agents.keys()];
+                let cancelled = 0;
+                for (const agentId of targets) {
+                    const agent = agents.get(agentId);
+                    if (!agent)
+                        continue;
+                    cancelled += agent.cancelDispatch(payload.requestId);
+                }
+                logger.info({ agentId: payload.agentId, requestId: payload.requestId, cancelled, reason: payload.reason }, 'dispatch cancel requested');
+            });
             socket.on('agents:discover', async () => {
                 await scanAndRegister(socket, false);
             });

package/dist/workspace-manager.js

@@ -42,6 +42,11 @@ function replaceAllLiteral(value, search, replacement) {
         return value;
     return value.replace(new RegExp(escapeRegExp(search), 'g'), replacement);
 }
+function stripDevicePath(value, replacement) {
+    let body = replaceAllLiteral(value, `file://${replacement}`, basename(replacement));
+    body = replaceAllLiteral(body, replacement, basename(replacement));
+    return body;
+}
 export function beginAgentWorkspaceRun(input) {
     const teamId = safeSegment(input.teamId);
     const agentId = safeSegment(input.agentId);
@@ -122,17 +127,25 @@ export function archiveOutputFiles(run, files) {
     }
     return archived;
 }
-export function formatWorkspaceReply(reply, files) {
+export function formatWorkspaceReply(reply, files, options = {}) {
+    const exposeLocalPaths = options.exposeLocalPaths ?? true;
     let body = reply;
     for (const file of files) {
-        body = replaceAllLiteral(body, `file://${file.originalPath}`, `file://${file.archivedPath}`);
-        body = replaceAllLiteral(body, file.originalPath, file.archivedPath);
+        if (exposeLocalPaths) {
+            body = replaceAllLiteral(body, `file://${file.originalPath}`, `file://${file.archivedPath}`);
+            body = replaceAllLiteral(body, file.originalPath, file.archivedPath);
+        }
+        else {
+            body = stripDevicePath(body, file.originalPath);
+            body = stripDevicePath(body, file.archivedPath);
+        }
     }
-    const missingPaths = files
-        .map((file) => file.archivedPath)
-        .filter((path) => !body.includes(path));
+    const missingPaths = files.filter((file) => {
+        const marker = exposeLocalPaths ? file.archivedPath : basename(file.archivedPath);
+        return !body.includes(marker);
+    });
     if (missingPaths.length > 0) {
-        body += '\n\n已生成文件:\n' + missingPaths.map((path) => `- ${path}`).join('\n');
+        body += '\n\n已生成文件:\n' + missingPaths.map((file) => `- ${exposeLocalPaths ? file.archivedPath : basename(file.archivedPath)}`).join('\n');
     }
     return body;
 }

package/package.json

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