ework-daemon 0.4.23 → 0.4.25

package/package.json

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

package/src/config.ts

@@ -36,6 +36,7 @@ export const configSchema = z.object({
   }),
   work: z.object({
     capacity: z.coerce.number().int().positive().default(4),
+    maxConcurrent: z.coerce.number().int().positive().default(4),
     heartbeatMs: z.coerce.number().int().positive().default(10_000),
     leaseTtlMs: z.coerce.number().int().positive().default(60_000),
   }),
@@ -85,8 +86,10 @@ const TEST_DEFAULTS = {
 };
 
 function readWorkSection() {
+  const capacity = process.env.WORK_DAEMON_CAPACITY ? Number(process.env.WORK_DAEMON_CAPACITY) : 4;
   return {
-    capacity: process.env.WORK_DAEMON_CAPACITY ? Number(process.env.WORK_DAEMON_CAPACITY) : 4,
+    capacity,
+    maxConcurrent: process.env.WORK_MAX_CONCURRENT ? Number(process.env.WORK_MAX_CONCURRENT) : capacity,
     heartbeatMs: process.env.WORK_DAEMON_HEARTBEAT_MS ? Number(process.env.WORK_DAEMON_HEARTBEAT_MS) : 10_000,
     leaseTtlMs: process.env.WORK_DAEMON_LEASE_TTL_MS ? Number(process.env.WORK_DAEMON_LEASE_TTL_MS) : 60_000,
   };

package/src/gitea.ts

@@ -75,8 +75,8 @@ export class GiteaClient {
         status,
         detail,
       }, true);
-    } catch {
-      // Status callback is best-effort — don't block processing on API failure.
+    } catch (e) {
+      console.warn("[gitea] updateIssueStatus failed:", (e as Error).message);
     }
   }
 

package/src/op.ts

@@ -299,6 +299,14 @@ export class Store {
     return row ? rowToMessage(row) : undefined;
   }
 
+  async getGlobalPendingMessages(limit: number): Promise<Message[]> {
+    const rows = await getDB().all<MessageRow>(
+      "SELECT * FROM {{messages}} WHERE status = 'pending' ORDER BY created_at ASC LIMIT ?",
+      [limit]
+    );
+    return rows.map(rowToMessage);
+  }
+
   async updateMessageStatus(id: string, status: Message["status"], error?: string): Promise<void> {
     const row = await getDB().get<MessageRow>("SELECT * FROM {{messages}} WHERE uid = ?", [id]);
     const attempts = row ? row.attempts + (status === "failed" ? 1 : 0) : 0;

package/src/opencode.ts

@@ -561,6 +561,11 @@ export class Engine {
       return;
     }
 
+    if (issueData.ai_status === "halted" && (event.type === "issue_opened" || event.type === "comment_created")) {
+      log.info(`engine: issue halted — skipping ${event.type} for ${ref.trackerType}:${scopeKey}#${ref.issueId}`);
+      return;
+    }
+
     const issueMapKey = `${ref.trackerType}:${scopeKey}#${ref.issueId}`;
     if (groupConfig) {
       this.groupConfigs.set(issueMapKey, groupConfig);
@@ -884,6 +889,11 @@ export class Engine {
       return;
     }
 
+    if (this.running.size >= this.cfg.work.maxConcurrent) {
+      log.info(`engine: concurrency limit reached (${this.running.size}/${this.cfg.work.maxConcurrent}), message ${msg.id.slice(0, 8)} queued for ${k}`);
+      return;
+    }
+
     // Not running — execute directly
     await this.executeMessage(k, session, issue, msg);
   }
@@ -1163,6 +1173,7 @@ export class Engine {
     if (exitCode === null) {
       log.info(`engine: spawn failed for ${k}, skipping completion check`);
       await this.store.updateSession(session.id, { opencodePid: undefined });
+      void tracker.updateStatus(ref, "failed", "spawn failed");
       await this.deactivateIfIdle(k, session, issue);
       return;
     }
@@ -1185,6 +1196,7 @@ export class Engine {
       this.nudgeRounds.delete(k);
       this.emptyResponseRounds.delete(k);
       await this.persistRuntimeState(session.id);
+      void tracker.updateStatus(ref, "");
     } else {
       const sessionOutput = await this.checkSessionOutput(session.opencodeSessionId);
       const emptyRound = this.emptyResponseRounds.get(k) ?? 0;
@@ -1207,6 +1219,7 @@ export class Engine {
         this.emptyResponseRounds.delete(k);
         this.nudgeRounds.delete(k);
         await tracker.createComment(ref, `[system] ❌ **${session.name}** 模型返回空响应（0 token），已重试 ${emptyRound} 次。请检查模型配置或稍后重试。`).catch(() => {});
+        void tracker.updateStatus(ref, "failed", "empty model response");
       } else {
         const nudgeRound = this.nudgeRounds.get(k) ?? 0;
         if (exitCode === 0 && nudgeRound < Engine.MAX_NUDGE_ROUNDS) {
@@ -1225,6 +1238,7 @@ export class Engine {
         this.nudgeRounds.delete(k);
         const detail = exitCode === 0 ? "ran but did not post a reply" : `crashed (exit ${exitCode})`;
         await tracker.createComment(ref, `[system] ❌ **${session.name}** ${detail}. Try posting again or @${session.name} to retry.`).catch(() => {});
+        void tracker.updateStatus(ref, "failed", detail);
       }
     }
 
@@ -1258,13 +1272,38 @@ export class Engine {
     if (nextMsg) {
       const current = await this.store.getSession(session.id);
       if (current && current.state !== "idle") {
-        await this.dequeueOrIdle(k, current, issue, nextMsg);
-        return;
+        if (this.running.size >= this.cfg.work.maxConcurrent) {
+          log.info(`engine: concurrency limit (${this.running.size}/${this.cfg.work.maxConcurrent}), keeping msg ${nextMsg.id.slice(0, 8)} pending for ${k}`);
+        } else {
+          await this.dequeueOrIdle(k, current, issue, nextMsg);
+          return;
+        }
       }
     }
 
     this.clearRuntimeState(k);
     await this.store.updateSession(session.id, { state: "idle" });
+
+    void this.drainGlobalPending();
+  }
+
+  private async drainGlobalPending(): Promise<void> {
+    const slotsAvailable = this.cfg.work.maxConcurrent - this.running.size;
+    if (slotsAvailable <= 0) return;
+    const pending = await this.store.getGlobalPendingMessages(slotsAvailable);
+    for (const msg of pending) {
+      if (this.running.size >= this.cfg.work.maxConcurrent) break;
+      const session = await this.store.getSession(msg.sessionId);
+      if (!session || session.state === "running") continue;
+      const issue = await this.store.getIssue(session.issueId);
+      if (!issue || issue.state === "closed") continue;
+      const k = this.sessionKey(session, issue);
+      if (this.running.has(k)) continue;
+      const won = await this.store.claimMessage(msg.id);
+      if (!won) continue;
+      log.info(`engine: drainGlobalPending picked up msg ${msg.id.slice(0, 8)} for ${k}`);
+      await this.dequeueOrIdle(k, session, issue, msg);
+    }
   }
 
   private async dequeueOrIdle(k: string, session: OpSession, issue: Issue, msg: Message) {

package/src/trackers/gitea-tracker.ts

@@ -140,6 +140,7 @@ export class GiteaTracker implements IssueTracker {
     };
 
     const issueUser = issue.user as Record<string, string>;
+    const aiStatus = typeof issue.ai_status === "string" ? issue.ai_status : "";
 
     if (action === "opened" || action === "reopened") {
       return {
@@ -150,6 +151,7 @@ export class GiteaTracker implements IssueTracker {
           body: (issue.body as string) ?? "",
           state: (issue.state as string) ?? "open",
           author: issueUser?.login ?? "",
+          ai_status: aiStatus,
         },
         model,
         cloneUrl,
@@ -167,6 +169,7 @@ export class GiteaTracker implements IssueTracker {
           body: (issue.body as string) ?? "",
           state: (issue.state as string) ?? "open",
           author: issueUser?.login ?? "",
+          ai_status: aiStatus,
         },
         comment: {
           id: String(comment.id),
@@ -188,6 +191,7 @@ export class GiteaTracker implements IssueTracker {
           body: (issue.body as string) ?? "",
           state: "closed",
           author: issueUser?.login ?? "",
+          ai_status: aiStatus,
         },
         model,
         cloneUrl,
@@ -205,6 +209,7 @@ export class GiteaTracker implements IssueTracker {
           body: (issue.body as string) ?? "",
           state: (issue.state as string) ?? "open",
           author: issueUser?.login ?? "",
+          ai_status: aiStatus,
         },
         status: {
           from: status?.from ?? "",

package/src/trackers/types.ts

@@ -23,6 +23,7 @@ export interface TrackerEvent {
     body: string;
     state: string;
     author: string;
+    ai_status?: string;
   };
   comment?: {
     id: string;