@downcity/agent 1.1.338 → 1.1.400

package/scripts/image-plugin-job.test.mjs

@@ -16,6 +16,20 @@ import path from "node:path";
 import { ImagePlugin } from "../../plugins/bin/index.js";
 import { PluginRegistry } from "../bin/plugin/core/PluginRegistry.js";
 
+let current_image_ai;
+
+function create_image_plugin(options = {}) {
+  const { list_models, image_create, image_result, ...profile } = options;
+  current_image_ai = {
+    catalog: async () => ({ all: () => (list_models ? list_models() : []) }),
+    image_create,
+    image_result,
+  };
+  return new ImagePlugin({
+    ...profile,
+  });
+}
+
 function create_image_message() {
   return {
     id: "msg_image_test",
@@ -23,7 +37,7 @@ function create_image_message() {
     parts: [
       {
         type: "file",
-        mediaType: "image/png",
+        media_type: "image/png",
         filename: "image.png",
         url: "/workspace/image.png",
       },
@@ -49,20 +63,41 @@ function create_files(workspace_path) {
 }
 
 function create_context(workspace_path = process.cwd()) {
+  const data_path = path.join(workspace_path, "agent-workspace-data");
   return {
+    agent_id: "image_test_agent",
+    workspace_id: "image_test_workspace",
     workspace_path,
+    data_path,
     files: create_files(workspace_path),
+    data_files: create_files(data_path),
+    embassy: { user: { ai: current_image_ai } },
+  };
+}
+
+function create_execution_context() {
+  const call_id = "image_test_call";
+  const abort_signal = new AbortController().signal;
+  return {
+    call_id,
+    abort_signal,
+    snapshot: {
+      call_id,
+      abort_signal,
+    },
   };
 }
 
 function create_registry(plugin, workspace_path = process.cwd()) {
-  const registry = new PluginRegistry([plugin]);
-  registry.bind_context(create_context(workspace_path));
-  return registry;
+  const registry = new PluginRegistry({
+    agent_id: "image_test_agent",
+    instructions: [],
+  }, [plugin]);
+  return registry.contextual(create_context(workspace_path));
 }
 
 test("ImagePlugin exposes only job-style image actions", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
   });
@@ -74,7 +109,7 @@ test("ImagePlugin exposes only job-style image actions", async () => {
 });
 
 test("ImagePlugin image_create returns image job", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: (input) => ({
       job_id: "img_1",
       status: "queued",
@@ -86,6 +121,7 @@ test("ImagePlugin image_create returns image job", async () => {
 
   const result = await plugin.actions.image_create.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: { prompt: "draw" },
     plugin_name: "image",
     action_name: "image_create",
@@ -97,7 +133,7 @@ test("ImagePlugin image_create returns image job", async () => {
 });
 
 test("ImagePlugin models lists image-capable models", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     list_models: () => [
       {
         id: "text_1",
@@ -123,6 +159,7 @@ test("ImagePlugin models lists image-capable models", async () => {
 
   const result = await plugin.actions.models.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {},
     plugin_name: "image",
     action_name: "models",
@@ -134,7 +171,7 @@ test("ImagePlugin models lists image-capable models", async () => {
 });
 
 test("ImagePlugin exposes action metadata through plugin registry", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
   });
@@ -156,7 +193,7 @@ test("ImagePlugin exposes action metadata through plugin registry", async () =>
 
 test("ImagePlugin image_result reads pending state once", async () => {
   const calls = [];
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: (input) => {
       calls.push(input.job_id);
@@ -171,6 +208,7 @@ test("ImagePlugin image_result reads pending state once", async () => {
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: { job_id: "img_1" },
     plugin_name: "image",
     action_name: "image_result",
@@ -185,7 +223,7 @@ test("ImagePlugin image_result reads pending state once", async () => {
 
 test("ImagePlugin image_result returns final message when succeeded", async () => {
   const message = create_image_message();
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: (input) => ({
       job_id: input.job_id,
@@ -197,6 +235,7 @@ test("ImagePlugin image_result returns final message when succeeded", async () =
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: { job_id: "img_1" },
     plugin_name: "image",
     action_name: "image_result",
@@ -212,7 +251,7 @@ test("ImagePlugin image_result returns final message when succeeded", async () =
   }]);
 });
 
-test("ImagePlugin image_result stores remote images locally and preserves source URLs", async (t) => {
+test("ImagePlugin image_result stores remote images locally", async (t) => {
   const workspace_path = await fs.mkdtemp(path.join(os.tmpdir(), "image-plugin-result-"));
   t.after(() => fs.rm(workspace_path, { recursive: true, force: true }));
   t.mock.method(globalThis, "fetch", async (url) => {
@@ -231,17 +270,17 @@ test("ImagePlugin image_result stores remote images locally and preserves source
     parts: [
       {
         type: "file",
-        mediaType: "image/png",
+        media_type: "image/png",
         url: "https://storage.example.com/first.png",
       },
       {
         type: "file",
-        mediaType: "image/webp",
+        media_type: "image/webp",
         url: "https://storage.example.com/second.webp",
       },
     ],
   };
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_remote", status: "queued" }),
     image_result: () => ({
       job_id: "img_remote",
@@ -252,6 +291,7 @@ test("ImagePlugin image_result stores remote images locally and preserves source
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(workspace_path),
+    execution: create_execution_context(),
     input: { job_id: "img_remote" },
     plugin_name: "image",
     action_name: "image_result",
@@ -259,19 +299,15 @@ test("ImagePlugin image_result stores remote images locally and preserves source
 
   assert.equal(result.success, true);
   assert.deepEqual(result.data.result.parts.map((part) => part.url), [
-    ".downcity/image/results/img_remote/image_01.png",
-    ".downcity/image/results/img_remote/image_02.webp",
+    path.join(workspace_path, "agent-workspace-data", "image", "results", "img_remote", "image_01.png"),
+    path.join(workspace_path, "agent-workspace-data", "image", "results", "img_remote", "image_02.webp"),
   ]);
-  assert.deepEqual(
-    result.data.result.parts.map((part) => part.providerMetadata.downcity.source_url),
-    remote_message.parts.map((part) => part.url),
-  );
   assert.equal(
-    await fs.readFile(path.join(workspace_path, result.data.result.parts[0].url), "utf8"),
+    await fs.readFile(result.data.result.parts[0].url, "utf8"),
     "png-bytes",
   );
   assert.equal(
-    await fs.readFile(path.join(workspace_path, result.data.result.parts[1].url), "utf8"),
+    await fs.readFile(result.data.result.parts[1].url, "utf8"),
     "webp-bytes",
   );
   assert.deepEqual(result.messages[0].parts, result.data.result.parts);
@@ -284,7 +320,7 @@ test("ImagePlugin image_result keeps remote URL when local storage fails", async
     return new Response("unavailable", { status: 503 });
   });
   const remote_url = "https://storage.example.com/failed.png";
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_fallback", status: "queued" }),
     image_result: () => ({
       job_id: "img_fallback",
@@ -292,13 +328,14 @@ test("ImagePlugin image_result keeps remote URL when local storage fails", async
       result: {
         id: "msg_remote_fallback",
         role: "assistant",
-        parts: [{ type: "file", mediaType: "image/png", url: remote_url }],
+        parts: [{ type: "file", media_type: "image/png", url: remote_url }],
       },
     }),
   });
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(workspace_path),
+    execution: create_execution_context(),
     input: { job_id: "img_fallback" },
     plugin_name: "image",
     action_name: "image_result",
@@ -306,20 +343,12 @@ test("ImagePlugin image_result keeps remote URL when local storage fails", async
 
   assert.equal(result.success, true);
   assert.equal(result.data.result.parts[0].url, remote_url);
-  assert.equal(
-    result.data.result.parts[0].providerMetadata.downcity.source_url,
-    remote_url,
-  );
-  assert.match(
-    result.data.result.parts[0].providerMetadata.downcity.localization_error,
-    /HTTP 503/,
-  );
   assert.match(result.message, /kept as remote URLs/);
   assert.deepEqual(result.messages[0].parts, result.data.result.parts);
 });
 
 test("ImagePlugin image_result reports failed terminal job", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: (input) => ({
       job_id: input.job_id,
@@ -331,6 +360,7 @@ test("ImagePlugin image_result reports failed terminal job", async () => {
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: { job_id: "img_1" },
     plugin_name: "image",
     action_name: "image_result",
@@ -342,7 +372,7 @@ test("ImagePlugin image_result reports failed terminal job", async () => {
 });
 
 test("ImagePlugin image_result payload is schema validated by registry", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
   });
@@ -363,7 +393,7 @@ test("ImagePlugin image_create converts local content image paths", async () =>
   try {
     await fs.writeFile(path.join(tempDir, "input.png"), Buffer.from("png"));
     let captured_input;
-    const plugin = new ImagePlugin({
+    const plugin = create_image_plugin({
       image_create: (input) => {
         captured_input = input;
         return { job_id: "img_1", status: "queued", poll_after_ms: 1 };
@@ -373,6 +403,7 @@ test("ImagePlugin image_create converts local content image paths", async () =>
 
     const result = await plugin.actions.image_create.execute({
       context: create_context(tempDir),
+      execution: create_execution_context(),
       input: {
         content: [
           { type: "text", text: "change background" },
@@ -396,7 +427,7 @@ test("ImagePlugin image_create converts local content image paths", async () =>
 
 test("ImagePlugin image_create uses content instead of prompt when both exist", async () => {
   let captured_input;
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: (input) => {
       captured_input = input;
       return { job_id: "img_1", status: "queued", poll_after_ms: 1 };
@@ -406,6 +437,7 @@ test("ImagePlugin image_create uses content instead of prompt when both exist",
 
   const result = await plugin.actions.image_create.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       prompt: "ignore this prompt",
       content: [{ type: "text", text: "use this content" }],
@@ -421,7 +453,7 @@ test("ImagePlugin image_create uses content instead of prompt when both exist",
 
 test("ImagePlugin image_create keeps remote content image URLs", async () => {
   let captured_input;
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: (input) => {
       captured_input = input;
       return { job_id: "img_1", status: "queued", poll_after_ms: 1 };
@@ -431,6 +463,7 @@ test("ImagePlugin image_create keeps remote content image URLs", async () => {
 
   const result = await plugin.actions.image_create.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       content: [
         { type: "text", text: "use this style" },
@@ -447,13 +480,14 @@ test("ImagePlugin image_create keeps remote content image URLs", async () => {
 });
 
 test("ImagePlugin image_create rejects legacy messages and data URLs", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
     image_result: () => ({ job_id: "img_1", status: "queued", poll_after_ms: 1 }),
   });
 
   const messages_result = await plugin.actions.image_create.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       messages: [
         {
@@ -471,6 +505,7 @@ test("ImagePlugin image_create rejects legacy messages and data URLs", async ()
 
   const data_url_result = await plugin.actions.image_create.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       content: [
         { type: "text", text: "edit this" },
@@ -489,7 +524,7 @@ test("ImagePlugin image_result polls until terminal when until_done=true", async
   const calls = [];
   let next_status = "running";
   const message = create_image_message();
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_wait", status: "queued", poll_after_ms: 1 }),
     image_result: (input) => {
       calls.push(input.job_id);
@@ -515,6 +550,7 @@ test("ImagePlugin image_result polls until terminal when until_done=true", async
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       job_id: "img_wait",
       until_done: true,
@@ -535,7 +571,7 @@ test("ImagePlugin image_result polls until terminal when until_done=true", async
 });
 
 test("ImagePlugin image_result returns last status when max_wait_ms elapses", async () => {
-  const plugin = new ImagePlugin({
+  const plugin = create_image_plugin({
     image_create: () => ({ job_id: "img_timeout", status: "queued", poll_after_ms: 1 }),
     image_result: (input) => ({
       job_id: input.job_id,
@@ -547,6 +583,7 @@ test("ImagePlugin image_result returns last status when max_wait_ms elapses", as
 
   const result = await plugin.actions.image_result.execute({
     context: create_context(),
+    execution: create_execution_context(),
     input: {
       job_id: "img_timeout",
       until_done: true,

package/scripts/logger-isolation.test.mjs

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 每次 get_logger 调用都应返回独立实例。
- * - 两个实例并发写日志时，只能写入各自项目的 `.downcity/logs`。
+ * - 两个实例并发写日志时，只能写入各自绑定数据根的 `logs`。
  */
 
 import test from "node:test";
@@ -18,7 +18,7 @@ import { get_logger } from "../bin/index.js";
  * 读取项目日志目录内的全部 JSONL 文本。
  */
 async function read_project_logs(project_root) {
-  const logs_dir = path.join(project_root, ".downcity", "logs");
+  const logs_dir = path.join(project_root, "logs");
   const files = await fs.readdir(logs_dir);
   const jsonl_files = files.filter((file) => file.endsWith(".jsonl"));
   const chunks = await Promise.all(

package/scripts/multi-agent-plugin-isolation.test.mjs

@@ -1,7 +1,7 @@
 /**
  * @file 验证多个 Agent 经 session.prompt 执行 plugin_call 时保持 registry 隔离。
  *
- * 两个 CityModel 并发进入原生 LanguageModelV3 tool loop，第二次模型调用必须只
+ * 两个 CityModel 并发进入原生 Downcity Model Protocol 工具循环，第二次模型调用必须只
  * 收到各自 Agent plugin action 返回的 owner。
  */
 
@@ -10,9 +10,11 @@ import assert from "node:assert/strict";
 import os from "node:os";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { MockLanguageModelV3 } from "ai/test";
+import { MockModelClient } from "./ModelClientMock.mjs";
 
-import { Agent, Workspace } from "../bin/index.js";
+import { Agent } from "../bin/index.js";
+import { create_workspace_entry } from "../bin/internal/index.js";
+import { Workspace } from "@downcity/workspace";
 import { create_action, create_plugin } from "../bin/plugin/core/PluginActionFactory.js";
 import { CITY_MODEL_KIND } from "@downcity/type";
 
@@ -76,10 +78,10 @@ function create_plugin_call_stream(model_id) {
   };
 }
 
-/** 创建原生 LanguageModelV3 CityModel。 */
+/** 创建原生 Downcity ModelClient。 */
 function create_test_model(model_id, model_requests) {
   let request_count = 0;
-  const language_model = new MockLanguageModelV3({
+  const language_model = new MockModelClient({
     modelId: model_id,
     doStream: async (options) => {
       if (!Array.isArray(options.tools) || options.tools.length === 0) {
@@ -134,20 +136,20 @@ test("multiple session prompts use only their owning Agent plugin registry", asy
   const root_b = await fs.mkdtemp(path.join(os.tmpdir(), "downcity-plugin-isolation-b-"));
   const agent_a = new Agent({
     id: "agent_a",
-    workspace: new Workspace({ path: root_a }),
     plugins: [create_owner_plugin("agent_a", executed_owners)],
     model: create_test_model("model_a", model_requests),
   });
   const agent_b = new Agent({
     id: "agent_b",
-    workspace: new Workspace({ path: root_b }),
     plugins: [create_owner_plugin("agent_b", executed_owners)],
     model: create_test_model("model_b", model_requests),
   });
+  const entry_a = create_workspace_entry(agent_a, new Workspace({ id: "workspace_a", path: root_a, data_root_path: path.join(root_a, "data") }));
+  const entry_b = create_workspace_entry(agent_b, new Workspace({ id: "workspace_b", path: root_b, data_root_path: path.join(root_b, "data") }));
 
   try {
-    const session_a = await agent_a.sessions.create({ session_id: "session_a" });
-    const session_b = await agent_b.sessions.create({ session_id: "session_b" });
+    const session_a = await entry_a.sessions.create({ session_id: "session_a" });
+    const session_b = await entry_b.sessions.create({ session_id: "session_b" });
     const [turn_a, turn_b] = await Promise.all([
       session_a.prompt({ query: "Call your skill plugin" }),
       session_b.prompt({ query: "Call your skill plugin" }),