@downcity/city 1.1.4 → 1.1.6

package/src/cli/IndexSupport.ts

@@ -1,138 +0,0 @@
-/**
- * CLI 入口共享工具。
- *
- * 关键点（中文）
- * - 统一承载 `Index.ts`、console 命令、agent 命令共用的参数解析与上下文注入逻辑。
- * - 保持共享工具纯函数化，避免命令装配文件继续膨胀。
- */
-
-import { readFileSync, existsSync } from "fs";
-import { basename, join, resolve } from "path";
-import { emitCliHeader, emitCliBlock, resetCliSectionFlow } from "./CliReporter.js";
-import { CliError } from "@/types/cli/CliError.js";
-
-/**
- * 在关键运行命令执行前打印当前 city 版本。
- *
- * 说明（中文）
- * - 仅用于 runtime 相关命令，避免影响 `config --json` 等结构化输出。
- * - 全局 catch CliError，统一渲染错误输出。
- */
-export function createVersionBanner<TArgs extends unknown[]>(
-  version: string,
-  action: (...args: TArgs) => Promise<void> | void,
-): (...args: TArgs) => Promise<void> {
-  return async (...args: TArgs): Promise<void> => {
-    // 关键点（中文）：`--json` 场景禁止在 stdout 混入 banner，避免破坏机器可解析输出。
-    const hasJsonMode = args.some((arg) => {
-      if (!arg || typeof arg !== "object") return false;
-      if (!Object.prototype.hasOwnProperty.call(arg, "json")) return false;
-      return (arg as { json?: unknown }).json === true;
-    });
-    if (!hasJsonMode) {
-      resetCliSectionFlow();
-      emitCliHeader(version);
-    }
-
-    try {
-      await action(...args);
-    } catch (error) {
-      if (error instanceof CliError) {
-        if (hasJsonMode) {
-          console.log(
-            JSON.stringify(
-              {
-                success: false,
-                error: error.message,
-                ...(error.note ? { detail: error.note } : {}),
-                ...(error.fix ? { fix: error.fix } : {}),
-              },
-              null,
-              2,
-            ),
-          );
-        } else {
-          emitCliBlock({
-            tone: "error",
-            title: error.message,
-            note: error.note,
-            facts: error.fix ? [{ label: "fix", value: error.fix }] : undefined,
-          });
-        }
-        process.exitCode = error.exitCode;
-        return;
-      }
-      // 非 CliError 继续向上抛，让 Node.js 默认处理。
-      throw error;
-    }
-  };
-}
-
-/**
- * 解析端口参数。
- */
-export function parsePort(value: string): number {
-  const num = Number.parseInt(value, 10);
-  if (
-    !Number.isFinite(num) ||
-    Number.isNaN(num) ||
-    !Number.isInteger(num) ||
-    num <= 0 ||
-    num > 65535
-  ) {
-    throw new Error(`Invalid port: ${value}`);
-  }
-  return num;
-}
-
-/**
- * 解析布尔参数。
- */
-export function parseBoolean(value: string | undefined): boolean {
-  if (value === undefined) return true;
-  const normalized = String(value).trim().toLowerCase();
-  if (["true", "1", "yes", "y", "on"].includes(normalized)) return true;
-  if (["false", "0", "no", "n", "off"].includes(normalized)) return false;
-  throw new Error(`Invalid boolean: ${value}`);
-}
-
-/**
- * 异步睡眠工具。
- */
-export const sleep = async (ms: number): Promise<void> =>
-  new Promise((resolve) => setTimeout(resolve, ms));
-
-/**
- * 从项目根目录推断 agent 名称。
- */
-export function resolveAgentName(projectRoot: string): string {
-  const fallback = basename(projectRoot);
-  const shipJsonPath = join(projectRoot, "downcity.json");
-  if (!existsSync(shipJsonPath)) return fallback;
-
-  try {
-    const raw = readFileSync(shipJsonPath, "utf-8");
-    const parsed = JSON.parse(raw) as { name?: unknown };
-    if (typeof parsed.name === "string" && parsed.name.trim()) {
-      return parsed.name.trim();
-    }
-  } catch {
-    // ignore parse errors and fallback to dirname
-  }
-
-  return fallback;
-}
-
-/**
- * 注入当前 agent 执行上下文。
- */
-export function injectAgentContext(pathInput: string = "."): {
-  projectRoot: string;
-  agentName: string;
-} {
-  const projectRoot = resolve(String(pathInput || "."));
-  const agentName = resolveAgentName(projectRoot);
-  process.env.DC_AGENT_PATH = projectRoot;
-  process.env.DC_AGENT_NAME = agentName;
-  return { projectRoot, agentName };
-}

package/src/cli/Init.ts

@@ -1,291 +0,0 @@
-/**
- * `city agent create`：在目标目录生成最小可用的 Downcity 工程骨架与配置文件。
- *
- * 目标
- * - 生成 `PROFILE.md` / `SOUL.md` / `downcity.json` / `.downcity/` 目录结构与 schema 文件
- * - 通过交互式问题收集必要配置（模型、channels 等）
- *
- * 设计要点
- * - Chat channels 支持多选：仅写入用户选择的 channels（未选择的不出现在 `downcity.json`）
- * - 避免写入无意义的默认值：能省则省，保持配置简洁
- */
-
-import path from "path";
-import os from "os";
-import prompts from "prompts";
-import fs from "fs-extra";
-import fg from "fast-glob";
-import { getProfileMdPath, getDowncityJsonPath, getSoulMdPath } from "@/config/Paths.js";
-import {
-  initializeAgentProject,
-  listConsoleModelChoices,
-  normalizeDefaultAgentName,
-} from "@downcity/agent";
-import type { AgentProjectChannel } from "@downcity/agent/shared/types/AgentProject.js";
-import type { ExecutionBindingConfig } from "@downcity/agent/shared/types/ExecutionBinding.js";
-import { emitCliBlock, emitCliList } from "./CliReporter.js";
-import { CliError } from "@/types/cli/CliError.js";
-
-type InitPromptResponse = {
-  name?: string;
-  primaryModelId?: string;
-  channels?: string[];
-};
-
-
-/**
- * init 命令入口。
- *
- * 流程（中文）
- * 1) 校验项目目录与覆盖策略
- * 2) 交互收集配置
- * 3) 生成配置与目录
- * 4) 生成最小可运行结构（skills 目录仅创建，不做自动同步/安装）
- */
-export async function initCommand(
-  cwd: string = ".",
-  options: { force?: boolean } = {},
-): Promise<void> {
-  const projectRoot = path.resolve(cwd);
-  const projectBaseName = path.basename(projectRoot);
-  const defaultAgentName =
-    normalizeDefaultAgentName(projectBaseName) || projectBaseName;
-  let allowOverwrite = Boolean(options.force);
-
-  emitCliBlock({
-    tone: "accent",
-    title: "Initializing agent project",
-    facts: [
-      {
-        label: "Project",
-        value: projectRoot,
-      },
-    ],
-  });
-
-  // Check if core initialization files already exist
-  const existingProfileMd = fs.existsSync(getProfileMdPath(projectRoot));
-  const existingSoulMd = fs.existsSync(getSoulMdPath(projectRoot));
-  const existingShipJson = fs.existsSync(getDowncityJsonPath(projectRoot));
-  const consoleModelChoices = await listConsoleModelChoices();
-  const consoleModelIds = consoleModelChoices.map((item) => item.value);
-
-  // 关键点（中文）：已存在的 PROFILE.md 永远不覆盖，只在 downcity.json 已存在时询问覆盖。
-  if (existingShipJson) {
-    if (!allowOverwrite) {
-      const confirmResponse = (await prompts({
-        type: "confirm",
-        name: "overwrite",
-        message:
-          "downcity.json already exists. Overwrite existing downcity.json and continue?",
-        initial: false,
-      })) as { overwrite?: boolean };
-
-      if (!confirmResponse.overwrite) {
-        emitCliBlock({
-          tone: "info",
-          title: "Initialization cancelled",
-        });
-        return;
-      }
-      allowOverwrite = true;
-    }
-  }
-
-  // Collect configuration information
-  // 交互采集（中文）：agent name + model + channels。
-  const response = (await prompts([
-    {
-      type: "text",
-      name: "name",
-      message: "Agent name",
-      initial: defaultAgentName,
-    },
-    {
-      type: "select",
-      name: "primaryModelId",
-      message: "Select primary model (from console model pool)",
-      choices: consoleModelChoices,
-      initial: 0,
-    },
-    {
-      // 关键交互: Chat channels 允许多选，未选择的就不写入 downcity.json
-      type: "multiselect",
-      name: "channels",
-      message: "Select chat channels (multi-select)",
-      choices: [
-        { title: "Telegram", value: "telegram" },
-        { title: "Feishu", value: "feishu" },
-        { title: "QQ", value: "qq" },
-      ],
-    },
-  ])) as InitPromptResponse;
-
-  // 关键点（中文）：agent_name 同时用于 `downcity.json.name` 与 init 模板变量渲染，避免两处来源不一致。
-  const agentName =
-    String(response.name || "").trim() || defaultAgentName;
-  const primaryModelId =
-    String(response.primaryModelId || "").trim() || "default";
-  if (consoleModelIds.length === 0) {
-    throw new CliError({
-      title: "Console model pool is empty",
-      note: "Please configure at least one model first.",
-      fix: "city model create",
-    });
-  }
-  const execution: ExecutionBindingConfig = {
-    type: "api",
-    modelId: primaryModelId,
-  };
-  const selectedChannels = Array.isArray(response.channels)
-    ? (response.channels as AgentProjectChannel[])
-    : [];
-  const initResult = await initializeAgentProject({
-    projectRoot,
-    agentName,
-    execution,
-    channels: selectedChannels,
-    forceOverwriteShipJson: allowOverwrite,
-  });
-
-  const createdItems: string[] = [];
-  const skippedItems: string[] = [];
-  if (!existingProfileMd && initResult.createdFiles.includes("PROFILE.md")) {
-    createdItems.push("PROFILE.md");
-  } else if (existingProfileMd) {
-    skippedItems.push("PROFILE.md");
-  }
-  if (!existingSoulMd && initResult.createdFiles.includes("SOUL.md")) {
-    createdItems.push("SOUL.md");
-  } else if (existingSoulMd) {
-    skippedItems.push("SOUL.md");
-  }
-  createdItems.push("downcity.json", ".downcity/", "downcity.schema.json");
-  skippedItems.push(".env", ".env.example");
-
-  emitCliBlock({
-    tone: "success",
-    title: "Initialization complete",
-    summary: agentName,
-  });
-  emitCliList({
-    tone: "accent",
-    title: "Created",
-    items: createdItems.map((item) => ({ title: item })),
-  });
-  emitCliList({
-    tone: "info",
-    title: "Skipped",
-    items: skippedItems.map((item) => ({ title: item })),
-  });
-  if (primaryModelId) {
-    emitCliBlock({
-      tone: "info",
-      title: "Execution",
-      summary: "api",
-      facts: [
-        {
-          label: "Model ID",
-          value: primaryModelId,
-        },
-        {
-          label: "Source",
-          value: "~/.downcity/downcity.db",
-        },
-      ],
-    });
-  }
-
-  const channelItems: Array<{ title: string; facts: Array<{ label: string; value: string }> }> = [];
-  if (selectedChannels.includes("feishu")) {
-    channelItems.push({
-      title: "feishu",
-      facts: [
-        {
-          label: "Bind",
-          value: "services.chat.channels.feishu.channelAccountId",
-        },
-        {
-          label: "Manage",
-          value: "Console > Global / Channel Accounts",
-        },
-      ],
-    });
-  }
-  if (selectedChannels.includes("telegram")) {
-    channelItems.push({
-      title: "telegram",
-      facts: [
-        {
-          label: "Bind",
-          value: "services.chat.channels.telegram.channelAccountId",
-        },
-        {
-          label: "Manage",
-          value: "Console > Global / Channel Accounts",
-        },
-      ],
-    });
-  }
-  if (selectedChannels.includes("qq")) {
-    channelItems.push({
-      title: "qq",
-      facts: [
-        {
-          label: "Bind",
-          value: "services.chat.channels.qq.channelAccountId",
-        },
-        {
-          label: "Manage",
-          value: "Console > Global / Channel Accounts",
-        },
-      ],
-    });
-  }
-  if (channelItems.length > 0) {
-    emitCliList({
-      tone: "accent",
-      title: "Channels",
-      items: channelItems,
-    });
-  }
-
-  const nextSteps: string[] = [
-    "Edit PROFILE.md to customize agent behavior",
-    "Edit SOUL.md to customize your core operating principles",
-    "Edit downcity.json.execution to adjust execution target",
-  ];
-  if (primaryModelId) {
-    nextSteps.push("Edit downcity.json.execution.modelId (bind to console API model id)");
-    nextSteps.push('Use "city model ..." to manage global model pool');
-  }
-
-  if (selectedChannels.includes("telegram")) {
-    nextSteps.push(
-      "Bind services.chat.channels.telegram.channelAccountId to an existing channel account",
-    );
-  }
-  if (selectedChannels.includes("feishu")) {
-    nextSteps.push(
-      "Bind services.chat.channels.feishu.channelAccountId to an existing channel account",
-    );
-  }
-  if (selectedChannels.includes("qq")) {
-    nextSteps.push(
-      "Bind services.chat.channels.qq.channelAccountId to an existing channel account",
-    );
-  }
-  nextSteps.push('Run "city agent start" to start the agent');
-
-  emitCliList({
-    tone: "accent",
-    title: "Next steps",
-    items: nextSteps.map((line, idx) => ({
-      title: `${idx + 1}. ${line}`,
-    })),
-  });
-  emitCliBlock({
-    tone: "info",
-    title: "Tip",
-  });
-}

package/src/cli/ModelCommandShared.ts

@@ -1,126 +0,0 @@
-/**
- * `city model` 命令共享工具。
- *
- * 关键点（中文）
- * - 统一封装 provider / model 子命令共用的解析、脱敏、错误输出逻辑。
- * - 保持 `Model.ts` 只负责命令装配，不再承载具体业务实现。
- */
-
-import { printResult } from "@/utils/cli/CliOutput.js";
-import { ModelManager, type ModelPreset } from "@/model/ModelManager.js";
-import type { LlmProviderType } from "@downcity/agent/shared/types/LlmConfig.js";
-import { ConsoleStore } from "@/store/index.js";
-
-const SUPPORTED_PROVIDER_TYPES: readonly LlmProviderType[] = [
-  "anthropic",
-  "openai",
-  "deepseek",
-  "gemini",
-  "open-compatible",
-  "open-responses",
-  "moonshot-cn",
-  "moonshot-ai",
-  "kimi-code",
-  "xai",
-  "huggingface",
-  "openrouter",
-];
-
-const modelManager = new ModelManager();
-
-function maskSecret(value: string | undefined): string | undefined {
-  const raw = String(value || "").trim();
-  if (!raw) return undefined;
-  if (raw.length <= 8) return "***";
-  return `${raw.slice(0, 4)}***${raw.slice(-4)}`;
-}
-
-export function toSafeProviderView<T extends { apiKey?: string }>(provider: T): T & {
-  apiKeyMasked?: string;
-} {
-  const masked = maskSecret(provider.apiKey);
-  return {
-    ...provider,
-    apiKey: masked ? "***masked***" : undefined,
-    apiKeyMasked: masked,
-  };
-}
-
-export { parseBoolean as parseBooleanOption } from "./IndexSupport.js";
-
-export function parseNumberOption(value: string): number {
-  const num = Number(value);
-  if (!Number.isFinite(num) || Number.isNaN(num)) {
-    throw new Error(`Invalid number: ${value}`);
-  }
-  return num;
-}
-
-export function parsePositiveIntegerOption(value: string): number {
-  const num = Number.parseInt(value, 10);
-  if (!Number.isFinite(num) || Number.isNaN(num) || !Number.isInteger(num) || num <= 0) {
-    throw new Error(`Invalid positive integer: ${value}`);
-  }
-  return num;
-}
-
-export function assertProviderType(inputType: string): LlmProviderType {
-  const candidate = String(inputType || "").trim() as LlmProviderType;
-  if (!SUPPORTED_PROVIDER_TYPES.includes(candidate)) {
-    throw new Error(
-      `Unsupported provider type: ${inputType}. Supported: ${SUPPORTED_PROVIDER_TYPES.join(", ")}`,
-    );
-  }
-  return candidate;
-}
-
-export function getSupportedProviderTypes(): readonly LlmProviderType[] {
-  return SUPPORTED_PROVIDER_TYPES;
-}
-
-export function resolveModelPresetOrThrow(input?: string): ModelPreset | undefined {
-  const presetId = String(input || "").trim();
-  if (!presetId) return undefined;
-  const preset = modelManager.getPreset(presetId);
-  if (!preset) throw new Error(`Unknown model preset: ${presetId}`);
-  return preset;
-}
-
-export async function runStoreCommand(
-  options: { json?: boolean },
-  handler: (store: ConsoleStore) => Promise<{
-    title: string;
-    payload: Record<string, unknown>;
-  }>,
-): Promise<void> {
-  const asJson = options.json !== false;
-  let store: ConsoleStore | null = null;
-  try {
-    store = new ConsoleStore();
-    const result = await handler(store);
-    printResult({
-      asJson,
-      success: true,
-      title: result.title,
-      payload: result.payload,
-    });
-  } catch (error) {
-    printResult({
-      asJson,
-      success: false,
-      title: "console model command failed",
-      payload: {
-        error:
-          error instanceof Error &&
-          String(error.message || "").includes("unable to open database file")
-            ? 'Console model store is unavailable. Run "city init" first.'
-            : error instanceof Error
-              ? error.message
-              : String(error),
-      },
-    });
-    process.exitCode = 1;
-  } finally {
-    store?.close();
-  }
-}