@downcity/agent 1.1.51 → 1.1.62

package/src/executor/store/history/jsonl/JsonlSessionHistoryStore.ts

@@ -194,29 +194,9 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
     await fs.ensureFile(this.getMessagesFilePath());
   }
 
-  private normalizePinnedSkillIds(input: string[] | undefined): string[] {
-    if (!Array.isArray(input)) return [];
-    const out: string[] = [];
-    for (const raw of input) {
-      const id = typeof raw === "string" ? raw.trim() : "";
-      if (!id) continue;
-      out.push(id);
-    }
-    return Array.from(new Set(out)).slice(0, 2000);
-  }
-
-  private normalizeSdkConfig(
-    input: SessionHistoryMetaV1["sdkConfig"],
-  ): SessionHistoryMetaV1["sdkConfig"] {
-    if (!input || typeof input !== "object" || Array.isArray(input)) {
-      return undefined;
-    }
-    const modelLabel =
-      typeof input.modelLabel === "string" ? input.modelLabel.trim() : "";
-    if (!modelLabel) return undefined;
-    return {
-      modelLabel,
-    };
+  private normalizeText(input: unknown): string | undefined {
+    const value = typeof input === "string" ? input.trim() : "";
+    return value || undefined;
   }
 
   private async readMetaUnsafe(): Promise<SessionHistoryMetaV1> {
@@ -235,24 +215,15 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
         ...(typeof raw.createdAt === "number" && Number.isFinite(raw.createdAt)
           ? { createdAt: raw.createdAt }
           : {}),
-        updatedAt: typeof raw.updatedAt === "number" ? raw.updatedAt : 0,
-        pinnedSkillIds: this.normalizePinnedSkillIds(raw.pinnedSkillIds),
-        ...(typeof raw.lastArchiveId === "string" && raw.lastArchiveId.trim()
-          ? { lastArchiveId: raw.lastArchiveId.trim() }
-          : {}),
-        ...(typeof raw.keepLastMessages === "number" &&
-        Number.isFinite(raw.keepLastMessages)
-          ? { keepLastMessages: raw.keepLastMessages }
-          : {}),
-        ...(typeof raw.maxInputTokensApprox === "number" &&
-        Number.isFinite(raw.maxInputTokensApprox)
-          ? { maxInputTokensApprox: raw.maxInputTokensApprox }
+        ...(this.normalizeText(raw.timezone)
+          ? { timezone: this.normalizeText(raw.timezone) }
           : {}),
-        ...(typeof raw.compactRatio === "number" && Number.isFinite(raw.compactRatio)
-          ? { compactRatio: raw.compactRatio }
+        updatedAt: typeof raw.updatedAt === "number" ? raw.updatedAt : 0,
+        ...(this.normalizeText(raw.title)
+          ? { title: this.normalizeText(raw.title) }
           : {}),
-        ...(this.normalizeSdkConfig(raw.sdkConfig)
-          ? { sdkConfig: this.normalizeSdkConfig(raw.sdkConfig) }
+        ...(this.normalizeText(raw.modelLabel)
+          ? { modelLabel: this.normalizeText(raw.modelLabel) }
           : {}),
       };
     } catch {
@@ -261,7 +232,6 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
         sessionId: this.sessionId,
         createdAt: Date.now(),
         updatedAt: 0,
-        pinnedSkillIds: [],
       };
     }
   }
@@ -276,26 +246,16 @@ export class JsonlSessionHistoryStore implements SessionHistoryStore {
       ...(typeof next.createdAt === "number" && Number.isFinite(next.createdAt)
         ? { createdAt: next.createdAt }
         : {}),
+      ...(this.normalizeText(next.timezone)
+        ? { timezone: this.normalizeText(next.timezone) }
+        : {}),
       updatedAt:
         typeof next.updatedAt === "number" ? next.updatedAt : Date.now(),
-      pinnedSkillIds: this.normalizePinnedSkillIds(next.pinnedSkillIds),
-      ...(typeof next.lastArchiveId === "string" && next.lastArchiveId.trim()
-        ? { lastArchiveId: next.lastArchiveId.trim() }
-        : {}),
-      ...(typeof next.keepLastMessages === "number" &&
-      Number.isFinite(next.keepLastMessages)
-        ? { keepLastMessages: next.keepLastMessages }
-        : {}),
-      ...(typeof next.maxInputTokensApprox === "number" &&
-      Number.isFinite(next.maxInputTokensApprox)
-        ? { maxInputTokensApprox: next.maxInputTokensApprox }
-        : {}),
-      ...(typeof next.compactRatio === "number" &&
-      Number.isFinite(next.compactRatio)
-        ? { compactRatio: next.compactRatio }
+      ...(this.normalizeText(next.title)
+        ? { title: this.normalizeText(next.title) }
         : {}),
-      ...(this.normalizeSdkConfig(next.sdkConfig)
-        ? { sdkConfig: this.normalizeSdkConfig(next.sdkConfig) }
+      ...(this.normalizeText(next.modelLabel)
+        ? { modelLabel: this.normalizeText(next.modelLabel) }
         : {}),
     };
     await fs.writeJson(this.getMetaFilePath(), normalized, { spaces: 2 });

package/src/executor/tools/shell/ShellToolBridge.ts

@@ -75,7 +75,7 @@ function tryParseJsonObject(raw: string): JsonObject | null {
 function shouldEnableCommandBridge(command: string): boolean {
   const raw = String(command || "").trim();
   if (!raw) return false;
-  return /(?:^|\s)(?:city|downcity)(?:\s|$)/i.test(raw);
+  return /(?:^|\s)(?:city|town)(?:\s|$)/i.test(raw);
 }
 
 async function injectUserTextMessage(params: {

package/src/executor/tools/shell/ShellToolFormatting.ts

@@ -33,7 +33,7 @@ function applyEnvMap(
 }
 
 /**
- * 对 `city chat send` 命令做前置安全校验。
+ * 对 `town chat send` 命令做前置安全校验。
  *
  * 关键点（中文）
  * - 历史上模型会把长文本直接拼进多行 shell 命令，导致后续行被 zsh 当作独立命令解析。
@@ -42,20 +42,20 @@ function applyEnvMap(
  */
 export function validateChatSendCommand(cmd: string): string | null {
   const source = String(cmd ?? "");
-  if (!/\b(?:city|downcity)\s+chat\s+send\b/.test(source)) return null;
+  if (!/\bbay\s+chat\s+send\b/.test(source)) return null;
   if (!/[\r\n]/.test(source)) return null;
-  if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--stdin(?:\s|$)/.test(source)) {
+  if (/\bbay\s+chat\s+send\b[\s\S]*\s--stdin(?:\s|$)/.test(source)) {
     return null;
   }
-  if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--text(?:\s|$)/.test(source)) {
+  if (/\bbay\s+chat\s+send\b[\s\S]*\s--text(?:\s|$)/.test(source)) {
     return null;
   }
-  if (/\b(?:city|downcity)\s+chat\s+send\b[\s\S]*\s--text-file(?:\s|$)/.test(source)) {
+  if (/\bbay\s+chat\s+send\b[\s\S]*\s--text-file(?:\s|$)/.test(source)) {
     return null;
   }
   return [
-    "Unsafe `city chat send` command: real newlines are not allowed.",
-    "If your message is multi-line, use `city chat send --stdin` (with heredoc/pipe), `--text-file`, or explicit `--text`.",
+    "Unsafe `town chat send` command: real newlines are not allowed.",
+    "If your message is multi-line, use `town chat send --stdin` (with heredoc/pipe), `--text-file`, or explicit `--text`.",
   ].join(" ");
 }
 

package/src/executor/types/SessionHistoryMeta.ts

@@ -3,21 +3,9 @@
  *
  * 关键点（中文）
  * - 存储位置：`.downcity/agents/<encodedAgentId>/sessions/<encodedSessionId>/messages/meta.json`
- * - 用于保存 compact 元数据与固定注入的 skills 信息
+ * - 用于保存 session 列表、详情和索引所需的轻量元信息
  */
 
-/**
- * SDK Session 配置摘要。
- *
- * 关键点（中文）
- * - 这里只存可稳定序列化、仅用于回显/索引的轻量配置摘要。
- * - 例如本地注入的 `LanguageModel` 实例本身不可序列化，因此仅记录其可读标签。
- */
-export type SessionHistorySdkConfigV1 = {
-  /** 当前 session 绑定模型的可读标签。 */
-  modelLabel?: string;
-};
-
 export type SessionHistoryMetaV1 = {
   /** schema 版本。 */
   v: 1;
@@ -31,16 +19,8 @@ export type SessionHistoryMetaV1 = {
   timezone?: string;
   /** 最近一次更新元信息的时间戳（ms）。 */
   updatedAt: number;
-  /** 固定注入到 Session 上下文的 skill id 列表。 */
-  pinnedSkillIds: string[];
-  /** 最近一次归档生成的 archive id。 */
-  lastArchiveId?: string;
-  /** 最近一次 compact 生效的保留消息数。 */
-  keepLastMessages?: number;
-  /** 最近一次 compact 生效的输入 token 近似上限。 */
-  maxInputTokensApprox?: number;
-  /** 最近一次 compact 生效的前段压缩比例。 */
-  compactRatio?: number;
-  /** SDK 侧的轻量配置摘要。 */
-  sdkConfig?: SessionHistorySdkConfigV1;
+  /** 当前 session 持久化标题。 */
+  title?: string;
+  /** 当前 session 绑定模型的可读标签。 */
+  modelLabel?: string;
 };

package/src/index.ts

@@ -10,8 +10,13 @@
 // Agent 入口
 export { Agent } from "./agent/Agent.js";
 export { RemoteAgent } from "./agent/RemoteAgent.js";
+export {
+  inferAgentModelLabel,
+  normalizeAgentModel,
+} from "./model/CityModelAdapter.js";
 export type {
   AgentSessionCollection,
+  AgentModel,
   AgentSessionActor,
   AgentSession,
   AgentCreateSessionInput,
@@ -281,14 +286,9 @@ export type {
   StoredChannelAccountChannel,
   StoredEnvEntry,
   StoredGlobalEnvEntry,
-  StoredModel,
-  StoredModelProvider,
-  StoredProviderMeta,
   UpsertChannelAccountInput,
   UpsertEnvEntryInput,
   UpsertGlobalEnvEntryInput,
-  UpsertModelInput,
-  UpsertModelProviderInput,
 } from "./types/runtime/host/Store.js";
 
 // HTTP auth 协议类型

package/src/model/CityModelAdapter.ts

@@ -0,0 +1,384 @@
+/**
+ * CityModel 到 AI SDK LanguageModel 的适配模块。
+ *
+ * 关键点（中文）
+ * - Agent 对外可以接收 CityModel，但 executor 内部仍只处理 AI SDK LanguageModel。
+ * - 适配逻辑集中在这里，避免 City 协议散落到 session/executor 各处。
+ * - 这里不依赖 @downcity/city，只依赖 @downcity/type 的共享协议。
+ */
+
+import {
+  CITY_MODEL_INVOKER,
+  isCityModel,
+  type CityModel,
+  type CityModelInvokeInput,
+} from "@downcity/type";
+import type { LanguageModel, UIMessage, UIMessageChunk } 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>;
+
+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 providerContentToUiParts(content: unknown): UIMessage["parts"] {
+  if (!Array.isArray(content)) {
+    return [{ type: "text", text: textFromProviderContent(content) }];
+  }
+
+  const parts: UIMessage["parts"] = [];
+  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),
+      });
+    }
+  }
+  return parts;
+}
+
+function providerPromptToMessages(prompt: unknown): UIMessage[] {
+  if (!Array.isArray(prompt)) return [];
+  return prompt
+    .map((message, index): UIMessage | null => {
+      if (!message || typeof message !== "object") return null;
+      const item = message as ProviderPromptMessage;
+      const role = item.role === "system" || item.role === "assistant" ? item.role : "user";
+      const parts = providerContentToUiParts(item.content);
+      return {
+        id: `city-model-message-${String(index)}`,
+        role,
+        parts,
+      };
+    })
+    .filter((message): message is UIMessage => Boolean(message));
+}
+
+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;
+        providerExecuted?: unknown;
+      };
+      return [{
+        type: "tool-call",
+        toolCallId: String(toolPart.toolCallId ?? ""),
+        toolName: String(toolPart.toolName ?? ""),
+        input: stringifyToolInput(toolPart.input),
+        providerExecuted: Boolean(toolPart.providerExecuted),
+      }];
+    }
+    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 [];
+  }
+}
+
+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;
+}
+
+/**
+ * 将 Agent 可接受的模型输入归一为 AI SDK LanguageModel。
+ */
+export function normalizeAgentModel(model: AgentModel): LanguageModel {
+  if (isCityModel(model)) return cityModelToLanguageModel(model);
+  return model;
+}
+
+/**
+ * 从 Agent 模型输入推导展示标签。
+ */
+export function inferAgentModelLabel(model: AgentModel | undefined): string | undefined {
+  if (!model) return undefined;
+  if (isCityModel(model)) return model.name || model.id;
+  if (typeof model !== "object") return undefined;
+  const record = model as Record<string, unknown>;
+  const candidates = [
+    record.modelId,
+    record.model,
+    record.id,
+    record.name,
+    record.label,
+  ];
+  for (const candidate of candidates) {
+    const label = typeof candidate === "string" ? candidate.trim() : "";
+    if (label) return label;
+  }
+  const constructorName =
+    model.constructor && typeof model.constructor.name === "string"
+      ? model.constructor.name.trim()
+      : "";
+  return constructorName || "configured-model";
+}

package/src/runtime/host/daemon/Paths.ts

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 这里只保留 agent 侧访问 daemon meta 所需的项目级路径。
- * - daemon 进程启停、pid 清理、registry 同步属于 `@downcity/city`，不放在 agent 包内。
+ * - daemon 进程启停、pid 清理、registry 同步属于 `downcity`，不放在 agent 包内。
  */
 
 import path from "node:path";

package/src/runtime/host/daemon/ProjectSetup.ts

@@ -30,14 +30,14 @@ function ensureContextFiles(projectRoot: string): void {
   // Check if initialized（启动入口一次性确认工程根目录与关键文件）
   if (!fs.existsSync(getProfileMdPath(projectRoot))) {
     console.error(
-      '❌ Project not initialized. Please run "city agent create" first',
+      '❌ Project not initialized. Please run "town agent create" first',
     );
     process.exit(1);
   }
 
   if (!fs.existsSync(getDowncityJsonPath(projectRoot))) {
     console.error(
-      '❌ downcity.json does not exist. Please run "city agent create" first',
+      '❌ downcity.json does not exist. Please run "town agent create" first',
     );
     process.exit(1);
   }