@keyou007/agent-bot 0.1.14-alpha.0 → 0.1.14-alpha.2

package/src/supervision/SafeRestartScheduler.ts

@@ -14,6 +14,7 @@ export type SafeRestartPhase =
 export interface RestartNotificationTarget {
   contextKey: string;
   replyMessageId?: string;
+  reason?: string;
 }
 
 export interface SafeRestartStatus {
@@ -60,7 +61,7 @@ export class SafeRestartScheduler {
       this.scheduleId += 1;
       this.notificationTargets = [];
     }
-    this.addNotificationTarget(notificationTarget);
+    this.addNotificationTarget(notificationTarget, reason);
     this.reason = reason;
     this.idleSince = undefined;
     this.idleInboundAt = undefined;
@@ -215,8 +216,8 @@ export class SafeRestartScheduler {
     });
   }
 
-  private addNotificationTarget(value: RestartNotificationTarget | undefined): void {
-    const target = normalizedNotificationTarget(value);
+  private addNotificationTarget(value: RestartNotificationTarget | undefined, reason: string): void {
+    const target = normalizedNotificationTarget(value, reason);
     if (!target) return;
     const existingIndex = this.notificationTargets.findIndex(
       (candidate) => candidate.contextKey === target.contextKey,
@@ -226,9 +227,13 @@ export class SafeRestartScheduler {
       return;
     }
     const existing = this.notificationTargets[existingIndex]!;
-    if (!existing.replyMessageId && target.replyMessageId) {
-      this.notificationTargets[existingIndex] = target;
-    }
+    this.notificationTargets[existingIndex] = {
+      ...existing,
+      reason: target.reason,
+      ...(!existing.replyMessageId && target.replyMessageId
+        ? { replyMessageId: target.replyMessageId }
+        : {}),
+    };
   }
 
   private notificationTargetsSnapshot(): RestartNotificationTarget[] {
@@ -238,6 +243,7 @@ export class SafeRestartScheduler {
 
 function normalizedNotificationTarget(
   value: RestartNotificationTarget | undefined,
+  reason: string,
 ): RestartNotificationTarget | undefined {
   const contextKey = value?.contextKey.trim();
   if (!contextKey) return undefined;
@@ -245,5 +251,6 @@ function normalizedNotificationTarget(
   return {
     contextKey,
     ...(replyMessageId ? { replyMessageId } : {}),
+    reason,
   };
 }

package/src/supervision/replacementSupervisor.ts

@@ -1,24 +1,47 @@
+import type { RestartNotificationTarget } from "./SafeRestartScheduler.js";
+
 export const RESTART_GROUP_CONTEXTS_ENV = "AGENT_BOT_RESTART_GROUP_CONTEXTS";
+export const RESTART_NOTIFICATION_TARGETS_ENV = "AGENT_BOT_RESTART_NOTIFICATION_TARGETS";
 
 export function replacementSupervisorEnvironment(
   restartReason: string,
   environment: NodeJS.ProcessEnv = process.env,
-  restartGroupContextKeys: readonly string[] = [],
+  restartNotificationTargets: readonly RestartNotificationTarget[] = [],
 ): NodeJS.ProcessEnv {
   const result: NodeJS.ProcessEnv = {
     ...environment,
     AGENT_BOT_START_DELAY_MS: "250",
     AGENT_BOT_RESTART_REASON: restartReason,
   };
-  const normalized = normalizedContextKeys(restartGroupContextKeys);
+  const normalized = normalizedNotificationTargets(restartNotificationTargets);
   if (normalized.length > 0) {
-    result[RESTART_GROUP_CONTEXTS_ENV] = JSON.stringify(normalized);
+    result[RESTART_NOTIFICATION_TARGETS_ENV] = JSON.stringify(normalized);
   } else {
-    delete result[RESTART_GROUP_CONTEXTS_ENV];
+    delete result[RESTART_NOTIFICATION_TARGETS_ENV];
   }
+  delete result[RESTART_GROUP_CONTEXTS_ENV];
   return result;
 }
 
+export function restartNotificationTargetsFromEnvironment(
+  value: string | undefined,
+): RestartNotificationTarget[] {
+  if (!value?.trim()) return [];
+  try {
+    const parsed = JSON.parse(value) as unknown;
+    return Array.isArray(parsed)
+      ? normalizedNotificationTargets(parsed.flatMap((entry) => {
+          if (!isRecord(entry)) return [];
+          const contextKey = typeof entry.contextKey === "string" ? entry.contextKey : "";
+          const replyMessageId = typeof entry.replyMessageId === "string" ? entry.replyMessageId : undefined;
+          return [{ contextKey, ...(replyMessageId ? { replyMessageId } : {}) }];
+        }))
+      : [];
+  } catch {
+    return [];
+  }
+}
+
 export function restartGroupContextKeysFromEnvironment(value: string | undefined): string[] {
   if (!value?.trim()) return [];
   try {
@@ -34,3 +57,26 @@ export function restartGroupContextKeysFromEnvironment(value: string | undefined
 function normalizedContextKeys(values: readonly string[]): string[] {
   return [...new Set(values.map((value) => value.trim()).filter(Boolean))];
 }
+
+function normalizedNotificationTargets(
+  values: readonly RestartNotificationTarget[],
+): RestartNotificationTarget[] {
+  const targets = new Map<string, RestartNotificationTarget>();
+  for (const value of values) {
+    const contextKey = value.contextKey.trim();
+    if (!contextKey) continue;
+    const replyMessageId = value.replyMessageId?.trim();
+    const existing = targets.get(contextKey);
+    targets.set(contextKey, {
+      contextKey,
+      ...(existing?.replyMessageId || replyMessageId
+        ? { replyMessageId: existing?.replyMessageId ?? replyMessageId }
+        : {}),
+    });
+  }
+  return [...targets.values()];
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/src/supervisor.ts

@@ -16,8 +16,11 @@ import { SupervisorDiagnostics, nodeDiagnosticReportArguments } from "./supervis
 import { refreshedSystemEnvironment } from "./supervision/systemEnvironment.js";
 import {
   RESTART_GROUP_CONTEXTS_ENV,
+  RESTART_NOTIFICATION_TARGETS_ENV,
   restartGroupContextKeysFromEnvironment,
+  restartNotificationTargetsFromEnvironment,
 } from "./supervision/replacementSupervisor.js";
+import type { RestartNotificationTarget } from "./supervision/SafeRestartScheduler.js";
 
 const childEntry = fileURLToPath(new URL("./index.js", import.meta.url));
 const config = loadConfig();
@@ -28,12 +31,14 @@ const diagnostics = new SupervisorDiagnostics(config);
 diagnostics.initialize();
 let child: ChildProcess | undefined;
 let restartTimer: NodeJS.Timeout | undefined;
-let restartGroupContextExpiryTimer: NodeJS.Timeout | undefined;
+let restartNotificationTargetExpiryTimer: NodeJS.Timeout | undefined;
 let stopping = false;
 let consecutiveFailures = 0;
 let nextStartReason = process.env.AGENT_BOT_RESTART_REASON?.trim() || "Supervisor 启动";
-let nextRestartGroupContextKeys = restartGroupContextKeysFromEnvironment(
-  process.env[RESTART_GROUP_CONTEXTS_ENV],
+let nextRestartNotificationTargets = mergeRestartNotificationTargets(
+  restartNotificationTargetsFromEnvironment(process.env[RESTART_NOTIFICATION_TARGETS_ENV]),
+  restartGroupContextKeysFromEnvironment(process.env[RESTART_GROUP_CONTEXTS_ENV])
+    .map((contextKey) => ({ contextKey })),
 );
 
 async function startChild(): Promise<void> {
@@ -45,7 +50,7 @@ async function startChild(): Promise<void> {
   }
   const startedAt = Date.now();
   const restartReason = nextStartReason;
-  const restartGroupContextKeys = nextRestartGroupContextKeys;
+  const restartNotificationTargets = nextRestartNotificationTargets;
   nextStartReason = "Supervisor 重新拉起进程";
   const workerStderr = diagnostics.openWorkerStderr();
   const environmentRefresh = refreshedSystemEnvironment();
@@ -64,7 +69,7 @@ async function startChild(): Promise<void> {
         ...environmentRefresh.environment,
         AGENT_BOT_SUPERVISED: "1",
         AGENT_BOT_RESTART_REASON: restartReason,
-      }, restartGroupContextKeys),
+      }, restartNotificationTargets),
       stdio: ["ignore", "ignore", workerStderr],
       windowsHide: true,
     });
@@ -75,7 +80,7 @@ async function startChild(): Promise<void> {
   writeSupervisorLog("started", {
     pid: child.pid,
     restartReason,
-    restartGroupContextKeys,
+    restartNotificationTargets,
     workerStderrPath: diagnostics.paths.workerStderrPath,
     crashReportDirectory: diagnostics.paths.crashReportDirectory,
   });
@@ -86,25 +91,26 @@ async function startChild(): Promise<void> {
   child.once("exit", (code, signal) => {
     void handleChildExit(code, signal, startedAt, workerPid);
   });
-  if (restartGroupContextKeys.length > 0) {
-    if (restartGroupContextExpiryTimer) clearTimeout(restartGroupContextExpiryTimer);
-    restartGroupContextExpiryTimer = setTimeout(() => {
-      nextRestartGroupContextKeys = [];
-      restartGroupContextExpiryTimer = undefined;
+  if (restartNotificationTargets.length > 0) {
+    if (restartNotificationTargetExpiryTimer) clearTimeout(restartNotificationTargetExpiryTimer);
+    restartNotificationTargetExpiryTimer = setTimeout(() => {
+      nextRestartNotificationTargets = [];
+      restartNotificationTargetExpiryTimer = undefined;
     }, STABLE_UPTIME_MS);
   }
 }
 
 function workerEnvironment(
   environment: NodeJS.ProcessEnv,
-  restartGroupContextKeys: readonly string[],
+  restartNotificationTargets: readonly RestartNotificationTarget[],
 ): NodeJS.ProcessEnv {
   const result = { ...environment };
-  if (restartGroupContextKeys.length > 0) {
-    result[RESTART_GROUP_CONTEXTS_ENV] = JSON.stringify(restartGroupContextKeys);
+  if (restartNotificationTargets.length > 0) {
+    result[RESTART_NOTIFICATION_TARGETS_ENV] = JSON.stringify(restartNotificationTargets);
   } else {
-    delete result[RESTART_GROUP_CONTEXTS_ENV];
+    delete result[RESTART_NOTIFICATION_TARGETS_ENV];
   }
+  delete result[RESTART_GROUP_CONTEXTS_ENV];
   return result;
 }
 
@@ -164,7 +170,7 @@ function stop(signal: NodeJS.Signals): void {
   if (stopping) return;
   stopping = true;
   if (restartTimer) clearTimeout(restartTimer);
-  if (restartGroupContextExpiryTimer) clearTimeout(restartGroupContextExpiryTimer);
+  if (restartNotificationTargetExpiryTimer) clearTimeout(restartNotificationTargetExpiryTimer);
   if (child && !child.killed) {
     child.kill(signal);
     return;
@@ -176,6 +182,19 @@ function writeSupervisorLog(event: string, data: Record<string, unknown>): void
   diagnostics.writeEvent(event, data);
 }
 
+function mergeRestartNotificationTargets(
+  ...targetGroups: RestartNotificationTarget[][]
+): RestartNotificationTarget[] {
+  const targets = new Map<string, RestartNotificationTarget>();
+  for (const target of targetGroups.flat()) {
+    const existing = targets.get(target.contextKey);
+    if (!existing || (!existing.replyMessageId && target.replyMessageId)) {
+      targets.set(target.contextKey, { ...target });
+    }
+  }
+  return [...targets.values()];
+}
+
 process.on("SIGINT", () => stop("SIGINT"));
 process.on("SIGTERM", () => stop("SIGTERM"));
 const initialDelayMs = Number(process.env.AGENT_BOT_START_DELAY_MS ?? 0);