ework-daemon 0.4.70 → 0.4.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-daemon",
-  "version": "0.4.70",
+  "version": "0.4.72",
   "description": "Issue-driven AI development daemon. Spawns opencode subprocesses to resolve Gitea issues.",
   "module": "src/index.ts",
   "type": "module",

package/src/op.ts

@@ -379,6 +379,22 @@ export class Store {
     const db = getDB();
     const cutoff = new Date(Date.now() - leaseTtlMs).toISOString();
 
+    // Identity reuse first: a fast restart (previous heartbeat still fresh)
+    // must keep the SAME row/id — daemon_id is embedded in web session links,
+    // so a fresh insert per boot orphans every historical link.
+    const mine = await db.get<{ id: number }>(
+      "SELECT id FROM {{daemons}} WHERE display_name = ? AND internal_endpoint = ? LIMIT 1",
+      [displayName, endpoint]
+    );
+    if (mine) {
+      const now = new Date().toISOString();
+      const res = await db.run(
+        "UPDATE {{daemons}} SET last_heartbeat = ?, status = 'active', capacity = ? WHERE id = ?",
+        [now, capacity, mine.id]
+      );
+      if (res.changes === 1) return mine.id;
+    }
+
     const orphan = await db.get<{ id: number }>(
       "SELECT id FROM {{daemons}} WHERE last_heartbeat < ? ORDER BY last_heartbeat LIMIT 1",
       [cutoff]

package/src/opencode.ts

@@ -422,6 +422,13 @@ export class Engine {
   private static MAX_INLINE_SIZE = 4000;
   private static MAX_NUDGE_ROUNDS = 1;
   private static MAX_EMPTY_RESPONSE_ROUNDS = 1;
+  // A queued (pending) message older than this is dead context — e.g. forwards
+  // left over from a webhook echo storm, or comments queued behind a session
+  // that ran for hours. Replaying them re-runs stale prompts and ping-pongs
+  // nudges ("reply → done → drain next stale → nudge → reply …"), observed on
+  // dog/tasks#3: 17:24 storm forwards replayed at 20:09–20:11. Expire instead
+  // of replay; explicit retryMessage bypasses this via { force: true }.
+  private static MAX_PENDING_AGE_MS = 30 * 60_000;
   private static MAX_STUCK_NUDGE_ROUNDS = 1;
   private static MAX_RUNTIME_MS = 3 * 60 * 60 * 1000;
   private static OBSERVER_INTERVAL_MS = 5 * 60 * 1000;
@@ -1717,7 +1724,24 @@ export class Engine {
     }
   }
 
-  private async dequeueOrIdle(k: string, session: OpSession, issue: Issue, msg: Message) {
+  private async dequeueOrIdle(k: string, session: OpSession, issue: Issue, msg: Message, opts: { force?: boolean } = {}) {
+    if (!opts.force) {
+      let next: Message | undefined = msg;
+      while (next) {
+        const age = Date.now() - next.createdAt.getTime();
+        if (age <= Engine.MAX_PENDING_AGE_MS) break;
+        log.warn(`engine: expiring stale pending msg ${next.id.slice(0, 8)} for ${k} (age ${Math.round(age / 60_000)}min > ${Math.round(Engine.MAX_PENDING_AGE_MS / 60_000)}min) — skipping replay`);
+        await this.store.updateMessageStatus(next.id, "failed", "expired: stale pending message not replayed");
+        next = await this.store.getNextPendingMessage(session.id);
+      }
+      if (!next) {
+        this.clearRuntimeState(k);
+        await this.store.updateSession(session.id, { state: "idle" });
+        void this.drainGlobalPending();
+        return;
+      }
+      msg = next;
+    }
     log.info(`engine: running dequeued msg ${msg.id.slice(0, 8)} for ${k}`);
     await this.store.updateMessageStatus(msg.id, "running");
     this.running.add(k);
@@ -2238,7 +2262,7 @@ export class Engine {
     await this.store.updateMessageStatus(messageId, "pending");
     const k = this.sessionKey(session, issue);
     if (!this.running.has(k)) {
-      await this.dequeueOrIdle(k, session, issue, msg);
+      await this.dequeueOrIdle(k, session, issue, msg, { force: true });
     }
     return true;
   }