downcity 1.1.126 → 1.1.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "downcity",
-  "version": "1.1.126",
+  "version": "1.1.127",
   "type": "module",
   "description": "Downcity CLI bundle — installs city and town commands",
   "bin": {
@@ -45,8 +45,8 @@
     "ws": "^8.21.0",
     "zod": "^4.4.3",
     "@downcity/agent": "^1.1.100",
-    "@downcity/city": "^0.2.56",
-    "@downcity/plugins": "^1.0.51"
+    "@downcity/plugins": "^1.0.51",
+    "@downcity/city": "^0.2.56"
   },
   "scripts": {
     "build": "node scripts/copy-cli-products.mjs && node scripts/ensure-cli-executable.mjs",

package/town/command/CityCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CityCommand.d.ts","sourceRoot":"","sources":["../../src/command/CityCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkFpE"}
+{"version":3,"file":"CityCommand.d.ts","sourceRoot":"","sources":["../../src/command/CityCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAezC;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0FpE"}

package/town/command/CityCommand.js

@@ -7,7 +7,8 @@
  * - `city` CLI 只负责 admin/base 管理，`town city` 只负责 user login。
  */
 import { parseBoolean } from "../shared/IndexSupport.js";
-import { DEFAULT_TOWN_ID, emitCityConnectionStatus, emitCityServerList, runCityConnectCommand, runCityDisconnectCommand, runCityLoginCommand, runCityLogoutCommand, runCityUseCommand, runInteractiveCityManager, } from "../shared/CityConnection.js";
+import { DEFAULT_TOWN_ID } from "../shared/CityStateStore.js";
+import { emitCityConnectionStatus, emitCityUserWhoami, emitCityServerList, runCityConnectCommand, runCityDisconnectCommand, runCityLoginCommand, runCityLogoutCommand, runCityUseCommand, runInteractiveCityManager, } from "../shared/CityConnection.js";
 /**
  * 注册 `town city` 命令组。
  */
@@ -37,6 +38,13 @@ export function registerCityConnectionCommand(program) {
         .action((options) => {
         emitCityServerList({ as_json: options.json === true });
     });
+    city
+        .command("whoami")
+        .description("查看 Town 当前实际使用的 City user")
+        .option("--json [enabled]", "以 JSON 输出", parseBoolean)
+        .action(async (options) => {
+        await emitCityUserWhoami({ as_json: options.json === true });
+    });
     city
         .command("connect [url]")
         .description("手动添加并选择一个 City base（默认 base.downcity.ai）")

package/town/command/CityCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"CityCommand.js","sourceRoot":"","sources":["../../src/command/CityCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAAgB;IAC5D,MAAM,IAAI,GAAG,OAAO;SACjB,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,4BAA4B,CAAC;SACzC,UAAU,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SAChD,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,MAAM,yBAAyB,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,wBAAwB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,0CAA0C,CAAC;SACvD,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,GAAuB,EAAE,OAA2B,EAAE,EAAE;QACrE,MAAM,qBAAqB,CAAC;YAC1B,GAAG;YACH,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,iDAAiD,CAAC;SAC9D,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,MAA0B,EAAE,OAA2B,EAAE,EAAE;QACxE,MAAM,iBAAiB,CAAC;YACtB,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,4BAA4B,CAAC;SACzC,MAAM,CAAC,oBAAoB,EAAE,cAAc,EAAE,eAAe,CAAC;SAC7D,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,KAAK,EACX,GAAuB,EACvB,OAA4C,EAC5C,EAAE;QACF,MAAM,mBAAmB,CAAC;YACxB,GAAG;YACH,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,oCAAoC,CAAC;SACjD,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,oBAAoB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,YAAY,CAAC;SACrB,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE;QACtC,wBAAwB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"CityCommand.js","sourceRoot":"","sources":["../../src/command/CityCommand.ts"],"names":[],"mappings":"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"}

package/town/shared/CityBalance.d.ts

@@ -7,19 +7,18 @@
  * - 交互菜单只调用这里的高层函数，避免 CityConnection 模块继续膨胀。
  */
 import type { TownCityBalanceAccount, TownCityRechargeInput, TownCityRechargeResult } from "../types/TownCityBalance.js";
-import type { TownCityUserSession } from "../types/TownCitySession.js";
 /**
  * 读取当前 Town City user 的余额。
  */
-export declare function readCurrentTownCityBalance(session: TownCityUserSession | null): Promise<TownCityBalanceAccount | null>;
+export declare function readCurrentTownCityBalance(): Promise<TownCityBalanceAccount>;
 /**
  * 给当前 Town City user 发起充值。
  */
-export declare function rechargeCurrentTownCityUser(session: TownCityUserSession | null, input: TownCityRechargeInput): Promise<TownCityRechargeResult | null>;
+export declare function rechargeCurrentTownCityUser(input: TownCityRechargeInput): Promise<TownCityRechargeResult>;
 /**
  * 输出当前 user 余额。
  */
-export declare function emitCurrentTownCityBalance(session: TownCityUserSession | null): Promise<void>;
+export declare function emitCurrentTownCityBalance(): Promise<void>;
 /**
  * 输出当前 user 充值结果。
  */

package/town/shared/CityBalance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CityBalance.d.ts","sourceRoot":"","sources":["../../src/shared/CityBalance.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,sBAAsB,EAGtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAgBvE;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAClC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAQxC;AAED;;GAEG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,mBAAmB,GAAG,IAAI,EACnC,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CA8BxC;AAwCD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAClC,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAoB/E"}
+{"version":3,"file":"CityBalance.d.ts","sourceRoot":"","sources":["../../src/shared/CityBalance.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,sBAAsB,EAGtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AAKrC;;GAEG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAKlF;AAED;;GAEG;AACH,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,sBAAsB,CAAC,CA0BjC;AAmBD;;GAEG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAchE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAoB/E"}

package/town/shared/CityBalance.js

@@ -7,31 +7,24 @@
  * - 交互菜单只调用这里的高层函数，避免 CityConnection 模块继续膨胀。
  */
 import { spawnSync } from "node:child_process";
-import { City } from "@downcity/city";
 import { emitCliBlock } from "./CliReporter.js";
+import { CityUserManager } from "./CityUserManager.js";
 const DEFAULT_PAYMENT_METHOD_ID = "stripe";
+const cityUserManager = new CityUserManager();
 /**
  * 读取当前 Town City user 的余额。
  */
-export async function readCurrentTownCityBalance(session) {
-    const client = createCurrentUserCityClient(session);
-    if (!client)
-        return null;
-    const current_user_id = await readCurrentTokenUserId(client);
-    assertSessionUserMatchesToken(session, current_user_id);
+export async function readCurrentTownCityBalance() {
+    const { user, client } = await cityUserManager.createUserClient();
     const account = await client.service("balance").get("me");
-    assertBalanceUserMatchesToken(account, current_user_id);
+    assertBalanceUserMatchesToken(account, user.user_id);
     return account;
 }
 /**
  * 给当前 Town City user 发起充值。
  */
-export async function rechargeCurrentTownCityUser(session, input) {
-    const client = createCurrentUserCityClient(session);
-    if (!client)
-        return null;
-    const current_user_id = await readCurrentTokenUserId(client);
-    assertSessionUserMatchesToken(session, current_user_id);
+export async function rechargeCurrentTownCityUser(input) {
+    const { client } = await cityUserManager.createUserClient();
     const amount = normalizePositiveInteger(input.amount, "amount");
     const method_id = normalizeText(input.method_id) || DEFAULT_PAYMENT_METHOD_ID;
     const topup = await client.service("balance").action("topups/create").invoke({
@@ -56,26 +49,10 @@ export async function rechargeCurrentTownCityUser(session, input) {
         opened,
     };
 }
-async function readCurrentTokenUserId(client) {
-    const result = await client.service("accounts").get("me");
-    const user_id = normalizeText(result.user?.user_id);
-    if (!user_id) {
-        throw new Error("City user token resolved without a user_id. Please run `town city login` again.");
-    }
-    return user_id;
-}
-function assertSessionUserMatchesToken(session, token_user_id) {
-    const session_user_id = normalizeText(session?.user_id);
-    if (session_user_id && session_user_id !== token_user_id) {
-        throw new Error([
-            "Town City session user does not match the authenticated token.",
-            `session=${session_user_id}`,
-            `token=${token_user_id}`,
-            "Run `town city logout` and then `town city login`.",
-        ].join(" "));
-    }
-}
 function assertBalanceUserMatchesToken(account, token_user_id) {
+    if (!token_user_id) {
+        throw new Error("City user token resolved without a user_id. Run `town city login` again.");
+    }
     if (account.user_id !== token_user_id) {
         throw new Error([
             "Balance account user does not match the authenticated token.",
@@ -88,10 +65,8 @@ function assertBalanceUserMatchesToken(account, token_user_id) {
 /**
  * 输出当前 user 余额。
  */
-export async function emitCurrentTownCityBalance(session) {
-    const account = await readCurrentTownCityBalance(session);
-    if (!account)
-        return;
+export async function emitCurrentTownCityBalance() {
+    const account = await readCurrentTownCityBalance();
     emitCliBlock({
         tone: "success",
         title: "User balance",
@@ -128,22 +103,6 @@ export function emitTownCityRechargeResult(result) {
             : "Checkout URL was not returned by the payment service.",
     });
 }
-function createCurrentUserCityClient(session) {
-    if (!session) {
-        emitCliBlock({
-            tone: "warning",
-            title: "City user not signed in",
-            note: "Run `town city login` first, or choose User 登录 in this manager.",
-        });
-        return null;
-    }
-    return new City({
-        role: "user",
-        city_url: session.base_url,
-        town_id: session.town_id,
-        user_token: session.user_token,
-    });
-}
 function normalizePositiveInteger(value, label) {
     const amount = typeof value === "number" ? value : Number(value);
     if (!Number.isInteger(amount) || amount <= 0) {

package/town/shared/CityBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"CityBalance.js","sourceRoot":"","sources":["../../src/shared/CityBalance.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAUhD,MAAM,yBAAyB,GAAG,QAAQ,CAAC;AAc3C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAmC;IAEnC,MAAM,MAAM,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC7D,6BAA6B,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAyB,IAAI,CAAC,CAAC;IAClF,6BAA6B,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACxD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAmC,EACnC,KAA4B;IAE5B,MAAM,MAAM,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC7D,6BAA6B,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,yBAAyB,CAAC;IAC9E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAuB;QACjG,MAAM;QACN,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,oBAAoB;QACvD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC;QAC7B,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU;YAClB,SAAS;SACV;KACF,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAyB;QACrF,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,KAAK,KAAK,CAAC;IAClD,MAAM,MAAM,GAAG,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE/E,OAAO;QACL,KAAK;QACL,QAAQ;QACR,SAAS;QACT,MAAM;KACP,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAAoB;IACxD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAA2B,IAAI,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,6BAA6B,CACpC,OAAmC,EACnC,aAAqB;IAErB,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,eAAe,IAAI,eAAe,KAAK,aAAa,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC;YACd,gEAAgE;YAChE,WAAW,eAAe,EAAE;YAC5B,SAAS,aAAa,EAAE;YACxB,oDAAoD;SACrD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CACpC,OAA+B,EAC/B,aAAqB;IAErB,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC;YACd,8DAA8D;YAC9D,WAAW,OAAO,CAAC,OAAO,EAAE;YAC5B,SAAS,aAAa,EAAE;YACxB,oDAAoD;SACrD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAmC;IAEnC,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,YAAY,CAAC;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,cAAc;QACrB,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QAC7C,KAAK,EAAE;YACL,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE;YACzC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACpD,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE;YACtC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE;SAChD;KACF,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,MAA8B;IACvE,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjE,YAAY,CAAC;QACX,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAC1C,KAAK,EAAE,eAAe;QACtB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;QAC5B,KAAK,EAAE;YACL,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE;YACzE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE;YAChD,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YAC5C,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU;gBAC5B,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnE,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE;SACrE;QACD,IAAI,EAAE,YAAY;YAChB,CAAC,CAAC,oDAAoD;YACtD,CAAC,CAAC,uDAAuD;KAC5D,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAmC;IACtE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,YAAY,CAAC;YACX,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,yBAAyB;YAChC,IAAI,EAAE,iEAAiE;SACxE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,IAAI,CAAC;QACd,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc,EAAE,KAAa;IAC7D,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,SAAS,CAAC,GAAG,KAAK,6BAA6B,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAC3C,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC5B,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,UAAU,CAAC;IACjB,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;QACvC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC;QAC1B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE;YACtC,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"CityBalance.js","sourceRoot":"","sources":["../../src/shared/CityBalance.ts"],"names":[],"mappings":"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"}

package/town/shared/CityConnection.d.ts

@@ -8,21 +8,14 @@
  * - CLI 命令装配统一放在 `src/command/CityCommand.ts`，本模块只保留状态与登录流程。
  */
 import type { TownCityConnectionState } from "../types/TownCityConnection.js";
-import type { TownCityUserSession } from "../types/TownCitySession.js";
-export declare const DEFAULT_CITY_URL = "https://base.downcity.ai";
-export declare const DEFAULT_TOWN_ID = "town_downcity";
-export declare function normalizeCityUrl(value: string): string;
 export declare function readTownCityAdminSecretForBase(city_url: string): string | undefined;
-export declare function readCurrentTownCitySession(): TownCityUserSession | null;
-export declare function readTownCityUserSessionForRuntime(): {
-    city_url: string;
-    town_id: string;
-    user_token: string;
-} | null;
 export declare function readTownCityConnectionState(): TownCityConnectionState;
 export declare function emitCityConnectionStatus(options?: {
     as_json?: boolean;
 }): void;
+export declare function emitCityUserWhoami(options?: {
+    as_json?: boolean;
+}): Promise<void>;
 export declare function emitCityServerList(options?: {
     as_json?: boolean;
 }): void;

package/town/shared/CityConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CityConnection.d.ts","sourceRoot":"","sources":["../../src/shared/CityConnection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAOvE,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAC3D,eAAO,MAAM,eAAe,kBAAkB,CAAC;AAqB/C,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAatD;AAsHD,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnF;AAkGD,wBAAgB,0BAA0B,IAAI,mBAAmB,GAAG,IAAI,CAIvE;AAED,wBAAgB,iCAAiC,IAAI;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,IAAI,CAUP;AAED,wBAAgB,2BAA2B,IAAI,uBAAuB,CA0BrE;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA8B9E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+BxE;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BhB;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAiBD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiB1E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqB9E;AA6DD,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkD/D"}
+{"version":3,"file":"CityConnection.d.ts","sourceRoot":"","sources":["../../src/shared/CityConnection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,gCAAgC,CAAC;AAqBxC,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnF;AAcD,wBAAgB,2BAA2B,IAAI,uBAAuB,CA0BrE;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA8B9E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDvF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+BxE;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BhB;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAiBD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiB1E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqB9E;AAkED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAsD/D"}

package/town/shared/CityConnection.js

@@ -7,230 +7,20 @@
  * - Town 可以只读发现 `city` CLI 已配置的 base 地址，但不依赖 city 内部模块。
  * - CLI 命令装配统一放在 `src/command/CityCommand.ts`，本模块只保留状态与登录流程。
  */
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import prompts from "prompts";
-import { PlatformStore } from "../town/store/index.js";
 import { emitCliBlock, emitCliList } from "./CliReporter.js";
 import { printResult } from "../utils/cli/CliOutput.js";
 import { performTownCityUserLogin } from "./CityUserLogin.js";
 import { emitCurrentTownCityBalance, emitTownCityRechargeResult, rechargeCurrentTownCityUser, } from "./CityBalance.js";
-export const DEFAULT_CITY_URL = "https://base.downcity.ai";
-export const DEFAULT_TOWN_ID = "town_downcity";
-const CITY_CONFIG_PATH = path.join(os.homedir(), ".downcity", "config.json");
-const TOWN_CITY_STATE_KEY = "town.city.state";
+import { CityUserManager } from "./CityUserManager.js";
+import { DEFAULT_CITY_URL, DEFAULT_TOWN_ID, listTownCityServers, normalizeCityUrl, readCityAdminSecretForUrl, readCityString, readCurrentTownCitySession, readTownCityState, resolveSelectedBaseUrl, upsertTownProfile, writeTownCityState, } from "./CityStateStore.js";
+const cityUserManager = new CityUserManager();
 function readString(value) {
-    return typeof value === "string" ? value.trim() : "";
-}
-function defaultProtocol(value) {
-    const host = value.split("/")[0] ?? "";
-    const clean_host = host.split(":")[0] ?? "";
-    if (clean_host === "localhost" ||
-        clean_host.includes(":") ||
-        clean_host.split(".").length === 4) {
-        return "http";
-    }
-    return "https";
-}
-export function normalizeCityUrl(value) {
-    const raw = String(value || "").trim();
-    if (!raw)
-        return "";
-    const has_protocol = /^[a-z][a-z\d+.-]*:\/\//iu.test(raw);
-    const with_protocol = has_protocol ? raw : `${defaultProtocol(raw)}://${raw}`;
-    const url = new URL(with_protocol);
-    if (!url.port &&
-        (url.hostname === "localhost" || /^\d+\.\d+\.\d+\.\d+$/u.test(url.hostname))) {
-        url.port = "43127";
-    }
-    return url.toString().replace(/\/+$/, "");
-}
-function deriveServerName(city_url) {
-    try {
-        return new URL(city_url).hostname || city_url;
-    }
-    catch {
-        return city_url;
-    }
-}
-function readJsonFile(file_path) {
-    try {
-        return JSON.parse(fs.readFileSync(file_path, "utf8"));
-    }
-    catch {
-        return null;
-    }
-}
-function normalizeLocalState(value) {
-    const selected_base_url = normalizeCityUrl(readString(value?.selected_base_url));
-    const profiles = [];
-    for (const item of Array.isArray(value?.profiles) ? value.profiles : []) {
-        const base_url = normalizeCityUrl(readString(item.base_url));
-        if (!base_url || profiles.some((profile) => profile.base_url === base_url))
-            continue;
-        profiles.push({
-            name: readString(item.name) || deriveServerName(base_url),
-            base_url,
-        });
-    }
-    const sessions = {};
-    const input_sessions = value?.sessions && typeof value.sessions === "object"
-        ? value.sessions
-        : {};
-    for (const [key, session] of Object.entries(input_sessions)) {
-        const base_url = normalizeCityUrl(readString(session?.base_url) || key);
-        const user_token = readString(session?.user_token);
-        if (!base_url || !user_token)
-            continue;
-        sessions[base_url] = {
-            base_url,
-            town_id: readString(session?.town_id) || DEFAULT_TOWN_ID,
-            user_id: readString(session?.user_id) || undefined,
-            user_label: readString(session?.user_label) || undefined,
-            user_token,
-            updated_at: readString(session?.updated_at) || new Date().toISOString(),
-        };
-    }
-    return {
-        selected_base_url: selected_base_url || undefined,
-        profiles,
-        sessions,
-    };
-}
-function readTownCityState() {
-    const store = new PlatformStore();
-    try {
-        return normalizeLocalState(store.getSecureSettingJsonSync(TOWN_CITY_STATE_KEY));
-    }
-    finally {
-        store.close();
-    }
-}
-function writeTownCityState(state) {
-    const store = new PlatformStore();
-    try {
-        store.setSecureSettingJsonSync(TOWN_CITY_STATE_KEY, normalizeLocalState(state));
-    }
-    finally {
-        store.close();
-    }
-}
-function readCityAdminConfig() {
-    return readJsonFile(CITY_CONFIG_PATH) ?? {};
-}
-function readCityAdminServers() {
-    const raw = readCityAdminConfig();
-    const servers = Array.isArray(raw.servers) ? raw.servers : [];
-    const active_url = normalizeCityUrl(readString(raw.active_server_url));
-    const out = [];
-    const state = readTownCityState();
-    const selected_base_url = resolveSelectedBaseUrl(state);
-    for (const item of servers) {
-        const base_url = normalizeCityUrl(readString(item.base_url) || readString(item.url));
-        if (!base_url || out.some((server) => server.base_url === base_url))
-            continue;
-        const session = state.sessions?.[base_url];
-        out.push({
-            name: readString(item.name) || deriveServerName(base_url),
-            base_url,
-            selected: base_url === selected_base_url,
-            source: "city-admin",
-            has_admin_secret_key: Boolean(readString(item.admin_secret_key)),
-            has_user_session: Boolean(session?.user_token),
-            town_id: session?.town_id,
-            user_id: session?.user_id,
-        });
-    }
-    return out.sort((left, right) => Number(right.base_url === active_url) - Number(left.base_url === active_url)
-        || left.name.localeCompare(right.name)
-        || left.base_url.localeCompare(right.base_url));
-}
-function readCityAdminSecretForUrl(city_url) {
-    const target_url = normalizeCityUrl(city_url);
-    const raw = readCityAdminConfig();
-    const servers = Array.isArray(raw.servers) ? raw.servers : [];
-    const matched = servers.find((item) => normalizeCityUrl(readString(item.base_url) || readString(item.url)) === target_url);
-    return readString(matched?.admin_secret_key) || undefined;
+    return readCityString(value);
 }
 export function readTownCityAdminSecretForBase(city_url) {
     return readCityAdminSecretForUrl(city_url);
 }
-function resolveSelectedBaseUrl(state = readTownCityState()) {
-    return normalizeCityUrl(readString(state.selected_base_url)) || DEFAULT_CITY_URL;
-}
-function upsertTownProfile(state, input) {
-    const base_url = normalizeCityUrl(input.base_url);
-    if (!base_url)
-        return state;
-    const profiles = [...(state.profiles ?? [])];
-    const index = profiles.findIndex((item) => item.base_url === base_url);
-    const profile = {
-        name: readString(input.name) || deriveServerName(base_url),
-        base_url,
-    };
-    if (index >= 0)
-        profiles[index] = profile;
-    else
-        profiles.push(profile);
-    return {
-        ...state,
-        selected_base_url: base_url,
-        profiles,
-    };
-}
-function listTownCityServers() {
-    const state = readTownCityState();
-    const selected_base_url = resolveSelectedBaseUrl(state);
-    const admin_servers = readCityAdminServers();
-    const by_url = new Map();
-    const append = (profile) => {
-        const existing = by_url.get(profile.base_url);
-        if (!existing) {
-            by_url.set(profile.base_url, profile);
-            return;
-        }
-        by_url.set(profile.base_url, {
-            ...existing,
-            selected: existing.selected || profile.selected,
-            source: existing.source === "town" ? "town" : profile.source,
-            has_admin_secret_key: existing.has_admin_secret_key || profile.has_admin_secret_key,
-            has_user_session: existing.has_user_session || profile.has_user_session,
-            town_id: existing.town_id || profile.town_id,
-            user_id: existing.user_id || profile.user_id,
-        });
-    };
-    for (const profile of state.profiles ?? []) {
-        const session = state.sessions?.[profile.base_url];
-        append({
-            name: profile.name,
-            base_url: profile.base_url,
-            selected: profile.base_url === selected_base_url,
-            source: "town",
-            has_admin_secret_key: Boolean(readCityAdminSecretForUrl(profile.base_url)),
-            has_user_session: Boolean(session?.user_token),
-            town_id: session?.town_id,
-            user_id: session?.user_id,
-        });
-    }
-    for (const server of admin_servers)
-        append(server);
-    const default_session = state.sessions?.[DEFAULT_CITY_URL];
-    append({
-        name: "Downcity Base",
-        base_url: DEFAULT_CITY_URL,
-        selected: DEFAULT_CITY_URL === selected_base_url,
-        source: "default",
-        has_admin_secret_key: Boolean(readCityAdminSecretForUrl(DEFAULT_CITY_URL)),
-        has_user_session: Boolean(default_session?.user_token),
-        town_id: default_session?.town_id,
-        user_id: default_session?.user_id,
-    });
-    return [...by_url.values()].sort((left, right) => Number(right.selected) - Number(left.selected)
-        || Number(right.source === "default") - Number(left.source === "default")
-        || left.name.localeCompare(right.name)
-        || left.base_url.localeCompare(right.base_url));
-}
 function findCityServer(input) {
     const query = String(input || "").trim();
     const servers = listTownCityServers();
@@ -241,23 +31,6 @@ function findCityServer(input) {
         server.base_url === normalized_query_url ||
         server.base_url === query) ?? null;
 }
-export function readCurrentTownCitySession() {
-    const state = readTownCityState();
-    const base_url = resolveSelectedBaseUrl(state);
-    return state.sessions?.[base_url] ?? null;
-}
-export function readTownCityUserSessionForRuntime() {
-    const state = readTownCityState();
-    const city_url = resolveSelectedBaseUrl(state);
-    const session = state.sessions?.[city_url] ?? null;
-    if (!session?.user_token)
-        return null;
-    return {
-        city_url,
-        town_id: session.town_id || DEFAULT_TOWN_ID,
-        user_token: session.user_token,
-    };
-}
 export function readTownCityConnectionState() {
     const state = readTownCityState();
     const city_url = resolveSelectedBaseUrl(state);
@@ -314,6 +87,62 @@ export function emitCityConnectionStatus(options) {
             : "Run `town city login` to sign in as a City user.",
     });
 }
+export async function emitCityUserWhoami(options) {
+    try {
+        const user = await cityUserManager.resolveCurrentUser();
+        if (options?.as_json === true) {
+            printResult({
+                asJson: true,
+                success: true,
+                title: "city user",
+                payload: {
+                    city_url: user.city_url,
+                    town_id: user.town_id,
+                    user_id: user.user_id,
+                    user_label: user.user_label,
+                    source: user.source,
+                    env_overrides: user.env_overrides,
+                    warnings: user.warnings,
+                },
+            });
+            return;
+        }
+        emitCliBlock({
+            tone: "success",
+            title: "City user",
+            summary: user.source,
+            facts: [
+                { label: "url", value: user.city_url },
+                { label: "town", value: user.town_id },
+                { label: "user", value: user.user_id || "unknown" },
+                ...(user.user_label ? [{ label: "label", value: user.user_label }] : []),
+                { label: "source", value: user.source },
+                { label: "env url", value: user.env_overrides.city_url ? "yes" : "no" },
+                { label: "env town", value: user.env_overrides.town_id ? "yes" : "no" },
+                { label: "env token", value: user.env_overrides.user_token ? "yes" : "no" },
+            ],
+            note: user.warnings.join(" ") || undefined,
+        });
+    }
+    catch (error) {
+        if (options?.as_json === true) {
+            printResult({
+                asJson: true,
+                success: false,
+                title: "city user",
+                payload: {
+                    error: error instanceof Error ? error.message : String(error),
+                },
+            });
+            return;
+        }
+        emitCliBlock({
+            tone: "error",
+            title: "City user unavailable",
+            note: error instanceof Error ? error.message : String(error),
+        });
+    }
+}
 export function emitCityServerList(options) {
     const servers = listTownCityServers();
     if (options?.as_json === true) {
@@ -518,6 +347,11 @@ async function promptCityManagerAction() {
                 description: state.has_user_token ? "重新登录当前 base" : "登录当前 base",
                 value: "login",
             },
+            {
+                title: "查看当前 User",
+                description: "显示 Town 当前实际使用的 City user",
+                value: "whoami",
+            },
             {
                 title: "查看 User 余额",
                 description: state.has_user_token ? "读取当前登录 user 的余额" : "需要先登录 user",
@@ -582,14 +416,18 @@ export async function runInteractiveCityManager() {
             await runCityLoginCommand({});
             continue;
         }
+        if (action === "whoami") {
+            await emitCityUserWhoami();
+            continue;
+        }
         if (action === "balance") {
-            await emitCurrentTownCityBalance(readCurrentTownCitySession());
+            await emitCurrentTownCityBalance();
             continue;
         }
         if (action === "recharge") {
             const input = await promptRechargeInput();
             if (input) {
-                const result = await rechargeCurrentTownCityUser(readCurrentTownCitySession(), input);
+                const result = await rechargeCurrentTownCityUser(input);
                 if (result)
                     emitTownCityRechargeResult(result);
             }