@downcity/city 1.1.4 → 1.1.6

package/bin/cli/control-plane/ControlPlaneProcess.js

@@ -0,0 +1,395 @@
+/**
+ * ControlPlaneProcess：city gateway / control plane 命令的 runtime/进程控制辅助。
+ *
+ * 关键点（中文）
+ * - 聚合 control plane 与受管 agent 的后台进程控制逻辑。
+ * - 让 `ControlPlaneCommand` 只保留命令树装配，不再混杂大量进程细节。
+ */
+import { resolve } from "path";
+import fs from "fs-extra";
+import { spawn } from "child_process";
+import { getDaemonLogPath, isProcessAlive as isDaemonProcessAlive, readDaemonMeta, readDaemonPid, stopDaemonProcess, } from "../../process/daemon/Manager.js";
+import { ensureRuntimeExecutionBindingReady } from "@downcity/agent";
+import { allocateAvailablePort } from "../../process/daemon/PortAllocator.js";
+import { ensureManagedAgentRegistry, listManagedAgentEntries, markManagedAgentStopped, } from "../../process/registry/CityRegistry.js";
+import { getCityLogPath, getCityPidPath, getCityRuntimeDirPath, } from "../../process/registry/CityPaths.js";
+import { isCityProcessAlive, isCityRunning, readCityPid, } from "../../process/registry/CityRuntime.js";
+import { signalDetachedProcess, sweepDetachedCityProcesses, } from "../../process/registry/ProcessSweep.js";
+import { startCommand } from "../agent/Start.js";
+import { injectAgentContext, resolveAgentName, sleep, } from "../shared/IndexSupport.js";
+import { buildRuntimePortFacts } from "../shared/PortHints.js";
+import { stopControlPlaneCommand } from "./ControlPlaneRuntime.js";
+import { ensureControlPlaneAuthBootstrap } from "./ControlPlaneAuthBootstrap.js";
+import { emitCliBlock } from "../shared/CliReporter.js";
+import { runWithSpinner } from "../../utils/cli/Spinner.js";
+import { CliError } from "../shared/CliError.js";
+import { ensureCityPublicHostEnv } from "../shared/PublicHostEnv.js";
+/**
+ * 启动 city runtime 后台进程。
+ */
+export async function startCityRuntimeCommand(cliPath) {
+    const consoleDir = getCityRuntimeDirPath();
+    const pidPath = getCityPidPath();
+    const logPath = getCityLogPath();
+    await fs.ensureDir(consoleDir);
+    await ensureManagedAgentRegistry();
+    const existingPid = await readCityPid();
+    if (existingPid && isCityProcessAlive(existingPid)) {
+        emitCliBlock({
+            tone: "info",
+            title: "City runtime already running",
+        });
+        await ensureControlPlaneAuthBootstrap();
+        return;
+    }
+    if (existingPid) {
+        await fs.remove(pidPath);
+    }
+    // 关键点（中文）：若 pid 文件已丢失，但旧 city runtime 进程仍在后台存活，这里先清理孤儿进程。
+    const sweep = await sweepDetachedCityProcesses({
+        includeConsole: true,
+    });
+    for (const item of sweep.stopped) {
+        emitCliBlock({
+            tone: "warning",
+            title: "Orphan city runtime cleaned",
+        });
+    }
+    for (const item of sweep.alive) {
+        emitCliBlock({
+            tone: "warning",
+            title: "Orphan city runtime still alive",
+        });
+    }
+    const logFd = fs.openSync(logPath, "a");
+    const publicHost = await ensureCityPublicHostEnv();
+    const child = spawn(process.execPath, [cliPath, "run"], {
+        cwd: process.cwd(),
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: {
+            ...process.env,
+            DOWNCITY_CONTROL_PLANE: "1",
+        },
+    });
+    child.unref();
+    if (!child.pid) {
+        throw new Error("Failed to start console process (missing pid)");
+    }
+    await fs.writeFile(pidPath, String(child.pid), "utf-8");
+    emitCliBlock({
+        tone: "success",
+        title: "City runtime started",
+        facts: [
+            ...buildRuntimePortFacts(),
+            ...(publicHost.changed
+                ? [
+                    {
+                        label: "Public Host",
+                        value: publicHost.value,
+                    },
+                ]
+                : []),
+        ],
+    });
+    await ensureControlPlaneAuthBootstrap();
+}
+/**
+ * 解析 control plane 维护的“正在运行” managed agent 列表。
+ */
+export async function resolveRunningManagedAgents(params) {
+    const syncRegistry = params?.syncRegistry !== false;
+    const entries = await listManagedAgentEntries();
+    const views = [];
+    for (const entry of entries) {
+        const projectRoot = resolve(String(entry.projectRoot || "").trim() || ".");
+        const daemonPid = await readDaemonPid(projectRoot);
+        if (!daemonPid || !isDaemonProcessAlive(daemonPid)) {
+            if (syncRegistry) {
+                await markManagedAgentStopped(projectRoot);
+            }
+            continue;
+        }
+        views.push({
+            projectRoot,
+            registeredPid: entry.pid,
+            daemonPid,
+            running: true,
+            startedAt: entry.startedAt,
+            updatedAt: entry.updatedAt,
+            logPath: getDaemonLogPath(projectRoot),
+        });
+    }
+    return views.sort((a, b) => a.projectRoot.localeCompare(b.projectRoot));
+}
+/**
+ * 停止 city runtime 后台进程（先停 Console，再停受管 agent，最后停 city runtime）。
+ */
+export async function stopCityRuntimeCommand(params) {
+    const timeoutMs = params?.timeoutMs ?? 10_000;
+    const consoleDir = getCityRuntimeDirPath();
+    const pidPath = getCityPidPath();
+    await fs.ensureDir(consoleDir);
+    // Phase 1: Stop Console
+    emitCliBlock({
+        tone: "info",
+        title: "City runtime",
+        summary: "stopping",
+    });
+    await stopControlPlaneCommand();
+    // Phase 2: Stop managed agents
+    const views = await resolveRunningManagedAgents();
+    if (views.length > 0) {
+        emitCliBlock({
+            tone: "info",
+            title: "Managed agents",
+            summary: `stopping · ${views.length} item${views.length > 1 ? "s" : ""}`,
+        });
+        for (const item of views) {
+            try {
+                const result = await runWithSpinner(() => stopDaemonProcess({ projectRoot: item.projectRoot }), { text: `Stopping ${resolveAgentName(item.projectRoot)}...` });
+                emitCliBlock({
+                    tone: result.stopped ? "success" : "info",
+                    title: resolveAgentName(item.projectRoot),
+                    summary: result.stopped ? "stopped" : "already stopped",
+                    facts: [{ label: "project", value: item.projectRoot }],
+                });
+                await markManagedAgentStopped(item.projectRoot);
+            }
+            catch (error) {
+                emitCliBlock({
+                    tone: "error",
+                    title: resolveAgentName(item.projectRoot),
+                    summary: "failed",
+                    facts: [
+                        { label: "project", value: item.projectRoot },
+                        { label: "error", value: String(error) },
+                    ],
+                });
+            }
+        }
+    }
+    // Phase 3: Stop city runtime process
+    const sweepOrphans = async () => {
+        const orphanSweep = await sweepDetachedCityProcesses({
+            includeConsole: true,
+            includeUi: true,
+            includeAgent: true,
+            timeoutMs,
+        });
+        for (const item of orphanSweep.stopped) {
+            emitCliBlock({
+                tone: "success",
+                title: "Orphan process stopped",
+            });
+        }
+        for (const item of orphanSweep.alive) {
+            emitCliBlock({
+                tone: "warning",
+                title: "Orphan process may still be running",
+            });
+        }
+    };
+    const consolePid = await readCityPid();
+    if (!consolePid) {
+        emitCliBlock({
+            tone: "info",
+            title: "City runtime process",
+            summary: "not running",
+        });
+        await sweepOrphans();
+        emitCliBlock({
+            tone: "success",
+            title: "City runtime",
+            summary: "stopped",
+        });
+        return;
+    }
+    if (!isCityProcessAlive(consolePid)) {
+        await fs.remove(pidPath);
+        emitCliBlock({
+            tone: "warning",
+            title: "City runtime process",
+            summary: "stale state cleaned",
+        });
+        await sweepOrphans();
+        emitCliBlock({
+            tone: "success",
+            title: "City runtime",
+            summary: "stopped",
+        });
+        return;
+    }
+    signalDetachedProcess(consolePid, "SIGTERM");
+    const startAt = Date.now();
+    while (Date.now() - startAt < timeoutMs) {
+        if (!isCityProcessAlive(consolePid))
+            break;
+        await sleep(200);
+    }
+    if (isCityProcessAlive(consolePid)) {
+        signalDetachedProcess(consolePid, "SIGKILL");
+        const forceStartAt = Date.now();
+        while (Date.now() - forceStartAt < 2_000) {
+            if (!isCityProcessAlive(consolePid))
+                break;
+            await sleep(100);
+        }
+    }
+    await fs.remove(pidPath);
+    const stillAlive = isCityProcessAlive(consolePid);
+    emitCliBlock({
+        tone: stillAlive ? "warning" : "success",
+        title: "City runtime process",
+        summary: stillAlive ? "may still be running" : "stopped",
+    });
+    await sweepOrphans();
+    emitCliBlock({
+        tone: "success",
+        title: "City runtime",
+        summary: "stopped",
+    });
+}
+async function resolveRestartOptionsFromProjectRoot(projectRoot) {
+    const meta = await readDaemonMeta(projectRoot);
+    if (!meta || !Array.isArray(meta.args)) {
+        return {};
+    }
+    const hostIndex = meta.args.findIndex((item) => item === "--host");
+    if (hostIndex < 0) {
+        return {};
+    }
+    const host = String(meta.args[hostIndex + 1] || "").trim();
+    if (!host) {
+        return {};
+    }
+    return { host };
+}
+/**
+ * 重启后恢复此前仍在运行的 agent daemon。
+ */
+export async function restartManagedAgents(cliPath) {
+    const runningAgents = await resolveRunningManagedAgents();
+    const restartOptionsMap = new Map();
+    for (const item of runningAgents) {
+        restartOptionsMap.set(item.projectRoot, await resolveRestartOptionsFromProjectRoot(item.projectRoot));
+    }
+    await stopCityRuntimeCommand();
+    await startCityRuntimeCommand(cliPath);
+    if (runningAgents.length === 0) {
+        return;
+    }
+    emitCliBlock({
+        tone: "accent",
+        title: "Managed agents",
+        summary: `restarting · ${runningAgents.length} item${runningAgents.length > 1 ? "s" : ""}`,
+    });
+    for (const item of runningAgents) {
+        try {
+            await startCommand(item.projectRoot, restartOptionsMap.get(item.projectRoot) || {});
+        }
+        catch (error) {
+            emitCliBlock({
+                tone: "error",
+                title: "Managed agent restart failed",
+                summary: resolveAgentName(item.projectRoot),
+                facts: [
+                    {
+                        label: "Project",
+                        value: item.projectRoot,
+                    },
+                    {
+                        label: "Error",
+                        value: String(error),
+                    },
+                ],
+            });
+        }
+    }
+}
+/**
+ * 重启 control plane 主进程。
+ */
+export async function restartCityRuntimeCommand(cliPath) {
+    await restartManagedAgents(cliPath);
+}
+/**
+ * 执行 city runtime 常驻进程。
+ */
+export async function runCityRuntimeCommand() {
+    const consoleDir = getCityRuntimeDirPath();
+    const pidPath = getCityPidPath();
+    await fs.ensureDir(consoleDir);
+    await ensureManagedAgentRegistry();
+    await fs.writeFile(pidPath, String(process.pid), "utf-8");
+    const shutdown = async () => {
+        await fs.remove(pidPath);
+        process.exit(0);
+    };
+    process.on("SIGINT", () => {
+        void shutdown();
+    });
+    process.on("SIGTERM", () => {
+        void shutdown();
+    });
+    setInterval(() => {
+        // keep alive
+    }, 60_000);
+}
+/**
+ * 解析并校验目标 agent 是否已登记在 managed agent registry。
+ */
+async function resolveRegisteredAgentProjectRoot(cwd) {
+    const projectRoot = resolve(String(cwd || "."));
+    const entries = await listManagedAgentEntries();
+    const matched = entries.some((entry) => resolve(String(entry.projectRoot || "").trim() || ".") === projectRoot);
+    if (matched)
+        return projectRoot;
+    throw new CliError({
+        title: "Agent is not registered in managed agent registry",
+        note: `project: ${projectRoot}`,
+        fix: "city agent start <path>",
+    });
+}
+/**
+ * 注册 `agent doctor` 对 managed agent registry 的依赖校验。
+ */
+export async function ensureRegisteredAgentProjectRoot(cwd) {
+    return await resolveRegisteredAgentProjectRoot(cwd);
+}
+/**
+ * 为前台 agent 运行补齐上下文与模型绑定。
+ */
+export async function prepareForegroundAgent(cwd, options) {
+    if (!(await isCityRunning())) {
+        throw new CliError({
+            title: "city runtime is not running",
+            fix: "city start",
+        });
+    }
+    injectAgentContext(cwd);
+    const projectRoot = resolve(String(cwd || "."));
+    ensureRuntimeExecutionBindingReady(projectRoot);
+    const shouldForeground = options.foreground === true;
+    if (!shouldForeground) {
+        return {
+            projectRoot,
+            options,
+            shouldForeground,
+        };
+    }
+    const host = String(options.host || "0.0.0.0").trim() || "0.0.0.0";
+    const foregroundPort = options.port !== undefined && options.port !== null && options.port !== ""
+        ? options.port
+        : await allocateAvailablePort({ host });
+    return {
+        projectRoot,
+        shouldForeground,
+        options: {
+            ...options,
+            host,
+            port: foregroundPort,
+        },
+    };
+}
+//# sourceMappingURL=ControlPlaneProcess.js.map

package/bin/cli/control-plane/ControlPlaneProcess.js.map

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

package/bin/cli/control-plane/ControlPlaneRuntime.d.ts

@@ -0,0 +1,98 @@
+/**
+ * `city console`：city gateway / control plane 进程管理与前台运行入口。
+ *
+ * 关键点（中文）
+ * - 默认 `city console` 等同于 `city console start`。
+ * - `run` 仅供内部使用（真正启动 control plane / gateway 进程）。
+ * - 这里管理的是平台控制面，不是单 agent control API。
+ */
+import type { ControlPlaneRuntimeStatus } from "@downcity/agent";
+/**
+ * control plane 模块启动参数。
+ */
+export interface ControlPlaneStartOptions {
+    /**
+     * 是否以公网模式暴露控制面。
+     */
+    public?: boolean;
+    /**
+     * 控制面监听端口。
+     */
+    port?: number;
+    /**
+     * 控制面监听主机。
+     */
+    host?: string;
+}
+/**
+ * 安全读取 control plane pid。
+ */
+export declare function readControlPlanePid(): Promise<number | null>;
+/**
+ * 判断两个 Console 绑定端点是否一致。
+ *
+ * 关键点（中文）
+ * - `127.0.0.1` 和 `0.0.0.0` 不能视为同一个绑定端点。
+ * - 这是 `start -p` 是否已经生效的核心判断，避免本机监听被误报成公网监听。
+ */
+export declare function isControlPlaneBindingMatch(actualHost: string, expectedHost: string): boolean;
+/**
+ * 解析 Console 实际监听 host。
+ *
+ * 关键点（中文）
+ * - 用户显式传 `--host` 时，始终尊重显式值。
+ * - 传 `--public` 时，默认切到 `0.0.0.0`，方便服务器直接对外暴露。
+ * - 未传 host/public 时，仍保持本机模式 `127.0.0.1`。
+ */
+export declare function resolveControlPlaneHostForBinding(options?: ControlPlaneStartOptions): string;
+/**
+ * 解析 detached Console 命令行中的 host/port。
+ */
+export declare function parseControlPlaneProcessCommand(command: string): {
+    host: string;
+    port: number;
+} | null;
+/**
+ * 从 detached 进程列表中挑选可复用的 Console 进程。
+ */
+export declare function findReusableControlPlaneProcess(processes: Array<{
+    pid: number;
+    command: string;
+}>, expected: {
+    host?: string;
+    port: number;
+}): {
+    pid: number;
+    host: string;
+    port: number;
+} | null;
+/**
+ * 获取 Console 当前运行状态。
+ */
+export declare function getControlPlaneRuntimeStatus(): Promise<ControlPlaneRuntimeStatus>;
+/**
+ * 前台运行 Console 网关（内部 run 命令）。
+ */
+export declare function runControlPlaneRuntimeCommand(options?: ControlPlaneStartOptions): Promise<void>;
+export declare function startControlPlaneCommand(params: {
+    options?: ControlPlaneStartOptions;
+    cliPath: string;
+}): Promise<void>;
+/**
+ * 重启后台 Console。
+ *
+ * 关键点（中文）
+ * - 先 stop 再 start，保证加载最新代码与路由。
+ * - 支持通过 options 覆盖 host/port。
+ */
+export declare function restartControlPlaneCommand(params: {
+    options?: ControlPlaneStartOptions;
+    cliPath: string;
+}): Promise<void>;
+/**
+ * 停止后台 Console。
+ */
+export declare function stopControlPlaneCommand(params?: {
+    timeoutMs?: number;
+}): Promise<void>;
+//# sourceMappingURL=ControlPlaneRuntime.d.ts.map

package/bin/cli/control-plane/ControlPlaneRuntime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ControlPlaneRuntime.d.ts","sourceRoot":"","sources":["../../../src/cli/control-plane/ControlPlaneRuntime.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAoBH,OAAO,KAAK,EAEV,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAUzB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASlE;AAwDD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAG5F;AAiBD;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,CAAC,EAAE,wBAAwB,GACjC,MAAM,CAKR;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,MAAM,GAAG;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,IAAI,CAcP;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,QAAQ,EAAE;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,GACA;IACD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,IAAI,CAmBP;AA8CD;;GAEG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,yBAAyB,CAAC,CA8CvF;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,IAAI,CAAC,CAqCf;AAyBD,wBAAsB,wBAAwB,CAAC,MAAM,EAAE;IACrD,OAAO,CAAC,EAAE,wBAAwB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4IhB;AAED;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,OAAO,CAAC,EAAE,wBAAwB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhB;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,CAAC,EAAE;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDhB"}