npm - @downcity/agent - Versions diffs - 1.1.62 → 1.1.63 - Mend

@downcity/agent 1.1.62 → 1.1.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/bin/model/CityModelAdapter.d.ts.map +1 -1
package/bin/model/CityModelAdapter.js +129 -13
package/bin/model/CityModelAdapter.js.map +1 -1
package/package.json +2 -2
package/scripts/city-model-tool-loop.test.mjs +181 -0
package/src/model/CityModelAdapter.ts +184 -15
package/tsconfig.tsbuildinfo +1 -1

package/bin/model/CityModelAdapter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CityModelAdapter.d.ts","sourceRoot":"","sources":["../../src/model/CityModelAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAGL,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,IAAI,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC;~~AA2UnD~~;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,aAAa,CAGpE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAqBtF"}
1	+ {"version":3,"file":"CityModelAdapter.d.ts","sourceRoot":"","sources":["../../src/model/CityModelAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAGL,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,IAAI,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC;AAofnD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,aAAa,CAGpE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAqBtF"}

package/bin/model/CityModelAdapter.js CHANGED Viewed

@@ -43,11 +43,49 @@ function fileUrlFromProviderPart(part) {
         return data;
     return "";
 }
-function providerContentToUiParts(content) {
+function resolveProviderPromptRole(input) {
+    return input === "system" || input === "user" || input === "assistant" || input === "tool"
+        ? input
+        : "user";
+}
+function normalizeProviderToolResultOutput(output) {
+    const outputType = typeof output.type === "string" ? output.type : "";
+    if (outputType === "json" || outputType === "text" || outputType === "content") {
+        return {
+            state: "output-available",
+            output: "value" in output ? output.value : null,
+        };
+    }
+    if (outputType === "error-json") {
+        return {
+            state: "output-error",
+            errorText: stringifyToolInput("value" in output ? output.value : null),
+        };
+    }
+    if (outputType === "error-text") {
+        return {
+            state: "output-error",
+            errorText: String(output.value ?? ""),
+        };
+    }
+    if (outputType === "execution-denied") {
+        return {
+            state: "output-error",
+            errorText: String(output.reason ?? "tool execution denied"),
+        };
+    }
+    return {
+        state: "output-available",
+        output,
+    };
+}
+function providerContentToUiParts(content, existingParts) {
     if (!Array.isArray(content)) {
         return [{ type: "text", text: textFromProviderContent(content) }];
     }
-    const parts = [];
+    const parts = Array.isArray(existingParts)
+        ? [...existingParts]
+        : [];
     for (const part of content) {
         if (!part || typeof part !== "object")
             continue;
@@ -81,6 +119,47 @@ function providerContentToUiParts(content) {
                 input: record.input,
                 providerExecuted: Boolean(record.providerExecuted),
             });
+            continue;
+        }
+        if (record.type === "tool-result") {
+            const toolCallId = String(record.toolCallId ?? "");
+            const toolName = String(record.toolName ?? "");
+            const normalizedOutput = normalizeProviderToolResultOutput(record.output ?? {});
+            const existingPart = parts.find((item) => {
+                if (!item || typeof item !== "object")
+                    return false;
+                const toolPart = item;
+                return String(toolPart.toolCallId ?? "") === toolCallId;
+            });
+            const baseInput = existingPart?.input ?? null;
+            const baseToolName = String(existingPart?.toolName ?? toolName);
+            const nextPart = normalizedOutput.state === "output-available"
+                ? {
+                    type: "dynamic-tool",
+                    toolName: baseToolName,
+                    toolCallId,
+                    state: "output-available",
+                    input: baseInput,
+                    output: normalizedOutput.output,
+                    providerExecuted: false,
+                }
+                : {
+                    type: "dynamic-tool",
+                    toolName: baseToolName,
+                    toolCallId,
+                    state: "output-error",
+                    input: baseInput,
+                    errorText: normalizedOutput.errorText ?? "tool_error",
+                    providerExecuted: false,
+                };
+            if (existingPart) {
+                const index = parts.indexOf(existingPart);
+                if (index >= 0) {
+                    parts[index] = nextPart;
+                    continue;
+                }
+            }
+            parts.push(nextPart);
         }
     }
     return parts;
@@ -88,20 +167,34 @@ function providerContentToUiParts(content) {
 function providerPromptToMessages(prompt) {
     if (!Array.isArray(prompt))
         return [];
-    return prompt
-        .map((message, index) => {
+    const messages = [];
+    for (const [index, message] of prompt.entries()) {
         if (!message || typeof message !== "object")
-            return null;
+            continue;
         const item = message;
-        const role = item.role === "system" || item.role === "assistant" ? item.role : "user";
-        const parts = providerContentToUiParts(item.content);
-        return {
+        const role = resolveProviderPromptRole(item.role);
+        if (role === "tool") {
+            const lastAssistantMessage = [...messages]
+                .reverse()
+                .find((candidate) => candidate.role === "assistant");
+            if (lastAssistantMessage) {
+                lastAssistantMessage.parts = providerContentToUiParts(item.content, lastAssistantMessage.parts);
+                continue;
+            }
+            messages.push({
+                id: `city-model-message-${String(index)}`,
+                role: "assistant",
+                parts: providerContentToUiParts(item.content),
+            });
+            continue;
+        }
+        messages.push({
             id: `city-model-message-${String(index)}`,
             role,
-            parts,
-        };
-    })
-        .filter((message) => Boolean(message));
+            parts: providerContentToUiParts(item.content),
+        });
+    }
+    return messages;
 }
 function providerOptionsToInput(options) {
     return {
@@ -128,13 +221,36 @@ function uiMessageToProviderContent(message) {
         }
         if (part.type === "dynamic-tool") {
             const toolPart = part;
-            return [{
+            const content = [{
                     type: "tool-call",
                     toolCallId: String(toolPart.toolCallId ?? ""),
                     toolName: String(toolPart.toolName ?? ""),
                     input: stringifyToolInput(toolPart.input),
                     providerExecuted: Boolean(toolPart.providerExecuted),
                 }];
+            if (toolPart.state === "output-available") {
+                content.push({
+                    type: "tool-result",
+                    toolCallId: String(toolPart.toolCallId ?? ""),
+                    toolName: String(toolPart.toolName ?? ""),
+                    output: {
+                        type: "json",
+                        value: toolPart.output ?? null,
+                    },
+                });
+            }
+            else if (toolPart.state === "output-error") {
+                content.push({
+                    type: "tool-result",
+                    toolCallId: String(toolPart.toolCallId ?? ""),
+                    toolName: String(toolPart.toolName ?? ""),
+                    output: {
+                        type: "error-text",
+                        value: String(toolPart.errorText ?? "tool_error"),
+                    },
+                });
+            }
+            return content;
         }
         return [];
     });

package/bin/model/CityModelAdapter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CityModelAdapter.js","sourceRoot":"","sources":["../../src/model/CityModelAdapter.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"CityModelAdapter.js","sourceRoot":"","sources":["../../src/model/CityModelAdapter.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@downcity/agent",
-  "version": "1.1.62",
+  "version": "1.1.63",
   "type": "module",
   "description": "Downcity Agent 运行时 — 单 Agent 执行壳与 HTTP 服务能力",
   "main": "./bin/index.js",
@@ -28,7 +28,7 @@
     "node-cron": "^4.2.1",
     "ws": "^8.21.0",
     "zod": "^4.4.3",
-    "@downcity/type": "0.1.6"
+    "@downcity/type": "0.1.7"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",

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

@@ -0,0 +1,181 @@
+/**
+ * @file 验证 CityModel 适配层会把本地 tool result 带回下一轮请求。
+ *
+ * 关键点（中文）
+ * - 这里直接走编译后的 Agent / City 产物，避免测试只覆盖源码级辅助函数。
+ * - 重点锁住 CityModelAdapter 的 tool-call -> 本地执行 -> tool-result 回传链路。
+ */
+import test from "node:test";
+import assert from "node:assert/strict";
+import http from "node:http";
+import os from "node:os";
+import path from "node:path";
+import fs from "node:fs/promises";
+import { Agent } from "../bin/index.js";
+import { City } from "../../city/bin/index.js";
+import { tool } from "ai";
+import { z } from "zod";
+function write_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`);
+  }
+  res.end();
+}
+async function read_json_body(req) {
+  const raw = await new Promise((resolve, reject) => {
+    let data = "";
+    req.on("data", (chunk) => {
+      data += chunk;
+    });
+    req.on("end", () => resolve(data));
+    req.on("error", reject);
+  });
+  return JSON.parse(String(raw || "{}"));
+}
+test("CityModel sends tool result back on the next round", async () => {
+  const requests = [];
+  let tool_executed = false;
+  const server = http.createServer(async (req, res) => {
+    const url = new URL(String(req.url || "/"), "http://127.0.0.1");
+    if (req.method === "GET" && url.pathname === "/v1/ai/models") {
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({
+        items: [
+          {
+            id: "mock-model",
+            name: "Mock Model",
+            description: "mock",
+            modalities: ["text", "stream"],
+            tags: [],
+            meta: {},
+            env: {},
+          },
+        ],
+      }));
+      return;
+    }
+    if (req.method === "POST" && url.pathname === "/v1/ai/stream") {
+      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" },
+          {
+            type: "tool-input-available",
+            toolCallId: "call_1",
+            toolName: "ping",
+            input: { value: "hello" },
+          },
+          { type: "finish", finishReason: "tool-calls" },
+        ]);
+        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" },
+      ]);
+      return;
+    }
+    res.writeHead(404);
+    res.end("not found");
+  });
+  await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
+  try {
+    const address = server.address();
+    assert.ok(address && typeof address === "object");
+    const city = new City({
+      role: "user",
+      city_url: `http://127.0.0.1:${String(address.port)}`,
+      town_id: "town_demo",
+      user_token: "ub_test",
+    });
+    const catalog = await city.ai.listModels();
+    const model = catalog.get("mock-model");
+    assert.ok(model);
+    const agent_path = await fs.mkdtemp(
+      path.join(os.tmpdir(), "downcity-agent-city-model-tool-loop-"),
+    );
+    const agent = new Agent({
+      id: "tool_loop_agent",
+      path: agent_path,
+      tools: {
+        ping: tool({
+          description: "ping tool",
+          inputSchema: z.object({
+            value: z.string(),
+          }),
+          execute: async ({ value }) => {
+            tool_executed = true;
+            return { echoed: value };
+          },
+        }),
+      },
+    });
+    const session = await agent.createSession();
+    await session.set({ model });
+    const turn = await session.prompt({ query: "please use the ping tool" });
+    const result = await turn.finished;
+    assert.equal(result.success, true);
+    assert.equal(tool_executed, true);
+    assert.equal(requests.length, 2);
+    const second_request_messages = Array.isArray(requests[1]?.messages)
+      ? 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,
+    });
+  } finally {
+    await new Promise((resolve, reject) => {
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+});