@downcity/city 1.1.39 → 1.1.47

package/src/terminal/core/update.ts

@@ -0,0 +1,230 @@
+/**
+ * CLI 自更新模块。
+ *
+ * 关键说明（中文）
+ * - 在 downcity 仓库内执行时，优先走本地 workspace 刷新全局安装
+ * - 普通全局安装环境下，退化为 `npm install -g @downcity/city@latest`
+ * - 更新完成后建议重新运行 CLI，避免当前进程继续使用旧代码
+ */
+
+import { existsSync, readFileSync } from "node:fs";
+import { chmod, cp, lstat, mkdir, readFile, rm, symlink } from "node:fs/promises";
+import path from "node:path";
+import { spawn } from "node:child_process";
+import os from "node:os";
+
+const CITY_PACKAGE_NAME = "@downcity/city";
+
+/**
+ * 执行 CLI 自更新。
+ */
+export async function updateCityCLI(cwd = process.cwd()): Promise<{
+  mode: "workspace" | "npm";
+  version: string;
+}> {
+  const workspaceRoot = findDowncityWorkspaceRoot(cwd);
+
+  if (workspaceRoot) {
+    await run(commandOf("pnpm"), ["-C", "packages/city", "build"], workspaceRoot);
+    const deploy_dir = path.join(os.tmpdir(), `downcity-city-deploy-${Date.now()}`);
+    await run(commandOf("pnpm"), ["--filter", CITY_PACKAGE_NAME, "deploy", "--legacy", deploy_dir], workspaceRoot);
+    await installCityDeployGlobally(deploy_dir, workspaceRoot);
+    await rm(deploy_dir, { recursive: true, force: true });
+    return {
+      mode: "workspace",
+      version: await readInstalledCityVersion(),
+    };
+  }
+
+  await run(commandOf("npm"), ["install", "-g", `${CITY_PACKAGE_NAME}@latest`], cwd);
+  return {
+    mode: "npm",
+    version: await readInstalledCityVersion(),
+  };
+}
+
+/**
+ * 读取当前全局安装的 city 版本。
+ */
+export async function readInstalledCityVersion(): Promise<string> {
+  try {
+    const global_paths = await resolveGlobalCityPaths(process.cwd());
+    const package_json = JSON.parse(await readFile(path.join(global_paths.package_dir, "package.json"), "utf8")) as {
+      version?: string;
+    };
+    return String(package_json.version ?? "unknown");
+  } catch {
+    return "unknown";
+  }
+}
+
+/**
+ * 将 pnpm deploy 的 city 产物安装到全局 CLI 位置。
+ */
+async function installCityDeployGlobally(deploy_dir: string, cwd: string): Promise<void> {
+  const global_paths = await resolveGlobalCityPaths(cwd);
+
+  // 关键点（中文）：绕开 npm install -g 本地目录，避免 npm 11 Arborist 对本地包的崩溃。
+  await mkdir(global_paths.package_scope_dir, { recursive: true });
+  await mkdir(global_paths.global_bin, { recursive: true });
+  await rm(global_paths.package_dir, { recursive: true, force: true });
+  await cp(deploy_dir, global_paths.package_dir, { recursive: true, force: true });
+  await chmod(global_paths.cli_entry, 0o755);
+
+  await recreateSymlink(global_paths.city_bin, "../lib/node_modules/@downcity/city/bin/cli/Index.js");
+  await recreateSymlink(global_paths.downcity_bin, "../lib/node_modules/@downcity/city/bin/cli/Index.js");
+}
+
+/**
+ * 解析 npm 全局目录下的 city 安装位置。
+ */
+async function resolveGlobalCityPaths(cwd: string): Promise<{
+  npm_prefix: string;
+  global_modules: string;
+  global_bin: string;
+  package_scope_dir: string;
+  package_dir: string;
+  cli_entry: string;
+  city_bin: string;
+  downcity_bin: string;
+}> {
+  const npm_prefix = (await capture(commandOf("npm"), ["prefix", "-g"], cwd)).trim();
+  const global_modules = path.join(npm_prefix, "lib", "node_modules");
+  const global_bin = path.join(npm_prefix, "bin");
+  const package_scope_dir = path.join(global_modules, "@downcity");
+  const package_dir = path.join(package_scope_dir, "city");
+
+  return {
+    npm_prefix,
+    global_modules,
+    global_bin,
+    package_scope_dir,
+    package_dir,
+    cli_entry: path.join(package_dir, "bin", "cli", "Index.js"),
+    city_bin: path.join(global_bin, "city"),
+    downcity_bin: path.join(global_bin, "downcity"),
+  };
+}
+
+/**
+ * 重新创建全局命令链接。
+ */
+async function recreateSymlink(link_path: string, target_path: string): Promise<void> {
+  try {
+    const stat = await lstat(link_path);
+    if (stat.isDirectory()) {
+      await rm(link_path, { recursive: true, force: true });
+    } else {
+      await rm(link_path, { force: true });
+    }
+  } catch {
+    // 链接不存在是正常路径。
+  }
+
+  await symlink(target_path, link_path);
+}
+
+/**
+ * 查找 downcity 仓库根目录。
+ */
+function findDowncityWorkspaceRoot(startDir: string): string | undefined {
+  let current = path.resolve(startDir);
+
+  while (true) {
+    if (isDowncityWorkspaceRoot(current)) {
+      return current;
+    }
+
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return undefined;
+    }
+    current = parent;
+  }
+}
+
+/**
+ * 判断某个目录是否为 downcity monorepo 根目录。
+ */
+function isDowncityWorkspaceRoot(dir: string): boolean {
+  const packageJsonPath = path.join(dir, "package.json");
+  const workspacePath = path.join(dir, "pnpm-workspace.yaml");
+  const cityPackagePath = path.join(dir, "packages", "city", "package.json");
+
+  if (!existsSync(packageJsonPath) || !existsSync(workspacePath) || !existsSync(cityPackagePath)) {
+    return false;
+  }
+
+  try {
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")) as {
+      name?: string;
+    };
+    return packageJson.name === "downcity";
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * 运行命令并继承当前终端输出。
+ */
+function run(command: string, args: string[], cwd: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      cwd,
+      stdio: "inherit",
+      shell: false,
+    });
+
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`${command} ${args.join(" ")} exited with code ${code ?? "unknown"}`));
+    });
+  });
+}
+
+/**
+ * 运行命令并采集 stdout。
+ */
+function capture(command: string, args: string[], cwd: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      shell: false,
+    });
+
+    let stdout = "";
+    let stderr = "";
+
+    child.stdout.on("data", (chunk) => {
+      stdout += String(chunk);
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0) {
+        resolve(stdout);
+        return;
+      }
+      reject(new Error(stderr.trim() || `${command} ${args.join(" ")} exited with code ${code ?? "unknown"}`));
+    });
+  });
+}
+
+/**
+ * 根据平台选择可执行文件名。
+ */
+function commandOf(name: "npm" | "pnpm" | "node"): string {
+  if (process.platform === "win32" && name !== "node") {
+    return `${name}.cmd`;
+  }
+  return name;
+}

package/src/terminal/user/balance.ts

@@ -0,0 +1,215 @@
+/**
+ * User Balance 命令。
+ *
+ * 提供：
+ * - 查看当前余额
+ * - 查看个人流水
+ * - 查看个人充值单
+ * - 发起充值
+ * - 兑换 redeem_code
+ */
+
+import type { UserClient } from "@downcity/conduit";
+import { openBrowser } from "../core/browser.js";
+import { buildStripeEndpoints } from "../core/stripe.js";
+import { askText, show, showError, showSuccess } from "../core/ui.js";
+
+interface BalanceAccount {
+  /** 用户 ID */
+  user_id: string;
+  /** 当前余额 */
+  balance: number;
+  /** 余额单位 */
+  unit: string;
+}
+
+interface BalanceLedgerItem {
+  /** 流水类型 */
+  kind: string;
+  /** 流水金额 */
+  amount: number;
+  /** 余额快照 */
+  balance_after: number;
+  /** 流水说明 */
+  note: string;
+  /** 创建时间 */
+  created_at: string;
+}
+
+interface BalanceTopupItem {
+  /** 充值单 ID */
+  topup_id: string;
+  /** 充值金额 */
+  amount: number;
+  /** 余额单位 */
+  unit: string;
+  /** 充值单状态 */
+  status: string;
+  /** 充值说明 */
+  note: string;
+  /** 创建时间 */
+  created_at: string;
+}
+
+interface StripeCheckoutResult {
+  /** 支付记录 ID */
+  payment_id: string;
+  /** 对应的充值单 ID */
+  topup_id: string;
+  /** Stripe Checkout Session ID */
+  stripe_checkout_session_id: string;
+  /** 可直接跳转的支付地址 */
+  checkout_url: string;
+  /** 当前支付状态 */
+  status: string;
+}
+
+interface BalanceRedeemCodeItem {
+  /** redeem_code ID */
+  redeem_code_id: string;
+  /** redeem_code 状态 */
+  status: string;
+  /** 脱敏兑换码 */
+  code_mask: string;
+  /** 兑换金额 */
+  amount: number;
+  /** 余额单位 */
+  unit: string;
+}
+
+interface BalanceRedeemResult {
+  /** 兑换后的账户快照 */
+  account: BalanceAccount;
+  /** 被兑换的 redeem_code */
+  redeem_code: BalanceRedeemCodeItem;
+}
+
+/** 展示当前余额 */
+export async function showBalance(c: UserClient): Promise<void> {
+  const account = await c.service("balance").get<BalanceAccount>("me");
+  show([
+    `user_id: ${account.user_id}`,
+    `balance: ${account.balance} ${account.unit}`,
+  ].join("\n"));
+}
+
+/** 展示个人流水 */
+export async function showBalanceHistory(c: UserClient): Promise<void> {
+  const response = await c.service("balance").get<{ items: BalanceLedgerItem[] }>("history/me", { limit: 20 });
+  if (response.items.length === 0) {
+    show("No balance history yet.");
+    return;
+  }
+
+  console.log(`\n${response.items.length} balance entries:\n`);
+  for (const item of response.items) {
+    console.log(`  ${item.created_at.slice(0, 19)}  ${item.kind.padEnd(8)} ${String(item.amount).padStart(6)}  -> ${String(item.balance_after).padStart(6)}  ${item.note}`);
+  }
+  console.log("");
+}
+
+/** 展示个人充值单 */
+export async function showTopups(c: UserClient): Promise<void> {
+  const response = await c.service("balance").get<{ items: BalanceTopupItem[] }>("topups/me", { limit: 20 });
+  if (response.items.length === 0) {
+    show("No topup orders yet.");
+    return;
+  }
+
+  console.log(`\n${response.items.length} topup orders:\n`);
+  for (const item of response.items) {
+    console.log(`  ${item.topup_id.padEnd(24)} ${String(item.amount).padStart(6)} ${item.unit.padEnd(10)} [${item.status}] ${item.note}`);
+  }
+  console.log("");
+}
+
+/** 发起充值 */
+export async function createTopup(c: UserClient): Promise<void> {
+  const result = await createTopupOrder(c);
+  if (!result) return;
+  showSuccess(`topup created: ${result.topup_id} (${result.amount} ${result.unit}, ${result.status})`);
+}
+
+/**
+ * 发起 Stripe 充值。
+ *
+ * 关键说明（中文）
+ * - 先创建 pending topup
+ * - 再调用 payment.stripe 创建 Checkout
+ * - 成功后尽量自动打开浏览器
+ */
+export async function rechargeWithStripe(c: UserClient): Promise<void> {
+  const topup = await createTopupOrder(c);
+  if (!topup) return;
+  const endpoints = buildStripeEndpoints(c.serverUrl);
+
+  showSuccess(`topup created: ${topup.topup_id} (${topup.amount} ${topup.unit}, ${topup.status})`);
+
+  const successURL = await askText("success_url override (optional)");
+  const cancelURL = await askText("cancel_url override (optional)");
+
+  try {
+    const checkout = await c.service("payment.stripe").action("checkout/create").invoke<StripeCheckoutResult>({
+      topup_id: topup.topup_id,
+      success_url: successURL ?? "",
+      cancel_url: cancelURL ?? "",
+    });
+
+    const opened = openBrowser(checkout.checkout_url);
+    showSuccess(`checkout created: ${checkout.payment_id}`);
+    show([
+      `topup_id: ${checkout.topup_id}`,
+      `checkout_url: ${checkout.checkout_url}`,
+      `status: ${checkout.status}`,
+      `stripe webhook endpoint: ${endpoints.webhook_url}`,
+    ].join("\n"));
+
+    if (opened) {
+      show("Browser opened for Stripe Checkout.");
+    } else {
+      showError(`Could not open browser. Please visit:\n  ${checkout.checkout_url}`);
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    showError([
+      "Stripe checkout creation failed.",
+      `topup_id: ${topup.topup_id}`,
+      `error: ${message}`,
+      `stripe webhook endpoint: ${endpoints.webhook_url}`,
+      "You can keep this pending topup and retry checkout later.",
+    ].join("\n"));
+  }
+}
+
+/**
+ * 创建充值单。
+ */
+async function createTopupOrder(c: UserClient): Promise<BalanceTopupItem | undefined> {
+  const rawAmount = await askText("topup amount");
+  if (!rawAmount) return undefined;
+
+  const amount = Number(rawAmount);
+  if (!Number.isInteger(amount) || amount <= 0) {
+    showError("topup amount must be a positive integer");
+    return undefined;
+  }
+
+  const note = await askText("topup note (optional)");
+  return await c.service("balance").action("topups/create").invoke<BalanceTopupItem>({
+    amount,
+    note: note ?? "",
+  });
+}
+
+/** 兑换 redeem_code */
+export async function redeemCode(c: UserClient): Promise<void> {
+  const code = await askText("redeem_code");
+  if (!code) return;
+
+  const result = await c.service("balance").action("redeem-codes/redeem").invoke<BalanceRedeemResult>({
+    code,
+  });
+  showSuccess(
+    `redeemed: ${result.redeem_code.code_mask} -> +${result.redeem_code.amount} ${result.redeem_code.unit} (balance: ${result.account.balance} ${result.account.unit})`,
+  );
+}

package/src/terminal/user/chat.ts

@@ -0,0 +1,80 @@
+/**
+ * User Chat 命令 — Agent 连续对话。
+ *
+ * 使用 pi-agent 进行多轮对话（流式输出 + tools）。
+ * pi-agent 通过 server 的 /chat/completions 端点调用 AI，
+ * client 不做任何 provider 或 model 硬编码。
+ * 空输入或 Esc 返回上级菜单。
+ */
+
+import type { UserClient } from "@downcity/conduit";
+import { type UserContext } from "../auth/user.js";
+import { askText, show, showError } from "../core/ui.js";
+import { createPiAgentSession, type PiAgentSession } from "../agent/pi-agent.js";
+
+let activeAgentSession: PiAgentSession | undefined;
+
+export async function doAgentChat(c: UserClient, ctx: UserContext): Promise<void> {
+  // 从 server 获取模型目录，构建 ModelHandle
+  let modelName: string;
+
+  try {
+    const catalog = await c.ai.listModels();
+    const all = catalog.all();
+    if (all.length === 0) {
+      showError("No ready models available on server. Please configure provider env first.");
+      return;
+    }
+
+    const selected = ctx.config.model
+      ? (catalog.get(ctx.config.model) ?? catalog.default())
+      : catalog.default();
+
+    if (!selected) {
+      showError("No ready default model found on server.");
+      return;
+    }
+
+    modelName = selected.name;
+
+    const handle = c.ai.model(selected);
+
+    show(`Starting agent chat (model: ${modelName})`);
+    show("Type your message (empty or Esc to exit chat)");
+
+    activeAgentSession = await createPiAgentSession({
+      model: handle,
+      tools: "agent",
+      onText: (text) => process.stdout.write(text),
+      onToolStart: (toolName) => process.stdout.write(`\n[tool:${toolName}] `),
+      onToolEnd: (toolName, isError) => {
+        if (isError) process.stdout.write(`[tool:${toolName} failed]\n`);
+      },
+    });
+  } catch (e) {
+    showError(`Failed to start agent: ${e instanceof Error ? e.message : String(e)}`);
+    return;
+  }
+
+  while (true) {
+    process.stdout.write("\n");
+    const prompt = await askText("You");
+    if (!prompt || prompt.trim() === "") {
+      show("Exited chat");
+      break;
+    }
+
+    process.stdout.write("assistant: ");
+    try {
+      const response = await activeAgentSession.ask(prompt);
+      if (response) process.stdout.write("\n");
+    } catch (e) {
+      process.stdout.write("\n");
+      showError(`Agent error: ${e instanceof Error ? e.message : String(e)}`);
+      show("Agent session ended. Please re-enter chat to start a new conversation.");
+      break;
+    }
+  }
+
+  activeAgentSession = undefined;
+}

package/src/terminal/user/loop.ts

@@ -0,0 +1,112 @@
+/**
+ * User 命令循环。返回 "logout" | "quit" | "switch_identity"。
+ *
+ * 关键说明（中文）
+ * - chat 直接使用 pi-agent 进行连续对话（流式输出），委托到 chat.ts。
+ * - models 合并了列表展示与选择切换，委托到 models.ts。
+ * - me / services / service 保持内联（逻辑简单）。
+ */
+
+import { UserClient } from "@downcity/conduit";
+import { type UserContext } from "../auth/user.js";
+import { clearUserSession } from "../core/session.js";
+import { askUserCommand, askText, show, showError, showSuccess } from "../core/ui.js";
+import { createTopup, rechargeWithStripe, redeemCode, showBalance, showBalanceHistory, showTopups } from "./balance.js";
+import { doAgentChat } from "./chat.js";
+import { doModels } from "./models.js";
+
+type Result = "logout" | "quit" | "switch_identity";
+
+export async function userLoop(ctx: UserContext): Promise<Result> {
+  const client = new UserClient({
+    base_url: ctx.session.base_url,
+    product_id: ctx.session.product_id,
+    user_token: ctx.session.user_token,
+  });
+
+  while (true) {
+    const cmd = await askUserCommand();
+    if (!cmd) continue;
+    if (cmd === "switch") return "switch_identity";
+
+    try {
+      const r = await execute(client, ctx, cmd);
+      if (r === "quit") return "quit";
+      if (r === "logout") return "logout";
+    } catch (e) {
+      showError(e instanceof Error ? e.message : String(e));
+    }
+  }
+}
+
+async function execute(
+  c: UserClient,
+  ctx: UserContext,
+  cmd: string,
+): Promise<"continue" | "logout" | "quit"> {
+  switch (cmd) {
+    case "chat":
+      await doAgentChat(c, ctx);
+      return "continue";
+
+    case "models":
+      await doModels(c, ctx);
+      return "continue";
+
+    case "balance":
+      await showBalance(c);
+      return "continue";
+
+    case "history":
+      await showBalanceHistory(c);
+      return "continue";
+
+    case "topups":
+      await showTopups(c);
+      return "continue";
+
+    case "recharge":
+      await rechargeWithStripe(c);
+      return "continue";
+
+    case "topup_create":
+      await createTopup(c);
+      return "continue";
+
+    case "redeem_code":
+      await redeemCode(c);
+      return "continue";
+
+    case "me": {
+      const b = await c.service("accounts").get<{ user?: { user_id: string; email: string } }>("me");
+      if (b.user) show(`user_id: ${b.user.user_id}\nemail: ${b.user.email}`);
+      return "continue";
+    }
+
+    case "services":
+      show(
+        (await c.listServices())
+          .map((service) => `${service.id} - ${service.name}`)
+          .join("\n"),
+      );
+      return "continue";
+
+    case "service": {
+      const n = await askText("service name");
+      if (n) show(JSON.stringify(await c.service(n).action("").invoke({}), null, 2));
+      return "continue";
+    }
+
+    case "logout":
+      clearUserSession(ctx.session.base_url);
+      showSuccess("logged out");
+      return "logout";
+
+    case "quit":
+      return "quit";
+
+    default:
+      showError(`unknown: ${cmd}`);
+      return "continue";
+  }
+}

package/src/terminal/user/models.ts

@@ -0,0 +1,43 @@
+/**
+ * User Models 命令 — 模型列表与选择。
+ *
+ * 从 server 获取模型目录，显示并允许用户切换。
+ */
+
+import type { UserClient, ModelCatalog } from "@downcity/conduit";
+import { type UserContext } from "../auth/user.js";
+import { askModel, type ModelOption, show, showError, showSuccess } from "../core/ui.js";
+import { readConfig, writeConfig } from "../core/session.js";
+
+/** 列出模型并选择切换 */
+export async function doModels(c: UserClient, ctx: UserContext): Promise<void> {
+  let catalog: ModelCatalog;
+  try {
+    catalog = await c.ai.listModels();
+  } catch (e) {
+    showError(`Failed to fetch models: ${e instanceof Error ? e.message : String(e)}`);
+    return;
+  }
+
+  const all = catalog.all();
+  if (all.length === 0) {
+    showError("No ready models available from server. Configure provider env first.");
+    return;
+  }
+
+  const currentModel = ctx.config.model || catalog.default()?.id || "";
+  show(`Current model: ${currentModel || "(none)"}`);
+
+  const options: ModelOption[] = all.map((m) => ({
+    id: m.id,
+    name: m.name,
+    hint: m.description || m.tags?.join(", ") || "",
+  }));
+
+  const selected = await askModel(options, currentModel);
+  if (selected) {
+    ctx.config.model = selected;
+    const cfg = readConfig(); cfg.model = selected; writeConfig(cfg);
+    showSuccess(`Model switched to: ${selected}`);
+  }
+}

package/src/utils/storage.ts

@@ -17,10 +17,3 @@ export async function ensureDir(dir: string): Promise<void> {
 export async function saveJson(filePath: string, data: JsonValue | object): Promise<void> {
   await fs.writeJson(filePath, data, { spaces: 2 });
 }
-
-export async function loadJson<T>(filePath: string): Promise<T | null> {
-  if (!fs.existsSync(filePath)) {
-    return null;
-  }
-  return fs.readJson(filePath) as Promise<T>;
-}

package/bin/process/rpc/Client.d.ts

@@ -1,13 +0,0 @@
-/**
- * Local RPC 客户端。
- *
- * 关键点（中文）
- * - 只用于本机受信任 IPC，不附加 HTTP Bearer 鉴权。
- * - 返回结构与 HTTP `callServer()` 对齐，便于上层透明切换 transport。
- */
-import type { DaemonJsonApiCallParams, DaemonJsonApiCallResult } from "../../process/daemon/Api.js";
-/**
- * 通过本地 IPC 调用 agent runtime。
- */
-export declare function callLocalServer<T>(params: DaemonJsonApiCallParams): Promise<DaemonJsonApiCallResult<T>>;
-//# sourceMappingURL=Client.d.ts.map