@downcity/city 1.1.32 → 1.1.47

package/src/model/runtime/ExecutionModelBinding.ts

@@ -0,0 +1,120 @@
+/**
+ * ExecutionModelBinding：city 宿主侧执行模型绑定辅助。
+ *
+ * 职责说明（中文）
+ * - 统一承接平台模型池读取、模型候选列表构建与项目 execution.modelId 校验。
+ * - 保证 `Agent` 只接收最终 `LanguageModel`，不再承担模型池查询职责。
+ * - 让 CLI、control gateway、前台启动等宿主入口复用同一套模型绑定规则。
+ */
+
+import fs from "fs-extra";
+import type { DowncityConfig, StoredModelProvider } from "@downcity/agent";
+import { assertProjectExecutionTarget } from "@downcity/agent";
+import { getDowncityJsonPath } from "@/config/Paths.js";
+import { PlatformStore } from "@/platform/store/index.js";
+
+/**
+ * 平台模型下拉候选项。
+ */
+export interface PlatformModelChoice {
+  /**
+   * 下拉展示文案。
+   */
+  title: string;
+  /**
+   * 实际写入 `execution.modelId` 的模型 ID。
+   */
+  value: string;
+}
+
+/**
+ * 读取平台模型候选列表。
+ *
+ * 关键点（中文）
+ * - 输出结果面向 CLI/Console 的模型选择界面。
+ * - provider 信息会拼到标题中，便于区分同名模型。
+ */
+export async function listPlatformModelChoices(): Promise<PlatformModelChoice[]> {
+  const store = new PlatformStore();
+  try {
+    const models = store.listModels();
+    const providers = await store.listProviders();
+    const providerMap = new Map(providers.map((item) => [item.id, item] as const));
+    return models
+      .map((item) => buildPlatformModelChoice(item.id, item.providerId, providerMap))
+      .filter((item): item is PlatformModelChoice => item !== null);
+  } finally {
+    store.close();
+  }
+}
+
+function buildPlatformModelChoice(
+  modelId: string,
+  providerId: string,
+  providerMap: Map<string, StoredModelProvider>,
+): PlatformModelChoice | null {
+  const id = String(modelId || "").trim();
+  if (!id) return null;
+  const normalizedProviderId = String(providerId || "").trim();
+  const providerType = String(providerMap.get(normalizedProviderId)?.type || "").trim();
+  const providerLabel = normalizedProviderId
+    ? providerType
+      ? `${normalizedProviderId} (${providerType})`
+      : normalizedProviderId
+    : "-";
+  return {
+    title: `${id} · ${providerLabel}`,
+    value: id,
+  };
+}
+
+/**
+ * 断言指定平台模型可用于 agent execution。
+ *
+ * 关键点（中文）
+ * - 当前只校验“存在且未暂停”。
+ * - 供应商连通性与 API Key 可用性仍交给真正创建模型实例时再校验。
+ */
+export function assertPlatformModelReady(modelId: string): void {
+  const normalizedModelId = String(modelId || "").trim();
+  if (!normalizedModelId) {
+    throw new Error("execution.modelId is required");
+  }
+
+  const store = new PlatformStore();
+  try {
+    const model = store.getModel(normalizedModelId);
+    if (!model) {
+      throw new Error(`Model not found in platform model pool: ${normalizedModelId}`);
+    }
+    if (model.isPaused === true) {
+      throw new Error(`Model is paused: ${normalizedModelId}`);
+    }
+  } finally {
+    store.close();
+  }
+}
+
+/**
+ * 断言项目 execution 绑定已声明且目标模型可用。
+ *
+ * 关键点（中文）
+ * - 这里是 city 启动/控制面入口的宿主前置校验。
+ * - 失败时抛出稳定错误，交由 CLI 或 HTTP 层决定如何展示。
+ */
+export function assertProjectExecutionModelReady(projectRoot: string): void {
+  const config = readProjectDowncityConfig(projectRoot);
+  assertProjectExecutionTarget(config);
+  const primaryModelId = String(config.execution?.type === "api" ? config.execution.modelId || "" : "").trim();
+  if (!primaryModelId) {
+    throw new Error(
+      'Invalid downcity.json: "execution" is required and must be { "type": "api", "modelId": "..." }',
+    );
+  }
+  assertPlatformModelReady(primaryModelId);
+}
+
+function readProjectDowncityConfig(projectRoot: string): DowncityConfig {
+  const shipJsonPath = getDowncityJsonPath(projectRoot);
+  return fs.readJsonSync(shipJsonPath) as DowncityConfig;
+}

package/src/model/service/ModelPoolService.ts

@@ -19,6 +19,7 @@ import { PlatformStore } from "@/platform/store/index.js";
 import { listManagedAgentEntries } from "@/process/registry/CityRegistry.js";
 import { discoverProviderModels } from "@/cli/model/ModelSupport.js";
 import { createRuntimeModel } from "@/model/runtime/CreateRuntimeModel.js";
+import { mergeProcessEnvWithPlatformGlobalEnv } from "@/env/ProcessEnv.js";
 
 const SUPPORTED_PROVIDER_TYPES: readonly LlmProviderType[] = [
   "anthropic",
@@ -77,11 +78,11 @@ function formatModelIds(modelIds: string[]): string {
 function formatAgentReference(reference: {
   projectRoot: string;
   shipJsonPath: string;
-  agentName?: string;
+  agentId?: string;
 }): string {
-  const agentName = String(reference.agentName || "").trim();
-  if (agentName) {
-    return `${agentName} (${reference.projectRoot})`;
+  const agentId = String(reference.agentId || "").trim();
+  if (agentId) {
+    return `${agentId} (${reference.projectRoot})`;
   }
   return reference.projectRoot;
 }
@@ -89,12 +90,12 @@ function formatAgentReference(reference: {
 async function listModelReferences(modelId: string): Promise<Array<{
   projectRoot: string;
   shipJsonPath: string;
-  agentName?: string;
+  agentId?: string;
 }>> {
   const references: Array<{
     projectRoot: string;
     shipJsonPath: string;
-    agentName?: string;
+    agentId?: string;
   }> = [];
   const entries = await listManagedAgentEntries();
   for (const entry of entries) {
@@ -104,7 +105,7 @@ async function listModelReferences(modelId: string): Promise<Array<{
     if (!(await fs.pathExists(shipJsonPath))) continue;
     try {
       const raw = (await fs.readJson(shipJsonPath)) as {
-        name?: unknown;
+        id?: unknown;
         execution?: {
           type?: unknown;
           modelId?: unknown;
@@ -113,11 +114,11 @@ async function listModelReferences(modelId: string): Promise<Array<{
       const executionType = String(raw?.execution?.type || "").trim();
       const candidateModelId = String(raw?.execution?.modelId || "").trim();
       if (executionType !== "api" || candidateModelId !== modelId) continue;
-      const agentName = String(raw?.name || "").trim() || undefined;
+      const agentId = String(raw?.id || "").trim() || undefined;
       references.push({
         projectRoot,
         shipJsonPath,
-        agentName,
+        agentId,
       });
     } catch {
       continue;
@@ -218,7 +219,7 @@ export class ModelPoolService {
     references: Array<{
       projectRoot: string;
       shipJsonPath: string;
-      agentName?: string;
+      agentId?: string;
     }>;
   }> {
     const id = String(modelId || "").trim();
@@ -507,10 +508,11 @@ export class ModelPoolService {
     const actualPrompt = String(prompt || "").trim() || "Reply with exactly: OK";
     const model = await createRuntimeModel({
       config: {
-        name: "console-model-test",
+        id: "console_model_test",
         version: "1.0.0",
         execution: { type: "api", modelId: id },
       },
+      env: mergeProcessEnvWithPlatformGlobalEnv(process.env),
     });
     const result = await generateText({
       model,

package/src/platform/store/StoreEnvRepository.ts

@@ -3,15 +3,12 @@
  *
  * 关键点（中文）
  * - 统一管理 `env_entries` 单表。
- * - 同时暴露 global / agent 两层语义化包装。
+ * - 当前版本只保留平台全局 env，不再区分 agent 私有层。
  */
 
 import type {
-  StoredAgentEnvEntry,
   StoredEnvEntry,
-  StoredEnvScope,
   StoredGlobalEnvEntry,
-  UpsertAgentEnvEntryInput,
   UpsertEnvEntryInput,
   UpsertGlobalEnvEntryInput,
 } from "@downcity/agent";
@@ -19,26 +16,6 @@ import { decryptText, decryptTextSync, encryptText } from "./crypto.js";
 import type { PlatformStoreContext } from "./StoreShared.js";
 import { normalizeNonEmptyText, nowIso } from "./StoreShared.js";
 
-/**
- * 规范化 env scope。
- */
-export function normalizeEnvScope(input: string): StoredEnvScope {
-  const scope = String(input || "").trim().toLowerCase();
-  if (scope === "agent") return "agent";
-  return "global";
-}
-
-/**
- * 规范化 env 的 agent 目标。
- */
-export function normalizeEnvAgentTarget(
-  scope: StoredEnvScope,
-  agentIdInput?: string,
-): string {
-  if (scope === "global") return "";
-  return normalizeNonEmptyText(agentIdInput || "", "agentId");
-}
-
 /**
  * 同步构造 env 条目。
  */
@@ -51,14 +28,12 @@ function buildEnvEntryFromRowSync(row: {
   created_at?: unknown;
   updated_at?: unknown;
 }): StoredEnvEntry | null {
-  const scope = normalizeEnvScope(String(row.scope || ""));
-  const agentId = String(row.agent_id || "").trim();
   const key = String(row.key || "").trim();
   const encrypted = typeof row.value_encrypted === "string" ? row.value_encrypted : "";
+  if (String(row.scope || "").trim() !== "global") return null;
   if (!key || !encrypted) return null;
   return {
-    scope,
-    agentId: scope === "agent" ? agentId : undefined,
+    scope: "global",
     key,
     description: String(row.description || "").trim() || undefined,
     value: decryptTextSync(encrypted),
@@ -79,14 +54,12 @@ async function buildEnvEntryFromRow(row: {
   created_at?: unknown;
   updated_at?: unknown;
 }): Promise<StoredEnvEntry | null> {
-  const scope = normalizeEnvScope(String(row.scope || ""));
-  const agentId = String(row.agent_id || "").trim();
   const key = String(row.key || "").trim();
   const encrypted = typeof row.value_encrypted === "string" ? row.value_encrypted : "";
+  if (String(row.scope || "").trim() !== "global") return null;
   if (!key || !encrypted) return null;
   return {
-    scope,
-    agentId: scope === "agent" ? agentId : undefined,
+    scope: "global",
     key,
     description: String(row.description || "").trim() || undefined,
     value: await decryptText(encrypted),
@@ -100,49 +73,15 @@ async function buildEnvEntryFromRow(row: {
  */
 export function listEnvEntriesSync(
   context: PlatformStoreContext,
-  scopeInput?: StoredEnvScope,
-  agentIdInput?: string,
 ): StoredEnvEntry[] {
-  const hasScope = Boolean(scopeInput);
-  const scope = hasScope ? normalizeEnvScope(scopeInput || "global") : undefined;
-  const hasAgentFilter = scope === "agent" && Boolean(String(agentIdInput || "").trim());
-  const agentId = hasAgentFilter
-    ? normalizeEnvAgentTarget(scope, agentIdInput)
-    : undefined;
-  const rows = hasAgentFilter
-    ? context.sqlite.prepare(
-        `
-        SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-        FROM env_entries
-        WHERE scope = 'agent' AND agent_id = ?
-        ORDER BY key ASC;
-        `,
-      ).all(agentId)
-    : scope === "agent"
-      ? context.sqlite.prepare(
-          `
-          SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-          FROM env_entries
-          WHERE scope = 'agent'
-          ORDER BY agent_id ASC, key ASC;
-          `,
-        ).all()
-      : scope === "global"
-        ? context.sqlite.prepare(
-            `
-            SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-            FROM env_entries
-            WHERE scope = 'global'
-            ORDER BY key ASC;
-            `,
-          ).all()
-        : context.sqlite.prepare(
-            `
-            SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-            FROM env_entries
-            ORDER BY scope ASC, agent_id ASC, key ASC;
-            `,
-          ).all();
+  const rows = context.sqlite.prepare(
+    `
+    SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
+    FROM env_entries
+    WHERE scope = 'global'
+    ORDER BY key ASC;
+    `,
+  ).all();
   const out: StoredEnvEntry[] = [];
   for (const row of rows as Array<Record<string, unknown>>) {
     const entry = buildEnvEntryFromRowSync(row);
@@ -156,49 +95,15 @@ export function listEnvEntriesSync(
  */
 export async function listEnvEntries(
   context: PlatformStoreContext,
-  scopeInput?: StoredEnvScope,
-  agentIdInput?: string,
 ): Promise<StoredEnvEntry[]> {
-  const hasScope = Boolean(scopeInput);
-  const scope = hasScope ? normalizeEnvScope(scopeInput || "global") : undefined;
-  const hasAgentFilter = scope === "agent" && Boolean(String(agentIdInput || "").trim());
-  const agentId = hasAgentFilter
-    ? normalizeEnvAgentTarget(scope, agentIdInput)
-    : undefined;
-  const rows = hasAgentFilter
-    ? context.sqlite.prepare(
-        `
-        SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-        FROM env_entries
-        WHERE scope = 'agent' AND agent_id = ?
-        ORDER BY key ASC;
-        `,
-      ).all(agentId)
-    : scope === "agent"
-      ? context.sqlite.prepare(
-          `
-          SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-          FROM env_entries
-          WHERE scope = 'agent'
-          ORDER BY agent_id ASC, key ASC;
-          `,
-        ).all()
-      : scope === "global"
-        ? context.sqlite.prepare(
-            `
-            SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-            FROM env_entries
-            WHERE scope = 'global'
-            ORDER BY key ASC;
-            `,
-          ).all()
-        : context.sqlite.prepare(
-            `
-            SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
-            FROM env_entries
-            ORDER BY scope ASC, agent_id ASC, key ASC;
-            `,
-          ).all();
+  const rows = context.sqlite.prepare(
+    `
+    SELECT scope, agent_id, key, description, value_encrypted, created_at, updated_at
+    FROM env_entries
+    WHERE scope = 'global'
+    ORDER BY key ASC;
+    `,
+  ).all();
   const out: StoredEnvEntry[] = [];
   for (const row of rows as Array<Record<string, unknown>>) {
     const entry = await buildEnvEntryFromRow(row);
@@ -214,9 +119,9 @@ export async function upsertEnvEntry(
   context: PlatformStoreContext,
   input: UpsertEnvEntryInput,
 ): Promise<void> {
-  const scope = normalizeEnvScope(input.scope);
-  const agentId = normalizeEnvAgentTarget(scope, input.agentId);
-  const key = normalizeNonEmptyText(input.key, `${scope} env key`);
+  const scope = "global";
+  const agentId = "";
+  const key = normalizeNonEmptyText(input.key, "global env key");
   const description = String(input.description || "").trim();
   const value = String(input.value ?? "");
   const existing = context.sqlite
@@ -259,14 +164,12 @@ export async function upsertEnvEntry(
  */
 export function removeEnvEntry(
   context: PlatformStoreContext,
-  input: { scope: StoredEnvScope; agentId?: string; key: string },
+  keyInput: string,
 ): void {
-  const scope = normalizeEnvScope(input.scope);
-  const agentId = normalizeEnvAgentTarget(scope, input.agentId);
-  const key = normalizeNonEmptyText(input.key, `${scope} env key`);
+  const key = normalizeNonEmptyText(keyInput, "global env key");
   context.sqlite
     .prepare("DELETE FROM env_entries WHERE scope = ? AND agent_id = ? AND key = ?;")
-    .run(scope, agentId, key);
+    .run("global", "", key);
 }
 
 /**
@@ -275,7 +178,7 @@ export function removeEnvEntry(
 export function listGlobalEnvEntriesSync(
   context: PlatformStoreContext,
 ): StoredGlobalEnvEntry[] {
-  return listEnvEntriesSync(context, "global");
+  return listEnvEntriesSync(context);
 }
 
 /**
@@ -298,7 +201,7 @@ export function getGlobalEnvMapSync(
 export async function listGlobalEnvEntries(
   context: PlatformStoreContext,
 ): Promise<StoredGlobalEnvEntry[]> {
-  return listEnvEntries(context, "global");
+  return listEnvEntries(context);
 }
 
 /**
@@ -324,8 +227,7 @@ export async function upsertGlobalEnvEntry(
 ): Promise<void> {
   await upsertEnvEntry(context, {
     scope: "global",
-    key: input.key,
-    value: input.value,
+    ...input,
   });
 }
 
@@ -336,10 +238,7 @@ export function removeGlobalEnvEntry(
   context: PlatformStoreContext,
   keyInput: string,
 ): void {
-  removeEnvEntry(context, {
-    scope: "global",
-    key: keyInput,
-  });
+  removeEnvEntry(context, keyInput);
 }
 
 /**
@@ -348,105 +247,3 @@ export function removeGlobalEnvEntry(
 export function clearGlobalEnvEntries(context: PlatformStoreContext): void {
   context.sqlite.prepare("DELETE FROM env_entries WHERE scope = 'global';").run();
 }
-
-/**
- * 同步列出指定 agent 的私有环境变量。
- */
-export function listAgentEnvEntriesSync(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-): StoredAgentEnvEntry[] {
-  return listEnvEntriesSync(context, "agent", agentIdInput);
-}
-
-/**
- * 同步读取 agent 环境变量映射。
- */
-export function getAgentEnvMapSync(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-): Record<string, string> {
-  const entries = listAgentEnvEntriesSync(context, agentIdInput);
-  const map: Record<string, string> = {};
-  for (const item of entries) {
-    map[item.key] = item.value;
-  }
-  return map;
-}
-
-/**
- * 异步列出指定 agent 的私有环境变量。
- */
-export async function listAgentEnvEntries(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-): Promise<StoredAgentEnvEntry[]> {
-  return listEnvEntries(context, "agent", agentIdInput);
-}
-
-/**
- * 异步列出全部 agent 私有环境变量。
- */
-export async function listAllAgentEnvEntries(
-  context: PlatformStoreContext,
-): Promise<StoredAgentEnvEntry[]> {
-  return listEnvEntries(context, "agent");
-}
-
-/**
- * 异步读取 agent 环境变量映射。
- */
-export async function getAgentEnvMap(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-): Promise<Record<string, string>> {
-  const entries = await listAgentEnvEntries(context, agentIdInput);
-  const map: Record<string, string> = {};
-  for (const item of entries) {
-    map[item.key] = item.value;
-  }
-  return map;
-}
-
-/**
- * 新增或更新 agent 私有环境变量。
- */
-export async function upsertAgentEnvEntry(
-  context: PlatformStoreContext,
-  input: UpsertAgentEnvEntryInput,
-): Promise<void> {
-  await upsertEnvEntry(context, {
-    scope: "agent",
-    agentId: input.agentId,
-    key: input.key,
-    value: input.value,
-  });
-}
-
-/**
- * 删除指定 agent 的单个环境变量。
- */
-export function removeAgentEnvEntry(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-  keyInput: string,
-): void {
-  removeEnvEntry(context, {
-    scope: "agent",
-    agentId: agentIdInput,
-    key: keyInput,
-  });
-}
-
-/**
- * 清空指定 agent 的私有环境变量。
- */
-export function clearAgentEnvEntries(
-  context: PlatformStoreContext,
-  agentIdInput: string,
-): void {
-  const agentId = normalizeNonEmptyText(agentIdInput, "agentId");
-  context.sqlite
-    .prepare("DELETE FROM env_entries WHERE scope = 'agent' AND agent_id = ?;")
-    .run(agentId);
-}

package/src/platform/store/StoreSchema.ts

@@ -71,7 +71,7 @@ export function ensurePlatformStoreSchema(context: PlatformStoreContext): void {
     CREATE INDEX IF NOT EXISTS env_entries_agent_id_idx
     ON env_entries(agent_id);
   `);
-  ensureEnvEntriesMigration(context);
+  ensureEnvEntriesColumns(context);
   context.sqlite.exec(`
     CREATE TABLE IF NOT EXISTS channel_accounts (
       id TEXT PRIMARY KEY NOT NULL,
@@ -283,9 +283,9 @@ function ensureChannelAccountsTableColumns(context: PlatformStoreContext): void
 }
 
 /**
- * 迁移历史 env 双表到统一单表。
+ * 补齐 env_entries 表的增量列。
  */
-function ensureEnvEntriesMigration(context: PlatformStoreContext): void {
+function ensureEnvEntriesColumns(context: PlatformStoreContext): void {
   const envEntryColumns = context.sqlite
     .prepare("PRAGMA table_info(env_entries)")
     .all() as Array<{ name?: unknown }>;
@@ -295,50 +295,4 @@ function ensureEnvEntriesMigration(context: PlatformStoreContext): void {
   if (!envEntryColumnNames.has("description")) {
     context.sqlite.exec("ALTER TABLE env_entries ADD COLUMN description TEXT;");
   }
-
-  const tableRows = context.sqlite
-    .prepare(
-      "SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('global_env', 'agent_env');",
-    )
-    .all() as Array<{ name?: unknown }>;
-  const tableNames = new Set(
-    tableRows.map((row) => String(row.name || "").trim()).filter(Boolean),
-  );
-  if (tableNames.has("global_env")) {
-    context.sqlite.exec(`
-      INSERT OR IGNORE INTO env_entries (
-        scope, agent_id, key, description, value_encrypted, created_at, updated_at
-      )
-      SELECT
-        'global',
-        '',
-        key,
-        NULL,
-        value_encrypted,
-        created_at,
-        updated_at
-      FROM global_env;
-    `);
-  }
-  if (tableNames.has("agent_env")) {
-    context.sqlite.exec(`
-      INSERT OR IGNORE INTO env_entries (
-        scope, agent_id, key, description, value_encrypted, created_at, updated_at
-      )
-      SELECT
-        'agent',
-        agent_id,
-        key,
-        NULL,
-        value_encrypted,
-        created_at,
-        updated_at
-      FROM agent_env;
-    `);
-    context.sqlite.exec(`
-      UPDATE env_entries
-      SET agent_id = ''
-      WHERE scope = 'global' AND agent_id IS NULL;
-    `);
-  }
 }