@downcity/agent 1.1.104 → 1.1.106

package/scripts/assistant-file-resource.test.mjs

@@ -1,9 +1,9 @@
 /**
- * @file 验证 assistant file part 会把 data URL 资源落盘为 file:// URL。
+ * @file 验证 assistant file part 会把资源落盘为 resources:// URL。
  *
  * 关键点（中文）
  * - 历史消息不应长期保存图片 base64。
- * - 送模型前可以从 file:// 临时 hydrate 回 data URL。
+ * - 送模型前可以从 resources:// 临时 hydrate 回 data URL。
  */
 
 import test from "node:test";
@@ -11,11 +11,16 @@ import assert from "node:assert/strict";
 import os from "node:os";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { fileURLToPath } from "node:url";
+import http from "node:http";
+import { pathToFileURL } from "node:url";
 
 import { materializeAssistantFileParts } from "../bin/executor/messages/AssistantFileResource.js";
 import { hydrateFileUrlPartsForModel } from "../bin/executor/messages/SessionAttachmentMapper.js";
 
+function resource_path_from_url(project_root, url) {
+  return path.join(project_root, String(url || "").replace(/^resources:\/\//, ""));
+}
+
 test("materializeAssistantFileParts stores data URL images under .downcity/resources", async () => {
   const project_root = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-assistant-resource-"),
@@ -39,10 +44,10 @@ test("materializeAssistantFileParts stores data URL images under .downcity/resou
   assert.equal(parts[0].type, "file");
   assert.equal(parts[0].mediaType, "image/png");
   assert.equal(parts[0].filename, "image-1.png");
-  assert.match(parts[0].url, /^file:\/\//);
+  assert.match(parts[0].url, /^resources:\/\/\.downcity\/resources\//);
   assert.equal(parts[0].url.includes("base64"), false);
 
-  const resource_path = fileURLToPath(parts[0].url);
+  const resource_path = resource_path_from_url(project_root, parts[0].url);
   assert.equal(
     path.dirname(resource_path),
     path.join(project_root, ".downcity", "resources"),
@@ -50,7 +55,49 @@ test("materializeAssistantFileParts stores data URL images under .downcity/resou
   assert.deepEqual(await fs.readFile(resource_path), bytes);
 });
 
-test("hydrateFileUrlPartsForModel converts persisted file URLs back to data URLs in memory", async () => {
+test("materializeAssistantFileParts downloads remote file URLs into resources", async () => {
+  const project_root = await fs.mkdtemp(
+    path.join(os.tmpdir(), "downcity-agent-assistant-remote-resource-"),
+  );
+  const bytes = Buffer.from("remote-png-bytes-for-test", "utf8");
+  const server = http.createServer((_, response) => {
+    response.writeHead(200, { "content-type": "image/png" });
+    response.end(bytes);
+  });
+
+  await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+  try {
+    const address = server.address();
+    assert.equal(typeof address, "object");
+    assert.ok(address);
+    const remote_url = `http://127.0.0.1:${address.port}/image.png`;
+
+    const parts = await materializeAssistantFileParts({
+      projectRoot: project_root,
+      parts: [
+        {
+          type: "file",
+          mediaType: "image/png",
+          filename: "remote.png",
+          url: remote_url,
+        },
+      ],
+    });
+
+    assert.match(parts[0].url, /^resources:\/\/\.downcity\/resources\//);
+    assert.equal(parts[0].url.startsWith("http://"), false);
+    assert.deepEqual(
+      await fs.readFile(resource_path_from_url(project_root, parts[0].url)),
+      bytes,
+    );
+  } finally {
+    await new Promise((resolve, reject) =>
+      server.close((error) => (error ? reject(error) : resolve())),
+    );
+  }
+});
+
+test("hydrateFileUrlPartsForModel converts resources URLs back to data URLs in memory", async () => {
   const project_root = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-assistant-hydrate-"),
   );
@@ -67,18 +114,21 @@ test("hydrateFileUrlPartsForModel converts persisted file URLs back to data URLs
     ],
   });
 
-  const messages = await hydrateFileUrlPartsForModel([
-    {
-      id: "a:test:1",
-      role: "assistant",
-      metadata: {
-        v: 1,
-        ts: Date.now(),
-        sessionId: "session_test",
+  const messages = await hydrateFileUrlPartsForModel(
+    [
+      {
+        id: "a:test:1",
+        role: "assistant",
+        metadata: {
+          v: 1,
+          ts: Date.now(),
+          sessionId: "session_test",
+        },
+        parts: materialized,
       },
-      parts: materialized,
-    },
-  ]);
+    ],
+    project_root,
+  );
 
   const hydrated_part = messages[0]?.parts[0];
   assert.equal(hydrated_part?.type, "file");
@@ -87,5 +137,44 @@ test("hydrateFileUrlPartsForModel converts persisted file URLs back to data URLs
     hydrated_part?.url,
     `data:image/png;base64,${bytes.toString("base64")}`,
   );
-  assert.match(materialized[0].url, /^file:\/\//);
+  assert.match(materialized[0].url, /^resources:\/\/\.downcity\/resources\//);
+});
+
+test("hydrateFileUrlPartsForModel keeps old file URLs compatible", async () => {
+  const project_root = await fs.mkdtemp(
+    path.join(os.tmpdir(), "downcity-agent-assistant-file-url-"),
+  );
+  const bytes = Buffer.from("legacy-file-url-bytes", "utf8");
+  const file_path = path.join(project_root, "legacy.png");
+  await fs.writeFile(file_path, bytes);
+
+  const messages = await hydrateFileUrlPartsForModel(
+    [
+      {
+        id: "a:test:legacy",
+        role: "assistant",
+        metadata: {
+          v: 1,
+          ts: Date.now(),
+          sessionId: "session_test",
+        },
+        parts: [
+          {
+            type: "file",
+            mediaType: "image/png",
+            filename: "legacy.png",
+            url: pathToFileURL(file_path).href,
+          },
+        ],
+      },
+    ],
+    project_root,
+  );
+
+  const hydrated_part = messages[0]?.parts[0];
+  assert.equal(hydrated_part?.type, "file");
+  assert.equal(
+    hydrated_part?.url,
+    `data:image/png;base64,${bytes.toString("base64")}`,
+  );
 });

package/src/config/DowncitySchema.ts

@@ -141,75 +141,6 @@ export const DOWNCITY_JSON_SCHEMA: JsonObject = {
             },
           },
         },
-        asr: {
-          type: "object",
-          additionalProperties: true,
-          properties: {
-            injectPrompt: { type: "boolean" },
-            augmentMessage: { type: "boolean" },
-            provider: { type: "string", enum: ["local", "command"] },
-            modelId: {
-              type: "string",
-              enum: [
-                "SenseVoiceSmall",
-                "paraformer-zh-streaming",
-                "whisper-large-v3-turbo",
-              ],
-            },
-            modelsDir: { type: "string" },
-            pythonBin: { type: "string" },
-            command: { type: "string" },
-            language: { type: "string" },
-            timeoutMs: { type: "integer", minimum: 1000, maximum: 600000 },
-            strategy: {
-              type: "string",
-              enum: ["auto", "funasr", "transformers-whisper", "command"],
-            },
-            installedModels: {
-              type: "array",
-              items: {
-                type: "string",
-                enum: [
-                  "SenseVoiceSmall",
-                  "paraformer-zh-streaming",
-                  "whisper-large-v3-turbo",
-                ],
-              },
-            },
-          },
-        },
-        tts: {
-          type: "object",
-          additionalProperties: true,
-          properties: {
-            provider: {
-              type: "string",
-              enum: ["local"],
-            },
-            modelId: {
-              type: "string",
-              enum: ["qwen3-tts-0.6b", "kokoro-82m", "qwen3-tts-1.7b"],
-            },
-            modelsDir: { type: "string" },
-            pythonBin: { type: "string" },
-            language: { type: "string" },
-            voice: { type: "string" },
-            format: {
-              type: "string",
-              enum: ["wav", "flac"],
-            },
-            speed: { type: "number", minimum: 0.5, maximum: 2 },
-            outputDir: { type: "string" },
-            timeoutMs: { type: "integer", minimum: 5000, maximum: 900000 },
-            installedModels: {
-              type: "array",
-              items: {
-                type: "string",
-                enum: ["qwen3-tts-0.6b", "kokoro-82m", "qwen3-tts-1.7b"],
-              },
-            },
-          },
-        },
       },
     },
     llm: {

package/src/config/Paths.ts

@@ -336,7 +336,7 @@ export function getDowncityPublicDirPath(cwd: string): string {
  *
  * 关键点（中文）
  * - 该目录用于存放会话历史引用的二进制资源，例如图片生成结果。
- * - `messages.jsonl` 只保存 `file://` 绝对 URL，避免把大段 base64 长期写入历史。
+ * - `messages.jsonl` 只保存 `resources://` 相对 URL，避免暴露本机绝对路径或长期保存 base64。
  */
 export function getDowncityResourcesDirPath(cwd: string): string {
   return path.join(getDowncityDirPath(cwd), "resources");

package/src/executor/composer/system/default/assets/plugin.prompt.ts

@@ -4,6 +4,6 @@
  */
 
 // Source: src/executor/composer/system/default/assets/plugin.prompt.ts.txt
-const TEXT_MODULE_CONTENT = "# Plugin State\n\n你正在一个基于 plugin 的执行环境中工作。\n\n## Plugin 调用规则\n\n- 当你需要使用 plugin 能力时，优先通过可用的 tool 调用 plugin action。\n- 若当前工具集中存在 `plugin_call`，使用 `plugin_call({ plugin, action, payload })` 触发对应 plugin action。\n- `plugin_call.plugin` 是 plugin 名称，例如 `skill`、`task`、`memory`、`contact`。\n- `plugin_call.action` 是 action 名称，例如 `list`、`lookup`、`create`、`run`。\n- `plugin_call.payload` 是结构化 JSON payload；没有参数时传 `{}`。\n- ActionSchedule 是 Agent 内部用于延迟执行 plugin action 的能力，不是独立 plugin。\n\n## 可用 plugin 概览\n\n- 当前内建托管 plugin：`shell` / `chat` / `task` / `memory` / `contact`。\n- 当前内建本地 plugin：`auth` / `skill` / `asr` / `tts`。\n\n具体 plugin 能力以该 plugin 的 action 和 system 提示为准。\n";
+const TEXT_MODULE_CONTENT = "# Plugin State\n\n你正在一个基于 plugin 的执行环境中工作。\n\n## Plugin 调用规则\n\n- 当你需要使用 plugin 能力时，优先通过可用的 tool 调用 plugin action。\n- 若当前工具集中存在 `plugin_call`，使用 `plugin_call({ plugin, action, payload })` 触发对应 plugin action。\n- `plugin_call.plugin` 是 plugin 名称，例如 `skill`、`task`、`memory`、`contact`。\n- `plugin_call.action` 是 action 名称，例如 `list`、`lookup`、`create`、`run`。\n- `plugin_call.payload` 是结构化 JSON payload；没有参数时传 `{}`。\n- ActionSchedule 是 Agent 内部用于延迟执行 plugin action 的能力，不是独立 plugin。\n\n## 可用 plugin 概览\n\n- 当前内建托管 plugin：`shell` / `chat` / `task` / `memory` / `contact`。\n- 当前内建本地 plugin：`auth` / `skill`。\n\n具体 plugin 能力以该 plugin 的 action 和 system 提示为准。\n";
 
 export default TEXT_MODULE_CONTENT;

package/src/executor/composer/system/default/assets/plugin.prompt.ts.txt

@@ -14,6 +14,6 @@
 ## 可用 plugin 概览
 
 - 当前内建托管 plugin：`shell` / `chat` / `task` / `memory` / `contact`。
-- 当前内建本地 plugin：`auth` / `skill` / `asr` / `tts`。
+- 当前内建本地 plugin：`auth` / `skill`。
 
 具体 plugin 能力以该 plugin 的 action 和 system 提示为准。

package/src/executor/core-engine/CoreEngineMessageState.ts

@@ -33,6 +33,11 @@ export class CoreEngineMessageState {
    */
   private readonly tools: Record<string, Tool>;
 
+  /**
+   * 当前项目根目录，用于解析历史中的 `resources://` file part。
+   */
+  private readonly projectRoot?: string;
+
   private constructor(params: {
     /**
      * 当前运行时 session 语义消息。
@@ -46,10 +51,15 @@ export class CoreEngineMessageState {
      * 当前轮可用工具集合。
      */
     tools: Record<string, Tool>;
+    /**
+     * 当前项目根目录。
+     */
+    projectRoot?: string;
   }) {
     this.sessionMessages = params.sessionMessages;
     this.currentModelMessages = params.modelMessages;
     this.tools = params.tools;
+    this.projectRoot = params.projectRoot;
   }
 
   /**
@@ -64,14 +74,23 @@ export class CoreEngineMessageState {
      * 当前轮可用工具集合。
      */
     tools: Record<string, Tool>;
+    /**
+     * 当前项目根目录。
+     */
+    projectRoot?: string;
   }): Promise<CoreEngineMessageState> {
     const sessionMessages = Array.isArray(params.messages)
       ? [...params.messages]
       : [];
     return new CoreEngineMessageState({
       sessionMessages,
-      modelMessages: await toModelMessages(sessionMessages, params.tools),
+      modelMessages: await toModelMessages(
+        sessionMessages,
+        params.tools,
+        params.projectRoot,
+      ),
       tools: params.tools,
+      projectRoot: params.projectRoot,
     });
   }
 
@@ -119,7 +138,11 @@ export class CoreEngineMessageState {
     messages: SessionMessageV1[],
   ): Promise<ModelMessage[]> {
     this.sessionMessages = [...this.sessionMessages, ...messages];
-    const modelMessages = await toModelMessages(messages, this.tools);
+    const modelMessages = await toModelMessages(
+      messages,
+      this.tools,
+      this.projectRoot,
+    );
     if (modelMessages.length > 0) {
       this.currentModelMessages = [...this.currentModelMessages, ...modelMessages];
       return modelMessages;
@@ -127,6 +150,7 @@ export class CoreEngineMessageState {
     this.currentModelMessages = await toModelMessages(
       this.sessionMessages,
       this.tools,
+      this.projectRoot,
     );
     return [];
   }

package/src/executor/core-engine/CoreEngineRunner.ts

@@ -154,6 +154,7 @@ export class CoreEngineRunner {
       const message_state = await CoreEngineMessageState.create({
         messages: input.execute_input.messages,
         tools,
+        projectRoot: input.run_context.projectRoot,
       });
 
       const append_merged_user_messages = (messages: SessionMessageV1[]) =>

package/src/executor/messages/SessionAttachmentMapper.ts

@@ -5,6 +5,7 @@
  * - 兼容 Telegram / Feishu / TUI 等统一的 `<file>` 协议入口。
  * - 仅在本轮执行的内存消息上追加 file parts，不修改持久化历史。
  * - 当前只为图片与 PDF 注入 file part，保持多模态模型可直接消费。
+ * - 历史中的 `resources://` 与旧版 `file://` 会在喂给模型前临时 hydrate。
  */
 
 import fs from "fs-extra";
@@ -62,11 +63,32 @@ function buildDataUrl(mediaType: string, buffer: Buffer): string {
   return `data:${safeType};base64,${base64}`;
 }
 
-async function hydrateFileUrlPart(part: FileUIPart): Promise<FileUIPart> {
+function resolveResourcesUrlPath(
+  projectRoot: string | undefined,
+  rawUrl: 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 root = path.resolve(String(projectRoot || "").trim() || process.cwd());
+  const absPath = path.resolve(root, relative);
+  const rel = path.relative(root, absPath);
+  if (rel === "" || rel.startsWith("..") || path.isAbsolute(rel)) return null;
+  return absPath;
+}
+
+async function hydrateFileUrlPart(
+  part: FileUIPart,
+  projectRoot?: string,
+): Promise<FileUIPart> {
   const url = String(part.url || "").trim();
-  if (!url.startsWith("file://")) return part;
+  const resourcesPath = resolveResourcesUrlPath(projectRoot, url);
+  if (!url.startsWith("file://") && !resourcesPath) return part;
   try {
-    const absPath = fileURLToPath(url);
+    const absPath = resourcesPath || fileURLToPath(url);
     const buffer = await fs.readFile(absPath);
     const mediaType =
       String(part.mediaType || "").trim() ||
@@ -83,14 +105,15 @@ async function hydrateFileUrlPart(part: FileUIPart): Promise<FileUIPart> {
 }
 
 /**
- * 将历史中的 `file://` file part 临时转换为模型可消费的 data URL。
+ * 将历史中的资源 file part 临时转换为模型可消费的 data URL。
  *
  * 关键点（中文）
  * - 该函数只修改本轮内存消息，不回写历史。
- * - 持久化层继续保留轻量 `file://` 绝对 URL，避免 JSONL 存储 base64。
+ * - 新历史保留 `resources://` 相对 URL，旧历史的 `file://` 仍继续兼容。
  */
 export async function hydrateFileUrlPartsForModel(
   messages: SessionMessageV1[],
+  projectRoot?: string,
 ): Promise<SessionMessageV1[]> {
   if (!Array.isArray(messages) || messages.length === 0) return messages;
 
@@ -109,7 +132,7 @@ export async function hydrateFileUrlPartsForModel(
         nextParts.push(part);
         continue;
       }
-      const nextPart = await hydrateFileUrlPart(part as FileUIPart);
+      const nextPart = await hydrateFileUrlPart(part as FileUIPart, projectRoot);
       if (nextPart !== part) changed = true;
       nextParts.push(nextPart as SessionMessageV1["parts"][number]);
     }

package/src/executor/messages/SessionMessageCodec.ts

@@ -72,6 +72,7 @@ export function pickMergedUserMessages(
 export async function toModelMessages(
   messages: SessionMessageV1[],
   tools: Record<string, Tool>,
+  projectRoot?: string,
 ): Promise<ModelMessage[]> {
   // 空输入快速返回，避免调用转换器的额外开销。
   if (!Array.isArray(messages) || messages.length === 0) return [];
@@ -79,8 +80,11 @@ export async function toModelMessages(
   // 第一步（中文）：在 user 消息上注入 file parts（多模态附件）。
   const enrichedMessages = await injectFilePartsFromAttachments(messages);
 
-  // 第二步（中文）：把历史里的 file:// 资源在内存中 hydrate 成模型可消费的 data URL。
-  const hydratedMessages = await hydrateFileUrlPartsForModel(enrichedMessages);
+  // 第二步（中文）：把历史里的资源 URL 在内存中 hydrate 成模型可消费的 data URL。
+  const hydratedMessages = await hydrateFileUrlPartsForModel(
+    enrichedMessages,
+    projectRoot,
+  );
 
   // 第三步（中文）：转换前先剔除 UI 层 id 字段，仅保留模型需要的数据结构。
   const input = hydratedMessages.map((message) => {