ework-daemon 0.4.59 → 0.4.61

package/package.json

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

package/src/opencode.ts

@@ -316,6 +316,20 @@ function createBackendFor(cfg: Config, runtime: string): RuntimeBackend {
   return new OpencodeBackend(cfg.opencode.binary, cfg.opencode.dbPath, cfg.childEnvDeny);
 }
 
+// Wake policy shared by issue_opened and comment_created: blacklist wins,
+// then an explicit login whitelist (which replaces the kind check), then
+// author kind. Issue openers carry no kind and default to human.
+export function wakePolicySkips(
+  d: { nonWakingAuthors: string[]; noWakeLogins: string[]; wakeLogins: string[]; wakeKinds: string[] },
+  author: string,
+  authorKind: string,
+): string | null {
+  if ([...d.nonWakingAuthors, ...d.noWakeLogins].includes(author)) return `non-waking author ${author}`;
+  if (d.wakeLogins.length > 0 && !d.wakeLogins.includes(author)) return `author ${author} not in wakeLogins`;
+  if (!d.wakeKinds.includes(authorKind)) return `author kind ${authorKind} not in wakeKinds [${d.wakeKinds.join(",")}]`;
+  return null;
+}
+
 export class Engine {
   private cfg: Config;
   private store: Store;
@@ -393,13 +407,16 @@ export class Engine {
   // An existing session must keep the backend that owns it: opencode session
   // ids are "ses_..." while pi ids are bare uuids, so the prefix outvotes the
   // per-issue override. New sessions follow the issue's runtime setting.
+  // k is the session key "tracker:scope#issue@sessionName"; the runtime map is
+  // keyed by the issue part, so strip the "@sessionName" suffix.
   private backendFor(k: string, opencodeSessionId?: string): RuntimeBackend {
+    const issueKey = k.slice(0, k.lastIndexOf("@"));
     if (opencodeSessionId) {
       const wants = opencodeSessionId.startsWith("ses_") ? "opencode" : "pi";
       if (wants !== this.cfg.runtime) return this.altBackendFor(wants);
       return this.backend;
     }
-    const runtime = this.issueRuntimes.get(k);
+    const runtime = this.issueRuntimes.get(issueKey);
     if (!runtime || runtime === this.cfg.runtime) return this.backend;
     return this.altBackendFor(runtime);
   }
@@ -748,21 +765,12 @@ export class Engine {
       return;
     }
 
-    if (event.type === "comment_created" && event.comment?.author) {
-      const author = event.comment.author;
-      const authorKind = event.comment.authorKind ?? "human";
-      const d = this.cfg.daemon;
-      const noWake = [...d.nonWakingAuthors, ...d.noWakeLogins];
-      if (noWake.includes(author)) {
-        log.info(`engine: non-waking author ${author} — skipping comment_created for ${ref.trackerType}:${scopeKey}#${ref.issueId}`);
-        return;
-      }
-      if (d.wakeLogins.length > 0 && !d.wakeLogins.includes(author)) {
-        log.info(`engine: author ${author} not in wakeLogins — skipping comment_created for ${ref.trackerType}:${scopeKey}#${ref.issueId}`);
-        return;
-      }
-      if (!d.wakeKinds.includes(authorKind)) {
-        log.info(`engine: author kind ${authorKind} not in wakeKinds [${d.wakeKinds.join(",")}] — skipping comment_created for ${ref.trackerType}:${scopeKey}#${ref.issueId}`);
+    const wakeAuthor = event.type === "comment_created" ? event.comment?.author : event.type === "issue_opened" ? event.issue?.author : undefined;
+    const wakeKind = event.type === "comment_created" ? event.comment?.authorKind ?? "human" : "human";
+    if (wakeAuthor) {
+      const skip = wakePolicySkips(this.cfg.daemon, wakeAuthor, wakeKind);
+      if (skip) {
+        log.info(`engine: ${skip} — skipping ${event.type} for ${ref.trackerType}:${scopeKey}#${ref.issueId}`);
         return;
       }
     }