@downcity/city 1.1.32 → 1.1.47

package/README.md

@@ -64,8 +64,7 @@ src
 │   └── store/
 ├── process/
 │   ├── daemon/
-│   ├── registry/
-│   └── rpc/
+│   └── registry/
 ├── types/
 │   ├── chat/
 │   ├── contact/
@@ -145,7 +144,7 @@ src
 
 - `src/process/`
   - city runtime 进程侧能力。
-  - 统一承接 daemon、registry、local rpc，不再散落在顶层目录。
+  - 统一承接 daemon 与 registry，不再散落在顶层目录。
 
 - `src/process/daemon/`
   - Agent daemon 的 pid/log/meta/启停管理。
@@ -155,10 +154,6 @@ src
   - city runtime 与多 Agent registry 状态。
   - 记录哪些 agent 已登记、哪些 daemon 正在运行、Console/city pid 路径等。
 
-- `src/process/rpc/`
-  - city 侧 local RPC 客户端辅助。
-  - 用于本机调用 Agent 暴露的 IPC 接口。
-
 - `src/types/`
   - 当前仅保留尚未进一步归位的领域类型。
   - 目前主要是 `chat / contact / task` 三组。
@@ -209,7 +204,7 @@ browser / UI
   -> src/control/ControlGateway.ts
   -> src/control/gateway/*
   -> src/process/registry/*
-  -> 转发到单 Agent HTTP / RPC
+  -> 转发到单 Agent HTTP
 ```
 
 ### 5. 全局模型池
@@ -252,6 +247,6 @@ city model ...
 - 模型池、provider store 与模型创建逻辑留在 city 宿主层，不下沉回 `@downcity/agent`。
 - `control/` 是平台 gateway / control plane。
 - 单 Agent 的 HTTP control API 语义应该留在 `@downcity/agent`。
-- `process/` 统一放 city 的进程管理、registry、RPC，不要再散落回顶层。
+- `process/` 统一放 city 的进程管理与 registry，不要再散落回顶层。
 - `config/` 只放静态配置/schema/路径，不混入运行时 store 逻辑。
 - CLI 类型、store 类型、city 自有小类型优先就近放在对应模块旁边。

package/bin/cli/Index.js

@@ -12,7 +12,8 @@ import { basename, dirname, join } from "path";
 import { createRequire } from "module";
 import { fileURLToPath } from "url";
 import { Command, Option } from "commander";
-import { registerAllPluginsForCli } from "@downcity/agent";
+import { listPluginsWithoutLifecycle, registerPluginActionCommandsForCli, } from "@downcity/agent";
+import { createBuiltinPlugins } from "@downcity/plugins";
 import { registerPluginsCommand } from "./shared/Plugins.js";
 import { registerManagedPluginCommandsForCli } from "./shared/ManagedPluginActionCommands.js";
 import { registerControlPlaneCommands } from "./control-plane/ControlPlaneCommand.js";
@@ -21,6 +22,7 @@ import { registerEnvCommand } from "./shared/Env.js";
 import { registerTokenCommand } from "./shared/Token.js";
 import { registerResetCommand } from "./shared/Reset.js";
 import { registerChatCommand } from "./shared/Chat.js";
+import { registerTerminalCommand } from "./shared/Terminal.js";
 import { setCliVerbosity } from "./shared/CliReporter.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -56,6 +58,7 @@ function resolveInstalledAgentVersion() {
 const installedAgentVersion = resolveInstalledAgentVersion();
 const program = new Command();
 const argv = process.argv.slice(2);
+const builtinPlugins = createBuiltinPlugins();
 program
     .name(basename(process.argv[1] || "downcity"))
     .description("把一个代码仓库，启动为一个拥有自主意识和执行能力的 Agent")
@@ -76,11 +79,15 @@ registerTokenCommand(program);
 registerEnvCommand(program);
 registerResetCommand(program);
 registerChatCommand(program);
+registerTerminalCommand(program, packageJson.version);
 registerPluginsCommand(program);
 // 受 agent 托管的 plugin 命令统一注册（chat / task / memory / shell / future managed plugins）
-registerManagedPluginCommandsForCli(program);
+registerManagedPluginCommandsForCli(program, builtinPlugins);
 // 插件命令统一注册（skill / asr / tts / future plugins）
-registerAllPluginsForCli(program);
+registerPluginActionCommandsForCli({
+    program,
+    plugins: listPluginsWithoutLifecycle(builtinPlugins),
+});
 program.showHelpAfterError();
 program.showSuggestionAfterError();
 /**

package/bin/cli/Index.js.map

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

package/bin/cli/agent/AgentChat.d.ts

@@ -5,13 +5,14 @@
  * - 统一覆盖交互式持续对话与一次性消息模式，不再保留独立 `quest` 命令。
  * - 目标 agent 始终按 managed agent registry 名称解析，不依赖当前工作目录。
  * - 默认使用独立 local-cli 主会话：`local-cli-chat-main`。
+ * - 远程访问统一走 `RemoteAgent({ url })`，不再在 CLI 侧维护第二套 HTTP SDK transport。
  */
 import type { AgentChatCliOptions, AgentChatExecutionOutcome, AgentChatTransportOptions } from "./AgentChatTypes.js";
 /**
  * 向目标 agent 的 SDK actor session 发送一轮消息。
  */
 export declare function executeAgentChatTurn(params: {
-    agentName: string;
+    agentId: string;
     message: string;
     transport?: AgentChatTransportOptions;
 }): Promise<AgentChatExecutionOutcome>;

package/bin/cli/agent/AgentChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAkBH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EAEzB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AA6d7B;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,yBAAyB,CAAC;CACvC,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAwCrC;AAqID;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC7E"}
+{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkBH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EAEzB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAiT7B;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,yBAAyB,CAAC;CACvC,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAwCrC;AAgID;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC7E"}

package/bin/cli/agent/AgentChat.js

@@ -5,18 +5,18 @@
  * - 统一覆盖交互式持续对话与一次性消息模式，不再保留独立 `quest` 命令。
  * - 目标 agent 始终按 managed agent registry 名称解析，不依赖当前工作目录。
  * - 默认使用独立 local-cli 主会话：`local-cli-chat-main`。
+ * - 远程访问统一走 `RemoteAgent({ url })`，不再在 CLI 侧维护第二套 HTTP SDK transport。
  */
 import { createInterface } from "node:readline/promises";
 import chalk from "chalk";
 import prompts from "prompts";
+import { RemoteAgent, } from "@downcity/agent";
 import { emitCliBlock } from "../shared/CliReporter.js";
 import { printResult } from "../../utils/cli/CliOutput.js";
-import { resolveProjectRootByAgentName, validateAgentProjectRoot, } from "../shared/PluginTargetSupport.js";
+import { resolveProjectRootByAgentId, validateAgentProjectRoot, } from "../shared/PluginTargetSupport.js";
 import { listRegisteredAgentsForCli } from "./AgentSelection.js";
-import { formatCliBearerHeaderValue, resolveCliAuthToken, } from "../../http/auth/CliAuthStateStore.js";
-import { resolveDaemonEndpoint } from "../../process/daemon/Client.js";
+import { resolveDaemonRpcEndpoint } from "../../process/daemon/Client.js";
 import { AGENT_CHAT_DEFAULT_SESSION_ID } from "./AgentChatTypes.js";
-const SDK_EVENTS_READY_TYPE = "sdk-events-ready";
 function normalizeChatMessage(input) {
     return String(input || "").trim();
 }
@@ -34,15 +34,15 @@ function buildAgentChatFailureText(error) {
     return (String(error || "").trim() ||
         "Agent daemon returned empty error (check config with `city agent status`)");
 }
-async function resolveChatTargetAgentName(inputName) {
-    const explicit = String(inputName || "").trim();
+async function resolveChatTargetAgentId(inputId) {
+    const explicit = String(inputId || "").trim();
     if (explicit)
         return explicit;
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         emitCliBlock({
             tone: "error",
-            title: "Agent name is required",
-            note: "Use `city agent chat --to <agentName>` or run this command in an interactive terminal.",
+            title: "Agent id is required",
+            note: "Use `city agent chat --to <id>` or run this command in an interactive terminal.",
         });
         return null;
     }
@@ -57,45 +57,45 @@ async function resolveChatTargetAgentName(inputName) {
     }
     const response = (await prompts({
         type: "select",
-        name: "agentName",
+        name: "agentId",
         message: "选择要聊天的 Agent",
         choices: runningAgents.map((agent) => ({
-            title: agent.name,
+            title: agent.id,
             description: agent.projectRoot,
-            value: agent.name,
+            value: agent.id,
         })),
         initial: 0,
     }));
-    const agentName = String(response.agentName || "").trim();
-    if (!agentName) {
+    const agentId = String(response.agentId || "").trim();
+    if (!agentId) {
         emitCliBlock({
             tone: "info",
             title: "Agent chat cancelled",
         });
         return null;
     }
-    return agentName;
+    return agentId;
 }
-async function resolveAgentChatTarget(agentNameInput) {
-    const agentName = String(agentNameInput || "").trim();
+async function resolveAgentChatTarget(agentIdInput) {
+    const agentId = String(agentIdInput || "").trim();
     const sessionId = AGENT_CHAT_DEFAULT_SESSION_ID;
-    if (!agentName) {
+    if (!agentId) {
         return {
             success: false,
             outcome: {
-                agentName: "",
+                agentId: "",
                 sessionId,
                 success: false,
-                error: "Missing target agent name.",
+                error: "Missing target agent id.",
             },
         };
     }
-    const resolved = await resolveProjectRootByAgentName(agentName);
+    const resolved = await resolveProjectRootByAgentId(agentId);
     if (!resolved.projectRoot) {
         return {
             success: false,
             outcome: {
-                agentName,
+                agentId,
                 sessionId,
                 success: false,
                 error: resolved.error || "Failed to resolve agent project path",
@@ -107,7 +107,7 @@ async function resolveAgentChatTarget(agentNameInput) {
         return {
             success: false,
             outcome: {
-                agentName,
+                agentId,
                 projectRoot: resolved.projectRoot,
                 sessionId,
                 success: false,
@@ -118,7 +118,7 @@ async function resolveAgentChatTarget(agentNameInput) {
     return {
         success: true,
         target: {
-            agentName,
+            agentId,
             projectRoot: resolved.projectRoot,
             sessionId,
         },
@@ -143,7 +143,7 @@ function printAgentChatFailure(params) {
         facts: [
             {
                 label: "agent",
-                value: params.agentName,
+                value: params.agentId,
             },
             {
                 label: "error",
@@ -152,53 +152,25 @@ function printAgentChatFailure(params) {
         ],
     });
 }
-async function readHttpFailure(response) {
-    const contentType = String(response.headers.get("content-type") || "").toLowerCase();
-    const text = await response.text().catch(() => "");
-    if (contentType.includes("application/json")) {
-        try {
-            const payload = JSON.parse(text);
-            return (String(payload.error || payload.message || "").trim() ||
-                `HTTP ${response.status}`);
-        }
-        catch {
-            // ignore malformed json payloads
-        }
-    }
-    return String(text || "").trim() || `HTTP ${response.status}`;
-}
-function isSdkEventsReadyFrame(value) {
-    return (typeof value === "object" &&
-        value !== null &&
-        "type" in value &&
-        String(value.type || "") === SDK_EVENTS_READY_TYPE);
-}
-async function postSdkPrompt(params) {
-    const response = await fetch(new URL(`/api/sdk/sessions/${encodeURIComponent(params.sessionId)}/prompt`, params.endpointBaseUrl).toString(), {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            ...(params.authHeaderValue ? { Authorization: params.authHeaderValue } : {}),
-        },
-        body: JSON.stringify({
-            query: params.message,
-        }),
-    }).catch((error) => {
-        throw new Error(`Failed to call ${params.endpointBaseUrl}: ${String(error)}`);
+function createRemoteAgent(params) {
+    const endpoint = resolveDaemonRpcEndpoint({
+        projectRoot: params.projectRoot,
+        host: params.transport?.host,
+        port: params.transport?.port,
     });
-    const payload = (await response.json().catch(() => ({})));
-    const turnId = String(payload.turn?.id || "").trim();
-    if (!response.ok || payload.success !== true || !turnId) {
-        return {
-            success: false,
-            error: String(payload.error || "").trim() ||
-                `SDK prompt failed with HTTP ${response.status}`,
-        };
+    return new RemoteAgent({
+        url: `rpc://${endpoint.host}:${endpoint.port}`,
+    });
+}
+async function getOrCreateRemoteSession(params) {
+    try {
+        return await params.remote_agent.getSession(params.session_id);
+    }
+    catch {
+        return await params.remote_agent.createSession({
+            sessionId: params.session_id,
+        });
     }
-    return {
-        success: true,
-        turnId,
-    };
 }
 async function runSdkPromptTurn(params) {
     const message = normalizeChatMessage(params.message);
@@ -210,7 +182,7 @@ async function runSdkPromptTurn(params) {
             text: "",
         };
     }
-    const resolved = await resolveAgentChatTarget(params.agentName);
+    const resolved = await resolveAgentChatTarget(params.agentId);
     if (!resolved.success) {
         return {
             success: false,
@@ -219,154 +191,66 @@ async function runSdkPromptTurn(params) {
             text: "",
         };
     }
-    const { target } = resolved;
-    const abortController = new AbortController();
-    const endpoint = resolveDaemonEndpoint({
-        projectRoot: target.projectRoot,
-        host: params.transport?.host,
-        port: params.transport?.port,
+    const remote_agent = createRemoteAgent({
+        projectRoot: resolved.target.projectRoot,
+        transport: params.transport,
     });
-    const authHeaderValue = formatCliBearerHeaderValue(resolveCliAuthToken({
-        explicitToken: params.transport?.token,
-    }));
-    const response = await fetch(new URL(`/api/sdk/sessions/${encodeURIComponent(target.sessionId)}/events`, endpoint.baseUrl).toString(), {
-        headers: {
-            ...(authHeaderValue ? { Authorization: authHeaderValue } : {}),
-        },
-        signal: abortController.signal,
-    }).catch((error) => {
-        throw new Error(`Failed to call ${endpoint.baseUrl}: ${String(error)}`);
+    const session = await getOrCreateRemoteSession({
+        remote_agent,
+        session_id: resolved.target.sessionId,
     });
-    if (!response.ok || !response.body) {
-        return {
-            success: false,
-            error: await readHttpFailure(response),
-            emittedVisibleText: false,
-            text: "",
-        };
-    }
-    const decoder = new TextDecoder();
-    const reader = response.body.getReader();
-    let buffered = "";
-    let printedLeadingNewline = false;
-    let emittedVisibleText = false;
-    let promptTurnId = "";
-    let promptPosted = false;
-    let finalText = "";
+    let printed_leading_newline = false;
+    let emitted_visible_text = false;
+    let final_text = "";
+    let target_turn_id = "";
     const renderEvent = (event) => {
-        if (event.type !== "text-delta" || event.turnId !== promptTurnId || !event.text)
+        if (event.type !== "text-delta" || event.turnId !== target_turn_id || !event.text) {
             return;
+        }
         if (params.renderText === false)
             return;
-        if (!printedLeadingNewline) {
+        if (!printed_leading_newline) {
             process.stdout.write("\n");
-            printedLeadingNewline = true;
+            printed_leading_newline = true;
         }
         process.stdout.write(event.text);
-        emittedVisibleText = true;
+        emitted_visible_text = true;
     };
-    const handleLine = async (line) => {
-        const value = JSON.parse(line);
-        if (isSdkEventsReadyFrame(value)) {
-            if (!promptPosted) {
-                promptPosted = true;
-                const promptResult = await postSdkPrompt({
-                    endpointBaseUrl: endpoint.baseUrl,
-                    sessionId: target.sessionId,
-                    message,
-                    authHeaderValue,
-                });
-                if (!promptResult.success) {
-                    return {
-                        done: true,
-                        error: promptResult.error,
-                    };
-                }
-                promptTurnId = promptResult.turnId;
-            }
-            return { done: false };
-        }
-        const event = value;
-        if (event.type === "error") {
-            return {
-                done: true,
-                error: event.message,
-            };
-        }
+    const unsubscribe = session.subscribe((event) => {
         renderEvent(event);
-        if (event.type === "turn-finish" && event.turnId === promptTurnId) {
-            finalText = event.text;
-            return {
-                done: true,
-                ...(event.success ? {} : { error: event.error || "Agent turn failed" }),
-            };
+        if (event.type === "turn-finish" && event.turnId === target_turn_id) {
+            final_text = event.text;
         }
-        return { done: false };
-    };
-    const finishTurn = (result) => {
-        if (printedLeadingNewline) {
+    });
+    try {
+        const turn = await session.prompt({ query: message });
+        target_turn_id = turn.id;
+        const result = await turn.finished;
+        final_text = result.text;
+        if (printed_leading_newline) {
             process.stdout.write("\n\n");
         }
         return {
             success: result.success,
             ...(result.error ? { error: result.error } : {}),
-            emittedVisibleText,
-            text: finalText,
+            emittedVisibleText: emitted_visible_text,
+            text: final_text,
         };
-    };
-    try {
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done)
-                break;
-            buffered += decoder.decode(value, { stream: true });
-            let newlineIndex = buffered.indexOf("\n");
-            while (newlineIndex >= 0) {
-                const line = buffered.slice(0, newlineIndex).trim();
-                buffered = buffered.slice(newlineIndex + 1);
-                if (line) {
-                    const result = await handleLine(line);
-                    if (result.done) {
-                        return finishTurn({
-                            success: !result.error,
-                            ...(result.error ? { error: result.error } : {}),
-                        });
-                    }
-                }
-                newlineIndex = buffered.indexOf("\n");
-            }
-        }
-        const tail = buffered.trim();
-        if (tail) {
-            const result = await handleLine(tail);
-            if (result.done) {
-                return finishTurn({
-                    success: !result.error,
-                    ...(result.error ? { error: result.error } : {}),
-                });
-            }
-        }
     }
     catch (error) {
-        return finishTurn({
+        if (printed_leading_newline) {
+            process.stdout.write("\n\n");
+        }
+        return {
             success: false,
             error: error instanceof Error ? error.message : String(error),
-        });
+            emittedVisibleText: emitted_visible_text,
+            text: final_text,
+        };
     }
     finally {
-        abortController.abort();
-        await reader.cancel().catch(() => undefined);
-        try {
-            reader.releaseLock();
-        }
-        catch {
-            // ignore
-        }
+        unsubscribe();
     }
-    return finishTurn({
-        success: promptPosted && Boolean(promptTurnId),
-        ...(promptPosted && promptTurnId ? {} : { error: "SDK events connection closed before prompt was accepted." }),
-    });
 }
 /**
  * 向目标 agent 的 SDK actor session 发送一轮消息。
@@ -376,23 +260,23 @@ export async function executeAgentChatTurn(params) {
     const sessionId = AGENT_CHAT_DEFAULT_SESSION_ID;
     if (!message) {
         return {
-            agentName: String(params.agentName || "").trim(),
+            agentId: String(params.agentId || "").trim(),
             sessionId,
             success: false,
             error: "Chat message is required.",
         };
     }
-    const resolved = await resolveAgentChatTarget(params.agentName);
+    const resolved = await resolveAgentChatTarget(params.agentId);
     if (!resolved.success)
         return resolved.outcome;
     const outcome = await runSdkPromptTurn({
-        agentName: params.agentName,
+        agentId: params.agentId,
         message,
         transport: params.transport,
         renderText: false,
     });
     return {
-        agentName: params.agentName,
+        agentId: params.agentId,
         ...(resolved.target.projectRoot ? { projectRoot: resolved.target.projectRoot } : {}),
         sessionId,
         success: outcome.success,
@@ -412,12 +296,11 @@ export async function executeAgentChatTurn(params) {
 async function runOneShotChat(params) {
     if (params.options.json === true) {
         const outcome = await executeAgentChatTurn({
-            agentName: params.agentName,
+            agentId: params.agentId,
             message: params.message,
             transport: {
                 host: params.options.host,
                 port: params.options.port,
-                token: params.options.token,
             },
         });
         printResult({
@@ -425,7 +308,7 @@ async function runOneShotChat(params) {
             success: outcome.success,
             title: "agent chat",
             payload: {
-                agent: params.agentName,
+                agent: params.agentId,
                 ...(outcome.projectRoot ? { projectRoot: outcome.projectRoot } : {}),
                 sessionId: outcome.sessionId,
                 ...(outcome.payload?.result ? { result: outcome.payload.result } : {}),
@@ -435,17 +318,16 @@ async function runOneShotChat(params) {
         return;
     }
     const outcome = await runSdkPromptTurn({
-        agentName: params.agentName,
+        agentId: params.agentId,
         message: params.message,
         transport: {
             host: params.options.host,
             port: params.options.port,
-            token: params.options.token,
         },
     });
     if (!outcome.success) {
         printAgentChatFailure({
-            agentName: params.agentName,
+            agentId: params.agentId,
             error: outcome.error,
         });
         return;
@@ -457,7 +339,7 @@ async function runOneShotChat(params) {
  * 启动交互式持续对话。
  */
 async function runInteractiveChat(params) {
-    const prompt = `${chalk.cyan(params.agentName)} ${chalk.dim("›")} `;
+    const prompt = `${chalk.cyan(params.agentId)} ${chalk.dim("›")} `;
     const helpText = [
         `${chalk.dim("/exit, /quit  — 退出对话")}`,
         `${chalk.dim("/clear       — 清屏")}`,
@@ -466,7 +348,7 @@ async function runInteractiveChat(params) {
     ];
     emitCliBlock({
         tone: "info",
-        title: `Agent chat · ${params.agentName}`,
+        title: `Agent chat · ${params.agentId}`,
         note: `Session: local-cli-chat-main · ${helpText[0].replace(chalk.dim(""), "").trim()}`,
     });
     console.log(helpText.join("\n"));
@@ -482,8 +364,6 @@ async function runInteractiveChat(params) {
                 line = await rl.question(prompt);
             }
             catch (error) {
-                // 关键点（中文）：Node 24 下 Ctrl+C 会让 readline.question 以 AbortError 拒绝。
-                // 这里按正常退出处理，避免把交互式 chat 变成未捕获异常。
                 if (isReadlineAbortError(error)) {
                     console.log();
                     break;
@@ -504,17 +384,16 @@ async function runInteractiveChat(params) {
                 continue;
             }
             const outcome = await runSdkPromptTurn({
-                agentName: params.agentName,
+                agentId: params.agentId,
                 message: text,
                 transport: {
                     host: params.options.host,
                     port: params.options.port,
-                    token: params.options.token,
                 },
             });
             if (!outcome.success) {
                 printAgentChatFailure({
-                    agentName: params.agentName,
+                    agentId: params.agentId,
                     error: outcome.error,
                 });
                 continue;
@@ -532,13 +411,13 @@ async function runInteractiveChat(params) {
  * `city agent chat` 统一入口。
  */
 export async function chatCommand(options) {
-    const agentName = await resolveChatTargetAgentName(options.to);
-    if (!agentName)
+    const agentId = await resolveChatTargetAgentId(options.to);
+    if (!agentId)
         return;
     const oneShotMessage = normalizeChatMessage(String(options.message || ""));
     if (oneShotMessage) {
         await runOneShotChat({
-            agentName,
+            agentId,
             message: oneShotMessage,
             options,
         });
@@ -561,7 +440,7 @@ export async function chatCommand(options) {
         return;
     }
     await runInteractiveChat({
-        agentName,
+        agentId,
         options,
     });
 }