@alook/daemon 0.1.19 → 0.1.21

package/dist/cli/index.js

@@ -17679,7 +17679,7 @@ var AuditLogWakeTriggerPayloadSchema = exports_external.object({
   reason: exports_external.enum(["unread", "mention"])
 });
 var AuditLogSessionResetPayloadSchema = exports_external.object({
-  trigger: exports_external.enum(["single", "reset_all"])
+  trigger: exports_external.enum(["single", "reset_all", "idle_timeout"])
 });
 var AuditLogNapPayloadSchema = exports_external.object({
   trigger: exports_external.literal("nap")
@@ -17722,10 +17722,33 @@ var BotAuditEventKindSchema = exports_external.enum([
 ]);
 var HostBotAuditEventFrameSchema = exports_external.object({
   type: exports_external.literal("bot_audit_event"),
+  eventId: exports_external.string().min(1).max(128).optional(),
+  occurredAt: exports_external.string().datetime({ offset: true }).optional(),
   agentId: exports_external.string().min(1),
   sessionId: exports_external.string().nullable().optional(),
   launchId: exports_external.string().nullable().optional(),
   event: BotAuditEventSchema
+}).superRefine((frame, ctx) => {
+  if (frame.event.kind === "session_reset" && frame.event.payload.trigger === "idle_timeout" && (!frame.eventId || !frame.occurredAt)) {
+    if (!frame.eventId) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["eventId"],
+        message: "eventId is required for idle_timeout session_reset"
+      });
+    }
+    if (!frame.occurredAt) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["occurredAt"],
+        message: "occurredAt is required for idle_timeout session_reset"
+      });
+    }
+  }
+});
+var BotAuditEventAckFrameSchema = exports_external.strictObject({
+  type: exports_external.literal("bot_audit_event_ack"),
+  eventId: exports_external.string().min(1).max(128)
 });
 // ../shared/src/db/community-schema.ts
 var exports_community_schema = {};
@@ -25708,6 +25731,7 @@ var DEFAULT_PING_INTERVAL_MS = 15000;
 var DEFAULT_PONG_TIMEOUT_MS = 30000;
 var DEFAULT_RECONNECT_BASE_MS = 500;
 var DEFAULT_RECONNECT_MAX_MS = 30000;
+var DEFAULT_AUDIT_ACK_RETRY_MS = 5000;
 function describeErr(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -25723,8 +25747,10 @@ class WsControlChannel {
   closedByUser = false;
   authRejected = false;
   pingTimer = null;
+  auditRetryTimer = null;
   pongDeadline = 0;
   resyncProvider = null;
+  pendingBotAuditEvents = new Map;
   log;
   wakeCoordinator = new WakeCoordinator;
   constructor(opts) {
@@ -25742,6 +25768,7 @@ class WsControlChannel {
   close() {
     this.closedByUser = true;
     this.clearHeartbeat();
+    this.clearAuditRetry();
     this.ws?.close();
     this.ws = null;
     this.statusValue = "closed";
@@ -25799,8 +25826,27 @@ class WsControlChannel {
     this.sendFrame({ type: "agent_typing_stop", ...info });
   }
   async reportBotAuditEvent(frame) {
+    if (frame.event.kind === "session_reset" && frame.event.payload.trigger === "idle_timeout") {
+      if (!frame.eventId || !frame.occurredAt) {
+        this.log.error("durable idle-reset audit missing local receipt", {
+          agentId: frame.agentId
+        });
+        return;
+      }
+      this.pendingBotAuditEvents.set(frame.eventId, frame);
+      this.sendFrame(frame);
+      this.scheduleAuditRetry();
+      return;
+    }
     this.sendFrame(frame);
   }
+  restorePendingBotAuditEvent(frame) {
+    if (!frame.eventId || !frame.occurredAt)
+      return;
+    this.pendingBotAuditEvents.set(frame.eventId, frame);
+    this.sendFrame(frame);
+    this.scheduleAuditRetry();
+  }
   async reportWakeAck(info) {
     this.wakeCoordinator.recordDeliveryAck(info.agentId, info.launchId, info.status);
     this.sendFrame({ type: "agent_wake_ack", ...info });
@@ -25827,10 +25873,14 @@ class WsControlChannel {
       const liveActivities = activities ?? [];
       for (const a of liveActivities)
         this.sendFrame({ type: "agent_activity", ...a });
+      for (const frame of this.pendingBotAuditEvents.values())
+        this.sendFrame(frame);
+      this.scheduleAuditRetry();
       this.log.info("resync sent", {
         ready: ready.runtimeReport.length,
         sessions: sessions.length,
-        activities: liveActivities.length
+        activities: liveActivities.length,
+        pendingAuditEvents: this.pendingBotAuditEvents.size
       });
     }
     for (const hook of this.resyncHooks) {
@@ -25873,6 +25923,34 @@ class WsControlChannel {
       this.opts.onAuthRejected?.();
       return;
     }
+    const auditAck = BotAuditEventAckFrameSchema.safeParse(frame);
+    if (auditAck.success) {
+      this.attempt = 0;
+      const pending = this.pendingBotAuditEvents.get(auditAck.data.eventId);
+      if (!pending)
+        return;
+      let durableCleared = this.opts.onBotAuditEventAck === undefined;
+      try {
+        durableCleared = this.opts.onBotAuditEventAck?.({
+          agentId: pending.agentId,
+          eventId: auditAck.data.eventId
+        }) ?? true;
+      } catch (err) {
+        this.log.warn("bot audit ack local clear threw", {
+          eventId: auditAck.data.eventId,
+          err: describeErr(err)
+        });
+      }
+      if (durableCleared)
+        this.pendingBotAuditEvents.delete(auditAck.data.eventId);
+      else
+        this.log.warn("bot audit ack local clear deferred", { eventId: auditAck.data.eventId });
+      if (this.pendingBotAuditEvents.size === 0)
+        this.clearAuditRetry();
+      else
+        this.scheduleAuditRetry();
+      return;
+    }
     this.attempt = 0;
     this.ingestCommand(frame).catch((err) => {
       this.log.warn("command ingress failed", { type: frame.type, err: describeErr(err) });
@@ -25947,6 +26025,7 @@ class WsControlChannel {
   onSocketClosed(code, reason) {
     this.log.warn("control channel closed", { code, reason: reason ? String(reason) : "" });
     this.clearHeartbeat();
+    this.clearAuditRetry();
     this.ws = null;
     if (this.closedByUser)
       return;
@@ -25994,6 +26073,26 @@ class WsControlChannel {
       this.pingTimer = null;
     }
   }
+  scheduleAuditRetry() {
+    if (this.auditRetryTimer || this.pendingBotAuditEvents.size === 0)
+      return;
+    const delayMs = this.opts.auditAckRetryMs ?? DEFAULT_AUDIT_ACK_RETRY_MS;
+    this.auditRetryTimer = setTimeout(() => {
+      this.auditRetryTimer = null;
+      if (this.statusValue === "open") {
+        for (const frame of this.pendingBotAuditEvents.values())
+          this.sendFrame(frame);
+      }
+      this.scheduleAuditRetry();
+    }, delayMs);
+    this.auditRetryTimer.unref?.();
+  }
+  clearAuditRetry() {
+    if (!this.auditRetryTimer)
+      return;
+    clearTimeout(this.auditRetryTimer);
+    this.auditRetryTimer = null;
+  }
   now() {
     return this.opts.now ? this.opts.now() : Date.now();
   }
@@ -27697,14 +27796,14 @@ class AgentProcessManager {
     const effects = this.dispatch({ type: "wake", agentId, message: normalized, nowMs: this.now() });
     return effects.length > 0;
   }
-  forgetSession(agentId, barrierType = "reset_session", forgottenSessionId) {
-    if (!this.forgetSessionSources(agentId, barrierType, forgottenSessionId))
+  forgetSession(agentId, barrierType = "reset_session", forgottenSessionId, pendingIdleResetEvent) {
+    if (!this.forgetSessionSources(agentId, barrierType, forgottenSessionId, pendingIdleResetEvent))
       return false;
     this.dispatch({ type: "reset_session", agentId });
     return true;
   }
-  forgetSessionSources(agentId, barrierType, forgottenSessionId) {
-    const persisted = this.opts.timeline?.forgetSession(agentId, barrierType, forgottenSessionId);
+  forgetSessionSources(agentId, barrierType, forgottenSessionId, pendingIdleResetEvent) {
+    const persisted = pendingIdleResetEvent ? this.opts.timeline?.forgetSession(agentId, barrierType, forgottenSessionId, pendingIdleResetEvent) : this.opts.timeline?.forgetSession(agentId, barrierType, forgottenSessionId);
     if (persisted === false)
       return false;
     this.resumeSessions.delete(agentId);
@@ -28283,7 +28382,11 @@ ${this.opts.wakePromptFooter}` : text2;
         break;
       case "reset_idle_session": {
         const spawnState = this.activeSpawnState.get(effect.agentId);
-        const persisted = this.forgetSession(effect.agentId, "reset_session", effect.sessionId);
+        const completion = {
+          eventId: `bae_${randomUUID5()}`,
+          occurredAt: new Date(this.now()).toISOString()
+        };
+        const persisted = this.forgetSession(effect.agentId, "reset_session", effect.sessionId, completion);
         if (!persisted) {
           this.log.error("idle session reset barrier was not persisted; reset deferred", {
             agentId: effect.agentId,
@@ -28295,6 +28398,23 @@ ${this.opts.wakePromptFooter}` : text2;
         if (spawnState)
           spawnState.discardEvents = true;
         this.dispatch({ type: "idle_reset_committed", agentId: effect.agentId, nowMs: this.now() });
+        if (this.opts.onBotAuditEvent) {
+          try {
+            this.opts.onBotAuditEvent(effect.agentId, {
+              kind: "session_reset",
+              payload: { trigger: "idle_timeout" }
+            }, {
+              sessionId: null,
+              launchId: null,
+              ...completion
+            });
+          } catch (err) {
+            this.log.debug("audit emit failed (idle session reset)", {
+              agentId: effect.agentId,
+              err: String(err)
+            });
+          }
+        }
         this.log.info("idle agent session reset", {
           agentId: effect.agentId,
           sessionId: effect.sessionId
@@ -29317,11 +29437,13 @@ var TIMELINE_READ_CHUNK_BYTES = 65536;
 var DATE_FILENAME_PATTERN = /^\d{4}-\d{2}-\d{2}\.jsonl$/;
 var RESUME_CONTROL_FILENAME = ".resume-control.json";
 var RESUME_CONTROL_MAX_BYTES = 4096;
+var MAX_PENDING_IDLE_RESET_EVENTS = 32;
 var EMPTY_RESUME_CONTROL = {
   version: 1,
   attemptedSessionId: null,
   fencedSessionId: null,
-  fullBarrier: null
+  fullBarrier: null,
+  pendingIdleResetEvents: []
 };
 function isBarrier(entry) {
   return entry.system !== undefined;
@@ -29711,7 +29833,8 @@ function readResumeControlState(timelineDir) {
     const raw = bounded.subarray(0, bytesRead).toString("utf8");
     const value = JSON.parse(raw);
     const validSessionId = (candidate) => candidate === null || typeof candidate === "string" && candidate.length > 0 && candidate.length <= 512;
-    if (value.version !== 1 || !validSessionId(value.attemptedSessionId) || !validSessionId(value.fencedSessionId) || value.fullBarrier !== null && value.fullBarrier !== "reset_session" && value.fullBarrier !== "nap")
+    const pendingIdleResetEvents = value.pendingIdleResetEvents === undefined ? [] : value.pendingIdleResetEvents;
+    if (value.version !== 1 || !validSessionId(value.attemptedSessionId) || !validSessionId(value.fencedSessionId) || !Array.isArray(pendingIdleResetEvents) || pendingIdleResetEvents.length > MAX_PENDING_IDLE_RESET_EVENTS || pendingIdleResetEvents.some((event) => !event || typeof event !== "object" || typeof event.eventId !== "string" || event.eventId.length < 1 || event.eventId.length > 128 || typeof event.occurredAt !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(event.occurredAt) || !Number.isFinite(Date.parse(event.occurredAt))) || new Set(pendingIdleResetEvents.map((event) => event.eventId)).size !== pendingIdleResetEvents.length || value.fullBarrier !== null && value.fullBarrier !== "reset_session" && value.fullBarrier !== "nap")
       return { kind: "invalid" };
     return {
       kind: "state",
@@ -29719,7 +29842,8 @@ function readResumeControlState(timelineDir) {
         version: 1,
         attemptedSessionId: value.attemptedSessionId,
         fencedSessionId: value.fencedSessionId,
-        fullBarrier: value.fullBarrier
+        fullBarrier: value.fullBarrier,
+        pendingIdleResetEvents
       }
     };
   } catch {
@@ -29742,11 +29866,14 @@ function updateResumeControlState(timelineDir, update) {
     const current = readResumeControlState(timelineDir);
     const base = current.kind === "state" ? current.state : EMPTY_RESUME_CONTROL;
     const next = update({ ...base });
+    if (!Array.isArray(next.pendingIdleResetEvents) || next.pendingIdleResetEvents.length > MAX_PENDING_IDLE_RESET_EVENTS || next.pendingIdleResetEvents.some((event) => !event || typeof event !== "object" || typeof event.eventId !== "string" || event.eventId.length < 1 || event.eventId.length > 128 || typeof event.occurredAt !== "string" || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(event.occurredAt) || !Number.isFinite(Date.parse(event.occurredAt))) || new Set(next.pendingIdleResetEvents.map((event) => event.eventId)).size !== next.pendingIdleResetEvents.length)
+      return false;
     const canonical = {
       version: 1,
       attemptedSessionId: next.attemptedSessionId,
       fencedSessionId: next.fencedSessionId,
-      fullBarrier: next.fullBarrier
+      fullBarrier: next.fullBarrier,
+      pendingIdleResetEvents: next.pendingIdleResetEvents
     };
     const body = JSON.stringify(canonical) + `
 `;
@@ -30410,7 +30537,7 @@ function createTimelineRecorder(opts) {
     clearSessionStall(agentId, sessionId) {
       return appendStallMarker(agentId, "stall_recovery_clear", sessionId);
     },
-    forgetSession(agentId, barrierType = "reset_session", forgottenSessionId) {
+    forgetSession(agentId, barrierType = "reset_session", forgottenSessionId, pendingIdleResetEvent) {
       retryPending(agentId);
       const dir = dirFor(agentId);
       if (!prepareTimelineDirectory(dir))
@@ -30422,7 +30549,8 @@ function createTimelineRecorder(opts) {
           ...state,
           attemptedSessionId: null,
           fencedSessionId: null,
-          fullBarrier: barrierType
+          fullBarrier: barrierType,
+          pendingIdleResetEvents: pendingIdleResetEvent && !state.pendingIdleResetEvents.some(({ eventId }) => eventId === pendingIdleResetEvent.eventId) ? [...state.pendingIdleResetEvents, pendingIdleResetEvent] : state.pendingIdleResetEvents
         }));
       } else if (barrierType === "stall_recovery") {
         persisted = updateResumeControlState(dir, (state) => ({
@@ -30453,6 +30581,19 @@ function createTimelineRecorder(opts) {
       const result = appendTrackedEntry(dir, createSystemEntry(barrierType, stamp.toISOString(), forgottenSessionId), stamp);
       handleTrackedResult(agentId, null, result);
       return true;
+    },
+    pendingIdleResetEvents(agentId) {
+      const state = readResumeControlState(dirFor(agentId));
+      return state.kind === "state" ? state.state.pendingIdleResetEvents.map((event) => ({ ...event })) : [];
+    },
+    acknowledgeIdleResetEvent(agentId, eventId) {
+      const dir = dirFor(agentId);
+      if (!prepareTimelineDirectory(dir))
+        return false;
+      return updateResumeControlState(dir, (state) => ({
+        ...state,
+        pendingIdleResetEvents: state.pendingIdleResetEvents.filter((event) => event.eventId !== eventId)
+      }));
     }
   };
   function appendStallMarker(agentId, type, sessionId) {
@@ -31007,6 +31148,8 @@ async function createDaemon(opts) {
   const emitBotAuditEvent = (agentId, event, context) => {
     channelRef?.reportBotAuditEvent?.({
       type: "bot_audit_event",
+      ...context?.eventId ? { eventId: context.eventId } : {},
+      ...context?.occurredAt ? { occurredAt: context.occurredAt } : {},
       agentId,
       sessionId: context?.sessionId ?? null,
       launchId: context?.launchId ?? null,
@@ -31106,6 +31249,7 @@ async function createDaemon(opts) {
         ownerName: b.ownerName,
         ownerDiscriminator: b.ownerDiscriminator
       });
+      restorePendingIdleResetEvents(b.id);
     }
     botCacheReady = true;
   }
@@ -31200,9 +31344,23 @@ async function createDaemon(opts) {
     headers: { Authorization: `Bearer ${opts.machineKey}` },
     webSocketFactory: opts.webSocketFactory,
     onAuthRejected: opts.onAuthRejected,
+    onBotAuditEventAck: ({ agentId, eventId }) => timeline2.acknowledgeIdleResetEvent(agentId, eventId),
     logger: log2.child("ws")
   });
   channelRef = channel2;
+  function restorePendingIdleResetEvents(agentId) {
+    for (const pending of timeline2.pendingIdleResetEvents(agentId)) {
+      channel2.restorePendingBotAuditEvent({
+        type: "bot_audit_event",
+        eventId: pending.eventId,
+        occurredAt: pending.occurredAt,
+        agentId,
+        sessionId: null,
+        launchId: null,
+        event: { kind: "session_reset", payload: { trigger: "idle_timeout" } }
+      });
+    }
+  }
   function handleBotFrame(cmd) {
     switch (cmd.type) {
       case "bot:added":
@@ -31213,6 +31371,7 @@ async function createDaemon(opts) {
           ownerName: cmd.ownerName,
           ownerDiscriminator: cmd.ownerDiscriminator
         });
+        restorePendingIdleResetEvents(cmd.botId);
         log2.debug("bot:added", { botId: cmd.botId, name: cmd.name });
         break;
       case "bot:updated": {