@keyou007/agent-bot 0.1.1 → 0.1.2

package/src/feishu/transport.ts

@@ -1,24 +1,15 @@
 import type { AppConfig } from "../config/schema.js";
 
-export type FeishuTransportMode = "sdk" | "console";
-
 type FeishuTransportConfig = Pick<
   AppConfig["feishu"],
-  "transport" | "appId" | "appSecret" | "useConsoleWhenMissingCredentials"
+  "appId" | "appSecret"
 >;
 
-export function resolveFeishuTransport(config: FeishuTransportConfig): FeishuTransportMode {
-  if (config.transport === "console") {
-    return "console";
-  }
-
-  const hasCredentials = Boolean(config.appId && config.appSecret);
-  if (config.transport === "sdk" || !config.useConsoleWhenMissingCredentials) {
-    if (!hasCredentials) {
-      throw new Error("Feishu appId/appSecret are required.");
-    }
-    return "sdk";
+export function requireServerFeishuTransport(config: FeishuTransportConfig): "sdk" {
+  if (!config.appId || !config.appSecret) {
+    throw new Error(
+      "飞书机器人尚未配置。请先运行 agent-bot init 完成初始化；仅需本地调试时请使用 agent-bot console。",
+    );
   }
-
-  return hasCredentials ? "sdk" : "console";
+  return "sdk";
 }

package/src/index.ts

@@ -15,7 +15,7 @@ import { ConsoleFeishuClient } from "./feishu/ConsoleFeishuClient.js";
 import { FeishuConnector } from "./feishu/FeishuConnector.js";
 import { FeishuMessageClient } from "./feishu/FeishuMessageClient.js";
 import { FeishuTurnPresenter } from "./feishu/FeishuTurnPresenter.js";
-import { resolveFeishuTransport } from "./feishu/transport.js";
+import { requireServerFeishuTransport } from "./feishu/transport.js";
 import { createLogger } from "./logging/logger.js";
 import { OutboundRouter, type OutboundRoute } from "./presentation/OutboundRouter.js";
 import { ProxySessionController } from "./proxy/ProxySessionController.js";
@@ -36,6 +36,7 @@ const startupReason = process.env.AGENT_BOT_RESTART_REASON?.trim()
   || (supervised ? "Supervisor 启动" : "直接启动");
 const consoleOnly = process.env.AGENT_BOT_CONSOLE_ONLY === "1";
 const config = loadConfig();
+const transport = consoleOnly ? "console" : requireServerFeishuTransport(config.feishu);
 const logger = createLogger(config);
 const store = new StateStore(config.storage.sqlitePath);
 
@@ -52,13 +53,13 @@ const codexProcessManager = new CodexProcessManager(
 const codexRuntime = new CodexRuntime(codexProcessManager, logger);
 const runtimes = new AgentRuntimeRegistry({ acp: acpRuntime, codex: codexRuntime });
 
-const transport = consoleOnly ? "console" : resolveFeishuTransport(config.feishu);
 const routes: OutboundRoute[] = [];
 let feishuConnector: FeishuConnector | undefined;
 let consoleConnector: ConsoleConnector | undefined;
 let startupNotifier: StartupNotifier | undefined;
 let safeRestartNotifier: SafeRestartNotifier | undefined;
 let controlServer: LocalControlServer | undefined;
+let serverReady = false;
 
 const feishuOutbound = transport === "sdk" ? new FeishuMessageClient(config, logger) : undefined;
 if (feishuOutbound) {
@@ -123,10 +124,18 @@ const startControlServer = async (): Promise<void> => {
 };
 
 if (feishuConnector && startupNotifier) {
-  await startFeishu(feishuConnector, startupNotifier, processStartedAt, startupReason, startControlServer);
+  await startFeishu(
+    feishuConnector,
+    startupNotifier,
+    processStartedAt,
+    startupReason,
+    startControlServer,
+    () => { serverReady = true; },
+  );
 } else {
   await startControlServer();
   await feishuConnector?.start();
+  serverReady = true;
 }
 consoleConnector?.start();
 
@@ -156,6 +165,8 @@ async function handleControlRequest(request: ControlRequest): Promise<ControlRes
       return {
         ok: true,
         data: {
+          ready: serverReady,
+          phase: serverReady ? "ready" : "connecting_feishu",
           pid: process.pid,
           startedAt: processStartedAt.toISOString(),
           supervised,

package/src/startup/startFeishu.ts

@@ -12,8 +12,10 @@ export async function startFeishu(
   startedAt: Date,
   restartReason: string,
   prepare?: () => Promise<void>,
+  onConnected?: () => void,
 ): Promise<void> {
   await prepare?.();
   await connector.start();
+  onConnected?.();
   await notifier.notify(startedAt, restartReason);
 }

package/src/supervisor.ts

@@ -1,8 +1,9 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { fileURLToPath } from "node:url";
-import { isServerRunning } from "./cli/LocalControlClient.js";
+import { isServerReachable } from "./cli/LocalControlClient.js";
 import { controlEndpoint } from "./cli/controlProtocol.js";
 import { loadConfig } from "./config/loadConfig.js";
+import { requireServerFeishuTransport } from "./feishu/transport.js";
 import {
   crashRestartDelayMs,
   describeRestartReason,
@@ -13,7 +14,9 @@ import {
 } from "./supervision/restartPolicy.js";
 
 const childEntry = fileURLToPath(new URL("./index.js", import.meta.url));
-const sqlitePath = loadConfig().storage.sqlitePath;
+const config = loadConfig();
+requireServerFeishuTransport(config.feishu);
+const sqlitePath = config.storage.sqlitePath;
 const serverEndpoint = controlEndpoint(sqlitePath);
 let child: ChildProcess | undefined;
 let restartTimer: NodeJS.Timeout | undefined;
@@ -23,7 +26,7 @@ let nextStartReason = process.env.AGENT_BOT_RESTART_REASON?.trim() || "Superviso
 
 async function startChild(): Promise<void> {
   if (stopping || child) return;
-  if (await isServerRunning(serverEndpoint)) {
+  if (await isServerReachable(serverEndpoint)) {
     writeSupervisorLog("existing_server_detected", { endpoint: serverEndpoint });
     process.exit(0);
     return;
@@ -64,7 +67,7 @@ async function handleChildExit(
     process.exit(0);
     return;
   }
-  if (await isServerRunning(serverEndpoint)) {
+  if (await isServerReachable(serverEndpoint)) {
     writeSupervisorLog("duplicate_supervisor_stopped", { endpoint: serverEndpoint });
     process.exit(0);
     return;