ework-daemon 0.4.55 → 0.4.57

package/package.json

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

package/src/opencode.ts

@@ -98,28 +98,24 @@ const RECENT_BOT_REPLY_THRESHOLD_MS = 5 * 60_000; // 5 minutes
 
 /**
  * Determine whether any non-system bot reply exists that is causally after
- * `promptTime` (when provided) or within a 5-minute absolute window (fallback).
- * Exported for unit testing — the causal vs absolute distinction is the P0
- * correctness fix for preempt/nudge false-done detection.
+ * `promptTime` (when provided) AND within a 5-minute absolute window.
+ * The causal bound prevents preempt/nudge false-done detection (a reply from
+ * the previous run must not satisfy this run); the recency bound prevents an
+ * early ack from satisfying a long run that ended silently (awork policy).
+ * Exported for unit testing.
  */
 export function hasRecentBotReply(
   comments: TrackerComment[],
   isBotUser: (author: string) => boolean,
   promptTime?: number,
 ): boolean {
-  if (promptTime) {
-    return comments.some(c => {
-      if (!isBotUser(c.author) || c.body.startsWith(SYSTEM_PREFIX)) return false;
-      if (!c.createdAt) return false;
-      return new Date(c.createdAt).getTime() > promptTime;
-    });
-  }
   const now = Date.now();
   return comments.some(c => {
     if (!isBotUser(c.author) || c.body.startsWith(SYSTEM_PREFIX)) return false;
-    if (!c.createdAt) return true;
-    const age = now - new Date(c.createdAt).getTime();
-    return age < RECENT_BOT_REPLY_THRESHOLD_MS;
+    if (!c.createdAt) return !promptTime;
+    const created = new Date(c.createdAt).getTime();
+    if (promptTime && created <= promptTime) return false;
+    return now - created < RECENT_BOT_REPLY_THRESHOLD_MS;
   });
 }
 
@@ -336,6 +332,7 @@ export class Engine {
   private startedAt = new Map<string, number>();
   private progressCommentId = new Map<string, string>();
   private pickupCommentId = new Map<string, string>();
+  private forwardCommentId = new Map<string, string>();
 
   private nudgeRounds = new Map<string, number>();
   private emptyResponseRounds = new Map<string, number>();
@@ -898,7 +895,10 @@ export class Engine {
         );
 
         // Immediate ack
-        await tracker.createComment(ref, `[system] ✓ Message forwarded to **${session.name}**${this.running.has(this.sessionKey(session, issue)) ? " (running)" : ""}.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`);
+        {
+          const c = await tracker.createComment(ref, `[system] ✓ Message forwarded to **${session.name}**${this.running.has(this.sessionKey(session, issue)) ? " (running)" : ""}.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`);
+          if (!session.opencodeSessionId) this.forwardCommentId.set(this.sessionKey(session, issue), c.id);
+        }
 
         await this.enqueueOrRun(session, issue, prompt, comment.id, model);
       } else {
@@ -1234,10 +1234,17 @@ export class Engine {
               const pickupId = this.pickupCommentId.get(k);
               if (pickupId) {
                 this.pickupCommentId.delete(k);
+    this.forwardCommentId.delete(k);
                 await tracker
                   .editComment(ref, pickupId, `[system] 🔄 **${session.name}** picked up this issue.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`)
                   .catch((err) => log.error(`engine: failed to rewrite pickup comment for ${k}:`, (err as Error).message));
               }
+              const forwardId = this.forwardCommentId.get(k);
+              if (forwardId) {
+                this.forwardCommentId.delete(k);
+                const body = `[system] ✓ Message forwarded to **${session.name}**${this.running.has(k) ? " (running)" : ""}.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`;
+                await tracker.editComment(ref, forwardId, body).catch(() => { /* cosmetic rewrite */ });
+              }
             }
           },
         },
@@ -1361,9 +1368,13 @@ export class Engine {
     const hasRecent = this.hasRecentBotReply(commentsNow, tracker, started ?? undefined);
 
     if (hasRecent) {
-      // oldest-first comment lists would match a pre-run bot reply when started
-      // is undefined; pick the LAST qualifying comment instead.
-      const matched = [...commentsNow].reverse().find(c => tracker.isBotUser(c.author) && !this.isSystemComment(c) && c.createdAt && new Date(c.createdAt).getTime() > (started ?? 0));
+      const nowMs = Date.now();
+      const matched = [...commentsNow].reverse().find(c => {
+        if (!tracker.isBotUser(c.author) || this.isSystemComment(c) || !c.createdAt) return false;
+        const created = new Date(c.createdAt).getTime();
+        if (started && created <= started) return false;
+        return nowMs - created < RECENT_BOT_REPLY_THRESHOLD_MS;
+      });
       log.info(`engine: [bot] reply found for ${k} after prompt (comment ${matched?.id ?? "?"} createdAt ${matched?.createdAt ?? "?"}), marking done`);
       if (matched && !usedModel) {
         const fromSession = await this.backend.lastSessionModel(session.opencodeSessionId).catch(() => ({ model: "" }));