@keyou007/agent-bot 0.1.4 → 0.1.6

package/src/cli.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
+import fs from "node:fs";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import qrcode from "qrcode-terminal";
-import { loadConfig } from "./config/loadConfig.js";
+import { loadConfig, loadConfigWithoutEnvironmentMutation } from "./config/loadConfig.js";
 import { sendControlRequest, isServerReachable } from "./cli/LocalControlClient.js";
 import {
   controlEndpoint,
@@ -19,6 +20,7 @@ import {
   type InitializationResult,
   type InitializationStatus,
 } from "./cli/Initializer.js";
+import { parseInitCommandOptions, type InitCommandOptions } from "./cli/initOptions.js";
 import {
   registerFeishuApp,
   type FeishuAppCredentials,
@@ -47,6 +49,7 @@ import {
   prepareCrashReportDirectory,
   resolveSupervisorDiagnosticsPaths,
 } from "./supervision/SupervisorDiagnostics.js";
+import { agentBotHome, defaultSqlitePath } from "./config/paths.js";
 
 const args = process.argv.slice(2);
 
@@ -69,7 +72,7 @@ async function main(input: string[]): Promise<void> {
     return;
   }
   if (command === "init") {
-    await initCommand(rest, parsed.configPath);
+    await initCommand(rest, parsed.configPath, Boolean(parsed.profilePath));
     return;
   }
   if (command === "console") {
@@ -102,44 +105,43 @@ interface InitCommandResult extends InitializationResult {
   server: InitializationServerResult;
 }
 
-async function initCommand(input: string[], configPath?: string): Promise<void> {
-  const supported = new Set(["--json", "--skip-feishu", "--reconfigure-feishu"]);
-  const unsupported = input.filter((value) => !supported.has(value));
-  if (unsupported.length > 0) throw new Error(`Unsupported init options: ${unsupported.join(" ")}`);
-  const json = input.includes("--json");
-  const skipFeishu = input.includes("--skip-feishu");
-  const reconfigureFeishu = input.includes("--reconfigure-feishu");
-  if (skipFeishu && reconfigureFeishu) {
-    throw new Error("--skip-feishu and --reconfigure-feishu cannot be used together.");
-  }
-
-  const paths = initializeAgentBot({ configPath });
-  if (!json) printInitializationPaths(paths);
-  const initializationLock = acquireInitializationLock(paths.home.path);
-
+async function initCommand(
+  input: string[],
+  configPath: string | undefined,
+  explicitProfile: boolean,
+): Promise<void> {
+  const options = parseInitCommandOptions(input, explicitProfile);
+  let initializationLock = options.reset
+    ? acquireInitializationLock(agentBotHome())
+    : undefined;
+  let paths: InitializationResult;
   let initialized: Omit<InitCommandResult, "server">;
   try {
+    if (options.reset) await assertResetProfileServerStopped(configPath);
+    paths = initializeAgentBot({ configPath, reset: options.reset });
+    if (!options.json) printInitializationPaths(paths);
+    initializationLock ??= acquireInitializationLock(paths.home.path);
     cleanupFeishuCredentialTemporaryFiles(paths.env.path);
     const feishu = await initializeFeishu(
       paths,
-      { json, skipFeishu, reconfigureFeishu },
+      options,
     );
     initialized = { ...paths, feishu };
   } finally {
-    initializationLock.release();
+    initializationLock?.release();
   }
 
-  if (!json) printInitializationResult(initialized);
-  if (!json && !skipFeishu) process.stdout.write("\nStarting Agent Bot server...\n");
-  const server = await startInitializedServer({ skipFeishu, configPath });
+  if (!options.json) printInitializationResult(initialized);
+  if (!options.json && !options.skipFeishu) process.stdout.write("\nStarting Agent Bot server...\n");
+  const server = await startInitializedServer({ skipFeishu: options.skipFeishu, configPath });
   const result: InitCommandResult = { ...initialized, server };
-  if (json) printJson(result);
+  if (options.json) printJson(result);
   else printInitializationServerResult(server);
 }
 
 async function initializeFeishu(
   paths: InitializationResult,
-  options: { json: boolean; skipFeishu: boolean; reconfigureFeishu: boolean },
+  options: InitCommandOptions,
 ): Promise<InitCommandResult["feishu"]> {
   const existing = readFeishuCredentials(paths.env.path);
   if (options.skipFeishu) {
@@ -191,6 +193,27 @@ async function initializeFeishu(
   }
 }
 
+async function assertResetProfileServerStopped(configPath?: string): Promise<void> {
+  const endpoints = new Set<string>([controlEndpoint(defaultSqlitePath())]);
+  const selectedConfigPath = configPath ?? process.env.AGENT_BOT_CONFIG;
+  if (selectedConfigPath && fs.existsSync(selectedConfigPath)) {
+    try {
+      endpoints.add(controlEndpoint(
+        loadConfigWithoutEnvironmentMutation(selectedConfigPath).storage.sqlitePath,
+      ));
+    } catch {
+      // Reset must remain available when the existing configuration is invalid.
+    }
+  }
+  for (const endpoint of endpoints) {
+    if (await isServerReachable(endpoint)) {
+      throw new Error(
+        "Cannot reset a running profile. Stop it with agent-bot --profile <directory> server stop, then try again.",
+      );
+    }
+  }
+}
+
 function skillsCommand(input: string[]): void {
   const [action = "status", ...rest] = input;
   const sourcePath = fileURLToPath(new URL("../skills/agent-bot/", import.meta.url));
@@ -462,6 +485,9 @@ function printSkillStatus(status: SkillRegistrationStatus): void {
 
 function printInitializationPaths(result: InitializationResult): void {
   process.stdout.write("Preparing the Agent Bot user environment...\n");
+  if (result.reset) {
+    process.stdout.write(`Reset backup: ${result.reset.backupPath}\n`);
+  }
   process.stdout.write(`Home directory: ${result.home.path} (${initializationStatusLabel(result.home.status)})\n`);
   process.stdout.write(`Config file: ${result.config.path} (${initializationStatusLabel(result.config.status)})\n`);
   process.stdout.write(`Environment file: ${result.env.path} (${initializationStatusLabel(result.env.status)})\n`);
@@ -603,6 +629,7 @@ function optionalFeishuFeatureWarnings(missing: FeishuConfigurationChallenge["mi
 
 function initializationStatusLabel(status: InitializationStatus): string {
   if (status === "created") return "created";
+  if (status === "reset") return "reset from template";
   return "already exists; unchanged";
 }
 

package/src/config/loadConfig.ts

@@ -114,6 +114,20 @@ export function loadConfig(
   };
 }
 
+export function loadConfigWithoutEnvironmentMutation(configPath?: string): AppConfig {
+  const environment = new Map(Object.entries(process.env));
+  try {
+    return loadConfig(configPath);
+  } finally {
+    for (const name of Object.keys(process.env)) {
+      if (!environment.has(name)) delete process.env[name];
+    }
+    for (const [name, value] of environment) {
+      process.env[name] = value;
+    }
+  }
+}
+
 function expandEnv(raw: string): string {
   return raw.replace(ENV_PATTERN, (_match, name: string) => process.env[name] ?? "");
 }

package/src/feishu/CardRenderer.ts

@@ -16,6 +16,7 @@ import { localCardImage } from "./LocalCardImage.js";
 export interface StartupStatusView {
   startedAt: Date;
   restartReason: string;
+  agentBotVersion: string;
   defaultAgentName: string;
   defaultAgentTitle: string;
   cwd: string;
@@ -340,6 +341,7 @@ export class CardRenderer {
         `**默认 Agent**：${view.defaultAgentTitle} (${inlineCode(view.defaultAgentName)})`,
       ];
     lines.push(
+      `**Agent Bot 版本**：${inlineCode(view.agentBotVersion)}`,
       `**服务状态 / 启动时间**：🟢 在线 / ${formatStartupTime(view.startedAt)}`,
       `**重启原因**：${inlineCode(view.restartReason)}`,
       "> 发送消息即可开始对话；发送 `/new` 创建新任务；发送 `/help` 查看帮助。",

package/src/index.ts

@@ -7,6 +7,7 @@ import { CodexProcessManager } from "./codex/CodexProcessManager.js";
 import { CodexRuntime } from "./codex/CodexRuntime.js";
 import { LocalControlServer } from "./cli/LocalControlServer.js";
 import { controlEndpoint, type ControlRequest, type ControlResponse } from "./cli/controlProtocol.js";
+import { readPackageVersion } from "./cli/packageVersion.js";
 import { loadConfig } from "./config/loadConfig.js";
 import { ConsoleConnector } from "./console/ConsoleConnector.js";
 import { ConsoleTurnPresenter } from "./console/ConsoleTurnPresenter.js";
@@ -36,6 +37,7 @@ import {
 } from "./supervision/SupervisorDiagnostics.js";
 
 const processStartedAt = new Date();
+const agentBotVersion = readPackageVersion();
 const supervised = process.env.AGENT_BOT_SUPERVISED === "1";
 const startupReason = process.env.AGENT_BOT_RESTART_REASON?.trim()
   || (supervised ? "Supervisor 启动" : "直接启动");
@@ -79,6 +81,7 @@ if (feishuOutbound) {
   const defaultAgent = config.agents[defaultAgentName];
   const metadataHydrator = new SessionMetadataHydrator(store, runtimes);
   startupNotifier = new StartupNotifier(store, feishuOutbound, renderer, logger, {
+    agentBotVersion,
     defaultAgentName,
     defaultAgentTitle: defaultAgent?.title ?? defaultAgentName,
     cwd: path.resolve(config.defaults.cwd),

package/src/startup/StartupNotifier.ts

@@ -5,6 +5,7 @@ import type { FeishuOutbound } from "../feishu/types.js";
 import type { SessionRecord, StateStore, UserContextRecord } from "../state/StateStore.js";
 
 export interface StartupNotificationOptions {
+  agentBotVersion: string;
   defaultAgentName: string;
   defaultAgentTitle: string;
   cwd: string;
@@ -74,6 +75,7 @@ export class StartupNotifier {
       const card = this.renderer.renderStartupStatus({
         startedAt,
         restartReason,
+        agentBotVersion: this.options.agentBotVersion,
         defaultAgentName: this.options.defaultAgentName,
         defaultAgentTitle: this.options.defaultAgentTitle,
         cwd,