@downcity/agent 1.1.216 → 1.1.222

package/bin/types/session/SessionOptions.d.ts

@@ -12,6 +12,7 @@ import type { SessionPort } from "../../types/runtime/agent/AgentContext.js";
 import type { AgentSessionSystemBlock } from "../../types/agent/SessionTypes.js";
 import type { SessionComposerOptions } from "../../types/session/SessionComposerOptions.js";
 import type { Logger } from "../../utils/logger/Logger.js";
+import type { AgentModel } from "../../model/CityModelAdapter.js";
 /**
  * Agent 可管理的本地 Session 实例。
  */
@@ -69,6 +70,8 @@ export interface SessionOptions {
      * 在执行前确保当前 session 已完成宿主侧默认配置。
      */
     ensureConfigured?: (session: AgentManagedSession) => Promise<void>;
+    /** 按稳定模型 ID 解析当前 Session 的运行时模型。 */
+    resolve_model?: (model_id: string) => Promise<AgentModel>;
     /**
      * 当前 session 的 Composer 覆盖项。
      */

package/bin/types/session/SessionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../../src/types/session/SessionOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,cAAc,IAAI,WAAW,CAAC;IAE9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,0BAA0B,EAAE,MAAM,uBAAuB,EAAE,CAAC;IAE5D;;OAEG;IACH,4BAA4B,EAAE,MAAM,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEvE;;OAEG;IACH,qBAAqB,EAAE,MAAM,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEhE;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnE;;OAEG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC"}
+{"version":3,"file":"SessionOptions.d.ts","sourceRoot":"","sources":["../../../src/types/session/SessionOptions.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,cAAc,IAAI,WAAW,CAAC;IAE9B;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,0BAA0B,EAAE,MAAM,uBAAuB,EAAE,CAAC;IAE5D;;OAEG;IACH,4BAA4B,EAAE,MAAM,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEvE;;OAEG;IACH,qBAAqB,EAAE,MAAM,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEhE;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnE,oCAAoC;IACpC,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1D;;OAEG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downcity/agent",
-  "version": "1.1.216",
+  "version": "1.1.222",
   "type": "module",
   "description": "Downcity Agent 运行时 — 单 Agent 执行壳与本机 RPC 能力",
   "main": "./bin/index.js",
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@ai-sdk/openai-compatible": "^2.0.48",
-    "@downcity/shell": "^0.1.80",
-    "@downcity/type": "0.1.113",
+    "@downcity/shell": "^0.1.85",
+    "@downcity/type": "0.1.118",
     "ai": "^6.0.193",
     "commander": "^15.0.0",
     "dotenv": "^17.4.2",

package/scripts/agent-env.test.mjs

@@ -33,7 +33,7 @@ test("项目 .env 覆盖宿主环境且不修改 process.env", () => {
     assert.equal(env.PROJECT_ONLY, "value");
     assert.equal(process.env.DOWNCITY_ENV_TEST, original_value);
   } finally {
-    fs.rmSync(project_root, { recursive: true, force: true });
+    fs.rmSync(project_root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   }
 });
 
@@ -50,7 +50,7 @@ test("SDK 未传 config 时不读取 downcity.json", async () => {
     await agent.ready();
     await agent.dispose();
   } finally {
-    fs.rmSync(project_root, { recursive: true, force: true });
+    fs.rmSync(project_root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   }
 });
 
@@ -65,7 +65,7 @@ test("SDK 未注入 plugin_config 时明确拒绝持久化", async () => {
     await agent.ready();
     await agent.dispose();
   } finally {
-    fs.rmSync(project_root, { recursive: true, force: true });
+    fs.rmSync(project_root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   }
 });
 
@@ -96,6 +96,6 @@ test("项目初始化只创建 .env、Skills 和运行目录并返回真实结
     assert.equal(second.skippedFiles.includes(".agents/skills/"), true);
     assert.equal(second.skippedFiles.includes(".downcity/"), true);
   } finally {
-    fs.rmSync(project_root, { recursive: true, force: true });
+    fs.rmSync(project_root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   }
 });

package/scripts/remote-session-reconnect.test.mjs

@@ -65,3 +65,36 @@ test("RemoteSession reconnects the event pump after transport close", async () =
   });
   assert.equal((await second_turn.finished).text, "done");
 });
+
+test("RemoteSession switches models by stable id without local model instances", async () => {
+  const updates = [];
+  const transport = {
+    async set(_session_id, input) {
+      updates.push(input);
+      return {
+        agentId: "agent_test",
+        sessionId: "session_test",
+        messageCount: 0,
+        modelId: input.modelId,
+        modelLabel: input.modelId,
+      };
+    },
+  };
+  const session = new RemoteSession(transport, {
+    agentId: "agent_test",
+    sessionId: "session_test",
+    messageCount: 0,
+    modelId: "old-model",
+    modelLabel: "old-model",
+  });
+
+  await session.set({ modelId: "next-model" });
+
+  assert.deepEqual(updates, [{ modelId: "next-model" }]);
+  assert.equal(session.config.modelId, "next-model");
+  assert.equal(session.config.modelLabel, "next-model");
+  await assert.rejects(
+    session.set({ model: { modelId: "local-model", provider: "test" } }),
+    /does not accept a local model instance/,
+  );
+});

package/scripts/session-action-message.test.mjs

@@ -113,12 +113,15 @@ test("session.set only persists and publishes model-switching actions when model
     });
     const events = [];
     const unsubscribe = session.subscribe((event) => {
-      if (event.type === "action") events.push(event);
+      if (
+        event.variant === "message" && event.type === "action"
+      ) events.push(event.message);
     });
 
     await session.set({
+      modelId: "test-model",
       model: {
-        modelId: "test-model",
+        modelId: "test-model-label-v1",
         provider: "test",
       },
     });
@@ -126,8 +129,9 @@ test("session.set only persists and publishes model-switching actions when model
     assert.deepEqual(events, []);
 
     await session.set({
+      modelId: "test-model",
       model: {
-        modelId: "test-model",
+        modelId: "test-model-label-v2",
         provider: "test",
       },
     });
@@ -135,26 +139,32 @@ test("session.set only persists and publishes model-switching actions when model
     assert.deepEqual(events, []);
 
     await session.set({
+      modelId: "next-test-model",
       model: {
-        modelId: "next-test-model",
+        modelId: "next-test-model-label",
         provider: "test",
       },
     });
     unsubscribe();
 
     assert.deepEqual(
-      events.map((event) => `${event.title}:${event.state}`),
-      ["Switching session model:running", "Session model switched:completed"],
+      events.map((event) => `${event.title}:${event.status}`),
+      [
+        "Switching session model from test-model-label-v2 to next-test-model-label:running",
+        "Session model switched from test-model-label-v2 to next-test-model-label:completed",
+      ],
     );
-    assert.equal(new Set(events.map((event) => event.id)).size, 1);
+    assert.equal(new Set(events.map((event) => event.message_id)).size, 1);
 
-    const records = await session.records({ view: "timeline" });
-    const action_events = records.items.filter(
-      (item) => item.role === "action",
+    const messages = await session.messages();
+    const action_events = messages.items.filter(
+      (item) => item.type === "action",
     );
     assert.deepEqual(
-      action_events.map((event) => `${event.actionTitle}:${event.actionState}`),
-      ["Session model switched:completed"],
+      action_events.map((event) => `${event.title}:${event.status}`),
+      [
+        "Session model switched from test-model-label-v2 to next-test-model-label:completed",
+      ],
     );
   } finally {
     await agent.dispose();
@@ -177,9 +187,9 @@ test("default model initialization does not persist model-switching actions", as
     const session = await agent.sessions.create({
       sessionId: "model_init_action_session",
     });
-    const records = await session.records({ view: "timeline" });
-    const action_events = records.items.filter(
-      (item) => item.role === "action",
+    const messages = await session.messages();
+    const action_events = messages.items.filter(
+      (item) => item.type === "action",
     );
     assert.deepEqual(action_events, []);
   } finally {
@@ -187,6 +197,117 @@ test("default model initialization does not persist model-switching actions", as
   }
 });
 
+test("session model id persists and restores through the host resolver", async () => {
+  const agent_path = await fs.mkdtemp(
+    path.join(os.tmpdir(), "downcity-agent-session-model-id-"),
+  );
+  const resolved_model_ids = [];
+  const resolve_model = async (model_id) => {
+    resolved_model_ids.push(model_id);
+    return {
+      modelId: model_id,
+      provider: "test",
+    };
+  };
+  const first_agent = new Agent({
+    id: "session_model_id_agent",
+    path: agent_path,
+    model: await resolve_model("default-model"),
+    model_id: "default-model",
+    resolve_model,
+  });
+  try {
+    const session = await first_agent.sessions.create({
+      sessionId: "persisted-model-session",
+    });
+    await session.set({ modelId: "session-model" });
+    const info = await session.get_info();
+    assert.equal(info.modelId, "session-model");
+    assert.equal(session.config.modelId, "session-model");
+  } finally {
+    await first_agent.dispose();
+  }
+
+  const restored_agent = new Agent({
+    id: "session_model_id_agent",
+    path: agent_path,
+    model: await resolve_model("other-default-model"),
+    model_id: "other-default-model",
+    resolve_model,
+  });
+  try {
+    const restored_session = await restored_agent.sessions.get(
+      "persisted-model-session",
+    );
+    assert.equal(restored_session.config.modelId, "session-model");
+    assert.equal(restored_session.config.model.modelId, "session-model");
+    assert.equal(resolved_model_ids.at(-1), "session-model");
+  } finally {
+    await restored_agent.dispose();
+  }
+});
+
+test("runtime restoration does not publish a model switch when model id is unchanged", async () => {
+  const agent_path = await fs.mkdtemp(
+    path.join(os.tmpdir(), "downcity-agent-session-model-runtime-restore-"),
+  );
+  const first_agent = new Agent({
+    id: "session_model_runtime_restore_agent",
+    path: agent_path,
+    model: {
+      modelId: "default-model",
+      provider: "test",
+    },
+    model_id: "default-model",
+    resolve_model: async (model_id) => ({
+      modelId: model_id,
+      provider: "test",
+    }),
+  });
+  try {
+    const session = await first_agent.sessions.create({
+      sessionId: "runtime-restored-model-session",
+    });
+    await session.set({ modelId: "session-model" });
+  } finally {
+    await first_agent.dispose();
+  }
+
+  let resolve_count = 0;
+  const restored_agent = new Agent({
+    id: "session_model_runtime_restore_agent",
+    path: agent_path,
+    model: {
+      modelId: "other-default-model",
+      provider: "test",
+    },
+    model_id: "other-default-model",
+    resolve_model: async (model_id) => {
+      resolve_count += 1;
+      return {
+        modelId: model_id,
+        provider: "test",
+      };
+    },
+  });
+  try {
+    const session_port = restored_agent
+      .getContext()
+      .session.get("runtime-restored-model-session");
+    const events = [];
+    const unsubscribe = session_port.subscribe((event) => {
+      if (event.type === "action") events.push(event);
+    });
+    await session_port.stop();
+    unsubscribe();
+
+    assert.equal(resolve_count, 1);
+    assert.deepEqual(events, []);
+  } finally {
+    await restored_agent.dispose();
+  }
+});
+
 test("session.fork persists and publishes history-forking actions on source session", async () => {
   const agent_path = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-history-forking-"),
@@ -209,32 +330,32 @@ test("session.fork persists and publishes history-forking actions on source sess
 
     const events = [];
     const unsubscribe = session.subscribe((event) => {
-      if (event.type === "action") {
-        events.push(event);
-      }
+      if (
+        event.variant === "message" && event.type === "action"
+      ) events.push(event.message);
     });
     const forked = await session.fork();
     unsubscribe();
 
     assert.deepEqual(
-      events.map((event) => `${event.title}:${event.state}`),
+      events.map((event) => `${event.title}:${event.status}`),
       ["Forking session records:running", "Session records forked:completed"],
     );
-    assert.equal(new Set(events.map((event) => event.id)).size, 1);
+    assert.equal(new Set(events.map((event) => event.message_id)).size, 1);
     assert.notEqual(forked.id, session.id);
 
-    const source_records = await session.records({ view: "timeline" });
-    const source_fork_actions = source_records.items.filter(
-      (item) => item.role === "action" && item.actionTitle === "Session records forked",
+    const source_messages = await session.messages();
+    const source_fork_actions = source_messages.items.filter(
+      (item) => item.type === "action" && item.title === "Session records forked",
     );
     assert.deepEqual(
-      source_fork_actions.map((event) => event.actionState),
+      source_fork_actions.map((event) => event.status),
       ["completed"],
     );
 
-    const forked_records = await forked.records({ view: "timeline" });
-    const forked_model_actions = forked_records.items.filter(
-      (item) => item.role === "action" && item.actionTitle === "Session model switched",
+    const forked_messages = await forked.messages();
+    const forked_model_actions = forked_messages.items.filter(
+      (item) => item.type === "action" && item.title.startsWith("Session model switched from "),
     );
     assert.equal(forked_model_actions.length, 0);
   } finally {

package/scripts/session-list-title.test.mjs

@@ -141,7 +141,7 @@ test("list_sessions returns persisted title from active session metadata", async
   }
 });
 
-test("list_sessions rebuilds stale metadata after external history changes", async () => {
+test("list_sessions reflects canonical Recorder history changes", async () => {
   const { agent, collection, session } = await create_agent_with_titled_session({
     tmp_prefix: "downcity-agent-session-summary-repair-",
     agent_id: "summary_repair_agent",
@@ -162,31 +162,18 @@ test("list_sessions rebuilds stale metadata after external history changes", asy
   const meta_path = path.join(messages_dir, "meta.json");
 
   try {
-    await fs.appendFile(
-      messages_path,
-      `${JSON.stringify({
-        id: "external_assistant",
-        role: "assistant",
-        metadata: {
-          v: 1,
-          ts: Date.now(),
-          sessionId: session.id,
-          source: "egress",
-          kind: "normal",
-        },
-        parts: [{ type: "text", text: "Externally appended history" }],
-      })}\n`,
-      "utf8",
-    );
+    await session.append_assistant_message({
+      text: "Recorder appended history",
+    });
 
     const page = await collection.list();
     const repaired_meta = JSON.parse(await fs.readFile(meta_path, "utf8"));
     const history_stat = await fs.stat(messages_path);
 
     assert.equal(page.items[0].messageCount, 2);
-    assert.equal(page.items[0].previewText, "Externally appended history");
+    assert.equal(page.items[0].previewText, "Recorder appended history");
     assert.equal(repaired_meta.messageCount, 2);
-    assert.equal(repaired_meta.previewText, "Externally appended history");
+    assert.equal(repaired_meta.previewText, "Recorder appended history");
     assert.equal(repaired_meta.historyBytes, history_stat.size);
   } finally {
     await agent.dispose();

package/scripts/session-prompt-runtime.test.mjs

@@ -76,7 +76,6 @@ async function isSettled(promise) {
 test("SessionPromptRuntime merges queued prompts at the next step boundary", async () => {
   const events = [];
   const persisted = [];
-  const steer_actions = [];
   const merge_lifecycle = [];
   const executionFinished = createDeferred();
   let stepMerge = null;
@@ -92,10 +91,7 @@ test("SessionPromptRuntime merges queued prompts at the next step boundary", asy
       merge_lifecycle.push(`message:${input.query}`);
       return message;
     },
-    emit_steer_action: async (input) => {
-      steer_actions.push(input);
-      merge_lifecycle.push(`action:${input.message.parts[0]?.text}`);
-    },
+    appendErrorMessage: async () => {},
     executeTurn: async (input) => {
       stepMerge = input.onStepMerge;
       await executionFinished.promise;
@@ -126,17 +122,9 @@ test("SessionPromptRuntime merges queued prompts at the next step boundary", asy
     persisted.map((message) => message.parts[0]?.text),
     ["first", "second"],
   );
-  assert.deepEqual(
-    steer_actions.map((action) => ({
-      turn_id: action.turn_id,
-      text: action.message.parts[0]?.text,
-    })),
-    [{ turn_id: firstTurn.id, text: "second" }],
-  );
   assert.deepEqual(merge_lifecycle, [
     "message:first",
     "message:second",
-    "action:second",
   ]);
 
   executionFinished.resolve();
@@ -163,7 +151,7 @@ test("SessionPromptRuntime moves unmerged prompts into the next turn", async ()
     createAndPersistUserMessage: async (input) => {
       return createUserMessage(input.query, events.length + 1);
     },
-    emit_steer_action: async () => {},
+    appendErrorMessage: async () => {},
     executeTurn: async (input) => {
       const deferred = createDeferred();
       finishQueue.push({
@@ -221,7 +209,7 @@ test("SessionPromptRuntime stops current turn and cancels unmerged queued prompt
     createAndPersistUserMessage: async (input) => {
       return createUserMessage(input.query, events.length + 1);
     },
-    emit_steer_action: async () => {},
+    appendErrorMessage: async () => {},
     executeTurn: async (input) => {
       await new Promise((resolve) => {
         input.abortSignal.addEventListener("abort", resolve, { once: true });
@@ -278,7 +266,7 @@ test("SessionPromptRuntime does not synthesize assistant text when stopped befor
     createAndPersistUserMessage: async (input) => {
       return createUserMessage(input.query, 1);
     },
-    emit_steer_action: async () => {},
+    appendErrorMessage: async () => {},
     executeTurn: async (input) => {
       await new Promise((resolve) => {
         input.abortSignal.addEventListener("abort", resolve, { once: true });