downcity 1.1.364 → 1.1.394

package/README.md

@@ -7,10 +7,10 @@ npm install -g downcity
 downcity -v
 ```
 
-安装后会得到 `city` / `downcity` 与 `fed` / `downfed` 两组命令：
+安装后会得到 `city` / `downcity` 与 `fed` / `downfed` 两个相互独立的工具：
 
-- `fed` 创建、部署和管理 Federation；Local Node.js 和 Cloudflare Workers 都通过 `fed deploy` 部署。
-- `city` 管理本机 Agent、插件、chat 与 Federation 用户登录态。
+- `city` 是本机 City 容器，基于 `City()` 与 Agent SDK 管理全局 Agent、运行时、Plugin 与控制台。
+- `fed` 是 Federation Server Manager；TUI 用于注册和管理 Server，项目命令读取当前目录的 `federation.json`。Local Node.js 和 Cloudflare Workers 都通过 `fed deploy` 部署。
 
 ```bash
 fed create ./my-fed
@@ -22,10 +22,25 @@ fed
 
 `fed create` 默认生成 Local Node.js + SQLite 项目。Local deploy 会自动注入并保存 admin key。无参数执行 `fed` 会进入系统级 Federation 管理面板，已部署实例不依赖当前工作目录。
 
+City 的主要命令：
+
+```bash
+city agent create .
+city agent start <agent_id>
+city agent token create <agent_id> --name local
+city plugin action <plugin_name> <action_name> <agent_id> --input '{}'
+```
+
+`city agent start` 创建的 Agent 默认启用 `ask_question` Tool。使用
+`city agent chat <agent_id>` 交互时，模型可以在缺少关键信息时显示文本、单选或多选问题；
+回答会通过 Session Interaction 提交，并在同一轮模型执行中继续处理。
+
+Agent 与 Plugin Binding 统一保存在全局数据库；Plugin 配置不进入 Agent SDK 的运行时 Plugin 对象。未传 `agent_id` 时，TTY 打开全局 Agent 选择器，非交互环境直接报错。
+
 为独立产品后端登记 Bureau：
 
 ```bash
 fed bureau token
 ```
 
-命令在 CLI 本地生成 `bureau_token`，Federation 只保存 hash，并将明文输出一次。把明文写入 Bureau 服务器的 `DOWNCITY_BUREAU_TOKEN` 环境变量；Federation 与 Bureau 不需要部署在同一台服务器。注册记录可用 `fed bureau list` 查看，使用 `fed bureau revoke <token_id>` 撤销。
+命令打开 Bureau Token 交互式管理界面，可创建、查看和撤销 Token。创建时必须输入用途，也可以直接运行 `fed bureau token create`。CLI 在本地生成 `bureau_token`，Federation 保存用途和 hash，并将明文输出一次。把明文写入 Bureau 服务器的 `DOWNCITY_BUREAU_TOKEN` 环境变量；Federation 与 Bureau 不需要部署在同一台服务器。脚本中可用 `fed bureau token list` 查看，使用 `fed bureau token revoke <token_id>` 撤销。

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

@@ -1 +1 @@
-{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/city/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAW1E;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiH7E"}
+{"version":3,"file":"AgentChat.d.ts","sourceRoot":"","sources":["../../../src/city/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAU1E;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsI7E"}

package/bin/city/agent/AgentChat.js

@@ -12,7 +12,6 @@ import { emitCliBlock } from "../../shared/CliReporter.js";
 import { createRemoteChatSession, listRemoteChatSessions, } from "./AgentChatRemote.js";
 import { run_agent_chat_tui } from "./AgentChatTui.js";
 import { normalizeChatMessage, resolveAgentChatSessionOptions, resolveChatTargetAgentId, resolveInteractiveChatSession, runOneShotChat, runSdkPromptTurn, } from "./AgentChatHelpers.js";
-import { session_messages_to_entries } from "./tui/history/HistoryLoader.js";
 /**
  * `city agent chat` 统一入口。
  */
@@ -26,13 +25,13 @@ export async function chatCommand(options) {
         });
         return;
     }
-    const agentId = await resolveChatTargetAgentId(options.to);
-    if (!agentId)
+    const agent_id = await resolveChatTargetAgentId(options.to);
+    if (!agent_id)
         return;
     const oneShotMessage = normalizeChatMessage(String(options.message || ""));
     if (oneShotMessage) {
         await runOneShotChat({
-            agentId,
+            agent_id,
             message: oneShotMessage,
             options,
         });
@@ -55,7 +54,7 @@ export async function chatCommand(options) {
         return;
     }
     const interactive = await resolveInteractiveChatSession({
-        agentId,
+        agent_id,
         options,
         transport: {
             host: options.host,
@@ -74,34 +73,55 @@ export async function chatCommand(options) {
     }
     try {
         await run_agent_chat_tui({
-            agent_id: agentId,
-            session_id: interactive.target.sessionId,
+            agent_id: agent_id,
+            session_id: interactive.target.session_id,
             list_sessions: async () => await listRemoteChatSessions({
                 remote_agent: interactive.remote_agent,
             }),
             create_session: async () => await createRemoteChatSession({
                 remote_agent: interactive.remote_agent,
             }),
-            load_session_history: async (session_id) => {
+            load_session_context: async (session_id) => {
                 const session = await interactive.remote_agent.sessions.get(session_id);
-                const [info, messages] = await Promise.all([
+                const [info, messages, status, interactions] = await Promise.all([
                     session.get_info(),
                     session.messages(),
+                    session.status(),
+                    session.interactions(),
                 ]);
                 const title = info.title?.trim() || "Untitled";
-                const entries = session_messages_to_entries(messages.items);
-                return { title, entries };
+                return {
+                    title,
+                    messages: messages.items,
+                    security: status.security,
+                    interactions,
+                };
             },
-            resolve_approval: async (session_id, approval_id, decision) => {
+            get_session_status: async (session_id) => {
                 const session = await interactive.remote_agent.sessions.get(session_id);
-                return await session.resolve_approval({ approval_id, decision });
+                return await session.status();
+            },
+            set_session_security: async (session_id, mode) => {
+                const session = await interactive.remote_agent.sessions.get(session_id);
+                await session.set({ security: { approval_mode: mode } });
+            },
+            stop_session: async (session_id) => {
+                const session = await interactive.remote_agent.sessions.get(session_id);
+                return await session.stop();
+            },
+            respond_interaction: async (session_id, interaction_id, response) => {
+                const session = await interactive.remote_agent.sessions.get(session_id);
+                return await session.respond({
+                    interaction_id,
+                    response,
+                });
             },
             run_turn: async ({ session_id, message, interactive_renderer }) => {
                 const outcome = await runSdkPromptTurn({
-                    agentId,
+                    agent_id,
                     message,
                     sessionOptions: {
-                        sessionId: session_id,
+                        session_id: session_id,
                         newSession: false,
                     },
                     transport: {

package/bin/city/agent/AgentChat.js.map

@@ -1 +1 @@
-{"version":3,"file":"AgentChat.js","sourceRoot":"","sources":["../../../src/city/agent/AgentChat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AgentChat.js","sourceRoot":"","sources":["../../../src/city/agent/AgentChat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,wBAAwB,EACxB,6BAA6B,EAC7B,cAAc,EACd,gBAAgB,GACjB,MAAM,kCAAkC,CAAC;AAE1C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAA4B;IAC5D,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACjE,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,YAAY,CAAC;YACX,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,8BAA8B;YACrC,IAAI,EAAE,gBAAgB,CAAC,KAAK;SAC7B,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3E,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,cAAc,CAAC;YACnB,QAAQ;YACR,OAAO,EAAE,cAAc;YACvB,OAAO;SACR,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAC1B,YAAY,CAAC;YACX,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,8BAA8B;YACrC,IAAI,EAAE,+EAA+E;SACtF,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClD,YAAY,CAAC;YACX,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,+BAA+B;YACtC,IAAI,EAAE,+FAA+F;SACtG,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,6BAA6B,CAAC;QACtD,QAAQ;QACR,OAAO;QACP,SAAS,EAAE;YACT,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB;KACF,CAAC,CAAC;IACH,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;YACtB,YAAY,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,mBAAmB;gBAC1B,IAAI,EAAE,WAAW,CAAC,KAAK;aACxB,CAAC,CAAC;QACL,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,kBAAkB,CAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU;YACzC,aAAa,EAAE,KAAK,IAAI,EAAE,CACxB,MAAM,sBAAsB,CAAC;gBAC3B,YAAY,EAAE,WAAW,CAAC,YAAY;aACvC,CAAC;YACJ,cAAc,EAAE,KAAK,IAAI,EAAE,CACzB,MAAM,uBAAuB,CAAC;gBAC5B,YAAY,EAAE,WAAW,CAAC,YAAY;aACvC,CAAC;YACJ,oBAAoB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACzC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBAC/D,OAAO,CAAC,QAAQ,EAAE;oBAClB,OAAO,CAAC,QAAQ,EAAE;oBAClB,OAAO,CAAC,MAAM,EAAE;oBAChB,OAAO,CAAC,YAAY,EAAE;iBACvB,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC;gBAC/C,OAAO;oBACL,KAAK;oBACL,QAAQ,EAAE,QAAQ,CAAC,KAAK;oBACxB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,YAAY;iBACb,CAAC;YACJ,CAAC;YACD,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACvC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,OAAO,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;YAChC,CAAC;YACD,oBAAoB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;gBAC/C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3D,CAAC;YACD,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACjC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YACD,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE;gBAClE,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxE,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC;oBAC3B,cAAc;oBACd,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;YACD,QAAQ,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE;gBAChE,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC;oBACrC,QAAQ;oBACR,OAAO;oBACP,cAAc,EAAE;wBACd,UAAU,EAAE,UAAU;wBACtB,UAAU,EAAE,KAAK;qBAClB;oBACD,SAAS,EAAE;wBACT,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;qBACnB;oBACD,mBAAmB,EAAE,oBAAoB;iBAC1C,CAAC,CAAC;gBAEH,OAAO;oBACL,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,oBAAoB,EAAE,OAAO,CAAC,kBAAkB;oBAChD,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,MAAM,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;AACH,CAAC"}

package/bin/city/agent/AgentChatHelpers.d.ts

@@ -13,11 +13,11 @@ import type { AgentChatCliOptions, AgentChatExecutionOutcome, AgentChatSessionOp
 import type { AgentChatInteractiveRendererPort } from "../types/AgentChatInteractive.js";
 export type ResolvedAgentChatTarget = {
     /** 目标 agent id。 */
-    agentId: string;
+    agent_id: string;
     /** 目标项目根目录。 */
-    projectRoot: string;
-    /** 当前 chat 绑定的 sessionId。 */
-    sessionId: string;
+    project_root: string;
+    /** 当前 chat 绑定的 session_id。 */
+    session_id: string;
     /** 当前 chat 是否要求创建全新的 session。 */
     createNewSession: boolean;
 };
@@ -49,11 +49,11 @@ export declare function resolveAgentChatTarget(agentIdInput: string, sessionOpti
 }>;
 export declare function printAssistantReply(replyText: string): void;
 export declare function printAgentChatFailure(params: {
-    agentId: string;
+    agent_id: string;
     error?: string;
 }): void;
 export declare function resolveInteractiveChatSession(params: {
-    agentId: string;
+    agent_id: string;
     options: AgentChatCliOptions;
     transport?: {
         host?: string;
@@ -68,7 +68,7 @@ export declare function resolveInteractiveChatSession(params: {
     error?: string;
 }>;
 export declare function runSdkPromptTurn(params: {
-    agentId: string;
+    agent_id: string;
     message: string;
     sessionOptions?: AgentChatSessionOptions;
     transport?: {
@@ -81,15 +81,15 @@ export declare function runSdkPromptTurn(params: {
     success: boolean;
     error?: string;
     emittedVisibleText: boolean;
-    sessionId: string;
-    projectRoot?: string;
+    session_id: string;
+    project_root?: string;
     text?: string;
 }>;
 /**
  * 向目标 agent 的 SDK actor session 发送一轮消息。
  */
 export declare function executeAgentChatTurn(params: {
-    agentId: string;
+    agent_id: string;
     message: string;
     sessionOptions?: AgentChatSessionOptions;
     transport?: {
@@ -98,7 +98,7 @@ export declare function executeAgentChatTurn(params: {
     };
 }): Promise<AgentChatExecutionOutcome>;
 export declare function runOneShotChat(params: {
-    agentId: string;
+    agent_id: string;
     message: string;
     options: AgentChatCliOptions;
 }): Promise<void>;

package/bin/city/agent/AgentChatHelpers.d.ts.map

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

package/bin/city/agent/AgentChatHelpers.js

@@ -12,7 +12,7 @@ import prompts from "../tui/Prompts.js";
 import { emitCliBlock } from "../../shared/CliReporter.js";
 import { printResult } from "../utils/cli/CliOutput.js";
 import { resolveProjectRootByAgentId, validateAgentProjectRoot, } from "../shared/PluginTargetSupport.js";
-import { listRegisteredAgentsForCli } from "./AgentSelection.js";
+import { list_registered_agents_for_cli } from "./AgentSelection.js";
 import { createAgentChatSessionId, createRemoteAgent, createRemoteChatSession, getOrCreateRemoteSession, buildAgentChatFailureText, listRemoteChatSessions, } from "./AgentChatRemote.js";
 import { AGENT_CHAT_DEFAULT_SESSION_ID, } from "./AgentChatTypes.js";
 export function normalizeChatMessage(input) {
@@ -27,7 +27,7 @@ export function normalizeChatMessage(input) {
  * - `--session-id` 与 `--new-session` 互斥，避免“复用”和“新建”语义冲突。
  */
 export function resolveAgentChatSessionOptions(input) {
-    const explicit_session_id = String(input?.sessionId || "").trim();
+    const explicit_session_id = String(input?.session_id || "").trim();
     const should_create_new_session = input?.newSession === true;
     if (explicit_session_id && should_create_new_session) {
         return {
@@ -49,7 +49,7 @@ export function resolveAgentChatSessionOptions(input) {
     };
 }
 export function hasExplicitSessionSelection(input) {
-    return Boolean(String(input.sessionId || "").trim() || input.newSession === true);
+    return Boolean(String(input.session_id || "").trim() || input.newSession === true);
 }
 export async function resolveChatTargetAgentId(inputId) {
     const explicit = String(inputId || "").trim();
@@ -58,103 +58,103 @@ export async function resolveChatTargetAgentId(inputId) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         emitCliBlock({
             tone: "error",
-            title: "Agent id is required",
+            title: "Agent ID is required",
             note: "Use `city agent chat --to <id>` or run this command in an interactive terminal.",
         });
         return null;
     }
-    const runningAgents = (await listRegisteredAgentsForCli()).filter((item) => item.status === "running");
-    if (runningAgents.length === 0) {
+    const registered_agents = await list_registered_agents_for_cli();
+    if (registered_agents.length === 0) {
         emitCliBlock({
             tone: "error",
-            title: "No running agents",
-            note: "Run `city agent start` first.",
+            title: "No managed agents",
+            note: "Run `city agent create <workspace_path>` first.",
         });
         return null;
     }
     const response = (await prompts({
         type: "select",
-        name: "agentId",
+        name: "agent_id",
         message: "选择要聊天的 Agent",
-        choices: runningAgents.map((agent) => ({
-            title: agent.id,
-            description: agent.projectRoot,
-            value: agent.id,
+        choices: registered_agents.map((agent) => ({
+            title: agent.agent_id,
+            description: `${agent.status} · ${agent.workspace_path}`,
+            value: agent.agent_id,
         })),
         initial: 0,
     }));
-    const agentId = String(response.agentId || "").trim();
-    if (!agentId) {
+    const agent_id = String(response.agent_id || "").trim();
+    if (!agent_id) {
         emitCliBlock({
             tone: "info",
             title: "Agent chat cancelled",
         });
         return null;
     }
-    return agentId;
+    return agent_id;
 }
 export async function resolveAgentChatTarget(agentIdInput, sessionOptions) {
-    const agentId = String(agentIdInput || "").trim();
+    const agent_id = String(agentIdInput || "").trim();
     const resolved_session = resolveAgentChatSessionOptions(sessionOptions);
-    const sessionId = resolved_session.success
+    const session_id = resolved_session.success
         ? resolved_session.session_id
         : AGENT_CHAT_DEFAULT_SESSION_ID;
     if (!resolved_session.success) {
         return {
             success: false,
             outcome: {
-                agentId,
-                sessionId,
+                agent_id,
+                session_id,
                 success: false,
                 error: resolved_session.error,
             },
         };
     }
-    if (!agentId) {
+    if (!agent_id) {
         return {
             success: false,
             outcome: {
-                agentId: "",
-                sessionId,
+                agent_id: "",
+                session_id,
                 success: false,
                 error: "Missing target agent id.",
             },
         };
     }
-    const resolved = await resolveProjectRootByAgentId(agentId);
-    if (!resolved.projectRoot) {
+    const resolved = await resolveProjectRootByAgentId(agent_id);
+    if (!resolved.project_root) {
         return {
             success: false,
             outcome: {
-                agentId,
-                sessionId,
+                agent_id,
+                session_id,
                 success: false,
                 error: resolved.error || "Failed to resolve agent project path",
             },
         };
     }
-    const pathError = validateAgentProjectRoot(resolved.projectRoot);
+    const pathError = validateAgentProjectRoot(resolved.project_root);
     if (pathError) {
         return {
             success: false,
             outcome: {
-                agentId,
-                projectRoot: resolved.projectRoot,
-                sessionId,
+                agent_id,
+                project_root: resolved.project_root,
+                session_id,
                 success: false,
                 error: pathError,
             },
         };
     }
-    const registeredAgents = await listRegisteredAgentsForCli();
-    const registeredAgent = registeredAgents.find((item) => item.projectRoot === resolved.projectRoot || item.id === agentId);
+    const registeredAgents = await list_registered_agents_for_cli();
+    const registeredAgent = registeredAgents.find((item) => item.workspace_path === resolved.project_root || item.agent_id === agent_id);
     if (registeredAgent && registeredAgent.status !== "running") {
         return {
             success: false,
             outcome: {
-                agentId,
-                projectRoot: resolved.projectRoot,
-                sessionId,
+                agent_id,
+                project_root: resolved.project_root,
+                session_id,
                 success: false,
                 error: "Agent is not running. Run `city agent start` first.",
             },
@@ -163,9 +163,9 @@ export async function resolveAgentChatTarget(agentIdInput, sessionOptions) {
     return {
         success: true,
         target: {
-            agentId,
-            projectRoot: resolved.projectRoot,
-            sessionId,
+            agent_id,
+            project_root: resolved.project_root,
+            session_id,
             createNewSession: resolved_session.create_new_session,
         },
     };
@@ -189,7 +189,7 @@ export function printAgentChatFailure(params) {
         facts: [
             {
                 label: "agent",
-                value: params.agentId,
+                value: params.agent_id,
             },
             {
                 label: "error",
@@ -206,8 +206,8 @@ export async function resolveInteractiveChatSession(params) {
             error: preselected_session.error,
         };
     }
-    const resolved = await resolveAgentChatTarget(params.agentId, {
-        sessionId: preselected_session.session_id,
+    const resolved = await resolveAgentChatTarget(params.agent_id, {
+        session_id: preselected_session.session_id,
         newSession: false,
     });
     if (!resolved.success) {
@@ -218,7 +218,7 @@ export async function resolveInteractiveChatSession(params) {
     }
     resolved.target.createNewSession = preselected_session.create_new_session;
     const remote_agent = await createRemoteAgent({
-        projectRoot: resolved.target.projectRoot,
+        agent_id: resolved.target.agent_id,
         transport: params.transport,
     });
     if (hasExplicitSessionSelection(params.options)) {
@@ -227,7 +227,7 @@ export async function resolveInteractiveChatSession(params) {
                 remote_agent,
                 session_id: preselected_session.session_id,
             });
-            resolved.target.sessionId = created.session_id;
+            resolved.target.session_id = created.session_id;
             resolved.target.createNewSession = false;
         }
         return {
@@ -241,7 +241,7 @@ export async function resolveInteractiveChatSession(params) {
     // 用户仍可在 TUI 内通过 /session 命令随时切换。
     const latest_session_id = await resolveLatestChatSessionId({ remote_agent });
     if (latest_session_id) {
-        resolved.target.sessionId = latest_session_id;
+        resolved.target.session_id = latest_session_id;
     }
     return {
         success: true,
@@ -253,7 +253,7 @@ export async function resolveInteractiveChatSession(params) {
  * 解析最近活跃的 chat session id。
  *
  * 说明（中文）
- * - 按 `updatedAt` 取最新的会话；缺失 `updatedAt` 视为最旧。
+ * - 按 `updated_at` 取最新的会话；缺失 `updated_at` 视为最旧。
  * - 列表为空时返回 null，由调用方回落到默认 session。
  *
  * @param params.remote_agent 远程 agent 句柄。
@@ -272,11 +272,11 @@ async function resolveLatestChatSessionId(params) {
     }
     let latest = sessions[0];
     for (const candidate of sessions) {
-        if ((candidate.updatedAt ?? 0) > (latest.updatedAt ?? 0)) {
+        if ((candidate.updated_at ?? 0) > (latest.updated_at ?? 0)) {
             latest = candidate;
         }
     }
-    return latest.sessionId;
+    return latest.session_id;
 }
 export async function runSdkPromptTurn(params) {
     const message = normalizeChatMessage(params.message);
@@ -286,30 +286,30 @@ export async function runSdkPromptTurn(params) {
             success: false,
             error: "Chat message is required.",
             emittedVisibleText: false,
-            sessionId: resolved_session.success
+            session_id: resolved_session.success
                 ? resolved_session.session_id
                 : AGENT_CHAT_DEFAULT_SESSION_ID,
             text: "",
         };
     }
-    const resolved = await resolveAgentChatTarget(params.agentId, params.sessionOptions);
+    const resolved = await resolveAgentChatTarget(params.agent_id, params.sessionOptions);
     if (!resolved.success) {
         return {
             success: false,
             error: resolved.outcome.error,
             emittedVisibleText: false,
-            sessionId: resolved.outcome.sessionId,
-            ...(resolved.outcome.projectRoot ? { projectRoot: resolved.outcome.projectRoot } : {}),
+            session_id: resolved.outcome.session_id,
+            ...(resolved.outcome.project_root ? { project_root: resolved.outcome.project_root } : {}),
             text: "",
         };
     }
     const remote_agent = await createRemoteAgent({
-        projectRoot: resolved.target.projectRoot,
+        agent_id: resolved.target.agent_id,
         transport: params.transport,
     });
     const session = await getOrCreateRemoteSession({
         remote_agent,
-        session_id: resolved.target.sessionId,
+        session_id: resolved.target.session_id,
         create_new_session: resolved.target.createNewSession,
     });
     let printed_leading_newline = false;
@@ -371,8 +371,8 @@ export async function runSdkPromptTurn(params) {
             success: result.success,
             ...(result.error ? { error: result.error } : {}),
             emittedVisibleText: emitted_visible_text,
-            sessionId: resolved.target.sessionId,
-            projectRoot: resolved.target.projectRoot,
+            session_id: resolved.target.session_id,
+            project_root: resolved.target.project_root,
             text: final_text,
         };
     }
@@ -388,8 +388,8 @@ export async function runSdkPromptTurn(params) {
             success: false,
             error: error instanceof Error ? error.message : String(error),
             emittedVisibleText: emitted_visible_text,
-            sessionId: resolved.target.sessionId,
-            projectRoot: resolved.target.projectRoot,
+            session_id: resolved.target.session_id,
+            project_root: resolved.target.project_root,
             text: final_text,
         };
     }
@@ -404,32 +404,32 @@ export async function runSdkPromptTurn(params) {
 export async function executeAgentChatTurn(params) {
     const message = normalizeChatMessage(params.message);
     const resolved_session = resolveAgentChatSessionOptions(params.sessionOptions);
-    const sessionId = resolved_session.success
+    const session_id = resolved_session.success
         ? resolved_session.session_id
         : AGENT_CHAT_DEFAULT_SESSION_ID;
     if (!message) {
         return {
-            agentId: String(params.agentId || "").trim(),
-            sessionId,
+            agent_id: String(params.agent_id || "").trim(),
+            session_id,
             success: false,
             error: "Chat message is required.",
         };
     }
     const outcome = await runSdkPromptTurn({
-        agentId: params.agentId,
+        agent_id: params.agent_id,
         message,
         sessionOptions: params.sessionOptions,
         transport: params.transport,
         renderText: false,
     });
     return {
-        agentId: params.agentId,
-        ...(outcome.projectRoot ? { projectRoot: outcome.projectRoot } : {}),
-        sessionId: outcome.sessionId,
+        agent_id: params.agent_id,
+        ...(outcome.project_root ? { project_root: outcome.project_root } : {}),
+        session_id: outcome.session_id,
         success: outcome.success,
         payload: {
             success: outcome.success,
-            sessionId: outcome.sessionId,
+            session_id: outcome.session_id,
             result: {
                 success: outcome.success,
                 userVisible: outcome.text || "",
@@ -443,10 +443,10 @@ export async function executeAgentChatTurn(params) {
 export async function runOneShotChat(params) {
     if (params.options.json === true) {
         const outcome = await executeAgentChatTurn({
-            agentId: params.agentId,
+            agent_id: params.agent_id,
             message: params.message,
             sessionOptions: {
-                sessionId: params.options.sessionId,
+                session_id: params.options.session_id,
                 newSession: params.options.newSession,
             },
             transport: {
@@ -459,9 +459,9 @@ export async function runOneShotChat(params) {
             success: outcome.success,
             title: "agent chat",
             payload: {
-                agent: params.agentId,
-                ...(outcome.projectRoot ? { projectRoot: outcome.projectRoot } : {}),
-                sessionId: outcome.sessionId,
+                agent: params.agent_id,
+                ...(outcome.project_root ? { project_root: outcome.project_root } : {}),
+                session_id: outcome.session_id,
                 ...(outcome.payload?.result ? { result: outcome.payload.result } : {}),
                 ...(outcome.error ? { error: outcome.error } : {}),
             },
@@ -469,10 +469,10 @@ export async function runOneShotChat(params) {
         return;
     }
     const outcome = await runSdkPromptTurn({
-        agentId: params.agentId,
+        agent_id: params.agent_id,
         message: params.message,
         sessionOptions: {
-            sessionId: params.options.sessionId,
+            session_id: params.options.session_id,
             newSession: params.options.newSession,
         },
         transport: {
@@ -482,7 +482,7 @@ export async function runOneShotChat(params) {
     });
     if (!outcome.success) {
         printAgentChatFailure({
-            agentId: params.agentId,
+            agent_id: params.agent_id,
             error: outcome.error,
         });
         return;