@downcity/city 1.1.4 → 1.1.5

package/src/cli/agent/AgentManagerTypes.ts

@@ -0,0 +1,29 @@
+/**
+ * `city agent` 交互式 manager 类型。
+ */
+
+export type AgentManagerRootAction =
+  | "list"
+  | "create"
+  | "start"
+  | "manage"
+  | "exit";
+
+export type AgentManagerAgentAction =
+  | "status"
+  | "start"
+  | "stop"
+  | "restart"
+  | "chat"
+  | "configureName"
+  | "configureModel"
+  | "connectChannels"
+  | "back";
+
+export interface AgentManagerAgentSummary {
+  name: string;
+  projectRoot: string;
+  status: "running" | "stopped";
+  modelId?: string;
+  channels: string[];
+}

package/src/cli/agent/AgentReset.ts

@@ -0,0 +1,181 @@
+/**
+ * `city agent reset`：重新配置 Agent 的执行绑定。
+ *
+ * 关键点（中文）
+ * - 当 agent 启动失败（如 model not found）时，不必删除重建，直接重选模型。
+ * - 从平台全局模型池中选择可用模型，更新 downcity.json.execution.modelId。
+ * - 仅修改 execution.modelId，不触碰 PROFILE.md / SOUL.md / channels 等其他配置。
+ */
+
+import path from "node:path";
+import fs from "fs-extra";
+import prompts from "prompts";
+import { getDowncityJsonPath } from "@/config/Paths.js";
+import { PlatformStore } from "@downcity/agent";
+import { emitCliBlock } from "../shared/CliReporter.js";
+import { CliError } from "../shared/CliError.js";
+import { resolveAgentName } from "../shared/IndexSupport.js";
+
+/**
+ * 读取当前 agent 的 execution.modelId。
+ */
+function readCurrentModelId(projectRoot: string): { shipJsonPath: string; current: string } {
+  const shipJsonPath = getDowncityJsonPath(projectRoot);
+  if (!fs.existsSync(shipJsonPath)) {
+    throw new Error(`downcity.json not found: ${shipJsonPath}`);
+  }
+  const raw = fs.readJsonSync(shipJsonPath) as Record<string, unknown>;
+  const current = String(raw?.execution && typeof raw.execution === "object"
+    ? (raw.execution as Record<string, unknown>).modelId || ""
+    : "").trim();
+  return { shipJsonPath, current };
+}
+
+/**
+ * 列出可用的平台模型选项。
+ */
+function listModelChoices(): Array<{ title: string; value: string }> {
+  const store = new PlatformStore();
+  try {
+    const models = store.listModels();
+    const providers = store.listProvidersSync();
+    const providerMap = new Map(providers.map((p) => [p.id, p]));
+    return models
+      .filter((m) => !m.isPaused)
+      .map((m) => {
+        const provider = providerMap.get(m.providerId);
+        const label = provider
+          ? `${provider.type}${provider.baseUrl ? ` · ${provider.baseUrl}` : ""}`
+          : "-";
+        return {
+          title: `${m.id}  [${label}]`,
+          value: m.id,
+        };
+      });
+  } finally {
+    store.close();
+  }
+}
+
+/**
+ * 执行 `city agent reset` 交互流程。
+ */
+export async function agentResetCommand(cwd: string = "."): Promise<void> {
+  const projectRoot = path.resolve(cwd);
+
+  // 1) 校验项目文件存在
+  const shipJsonPath = getDowncityJsonPath(projectRoot);
+  if (!fs.existsSync(shipJsonPath)) {
+    throw new CliError({
+      title: "downcity.json not found",
+      note: `project: ${projectRoot}`,
+      fix: "city agent create <path>",
+    });
+  }
+
+  // 2) 读取当前 modelId
+  const { current } = readCurrentModelId(projectRoot);
+
+  // 3) 获取可用模型列表
+  const choices = listModelChoices();
+  if (choices.length === 0) {
+    throw new CliError({
+      title: "No models available in platform pool",
+      note: "请先配置 provider 并创建 model",
+      fix: "city model create",
+    });
+  }
+
+  // 4) 交互选择模型
+  const response = (await prompts({
+    type: "select",
+    name: "modelId",
+    message: "选择 Agent 使用的模型",
+    choices,
+    initial: current ? Math.max(0, choices.findIndex((c) => c.value === current)) : 0,
+  })) as { modelId?: string };
+
+  const nextModelId = String(response.modelId || "").trim();
+  if (!nextModelId) {
+    emitCliBlock({
+      tone: "info",
+      title: "Agent reset cancelled",
+      summary: resolveAgentName(projectRoot),
+    });
+    return;
+  }
+
+  if (nextModelId === current) {
+    emitCliBlock({
+      tone: "info",
+      title: "Model unchanged",
+      summary: resolveAgentName(projectRoot),
+      facts: [
+        { label: "modelId", value: current },
+        { label: "project", value: projectRoot },
+      ],
+    });
+    return;
+  }
+
+  // 5) 写入 downcity.json
+  const raw = fs.readJsonSync(shipJsonPath) as Record<string, unknown>;
+  raw.execution = { type: "api", modelId: nextModelId };
+  fs.writeJsonSync(shipJsonPath, raw, { spaces: 2 });
+
+  emitCliBlock({
+    tone: "success",
+    title: "Agent reconfigured",
+    summary: resolveAgentName(projectRoot),
+    facts: [
+      { label: "previous", value: current || "(none)" },
+      { label: "current", value: nextModelId },
+      { label: "project", value: projectRoot },
+    ],
+  });
+
+  // 关键点（中文）：检测控制面是否运行，决定能否即时重启。
+  const { isCityRunning } = await import("@/process/registry/CityRuntime.js");
+  const controlPlaneRunning = await isCityRunning();
+
+  if (!controlPlaneRunning) {
+    emitCliBlock({
+      tone: "warning",
+      title: "Control plane is not running",
+      note: "请先启动控制面再重启 agent",
+      facts: [
+        { label: "step 1", value: "city start" },
+        { label: "step 2", value: `city agent restart ${projectRoot}` },
+      ],
+    });
+    return;
+  }
+
+  const restartNow = (await prompts({
+    type: "confirm",
+    name: "restart",
+    message: "立即重启 agent 使新模型生效？",
+    initial: true,
+  })) as { restart?: boolean };
+
+  if (restartNow.restart === true) {
+    const { restartCommand } = await import("./Restart.js");
+    try {
+      await restartCommand(projectRoot, {});
+      return;
+    } catch (error) {
+      emitCliBlock({
+        tone: "error",
+        title: "Agent restart failed",
+        note: error instanceof Error ? error.message : String(error),
+      });
+      return;
+    }
+  }
+
+  emitCliBlock({
+    tone: "info",
+    title: "Agent not restarted",
+    note: `run \`city agent restart ${projectRoot}\` to apply the new model`,
+  });
+}

package/src/cli/agent/AgentSelection.ts

@@ -0,0 +1,297 @@
+/**
+ * agent 列表与交互式选择辅助模块。
+ *
+ * 关键点（中文）
+ * - 统一承接 `city agent list` 的 registry 展示逻辑。
+ * - 统一承接 `city agent start` 在省略路径时的目标选择逻辑。
+ * - 规则固定为：显式路径优先，其次当前目录已初始化，最后才进入交互选择。
+ */
+
+import { existsSync } from "fs";
+import { resolve } from "path";
+import prompts from "prompts";
+import { getDowncityJsonPath, getProfileMdPath } from "@/config/Paths.js";
+import { listManagedAgentEntries } from "@/process/registry/CityRegistry.js";
+import type { ManagedAgentRegistryEntry } from "@downcity/agent";
+import type {
+  CliAgentPromptChoice,
+  CliRegisteredAgentView,
+  ResolveCliAgentStartTargetDecision,
+  ResolveCliAgentStartTargetDecisionInput,
+} from "./AgentSelectionTypes.js";
+import { emitCliBlock, emitCliList } from "../shared/CliReporter.js";
+import { printResult } from "@/utils/cli/CliOutput.js";
+import { CliError } from "../shared/CliError.js";
+import { resolveAgentName } from "../shared/IndexSupport.js";
+import { resolveRunningManagedAgents } from "../control-plane/ControlPlaneProcess.js";
+
+/**
+ * 判断一个目录是否已经满足最小 agent 初始化条件。
+ */
+function isInitializedAgentProject(projectRoot: string): boolean {
+  return existsSync(getProfileMdPath(projectRoot)) && existsSync(getDowncityJsonPath(projectRoot));
+}
+
+/**
+ * 将 registry entry 转换为 CLI 展示视图。
+ */
+function toCliRegisteredAgentView(
+  entry: ManagedAgentRegistryEntry,
+): CliRegisteredAgentView {
+  const projectRoot = resolve(String(entry.projectRoot || "").trim() || ".");
+  return {
+    name: resolveAgentName(projectRoot),
+    projectRoot,
+    status: entry.status === "stopped" ? "stopped" : "running",
+  };
+}
+
+/**
+ * 读取当前 registry 中的已登记 agent 列表。
+ */
+export async function listRegisteredAgentsForCli(): Promise<CliRegisteredAgentView[]> {
+  const entries = await listManagedAgentEntries();
+  const runningViews = await resolveRunningManagedAgents({
+    syncRegistry: false,
+  });
+  const runningProjectRoots = new Set(
+    runningViews.map((item) => resolve(String(item.projectRoot || "").trim() || ".")),
+  );
+  return entries
+    .map((entry) => {
+      const view = toCliRegisteredAgentView(entry);
+      return {
+        ...view,
+        status: runningProjectRoots.has(view.projectRoot) ? "running" : "stopped",
+      } satisfies CliRegisteredAgentView;
+    })
+    .sort((left, right) =>
+      left.name.localeCompare(right.name) || left.projectRoot.localeCompare(right.projectRoot),
+    );
+}
+
+/**
+ * 构建交互式选择器的 choices。
+ */
+export function buildCliAgentPromptChoices(
+  agents: CliRegisteredAgentView[],
+): CliAgentPromptChoice[] {
+  return agents.map((agent) => ({
+    title: agent.name,
+    value: agent.projectRoot,
+    description: `${agent.status} · ${agent.projectRoot}`,
+  }));
+}
+
+/**
+ * 解析 `agent start` 在当前上下文下应该如何决定目标目录。
+ */
+export function resolveCliAgentStartTargetDecision(
+  input: ResolveCliAgentStartTargetDecisionInput,
+): ResolveCliAgentStartTargetDecision {
+  const explicitPath = String(input.pathInput || "").trim();
+  if (explicitPath) {
+    return {
+      mode: "explicit",
+      projectRoot: resolve(explicitPath),
+    };
+  }
+
+  const currentWorkingDirectory = resolve(input.currentWorkingDirectory || ".");
+  if (input.currentDirectoryInitialized) {
+    return {
+      mode: "current",
+      projectRoot: currentWorkingDirectory,
+    };
+  }
+
+  if (input.registeredAgents.length === 0) {
+    return {
+      mode: "error",
+      reason: "no-registered-agents",
+    };
+  }
+
+  if (!input.interactive) {
+    return {
+      mode: "error",
+      reason: "non-interactive",
+    };
+  }
+
+  return {
+    mode: "prompt",
+  };
+}
+
+/**
+ * 通过终端交互让用户选择一个已登记 agent。
+ */
+async function promptRegisteredAgentProjectRoot(
+  agents: CliRegisteredAgentView[],
+): Promise<string | null> {
+  const response = (await prompts({
+    type: "select",
+    name: "projectRoot",
+    message: "选择要启动的 Agent",
+    choices: buildCliAgentPromptChoices(agents),
+    initial: 0,
+  })) as { projectRoot?: string };
+
+  const projectRoot = String(response.projectRoot || "").trim();
+  return projectRoot || null;
+}
+
+/**
+ * 输出已登记 agent 列表。
+ */
+export async function emitRegisteredAgentList(): Promise<void> {
+  const agents = await listRegisteredAgentsForCli();
+  const filteredAgents = agents;
+
+  if (filteredAgents.length === 0) {
+    emitCliBlock({
+      tone: "info",
+      title: "Agents",
+      summary: "0 registered",
+      note: "Run `city agent start <path>` once to register an agent with city.",
+    });
+    return;
+  }
+
+  emitCliList({
+    tone: "accent",
+    title: "Agents",
+    summary: `${filteredAgents.length} registered`,
+    items: filteredAgents.map((agent) => ({
+      tone: agent.status === "running" ? "success" : "info",
+      title: agent.name,
+      facts: [
+        {
+          label: "Project",
+          value: agent.projectRoot,
+        },
+        {
+          label: "Status",
+          value: agent.status,
+        },
+      ],
+    })),
+  });
+}
+
+/**
+ * 输出已登记 agent 列表，可选仅显示运行中项目。
+ */
+export async function emitRegisteredAgentListWithOptions(options?: {
+  /**
+   * 是否只输出当前运行中的 agent。
+   */
+  runningOnly?: boolean;
+  /**
+   * 是否以 JSON 输出。
+   */
+  asJson?: boolean;
+}): Promise<void> {
+  const allAgents = await listRegisteredAgentsForCli();
+  const agents = options?.runningOnly === true
+    ? allAgents.filter((item) => item.status === "running")
+    : allAgents;
+
+  if (options?.asJson === true) {
+    printResult({
+      asJson: true,
+      success: true,
+      title: "agents",
+      payload: {
+        count: agents.length,
+        runningOnly: options.runningOnly === true,
+        agents,
+      },
+    });
+    return;
+  }
+
+  if (agents.length === 0) {
+    emitCliBlock({
+      tone: "info",
+      title: options?.runningOnly === true ? "Running agents" : "Agents",
+      summary: options?.runningOnly === true ? "0 running" : "0 registered",
+      note: options?.runningOnly === true
+        ? "No agent daemon is currently running."
+        : "Run `city agent start <path>` once to register an agent with city.",
+    });
+    return;
+  }
+
+  emitCliList({
+    tone: "accent",
+    title: options?.runningOnly === true ? "Running agents" : "Agents",
+    summary: options?.runningOnly === true
+      ? `${agents.length} running`
+      : `${agents.length} registered`,
+    items: agents.map((agent) => ({
+      tone: agent.status === "running" ? "success" : "info",
+      title: agent.name,
+      facts: [
+        {
+          label: "Project",
+          value: agent.projectRoot,
+        },
+        {
+          label: "Status",
+          value: agent.status,
+        },
+      ],
+    })),
+  });
+}
+
+/**
+ * 为 `city agent start` 解析最终要启动的项目目录。
+ */
+export async function resolveCliAgentStartProjectRoot(
+  pathInput?: string,
+): Promise<string> {
+  const currentWorkingDirectory = resolve(process.cwd());
+  const registeredAgents = await listRegisteredAgentsForCli();
+  const decision = resolveCliAgentStartTargetDecision({
+    pathInput,
+    currentWorkingDirectory,
+    currentDirectoryInitialized: isInitializedAgentProject(currentWorkingDirectory),
+    interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
+    registeredAgents,
+  });
+
+  if (decision.mode === "explicit" || decision.mode === "current") {
+    return decision.projectRoot;
+  }
+
+  if (decision.mode === "error") {
+    if (decision.reason === "no-registered-agents") {
+      throw new CliError({
+        title: "No registered agents",
+        fix: "city agent start <path>",
+      });
+    }
+
+    throw new CliError({
+      title: "Agent path is required",
+      fix: "city agent start <path>",
+    });
+  }
+
+  const selectedProjectRoot = await promptRegisteredAgentProjectRoot(registeredAgents);
+  if (!selectedProjectRoot) {
+    emitCliBlock({
+      tone: "info",
+      title: "Agent start cancelled",
+    });
+    throw new CliError({
+      title: "Agent start cancelled",
+      exitCode: 0,
+    });
+  }
+
+  return selectedProjectRoot;
+}

package/src/cli/agent/AgentSelectionTypes.ts

@@ -0,0 +1,36 @@
+/**
+ * agent 选择与列表展示类型定义。
+ */
+
+export type CliRegisteredAgentView = {
+  name: string;
+  projectRoot: string;
+  status: "running" | "stopped";
+};
+
+export type CliAgentPromptChoice = {
+  title: string;
+  value: string;
+  description: string;
+};
+
+export type ResolveCliAgentStartTargetDecisionInput = {
+  pathInput?: string;
+  currentWorkingDirectory: string;
+  currentDirectoryInitialized: boolean;
+  interactive: boolean;
+  registeredAgents: CliRegisteredAgentView[];
+};
+
+export type ResolveCliAgentStartTargetDecision =
+  | {
+      mode: "explicit" | "current";
+      projectRoot: string;
+    }
+  | {
+      mode: "prompt";
+    }
+  | {
+      mode: "error";
+      reason: "no-registered-agents" | "non-interactive";
+    };