@downcity/agent 1.1.157 → 1.1.161

package/src/executor/messages/SessionAttachmentMapper.ts

@@ -5,7 +5,7 @@
  * - 兼容 Telegram / Feishu / TUI 等统一的 `<file>` 协议入口。
  * - 仅在本轮执行的内存消息上追加 file parts，不修改持久化历史。
  * - 当前只为图片与 PDF 注入 file part，保持多模态模型可直接消费。
- * - 历史中的 `resources://` 与旧版 `file://` 会在喂给模型前临时 hydrate。
+ * - 历史中的相对路径与旧版 `file://` 会在喂给模型前临时 hydrate。
  */
 
 import fs from "fs-extra";
@@ -63,18 +63,17 @@ function buildDataUrl(mediaType: string, buffer: Buffer): string {
   return `data:${safeType};base64,${base64}`;
 }
 
-function resolveResourcesUrlPath(
+function resolveHydratableFilePath(
   projectRoot: string | undefined,
-  rawUrl: string,
+  rawPath: string,
 ): string | null {
-  const prefix = "resources://";
-  const raw = String(rawUrl || "").trim();
-  if (!raw.startsWith(prefix)) return null;
-  const relative = raw.slice(prefix.length).replace(/^\/+/, "");
-  if (!relative) return null;
+  const raw = String(rawPath || "").trim();
+  if (!raw || raw.startsWith("data:") || /^https?:\/\//i.test(raw)) return null;
+  if (raw.startsWith("file://")) return fileURLToPath(raw);
+  if (path.isAbsolute(raw)) return path.resolve(raw);
 
   const root = path.resolve(String(projectRoot || "").trim() || process.cwd());
-  const absPath = path.resolve(root, relative);
+  const absPath = path.resolve(root, raw);
   const rel = path.relative(root, absPath);
   if (rel === "" || rel.startsWith("..") || path.isAbsolute(rel)) return null;
   return absPath;
@@ -85,14 +84,13 @@ async function hydrateFileUrlPart(
   projectRoot?: string,
 ): Promise<FileUIPart> {
   const url = String(part.url || "").trim();
-  const resourcesPath = resolveResourcesUrlPath(projectRoot, url);
-  if (!url.startsWith("file://") && !resourcesPath) return part;
+  const filePath = resolveHydratableFilePath(projectRoot, url);
+  if (!filePath) return part;
   try {
-    const absPath = resourcesPath || fileURLToPath(url);
-    const buffer = await fs.readFile(absPath);
+    const buffer = await fs.readFile(filePath);
     const mediaType =
       String(part.mediaType || "").trim() ||
-      guessAttachmentMediaTypeFromPath(absPath) ||
+      guessAttachmentMediaTypeFromPath(filePath) ||
       "application/octet-stream";
     return {
       ...part,
@@ -109,7 +107,7 @@ async function hydrateFileUrlPart(
  *
  * 关键点（中文）
  * - 该函数只修改本轮内存消息，不回写历史。
- * - 新历史保留 `resources://` 相对 URL，旧历史的 `file://` 仍继续兼容。
+ * - 新历史保留 Agent 根目录相对路径，旧历史的 `file://` 仍继续兼容。
  */
 export async function hydrateFileUrlPartsForModel(
   messages: SessionMessageV1[],
@@ -148,10 +146,11 @@ export async function hydrateFileUrlPartsForModel(
  */
 export async function injectFilePartsFromAttachments(
   messages: SessionMessageV1[],
+  projectRoot?: string,
 ): Promise<SessionMessageV1[]> {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
-  const cwd = process.cwd();
+  const root = path.resolve(String(projectRoot || "").trim() || process.cwd());
   const out: SessionMessageV1[] = [];
 
   for (const message of messages) {
@@ -203,7 +202,7 @@ export async function injectFilePartsFromAttachments(
 
       const absPath = path.isAbsolute(attachment.path)
         ? attachment.path
-        : path.resolve(cwd, attachment.path);
+        : path.resolve(root, attachment.path);
       try {
         const exists = await fs.pathExists(absPath);
         if (!exists) continue;

package/src/executor/messages/SessionMessageCodec.ts

@@ -78,7 +78,10 @@ export async function toModelMessages(
   if (!Array.isArray(messages) || messages.length === 0) return [];
 
   // 第一步（中文）：在 user 消息上注入 file parts（多模态附件）。
-  const enrichedMessages = await injectFilePartsFromAttachments(messages);
+  const enrichedMessages = await injectFilePartsFromAttachments(
+    messages,
+    projectRoot,
+  );
 
   // 第二步（中文）：把历史里的资源 URL 在内存中 hydrate 成模型可消费的 data URL。
   const hydratedMessages = await hydrateFileUrlPartsForModel(

package/src/executor/tools/plugin/PluginToolBridge.ts

@@ -18,7 +18,10 @@ import type {
   PluginReadInput,
   PluginReadToolResult,
 } from "@/executor/tools/plugin/types/PluginTool.js";
-import { materializeAssistantFileParts } from "@executor/messages/AssistantFileResource.js";
+import {
+  materializeAssistantFileParts,
+  resolveAgentFilePath,
+} from "@executor/messages/AssistantFileResource.js";
 import {
   enqueueAssistantFileParts,
   getSessionRunContext,
@@ -81,25 +84,6 @@ function resolve_project_root(project_root: string | undefined): string {
   return path.resolve(raw || process.cwd());
 }
 
-/**
- * 将 `resources://` URL 转成本机绝对路径。
- */
-function resolve_resources_file_path(
-  project_root: string,
-  raw_url: string,
-): string {
-  const prefix = "resources://";
-  const raw = String(raw_url || "").trim();
-  if (!raw.startsWith(prefix)) return "";
-  const relative = raw.slice(prefix.length).replace(/^\/+/, "");
-  if (!relative) return "";
-
-  const file_path = path.resolve(project_root, relative);
-  const rel = path.relative(project_root, file_path);
-  if (rel === "" || rel.startsWith("..") || path.isAbsolute(rel)) return "";
-  return file_path;
-}
-
 /**
  * 构建返回给模型和用户可见的文件摘要。
  */
@@ -107,13 +91,19 @@ function summarize_materialized_files(
   parts: FileUIPart[],
   project_root: string,
 ): PluginCallToolFileResult[] {
-  return parts.map((part, index) => ({
-    index,
-    media_type: part.mediaType,
-    filename: typeof part.filename === "string" ? part.filename : "",
-    url: String(part.url || ""),
-    path: resolve_resources_file_path(project_root, String(part.url || "")),
-  }));
+  return parts.map((part, index) => {
+    const relative_path = String(part.url || "");
+    return {
+      index,
+      media_type: part.mediaType,
+      filename: typeof part.filename === "string" ? part.filename : "",
+      relative_path,
+      path: resolveAgentFilePath({
+        projectRoot: project_root,
+        filePath: relative_path,
+      }),
+    };
+  });
 }
 
 /**

package/src/executor/tools/plugin/types/PluginTool.ts

@@ -40,9 +40,9 @@ export interface PluginCallToolFileResult {
   media_type: string;
   /** 原始文件名；若上游未提供则为空字符串。 */
   filename: string;
-  /** 持久化到历史消息中的资源 URL，通常为 `resources://.downcity/resources/...`。 */
-  url: string;
-  /** 当前机器可直接打开的绝对文件路径。 */
+  /** 基于 Agent 项目根目录的相对路径，例如 `.downcity/resources/xxx.png`。 */
+  relative_path: string;
+  /** 当前机器可直接打开的绝对文件路径，按 Agent 项目根目录解析。 */
   path: string;
 }