@keyou007/agent-bot 0.1.11 → 0.1.13-alpha.0

package/src/cli/Initializer.ts

@@ -5,6 +5,7 @@ import path from "node:path";
 import { cliText } from "./i18n.js";
 import { fileURLToPath } from "node:url";
 import { parse as parseDotEnv } from "dotenv";
+import { isMap, isScalar, parseDocument, type YAMLMap } from "yaml";
 import {
   agentBotHome,
   defaultConfigPath,
@@ -12,7 +13,7 @@ import {
   resolveUserPath,
 } from "../config/paths.js";
 
-export type InitializationStatus = "created" | "existing" | "reset";
+export type InitializationStatus = "created" | "existing" | "updated" | "reset";
 
 export interface InitializedPath {
   path: string;
@@ -38,6 +39,16 @@ export interface InitializationOptions {
   reset?: boolean;
 }
 
+export interface ConfiguredAgentOption {
+  name: string;
+  title: string;
+}
+
+export interface ConfiguredAgentSelection {
+  agents: ConfiguredAgentOption[];
+  defaultAgent?: string;
+}
+
 export type FeishuCredentialStatus = "configured" | "missing" | "incomplete";
 
 export interface FeishuCredentialState {
@@ -82,8 +93,8 @@ export function initializeAgentBot(options: InitializationOptions = {}): Initial
     ? resetProfileContents(homePath, configPath, envPath, configDirectory)
     : undefined;
 
-  const config = copyIfMissing(configTemplatePath, configPath);
-  const envFile = copyIfMissing(envTemplatePath, envPath);
+  const config = initializeConfig(configTemplatePath, configPath);
+  const envFile = initializeEnv(envTemplatePath, envPath);
   restrictFilePermissions(envFile.path);
   const data = ensureDirectory(path.join(configDirectory, "data"));
   const logs = ensureDirectory(path.join(configDirectory, "logs"));
@@ -98,6 +109,68 @@ export function initializeAgentBot(options: InitializationOptions = {}): Initial
   };
 }
 
+export function readConfiguredAgentSelection(configPath: string): ConfiguredAgentSelection {
+  const document = parseConfigurationDocument(fs.readFileSync(configPath, "utf8"), configPath);
+  if (!isMap(document.contents)) {
+    throw new Error(cliText(
+      `Configuration file must contain a YAML mapping: ${configPath}`,
+      `配置文件必须包含 YAML 映射：${configPath}`,
+    ));
+  }
+  const configuredAgents = document.contents.get("agents", true);
+  if (!isMap(configuredAgents)) {
+    throw new Error(cliText(
+      `Configuration file must contain an agents mapping: ${configPath}`,
+      `配置文件必须包含 agents 映射：${configPath}`,
+    ));
+  }
+  const agents = configuredAgents.items.flatMap((pair) => {
+    const name = yamlMappingKey(pair.key);
+    if (!name) return [];
+    const titleNode = isMap(pair.value) ? pair.value.get("title", true) : undefined;
+    const title = isScalar(titleNode) && typeof titleNode.value === "string"
+      ? titleNode.value
+      : name;
+    return [{ name, title }];
+  });
+  const defaultAgent = document.getIn(["defaults", "agent"]);
+  return {
+    agents,
+    ...(typeof defaultAgent === "string" && defaultAgent.trim() ? { defaultAgent } : {}),
+  };
+}
+
+export function writeDefaultAgent(configPath: string, agentName: string): boolean {
+  const original = fs.readFileSync(configPath, "utf8");
+  const document = parseConfigurationDocument(original, configPath);
+  if (!isMap(document.contents)) {
+    throw new Error(cliText(
+      `Configuration file must contain a YAML mapping: ${configPath}`,
+      `配置文件必须包含 YAML 映射：${configPath}`,
+    ));
+  }
+  const configuredAgents = document.contents.get("agents", true);
+  if (!isMap(configuredAgents) || !configuredAgents.has(agentName)) {
+    throw new Error(cliText(
+      `Cannot select an Agent that is not configured: ${agentName}`,
+      `不能选择尚未配置的 Agent：${agentName}`,
+    ));
+  }
+  const defaults = document.contents.get("defaults", true);
+  if (defaults !== undefined && !isMap(defaults)) {
+    throw new Error(cliText(
+      `Configuration defaults must contain a YAML mapping: ${configPath}`,
+      `配置文件的 defaults 必须是 YAML 映射：${configPath}`,
+    ));
+  }
+  const currentAgent = document.getIn(["defaults", "agent"]);
+  if (currentAgent === agentName) return false;
+  if (isMap(defaults)) defaults.set("agent", agentName);
+  else document.setIn(["defaults"], { agent: agentName });
+  writeFileAtomically(configPath, document.toString());
+  return true;
+}
+
 export function readFeishuCredentials(envPath: string, env: NodeJS.ProcessEnv = process.env): FeishuCredentialState {
   const fileValues = fs.existsSync(envPath) ? parseDotEnv(fs.readFileSync(envPath, "utf8")) : {};
   const appId = firstNonBlank(env.FEISHU_APP_ID, fileValues.FEISHU_APP_ID);
@@ -188,8 +261,8 @@ export function acquireInitializationLock(lockDirectory: string): Initialization
       if (!isFileExistsError(error)) throw error;
       if (!isStaleInitializationLock(lockPath)) {
         throw new Error(cliText(
-          `Another agent-bot init process is running (lock file: ${lockPath}).`,
-          `另一个 agent-bot init 进程正在运行（锁文件：${lockPath}）。`,
+          `Another agentbot init process is running (lock file: ${lockPath}).`,
+          `另一个 agentbot init 进程正在运行（锁文件：${lockPath}）。`,
         ));
       }
       fs.rmSync(lockPath, { force: true });
@@ -244,6 +317,134 @@ function copyIfMissing(sourcePath: string, targetPath: string): InitializedPath
   }
 }
 
+function initializeConfig(templatePath: string, configPath: string): InitializedPath {
+  if (!fs.existsSync(configPath)) {
+    const copied = copyIfMissing(templatePath, configPath);
+    if (copied.status === "created") return copied;
+  }
+
+  const original = fs.readFileSync(configPath, "utf8");
+  const template = fs.readFileSync(templatePath, "utf8");
+  const configDocument = parseConfigurationDocument(original, configPath);
+  const templateDocument = parseConfigurationDocument(template, templatePath);
+  if (!isMap(configDocument.contents) || !isMap(templateDocument.contents)) {
+    throw new Error(cliText(
+      `Configuration files must contain a YAML mapping: ${configPath}`,
+      `配置文件必须包含 YAML 映射：${configPath}`,
+    ));
+  }
+
+  const updated = mergeMissingConfiguration(
+    configDocument.contents,
+    templateDocument.contents,
+    [],
+  );
+  if (!updated) return { path: configPath, status: "existing" };
+  writeFileAtomically(configPath, configDocument.toString());
+  return { path: configPath, status: "updated" };
+}
+
+function initializeEnv(templatePath: string, envPath: string): InitializedPath {
+  if (!fs.existsSync(envPath)) {
+    const copied = copyIfMissing(templatePath, envPath);
+    if (copied.status === "created") return copied;
+  }
+
+  const original = fs.readFileSync(envPath, "utf8");
+  const template = fs.readFileSync(templatePath, "utf8");
+  const existingKeys = dotEnvKeys(original);
+  const missingLines = template
+    .split(/\r?\n/)
+    .flatMap((line) => {
+      const key = dotEnvAssignmentKey(line);
+      if (!key || existingKeys.has(key)) return [];
+      existingKeys.add(key);
+      return [line];
+    });
+  if (missingLines.length === 0) return { path: envPath, status: "existing" };
+
+  const newline = original.includes("\r\n") ? "\r\n" : "\n";
+  const separator = original.length === 0 || /\r?\n$/u.test(original) ? "" : newline;
+  writeFileAtomically(envPath, `${original}${separator}${missingLines.join(newline)}${newline}`);
+  return { path: envPath, status: "updated" };
+}
+
+function parseConfigurationDocument(contents: string, filePath: string) {
+  const document = parseDocument(contents);
+  if (document.errors.length === 0) return document;
+  throw new Error(cliText(
+    `Could not upgrade configuration file ${filePath}: ${document.errors[0]?.message ?? "invalid YAML"}`,
+    `无法升级配置文件 ${filePath}：${document.errors[0]?.message ?? "YAML 无效"}`,
+  ));
+}
+
+function mergeMissingConfiguration(
+  config: YAMLMap,
+  template: YAMLMap,
+  parentPath: string[],
+): boolean {
+  let updated = false;
+  for (const templatePair of template.items) {
+    const key = yamlMappingKey(templatePair.key);
+    if (!key) continue;
+    if (!config.has(key)) {
+      if (shouldPreserveMissingConfiguration(parentPath, key)) continue;
+      const clonedPair = templatePair.clone();
+      if (parentPath.length === 0 && key === "defaults" && isMap(clonedPair.value)) {
+        clonedPair.value.delete("agent");
+        if (clonedPair.value.items.length === 0) continue;
+      }
+      config.add(clonedPair);
+      updated = true;
+      continue;
+    }
+
+    const configValue = config.get(key, true);
+    if (isMap(configValue) && isMap(templatePair.value)) {
+      updated = mergeMissingConfiguration(configValue, templatePair.value, [...parentPath, key]) || updated;
+    }
+  }
+  return updated;
+}
+
+function shouldPreserveMissingConfiguration(parentPath: string[], key: string): boolean {
+  if (parentPath.length === 1 && parentPath[0] === "agents") return true;
+  return parentPath.length === 1 && parentPath[0] === "defaults" && key === "agent";
+}
+
+function yamlMappingKey(value: unknown): string | undefined {
+  if (typeof value === "string") return value;
+  return isScalar(value) && typeof value.value === "string" ? value.value : undefined;
+}
+
+function dotEnvKeys(contents: string): Set<string> {
+  return new Set(contents.split(/\r?\n/).flatMap((line) => {
+    const key = dotEnvAssignmentKey(line);
+    return key ? [key] : [];
+  }));
+}
+
+function dotEnvAssignmentKey(line: string): string | undefined {
+  return /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=/u.exec(line)?.[1];
+}
+
+function writeFileAtomically(filePath: string, contents: string): void {
+  const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+  let temporaryFile: number | undefined;
+  try {
+    temporaryFile = fs.openSync(temporaryPath, "wx", fs.statSync(filePath).mode);
+    fs.writeFileSync(temporaryFile, contents, "utf8");
+    fs.fsyncSync(temporaryFile);
+    fs.closeSync(temporaryFile);
+    temporaryFile = undefined;
+    fs.renameSync(temporaryPath, filePath);
+    syncDirectory(path.dirname(filePath));
+  } finally {
+    if (temporaryFile !== undefined) fs.closeSync(temporaryFile);
+    fs.rmSync(temporaryPath, { force: true });
+  }
+}
+
 function resetProfileContents(
   homePath: string,
   configPath: string,

package/src/cli/ServerStarter.ts

@@ -8,6 +8,7 @@ import {
   prepareCrashReportDirectory,
   resolveSupervisorDiagnosticsPaths,
 } from "../supervision/SupervisorDiagnostics.js";
+import { refreshedSystemEnvironment } from "../supervision/systemEnvironment.js";
 import { controlEndpoint } from "./controlProtocol.js";
 import { cliText } from "./i18n.js";
 import { isServerReachable, isServerRunning } from "./LocalControlClient.js";
@@ -53,8 +54,8 @@ export async function startServer(
   } catch (error) {
     if (error instanceof Error && /Lark bot is not configured/.test(error.message)) {
       throw new Error(cliText(
-        "The Lark bot is not configured. Run agent-bot init first, or use agent-bot console for local-only testing.",
-        "尚未配置飞书机器人。请先运行 agent-bot init，或使用 agent-bot console 进行纯本地测试。",
+        "The Lark bot is not configured. Run agentbot init first, or use agentbot console for local-only testing.",
+        "尚未配置飞书机器人。请先运行 agentbot init，或使用 agentbot console 进行纯本地测试。",
       ));
     }
     throw error;
@@ -94,6 +95,7 @@ const defaultDependencies: ServerStarterDependencies = {
     const entry = fileURLToPath(new URL("../supervisor.js", import.meta.url));
     const reportDirectory = resolveSupervisorDiagnosticsPaths(config).crashReportDirectory;
     prepareCrashReportDirectory(reportDirectory);
+    const environmentRefresh = refreshedSystemEnvironment();
     const child = spawn(process.execPath, [
       ...nodeDiagnosticReportArguments(reportDirectory),
       entry,
@@ -102,7 +104,10 @@ const defaultDependencies: ServerStarterDependencies = {
       detached: true,
       windowsHide: true,
       stdio: "ignore",
-      env: { ...process.env, AGENT_BOT_RESTART_REASON: "通过 Agent Bot CLI 启动" },
+      env: {
+        ...environmentRefresh.environment,
+        AGENT_BOT_RESTART_REASON: "通过 Agent Bot CLI 启动",
+      },
     });
     child.unref();
   },

package/src/cli/controlProtocol.ts

@@ -11,7 +11,16 @@ export type ControlRequest =
   | { action: "task_status"; localSessionId: string }
   | { action: "task_stop"; localSessionId: string }
   | { action: "task_title"; localSessionId: string; title: string }
-  | { action: "task_prompt"; localSessionId: string; text: string };
+  | { action: "task_prompt"; localSessionId: string; text: string }
+  | {
+      action: "task_new_group";
+      localSessionId: string;
+      title?: string;
+      cwd?: string;
+      agentName?: string;
+      projectless?: boolean;
+    }
+  | { action: "task_fork_group"; localSessionId: string; title?: string };
 
 export interface ControlResponse {
   ok: boolean;
@@ -25,6 +34,17 @@ export interface TaskStatusControlData {
   remote?: RemoteSessionSummary;
 }
 
+export interface TaskGroupControlData {
+  sourceLocalSessionId: string;
+  sourceTurnId?: string;
+  group: {
+    chatId: string;
+    contextKey: string;
+    name: string;
+  };
+  task: SessionRecord;
+}
+
 export function controlEndpoint(sqlitePath: string): string {
   const resolvedPath = path.resolve(sqlitePath);
   const key = createHash("sha256").update(resolvedPath.toLowerCase()).digest("hex").slice(0, 16);

package/src/cli/help.ts

@@ -3,13 +3,13 @@ import { cliLanguage, type CliLanguage } from "./i18n.js";
 export function renderCliHelp(version: string, language: CliLanguage = cliLanguage): string {
   if (language === "zh") {
     return `Agent Bot ${version}
-通过飞书使用本地 Codex 和 ACP Agent。
+通过飞书使用本地 Codex、TraeX 和兼容 ACP 的 Agent。
 
 用法：
-  agent-bot [选项] <命令>
+  agentbot [选项] <命令>
 
 常用命令：
-  init                              初始化飞书应用并启动服务
+  init                              检查并选择 Agent，初始化飞书应用和服务
   init --reset                      重置并重新配置显式指定的 Profile
   console                           打开本地控制台
   server start                      在后台启动 Agent Bot
@@ -20,6 +20,8 @@ export function renderCliHelp(version: string, language: CliLanguage = cliLangua
   task status <任务>                显示任务状态
   task chat <任务>                  显示任务绑定的飞书会话
   task prompt <任务> <提示词>       向任务发送提示词
+  task newgroup <任务> [标题]       创建新群；支持 --agent、--dir、--nodir
+  task forkgroup <任务> [标题]      从任务 Fork 新群
   task stop <任务>                  停止任务
   task title <任务> <标题>          重命名任务
   skills status                     显示内置 Skill 状态
@@ -38,24 +40,24 @@ export function renderCliHelp(version: string, language: CliLanguage = cliLangua
   --reconfigure-feishu              仅替换现有飞书凭据
 
 示例：
-  agent-bot init
-  agent-bot --profile ~/.agent-bot init --reset
-  agent-bot --profile ~/.agent-bot-rescue init
-  agent-bot server start
-  agent-bot server status
-  agent-bot task list
-  agent-bot server restart --reason "更新 Agent Bot"
+  agentbot init
+  agentbot --profile ~/.agent-bot init --reset
+  agentbot --profile ~/.agent-bot-rescue init
+  agentbot server start
+  agentbot server status
+  agentbot task list
+  agentbot server restart --reason "更新 Agent Bot"
 `;
   }
 
   return `Agent Bot ${version}
-Use local Codex and ACP agents from Lark/Feishu.
+Use Codex, TraeX, and compatible ACP agents from Lark/Feishu.
 
 Usage:
-  agent-bot [options] <command>
+  agentbot [options] <command>
 
 Common commands:
-  init                              Initialize the Lark app and start the service
+  init                              Check and select an Agent; initialize the Lark app and service
   init --reset                      Reset and reconfigure an explicit profile
   console                           Open the local console
   server start                      Start Agent Bot in the background
@@ -66,6 +68,8 @@ Common commands:
   task status <task>                Show task status
   task chat <task>                  Show the task's Lark chat binding
   task prompt <task> <prompt>       Send a Prompt to a task
+  task newgroup <task> [title]      Create a group; supports --agent, --dir, --nodir
+  task forkgroup <task> [title]     Fork a task into a new group
   task stop <task>                  Stop a task
   task title <task> <title>         Rename a task
   skills status                     Show the built-in Skill status
@@ -84,12 +88,12 @@ Init options:
   --reconfigure-feishu              Replace only the existing Lark credentials
 
 Examples:
-  agent-bot init
-  agent-bot --profile ~/.agent-bot init --reset
-  agent-bot --profile ~/.agent-bot-rescue init
-  agent-bot server start
-  agent-bot server status
-  agent-bot task list
-  agent-bot server restart --reason "Update Agent Bot"
+  agentbot init
+  agentbot --profile ~/.agent-bot init --reset
+  agentbot --profile ~/.agent-bot-rescue init
+  agentbot server start
+  agentbot server status
+  agentbot task list
+  agentbot server restart --reason "Update Agent Bot"
 `;
 }

package/src/cli/taskGroupOptions.ts

@@ -0,0 +1,149 @@
+import { cliLanguage, cliText, type CliLanguage } from "./i18n.js";
+
+export interface TaskNewGroupOptions {
+  reference: string;
+  title?: string;
+  cwd?: string;
+  agentName?: string;
+  projectless: boolean;
+  json: boolean;
+}
+
+export interface TaskForkGroupOptions {
+  reference: string;
+  title?: string;
+  json: boolean;
+}
+
+export function parseTaskNewGroupOptions(
+  input: string[],
+  language: CliLanguage = cliLanguage,
+): TaskNewGroupOptions {
+  const positionals: string[] = [];
+  let cwd: string | undefined;
+  let agentName: string | undefined;
+  let projectless = false;
+  let json = false;
+  for (let index = 0; index < input.length; index += 1) {
+    const argument = input[index]!;
+    if (argument === "--json") {
+      json = true;
+      continue;
+    }
+    if (argument === "--nodir") {
+      if (projectless) throw optionError("newgroup", "--nodir", language);
+      if (cwd !== undefined) throw conflictingProjectOptions(language);
+      projectless = true;
+      continue;
+    }
+    if (argument === "--dir") {
+      if (projectless) throw conflictingProjectOptions(language);
+      if (cwd !== undefined) throw optionError("newgroup", "--dir", language);
+      const directory = input[index + 1];
+      if (!directory || directory.startsWith("--")) {
+        throw new Error(cliText(
+          "task newgroup requires a project directory after --dir.",
+          "task newgroup 需要在 --dir 后指定项目目录。",
+          language,
+        ));
+      }
+      cwd = directory;
+      index += 1;
+      continue;
+    }
+    if (argument === "--agent") {
+      if (agentName !== undefined) throw optionError("newgroup", "--agent", language);
+      const name = input[index + 1];
+      if (!name?.trim() || name.startsWith("--")) {
+        throw new Error(cliText(
+          "task newgroup requires an Agent standard name after --agent.",
+          "task newgroup 需要在 --agent 后指定 Agent 标准名。",
+          language,
+        ));
+      }
+      agentName = name.trim();
+      index += 1;
+      continue;
+    }
+    if (argument.startsWith("--")) throw unsupportedOption("newgroup", argument, language);
+    positionals.push(argument);
+  }
+  const [reference, ...titleParts] = positionals;
+  requireTaskReference("newgroup", reference, language);
+  return {
+    reference,
+    title: titleParts.join(" ").trim() || undefined,
+    cwd,
+    ...(agentName ? { agentName } : {}),
+    projectless,
+    json,
+  };
+}
+
+export function parseTaskForkGroupOptions(
+  input: string[],
+  language: CliLanguage = cliLanguage,
+): TaskForkGroupOptions {
+  const positionals: string[] = [];
+  let json = false;
+  for (const argument of input) {
+    if (argument === "--json") {
+      json = true;
+      continue;
+    }
+    if (argument.startsWith("--")) throw unsupportedOption("forkgroup", argument, language);
+    positionals.push(argument);
+  }
+  const [reference, ...titleParts] = positionals;
+  requireTaskReference("forkgroup", reference, language);
+  return {
+    reference,
+    title: titleParts.join(" ").trim() || undefined,
+    json,
+  };
+}
+
+function requireTaskReference(
+  action: "newgroup" | "forkgroup",
+  reference: string | undefined,
+  language: CliLanguage,
+): asserts reference is string {
+  if (reference && !reference.startsWith("--")) return;
+  throw new Error(cliText(
+    `task ${action} requires a source task number or task ID.`,
+    `task ${action} 需要源任务序号或任务 ID。`,
+    language,
+  ));
+}
+
+function optionError(
+  action: "newgroup",
+  option: "--agent" | "--dir" | "--nodir",
+  language: CliLanguage,
+): Error {
+  return new Error(cliText(
+    `task ${action} accepts ${option} only once.`,
+    `task ${action} 只能指定一次 ${option}。`,
+    language,
+  ));
+}
+
+function conflictingProjectOptions(language: CliLanguage): Error {
+  return new Error(cliText(
+    "task newgroup cannot combine --dir and --nodir.",
+    "task newgroup 的 --dir 和 --nodir 不能同时使用。",
+    language,
+  ));
+}
+
+function unsupportedOption(
+  action: "newgroup" | "forkgroup",
+  option: string,
+  language: CliLanguage,
+): Error {
+  return new Error(cliText(
+    `task ${action} does not support option: ${option}.`,
+    `task ${action} 不支持参数：${option}。`,
+    language,
+  ));
+}