@downcity/city 1.1.1 → 1.1.5

package/src/cli/Update.ts

@@ -1,183 +0,0 @@
-/**
- * `city update`：更新全局 downcity CLI。
- *
- * 关键点（中文）
- * - 优先根据当前 CLI 所在的全局模块目录，自动判断是 npm 还是 pnpm 安装。
- * - 允许用户通过 `--manager` 显式覆盖包管理器选择。
- * - 实际更新只负责全局包升级，不自动重启已有 runtime/Console 进程。
- */
-
-import fs from "fs";
-import path from "path";
-import { execFileSync, spawn } from "node:child_process";
-import { fileURLToPath } from "url";
-import { emitCliBlock } from "./CliReporter.js";
-import { CliError } from "@/types/cli/CliError.js";
-import { runWithSpinner } from "@shared/utils/cli/Spinner.js";
-
-export type UpdateManager = "npm" | "pnpm";
-
-export interface UpdateCommandOptions {
-  /**
-   * 包管理器选择。
-   *
-   * - `auto`：按当前 CLI 所在的全局目录自动判断。
-   * - `npm` / `pnpm`：强制使用指定包管理器。
-   */
-  manager?: UpdateManager | "auto";
-}
-
-const GLOBAL_PACKAGE_NAME = "downcity";
-
-/**
- * 构造全局更新命令。
- */
-export function buildGlobalUpdateInvocation(manager: UpdateManager): {
-  command: string;
-  args: string[];
-} {
-  if (manager === "pnpm") {
-    return {
-      command: "pnpm",
-      args: ["add", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
-    };
-  }
-
-  return {
-    command: "npm",
-    args: ["install", "-g", `${GLOBAL_PACKAGE_NAME}@latest`],
-  };
-}
-
-/**
- * 根据全局模块根目录判断当前 CLI 来源。
- */
-export function resolveUpdateManagerFromGlobalRoots(params: {
-  packageRoot: string;
-  npmRoot?: string;
-  pnpmRoot?: string;
-}): UpdateManager | null {
-  const packageRoot = normalizeRealPath(params.packageRoot) || path.resolve(params.packageRoot);
-  const pnpmRoot = normalizeRealPath(params.pnpmRoot);
-  const npmRoot = normalizeRealPath(params.npmRoot);
-
-  if (pnpmRoot && isSubPath(packageRoot, pnpmRoot)) return "pnpm";
-  if (npmRoot && isSubPath(packageRoot, npmRoot)) return "npm";
-  return null;
-}
-
-function normalizeRealPath(target?: string): string | null {
-  const raw = String(target || "").trim();
-  if (!raw) return null;
-  try {
-    return fs.realpathSync(raw);
-  } catch {
-    return path.resolve(raw);
-  }
-}
-
-function isSubPath(targetPath: string, rootPath: string): boolean {
-  const relative = path.relative(rootPath, targetPath);
-  return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
-}
-
-function readGlobalRoot(manager: UpdateManager): string | null {
-  try {
-    const output = execFileSync(manager, ["root", "-g"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-    });
-    const trimmed = String(output || "").trim();
-    return trimmed || null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * 自动判断当前全局安装使用的包管理器。
- */
-export function detectInstalledUpdateManager(): UpdateManager {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-  const packageRoot = path.resolve(__dirname, "../..");
-  const detected = resolveUpdateManagerFromGlobalRoots({
-    packageRoot,
-    npmRoot: readGlobalRoot("npm") || undefined,
-    pnpmRoot: readGlobalRoot("pnpm") || undefined,
-  });
-  return detected || "npm";
-}
-
-async function runCommand(command: string, args: string[]): Promise<void> {
-  await new Promise<void>((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: "inherit",
-      env: process.env,
-    });
-    child.on("error", reject);
-    child.on("exit", (code) => {
-      if (code === 0) {
-        resolve();
-        return;
-      }
-      reject(new Error(`${command} exited with code ${String(code)}`));
-    });
-  });
-}
-
-/**
- * update 命令入口。
- */
-export async function updateCommand(
-  options: UpdateCommandOptions = {},
-): Promise<void> {
-  const manager =
-    options.manager && options.manager !== "auto"
-      ? options.manager
-      : detectInstalledUpdateManager();
-  const invocation = buildGlobalUpdateInvocation(manager);
-
-  emitCliBlock({
-    tone: "accent",
-    title: "Updating downcity",
-    facts: [
-      {
-        label: "Manager",
-        value: manager,
-      },
-      {
-        label: "Command",
-        value: `${invocation.command} ${invocation.args.join(" ")}`,
-      },
-    ],
-  });
-
-  try {
-    await runWithSpinner(
-      () => runCommand(invocation.command, invocation.args),
-      { text: `Installing ${GLOBAL_PACKAGE_NAME}@latest via ${manager}...` },
-    );
-  } catch (error) {
-    throw new CliError({
-      title: "Failed to update downcity",
-      note: error instanceof Error ? error.message : String(error),
-    });
-  }
-
-  emitCliBlock({
-    tone: "success",
-    title: "Downcity updated",
-    facts: [
-      {
-        label: "Package",
-        value: `${GLOBAL_PACKAGE_NAME}@latest`,
-      },
-      {
-        label: "Manager",
-        value: manager,
-      },
-    ],
-    note: "如果当前已有 city runtime / Console 在运行，建议执行 `city restart` 载入最新版本。",
-  });
-}

package/src/config/Config.ts

@@ -1,251 +0,0 @@
-/**
- * City Env Config：city 级环境与配置读取模块。
- *
- * 关键点（中文）
- * - `main/city/env/*` 放的是 city 全局运行态依赖的配置基础设施，不是通用小工具目录。
- * - 这里统一处理 `downcity.json`、项目 `.env`、全局 env store 三类配置来源。
- * - agent 运行时和 Console 模块都通过这里读取配置，避免各处重复拼装规则。
- */
-import dotenv from "dotenv";
-import fs from "fs-extra";
-import path from "path";
-import type { DowncityConfig } from "@/shared/types/DowncityConfig.js";
-import type { JsonObject, JsonValue } from "@/shared/types/Json.js";
-import { ConsoleStore } from "@/shared/utils/store/index.js";
-import { assertProjectExecutionTarget } from "@/agent/project/ProjectExecutionBinding.js";
-
-export type { DowncityConfig };
-
-/**
- * 读取 console 共享环境变量（`env_entries.scope=global`）。
- */
-export function loadGlobalEnvFromStore(): Record<string, string> {
-  const store = new ConsoleStore();
-  try {
-    return store.getGlobalEnvMapSync();
-  } catch {
-    return {};
-  } finally {
-    store.close();
-  }
-}
-
-/**
- * 读取 agent 私有环境变量（`env_entries.scope=agent`）。
- */
-export function loadAgentEnvFromStore(agentId: string): Record<string, string> {
-  const normalizedAgentId = String(agentId || "").trim();
-  if (!normalizedAgentId) return {};
-  const store = new ConsoleStore();
-  try {
-    return store.getAgentEnvMapSync(normalizedAgentId);
-  } catch {
-    return {};
-  } finally {
-    store.close();
-  }
-}
-
-/**
- * 读取 agent 最终环境变量快照。
- *
- * 关键点（中文）
- * - 来源：agent scope env（DB） + `<agent>/.env`（用户文件）。
- * - 冲突时 `.env` 优先，满足用户可在本地即时覆盖。
- */
-export function loadAgentEnvSnapshot(projectRoot: string): Record<string, string> {
-  const agentFromDb = loadAgentEnvFromStore(projectRoot);
-  const projectDotenv = loadProjectDotenv(projectRoot);
-  return {
-    ...agentFromDb,
-    ...projectDotenv,
-  };
-}
-
-/**
- * 读取项目 `.env` 快照（不污染全局 process.env）。
- *
- * 关键点（中文）
- * - 只返回当前 agent 项目自己的 env 映射，供 runtime 局部使用。
- * - 不再把 agent env 注入全局，避免多个 agent 在同一 console 进程里互相污染。
- */
-export function loadProjectDotenv(projectRoot: string): Record<string, string> {
-  // 关键点（中文）
-  // - console 级配置不再走 `~/.downcity/.env`（统一迁移到 downcity.db）
-  // - 仅解析项目 `.env`（agent 级）
-  const projectEnvPath = path.join(projectRoot, ".env");
-  if (!fs.existsSync(projectEnvPath)) {
-    return {};
-  }
-  try {
-    const raw = fs.readFileSync(projectEnvPath, "utf-8");
-    const parsed = dotenv.parse(raw);
-    const result: Record<string, string> = {};
-    for (const [key, value] of Object.entries(parsed)) {
-      const normalizedKey = String(key || "").trim();
-      if (!normalizedKey) continue;
-      result[normalizedKey] = String(value || "").trim();
-    }
-    return result;
-  } catch {
-    return {};
-  }
-}
-
-type ResolvedConfigValue =
-  | JsonValue
-  | undefined
-  | { [key: string]: ResolvedConfigValue }
-  | ResolvedConfigValue[];
-
-function resolveEnvPlaceholdersDeep(
-  value: ResolvedConfigValue,
-  resolveEnvVar: (name: string) => string | undefined,
-): ResolvedConfigValue {
-  if (typeof value === "string") {
-    const match = value.match(/^\$\{([A-Z0-9_]+)\}$/);
-    if (!match) return value;
-    const envVar = match[1];
-    return resolveEnvVar(envVar);
-  }
-
-  if (Array.isArray(value)) {
-    return value.map((item) => resolveEnvPlaceholdersDeep(item, resolveEnvVar));
-  }
-
-  if (value && typeof value === "object") {
-    const obj = value as JsonObject;
-    const out: { [key: string]: ResolvedConfigValue } = {};
-    for (const [k, v] of Object.entries(obj)) {
-      out[k] = resolveEnvPlaceholdersDeep(v as ResolvedConfigValue, resolveEnvVar);
-    }
-    return out;
-  }
-
-  return value;
-}
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
-/**
- * 深合并：对象递归合并，数组与标量以 override 为准。
- *
- * 关键点（中文）
- * - downcity.json 的“继承/覆盖”语义：越靠近 agent 项目的配置优先级越高。
- * - 数组不做 concat，避免出现重复 paths / models。
- */
-function deepMerge(base: unknown, override: unknown): unknown {
-  if (!isPlainObject(base) || !isPlainObject(override)) {
-    return override === undefined ? base : override;
-  }
-
-  const out: Record<string, unknown> = { ...base };
-  for (const [key, overrideValue] of Object.entries(override)) {
-    const baseValue = (base as Record<string, unknown>)[key];
-    if (Array.isArray(overrideValue)) {
-      out[key] = overrideValue;
-      continue;
-    }
-    if (isPlainObject(overrideValue) && isPlainObject(baseValue)) {
-      out[key] = deepMerge(baseValue, overrideValue);
-      continue;
-    }
-    out[key] = overrideValue === undefined ? baseValue : overrideValue;
-  }
-  return out;
-}
-
-function readShipJsonLayer(
-  filePath: string,
-  resolveEnvVar: (name: string) => string | undefined,
-): ResolvedConfigValue {
-  const raw = fs.readJsonSync(filePath) as ResolvedConfigValue;
-  return resolveEnvPlaceholdersDeep(raw, resolveEnvVar);
-}
-
-/**
- * 校验项目层是否误配废弃的 `extensions` 字段。
- *
- * 关键点（中文）
- * - 新版本统一使用 `plugins`。
- * - 发现旧字段时直接报错，避免继续沿用已删除方案。
- */
-function assertNoProjectExtensionsLayer(
-  filePath: string,
-  layer: ResolvedConfigValue,
-): void {
-  if (!isPlainObject(layer)) return;
-  if (!Object.prototype.hasOwnProperty.call(layer, "extensions")) return;
-  throw new Error(
-    `Invalid downcity.json: legacy "extensions" config is no longer supported. Use "plugins" instead (${filePath})`,
-  );
-}
-
-function collectAncestorShipJsonPaths(projectRoot: string): string[] {
-  const paths: string[] = [];
-  const resolvedRoot = path.resolve(projectRoot);
-  let dir = resolvedRoot;
-  while (true) {
-    const candidate = path.join(dir, "downcity.json");
-    if (fs.existsSync(candidate)) paths.push(candidate);
-    const parent = path.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  // root -> leaf
-  return paths.reverse();
-}
-
-export function loadDowncityConfig(
-  projectRoot: string,
-  options?: {
-    projectEnv?: Record<string, string>;
-    agentEnv?: Record<string, string>;
-    globalEnv?: Record<string, string>;
-  },
-): DowncityConfig {
-  const projectDotenv = options?.projectEnv ?? loadProjectDotenv(projectRoot);
-  const agentEnv = options?.agentEnv ?? loadAgentEnvFromStore(projectRoot);
-  const globalEnv = options?.globalEnv ?? loadGlobalEnvFromStore();
-  const runtimeAgentEnv = {
-    ...agentEnv,
-    ...projectDotenv,
-  };
-  /**
-   * 读取 agent 项目私有环境变量（services）。
-   *
-   * 关键点（中文）
-   * - project 层只读当前项目 .env，不再回退到共享 env。
-   * - 从根上杜绝跨 agent 的服务凭据串用。
-   */
-  const resolveProjectEnvVar = (name: string): string | undefined => {
-    const projectValue = String(runtimeAgentEnv[name] || "").trim();
-    return projectValue || undefined;
-  };
-
-  const ancestorShipJsonPaths = collectAncestorShipJsonPaths(projectRoot);
-  if (ancestorShipJsonPaths.length === 0) {
-    throw new Error("downcity.json not found in project directory");
-  }
-
-  let merged: unknown = undefined;
-  for (const p of ancestorShipJsonPaths) {
-    const layer = readShipJsonLayer(p, resolveProjectEnvVar);
-    assertNoProjectExtensionsLayer(p, layer);
-    merged = deepMerge(merged, layer);
-  }
-
-  if (!merged || typeof merged !== "object" || Array.isArray(merged)) {
-    throw new Error("Invalid downcity.json: expected object");
-  }
-
-  const candidate = merged as Partial<DowncityConfig>;
-  if (typeof candidate.name !== "string" || typeof candidate.version !== "string") {
-    throw new Error("Invalid downcity.json: missing required fields name/version");
-  }
-  const config = candidate as DowncityConfig;
-  assertProjectExecutionTarget(config);
-  return config;
-}

package/src/console/AgentStatusApiRoutes.ts

@@ -1,225 +0,0 @@
-/**
- * Console Agent 状态探活路由。
- *
- * 关键点（中文）
- * - 启动窗口期的 agent 状态探测放到 UI 网关内部执行，避免浏览器直接看到 500/503 噪音。
- * - 该接口始终返回 200 + 结构化状态，前端按状态轮询即可。
- * - ready 判定收敛在这里，保持前端逻辑尽量薄。
- */
-
-import type { Hono } from "hono";
-import type { ConsoleAgentOption } from "@/shared/types/Console.js";
-
-type AgentStatusPayload = {
-  success: boolean;
-  running: boolean;
-  serverReady: boolean;
-  servicesReady: boolean;
-  hasChatService: boolean;
-  reason?: string;
-};
-
-type ServicesResponse = {
-  success?: boolean;
-  services?: Array<{
-    name?: unknown;
-    state?: unknown;
-  }>;
-  error?: unknown;
-  message?: unknown;
-};
-
-type ChatStatusResponse = {
-  success?: boolean;
-  error?: unknown;
-  message?: unknown;
-};
-
-function getErrorMessage(error: unknown): string {
-  if (error instanceof Error) {
-    return error.message || String(error);
-  }
-  return String(error);
-}
-
-function isReadyState(input: unknown): boolean {
-  const state = String(input || "").trim().toLowerCase();
-  return ["running", "ok", "active", "enabled", "success", "idle"].includes(state);
-}
-
-async function fetchStatusJson<T>(input: string, init?: RequestInit): Promise<T> {
-  const response = await fetch(input, init);
-  const payload = (await response.json().catch(() => ({}))) as {
-    success?: boolean;
-    error?: unknown;
-    message?: unknown;
-  };
-  if (!response.ok || payload.success === false) {
-    const message =
-      typeof payload.error === "string"
-        ? payload.error
-        : typeof payload.message === "string"
-          ? payload.message
-          : `${response.status} ${response.statusText}`;
-    throw new Error(message);
-  }
-  return payload as T;
-}
-
-async function probeSelectedAgentStatus(
-  selectedAgent: ConsoleAgentOption,
-): Promise<AgentStatusPayload> {
-  const baseUrl = String(selectedAgent.baseUrl || "").trim();
-  if (!selectedAgent.running || !baseUrl) {
-    return {
-      success: true,
-      running: false,
-      serverReady: false,
-      servicesReady: false,
-      hasChatService: false,
-      reason: "Selected agent endpoint is unavailable.",
-    };
-  }
-
-  try {
-    await fetchStatusJson<{ status?: string }>(new URL("/api/status", baseUrl).toString());
-  } catch (error) {
-    return {
-      success: true,
-      running: true,
-      serverReady: false,
-      servicesReady: false,
-      hasChatService: false,
-      reason: getErrorMessage(error),
-    };
-  }
-
-  let servicesPayload: ServicesResponse;
-  try {
-    servicesPayload = await fetchStatusJson<ServicesResponse>(
-      new URL("/api/dashboard/services", baseUrl).toString(),
-    );
-  } catch (error) {
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: false,
-      hasChatService: false,
-      reason: getErrorMessage(error),
-    };
-  }
-
-  const serviceList = Array.isArray(servicesPayload.services)
-    ? servicesPayload.services
-    : [];
-  if (serviceList.length === 0) {
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: false,
-      hasChatService: false,
-      reason: "Service list is empty.",
-    };
-  }
-
-  const allReady = serviceList.every((item) => isReadyState(item.state));
-  const hasChatService = serviceList.some((item) => {
-    const name = String(item.name || "").trim().toLowerCase();
-    return name === "chat";
-  });
-  if (!allReady) {
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: false,
-      hasChatService,
-      reason: "Services are still starting.",
-    };
-  }
-
-  if (!hasChatService) {
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: true,
-      hasChatService: false,
-    };
-  }
-
-  try {
-    await fetchStatusJson<ChatStatusResponse>(
-      new URL("/api/services/command", baseUrl).toString(),
-      {
-        method: "POST",
-        headers: {
-          "content-type": "application/json",
-        },
-        body: JSON.stringify({
-          serviceName: "chat",
-          command: "status",
-          payload: {},
-        }),
-      },
-    );
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: true,
-      hasChatService: true,
-    };
-  } catch (error) {
-    return {
-      success: true,
-      running: true,
-      serverReady: true,
-      servicesReady: false,
-      hasChatService: true,
-      reason: getErrorMessage(error),
-    };
-  }
-}
-
-/**
- * 注册 Agent 状态探活 API 路由。
- */
-export function registerConsoleAgentStatusRoutes(params: {
-  /**
-   * Hono 应用实例。
-   */
-  app: Hono;
-  /**
-   * 从请求中读取目标 agent id。
-   */
-  readRequestedAgentId: (request: Request) => string;
-  /**
-   * 解析当前应使用的 agent。
-   */
-  resolveSelectedAgent: (requestedAgentId: string) => Promise<ConsoleAgentOption | null>;
-}): void {
-  const app = params.app;
-
-  app.get("/api/ui/agents/status", async (c) => {
-    try {
-      const requestedAgentId = params.readRequestedAgentId(c.req.raw);
-      const selectedAgent = await params.resolveSelectedAgent(requestedAgentId);
-      if (!selectedAgent) {
-        return c.json({
-          success: true,
-          running: false,
-          serverReady: false,
-          servicesReady: false,
-          hasChatService: false,
-          reason: "No running agent selected.",
-        } satisfies AgentStatusPayload);
-      }
-      return c.json(await probeSelectedAgentStatus(selectedAgent));
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 500);
-    }
-  });
-}