@downcity/agent 1.1.63 → 1.1.66

package/src/model/CityModelAdapter.ts

@@ -1,528 +1,53 @@
 /**
- * CityModel 到 AI SDK LanguageModel 的适配模块。
+ * CityModel 到 AI SDK LanguageModel 的归一化模块。
  *
  * 关键点（中文）
- * - Agent 对外可以接收 CityModel，但 executor 内部仍只处理 AI SDK LanguageModel。
- * - 适配逻辑集中在这里，避免 City 协议散落到 session/executor 各处。
+ * - Agent 对外可以接收 CityModel，但 executor 内部只处理 AI SDK LanguageModel。
+ * - CityModel 保留模型目录信息；运行时连接信息通过隐藏协议提供。
+ * - 这里直接创建 OpenAI-compatible LanguageModel，不再保留旧的 text/stream 反向适配。
  * - 这里不依赖 @downcity/city，只依赖 @downcity/type 的共享协议。
  */
 
+import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import {
   CITY_MODEL_INVOKER,
   isCityModel,
   type CityModel,
-  type CityModelInvokeInput,
 } from "@downcity/type";
-import type { LanguageModel, UIMessage, UIMessageChunk } from "ai";
+import type { LanguageModel } from "ai";
 
 /**
  * Agent SDK 可接受的模型输入。
  */
 export type AgentModel = LanguageModel | CityModel;
 
-type ProviderPromptMessage = {
-  /**
-   * 模型消息角色。
-   */
-  role?: string;
-
-  /**
-   * 模型消息内容。
-   */
-  content?: unknown;
-};
-
-type ProviderStreamController = ReadableStreamDefaultController<Record<string, unknown>>;
-type ProviderContentPart = Record<string, unknown>;
-type ProviderPromptRole = "system" | "user" | "assistant" | "tool";
-
-type ProviderToolResultOutput = {
-  /**
-   * tool result 输出类型。
-   */
-  type?: unknown;
-
-  /**
-   * tool result 输出值。
-   */
-  value?: unknown;
-
-  /**
-   * tool 拒绝原因。
-   */
-  reason?: unknown;
-};
-
-function normalizeFinishReason(input: unknown): {
-  unified: "stop" | "length" | "content-filter" | "tool-calls" | "error" | "other";
-  raw: string | undefined;
-} {
-  const text = typeof input === "string" ? input : "";
-  if (text === "stop" || text === "length" || text === "content-filter" || text === "tool-calls" || text === "error") {
-    return { unified: text, raw: text };
-  }
-  return { unified: "stop", raw: text || "stop" };
-}
-
-function stringifyToolInput(input: unknown): string {
-  if (typeof input === "string") return input;
-  try {
-    return JSON.stringify(input ?? {});
-  } catch {
-    return "{}";
-  }
-}
-
-function textFromProviderContent(content: unknown): string {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  return content
-    .filter((part) => part && typeof part === "object" && (part as { type?: unknown }).type === "text")
-    .map((part) => String((part as { text?: unknown }).text ?? ""))
-    .join("\n")
-    .trim();
-}
-
-function fileUrlFromProviderPart(part: Record<string, unknown>): string {
-  const data = part.data;
-  if (data instanceof URL) return data.toString();
-  if (typeof data === "string") return data;
-  return "";
-}
-
-function resolveProviderPromptRole(input: unknown): ProviderPromptRole {
-  return input === "system" || input === "user" || input === "assistant" || input === "tool"
-    ? input
-    : "user";
-}
-
-function normalizeProviderToolResultOutput(
-  output: ProviderToolResultOutput,
-): {
-  /**
-   * 归一后的 tool part 状态。
-   */
-  state: "output-available" | "output-error";
-
-  /**
-   * tool 成功输出。
-   */
-  output?: unknown;
-
-  /**
-   * tool 错误文本。
-   */
-  errorText?: string;
-} {
-  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: unknown,
-  existingParts?: UIMessage["parts"],
-): UIMessage["parts"] {
-  if (!Array.isArray(content)) {
-    return [{ type: "text", text: textFromProviderContent(content) }];
-  }
-
-  const parts: UIMessage["parts"] = Array.isArray(existingParts)
-    ? [...existingParts]
-    : [];
-  for (const part of content) {
-    if (!part || typeof part !== "object") continue;
-    const record = part as Record<string, unknown>;
-    if (record.type === "text") {
-      parts.push({ type: "text", text: String(record.text ?? "") });
-      continue;
-    }
-    if (record.type === "reasoning") {
-      parts.push({ type: "reasoning", text: String(record.text ?? "") });
-      continue;
-    }
-    if (record.type === "file") {
-      const url = fileUrlFromProviderPart(record);
-      if (!url) continue;
-      parts.push({
-        type: "file",
-        mediaType: String(record.mediaType ?? "application/octet-stream"),
-        filename: typeof record.filename === "string" ? record.filename : undefined,
-        url,
-      });
-      continue;
-    }
-    if (record.type === "tool-call") {
-      parts.push({
-        type: "dynamic-tool",
-        toolName: String(record.toolName ?? ""),
-        toolCallId: String(record.toolCallId ?? ""),
-        state: "input-available",
-        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 as ProviderToolResultOutput | undefined) ?? {},
-      );
-      const existingPart = parts.find((item) => {
-        if (!item || typeof item !== "object") return false;
-        const toolPart = item as { toolCallId?: unknown };
-        return String(toolPart.toolCallId ?? "") === toolCallId;
-      }) as
-        | ({
-            toolCallId?: unknown;
-            toolName?: unknown;
-            input?: unknown;
-            providerExecuted?: unknown;
-          } & Record<string, unknown>)
-        | undefined;
-      const baseInput = existingPart?.input ?? null;
-      const baseToolName = String(existingPart?.toolName ?? toolName);
-      const nextPart = normalizedOutput.state === "output-available"
-        ? {
-            type: "dynamic-tool" as const,
-            toolName: baseToolName,
-            toolCallId,
-            state: "output-available" as const,
-            input: baseInput,
-            output: normalizedOutput.output,
-            providerExecuted: false,
-          }
-        : {
-            type: "dynamic-tool" as const,
-            toolName: baseToolName,
-            toolCallId,
-            state: "output-error" as const,
-            input: baseInput,
-            errorText: normalizedOutput.errorText ?? "tool_error",
-            providerExecuted: false,
-          };
-      if (existingPart) {
-        const index = parts.indexOf(existingPart as never);
-        if (index >= 0) {
-          parts[index] = nextPart;
-          continue;
-        }
-      }
-      parts.push(nextPart);
-    }
-  }
-  return parts;
-}
-
-function providerPromptToMessages(prompt: unknown): UIMessage[] {
-  if (!Array.isArray(prompt)) return [];
-  const messages: UIMessage[] = [];
-  for (const [index, message] of prompt.entries()) {
-    if (!message || typeof message !== "object") continue;
-    const item = message as ProviderPromptMessage;
-    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: providerContentToUiParts(item.content),
-    });
-  }
-  return messages;
-}
-
-function providerOptionsToInput(options: Record<string, unknown>): CityModelInvokeInput {
-  return {
-    messages: providerPromptToMessages(options.prompt),
-    tools: options.tools,
-    toolChoice: options.toolChoice,
-    providerOptions: options.providerOptions,
-  };
-}
-
-function textFromUiMessage(message: UIMessage): string {
-  return message.parts
-    .filter((part) => part.type === "text")
-    .map((part) => String((part as { text?: unknown }).text ?? ""))
-    .join("\n")
-    .trim();
-}
-
-function uiMessageToProviderContent(message: UIMessage): ProviderContentPart[] {
-  return message.parts.flatMap((part): ProviderContentPart[] => {
-    if (part.type === "text") {
-      return [{ type: "text", text: String((part as { text?: unknown }).text ?? "") }];
-    }
-    if (part.type === "reasoning") {
-      return [{ type: "reasoning", text: String((part as { text?: unknown }).text ?? "") }];
-    }
-    if (part.type === "dynamic-tool") {
-      const toolPart = part as {
-        toolCallId?: unknown;
-        toolName?: unknown;
-        input?: unknown;
-        output?: unknown;
-        errorText?: unknown;
-        state?: unknown;
-        providerExecuted?: unknown;
-      };
-      const content: ProviderContentPart[] = [{
-        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 [];
-  });
-}
-
-function enqueueFinish(
-  controller: ProviderStreamController,
-  finishReason: unknown,
-): void {
-  controller.enqueue({
-    type: "finish",
-    finishReason: normalizeFinishReason(finishReason),
-    usage: {
-      inputTokens: {
-        total: undefined,
-        noCache: undefined,
-        cacheRead: undefined,
-        cacheWrite: undefined,
-      },
-      outputTokens: {
-        total: undefined,
-        text: undefined,
-        reasoning: undefined,
-      },
-    },
-  });
-}
-
-function enqueueProviderParts(
-  controller: ProviderStreamController,
-  parts: Record<string, unknown>[],
-  state: {
-    /**
-     * 当前流是否已经发出 stream-start。
-     */
-    sawStart: boolean;
-
-    /**
-     * 当前流是否已经发出 finish。
-     */
-    sawFinish: boolean;
-  },
-): void {
-  for (const part of parts) {
-    if (part.type !== "stream-start" && !state.sawStart) {
-      controller.enqueue({ type: "stream-start", warnings: [] });
-      state.sawStart = true;
-    }
-    if (part.type === "stream-start") state.sawStart = true;
-    if (part.type === "finish") state.sawFinish = true;
-    controller.enqueue(part);
-  }
-}
-
-function mapUiChunkToProviderParts(chunk: UIMessageChunk): ProviderContentPart[] {
-  switch (chunk.type) {
-    case "start":
-      return [{ type: "stream-start", warnings: [] }];
-    case "text-start":
-      return [{ type: "text-start", id: chunk.id }];
-    case "text-delta":
-      return [{ type: "text-delta", id: chunk.id, delta: chunk.delta }];
-    case "text-end":
-      return [{ type: "text-end", id: chunk.id }];
-    case "reasoning-start":
-      return [{ type: "reasoning-start", id: chunk.id }];
-    case "reasoning-delta":
-      return [{ type: "reasoning-delta", id: chunk.id, delta: chunk.delta }];
-    case "reasoning-end":
-      return [{ type: "reasoning-end", id: chunk.id }];
-    case "tool-input-start":
-      return [{
-        type: "tool-input-start",
-        id: chunk.toolCallId,
-        toolName: chunk.toolName,
-        providerExecuted: chunk.providerExecuted,
-        dynamic: chunk.dynamic,
-      }];
-    case "tool-input-delta":
-      return [{
-        type: "tool-input-delta",
-        id: chunk.toolCallId,
-        delta: chunk.inputTextDelta,
-      }];
-    case "tool-input-available":
-      return [{
-        type: "tool-call",
-        toolCallId: chunk.toolCallId,
-        toolName: chunk.toolName,
-        input: stringifyToolInput(chunk.input),
-        providerExecuted: chunk.providerExecuted,
-        dynamic: chunk.dynamic,
-      }];
-    case "tool-output-available":
-      return [{
-        type: "tool-result",
-        toolCallId: chunk.toolCallId,
-        toolName: "",
-        output: { type: "json", value: chunk.output },
-        providerExecuted: chunk.providerExecuted,
-        dynamic: chunk.dynamic,
-      }];
-    case "error":
-      return [{ type: "error", error: new Error(chunk.errorText) }];
-    default:
-      return [];
-  }
-}
-
+/**
+ * 将 CityModel 的 hidden connection 转换为 AI SDK LanguageModel。
+ */
 function cityModelToLanguageModel(model: CityModel): LanguageModel {
-  const invoker = model[CITY_MODEL_INVOKER];
-  const languageModel = {
-    specificationVersion: "v3",
-    provider: "downcity",
-    modelId: model.id,
-    supportedUrls: {},
-    async doGenerate(options) {
-      const message = await invoker.text(providerOptionsToInput(options as Record<string, unknown>));
-      return {
-        content: uiMessageToProviderContent(message),
-        finishReason: normalizeFinishReason("stop"),
-        usage: {
-          inputTokens: {
-            total: undefined,
-            noCache: undefined,
-            cacheRead: undefined,
-            cacheWrite: undefined,
-          },
-          outputTokens: {
-            total: undefined,
-            text: undefined,
-            reasoning: undefined,
-          },
-        },
-        response: {
-          modelId: model.id,
-        },
-        warnings: [],
-      };
-    },
-    async doStream(options) {
-      const cityStream = await invoker.stream(providerOptionsToInput(options as Record<string, unknown>));
-      return {
-        stream: new ReadableStream({
-          async start(controller: ProviderStreamController) {
-            const reader = cityStream.getReader();
-            const state = {
-              sawStart: false,
-              sawFinish: false,
-            };
-            try {
-              while (true) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                const parts = mapUiChunkToProviderParts(value);
-                enqueueProviderParts(controller, parts, state);
-              }
-              if (!state.sawStart) controller.enqueue({ type: "stream-start", warnings: [] });
-              if (!state.sawFinish) enqueueFinish(controller, "stop");
-              controller.close();
-            } catch (error) {
-              controller.enqueue({ type: "error", error });
-              if (!state.sawFinish) enqueueFinish(controller, "error");
-              controller.close();
-            } finally {
-              reader.releaseLock();
-            }
-          },
-        }),
-        response: {
-          modelId: model.id,
-        },
-      };
-    },
-  };
-
-  return languageModel as unknown as LanguageModel;
+  const connection = model[CITY_MODEL_INVOKER].connection();
+  const provider = createOpenAICompatible({
+    name: "downcity",
+    baseURL: connection.base_url,
+    apiKey: connection.api_key,
+    transformRequestBody: (body) => ({
+      ...body,
+      ...connection.request_body,
+      model: typeof body.model === "string" && body.model.trim()
+        ? body.model
+        : connection.model_id,
+    }),
+  });
+  return provider.languageModel(connection.model_id) as LanguageModel;
 }
 
 /**
  * 将 Agent 可接受的模型输入归一为 AI SDK LanguageModel。
  */
 export function normalizeAgentModel(model: AgentModel): LanguageModel {
-  if (isCityModel(model)) return cityModelToLanguageModel(model);
+  if (isCityModel(model)) {
+    return cityModelToLanguageModel(model);
+  }
   return model;
 }
 

package/src/session/Session.ts

@@ -581,7 +581,13 @@ export class Session implements AgentSession {
     generate?: boolean;
   }): Promise<void> {
     const messages = await this.historyStore.list();
-    await ensureSessionTitle({
+    const beforeMetadata = await readSessionMetadata({
+      projectRoot: this.projectRoot,
+      agentId: this.agentId,
+      sessionId: this.id,
+    });
+    const beforeTitle = String(beforeMetadata.title || "").trim();
+    const nextMetadata = await ensureSessionTitle({
       projectRoot: this.projectRoot,
       agentId: this.agentId,
       sessionId: this.id,
@@ -589,6 +595,13 @@ export class Session implements AgentSession {
       ...(input?.generate ? { model: this.sessionConfig.model } : {}),
       generate: input?.generate === true,
     });
+    const nextTitle = String(nextMetadata.title || "").trim();
+    if (!nextTitle || nextTitle === beforeTitle) return;
+    this.eventHub.publish({
+      type: "session-title",
+      sessionId: this.id,
+      title: nextTitle,
+    });
   }
 
   private async persistAssistantResult(

package/src/types/sdk/AgentSessionEvent.ts

@@ -158,6 +158,30 @@ export interface AgentSessionAssistantStepEvent {
   visibility?: SessionAssistantStepVisibility;
 }
 
+/**
+ * Session 标题更新事件。
+ */
+export interface AgentSessionTitleEvent {
+  /**
+   * 当前事件类型。
+   */
+  type: "session-title";
+
+  /**
+   * 当前 session 唯一标识。
+   */
+  sessionId: string;
+
+  /**
+   * 当前 session 最新标题。
+   *
+   * 说明（中文）
+   * - 标题已持久化到 session meta。
+   * - 新 session 通常在首条 user message 落盘后生成标题。
+   */
+  title: string;
+}
+
 /**
  * 单个 turn 完成事件。
  */
@@ -213,6 +237,7 @@ export type AgentSessionEvent =
   | AgentSessionToolCallEvent
   | AgentSessionToolResultEvent
   | AgentSessionAssistantStepEvent
+  | AgentSessionTitleEvent
   | AgentSessionTurnFinishEvent
   | AgentSessionErrorEvent;