@downcity/city 1.1.39 → 1.1.47

package/src/cli/model/ModelManageCommand.ts

@@ -11,6 +11,7 @@ import { generateText } from "ai";
 import type { LlmProviderType } from "@downcity/agent";
 import { createRuntimeModel } from "@/model/runtime/CreateRuntimeModel.js";
 import { ModelPoolService } from "@/model/service/ModelPoolService.js";
+import { mergeProcessEnvWithPlatformGlobalEnv } from "@/env/ProcessEnv.js";
 import {
   discoverProviderModels,
 } from "./ModelSupport.js";
@@ -45,7 +46,7 @@ function registerAddCommands(model: Command): void {
     .description("新增 provider")
     .requiredOption("--type <type>", "provider 类型")
     .option("--base-url <baseUrl>", "provider baseUrl")
-    .requiredOption("--api-key <apiKey>", "provider apiKey（支持 ${ENV_VAR}）")
+    .requiredOption("--api-key <apiKey>", "provider apiKey")
     .option("--json [enabled]", "以 JSON 输出", parseBooleanOption, true)
     .helpOption("--help", "display help for command")
     .action(async (
@@ -247,7 +248,7 @@ function registerUpdateCommands(model: Command): void {
     .description("更新 provider")
     .option("--type <type>", "provider 类型")
     .option("--base-url <baseUrl>", "provider baseUrl")
-    .option("--api-key <apiKey>", "provider apiKey（支持 ${ENV_VAR}）")
+    .option("--api-key <apiKey>", "provider apiKey")
     .option("--clear-base-url", "清空 baseUrl", false)
     .option("--clear-api-key", "清空 apiKey", false)
     .option("--json [enabled]", "以 JSON 输出", parseBooleanOption, true)
@@ -497,10 +498,11 @@ function registerTestCommands(model: Command): void {
         if (!id) throw new Error("modelId cannot be empty");
         const runtimeModel = 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 prompt = String(options.prompt || "").trim() || "Reply with exactly: OK";
         const result = await generateText({

package/src/cli/model/ModelManager.ts

@@ -55,10 +55,10 @@ function parseOptionalPositiveIntegerInput(input: string): number | undefined {
 
 function formatManagerAgentReference(reference: {
   projectRoot: 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;
 }
 

package/src/cli/model/ModelSupport.ts

@@ -34,14 +34,6 @@ export type ProviderDiscoveryResult = {
   error?: string;
 };
 
-export function resolveEnvPlaceholder(value: string | undefined): string | undefined {
-  const raw = String(value || "").trim();
-  if (!raw) return undefined;
-  const matched = raw.match(/^\$\{([A-Z0-9_]+)\}$/);
-  if (!matched) return raw;
-  return process.env[matched[1]];
-}
-
 export function resolveProviderDefaultBaseUrl(
   providerType: LlmProviderType,
 ): string | undefined {
@@ -88,14 +80,14 @@ export async function discoverProviderModels(params: {
   const providerId = String(params.providerId || "").trim();
   const providerType = params.providerType;
   const baseUrl = normalizeBaseUrl(params.baseUrl) || resolveProviderDefaultBaseUrl(providerType);
-  const apiKey = resolveEnvPlaceholder(params.apiKey);
+  const apiKey = String(params.apiKey || "").trim() || undefined;
   if (!apiKey) {
     return {
       providerId,
       providerType,
       ok: false,
       models: [],
-      error: "Missing apiKey (or unresolved ${ENV_VAR})",
+      error: "Missing apiKey",
     };
   }
 

package/src/cli/shared/CliReporterTypes.ts

@@ -101,7 +101,7 @@ export type CliReportListItem = {
    * 当前列表项的主标题。
    *
    * 说明（中文）
-   * - 一般展示 agent 名称、服务名或项目名。
+   * - 一般展示 agent id、服务名或项目名。
    * - 尽量避免直接塞入大量详情信息。
    */
   title: string;

package/src/cli/shared/Config.ts

@@ -59,8 +59,8 @@ function readDowncityConfigByPath(
     throw new Error("Invalid downcity.json: expected object");
   }
   const candidate = raw as Partial<DowncityConfig>;
-  if (typeof candidate.name !== "string" || typeof candidate.version !== "string") {
-    throw new Error("Invalid downcity.json: missing required fields name/version");
+  if (typeof candidate.id !== "string" || typeof candidate.version !== "string") {
+    throw new Error("Invalid downcity.json: missing required fields id/version");
   }
   return { downcityJsonPath, config: candidate as DowncityConfig };
 }

package/src/cli/shared/Env.ts

@@ -4,37 +4,16 @@
  * 关键点（中文）
  * - `env` 是平台 Env 的资源命令，支持 list/set/delete。
  * - 默认不输出任何 secret value；只在显式 set 时写入值。
- * - global / agent 两层 env 共用统一 store，但 CLI 语义仍保持清晰。
+ * - 当前只保留平台全局 env，不再区分 agent 私有层。
  */
 
 import type { Command } from "commander";
 import { PlatformStore } from "@/platform/store/index.js";
-import type { StoredEnvEntry, StoredEnvScope } from "@downcity/agent";
+import type { StoredEnvEntry } from "@downcity/agent";
 import { emitCliBlock, emitCliList } from "./CliReporter.js";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import { parseBoolean } from "./IndexSupport.js";
 
-/**
- * env 子命令的 scope 类型。
- */
-type KeysScope = StoredEnvScope | "all";
-
-/**
- * 规范化 env scope。
- */
-function normalizeKeysScope(value: string | undefined, options?: {
-  /**
-   * 是否允许 `all`。
-   */
-  allowAll?: boolean;
-}): KeysScope {
-  const normalized = String(value || "").trim().toLowerCase();
-  if (!normalized || normalized === "global") return "global";
-  if (normalized === "agent") return "agent";
-  if (options?.allowAll === true && normalized === "all") return "all";
-  throw new Error(`Unsupported scope: ${value}`);
-}
-
 /**
  * 规范化 env key。
  */
@@ -46,17 +25,6 @@ function normalizeEnvKey(value: string): string {
   return key;
 }
 
-/**
- * 规范化非空文本。
- */
-function normalizeRequiredText(value: string | undefined, fieldName: string): string {
-  const normalized = String(value || "").trim();
-  if (!normalized) {
-    throw new Error(`${fieldName} is required`);
-  }
-  return normalized;
-}
-
 /**
  * 把 env value 格式化成 `.env` 可解析的值。
  *
@@ -93,13 +61,13 @@ function formatDotenvEntries(entries: StoredEnvEntry[]): string {
  * 判断当前命令是否处在 agent shell 执行上下文。
  *
  * 关键点（中文）
- * - agent shell 会注入 `DC_AGENT_PATH/DC_AGENT_NAME`，用于嵌套 city CLI 定位当前 agent。
+ * - agent shell 会注入 `DC_AGENT_PATH/DC_AGENT_ID`，用于嵌套 city CLI 定位当前 agent。
  * - `env copy` 会导出 secret 明文，不能允许 agent 自己调用。
  */
 function isAgentShellExecution(): boolean {
   return Boolean(
     String(process.env.DC_AGENT_PATH || "").trim() ||
-      String(process.env.DC_AGENT_NAME || "").trim(),
+      String(process.env.DC_AGENT_ID || "").trim(),
   );
 }
 
@@ -111,66 +79,10 @@ function assertEnvCopyAllowedFromLocalCli(): void {
   throw new Error("city env copy can only be run from the local CLI, not from an agent shell.");
 }
 
-/**
- * 解析命令输入最终使用的 env scope。
- */
-function resolveKeysCommandScope(params: {
-  /**
-   * 命令行 `--scope` 原始值。
-   */
-  scope?: string;
-  /**
-   * 命令行 `--agent` 原始值。
-   */
-  agentId?: string;
-  /**
-   * 当前命令是否允许 `all`。
-   */
-  allowAll?: boolean;
-}): {
-  /**
-   * 最终 env scope。
-   */
-  scope: KeysScope;
-  /**
-   * 规范化后的 agentId。
-   */
-  agentId?: string;
-} {
-  const agentId = String(params.agentId || "").trim();
-  if (agentId) {
-    return {
-      scope: "agent",
-      agentId,
-    };
-  }
-
-  return {
-    scope: normalizeKeysScope(params.scope, {
-      allowAll: params.allowAll === true,
-    }),
-  };
-}
-
-/**
- * 读取指定范围的 env 条目。
- */
-async function listKeysEntries(params: {
-  /**
-   * scope 过滤。
-   */
-  scope: KeysScope;
-  /**
-   * agent 过滤。
-   */
-  agentId?: string;
-}): Promise<StoredEnvEntry[]> {
+async function listKeysEntries(): Promise<StoredEnvEntry[]> {
   const store = new PlatformStore();
   try {
-    if (params.scope === "all") {
-      return await store.listEnvEntries();
-    }
-    return await store.listEnvEntries(params.scope, params.agentId);
+    return await store.listEnvEntries();
   } finally {
     store.close();
   }
@@ -180,23 +92,12 @@ async function listKeysEntries(params: {
  * 输出 env 列表。
  */
 async function emitKeysList(params: {
-  /**
-   * scope 过滤。
-   */
-  scope: KeysScope;
-  /**
-   * agent 过滤。
-   */
-  agentId?: string;
   /**
    * 是否以 JSON 输出。
    */
   asJson?: boolean;
 }): Promise<void> {
-  const entries = await listKeysEntries({
-    scope: params.scope,
-    agentId: params.agentId,
-  });
+  const entries = await listKeysEntries();
 
   if (params.asJson === true) {
     printResult({
@@ -204,14 +105,11 @@ async function emitKeysList(params: {
       success: true,
       title: "env list",
       payload: {
-        scope: params.scope,
-        agentId: params.agentId,
         count: entries.length,
         keys: entries.map((item) => ({
           key: item.key,
           description: item.description || "",
           scope: item.scope,
-          ...(item.agentId ? { agentId: item.agentId } : {}),
           createdAt: item.createdAt,
           updatedAt: item.updatedAt,
         })),
@@ -240,16 +138,8 @@ async function emitKeysList(params: {
       facts: [
         {
           label: "Scope",
-          value: item.scope,
+          value: "global",
         },
-        ...(item.agentId
-          ? [
-              {
-                label: "Agent",
-                value: item.agentId,
-              },
-            ]
-          : []),
         ...(item.description
           ? [
               {
@@ -266,20 +156,8 @@ async function emitKeysList(params: {
 /**
  * 输出 dotenv 格式的 env 内容。
  */
-async function emitDotenvCopy(params: {
-  /**
-   * scope 过滤。
-   */
-  scope: KeysScope;
-  /**
-   * agent 过滤。
-   */
-  agentId?: string;
-}): Promise<void> {
-  const entries = await listKeysEntries({
-    scope: params.scope,
-    agentId: params.agentId,
-  });
+async function emitDotenvCopy(): Promise<void> {
+  const entries = await listKeysEntries();
   process.stdout.write(formatDotenvEntries(entries));
 }
 
@@ -287,14 +165,6 @@ async function emitDotenvCopy(params: {
  * 写入单个 env 条目。
  */
 async function setKeyEntry(params: {
-  /**
-   * scope。
-   */
-  scope: StoredEnvScope;
-  /**
-   * agentId。
-   */
-  agentId?: string;
   /**
    * env key。
    */
@@ -315,8 +185,7 @@ async function setKeyEntry(params: {
   const store = new PlatformStore();
   try {
     await store.upsertEnvEntry({
-      scope: params.scope,
-      agentId: params.agentId,
+      scope: "global",
       key: params.key,
       value: params.value,
       description: String(params.description || "").trim(),
@@ -332,8 +201,7 @@ async function setKeyEntry(params: {
       title: "env set",
       payload: {
         action: "set",
-        scope: params.scope,
-        agentId: params.agentId,
+        scope: "global",
         key: params.key,
       },
     });
@@ -347,16 +215,8 @@ async function setKeyEntry(params: {
     facts: [
       {
         label: "Scope",
-        value: params.scope,
+        value: "global",
       },
-      ...(params.agentId
-        ? [
-            {
-              label: "Agent",
-              value: params.agentId,
-            },
-          ]
-        : []),
       ...(params.description
         ? [
             {
@@ -373,14 +233,6 @@ async function setKeyEntry(params: {
  * 删除单个 env 条目。
  */
 function deleteKeyEntry(params: {
-  /**
-   * scope。
-   */
-  scope: StoredEnvScope;
-  /**
-   * agentId。
-   */
-  agentId?: string;
   /**
    * env key。
    */
@@ -392,11 +244,7 @@ function deleteKeyEntry(params: {
 }): void {
   const store = new PlatformStore();
   try {
-    store.removeEnvEntry({
-      scope: params.scope,
-      agentId: params.agentId,
-      key: params.key,
-    });
+    store.removeEnvEntry(params.key);
   } finally {
     store.close();
   }
@@ -408,8 +256,7 @@ function deleteKeyEntry(params: {
       title: "env delete",
       payload: {
         action: "delete",
-        scope: params.scope,
-        agentId: params.agentId,
+        scope: "global",
         key: params.key,
       },
     });
@@ -423,16 +270,8 @@ function deleteKeyEntry(params: {
     facts: [
       {
         label: "Scope",
-        value: params.scope,
+        value: "global",
       },
-      ...(params.agentId
-        ? [
-            {
-              label: "Agent",
-              value: params.agentId,
-            },
-          ]
-        : []),
     ],
   });
 }
@@ -449,19 +288,10 @@ export function registerEnvCommand(program: Command): void {
   env
     .command("list")
     .description("列出平台 Env 中已配置的 key")
-    .option("--scope <scope>", "按作用域过滤：global|agent|all", "global")
-    .option("--agent <agentId>", "仅列出指定 agent 的私有 env（会隐式使用 --scope agent）")
     .option("--json [enabled]", "以 JSON 输出", parseBoolean)
     .helpOption("--help", "display help for command")
-    .action(async (options: { scope?: string; agent?: string; json?: boolean }) => {
-      const resolved = resolveKeysCommandScope({
-        scope: options.scope,
-        agentId: options.agent,
-        allowAll: true,
-      });
+    .action(async (options: { json?: boolean }) => {
       await emitKeysList({
-        scope: resolved.scope,
-        agentId: resolved.agentId,
         asJson: options.json === true,
       });
     });
@@ -469,28 +299,15 @@ export function registerEnvCommand(program: Command): void {
   env
     .command("set <key> <value>")
     .description("新增或更新平台 Env 中的 key")
-    .option("--scope <scope>", "写入作用域：global|agent", "global")
-    .option("--agent <agentId>", "指定 agent 私有 env（会隐式使用 --scope agent）")
     .option("-d, --description <description>", "设置 key 描述")
     .option("--json [enabled]", "以 JSON 输出", parseBoolean)
     .helpOption("--help", "display help for command")
     .action(async (
       keyInput: string,
       valueInput: string,
-      options: { scope?: string; agent?: string; description?: string; json?: boolean },
+      options: { description?: string; json?: boolean },
     ) => {
-      const resolved = resolveKeysCommandScope({
-        scope: options.scope,
-        agentId: options.agent,
-        allowAll: false,
-      });
-      if (resolved.scope === "all") {
-        throw new Error("env set does not support scope=all");
-      }
-
       await setKeyEntry({
-        scope: resolved.scope,
-        agentId: resolved.agentId,
         key: normalizeEnvKey(keyInput),
         value: String(valueInput ?? ""),
         description: String(options.description || "").trim(),
@@ -501,54 +318,29 @@ export function registerEnvCommand(program: Command): void {
   env
     .command("copy")
     .description("按 .env 文件格式输出平台 Env 的明文值")
-    .option("--scope <scope>", "按作用域复制：global|agent|all", "global")
-    .option("--agent <agentId>", "复制指定 agent 的私有 env（会隐式使用 --scope agent）")
     .helpOption("--help", "display help for command")
-    .action(async (options: { scope?: string; agent?: string }) => {
+    .action(async () => {
       assertEnvCopyAllowedFromLocalCli();
-      const resolved = resolveKeysCommandScope({
-        scope: options.scope,
-        agentId: options.agent,
-        allowAll: true,
-      });
-      await emitDotenvCopy({
-        scope: resolved.scope,
-        agentId: resolved.agentId,
-      });
+      await emitDotenvCopy();
     });
 
   env
     .command("delete <key>")
     .description("删除平台 Env 中的 key")
-    .option("--scope <scope>", "删除作用域：global|agent", "global")
-    .option("--agent <agentId>", "指定 agent 私有 env（会隐式使用 --scope agent）")
     .option("--json [enabled]", "以 JSON 输出", parseBoolean)
     .helpOption("--help", "display help for command")
     .action(async (
       keyInput: string,
-      options: { scope?: string; agent?: string; json?: boolean },
+      options: { json?: boolean },
     ) => {
-      const resolved = resolveKeysCommandScope({
-        scope: options.scope,
-        agentId: options.agent,
-        allowAll: false,
-      });
-      if (resolved.scope === "all") {
-        throw new Error("env delete does not support scope=all");
-      }
-
       deleteKeyEntry({
-        scope: resolved.scope,
-        agentId: resolved.agentId,
         key: normalizeEnvKey(keyInput),
         asJson: options.json === true,
       });
     });
 
   env.action(async () => {
-    await emitKeysList({
-      scope: "global",
-    });
+    await emitKeysList({});
   });
 
   env.showHelpAfterError();

package/src/cli/shared/IndexAgentCommand.ts

@@ -97,6 +97,7 @@ export function registerAgentCommands(
     .command("start [path]")
     .description("启动 Agent 进程（后台/前台）")
     .addOption(new context.hiddenPortOption("--port <port>").argParser(parsePort).hideHelp())
+    .addOption(new context.hiddenPortOption("--rpc-port <port>").argParser(parsePort).hideHelp())
     .option("-h, --host <host>", "服务主机（默认 0.0.0.0）")
     .option("--foreground [enabled]", "前台启动（仅当前终端）", parseBoolean)
     .helpOption("--help", "display help for command")
@@ -119,12 +120,11 @@ export function registerAgentCommands(
   agent
     .command("chat")
     .description("在终端中与指定 Agent 对话（交互式或一次性）")
-    .option("-t, --to <name>", "目标 agent 名称（省略时交互选择）")
+    .option("-t, --to <id>", "目标 agent id（省略时交互选择）")
     .option("-m, --message <text>", "一次性发送一轮消息并退出")
     .option("--json [enabled]", "一次性模式下以 JSON 输出", parseBoolean)
-    .option("--host <host>", "Server host（覆盖自动解析）")
+    .option("--host <host>", "RPC host（覆盖自动解析）")
     .addOption(new context.hiddenPortOption("--port <port>").argParser(parsePort).hideHelp())
-    .option("--token <token>", "覆盖 Bearer Token（仅远程 HTTP 调用需要）")
     .helpOption("--help", "display help for command")
     .action(createVersionBanner(
       context.version,
@@ -135,7 +135,6 @@ export function registerAgentCommands(
           json?: boolean;
           host?: string;
           port?: number;
-          token?: string;
         },
       ) => {
         await chatCommand(options);

package/src/cli/shared/IndexSupport.ts

@@ -103,18 +103,24 @@ export const sleep = async (ms: number): Promise<void> =>
   new Promise((resolve) => setTimeout(resolve, ms));
 
 /**
- * 从项目根目录推断 agent 名称。
+ * 从项目根目录推断 agent id。
  */
-export function resolveAgentName(projectRoot: string): string {
-  const fallback = basename(projectRoot);
+export function resolveAgentId(projectRoot: string): string {
+  const fallback = basename(projectRoot)
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "_")
+    .replace(/^_+|_+$/g, "")
+    .replace(/_{2,}/g, "_")
+    .trim() || basename(projectRoot);
   const shipJsonPath = join(projectRoot, "downcity.json");
   if (!existsSync(shipJsonPath)) return fallback;
 
   try {
     const raw = readFileSync(shipJsonPath, "utf-8");
-    const parsed = JSON.parse(raw) as { name?: unknown };
-    if (typeof parsed.name === "string" && parsed.name.trim()) {
-      return parsed.name.trim();
+    const parsed = JSON.parse(raw) as { id?: unknown };
+    if (typeof parsed.id === "string" && parsed.id.trim()) {
+      return parsed.id.trim();
     }
   } catch {
     // ignore parse errors and fallback to dirname
@@ -128,11 +134,11 @@ export function resolveAgentName(projectRoot: string): string {
  */
 export function injectAgentContext(pathInput: string = "."): {
   projectRoot: string;
-  agentName: string;
+  agentId: string;
 } {
   const projectRoot = resolve(String(pathInput || "."));
-  const agentName = resolveAgentName(projectRoot);
+  const agentId = resolveAgentId(projectRoot);
   process.env.DC_AGENT_PATH = projectRoot;
-  process.env.DC_AGENT_NAME = agentName;
-  return { projectRoot, agentName };
+  process.env.DC_AGENT_ID = agentId;
+  return { projectRoot, agentId };
 }

package/src/cli/shared/ManagedPluginActionCommands.ts

@@ -10,7 +10,6 @@
 import path from "node:path";
 import type { Command } from "commander";
 import {
-  callAgentTransport,
   parseActionScheduleRunAtMsOrThrow,
 } from "@downcity/agent";
 import { listPluginsWithLifecycle } from "@downcity/agent";
@@ -19,6 +18,7 @@ import type { JsonObject, JsonValue } from "@downcity/agent";
 import type { PluginActionScheduleInput } from "@downcity/agent";
 import type { PluginCommandResponse } from "@downcity/agent";
 import type { PluginCliBaseOptions } from "@downcity/agent";
+import { callServer } from "@/process/daemon/Client.js";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import { parseBoolean, parsePort } from "./IndexSupport.js";
 import { runManagedPluginControlCommand } from "./ManagedPluginRemote.js";
@@ -207,7 +207,7 @@ function registerPluginActionCommand(params: {
     .option("--path <path>", "项目根目录（默认当前目录）", ".")
     .option("--host <host>", "Server host（覆盖自动解析）")
     .option("--port <port>", "Server port（覆盖自动解析）", parsePort)
-    .option("--token <token>", "覆盖 Bearer Token（仅远程 HTTP 调用需要；默认本地走 IPC）")
+    .option("--token <token>", "覆盖 Bearer Token（按 HTTP daemon 调用时可选）")
     .option("--json [enabled]", "以 JSON 输出", parseBoolean, true);
 
   commandSpec.configure?.(actionCommand);
@@ -278,7 +278,7 @@ function registerPluginActionCommand(params: {
       return;
     }
 
-    const remote = await callAgentTransport<PluginCommandResponse>({
+    const remote = await callServer<PluginCommandResponse>({
       projectRoot: resolveProjectRoot(bridgeOptions.path),
       path: "/api/plugins/command",
       method: "POST",
@@ -330,7 +330,7 @@ function attachPluginLifecycleOptions(command: Command): Command {
     .option("--path <path>", "项目根目录（默认当前目录）", ".")
     .option("--host <host>", "Server host（覆盖自动解析）")
     .option("--port <port>", "Server port（覆盖自动解析）", parsePort)
-    .option("--token <token>", "覆盖 Bearer Token（仅远程 HTTP 调用需要；默认本地走 IPC）")
+    .option("--token <token>", "覆盖 Bearer Token（按 HTTP daemon 调用时可选）")
     .option("--json [enabled]", "以 JSON 输出", parseBoolean, true);
 }