ework-daemon 0.4.54 → 0.4.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-daemon",
-  "version": "0.4.54",
+  "version": "0.4.56",
   "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;
   });
 }
 
@@ -1361,12 +1357,19 @@ 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) {
-        void tracker.setCommentModel(ref, matched.id, usedModel).catch(() => { /* display-only */ });
+      if (matched && !usedModel) {
+        const fromSession = await this.backend.lastSessionModel(session.opencodeSessionId).catch(() => ({ model: "" }));
+        if (fromSession.model) {
+          void tracker.setCommentModel(ref, matched.id, fromSession.model).catch(() => { /* display-only */ });
+        }
       }
       this.nudgeRounds.delete(k);
       this.emptyResponseRounds.delete(k);

package/src/runtime/opencode-backend.ts

@@ -7,6 +7,7 @@ import type {
   RuntimeSpawnCallbacks,
   RuntimeHandle,
   SessionOutputResult,
+  LastModelResult,
 } from "./types";
 
 const ENV_DENY_ALWAYS = ["OPENCODE", "OPENCODE_PID", "OPENCODE_RUN_ID", "OPENCODE_PROCESS_ROLE"] as const;
@@ -105,6 +106,28 @@ export class OpencodeBackend implements RuntimeBackend {
     }
   }
 
+  async lastSessionModel(sessionId: string | undefined): Promise<LastModelResult> {
+    if (!sessionId) return { model: "" };
+    let db: Database;
+    try {
+      db = new Database(this.dbPath, { readonly: true });
+    } catch {
+      return { model: "" };
+    }
+    try {
+      const row = db.prepare(
+        "SELECT json_extract(data,'$.modelID') AS model FROM message " +
+        "WHERE session_id = ? AND json_extract(data,'$.modelID') IS NOT NULL AND json_extract(data,'$.modelID') != '' " +
+        "ORDER BY time_created DESC LIMIT 1"
+      ).get(sessionId) as { model: string | null } | null;
+      return { model: row?.model ?? "" };
+    } catch {
+      return { model: "" };
+    } finally {
+      db.close();
+    }
+  }
+
   async getSessionOutputTokens(sessionId: string | undefined): Promise<SessionOutputResult> {
     if (!sessionId) return { hasOutput: true, tokenCount: 0 };
     let db: Database;

package/src/runtime/pi-backend.ts

@@ -8,6 +8,7 @@ import type {
   RuntimeSpawnCallbacks,
   RuntimeHandle,
   SessionOutputResult,
+  LastModelResult,
 } from "./types";
 
 export class PiBackend implements RuntimeBackend {
@@ -98,6 +99,10 @@ export class PiBackend implements RuntimeBackend {
     }
   }
 
+  async lastSessionModel(_sessionId: string | undefined): Promise<LastModelResult> {
+    return { model: "" };
+  }
+
   async sessionExists(sessionId: string): Promise<boolean> {
     if (!sessionId) return false;
     return this.findSessionFile(sessionId) !== null;

package/src/runtime/types.ts

@@ -11,6 +11,10 @@ export interface RuntimeSpawnCallbacks {
   onSessionId: (id: string) => Promise<void> | void;
 }
 
+export interface LastModelResult {
+  model: string;
+}
+
 export interface RuntimeHandle {
   pid: number;
   exited: Promise<number>;
@@ -26,6 +30,7 @@ export interface RuntimeBackend {
   readonly name: string;
 
   spawn(opts: RuntimeSpawnOpts, callbacks: RuntimeSpawnCallbacks): Promise<RuntimeHandle>;
+  lastSessionModel(sessionId: string | undefined): Promise<LastModelResult>;
 
   sessionExists(sessionId: string): Promise<boolean>;