ework-daemon 0.4.39 → 0.4.41

package/package.json

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

package/src/op.ts

@@ -520,7 +520,7 @@ export class Store {
       `SELECT m.* FROM {{messages}} m
        INNER JOIN {{op_sessions}} s ON s.uid = m.session_id
        INNER JOIN {{issues}} i ON i.uid = s.issue_id
-       WHERE i.owner_daemon_id = ? AND m.status IN ('pending', 'running')
+       WHERE i.owner_daemon_id = ? AND m.status IN ('pending', 'running', 'interrupted')
        ORDER BY m.created_at ASC`,
       [daemonId]
     );

package/src/opencode.ts

@@ -283,6 +283,7 @@ export interface EngineOptions {
   daemonId: number;
   takeover?: TakeoverStrategy;
   backend?: RuntimeBackend;
+  gateChecker?: (issue: Issue) => Promise<{ allowed: boolean; reason: string }>;
 }
 
 function createDefaultBackend(cfg: Config): RuntimeBackend {
@@ -299,6 +300,7 @@ export class Engine {
   private readonly daemonId: number;
   private readonly takeover: TakeoverStrategy;
   private readonly backend: RuntimeBackend;
+  private gateChecker: (issue: Issue) => Promise<{ allowed: boolean; reason: string }>;
   private heartbeatTimer?: ReturnType<typeof setInterval>;
   private maxConcurrent: number;
   private maxConcurrentExplicit: boolean;
@@ -350,6 +352,7 @@ export class Engine {
     this.daemonId = opts.daemonId;
     this.takeover = opts.takeover ?? new RecloneStrategy(cfg);
     this.backend = opts.backend ?? createDefaultBackend(cfg);
+    this.gateChecker = opts.gateChecker ?? ((issue: Issue) => this.webGateAllows(issue));
     this.maxConcurrent = cfg.work.maxConcurrent;
     this.maxConcurrentExplicit = cfg.work.maxConcurrentExplicit;
     this.startGlobalObserver();
@@ -1119,6 +1122,17 @@ export class Engine {
   // ─── Process Manager ───
 
   private async execProcess(k: string, session: OpSession, issue: Issue, msg: Message) {
+    const gate = await this.gateChecker(issue);
+    if (!gate.allowed) {
+      log.info(`engine: execProcess blocked by web gate (${gate.reason}) for ${k}`);
+      await this.store.updateMessageStatus(msg.id, "failed", `gate: ${gate.reason}`);
+      this.running.delete(k);
+      this.currentMessage.delete(k);
+      this.currentModel.delete(k);
+      void this.dequeueAfterGate(k, session, issue);
+      return;
+    }
+
     const gen = (this.generation.get(k) ?? 0) + 1;
     this.generation.set(k, gen);
 
@@ -1392,6 +1406,12 @@ export class Engine {
     void this.drainGlobalPending();
   }
 
+  private async dequeueAfterGate(k: string, session: OpSession, issue: Issue): Promise<void> {
+    const next = await this.store.getNextPendingMessage(session.id);
+    if (!next) return;
+    await this.dequeueOrIdle(k, session, issue, next);
+  }
+
   private async drainGlobalPending(): Promise<void> {
     const slotsAvailable = this.maxConcurrent - this.running.size;
     if (slotsAvailable <= 0) return;
@@ -1574,7 +1594,7 @@ export class Engine {
 
     for (const issue of ownedIssues) {
       try {
-        const gate = await this.webGateAllows(issue);
+    const gate = await this.gateChecker(issue);
         if (!gate.allowed) {
           log.info(`engine: observer — web gate blocked ${issue.trackerScopeKey}#${issue.trackerIssueId} (${gate.reason})`);
           continue;
@@ -1793,7 +1813,7 @@ export class Engine {
     // Reset running messages to pending
     for (const msg of stuck) {
       if (msg.status === "running") {
-        await this.store.updateMessageStatus(msg.id, "pending");
+        await this.store.updateMessageStatus(msg.id, "interrupted");
       }
     }
 
@@ -1811,16 +1831,26 @@ export class Engine {
       const issue = await this.store.getIssue(session.issueId);
       if (!issue || issue.state === "closed") continue;
 
-      const gate = await this.webGateAllows(issue);
+      const gate = await this.gateChecker(issue);
       if (!gate.allowed) {
-        log.info(`engine: recover — web gate blocked ${issue.trackerScopeKey}#${issue.trackerIssueId} (${gate.reason}), marking pending messages as skipped`);
-        for (const m of msgs) await this.store.updateMessageStatus(m.id, "failed", `web gate: ${gate.reason}`);
+        log.info(`engine: recover — web gate blocked ${issue.trackerScopeKey}#${issue.trackerIssueId} (${gate.reason}), discarding queued (pending) messages`);
+        for (const m of msgs) {
+          if (m.status === "pending") {
+            await this.store.updateMessageStatus(m.id, "failed", `web gate: ${gate.reason}`);
+          }
+        }
         continue;
       }
 
       const k = this.sessionKey(session, issue);
       if (this.running.has(k)) continue;
 
+      for (const m of msgs) {
+        if (m.status === "running") {
+          await this.store.updateMessageStatus(m.id, "pending");
+        }
+      }
+
       const first = msgs.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime())[0]!;
 
       // Check if AI already replied before the crash — skip re-running if so