ework-daemon 0.1.0 → 0.1.2

package/package.json

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

package/src/op.ts

@@ -432,7 +432,7 @@ export class Store {
 
   // ─── Messages ───
 
-  createMessage(sessionId: string, content: string, sourceCommentId?: string, reactionCommentId?: string): Message {
+  createMessage(sessionId: string, content: string, sourceCommentId?: string, reactionCommentId?: string, model?: string): Message {
     const now = new Date().toISOString();
     const id = crypto.randomUUID();
     this.msgStmts.insert.run(
@@ -444,6 +444,7 @@ export class Store {
       id, sessionId, content, sourceCommentId, reactionCommentId,
       status: "pending", attempts: 0,
       createdAt: new Date(now), updatedAt: new Date(now),
+      model,
     };
   }
 

package/src/opencode.ts

@@ -165,9 +165,9 @@ export class Engine {
 
     switch (event.type) {
       case "issue_opened":
-        return this.handleOpened(ref, scopeKey, issueData, tracker);
+        return this.handleOpened(ref, scopeKey, issueData, tracker, event.model);
       case "comment_created":
-        return this.handleCommented(ref, scopeKey, issueData, event.comment!, tracker);
+        return this.handleCommented(ref, scopeKey, issueData, event.comment!, tracker, event.model);
       case "issue_closed":
         return this.handleClosed(ref, scopeKey, tracker);
     }
@@ -177,7 +177,8 @@ export class Engine {
     ref: TrackerRef,
     scopeKey: string,
     issueData: TrackerEvent["issue"],
-    tracker: IssueTracker
+    tracker: IssueTracker,
+    model?: string,
   ) {
     // Create or find issue
     const issue = this.store.findOrCreateIssue(ref, scopeKey, issueData.title);
@@ -217,7 +218,7 @@ export class Engine {
       this.handleLargeContent(workdir, issueData.body, "issue-body.txt"),
       issueData.author, workdir, instructions
     );
-    this.enqueueOrRun(session, issue, prompt);
+    this.enqueueOrRun(session, issue, prompt, undefined, model);
   }
 
   private async handleCommented(
@@ -225,7 +226,8 @@ export class Engine {
     scopeKey: string,
     issueData: TrackerEvent["issue"],
     comment: NonNullable<TrackerEvent["comment"]>,
-    tracker: IssueTracker
+    tracker: IssueTracker,
+    model?: string,
   ) {
     if (!comment) return;
 
@@ -281,7 +283,7 @@ 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: \`${session.id}\` | workdir: \`${workdir}\``);
 
-        this.enqueueOrRun(session, issue, prompt, comment.id);
+        this.enqueueOrRun(session, issue, prompt, comment.id, model);
       } else {
         // Create new session
         session = this.store.createSession(issue.id, mentionName);
@@ -299,7 +301,7 @@ export class Engine {
           this.handleLargeContent(workdir, issueData.body, "issue-body.txt"),
           issueData.author, workdir, instructions
         );
-        this.enqueueOrRun(session, issue, prompt, comment.id);
+        this.enqueueOrRun(session, issue, prompt, comment.id, model);
       }
     } else {
       // No @mention → broadcast to all sessions on this issue
@@ -317,7 +319,7 @@ export class Engine {
           session.name, this.handleLargeContent(workdir, comment.body, `comment-${comment.id}.txt`),
           comment.author, issueData.title, workdir, instructions
         );
-        this.enqueueOrRun(session, issue, prompt, comment.id);
+        this.enqueueOrRun(session, issue, prompt, comment.id, model);
       }
 
       // Immediate ack
@@ -382,13 +384,13 @@ export class Engine {
 
   // ─── Preemptive Scheduler ───
 
-  private enqueueOrRun(session: OpSession, issue: Issue, prompt: string, sourceCommentId?: string) {
+  private enqueueOrRun(session: OpSession, issue: Issue, prompt: string, sourceCommentId?: string, model?: string) {
     const k = this.sessionKey(session, issue);
 
     this.stuckNudgeRounds.delete(k);
     this.processExitNudgeRounds.delete(k);
 
-    const msg = this.store.createMessage(session.id, prompt, sourceCommentId);
+    const msg = this.store.createMessage(session.id, prompt, sourceCommentId, undefined, model);
 
     if (this.running.has(k)) {
       // PREEMPTIVE: Kill running process, new message takes priority
@@ -455,6 +457,12 @@ export class Engine {
     if (session.opencodeSessionId) {
       args.push("--session", session.opencodeSessionId);
     }
+    // Push --model BEFORE the message content. Defends against env-var-
+    // registered providers stealing the slot (the original bug). Empty/
+    // undefined = omit, let opencode pick per its own opencode.json.
+    if (msg.model) {
+      args.push("--model", msg.model);
+    }
     args.push(msg.content);
 
     // Set eyes reaction on the source comment
@@ -466,10 +474,21 @@ export class Engine {
 
     let exitCode: number | null = null;
 
+    // M-1: build the child env explicitly. When a model IS resolved we push
+    // --model above, so opencode ignores OPENCODE_MODEL anyway. When NO model
+    // is resolved we must not let a leaked OPENCODE_MODEL from our own env
+    // silently win — strip it so opencode falls back to its opencode.json
+    // (the operator's explicit config) instead of arbitrary env pollution.
+    // Provider keys / Gitea vars are preserved (opencode + its plugin need
+    // them); only the explicit model-override var is neutralized.
+    const childEnv = { ...process.env };
+    if (!msg.model) delete childEnv.OPENCODE_MODEL;
+
     try {
       const proc = spawn({
         cmd: args,
         cwd: workdir,
+        env: childEnv,
         stdout: "pipe",
         stderr: "pipe",
         stdin: "ignore",

package/src/trackers/gitea-tracker.ts

@@ -119,6 +119,11 @@ export class GiteaTracker implements IssueTracker {
     const repoName = repository.name as string;
     if (!repoOwner || !repoName) return null;
 
+    // ework-web extension (non-Gitea field, ignored by strict Gitea consumers).
+    // Empty/missing = no model override; engine omits --model.
+    const modelRaw = repository.ework_model;
+    const model = typeof modelRaw === "string" && modelRaw.trim() ? modelRaw.trim() : undefined;
+
     const ref: TrackerRef = {
       trackerType: "gitea",
       scope: { owner: repoOwner, repo: repoName },
@@ -137,6 +142,7 @@ export class GiteaTracker implements IssueTracker {
           state: (issue.state as string) ?? "open",
           author: issueUser?.login ?? "",
         },
+        model,
       };
     }
 
@@ -156,6 +162,7 @@ export class GiteaTracker implements IssueTracker {
           body: comment.body as string,
           author: commentUser?.login ?? "",
         },
+        model,
       };
     }
 
@@ -169,6 +176,7 @@ export class GiteaTracker implements IssueTracker {
           state: "closed",
           author: issueUser?.login ?? "",
         },
+        model,
       };
     }
 

package/src/trackers/types.ts

@@ -29,6 +29,10 @@ export interface TrackerEvent {
     body: string;
     author: string;
   };
+  // Resolved "provider/model" string from ework-web (project override or
+  // global default). Empty/undefined = no override; engine omits --model
+  // and lets opencode pick per its own opencode.json + env.
+  model?: string;
 }
 
 /** Tracker-agnostic comment */
@@ -94,6 +98,10 @@ export interface Message {
   error?: string;
   createdAt: Date;
   updatedAt: Date;
+  // Resolved "provider/model" string from ework-web. When set, engine pushes
+  // `--model <X>` on opencode spawn to override opencode.json + env vars.
+  // Undefined = no override (let opencode pick).
+  model?: string;
 }
 
 // ─── Adapter Interface ───