@downcity/city 1.1.4 → 1.1.5

package/src/cli/ServiceActionCommands.ts

@@ -1,414 +0,0 @@
-/**
- * Service action CLI 注册器。
- *
- * 关键点（中文）
- * - 负责把 service actions 挂到 commander（`city <service> <action>`）。
- * - 仅处理 CLI 参数映射与远程调用，不承载 service 状态机逻辑。
- * - service 注册表与调度时间解析统一复用 agent 包实现，避免 city 维护第二套事实源。
- */
-
-import path from "node:path";
-import type { Command } from "commander";
-import { callAgentTransport } from "@downcity/agent";
-import { listRegisteredServices } from "@downcity/agent/service/ServiceClassRegistry.js";
-import { parseScheduledRunAtMsOrThrow } from "@downcity/agent/service/schedule/Time.js";
-import type { Service, ServiceAction } from "@downcity/agent/shared/types/Service.js";
-import type { JsonObject, JsonValue } from "@downcity/agent/shared/types/Json.js";
-import type { ServiceCommandScheduleInput } from "@downcity/agent/shared/types/ServiceSchedule.js";
-import type { ServiceCommandResponse } from "@downcity/agent/shared/types/Services.js";
-import type { ServiceCliBaseOptions } from "@downcity/agent/shared/types/Services.js";
-import { printResult } from "@/utils/cli/CliOutput.js";
-import { parseBoolean, parsePort } from "@/cli/IndexSupport.js";
-import { runServiceControlCommand } from "@/cli/ServiceCommandRemote.js";
-
-const CHAT_SERVICE_HELP_TEXT = [
-  "",
-  "Chat quick guide:",
-  "  直接输出 assistant 文本会发送到当前 chat channel。",
-  "  跨 chat 发送请使用 `city chat send --chat-key <chatKey>`。",
-  "  如果要发正文/附件/定时消息，先看 `city chat send --help` 与 `city chat react --help`。",
-  "",
-  "Common examples:",
-  "  city chat send --text 'done'",
-  "  city chat send --chat-key <chatKey> --text 'done'",
-  "  city chat react --message-id <messageId> --emoji '✅'",
-  "  city chat context",
-  "  city chat history --limit 30",
-].join("\n");
-
-const CHAT_HELP_HOOK_ATTACHED = Symbol("chat-help-hook-attached");
-
-type ServiceCliBridgeOptions = {
-  path?: string;
-  host?: string;
-  port?: number;
-  token?: string;
-  json?: boolean;
-};
-
-function resolveProjectRoot(pathInput?: string): string {
-  return path.resolve(String(pathInput || "."));
-}
-
-function toJsonValue(input: unknown): JsonValue | undefined {
-  if (input === null) return null;
-  if (typeof input === "string") return input;
-  if (typeof input === "number") {
-    return Number.isFinite(input) ? input : undefined;
-  }
-  if (typeof input === "boolean") return input;
-
-  if (Array.isArray(input)) {
-    const values: JsonValue[] = [];
-    for (const item of input) {
-      const value = toJsonValue(item);
-      if (value === undefined) continue;
-      values.push(value);
-    }
-    return values;
-  }
-
-  if (typeof input === "object" && input) {
-    const output: JsonObject = {};
-    for (const [key, value] of Object.entries(
-      input as Record<string, unknown>,
-    )) {
-      const normalized = toJsonValue(value);
-      if (normalized === undefined) continue;
-      output[key] = normalized;
-    }
-    return output;
-  }
-
-  return undefined;
-}
-
-function toServiceActionCommandOpts(
-  options: Record<string, unknown>,
-): Record<string, JsonValue> {
-  const reservedKeys = new Set(["path", "host", "port", "token", "json", "delay", "time"]);
-  const normalized: Record<string, JsonValue> = {};
-  for (const [key, value] of Object.entries(options)) {
-    if (reservedKeys.has(key)) continue;
-    const nextValue = toJsonValue(value);
-    if (nextValue === undefined) continue;
-    normalized[key] = nextValue;
-  }
-  return normalized;
-}
-
-function toServiceCliBridgeOptions(
-  options: Record<string, unknown>,
-): ServiceCliBridgeOptions {
-  return {
-    path: typeof options.path === "string" ? options.path : ".",
-    host: typeof options.host === "string" ? options.host : undefined,
-    port: typeof options.port === "number" ? options.port : undefined,
-    token: typeof options.token === "string" ? options.token : undefined,
-    json: options.json !== false,
-  };
-}
-
-function flattenServiceActionCommandArgs(values: unknown[]): string[] {
-  const out: string[] = [];
-  const pushValue = (value: unknown): void => {
-    if (value === undefined || value === null) return;
-    if (Array.isArray(value)) {
-      for (const item of value) pushValue(item);
-      return;
-    }
-    const text = String(value).trim();
-    if (!text) return;
-    out.push(text);
-  };
-  for (const value of values) {
-    pushValue(value);
-  }
-  return out;
-}
-
-function isCommanderCommandLike(value: unknown): value is Command {
-  return Boolean(
-    value &&
-      typeof value === "object" &&
-      typeof (value as { opts?: unknown }).opts === "function",
-  );
-}
-
-function isPlainOptionsObject(
-  value: unknown,
-): value is Record<string, unknown> {
-  return Boolean(
-    value &&
-      typeof value === "object" &&
-      !Array.isArray(value) &&
-      typeof (value as { opts?: unknown }).opts !== "function",
-  );
-}
-
-/**
- * 判断 command 是否已定义指定长参数。
- */
-function hasLongOption(command: Command, longFlag: string): boolean {
-  return command.options.some((item) => item.long === longFlag);
-}
-
-/**
- * 从 CLI 选项中提取通用调度输入。
- */
-function extractCommandScheduleInput(
-  options: Record<string, unknown>,
-): ServiceCommandScheduleInput | undefined {
-  const runAtMs = parseScheduledRunAtMsOrThrow({
-    delay: options.delay as string | number | undefined,
-    time: options.time as string | number | undefined,
-  });
-  if (typeof runAtMs !== "number") return undefined;
-  return { runAtMs };
-}
-
-function registerServiceActionCommand(params: {
-  program: Command;
-  service: Service;
-  actionName: string;
-  action: ServiceAction<JsonValue, JsonValue>;
-}): void {
-  const commandSpec = params.action.command;
-  if (!commandSpec) return;
-
-  const serviceCommand =
-    params.program.commands.find((item) => item.name() === params.service.name) ||
-    params.program
-      .command(params.service.name)
-      .description(`${params.service.name} service actions`)
-      .helpOption("--help", "display help for command");
-
-  if (
-    params.service.name === "chat" &&
-    !(serviceCommand as Command & { [CHAT_HELP_HOOK_ATTACHED]?: boolean })[
-      CHAT_HELP_HOOK_ATTACHED
-    ]
-  ) {
-    const chatCommand = serviceCommand as Command & {
-      [CHAT_HELP_HOOK_ATTACHED]?: boolean;
-    };
-    chatCommand.on("--help", () => {
-      console.log(CHAT_SERVICE_HELP_TEXT);
-    });
-    chatCommand[CHAT_HELP_HOOK_ATTACHED] = true;
-  }
-
-  const actionCommand = serviceCommand
-    .command(params.actionName)
-    .description(commandSpec.description)
-    .helpOption("--help", "display help for command")
-    .option("--path <path>", "项目根目录（默认当前目录）", ".")
-    .option("--host <host>", "Server host（覆盖自动解析）")
-    .option("--port <port>", "Server port（覆盖自动解析）", parsePort)
-    .option("--token <token>", "覆盖 Bearer Token（仅远程 HTTP 调用需要；默认本地走 IPC）")
-    .option("--json [enabled]", "以 JSON 输出", parseBoolean, true);
-
-  commandSpec.configure?.(actionCommand);
-  if (!hasLongOption(actionCommand, "--delay")) {
-    actionCommand.option("--delay <ms>", "延迟执行毫秒数（所有 service action 通用）");
-  }
-  if (!hasLongOption(actionCommand, "--time")) {
-    actionCommand.option(
-      "--time <time>",
-      "定时执行时间（Unix 时间戳秒/毫秒或 ISO 时间，所有 service action 通用）",
-    );
-  }
-
-  actionCommand.action(async (...rawArgs: unknown[]) => {
-    const last = rawArgs.at(-1);
-    const commandLike = isCommanderCommandLike(last) ? last : null;
-    const positionalArgs = commandLike
-      ? flattenServiceActionCommandArgs(
-          Array.isArray(commandLike.processedArgs)
-            ? (commandLike.processedArgs as unknown[])
-            : [],
-        )
-      : (() => {
-          const fallbackLast = rawArgs.at(-1);
-          const fallbackPositional = isPlainOptionsObject(fallbackLast)
-            ? rawArgs.slice(0, -1)
-            : rawArgs;
-          return flattenServiceActionCommandArgs(fallbackPositional);
-        })();
-    const allOptions = commandLike
-      ? ((commandLike.opts() as Record<string, unknown>) || {})
-      : (() => {
-          const fallbackLast = rawArgs.at(-1);
-          return isPlainOptionsObject(fallbackLast) ? fallbackLast : {};
-        })();
-    const actionOptions = toServiceActionCommandOpts(allOptions);
-    const bridgeOptions = toServiceCliBridgeOptions(allOptions);
-    let schedule: ServiceCommandScheduleInput | undefined;
-    try {
-      schedule = extractCommandScheduleInput(allOptions);
-    } catch (error) {
-      printResult({
-        asJson: bridgeOptions.json,
-        success: false,
-        title: `${params.service.name}.${params.actionName} failed`,
-        payload: {
-          error: `Failed to parse schedule input: ${String(error)}`,
-        },
-      });
-      return;
-    }
-
-    let payload: JsonValue;
-    try {
-      payload = await commandSpec.mapInput({
-        args: positionalArgs,
-        opts: actionOptions,
-      });
-    } catch (error) {
-      printResult({
-        asJson: bridgeOptions.json,
-        success: false,
-        title: `${params.service.name}.${params.actionName} failed`,
-        payload: {
-          error: `Failed to parse command input: ${String(error)}`,
-        },
-      });
-      return;
-    }
-
-    const remote = await callAgentTransport<ServiceCommandResponse>({
-      projectRoot: resolveProjectRoot(bridgeOptions.path),
-      path: "/api/services/command",
-      method: "POST",
-      host: bridgeOptions.host,
-      port: bridgeOptions.port,
-      authToken: bridgeOptions.token,
-      body: {
-        serviceName: params.service.name,
-        command: params.actionName,
-        payload,
-        ...(schedule ? { schedule } : {}),
-      } as unknown as JsonValue,
-    });
-
-    if (remote.success && remote.data) {
-      const data = remote.data;
-      printResult({
-        asJson: bridgeOptions.json,
-        success: Boolean(data.success),
-        title: data.success
-          ? `${params.service.name}.${params.actionName} ok`
-          : `${params.service.name}.${params.actionName} failed`,
-        payload: {
-          ...(data.data !== undefined ? { data: data.data } : {}),
-          ...(data.message ? { message: data.message } : {}),
-          ...(data.error ? { error: data.error } : {}),
-        },
-      });
-      return;
-    }
-
-    printResult({
-      asJson: bridgeOptions.json,
-      success: false,
-      title: `${params.service.name}.${params.actionName} failed`,
-      payload: {
-        error: remote.error || "Unknown error",
-      },
-    });
-  });
-}
-
-function hasServiceSubcommand(command: Command, name: string): boolean {
-  return command.commands.some((item) => item.name() === name);
-}
-
-function attachServiceLifecycleOptions(command: Command): Command {
-  return command
-    .option("--path <path>", "项目根目录（默认当前目录）", ".")
-    .option("--host <host>", "Server host（覆盖自动解析）")
-    .option("--port <port>", "Server port（覆盖自动解析）", parsePort)
-    .option("--token <token>", "覆盖 Bearer Token（仅远程 HTTP 调用需要；默认本地走 IPC）")
-    .option("--json [enabled]", "以 JSON 输出", parseBoolean, true);
-}
-
-function registerServiceLifecycleCommands(params: {
-  program: Command;
-  service: Service;
-}): void {
-  if (!params.service.lifecycle?.start && !params.service.lifecycle?.stop) {
-    return;
-  }
-
-  const serviceCommand =
-    params.program.commands.find((item) => item.name() === params.service.name) ||
-    params.program
-      .command(params.service.name)
-      .description(`${params.service.name} service actions`)
-      .helpOption("--help", "display help for command");
-
-  const lifecycleCommands = [
-    {
-      name: "start",
-      description: `启动 ${params.service.name} service`,
-      action: "start" as const,
-    },
-    {
-      name: "stop",
-      description: `停止 ${params.service.name} service`,
-      action: "stop" as const,
-    },
-    {
-      name: "restart",
-      description: `重启 ${params.service.name} service`,
-      action: "restart" as const,
-    },
-    {
-      name: "status",
-      description: `查看 ${params.service.name} service 运行状态`,
-      action: "status" as const,
-    },
-  ];
-
-  for (const item of lifecycleCommands) {
-    if (hasServiceSubcommand(serviceCommand, item.name)) {
-      continue;
-    }
-
-    attachServiceLifecycleOptions(
-      serviceCommand
-        .command(item.name)
-        .description(item.description)
-        .helpOption("--help", "display help for command"),
-    ).action(async (options: ServiceCliBaseOptions) => {
-      await runServiceControlCommand({
-        serviceName: params.service.name,
-        action: item.action,
-        options,
-      });
-    });
-  }
-}
-
-/**
- * 注册所有 service actions 的 CLI 命令。
- */
-export function registerAllServicesForCli(program: Command): void {
-  const services = listRegisteredServices();
-  for (const service of services) {
-    for (const [actionName, action] of Object.entries(service.actions)) {
-      registerServiceActionCommand({
-        program,
-        service,
-        actionName,
-        action,
-      });
-    }
-  }
-  for (const service of services) {
-    registerServiceLifecycleCommands({
-      program,
-      service,
-    });
-  }
-}

package/src/cli/ServiceCommandRemote.ts

@@ -1,230 +0,0 @@
-/**
- * `city service` 远程 Agent server 调用辅助。
- *
- * 关键点（中文）
- * - 统一处理 list/control/command 三类需要访问 Agent server 的命令。
- * - 这里不负责命令注册，只负责 transport 调用与结果输出。
- */
-
-import { callAgentTransport } from "@downcity/agent";
-import { printResult } from "@/utils/cli/CliOutput.js";
-import type {
-  ServiceCliBaseOptions,
-  ServiceCommandResponse,
-  ServiceControlAction,
-  ServiceControlResponse,
-  ServiceListResponse,
-} from "@downcity/agent/shared/types/Services.js";
-import {
-  parseCommandPayload,
-  resolveServiceProjectRoot,
-  validateAgentProjectRoot,
-} from "./ServiceCommandSupport.js";
-
-const SERVICE_COMMAND_TIMEOUT_MS = 120_000;
-
-/**
- * 执行 `service list`。
- */
-export async function runServiceListCommand(options: ServiceCliBaseOptions): Promise<void> {
-  const resolved = await resolveServiceProjectRoot(options);
-  if (!resolved.projectRoot) {
-    printResult({
-      asJson: options.json,
-      success: false,
-      title: "service list failed",
-      payload: {
-        error: resolved.error || "Failed to resolve agent project path",
-      },
-    });
-    return;
-  }
-  const projectRoot = resolved.projectRoot;
-  const pathError = validateAgentProjectRoot(projectRoot);
-  if (pathError) {
-    printResult({
-      asJson: options.json,
-      success: false,
-      title: "service list failed",
-      payload: {
-        error: pathError,
-      },
-    });
-    return;
-  }
-  const remote = await callAgentTransport<ServiceListResponse>({
-    projectRoot,
-    path: "/api/services/list",
-    method: "GET",
-    host: options.host,
-    port: options.port,
-    authToken: options.token,
-  });
-
-  if (remote.success && remote.data) {
-    printResult({
-      asJson: options.json,
-      success: Boolean(remote.data.success),
-      title: remote.data.success ? "services listed" : "service list failed",
-      payload: {
-        ...(Array.isArray(remote.data.services) ? { services: remote.data.services } : {}),
-        ...(remote.data.error ? { error: remote.data.error } : {}),
-      },
-    });
-    return;
-  }
-
-  printResult({
-    asJson: options.json,
-    success: false,
-    title: "service list failed",
-    payload: {
-      error: remote.error || "Unknown error",
-    },
-  });
-}
-
-/**
- * 执行 `service status/start/stop/restart`。
- */
-export async function runServiceControlCommand(params: {
-  serviceName: string;
-  action: ServiceControlAction;
-  options: ServiceCliBaseOptions;
-}): Promise<void> {
-  const resolved = await resolveServiceProjectRoot(params.options);
-  if (!resolved.projectRoot) {
-    printResult({
-      asJson: params.options.json,
-      success: false,
-      title: `service ${params.action} failed`,
-      payload: {
-        error: resolved.error || "Failed to resolve agent project path",
-      },
-    });
-    return;
-  }
-  const projectRoot = resolved.projectRoot;
-  const pathError = validateAgentProjectRoot(projectRoot);
-  if (pathError) {
-    printResult({
-      asJson: params.options.json,
-      success: false,
-      title: `service ${params.action} failed`,
-      payload: {
-        error: pathError,
-      },
-    });
-    return;
-  }
-  const remote = await callAgentTransport<ServiceControlResponse>({
-    projectRoot,
-    path: "/api/services/control",
-    method: "POST",
-    host: params.options.host,
-    port: params.options.port,
-    authToken: params.options.token,
-    body: {
-      serviceName: params.serviceName,
-      action: params.action,
-    },
-  });
-
-  if (remote.success && remote.data) {
-    printResult({
-      asJson: params.options.json,
-      success: Boolean(remote.data.success),
-      title: remote.data.success ? `service ${params.action} ok` : `service ${params.action} failed`,
-      payload: {
-        ...(remote.data.service ? { service: remote.data.service } : {}),
-        ...(remote.data.error ? { error: remote.data.error } : {}),
-      },
-    });
-    return;
-  }
-
-  printResult({
-    asJson: params.options.json,
-    success: false,
-    title: `service ${params.action} failed`,
-    payload: {
-      error: remote.error || "Unknown error",
-    },
-  });
-}
-
-/**
- * 执行 `service command` 桥接。
- */
-export async function runServiceCommandBridge(params: {
-  serviceName: string;
-  command: string;
-  payloadRaw?: string;
-  options: ServiceCliBaseOptions;
-}): Promise<void> {
-  const resolved = await resolveServiceProjectRoot(params.options);
-  if (!resolved.projectRoot) {
-    printResult({
-      asJson: params.options.json,
-      success: false,
-      title: "service command failed",
-      payload: {
-        error: resolved.error || "Failed to resolve agent project path",
-      },
-    });
-    return;
-  }
-  const projectRoot = resolved.projectRoot;
-  const pathError = validateAgentProjectRoot(projectRoot);
-  if (pathError) {
-    printResult({
-      asJson: params.options.json,
-      success: false,
-      title: "service command failed",
-      payload: {
-        error: pathError,
-      },
-    });
-    return;
-  }
-  const remote = await callAgentTransport<ServiceCommandResponse>({
-    projectRoot,
-    path: "/api/services/command",
-    method: "POST",
-    timeoutMs: SERVICE_COMMAND_TIMEOUT_MS,
-    host: params.options.host,
-    port: params.options.port,
-    authToken: params.options.token,
-    body: {
-      serviceName: params.serviceName,
-      command: params.command,
-      ...(params.payloadRaw !== undefined
-        ? { payload: parseCommandPayload(params.payloadRaw) }
-        : {}),
-    },
-  });
-
-  if (remote.success && remote.data) {
-    printResult({
-      asJson: params.options.json,
-      success: Boolean(remote.data.success),
-      title: remote.data.success ? "service command ok" : "service command failed",
-      payload: {
-        ...(remote.data.service ? { service: remote.data.service } : {}),
-        ...(remote.data.message ? { message: remote.data.message } : {}),
-        ...(remote.data.data !== undefined ? { data: remote.data.data } : {}),
-        ...(remote.data.error ? { error: remote.data.error } : {}),
-      },
-    });
-    return;
-  }
-
-  printResult({
-    asJson: params.options.json,
-    success: false,
-    title: "service command failed",
-    payload: {
-      error: remote.error || "Unknown error",
-    },
-  });
-}