downcity 1.1.89 → 1.1.90

package/city/admin/commands/config.d.ts

@@ -2,7 +2,7 @@
  * 旧的 Admin Server URL 命令兼容壳。
  *
  * 关键说明（中文）
- * - 新交互下，server 管理已经提升到顶层 Manage Servers
+ * - 新交互下，server 管理已经提升到当前 City 的 server management
  * - 这里保留空壳是为了避免历史导入直接报错
  */
 import { type AdminSession } from "../../core/session.js";

package/city/admin/commands/config.js

@@ -2,7 +2,7 @@
  * 旧的 Admin Server URL 命令兼容壳。
  *
  * 关键说明（中文）
- * - 新交互下，server 管理已经提升到顶层 Manage Servers
+ * - 新交互下，server 管理已经提升到当前 City 的 server management
  * - 这里保留空壳是为了避免历史导入直接报错
  */
 export async function changeServerUrl(_session) {

package/city/admin/loop.d.ts

@@ -1,6 +1,12 @@
 /**
- * Admin 命令循环。返回 "logout" | "quit" | "switch_identity"。
+ * Admin 命令循环。
+ *
+ * 关键说明（中文）
+ * - embedded 模式用于 user 工作区下的 server management
+ * - 此时 admin 只作为低频管理工具，不再承担顶层导航职责
  */
 import { type AdminSession } from "../core/session.js";
-export declare function adminLoop(session: AdminSession): Promise<"logout" | "quit" | "switch_identity">;
+export declare function adminLoop(session: AdminSession, options?: {
+    embedded?: boolean;
+}): Promise<"logout" | "quit" | "switch_identity" | "back">;
 //# sourceMappingURL=loop.d.ts.map

package/city/admin/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/admin/loop.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAyBvD,wBAAsB,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,GAAG,MAAM,GAAG,iBAAiB,CAAC,CAyCrG"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/admin/loop.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAyBvD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/B,OAAO,CAAC,QAAQ,GAAG,MAAM,GAAG,iBAAiB,GAAG,MAAM,CAAC,CA+CzD"}

package/city/admin/loop.js

@@ -1,5 +1,9 @@
 /**
- * Admin 命令循环。返回 "logout" | "quit" | "switch_identity"。
+ * Admin 命令循环。
+ *
+ * 关键说明（中文）
+ * - embedded 模式用于 user 工作区下的 server management
+ * - 此时 admin 只作为低频管理工具，不再承担顶层导航职责
  */
 import { City } from "@downcity/city";
 import { select, isCancel } from "@clack/prompts";
@@ -25,15 +29,16 @@ const commands = {
     payment: managePayment,
     custom: manageCustom,
 };
-export async function adminLoop(session) {
+export async function adminLoop(session, options) {
     const admin = new City({
         role: "admin",
         city_url: session.base_url,
         admin_secret_key: session.admin_secret_key,
     });
+    const embedded = options?.embedded === true;
     while (true) {
         const svc = await select({
-            message: "Manage Service",
+            message: embedded ? "Server management" : "Manage Service",
             options: [
                 { label: "Env", value: "env", hint: "View & configure environment variables" },
                 { label: "City Instruction", value: "instruction", hint: "Read aggregated city/service guidance" },
@@ -44,15 +49,21 @@ export async function adminLoop(session) {
                 { label: "Usage", value: "usage" },
                 { label: "Payment (Stripe)", value: "payment" },
                 { label: "Custom service...", value: "custom" },
-                { label: "Switch to User", value: "switch" },
-                { label: "Logout", value: "logout" },
+                ...(embedded
+                    ? [{ label: "Back", value: "back" }]
+                    : [
+                        { label: "Switch to User", value: "switch" },
+                        { label: "Logout", value: "logout" },
+                    ]),
                 { label: "Quit", value: "quit" },
             ],
         });
         if (!svc || isCancel(svc))
-            return "quit";
+            return embedded ? "back" : "quit";
         if (svc === "quit")
             return "quit";
+        if (svc === "back")
+            return "back";
         if (svc === "logout") {
             showSuccess("left admin mode");
             return "logout";

package/city/admin/loop.js.map

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

package/city/app.d.ts

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 /**
- * Downcity City 管理入口与状态机调度。
+ * Downcity City 交互入口与工作区调度。
  *
  * 状态流转：
- *   selectIdentity → Admin → adminLoop → selectIdentity (switch identity)
- *   selectIdentity → User  → userLoop  → selectIdentity (switch identity)
- *   selectIdentity → Manage Servers → selectIdentity
+ *   welcome/home → connect/switch City → server workspace → server management/admin tools
  *
- * 不再持有 config 快照，每次需要时从磁盘 readConfig()。
+ * 关键说明（中文）
+ * - 顶层不再要求先选择 admin / user 身份
+ * - connect City 后默认进入 user sign in / user 工作区
+ * - admin 能力只作为低频的 server management 入口出现
  */
 export declare function runCityApp(argv?: string[]): Promise<void>;
 //# sourceMappingURL=app.d.ts.map

package/city/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";AAEA;;;;;;;;;GASG;AAeH,wBAAsB,UAAU,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA2DnE"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;GAUG;AAYH,wBAAsB,UAAU,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsEnE"}

package/city/app.js

@@ -1,26 +1,24 @@
 #!/usr/bin/env node
 /**
- * Downcity City 管理入口与状态机调度。
+ * Downcity City 交互入口与工作区调度。
  *
  * 状态流转：
- *   selectIdentity → Admin → adminLoop → selectIdentity (switch identity)
- *   selectIdentity → User  → userLoop  → selectIdentity (switch identity)
- *   selectIdentity → Manage Servers → selectIdentity
+ *   welcome/home → connect/switch City → server workspace → server management/admin tools
  *
- * 不再持有 config 快照，每次需要时从磁盘 readConfig()。
+ * 关键说明（中文）
+ * - 顶层不再要求先选择 admin / user 身份
+ * - connect City 后默认进入 user sign in / user 工作区
+ * - admin 能力只作为低频的 server management 入口出现
  */
 import { readFileSync } from "node:fs";
 import { intro } from "./core/ui.js";
-import { readActiveServer, readConfig, writeConfig } from "./core/session.js";
+import { readActiveServer } from "./core/session.js";
 import { parseArgs } from "./core/env.js";
-import { selectIdentity } from "./auth/mode-select.js";
-import { adminAuth } from "./auth/admin.js";
-import { userAuth } from "./auth/user.js";
-import { ensureServerConfigured, manageServersMenu } from "./auth/server-switch.js";
-import { userLoop } from "./user/loop.js";
-import { adminLoop } from "./admin/loop.js";
+import { promptAddServer, promptSelectActiveServer } from "./auth/server-switch.js";
 import { show, showError, showSuccess } from "./core/ui.js";
 import { updateCli } from "./core/update.js";
+import { selectHomeAction, selectWelcomeAction } from "./home/HomeMenu.js";
+import { openServerWorkspace } from "./workspace/ServerWorkspace.js";
 export async function runCityApp(argv = []) {
     const cli = parseArgs(argv);
     if (cli.command === "update") {
@@ -28,64 +26,61 @@ export async function runCityApp(argv = []) {
         return;
     }
     intro(`Downcity City v${readCliVersion()} (Esc to go back, Ctrl+C to exit)`);
-    if (!(await ensureServerConfigured())) {
-        return;
-    }
-    let identity = await selectIdentity();
-    while (identity !== "quit") {
-        if (identity === "update") {
-            await runSelfUpdate();
-            return;
-        }
-        if (identity === "servers") {
-            await manageServersMenu();
-            if (!(await ensureServerConfigured())) {
-                return;
-            }
-            identity = await selectIdentity();
-            continue;
-        }
-        // 每次从磁盘读取最新 config，不持快照
-        const cfg = readConfig();
+    while (true) {
         const activeServer = readActiveServer();
         if (!activeServer) {
-            if (!(await ensureServerConfigured())) {
+            const welcomeAction = await selectWelcomeAction();
+            if (welcomeAction === "quit") {
+                return;
+            }
+            if (welcomeAction === "update") {
+                await runSelfUpdate();
+                return;
+            }
+            const connectedServer = await promptAddServer();
+            if (!connectedServer) {
+                continue;
+            }
+            const result = await openServerWorkspace(connectedServer.base_url);
+            if (result === "quit") {
                 return;
             }
-            identity = await selectIdentity();
             continue;
         }
-        writeConfig({ ...cfg, last_identity: identity });
-        if (identity === "admin") {
-            const session = await adminAuth(activeServer);
-            if (!session) {
-                identity = await selectIdentity();
+        const homeAction = await selectHomeAction();
+        if (homeAction === "quit") {
+            return;
+        }
+        if (homeAction === "update") {
+            await runSelfUpdate();
+            return;
+        }
+        if (homeAction === "connect_city") {
+            const connectedServer = await promptAddServer();
+            if (!connectedServer) {
                 continue;
             }
-            const result = await adminLoop(session);
-            if (result === "quit")
-                break;
-            if (result === "switch_identity") {
-                identity = await selectIdentity();
-                continue;
+            const result = await openServerWorkspace(connectedServer.base_url);
+            if (result === "quit") {
+                return;
             }
-            identity = await selectIdentity();
             continue;
         }
-        // identity === "user"
-        const ctx = await userAuth(activeServer.base_url);
-        if (!ctx) {
-            identity = await selectIdentity();
+        if (homeAction === "switch_city") {
+            const selectedServer = await promptSelectActiveServer();
+            if (!selectedServer) {
+                continue;
+            }
+            const result = await openServerWorkspace(selectedServer.base_url);
+            if (result === "quit") {
+                return;
+            }
             continue;
         }
-        const result = await userLoop(ctx);
-        if (result === "quit")
-            break;
-        if (result === "switch_identity") {
-            identity = await selectIdentity();
-            continue;
+        const result = await openServerWorkspace(activeServer.base_url);
+        if (result === "quit") {
+            return;
         }
-        identity = await selectIdentity();
     }
 }
 /**

package/city/app.js.map

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

package/city/auth/admin.js

@@ -7,7 +7,7 @@ import { showError } from "../core/ui.js";
 export async function adminAuth(server) {
     const adminSecretKey = String(server.admin_secret_key ?? "").trim();
     if (!adminSecretKey) {
-        showError("Current server is missing admin_secret_key. Use Manage Servers -> Edit Server.");
+        showError("Current City is missing admin_secret_key. Open Server management -> Configure admin access.");
         return undefined;
     }
     return {

package/city/auth/admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/auth/admin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAqB;IACnD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,SAAS,CAAC,gFAAgF,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB,EAAE,cAAc;KACjC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/auth/admin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAqB;IACnD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,SAAS,CAAC,6FAA6F,CAAC,CAAC;QACzG,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB,EAAE,cAAc;KACjC,CAAC;AACJ,CAAC"}

package/city/auth/server-switch.d.ts

@@ -2,21 +2,20 @@
  * Server 管理模块。
  *
  * 关键说明（中文）
- * - 不再提供“切换当前 server”的临时入口
- * - 所有 server 操作都统一收口到 Manage Servers
- * - 没有 server 时，CLI 会先强制进入添加流程
+ * - connect City 不再强制要求 admin_secret_key
+ * - admin access 只在低频管理场景中单独配置
+ * - server 仍然作为本地连接记录持久化保存
  */
 import { type ServerProfile } from "../core/session.js";
-/**
- * 确保至少存在一个 server。
- */
-export declare function ensureServerConfigured(): Promise<boolean>;
-/**
- * 顶层 server 管理菜单。
- */
-export declare function manageServersMenu(): Promise<void>;
 /**
  * 添加 server。
  */
 export declare function promptAddServer(): Promise<ServerProfile | undefined>;
+export declare function promptSelectActiveServer(): Promise<ServerProfile | undefined>;
+export declare function promptEditServer(baseUrl?: string): Promise<ServerProfile | undefined>;
+/**
+ * 为当前 server 单独配置 admin access。
+ */
+export declare function promptConfigureAdminAccess(baseUrl: string): Promise<ServerProfile | undefined>;
+export declare function promptRemoveServer(baseUrl?: string): Promise<boolean>;
 //# sourceMappingURL=server-switch.d.ts.map

package/city/auth/server-switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-switch.d.ts","sourceRoot":"","sources":["../../src/auth/server-switch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAOL,KAAK,aAAa,EAEnB,MAAM,oBAAoB,CAAC;AAG5B;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC,CAY/D;AAED;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CA+CvD;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA2B1E"}
+{"version":3,"file":"server-switch.d.ts","sourceRoot":"","sources":["../../src/auth/server-switch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAOL,KAAK,aAAa,EAEnB,MAAM,oBAAoB,CAAC;AAG5B;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAqB1E;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwBnF;AAED,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwE3F;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAyBpC;AAED,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8B3E"}

package/city/auth/server-switch.js

@@ -2,73 +2,14 @@
  * Server 管理模块。
  *
  * 关键说明（中文）
- * - 不再提供“切换当前 server”的临时入口
- * - 所有 server 操作都统一收口到 Manage Servers
- * - 没有 server 时，CLI 会先强制进入添加流程
+ * - connect City 不再强制要求 admin_secret_key
+ * - admin access 只在低频管理场景中单独配置
+ * - server 仍然作为本地连接记录持久化保存
  */
 import { City } from "@downcity/city";
 import { isCancel, password, select, text } from "@clack/prompts";
 import { addServer, readActiveServer, readConfig, readServer, removeServer, setActiveServer, updateServer, } from "../core/session.js";
-import { show, showError, showSuccess } from "../core/ui.js";
-/**
- * 确保至少存在一个 server。
- */
-export async function ensureServerConfigured() {
-    if (readConfig().servers.length > 0) {
-        return true;
-    }
-    show("No servers configured. Add a server before continuing.");
-    const created = await promptAddServer();
-    if (!created) {
-        showError("No server configured. Exiting.");
-        return false;
-    }
-    return true;
-}
-/**
- * 顶层 server 管理菜单。
- */
-export async function manageServersMenu() {
-    while (true) {
-        const config = readConfig();
-        const active = readActiveServer();
-        const selected = await select({
-            message: active
-                ? `Manage Servers [current: ${active.name}]`
-                : "Manage Servers [no active server]",
-            options: [
-                { label: "List Servers", value: "list", hint: `${config.servers.length} configured` },
-                { label: "Add Server", value: "add", hint: "Create a new Infra server profile" },
-                { label: "Select Active Server", value: "select", hint: active ? active.base_url : "Choose current server" },
-                { label: "Edit Server", value: "edit", hint: "Update name, server URL, or admin key" },
-                { label: "Remove Server", value: "remove", hint: "Delete a server profile" },
-                { label: "Back", value: "back", hint: "Return to main menu" },
-            ],
-        });
-        if (!selected || isCancel(selected) || selected === "back") {
-            return;
-        }
-        if (selected === "list") {
-            printServers(config.servers, active?.base_url);
-            continue;
-        }
-        if (selected === "add") {
-            await promptAddServer();
-            continue;
-        }
-        if (selected === "select") {
-            await promptSelectActiveServer();
-            continue;
-        }
-        if (selected === "edit") {
-            await promptEditServer();
-            continue;
-        }
-        if (selected === "remove") {
-            await promptRemoveServer();
-        }
-    }
-}
+import { showError, showSuccess } from "../core/ui.js";
 /**
  * 添加 server。
  */
@@ -80,28 +21,23 @@ export async function promptAddServer() {
     if (!baseUrl || isCancel(baseUrl) || !String(baseUrl).trim()) {
         return undefined;
     }
-    const adminSecretKey = await password({ message: "admin_secret_key" });
-    if (!adminSecretKey || isCancel(adminSecretKey) || !String(adminSecretKey).trim()) {
-        return undefined;
-    }
     const server = addServer({
         base_url: String(baseUrl).trim(),
-        admin_secret_key: String(adminSecretKey).trim(),
     });
-    const verified = await verifyServerAdminAccess(server);
+    const verified = await verifyServerPublicAccess(server);
     if (verified) {
-        showSuccess(`Server added and activated: ${server.name}`);
+        showSuccess(`City connected: ${server.name}`);
     }
     else {
-        showError(`Server saved, but admin verification failed: ${server.name}`);
+        showError(`City saved, but the public reachability check failed: ${server.name}`);
     }
     return server;
 }
-async function promptSelectActiveServer() {
+export async function promptSelectActiveServer() {
     const config = readConfig();
     if (config.servers.length === 0) {
         showError("No servers configured.");
-        return;
+        return undefined;
     }
     const selected = await select({
         message: "Select active server",
@@ -112,18 +48,20 @@ async function promptSelectActiveServer() {
         })),
     });
     if (!selected || isCancel(selected)) {
-        return;
+        return undefined;
     }
-    setActiveServer(String(selected));
-    showSuccess(`Active server: ${String(selected)}`);
+    const selected_base_url = String(selected);
+    setActiveServer(selected_base_url);
+    showSuccess(`Current City: ${selected_base_url}`);
+    return readServer(selected_base_url);
 }
-async function promptEditServer() {
+export async function promptEditServer(baseUrl) {
     const config = readConfig();
     if (config.servers.length === 0) {
         showError("No servers configured.");
-        return;
+        return undefined;
     }
-    const targetBaseUrl = await select({
+    const targetBaseUrl = baseUrl ?? await select({
         message: "Edit server",
         options: config.servers.map((server) => ({
             label: server.base_url === config.active_server_url ? `★ ${server.name}` : `   ${server.name}`,
@@ -132,12 +70,12 @@ async function promptEditServer() {
         })),
     });
     if (!targetBaseUrl || isCancel(targetBaseUrl)) {
-        return;
+        return undefined;
     }
     const current = readServer(String(targetBaseUrl));
     if (!current) {
         showError("Selected server no longer exists.");
-        return;
+        return undefined;
     }
     const field = await select({
         message: `Edit ${current.name}`,
@@ -149,43 +87,80 @@ async function promptEditServer() {
         ],
     });
     if (!field || isCancel(field) || field === "cancel") {
-        return;
+        return undefined;
     }
     const next = { ...current };
     if (field === "name") {
         const name = await text({ message: "Display name", initialValue: current.name });
         if (!name || isCancel(name))
-            return;
+            return undefined;
         next.name = String(name).trim() || current.name;
     }
     else if (field === "base_url") {
         const baseUrl = await text({ message: "Server URL", initialValue: current.base_url });
         if (!baseUrl || isCancel(baseUrl))
-            return;
+            return undefined;
         next.base_url = String(baseUrl).trim() || current.base_url;
     }
     else if (field === "admin_secret_key") {
         const adminSecretKey = await password({ message: "admin_secret_key" });
         if (!adminSecretKey || isCancel(adminSecretKey))
-            return;
+            return undefined;
         next.admin_secret_key = String(adminSecretKey).trim();
     }
     const updated = updateServer(current.base_url, next);
+    if (field === "admin_secret_key") {
+        const verified = await verifyServerAdminAccess(updated);
+        if (verified) {
+            showSuccess(`Admin access updated: ${updated.name}`);
+        }
+        else {
+            showError(`City saved, but admin verification failed: ${updated.name}`);
+        }
+        return updated;
+    }
+    const verified = await verifyServerPublicAccess(updated);
+    if (verified) {
+        showSuccess(`City updated: ${updated.name}`);
+    }
+    else {
+        showError(`City saved, but the public reachability check failed: ${updated.name}`);
+    }
+    return updated;
+}
+/**
+ * 为当前 server 单独配置 admin access。
+ */
+export async function promptConfigureAdminAccess(baseUrl) {
+    const current = readServer(baseUrl);
+    if (!current) {
+        showError("Selected server no longer exists.");
+        return undefined;
+    }
+    const adminSecretKey = await password({ message: "admin_secret_key" });
+    if (!adminSecretKey || isCancel(adminSecretKey) || !String(adminSecretKey).trim()) {
+        return undefined;
+    }
+    const updated = updateServer(current.base_url, {
+        ...current,
+        admin_secret_key: String(adminSecretKey).trim(),
+    });
     const verified = await verifyServerAdminAccess(updated);
     if (verified) {
-        showSuccess(`Server updated: ${updated.name}`);
+        showSuccess(`Admin access configured: ${updated.name}`);
     }
     else {
-        showError(`Server updated, but admin verification failed: ${updated.name}`);
+        showError(`City saved, but admin verification failed: ${updated.name}`);
     }
+    return updated;
 }
-async function promptRemoveServer() {
+export async function promptRemoveServer(baseUrl) {
     const config = readConfig();
     if (config.servers.length === 0) {
         showError("No servers configured.");
-        return;
+        return false;
     }
-    const selected = await select({
+    const selected = baseUrl ?? await select({
         message: "Remove server",
         options: [
             ...config.servers.map((server) => ({
@@ -197,13 +172,14 @@ async function promptRemoveServer() {
         ],
     });
     if (!selected || isCancel(selected) || selected === "cancel") {
-        return;
+        return false;
     }
     removeServer(String(selected));
     const nextActive = readActiveServer();
     showSuccess(nextActive
         ? `Server removed. Current server: ${nextActive.name}`
         : "Server removed. No servers configured.");
+    return true;
 }
 async function verifyServerAdminAccess(server) {
     try {
@@ -219,17 +195,18 @@ async function verifyServerAdminAccess(server) {
         return false;
     }
 }
-function printServers(servers, activeBaseUrl) {
-    if (servers.length === 0) {
-        show("No servers configured.");
-        return;
+async function verifyServerPublicAccess(server) {
+    try {
+        const user = new City({
+            role: "user",
+            city_url: server.base_url,
+        });
+        await user.service("accounts").get("providers");
+        return true;
     }
-    console.log(`\n${servers.length} servers:\n`);
-    for (const server of servers) {
-        const marker = server.base_url === activeBaseUrl ? "★" : " ";
-        console.log(` ${marker} ${server.name.padEnd(24)} ${server.base_url}  admin=${maskSecret(server.admin_secret_key)}`);
+    catch {
+        return false;
     }
-    console.log("");
 }
 function maskSecret(value) {
     const normalized = String(value ?? "").trim();