@downcity/agent 1.1.10 → 1.1.11

package/src/host/runtime/CityRuntime.ts

@@ -1,45 +0,0 @@
-/**
- * CityRuntime：city 后台进程状态工具。
- *
- * 关键点（中文）
- * - city 后台负责统一管理/观测多个 agent daemon。
- * - 这里处理的是 city 后台自身的 pid 与判活，不涉及 control plane 进程。
- * - agent daemon 启动前必须确保 city 后台已启动（强约束）。
- */
-
-import fs from "fs-extra";
-import { getCityPidPath } from "./CityPaths.js";
-
-/**
- * 读取 city 后台 pid（读取失败或内容非法返回 null）。
- */
-export async function readCityPid(): Promise<number | null> {
-  try {
-    const raw = await fs.readFile(getCityPidPath(), "utf-8");
-    const pid = Number.parseInt(String(raw).trim(), 10);
-    return Number.isFinite(pid) && pid > 0 ? pid : null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * 判断 city 后台进程是否存活。
- */
-export function isCityProcessAlive(pid: number): boolean {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * 判断 city 后台是否在运行（基于 pid file + 判活）。
- */
-export async function isCityRunning(): Promise<boolean> {
-  const pid = await readCityPid();
-  if (!pid) return false;
-  return isCityProcessAlive(pid);
-}

package/src/host/runtime/ProcessSweep.ts

@@ -1,239 +0,0 @@
-/**
- * 孤儿进程清扫工具。
- *
- * 关键点（中文）
- * - 处理“pid 文件不存在，但旧的 detached 进程还活着”的场景。
- * - 仅匹配 Downcity CLI 自己拉起的 `run` / `console run` / `agent start --foreground true`。
- * - 作为 stop/start 的兜底清理层，避免旧版本进程占住端口却无法被当前 pid 文件追踪。
- * - `run` 指 city 后台，`console run` 指 control plane 命令，二者需要明确区分。
- */
-
-import { execFile as execFileCb } from "node:child_process";
-import { promisify } from "node:util";
-
-const execFileAsync = promisify(execFileCb);
-
-function isProcessAlive(pid: number): boolean {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function normalizeCommand(command: string): string {
-  return String(command || "").replace(/\s+/g, " ").trim();
-}
-
-/**
- * 构建 detached 进程停机时的信号目标。
- *
- * 关键点（中文）
- * - POSIX 下 `detached: true` 会让子进程成为新的进程组 leader。
- * - `-pid` 表示向整个进程组发信号，可覆盖 ACP、shell、watcher 等孙进程。
- * - Windows 不支持负 pid 进程组语义，只能回退到单 pid。
- */
-export function buildDetachedProcessSignalTargets(pid: number): number[] {
-  if (!Number.isInteger(pid) || pid <= 0) return [];
-  if (process.platform === "win32") return [pid];
-  return [-pid, pid];
-}
-
-/**
- * 向 detached 进程发送信号。
- *
- * 关键点（中文）
- * - 优先发送到进程组；失败后再尝试单 pid。
- * - 返回值只表示至少有一个目标接收到了信号，不代表进程已经退出。
- */
-export function signalDetachedProcess(
-  pid: number,
-  signal: NodeJS.Signals,
-): boolean {
-  for (const target of buildDetachedProcessSignalTargets(pid)) {
-    try {
-      process.kill(target, signal);
-      return true;
-    } catch {
-      // 尝试下一个目标。
-    }
-  }
-  return false;
-}
-
-export function isDowncityCliCommand(command: string): boolean {
-  return /\/bin\/main\/modules\/cli\/Index\.js(?:\s|$)/.test(command);
-}
-
-/**
- * 判断命令行是否属于本次清扫目标。
- *
- * 关键点（中文）
- * - `Index.js run` 是 city runtime。
- * - `Index.js console run` 是 control plane runtime。
- * - 两者都包含 `run`，因此必须按完整子命令匹配，不能只查 `run` 词元。
- */
-export function shouldSweepDetachedCityCommand(
-  command: string,
-  params: {
-    includeConsole?: boolean;
-    includeUi?: boolean;
-    includeAgent?: boolean;
-  },
-): boolean {
-  if (!isDowncityCliCommand(command)) return false;
-  if (
-    params.includeConsole &&
-    /\/bin\/main\/modules\/cli\/Index\.js\s+run(?:\s|$)/.test(command)
-  ) {
-    return true;
-  }
-  if (
-    params.includeUi &&
-    /\/bin\/main\/modules\/cli\/Index\.js\s+console\s+run(?:\s|$)/.test(command)
-  ) {
-    return true;
-  }
-  if (
-    params.includeAgent &&
-    /\/bin\/main\/modules\/cli\/Index\.js\s+agent\s+start(?:\s|$)/.test(command) &&
-    /--foreground\s+true\b/.test(command)
-  ) {
-    return true;
-  }
-  return false;
-}
-
-async function listDetachedCityProcesses(params: {
-  includeConsole?: boolean;
-  includeUi?: boolean;
-  includeAgent?: boolean;
-  excludePids: Set<number>;
-}): Promise<Array<{ pid: number; command: string }>> {
-  if (process.platform === "win32") {
-    return [];
-  }
-
-  try {
-    const { stdout } = await execFileAsync(
-      "ps",
-      ["-axo", "pid=,command="],
-      {
-        maxBuffer: 1024 * 1024,
-      },
-    );
-
-    return String(stdout || "")
-      .split("\n")
-      .map((line) => line.match(/^\s*(\d+)\s+(.*)$/))
-      .filter((item): item is RegExpMatchArray => Boolean(item))
-      .map((item) => ({
-        pid: Number.parseInt(item[1] || "", 10),
-        command: normalizeCommand(item[2] || ""),
-      }))
-      .filter((item) => Number.isInteger(item.pid) && item.pid > 0)
-      .filter((item) => !params.excludePids.has(item.pid))
-      .filter((item) => shouldSweepDetachedCityCommand(item.command, params));
-  } catch {
-    return [];
-  }
-}
-
-/**
- * 只探测失联的 Downcity detached 进程，不执行停止动作。
- */
-export async function findDetachedCityProcesses(params?: {
-  includeConsole?: boolean;
-  includeUi?: boolean;
-  includeAgent?: boolean;
-  excludePids?: number[];
-}): Promise<Array<{ pid: number; command: string }>> {
-  const excludePids = new Set<number>([
-    process.pid,
-    ...(Array.isArray(params?.excludePids) ? params.excludePids : []),
-  ]);
-
-  return listDetachedCityProcesses({
-    includeConsole: params?.includeConsole,
-    includeUi: params?.includeUi,
-    includeAgent: params?.includeAgent,
-    excludePids,
-  });
-}
-
-async function stopPid(pid: number, timeoutMs: number): Promise<boolean> {
-  if (!isProcessAlive(pid)) return true;
-
-  if (!signalDetachedProcess(pid, "SIGTERM")) {
-    return !isProcessAlive(pid);
-  }
-
-  const termStart = Date.now();
-  while (Date.now() - termStart < timeoutMs) {
-    if (!isProcessAlive(pid)) return true;
-    await new Promise((resolve) => setTimeout(resolve, 200));
-  }
-
-  try {
-    if (isProcessAlive(pid)) {
-      signalDetachedProcess(pid, "SIGKILL");
-    }
-  } catch {
-    return !isProcessAlive(pid);
-  }
-
-  const killStart = Date.now();
-  while (Date.now() - killStart < 2_000) {
-    if (!isProcessAlive(pid)) return true;
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-
-  return !isProcessAlive(pid);
-}
-
-/**
- * 清扫失联的 Downcity detached 进程。
- */
-export async function sweepDetachedCityProcesses(params?: {
-  includeConsole?: boolean;
-  includeUi?: boolean;
-  includeAgent?: boolean;
-  timeoutMs?: number;
-  excludePids?: number[];
-}): Promise<{
-  matched: Array<{ pid: number; command: string }>;
-  stopped: Array<{ pid: number; command: string }>;
-  alive: Array<{ pid: number; command: string }>;
-}> {
-  const timeoutMs = params?.timeoutMs ?? 8_000;
-  const excludePids = new Set<number>([
-    process.pid,
-    ...(Array.isArray(params?.excludePids) ? params.excludePids : []),
-  ]);
-  const matched = await listDetachedCityProcesses({
-    includeConsole: params?.includeConsole,
-    includeUi: params?.includeUi,
-    includeAgent: params?.includeAgent,
-    excludePids,
-  });
-
-  const stopped: Array<{ pid: number; command: string }> = [];
-  const alive: Array<{ pid: number; command: string }> = [];
-
-  for (const item of matched) {
-    // 关键点（中文）：逐个停止，避免并发 kill 时输出与状态难以对应。
-    const ok = await stopPid(item.pid, timeoutMs);
-    if (ok) {
-      stopped.push(item);
-    } else {
-      alive.push(item);
-    }
-  }
-
-  return {
-    matched,
-    stopped,
-    alive,
-  };
-}

package/src/host/sdk/SdkSessionSystemComposer.ts

@@ -1,113 +0,0 @@
-/**
- * SDK Session 默认 system composer。
- *
- * 关键点（中文）
- * - 面向 `Agent` SDK 的本地会话执行场景。
- * - 注入静态 PROFILE / SOUL / core prompt、显式注入 service system、显式注册 plugin system 与运行时时钟上下文。
- */
-
-import { SessionSystemComposer } from "@session/composer/system/SessionSystemComposer.js";
-import { getSessionRunScope } from "@session/SessionRunScope.js";
-import { transformPromptsIntoSystemMessages } from "@session/composer/system/default/PromptRenderer.js";
-import { buildRuntimeClockSystemPrompt } from "@session/composer/system/default/variables/VariableReplacer.js";
-
-type SdkSessionSystemComposerOptions = {
-  /**
-   * 当前 agent 绑定的项目根目录。
-   */
-  projectRoot: string;
-
-  /**
-   * 读取当前生效的静态 system 文本集合。
-   */
-  getStaticSystemPrompts: () => string[];
-
-  /**
-   * 读取当前显式注册 plugin 的 system 文本集合。
-   */
-  getPluginSystemPrompts: () => Promise<string[]>;
-
-  /**
-   * 读取当前显式注入 service 的 system 文本集合。
-   */
-  getServiceSystemPrompts: () => Promise<string[]>;
-};
-
-/**
- * SDK Session system composer 实现。
- */
-export class SdkSessionSystemComposer extends SessionSystemComposer {
-  readonly name = "sdk_prompt_system";
-
-  private readonly projectRoot: string;
-  private readonly getStaticSystemPrompts: SdkSessionSystemComposerOptions["getStaticSystemPrompts"];
-  private readonly getServiceSystemPrompts: SdkSessionSystemComposerOptions["getServiceSystemPrompts"];
-  private readonly getPluginSystemPrompts: SdkSessionSystemComposerOptions["getPluginSystemPrompts"];
-
-  constructor(options: SdkSessionSystemComposerOptions) {
-    super();
-    this.projectRoot = String(options.projectRoot || "").trim();
-    this.getStaticSystemPrompts = options.getStaticSystemPrompts;
-    this.getServiceSystemPrompts = options.getServiceSystemPrompts;
-    this.getPluginSystemPrompts = options.getPluginSystemPrompts;
-    if (!this.projectRoot) {
-      throw new Error("SdkSessionSystemComposer requires a non-empty projectRoot");
-    }
-  }
-
-  /**
-   * 解析本轮 SDK session system messages。
-   */
-  async resolve() {
-    const sessionId = String(getSessionRunScope()?.sessionId || "").trim();
-    if (!sessionId) {
-      throw new Error("SdkSessionSystemComposer.resolve requires a non-empty sessionId");
-    }
-    const staticPrompts = this.getStaticSystemPrompts().filter((item) =>
-      String(item || "").trim(),
-    );
-    const staticMessages = await transformPromptsIntoSystemMessages(
-      staticPrompts,
-      {
-        projectPath: this.projectRoot,
-        sessionId,
-        variableMode: "stable",
-      },
-    );
-    const servicePrompts = (await this.getServiceSystemPrompts()).filter((item) =>
-      String(item || "").trim(),
-    );
-    const serviceMessages = await transformPromptsIntoSystemMessages(
-      servicePrompts,
-      {
-        projectPath: this.projectRoot,
-        sessionId,
-        variableMode: "stable",
-      },
-    );
-    const pluginPrompts = (await this.getPluginSystemPrompts()).filter((item) =>
-      String(item || "").trim(),
-    );
-    const pluginMessages = await transformPromptsIntoSystemMessages(
-      pluginPrompts,
-      {
-        projectPath: this.projectRoot,
-        sessionId,
-        variableMode: "stable",
-      },
-    );
-
-    return [
-      ...staticMessages,
-      ...serviceMessages,
-      ...pluginMessages,
-      {
-        role: "system" as const,
-        content: buildRuntimeClockSystemPrompt({
-          projectPath: this.projectRoot,
-          sessionId,
-        }),
-      },
-    ];
-  }
-}