@downcity/city 1.1.21 → 1.1.24

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

@@ -8,7 +8,7 @@
  */
 import type { AgentChatCliOptions, AgentChatExecutionOutcome, AgentChatTransportOptions } from "./AgentChatTypes.js";
 /**
- * 向目标 agent 的 Console 主会话发送一轮消息。
+ * 向目标 agent 的 SDK actor session 发送一轮消息。
  */
 export declare function executeAgentChatTurn(params: {
     agentName: string;

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;AAqBH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EAEzB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAiX7B;;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,CAsDrC;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;;;;;;;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"}

package/bin/cli/agent/AgentChat.js

@@ -9,7 +9,6 @@
 import { createInterface } from "node:readline/promises";
 import chalk from "chalk";
 import prompts from "prompts";
-import { callAgentTransport, } from "@downcity/agent";
 import { emitCliBlock } from "../shared/CliReporter.js";
 import { printResult } from "../../utils/cli/CliOutput.js";
 import { resolveProjectRootByAgentName, validateAgentProjectRoot, } from "../service/ServiceCommandSupport.js";
@@ -17,7 +16,7 @@ import { listRegisteredAgentsForCli } from "./AgentSelection.js";
 import { formatCliBearerHeaderValue, resolveCliAuthToken, } from "../../http/auth/CliAuthStateStore.js";
 import { resolveDaemonEndpoint } from "../../process/daemon/Client.js";
 import { AGENT_CHAT_DEFAULT_SESSION_ID } from "./AgentChatTypes.js";
-const AGENT_CHAT_EXECUTE_TIMEOUT_MS = 120_000;
+const SDK_EVENTS_READY_TYPE = "sdk-events-ready";
 function normalizeChatMessage(input) {
     return String(input || "").trim();
 }
@@ -35,13 +34,6 @@ function buildAgentChatFailureText(error) {
     return (String(error || "").trim() ||
         "Agent daemon returned empty error (check config with `city agent status`)");
 }
-function isChatSuccess(payload) {
-    if (!payload || payload.success !== true)
-        return false;
-    if (payload.result?.success === false)
-        return false;
-    return true;
-}
 async function resolveChatTargetAgentName(inputName) {
     const explicit = String(inputName || "").trim();
     if (explicit)
@@ -144,26 +136,6 @@ function printAssistantReply(replyText) {
     }
     console.log(`\n${text}\n`);
 }
-function printQueuedResult(params) {
-    emitCliBlock({
-        tone: "info",
-        title: "Turn queued",
-        facts: [
-            {
-                label: "agent",
-                value: params.agentName,
-            },
-            ...(params.payload.result?.queueItemId
-                ? [
-                    {
-                        label: "queue item",
-                        value: params.payload.result.queueItemId,
-                    },
-                ]
-                : []),
-        ],
-    });
-}
 function printAgentChatFailure(params) {
     emitCliBlock({
         tone: "error",
@@ -180,7 +152,7 @@ function printAgentChatFailure(params) {
         ],
     });
 }
-async function readStreamFailure(response) {
+async function readHttpFailure(response) {
     const contentType = String(response.headers.get("content-type") || "").toLowerCase();
     const text = await response.text().catch(() => "");
     if (contentType.includes("application/json")) {
@@ -195,13 +167,47 @@ async function readStreamFailure(response) {
     }
     return String(text || "").trim() || `HTTP ${response.status}`;
 }
-async function streamAgentChatTurn(params) {
+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)}`);
+    });
+    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 {
+        success: true,
+        turnId,
+    };
+}
+async function runSdkPromptTurn(params) {
     const message = normalizeChatMessage(params.message);
     if (!message) {
         return {
             success: false,
             error: "Chat message is required.",
             emittedVisibleText: false,
+            text: "",
         };
     }
     const resolved = await resolveAgentChatTarget(params.agentName);
@@ -210,9 +216,11 @@ async function streamAgentChatTurn(params) {
             success: false,
             error: resolved.outcome.error,
             emittedVisibleText: false,
+            text: "",
         };
     }
     const { target } = resolved;
+    const abortController = new AbortController();
     const endpoint = resolveDaemonEndpoint({
         projectRoot: target.projectRoot,
         host: params.transport?.host,
@@ -221,23 +229,20 @@ async function streamAgentChatTurn(params) {
     const authHeaderValue = formatCliBearerHeaderValue(resolveCliAuthToken({
         explicitToken: params.transport?.token,
     }));
-    const response = await fetch(new URL(`/api/control/sessions/${encodeURIComponent(target.sessionId)}/stream`, endpoint.baseUrl).toString(), {
-        method: "POST",
+    const response = await fetch(new URL(`/api/sdk/sessions/${encodeURIComponent(target.sessionId)}/events`, endpoint.baseUrl).toString(), {
         headers: {
-            "Content-Type": "application/json",
             ...(authHeaderValue ? { Authorization: authHeaderValue } : {}),
         },
-        body: JSON.stringify({
-            instructions: message,
-        }),
+        signal: abortController.signal,
     }).catch((error) => {
         throw new Error(`Failed to call ${endpoint.baseUrl}: ${String(error)}`);
     });
     if (!response.ok || !response.body) {
         return {
             success: false,
-            error: await readStreamFailure(response),
+            error: await readHttpFailure(response),
             emittedVisibleText: false,
+            text: "",
         };
     }
     const decoder = new TextDecoder();
@@ -245,8 +250,13 @@ async function streamAgentChatTurn(params) {
     let buffered = "";
     let printedLeadingNewline = false;
     let emittedVisibleText = false;
+    let promptTurnId = "";
+    let promptPosted = false;
+    let finalText = "";
     const renderEvent = (event) => {
-        if (event.type !== "text-delta" || !event.text)
+        if (event.type !== "text-delta" || event.turnId !== promptTurnId || !event.text)
+            return;
+        if (params.renderText === false)
             return;
         if (!printedLeadingNewline) {
             process.stdout.write("\n");
@@ -255,6 +265,55 @@ async function streamAgentChatTurn(params) {
         process.stdout.write(event.text);
         emittedVisibleText = 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,
+            };
+        }
+        renderEvent(event);
+        if (event.type === "turn-finish" && event.turnId === promptTurnId) {
+            finalText = event.text;
+            return {
+                done: true,
+                ...(event.success ? {} : { error: event.error || "Agent turn failed" }),
+            };
+        }
+        return { done: false };
+    };
+    const finishTurn = (result) => {
+        if (printedLeadingNewline) {
+            process.stdout.write("\n\n");
+        }
+        return {
+            success: result.success,
+            ...(result.error ? { error: result.error } : {}),
+            emittedVisibleText,
+            text: finalText,
+        };
+    };
     try {
         while (true) {
             const { done, value } = await reader.read();
@@ -266,49 +325,51 @@ async function streamAgentChatTurn(params) {
                 const line = buffered.slice(0, newlineIndex).trim();
                 buffered = buffered.slice(newlineIndex + 1);
                 if (line) {
-                    const event = JSON.parse(line);
-                    if (event.type === "error") {
-                        return {
-                            success: false,
-                            error: event.error,
-                            emittedVisibleText,
-                        };
+                    const result = await handleLine(line);
+                    if (result.done) {
+                        return finishTurn({
+                            success: !result.error,
+                            ...(result.error ? { error: result.error } : {}),
+                        });
                     }
-                    renderEvent(event);
                 }
                 newlineIndex = buffered.indexOf("\n");
             }
         }
         const tail = buffered.trim();
         if (tail) {
-            const event = JSON.parse(tail);
-            if (event.type === "error") {
-                return {
-                    success: false,
-                    error: event.error,
-                    emittedVisibleText,
-                };
+            const result = await handleLine(tail);
+            if (result.done) {
+                return finishTurn({
+                    success: !result.error,
+                    ...(result.error ? { error: result.error } : {}),
+                });
             }
-            renderEvent(event);
         }
     }
     catch (error) {
-        return {
+        return finishTurn({
             success: false,
             error: error instanceof Error ? error.message : String(error),
-            emittedVisibleText,
-        };
+        });
     }
-    if (printedLeadingNewline) {
-        process.stdout.write("\n\n");
+    finally {
+        abortController.abort();
+        await reader.cancel().catch(() => undefined);
+        try {
+            reader.releaseLock();
+        }
+        catch {
+            // ignore
+        }
     }
-    return {
-        success: true,
-        emittedVisibleText,
-    };
+    return finishTurn({
+        success: promptPosted && Boolean(promptTurnId),
+        ...(promptPosted && promptTurnId ? {} : { error: "SDK events connection closed before prompt was accepted." }),
+    });
 }
 /**
- * 向目标 agent 的 Console 主会话发送一轮消息。
+ * 向目标 agent 的 SDK actor session 发送一轮消息。
  */
 export async function executeAgentChatTurn(params) {
     const message = normalizeChatMessage(params.message);
@@ -324,40 +385,28 @@ export async function executeAgentChatTurn(params) {
     const resolved = await resolveAgentChatTarget(params.agentName);
     if (!resolved.success)
         return resolved.outcome;
-    const { target } = resolved;
-    const remote = await callAgentTransport({
-        projectRoot: target.projectRoot,
-        path: `/api/control/sessions/${encodeURIComponent(sessionId)}/execute`,
-        method: "POST",
-        timeoutMs: AGENT_CHAT_EXECUTE_TIMEOUT_MS,
-        host: params.transport?.host,
-        port: params.transport?.port,
-        authToken: params.transport?.token,
-        body: {
-            instructions: message,
-        },
+    const outcome = await runSdkPromptTurn({
+        agentName: params.agentName,
+        message,
+        transport: params.transport,
+        renderText: false,
     });
-    if (!remote.success || !remote.data) {
-        return {
-            agentName: target.agentName,
-            projectRoot: target.projectRoot,
-            sessionId,
-            success: false,
-            error: remote.error || "Agent daemon unreachable or returned empty error (try `city agent restart`)",
-        };
-    }
     return {
-        agentName: target.agentName,
-        projectRoot: target.projectRoot,
-        sessionId: String(remote.data.sessionId || sessionId),
-        success: isChatSuccess(remote.data),
-        payload: remote.data,
-        ...(isChatSuccess(remote.data)
-            ? {}
-            : {
-                error: String(remote.data.result?.error || remote.data.error || "").trim() ||
-                    "Daemon error (check `city agent status` and `city agent doctor`)",
-            }),
+        agentName: params.agentName,
+        ...(resolved.target.projectRoot ? { projectRoot: resolved.target.projectRoot } : {}),
+        sessionId,
+        success: outcome.success,
+        payload: {
+            success: outcome.success,
+            sessionId,
+            result: {
+                success: outcome.success,
+                userVisible: outcome.text || "",
+                ...(outcome.error ? { error: outcome.error } : {}),
+            },
+            ...(outcome.error ? { error: outcome.error } : {}),
+        },
+        ...(outcome.error ? { error: outcome.error } : {}),
     };
 }
 async function runOneShotChat(params) {
@@ -385,7 +434,7 @@ async function runOneShotChat(params) {
         });
         return;
     }
-    const outcome = await streamAgentChatTurn({
+    const outcome = await runSdkPromptTurn({
         agentName: params.agentName,
         message: params.message,
         transport: {
@@ -454,7 +503,7 @@ async function runInteractiveChat(params) {
                 console.log(helpText.join("\n"));
                 continue;
             }
-            const outcome = await streamAgentChatTurn({
+            const outcome = await runSdkPromptTurn({
                 agentName: params.agentName,
                 message: text,
                 transport: {

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

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

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

@@ -27,24 +27,18 @@ export interface AgentChatCliOptions {
     token?: string;
 }
 /**
- * Control execute 结果片段。
+ * SDK prompt 结果片段。
  */
 export interface AgentChatExecuteResult {
     /** 本轮执行是否成功。 */
     success?: boolean;
-    /** 是否已经进入队列。 */
-    queued?: boolean;
-    /** 队列项 ID。 */
-    queueItemId?: string;
-    /** 当前队列位置。 */
-    queuePosition?: number;
     /** 面向用户可直接阅读的回复文本。 */
     userVisible?: string;
     /** 错误信息。 */
     error?: string;
 }
 /**
- * Control execute 响应体。
+ * SDK prompt 响应体。
  */
 export interface AgentChatExecuteResponse {
     /** HTTP 路由层是否成功处理请求。 */

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

@@ -1 +1 @@
-{"version":3,"file":"AgentChatTypes.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChatTypes.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mBAAmB;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kBAAkB;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,gBAAgB;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,wBAAwB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,yBAAyB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY;IACZ,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,cAAc;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,mBAAmB;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;IACnC,gBAAgB;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"AgentChatTypes.d.ts","sourceRoot":"","sources":["../../../src/cli/agent/AgentChatTypes.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,mBAAmB;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kBAAkB;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,gBAAgB;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,wBAAwB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,yBAAyB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY;IACZ,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,cAAc;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,mBAAmB;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;IACnC,gBAAgB;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}

package/bin/cli/shared/Update.d.ts

@@ -1,5 +1,5 @@
 /**
- * `city update`：更新全局 downcity CLI。
+ * `city update`：更新当前全局安装来源对应的 Downcity CLI。
  *
  * 关键点（中文）
  * - 优先根据当前 CLI 所在的全局模块目录，自动判断是 npm 还是 pnpm 安装。
@@ -17,9 +17,10 @@ export interface UpdateCommandOptions {
     manager?: UpdateManager | "auto";
 }
 /**
- * 构造全局更新命令。
+ * 检测当前 CLI 实际安装来源的包名。
  */
-export declare function buildGlobalUpdateInvocation(manager: UpdateManager): {
+export declare function detectInstalledPackageName(): string;
+export declare function buildGlobalUpdateInvocation(manager: UpdateManager, packageName: string): {
     command: string;
     args: string[];
 };

package/bin/cli/shared/Update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Update.d.ts","sourceRoot":"","sources":["../../../src/cli/shared/Update.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;CAClC;AAID;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,aAAa,GAAG;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAYA;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE;IAC1D,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,aAAa,GAAG,IAAI,CAQvB;AA8BD;;GAEG;AACH,wBAAgB,4BAA4B,IAAI,aAAa,CAU5D;AAmBD;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAiDf"}
+{"version":3,"file":"Update.d.ts","sourceRoot":"","sources":["../../../src/cli/shared/Update.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;CAClC;AAgCD;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,GAClB;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAYA;AAED;;GAEG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE;IAC1D,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,aAAa,GAAG,IAAI,CAQvB;AA8BD;;GAEG;AACH,wBAAgB,4BAA4B,IAAI,aAAa,CAQ5D;AAmBD;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAkDf"}

package/bin/cli/shared/Update.js

@@ -1,5 +1,5 @@
 /**
- * `city update`：更新全局 downcity CLI。
+ * `city update`：更新当前全局安装来源对应的 Downcity CLI。
  *
  * 关键点（中文）
  * - 优先根据当前 CLI 所在的全局模块目录，自动判断是 npm 还是 pnpm 安装。
@@ -13,20 +13,50 @@ import { fileURLToPath } from "url";
 import { emitCliBlock } from "./CliReporter.js";
 import { CliError } from "./CliError.js";
 import { runWithSpinner } from "../../utils/cli/Spinner.js";
-const GLOBAL_PACKAGE_NAME = "downcity";
+const FALLBACK_GLOBAL_PACKAGE_NAME = "downcity";
 /**
- * 构造全局更新命令。
+ * 解析当前 CLI 安装包根目录。
+ *
+ * 关键点（中文）
+ * - 开发态路径是 `src/cli/shared`，构建后路径是 `bin/cli/shared`。
+ * - 两种目录结构都可以通过回退三级拿到 package 根目录。
  */
-export function buildGlobalUpdateInvocation(manager) {
+function resolveInstalledPackageRoot() {
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
+    return path.resolve(__dirname, "../../..");
+}
+/**
+ * 读取当前 CLI 实际对应的 npm 包名。
+ */
+function readInstalledPackageName(packageRoot) {
+    try {
+        const packageJsonPath = path.join(packageRoot, "package.json");
+        const raw = fs.readFileSync(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        const packageName = typeof parsed.name === "string" ? parsed.name.trim() : "";
+        return packageName || FALLBACK_GLOBAL_PACKAGE_NAME;
+    }
+    catch {
+        return FALLBACK_GLOBAL_PACKAGE_NAME;
+    }
+}
+/**
+ * 检测当前 CLI 实际安装来源的包名。
+ */
+export function detectInstalledPackageName() {
+    return readInstalledPackageName(resolveInstalledPackageRoot());
+}
+export function buildGlobalUpdateInvocation(manager, packageName) {
     if (manager === "pnpm") {
         return {
             command: "pnpm",
-            args: ["add", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
+            args: ["add", "-g", `${packageName}@latest`],
         };
     }
     return {
         command: "npm",
-        args: ["install", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
+        args: ["install", "-g", `${packageName}@latest`],
     };
 }
 /**
@@ -74,9 +104,7 @@ function readGlobalRoot(manager) {
  * 自动判断当前全局安装使用的包管理器。
  */
 export function detectInstalledUpdateManager() {
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = path.dirname(__filename);
-    const packageRoot = path.resolve(__dirname, "../..");
+    const packageRoot = resolveInstalledPackageRoot();
     const detected = resolveUpdateManagerFromGlobalRoots({
         packageRoot,
         npmRoot: readGlobalRoot("npm") || undefined,
@@ -104,10 +132,11 @@ async function runCommand(command, args) {
  * update 命令入口。
  */
 export async function updateCommand(options = {}) {
+    const packageName = detectInstalledPackageName();
     const manager = options.manager && options.manager !== "auto"
         ? options.manager
         : detectInstalledUpdateManager();
-    const invocation = buildGlobalUpdateInvocation(manager);
+    const invocation = buildGlobalUpdateInvocation(manager, packageName);
     emitCliBlock({
         tone: "accent",
         title: "Updating downcity",
@@ -123,7 +152,7 @@ export async function updateCommand(options = {}) {
         ],
     });
     try {
-        await runWithSpinner(() => runCommand(invocation.command, invocation.args), { text: `Installing ${GLOBAL_PACKAGE_NAME}@latest via ${manager}...` });
+        await runWithSpinner(() => runCommand(invocation.command, invocation.args), { text: `Installing ${packageName}@latest via ${manager}...` });
     }
     catch (error) {
         throw new CliError({
@@ -137,7 +166,7 @@ export async function updateCommand(options = {}) {
         facts: [
             {
                 label: "Package",
-                value: `${GLOBAL_PACKAGE_NAME}@latest`,
+                value: `${packageName}@latest`,
             },
             {
                 label: "Manager",

package/bin/cli/shared/Update.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downcity/city",
-  "version": "1.1.21",
+  "version": "1.1.24",
   "type": "module",
   "description": "Downcity City 平台 — CLI、daemon 管理、Console 网关、能力平台",
   "bin": {
@@ -36,7 +36,7 @@
     "prompts": "^2.4.0",
     "ws": "^8.19.0",
     "zod": "^3.24.0",
-    "@downcity/agent": "^1.1.23"
+    "@downcity/agent": "^1.1.25"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",

package/src/cli/agent/AgentChat.ts

@@ -10,10 +10,7 @@
 import { createInterface } from "node:readline/promises";
 import chalk from "chalk";
 import prompts from "prompts";
-import {
-  callAgentTransport,
-  type AgentUiChunkEvent,
-} from "@downcity/agent";
+import type { AgentSessionEvent } from "@downcity/agent";
 import { emitCliBlock } from "../shared/CliReporter.js";
 import { printResult } from "@/utils/cli/CliOutput.js";
 import {
@@ -34,7 +31,7 @@ import type {
 } from "./AgentChatTypes.js";
 import { AGENT_CHAT_DEFAULT_SESSION_ID } from "./AgentChatTypes.js";
 
-const AGENT_CHAT_EXECUTE_TIMEOUT_MS = 120_000;
+const SDK_EVENTS_READY_TYPE = "sdk-events-ready";
 
 type ResolvedAgentChatTarget = {
   /**
@@ -72,12 +69,6 @@ function buildAgentChatFailureText(error?: string): string {
   );
 }
 
-function isChatSuccess(payload: AgentChatExecuteResponse | undefined): boolean {
-  if (!payload || payload.success !== true) return false;
-  if (payload.result?.success === false) return false;
-  return true;
-}
-
 async function resolveChatTargetAgentName(inputName?: string): Promise<string | null> {
   const explicit = String(inputName || "").trim();
   if (explicit) return explicit;
@@ -201,30 +192,6 @@ function printAssistantReply(replyText: string): void {
   console.log(`\n${text}\n`);
 }
 
-function printQueuedResult(params: {
-  agentName: string;
-  payload: AgentChatExecuteResponse;
-}): void {
-  emitCliBlock({
-    tone: "info",
-    title: "Turn queued",
-    facts: [
-      {
-        label: "agent",
-        value: params.agentName,
-      },
-      ...(params.payload.result?.queueItemId
-        ? [
-          {
-            label: "queue item",
-            value: params.payload.result.queueItemId,
-          },
-        ]
-        : []),
-    ],
-  });
-}
-
 function printAgentChatFailure(params: {
   agentName: string;
   error?: string;
@@ -245,7 +212,7 @@ function printAgentChatFailure(params: {
   });
 }
 
-async function readStreamFailure(response: Response): Promise<string> {
+async function readHttpFailure(response: Response): Promise<string> {
   const contentType = String(response.headers.get("content-type") || "").toLowerCase();
   const text = await response.text().catch(() => "");
   if (contentType.includes("application/json")) {
@@ -265,14 +232,81 @@ async function readStreamFailure(response: Response): Promise<string> {
   return String(text || "").trim() || `HTTP ${response.status}`;
 }
 
-async function streamAgentChatTurn(params: {
+function isSdkEventsReadyFrame(value: unknown): boolean {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "type" in value &&
+    String((value as { type?: unknown }).type || "") === SDK_EVENTS_READY_TYPE
+  );
+}
+
+async function postSdkPrompt(params: {
+  endpointBaseUrl: string;
+  sessionId: string;
+  message: string;
+  authHeaderValue?: string;
+}): Promise<
+  | {
+      success: true;
+      turnId: string;
+    }
+  | {
+      success: false;
+      error: string;
+    }
+> {
+  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)}`);
+  });
+
+  const payload = (await response.json().catch(() => ({}))) as {
+    success?: boolean;
+    error?: string;
+    turn?: {
+      id?: string;
+    };
+  };
+  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 {
+    success: true,
+    turnId,
+  };
+}
+
+async function runSdkPromptTurn(params: {
   agentName: string;
   message: string;
   transport?: AgentChatTransportOptions;
+  renderText?: boolean;
 }): Promise<{
   success: boolean;
   error?: string;
   emittedVisibleText: boolean;
+  text?: string;
 }> {
   const message = normalizeChatMessage(params.message);
   if (!message) {
@@ -280,6 +314,7 @@ async function streamAgentChatTurn(params: {
       success: false,
       error: "Chat message is required.",
       emittedVisibleText: false,
+      text: "",
     };
   }
 
@@ -289,10 +324,12 @@ async function streamAgentChatTurn(params: {
       success: false,
       error: resolved.outcome.error,
       emittedVisibleText: false,
+      text: "",
     };
   }
 
   const { target } = resolved;
+  const abortController = new AbortController();
   const endpoint = resolveDaemonEndpoint({
     projectRoot: target.projectRoot,
     host: params.transport?.host,
@@ -305,18 +342,14 @@ async function streamAgentChatTurn(params: {
   );
   const response = await fetch(
     new URL(
-      `/api/control/sessions/${encodeURIComponent(target.sessionId)}/stream`,
+      `/api/sdk/sessions/${encodeURIComponent(target.sessionId)}/events`,
       endpoint.baseUrl,
     ).toString(),
     {
-      method: "POST",
       headers: {
-        "Content-Type": "application/json",
         ...(authHeaderValue ? { Authorization: authHeaderValue } : {}),
       },
-      body: JSON.stringify({
-        instructions: message,
-      }),
+      signal: abortController.signal,
     },
   ).catch((error) => {
     throw new Error(`Failed to call ${endpoint.baseUrl}: ${String(error)}`);
@@ -325,8 +358,9 @@ async function streamAgentChatTurn(params: {
   if (!response.ok || !response.body) {
     return {
       success: false,
-      error: await readStreamFailure(response),
+      error: await readHttpFailure(response),
       emittedVisibleText: false,
+      text: "",
     };
   }
 
@@ -335,9 +369,13 @@ async function streamAgentChatTurn(params: {
   let buffered = "";
   let printedLeadingNewline = false;
   let emittedVisibleText = false;
+  let promptTurnId = "";
+  let promptPosted = false;
+  let finalText = "";
 
-  const renderEvent = (event: AgentUiChunkEvent): void => {
-    if (event.type !== "text-delta" || !event.text) return;
+  const renderEvent = (event: AgentSessionEvent): void => {
+    if (event.type !== "text-delta" || event.turnId !== promptTurnId || !event.text) return;
+    if (params.renderText === false) return;
     if (!printedLeadingNewline) {
       process.stdout.write("\n");
       printedLeadingNewline = true;
@@ -346,6 +384,74 @@ async function streamAgentChatTurn(params: {
     emittedVisibleText = true;
   };
 
+  const handleLine = async (line: string): Promise<
+    | {
+        done: true;
+        error?: string;
+      }
+    | {
+        done: false;
+      }
+  > => {
+    const value = JSON.parse(line) as unknown;
+    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 as AgentSessionEvent;
+    if (event.type === "error") {
+      return {
+        done: true,
+        error: event.message,
+      };
+    }
+    renderEvent(event);
+    if (event.type === "turn-finish" && event.turnId === promptTurnId) {
+      finalText = event.text;
+      return {
+        done: true,
+        ...(event.success ? {} : { error: event.error || "Agent turn failed" }),
+      };
+    }
+    return { done: false };
+  };
+
+  const finishTurn = (result: {
+    success: boolean;
+    error?: string;
+  }): {
+    success: boolean;
+    error?: string;
+    emittedVisibleText: boolean;
+    text: string;
+  } => {
+    if (printedLeadingNewline) {
+      process.stdout.write("\n\n");
+    }
+    return {
+      success: result.success,
+      ...(result.error ? { error: result.error } : {}),
+      emittedVisibleText,
+      text: finalText,
+    };
+  };
+
   try {
     while (true) {
       const { done, value } = await reader.read();
@@ -356,15 +462,13 @@ async function streamAgentChatTurn(params: {
         const line = buffered.slice(0, newlineIndex).trim();
         buffered = buffered.slice(newlineIndex + 1);
         if (line) {
-          const event = JSON.parse(line) as AgentUiChunkEvent;
-          if (event.type === "error") {
-            return {
-              success: false,
-              error: event.error,
-              emittedVisibleText,
-            };
+          const result = await handleLine(line);
+          if (result.done) {
+            return finishTurn({
+              success: !result.error,
+              ...(result.error ? { error: result.error } : {}),
+            });
           }
-          renderEvent(event);
         }
         newlineIndex = buffered.indexOf("\n");
       }
@@ -372,36 +476,37 @@ async function streamAgentChatTurn(params: {
 
     const tail = buffered.trim();
     if (tail) {
-      const event = JSON.parse(tail) as AgentUiChunkEvent;
-      if (event.type === "error") {
-        return {
-          success: false,
-          error: event.error,
-          emittedVisibleText,
-        };
+      const result = await handleLine(tail);
+      if (result.done) {
+        return finishTurn({
+          success: !result.error,
+          ...(result.error ? { error: result.error } : {}),
+        });
       }
-      renderEvent(event);
     }
   } catch (error) {
-    return {
+    return finishTurn({
       success: false,
       error: error instanceof Error ? error.message : String(error),
-      emittedVisibleText,
-    };
-  }
-
-  if (printedLeadingNewline) {
-    process.stdout.write("\n\n");
+    });
+  } finally {
+    abortController.abort();
+    await reader.cancel().catch(() => undefined);
+    try {
+      reader.releaseLock();
+    } catch {
+      // ignore
+    }
   }
 
-  return {
-    success: true,
-    emittedVisibleText,
-  };
+  return finishTurn({
+    success: promptPosted && Boolean(promptTurnId),
+    ...(promptPosted && promptTurnId ? {} : { error: "SDK events connection closed before prompt was accepted." }),
+  });
 }
 
 /**
- * 向目标 agent 的 Console 主会话发送一轮消息。
+ * 向目标 agent 的 SDK actor session 发送一轮消息。
  */
 export async function executeAgentChatTurn(params: {
   agentName: string;
@@ -423,43 +528,29 @@ export async function executeAgentChatTurn(params: {
   const resolved = await resolveAgentChatTarget(params.agentName);
   if (!resolved.success) return resolved.outcome;
 
-  const { target } = resolved;
-  const remote = await callAgentTransport<AgentChatExecuteResponse>({
-    projectRoot: target.projectRoot,
-    path: `/api/control/sessions/${encodeURIComponent(sessionId)}/execute`,
-    method: "POST",
-    timeoutMs: AGENT_CHAT_EXECUTE_TIMEOUT_MS,
-    host: params.transport?.host,
-    port: params.transport?.port,
-    authToken: params.transport?.token,
-    body: {
-      instructions: message,
-    },
+  const outcome = await runSdkPromptTurn({
+    agentName: params.agentName,
+    message,
+    transport: params.transport,
+    renderText: false,
   });
 
-  if (!remote.success || !remote.data) {
-    return {
-      agentName: target.agentName,
-      projectRoot: target.projectRoot,
-      sessionId,
-      success: false,
-      error: remote.error || "Agent daemon unreachable or returned empty error (try `city agent restart`)",
-    };
-  }
-
   return {
-    agentName: target.agentName,
-    projectRoot: target.projectRoot,
-    sessionId: String(remote.data.sessionId || sessionId),
-    success: isChatSuccess(remote.data),
-    payload: remote.data,
-    ...(isChatSuccess(remote.data)
-      ? {}
-      : {
-        error:
-          String(remote.data.result?.error || remote.data.error || "").trim() ||
-          "Daemon error (check `city agent status` and `city agent doctor`)",
-      }),
+    agentName: params.agentName,
+    ...(resolved.target.projectRoot ? { projectRoot: resolved.target.projectRoot } : {}),
+    sessionId,
+    success: outcome.success,
+    payload: {
+      success: outcome.success,
+      sessionId,
+      result: {
+        success: outcome.success,
+        userVisible: outcome.text || "",
+        ...(outcome.error ? { error: outcome.error } : {}),
+      },
+      ...(outcome.error ? { error: outcome.error } : {}),
+    },
+    ...(outcome.error ? { error: outcome.error } : {}),
   };
 }
 
@@ -493,7 +584,7 @@ async function runOneShotChat(params: {
     return;
   }
 
-  const outcome = await streamAgentChatTurn({
+  const outcome = await runSdkPromptTurn({
     agentName: params.agentName,
     message: params.message,
     transport: {
@@ -568,7 +659,7 @@ async function runInteractiveChat(params: {
         continue;
       }
 
-      const outcome = await streamAgentChatTurn({
+      const outcome = await runSdkPromptTurn({
         agentName: params.agentName,
         message: text,
         transport: {

package/src/cli/agent/AgentChatTypes.ts

@@ -30,17 +30,11 @@ export interface AgentChatCliOptions {
 }
 
 /**
- * Control execute 结果片段。
+ * SDK prompt 结果片段。
  */
 export interface AgentChatExecuteResult {
   /** 本轮执行是否成功。 */
   success?: boolean;
-  /** 是否已经进入队列。 */
-  queued?: boolean;
-  /** 队列项 ID。 */
-  queueItemId?: string;
-  /** 当前队列位置。 */
-  queuePosition?: number;
   /** 面向用户可直接阅读的回复文本。 */
   userVisible?: string;
   /** 错误信息。 */
@@ -48,7 +42,7 @@ export interface AgentChatExecuteResult {
 }
 
 /**
- * Control execute 响应体。
+ * SDK prompt 响应体。
  */
 export interface AgentChatExecuteResponse {
   /** HTTP 路由层是否成功处理请求。 */

package/src/cli/shared/Update.ts

@@ -1,5 +1,5 @@
 /**
- * `city update`：更新全局 downcity CLI。
+ * `city update`：更新当前全局安装来源对应的 Downcity CLI。
  *
  * 关键点（中文）
  * - 优先根据当前 CLI 所在的全局模块目录，自动判断是 npm 还是 pnpm 安装。
@@ -27,25 +27,60 @@ export interface UpdateCommandOptions {
   manager?: UpdateManager | "auto";
 }
 
-const GLOBAL_PACKAGE_NAME = "downcity";
+const FALLBACK_GLOBAL_PACKAGE_NAME = "downcity";
 
 /**
- * 构造全局更新命令。
+ * 解析当前 CLI 安装包根目录。
+ *
+ * 关键点（中文）
+ * - 开发态路径是 `src/cli/shared`，构建后路径是 `bin/cli/shared`。
+ * - 两种目录结构都可以通过回退三级拿到 package 根目录。
+ */
+function resolveInstalledPackageRoot(): string {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = path.dirname(__filename);
+  return path.resolve(__dirname, "../../..");
+}
+
+/**
+ * 读取当前 CLI 实际对应的 npm 包名。
  */
-export function buildGlobalUpdateInvocation(manager: UpdateManager): {
+function readInstalledPackageName(packageRoot: string): string {
+  try {
+    const packageJsonPath = path.join(packageRoot, "package.json");
+    const raw = fs.readFileSync(packageJsonPath, "utf8");
+    const parsed = JSON.parse(raw) as { name?: unknown };
+    const packageName = typeof parsed.name === "string" ? parsed.name.trim() : "";
+    return packageName || FALLBACK_GLOBAL_PACKAGE_NAME;
+  } catch {
+    return FALLBACK_GLOBAL_PACKAGE_NAME;
+  }
+}
+
+/**
+ * 检测当前 CLI 实际安装来源的包名。
+ */
+export function detectInstalledPackageName(): string {
+  return readInstalledPackageName(resolveInstalledPackageRoot());
+}
+
+export function buildGlobalUpdateInvocation(
+  manager: UpdateManager,
+  packageName: string,
+): {
   command: string;
   args: string[];
 } {
   if (manager === "pnpm") {
     return {
       command: "pnpm",
-      args: ["add", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
+      args: ["add", "-g", `${packageName}@latest`],
     };
   }
 
   return {
     command: "npm",
-    args: ["install", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
+    args: ["install", "-g", `${packageName}@latest`],
   };
 }
 
@@ -98,9 +133,7 @@ function readGlobalRoot(manager: UpdateManager): string | null {
  * 自动判断当前全局安装使用的包管理器。
  */
 export function detectInstalledUpdateManager(): UpdateManager {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-  const packageRoot = path.resolve(__dirname, "../..");
+  const packageRoot = resolveInstalledPackageRoot();
   const detected = resolveUpdateManagerFromGlobalRoots({
     packageRoot,
     npmRoot: readGlobalRoot("npm") || undefined,
@@ -132,11 +165,12 @@ async function runCommand(command: string, args: string[]): Promise<void> {
 export async function updateCommand(
   options: UpdateCommandOptions = {},
 ): Promise<void> {
+  const packageName = detectInstalledPackageName();
   const manager =
     options.manager && options.manager !== "auto"
       ? options.manager
       : detectInstalledUpdateManager();
-  const invocation = buildGlobalUpdateInvocation(manager);
+  const invocation = buildGlobalUpdateInvocation(manager, packageName);
 
   emitCliBlock({
     tone: "accent",
@@ -156,7 +190,7 @@ export async function updateCommand(
   try {
     await runWithSpinner(
       () => runCommand(invocation.command, invocation.args),
-      { text: `Installing ${GLOBAL_PACKAGE_NAME}@latest via ${manager}...` },
+      { text: `Installing ${packageName}@latest via ${manager}...` },
     );
   } catch (error) {
     throw new CliError({
@@ -171,7 +205,7 @@ export async function updateCommand(
     facts: [
       {
         label: "Package",
-        value: `${GLOBAL_PACKAGE_NAME}@latest`,
+        value: `${packageName}@latest`,
       },
       {
         label: "Manager",