@agentbean/daemon 0.1.11 → 0.1.13

package/dist/agent-instance.js

@@ -1,8 +1,10 @@
+import { writeFileSync } from 'node:fs';
+import { basename, join } from 'node:path';
 import { logger } from './log.js';
 import { uploadArtifact } from './uploader.js';
 import { postProcess } from './post-process.js';
 import { generateSandboxProfile, getWorkspaceDir, isSandboxAvailable } from './sandbox.js';
-import { archiveOutputFiles, beginAgentWorkspaceRun, finishAgentWorkspaceRun, workspaceEnv, } from './workspace-manager.js';
+import { archiveOutputFiles, beginAgentWorkspaceRun, finishAgentWorkspaceRun, formatWorkspaceReply, workspaceEnv, } from './workspace-manager.js';
 function errorMessage(err) {
     if (err instanceof Error && err.message)
         return err.message;
@@ -16,6 +18,39 @@ function errorMessage(err) {
     catch { }
     return 'unknown error';
 }
+function safeFilename(value) {
+    return basename(value).replace(/[^a-zA-Z0-9._-]/g, '-').replace(/^-+|-+$/g, '') || 'attachment';
+}
+async function downloadAttachments(input) {
+    const downloaded = [];
+    for (const attachment of input.attachments ?? []) {
+        const sep = attachment.downloadUrl.includes('?') ? '&' : '?';
+        const url = `${input.serverUrl}${attachment.downloadUrl}${sep}token=${encodeURIComponent(input.token)}`;
+        try {
+            const resp = await fetch(url);
+            if (!resp.ok) {
+                logger.warn({ id: attachment.id, status: resp.status }, 'attachment download rejected');
+                continue;
+            }
+            const bytes = Buffer.from(await resp.arrayBuffer());
+            const localPath = join(input.run.inputDir, `${attachment.id}-${safeFilename(attachment.filename)}`);
+            writeFileSync(localPath, bytes);
+            downloaded.push({ ...attachment, localPath });
+        }
+        catch (err) {
+            logger.warn({ id: attachment.id, err: err?.message }, 'attachment download failed');
+        }
+    }
+    return downloaded;
+}
+function promptWithAttachments(prompt, attachments) {
+    if (attachments.length === 0)
+        return prompt;
+    const list = attachments
+        .map((file) => `- ${file.filename} (${file.mimeType}, ${file.sizeBytes} bytes): ${file.localPath}`)
+        .join('\n');
+    return `${prompt}\n\n用户随消息附加了以下本地文件，请在需要时读取并使用：\n${list}`;
+}
 export class AgentInstance {
     config;
     adapter;
@@ -58,8 +93,10 @@ export class AgentInstance {
         });
         let archivedFiles = [];
         try {
+            const downloadedAttachments = await downloadAttachments({ serverUrl, token, run, attachments: req.attachments });
+            const prompt = promptWithAttachments(req.prompt, downloadedAttachments);
             const rawBody = await this.adapter.ask({
-                prompt: req.prompt,
+                prompt,
                 history: req.history ?? [],
                 systemPrompt: this.config.adapter.systemPrompt,
                 workspace: projectWorkspace,
@@ -72,7 +109,8 @@ export class AgentInstance {
                 outputDirs: [run.outputDir, run.intermediateDir],
             });
             archivedFiles = archiveOutputFiles(run, processed.outputFiles);
-            finishAgentWorkspaceRun(run, { replyText: processed.replyText, files: archivedFiles, status: 'completed' });
+            const replyText = formatWorkspaceReply(rawBody, archivedFiles);
+            finishAgentWorkspaceRun(run, { replyText, files: archivedFiles, status: 'completed' });
             const artifactIds = [];
             if (archivedFiles.length > 0) {
                 for (const file of archivedFiles) {
@@ -92,7 +130,6 @@ export class AgentInstance {
                                 deviceId: deviceId ?? null,
                                 pathKind: file.pathKind,
                                 relativePath: file.relativePath,
-                                originalPath: file.originalPath,
                                 sha256: file.sha256,
                             }),
                         });
@@ -107,7 +144,7 @@ export class AgentInstance {
             socket.emit('reply', {
                 agentId: this.id,
                 channelId: req.channelId,
-                body: processed.replyText,
+                body: replyText,
                 requestId: req.requestId,
                 artifactIds: artifactIds.length > 0 ? artifactIds : undefined,
             });

package/dist/connection.js

@@ -1,8 +1,10 @@
 import { io } from 'socket.io-client';
+import { writeFileSync } from 'node:fs';
+import { basename, join } from 'node:path';
 import { logger } from './log.js';
 import { uploadArtifact } from './uploader.js';
 import { postProcess } from './post-process.js';
-import { archiveOutputFiles, beginAgentWorkspaceRun, finishAgentWorkspaceRun, workspaceEnv, } from './workspace-manager.js';
+import { archiveOutputFiles, beginAgentWorkspaceRun, finishAgentWorkspaceRun, formatWorkspaceReply, workspaceEnv, } from './workspace-manager.js';
 function errorMessage(err) {
     if (err instanceof Error && err.message)
         return err.message;
@@ -16,6 +18,38 @@ function errorMessage(err) {
     catch { }
     return 'unknown error';
 }
+function safeFilename(value) {
+    return basename(value).replace(/[^a-zA-Z0-9._-]/g, '-').replace(/^-+|-+$/g, '') || 'attachment';
+}
+async function downloadAttachments(input) {
+    const downloaded = [];
+    for (const attachment of input.attachments ?? []) {
+        const sep = attachment.downloadUrl.includes('?') ? '&' : '?';
+        const url = `${input.serverUrl}${attachment.downloadUrl}${sep}token=${encodeURIComponent(input.token)}`;
+        try {
+            const resp = await fetch(url);
+            if (!resp.ok) {
+                logger.warn({ id: attachment.id, status: resp.status }, 'attachment download rejected');
+                continue;
+            }
+            const localPath = join(input.run.inputDir, `${attachment.id}-${safeFilename(attachment.filename)}`);
+            writeFileSync(localPath, Buffer.from(await resp.arrayBuffer()));
+            downloaded.push({ ...attachment, localPath });
+        }
+        catch (err) {
+            logger.warn({ id: attachment.id, err: err?.message }, 'attachment download failed');
+        }
+    }
+    return downloaded;
+}
+function promptWithAttachments(prompt, attachments) {
+    if (attachments.length === 0)
+        return prompt;
+    const list = attachments
+        .map((file) => `- ${file.filename} (${file.mimeType}, ${file.sizeBytes} bytes): ${file.localPath}`)
+        .join('\n');
+    return `${prompt}\n\n用户随消息附加了以下本地文件，请在需要时读取并使用：\n${list}`;
+}
 export function createConnection(cfg, adapter) {
     let socket = null;
     let heartbeatTimer = null;
@@ -69,8 +103,16 @@ export function createConnection(cfg, adapter) {
                     });
                     let archivedFiles = [];
                     try {
+                        const httpBase = cfg.server.url.replace(/\/agent$/, '');
+                        const downloadedAttachments = await downloadAttachments({
+                            serverUrl: httpBase,
+                            token: cfg.server.token,
+                            run,
+                            attachments: req.attachments,
+                        });
+                        const prompt = promptWithAttachments(req.prompt, downloadedAttachments);
                         const rawBody = await adapter.ask({
-                            prompt: req.prompt,
+                            prompt,
                             history: req.history ?? [],
                             systemPrompt: cfg.adapter.systemPrompt,
                             workspace: cfg.adapter.workspace,
@@ -80,10 +122,10 @@ export function createConnection(cfg, adapter) {
                             outputDirs: [run.outputDir, run.intermediateDir],
                         });
                         archivedFiles = archiveOutputFiles(run, processed.outputFiles);
-                        finishAgentWorkspaceRun(run, { replyText: processed.replyText, files: archivedFiles, status: 'completed' });
+                        const replyText = formatWorkspaceReply(rawBody, archivedFiles);
+                        finishAgentWorkspaceRun(run, { replyText, files: archivedFiles, status: 'completed' });
                         const artifactIds = [];
                         if (archivedFiles.length > 0) {
-                            const httpBase = cfg.server.url.replace(/\/agent$/, '');
                             for (const file of archivedFiles) {
                                 try {
                                     const result = await uploadArtifact({
@@ -100,7 +142,6 @@ export function createConnection(cfg, adapter) {
                                             runId: req.requestId,
                                             pathKind: file.pathKind,
                                             relativePath: file.relativePath,
-                                            originalPath: file.originalPath,
                                             sha256: file.sha256,
                                         }),
                                     });
@@ -114,7 +155,7 @@ export function createConnection(cfg, adapter) {
                         }
                         currentSocket.emit('reply', {
                             channelId: req.channelId,
-                            body: processed.replyText,
+                            body: replyText,
                             requestId: req.requestId,
                             artifactIds: artifactIds.length > 0 ? artifactIds : undefined,
                         });

package/dist/workspace-manager.js

@@ -34,6 +34,14 @@ function uniqueDestination(dir, filename) {
     }
     return candidate;
 }
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function replaceAllLiteral(value, search, replacement) {
+    if (!search || search === replacement)
+        return value;
+    return value.replace(new RegExp(escapeRegExp(search), 'g'), replacement);
+}
 export function beginAgentWorkspaceRun(input) {
     const teamId = safeSegment(input.teamId);
     const agentId = safeSegment(input.agentId);
@@ -41,6 +49,7 @@ export function beginAgentWorkspaceRun(input) {
     const teamDir = ensureDir(join(rootDir(), 'teams', teamId));
     const agentDir = ensureDir(join(teamDir, 'agents', agentId));
     const runDir = ensureDir(join(agentDir, 'runs', runId));
+    const inputDir = ensureDir(join(runDir, 'inputs'));
     const outputDir = ensureDir(join(runDir, 'outputs'));
     const intermediateDir = ensureDir(join(runDir, 'intermediates'));
     const logDir = ensureDir(join(runDir, 'logs'));
@@ -64,7 +73,7 @@ export function beginAgentWorkspaceRun(input) {
         createdAt: new Date().toISOString(),
         files: [],
     });
-    return { teamId: input.teamId, agentId: input.agentId, runId: input.runId, agentDir, runDir, outputDir, intermediateDir, logDir };
+    return { teamId: input.teamId, agentId: input.agentId, runId: input.runId, agentDir, runDir, inputDir, outputDir, intermediateDir, logDir };
 }
 export function workspaceEnv(run) {
     return {
@@ -72,6 +81,7 @@ export function workspaceEnv(run) {
         AGENTBEAN_AGENT_ID: run.agentId,
         AGENTBEAN_RUN_ID: run.runId,
         AGENTBEAN_WORKSPACE: run.agentDir,
+        AGENTBEAN_INPUT_DIR: run.inputDir,
         AGENTBEAN_OUTPUT_DIR: run.outputDir,
         AGENTBEAN_INTERMEDIATE_DIR: run.intermediateDir,
         AGENT_BEAN_OUTPUT_DIRS: [run.outputDir, run.intermediateDir].join(','),
@@ -112,6 +122,20 @@ export function archiveOutputFiles(run, files) {
     }
     return archived;
 }
+export function formatWorkspaceReply(reply, files) {
+    let body = reply;
+    for (const file of files) {
+        body = replaceAllLiteral(body, `file://${file.originalPath}`, `file://${file.archivedPath}`);
+        body = replaceAllLiteral(body, file.originalPath, file.archivedPath);
+    }
+    const missingPaths = files
+        .map((file) => file.archivedPath)
+        .filter((path) => !body.includes(path));
+    if (missingPaths.length > 0) {
+        body += '\n\n已生成文件:\n' + missingPaths.map((path) => `- ${path}`).join('\n');
+    }
+    return body;
+}
 export function finishAgentWorkspaceRun(run, input) {
     if (input.replyText !== undefined) {
         writeFileSync(join(run.runDir, 'response.md'), input.replyText);

package/package.json

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