@downcity/agent 1.1.64 → 1.1.69

package/scripts/city-model-tool-loop.test.mjs

@@ -1,9 +1,10 @@
 /**
- * @file 验证 CityModel 适配层会把本地 tool result 带回下一轮请求。
+ * @file 验证 CityModel 会优先走 OpenAI-compatible LanguageModel 并完成 tool loop。
  *
  * 关键点（中文）
  * - 这里直接走编译后的 Agent / City 产物，避免测试只覆盖源码级辅助函数。
- * - 重点锁住 CityModelAdapter 的 tool-call -> 本地执行 -> tool-result 回传链路。
+ * - 重点锁住 CityModel -> LanguageModel -> tool-call -> 本地执行 -> tool-result 回传链路。
+ * - 新路径不应再调用 `/v1/ai/stream`，避免 UIMessage stream 反向适配丢失 finish 语义。
  */
 
 import test from "node:test";
@@ -17,15 +18,15 @@ import { City } from "../../city/bin/index.js";
 import { tool } from "ai";
 import { z } from "zod";
 
-function write_sse(res, chunks) {
+function write_openai_sse(res, chunks) {
   res.writeHead(200, {
     "content-type": "text/event-stream; charset=utf-8",
     "cache-control": "no-cache",
     connection: "keep-alive",
-    "x-vercel-ai-ui-message-stream": "v1",
   });
   for (const chunk of chunks) {
-    res.write(`data: ${JSON.stringify(chunk)}\n\n`);
+    const payload = typeof chunk === "string" ? chunk : JSON.stringify(chunk);
+    res.write(`data: ${payload}\n\n`);
   }
   res.end();
 }
@@ -42,8 +43,10 @@ async function read_json_body(req) {
   return JSON.parse(String(raw || "{}"));
 }
 
-test("CityModel sends tool result back on the next round", async () => {
+test("CityModel uses direct LanguageModel path and sends tool result back", async () => {
   const requests = [];
+  const agent_requests = [];
+  let stream_requests = 0;
   let tool_executed = false;
 
   const server = http.createServer(async (req, res) => {
@@ -68,30 +71,149 @@ test("CityModel sends tool result back on the next round", async () => {
     }
 
     if (req.method === "POST" && url.pathname === "/v1/ai/stream") {
+      stream_requests += 1;
+      res.writeHead(500, { "content-type": "application/json" });
+      res.end(JSON.stringify({ error: "legacy stream endpoint should not be called" }));
+      return;
+    }
+
+    if (req.method === "POST" && url.pathname === "/v1/ai/chat/completions") {
       const body = await read_json_body(req);
       requests.push(body);
 
-      if (requests.length === 1) {
-        write_sse(res, [
-          { type: "start", messageId: "msg_1" },
-          { type: "tool-input-start", toolCallId: "call_1", toolName: "ping" },
+      if (!Array.isArray(body.tools)) {
+        write_openai_sse(res, [
+          {
+            id: "chatcmpl_title",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "mock-model",
+            choices: [
+              {
+                index: 0,
+                delta: { role: "assistant", content: "Tool loop" },
+                finish_reason: null,
+              },
+            ],
+          },
+          {
+            id: "chatcmpl_title",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "mock-model",
+            choices: [
+              {
+                index: 0,
+                delta: {},
+                finish_reason: "stop",
+              },
+            ],
+          },
+          "[DONE]",
+        ]);
+        return;
+      }
+
+      agent_requests.push(body);
+      if (agent_requests.length === 1) {
+        write_openai_sse(res, [
+          {
+            id: "chatcmpl_1",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "mock-model",
+            choices: [
+              {
+                index: 0,
+                delta: { role: "assistant" },
+                finish_reason: null,
+              },
+            ],
+          },
+          {
+            id: "chatcmpl_1",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "mock-model",
+            choices: [
+              {
+                index: 0,
+                delta: {
+                  tool_calls: [
+                    {
+                      index: 0,
+                      id: "call_1",
+                      type: "function",
+                      function: {
+                        name: "ping",
+                        arguments: "{\"value\":\"hello\"}",
+                      },
+                    },
+                  ],
+                },
+                finish_reason: null,
+              },
+            ],
+          },
           {
-            type: "tool-input-available",
-            toolCallId: "call_1",
-            toolName: "ping",
-            input: { value: "hello" },
+            id: "chatcmpl_1",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "mock-model",
+            choices: [
+              {
+                index: 0,
+                delta: {},
+                finish_reason: "tool_calls",
+              },
+            ],
           },
-          { type: "finish", finishReason: "tool-calls" },
+          "[DONE]",
         ]);
         return;
       }
 
-      write_sse(res, [
-        { type: "start", messageId: "msg_2" },
-        { type: "text-start", id: "text_2" },
-        { type: "text-delta", id: "text_2", delta: "done" },
-        { type: "text-end", id: "text_2" },
-        { type: "finish", finishReason: "stop" },
+      write_openai_sse(res, [
+        {
+          id: "chatcmpl_2",
+          object: "chat.completion.chunk",
+          created: 1,
+          model: "mock-model",
+          choices: [
+            {
+              index: 0,
+              delta: { role: "assistant" },
+              finish_reason: null,
+            },
+          ],
+        },
+        {
+          id: "chatcmpl_2",
+          object: "chat.completion.chunk",
+          created: 1,
+          model: "mock-model",
+          choices: [
+            {
+              index: 0,
+              delta: { content: "done" },
+              finish_reason: null,
+            },
+          ],
+        },
+        {
+          id: "chatcmpl_2",
+          object: "chat.completion.chunk",
+          created: 1,
+          model: "mock-model",
+          choices: [
+            {
+              index: 0,
+              delta: {},
+              finish_reason: "stop",
+            },
+          ],
+        },
+        "[DONE]",
       ]);
       return;
     }
@@ -142,31 +264,19 @@ test("CityModel sends tool result back on the next round", async () => {
 
     assert.equal(result.success, true);
     assert.equal(tool_executed, true);
-    assert.equal(requests.length, 2);
+    assert.equal(stream_requests, 0);
+    assert.equal(agent_requests.length, 2);
+    assert.equal(requests.every((request) => request?.town_id === "town_demo"), true);
+    assert.equal(agent_requests[0]?.model, "mock-model");
 
-    const second_request_messages = Array.isArray(requests[1]?.messages)
-      ? requests[1].messages
+    const second_request_messages = Array.isArray(agent_requests[1]?.messages)
+      ? agent_requests[1].messages
       : [];
-    const second_assistant_message = second_request_messages.find(
-      (message) => message && message.role === "assistant",
-    );
-    assert.ok(second_assistant_message);
-    const second_assistant_parts = Array.isArray(second_assistant_message.parts)
-      ? second_assistant_message.parts
-      : [];
-
-    const tool_call_part = second_assistant_parts.find(
-      (part) => part && part.type === "dynamic-tool" && part.state === "output-available",
-    );
-    assert.deepEqual(tool_call_part, {
-      type: "dynamic-tool",
-      toolName: "ping",
-      toolCallId: "call_1",
-      state: "output-available",
-      input: { value: "hello" },
-      output: { echoed: "hello" },
-      providerExecuted: false,
-    });
+    const serialized_second_messages = JSON.stringify(second_request_messages);
+    assert.match(serialized_second_messages, /"role":"tool"/);
+    assert.match(serialized_second_messages, /call_1/);
+    assert.match(serialized_second_messages, /echoed/);
+    assert.match(serialized_second_messages, /hello/);
   } finally {
     await new Promise((resolve, reject) => {
       server.close((error) => {

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

@@ -3,7 +3,8 @@
  *
  * 关键点（中文）
  * - 这里走编译后的公开 SDK，锁住调用方实际可见行为。
- * - 使用 appendUserMessage 触发 fallback 标题，避免测试依赖真实模型。
+ * - title 默认允许为空；没有可用模型时不会再回退成首条 user message。
+ * - 当后续补上模型且 title 仍为空时，应允许再次尝试生成。
  */
 
 import test from "node:test";
@@ -12,9 +13,39 @@ import os from "node:os";
 import path from "node:path";
 import fs from "node:fs/promises";
 
+import { MockLanguageModelV3 } from "ai/test";
 import { Agent } from "../bin/index.js";
 
-test("Session publishes title event and exposes title in history", async () => {
+function create_mock_title_model(title_text) {
+  return new MockLanguageModelV3({
+    modelId: "mock-session-title-model",
+    doGenerate: async () => ({
+      content: [
+        {
+          type: "text",
+          text: title_text,
+        },
+      ],
+      finishReason: "stop",
+      usage: {
+        inputTokens: {
+          total: 0,
+          noCache: 0,
+          cacheRead: 0,
+          cacheWrite: 0,
+        },
+        outputTokens: {
+          total: 0,
+          text: 0,
+          reasoning: 0,
+        },
+      },
+      warnings: [],
+    }),
+  });
+}
+
+test("Session keeps title empty when no model is available", async () => {
   const agent_path = await fs.mkdtemp(
     path.join(os.tmpdir(), "downcity-agent-session-title-"),
   );
@@ -33,18 +64,54 @@ test("Session publishes title event and exposes title in history", async () => {
       text: "Use shell tools to inspect the current workspace",
     });
 
+    const title_event = events.find((event) => event.type === "session-title");
+    assert.equal(title_event, undefined);
+
+    const history = await session.history();
+    assert.equal(history.session.title, undefined);
+  } finally {
+    unsubscribe();
+  }
+});
+
+test("Session retries title generation after model becomes available", async () => {
+  const agent_path = await fs.mkdtemp(
+    path.join(os.tmpdir(), "downcity-agent-session-title-retry-"),
+  );
+  const agent = new Agent({
+    id: "title_retry_agent",
+    path: agent_path,
+  });
+  const session = await agent.createSession();
+  const events = [];
+  const unsubscribe = session.subscribe((event) => {
+    events.push(event);
+  });
+
+  try {
+    await session.appendUserMessage({
+      text: "Investigate flaky session title generation in the SDK",
+    });
+
+    const history_before_model = await session.history();
+    assert.equal(history_before_model.session.title, undefined);
+
+    await session.set({
+      model: create_mock_title_model("排查 session 标题"),
+    });
+    await session.appendUserMessage({
+      text: "Need another prompt to trigger the retry path",
+    });
+
     const title_event = events.find((event) => event.type === "session-title");
     assert.deepEqual(title_event, {
       type: "session-title",
       sessionId: session.id,
-      title: "Use shell tools to inspect the current workspace",
+      title: "排查 session 标题",
     });
 
     const history = await session.history();
-    assert.equal(
-      history.session.title,
-      "Use shell tools to inspect the current workspace",
-    );
+    assert.equal(history.session.title, "排查 session 标题");
   } finally {
     unsubscribe();
   }

package/src/agent/Agent.ts

@@ -431,6 +431,7 @@ export class Agent {
       host,
       port,
       sessionCollection: this.sessionCollection,
+      getAgentContext: () => this.agentContext,
     });
     this.rpcBinding = {
       url: `rpc://${host}:${port}`,

package/src/agent/RemoteAgent.ts

@@ -115,6 +115,10 @@ type RemoteAgentTransport = RemoteSessionTransport & {
    * 列出 sessions。
    */
   list_sessions(input?: AgentListSessionsInput): Promise<AgentSessionSummaryPage>;
+  /**
+   * 关闭 transport 持有的长期连接。
+   */
+  close?(): Promise<void>;
 };
 
 type SdkEventsReadyFrame = {
@@ -336,7 +340,7 @@ export class RemoteAgent {
     if (!url) {
       throw new Error("RemoteAgent requires a non-empty url");
     }
-    this.transport = create_remote_agent_transport(url);
+    this.transport = create_remote_agent_transport(url, options.token);
   }
 
   /**
@@ -369,13 +373,34 @@ export class RemoteAgent {
   ): Promise<AgentSessionSummaryPage> {
     return await this.transport.list_sessions(input);
   }
+
+  /**
+   * 关闭远程 transport。
+   *
+   * 关键点（中文）
+   * - `rpc://` 会关闭底层长连接。
+   * - `http://` / `https://` 没有常驻连接，调用时是安全 no-op。
+   */
+  async close(): Promise<void> {
+    await this.transport.close?.();
+  }
 }
 
 class HttpRemoteAgentTransport implements RemoteAgentTransport {
   private readonly base_url: string;
+  private readonly token: string;
 
-  constructor(url: string) {
+  constructor(url: string, token?: string) {
     this.base_url = url.replace(/\/+$/, "");
+    this.token = String(token || "").trim();
+  }
+
+  private headers(input?: Record<string, string>): Headers {
+    const headers = new Headers(input);
+    if (this.token) {
+      headers.set("Authorization", `Bearer ${this.token}`);
+    }
+    return headers;
   }
 
   async create_session(input?: AgentCreateSessionInput): Promise<AgentSessionInfo> {
@@ -385,9 +410,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       session?: AgentSessionInfo;
     }>(`${this.base_url}/api/sdk/sessions`, {
       method: "POST",
-      headers: {
+      headers: this.headers({
         "Content-Type": "application/json",
-      },
+      }),
       body: JSON.stringify({
         ...(input?.sessionId ? { sessionId: input.sessionId } : {}),
       }),
@@ -403,7 +428,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       success?: boolean;
       error?: string;
       session?: AgentSessionInfo;
-    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}`);
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}`, {
+      headers: this.headers(),
+    });
     if (!payload.success || !payload.session?.sessionId) {
       throw new Error(String(payload.error || "Remote session info failed"));
     }
@@ -422,9 +449,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       };
     }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/prompt`, {
       method: "POST",
-      headers: {
+      headers: this.headers({
         "Content-Type": "application/json",
-      },
+      }),
       body: JSON.stringify({
         query: input.query,
       }),
@@ -451,6 +478,7 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
     const response = await fetch(
       `${this.base_url}/api/sdk/sessions/${encodeURIComponent(params.session_id)}/events`,
       {
+        headers: this.headers(),
         signal: abort_controller.signal,
       },
     );
@@ -495,6 +523,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       `${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/history${
         query.size > 0 ? `?${query.toString()}` : ""
       }`,
+      {
+        headers: this.headers(),
+      },
     );
     if (!payload.success || !payload.history || !Array.isArray(payload.history.items)) {
       throw new Error(String(payload.error || "Remote session history failed"));
@@ -507,7 +538,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       success?: boolean;
       error?: string;
       system?: AgentSessionSystemSnapshot;
-    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/system`);
+    }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/system`, {
+      headers: this.headers(),
+    });
     if (!payload.success || !payload.system || !Array.isArray(payload.system.blocks)) {
       throw new Error(String(payload.error || "Remote session system failed"));
     }
@@ -528,9 +561,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       session?: AgentSessionInfo;
     }>(`${this.base_url}/api/sdk/sessions/${encodeURIComponent(session_id)}/fork`, {
       method: "POST",
-      headers: {
+      headers: this.headers({
         "Content-Type": "application/json",
-      },
+      }),
       body: JSON.stringify({
         ...(message_id ? { messageId: message_id } : {}),
       }),
@@ -552,6 +585,9 @@ class HttpRemoteAgentTransport implements RemoteAgentTransport {
       page?: AgentSessionSummaryPage;
     }>(
       `${this.base_url}/api/sdk/sessions${query.size > 0 ? `?${query.toString()}` : ""}`,
+      {
+        headers: this.headers(),
+      },
     );
     if (!payload.success || !payload.page) {
       throw new Error(String(payload.error || "Remote sessions list failed"));
@@ -633,11 +669,18 @@ class RpcRemoteAgentTransport implements RemoteAgentTransport {
   async list_sessions(input?: AgentListSessionsInput): Promise<AgentSessionSummaryPage> {
     return await this.client.list_sessions(input);
   }
+
+  async close(): Promise<void> {
+    await this.client.close();
+  }
 }
 
-function create_remote_agent_transport(url: string): RemoteAgentTransport {
+function create_remote_agent_transport(
+  url: string,
+  token?: string,
+): RemoteAgentTransport {
   if (/^https?:\/\//i.test(url)) {
-    return new HttpRemoteAgentTransport(url);
+    return new HttpRemoteAgentTransport(url, token);
   }
   if (/^rpc:\/\//i.test(url)) {
     return new RpcRemoteAgentTransport(url);