ework-daemon 0.4.7 → 0.4.9

package/package.json

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

package/src/config.ts

@@ -32,6 +32,7 @@ export const configSchema = z.object({
     dbPath: z.string().default(
       `${process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share")}/opencode/opencode.db`
     ),
+    defaultModel: z.string().default(""),
   }),
   work: z.object({
     capacity: z.coerce.number().int().positive().default(4),
@@ -77,7 +78,7 @@ const TEST_DEFAULTS = {
   gitea: { url: "http://localhost:9999", token: "test-token", webhookSecret: "" },
   bot: { username: "ework-daemon-test", token: "test-bot-token" },
   daemon: { port: 3111, host: "0.0.0.0", endpoint: "" },
-  opencode: { binary: "opencode", baseWorkdir: join(tmpdir(), "ework-daemon-test") },
+  opencode: { binary: "opencode", baseWorkdir: join(tmpdir(), "ework-daemon-test"), defaultModel: "" },
   work: { capacity: 4, heartbeatMs: 10_000, leaseTtlMs: 60_000 },
   db: { path: join(process.cwd(), "test", "ework-daemon-test.db") },
 };
@@ -131,6 +132,7 @@ export function loadConfig(): Config {
         binary: process.env.OPENCODE_BINARY ?? TEST_DEFAULTS.opencode.binary,
         baseWorkdir: process.env.OPENCODE_BASE_WORKDIR ?? TEST_DEFAULTS.opencode.baseWorkdir,
         dbPath: process.env.OPENCODE_DB_PATH ?? `${process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share")}/opencode/opencode.db`,
+        defaultModel: process.env.WORK_DEFAULT_MODEL ?? TEST_DEFAULTS.opencode.defaultModel,
       },
       work: readWorkSection(),
       db: readDbSection(TEST_DEFAULTS.db.path),
@@ -166,6 +168,7 @@ export function loadConfig(): Config {
       binary: process.env.OPENCODE_BINARY ?? "opencode",
       baseWorkdir: process.env.OPENCODE_BASE_WORKDIR,
       dbPath: process.env.OPENCODE_DB_PATH ?? `${process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share")}/opencode/opencode.db`,
+      defaultModel: process.env.WORK_DEFAULT_MODEL ?? "",
     },
     work: readWorkSection(),
     db: readDbSection(PRODUCTION_DB_DEFAULT),

package/src/db.ts

@@ -210,7 +210,7 @@ class MysqlDriver implements AsyncDatabase {
         try {
           await pool.query(stmt);
         } catch (e) {
-          if (e && typeof e === "object" && "errno" in e && (e as { errno: number }).errno === 1061) continue;
+          if (e && typeof e === "object" && "errno" in e && ((e as { errno: number }).errno === 1061 || (e as { errno: number }).errno === 30000)) continue;
           throw e;
         }
       }
@@ -320,7 +320,13 @@ async function runMigrations(db: AsyncDatabase): Promise<void> {
 
   const ensureColumn = async (table: string, col: string, ddl: string): Promise<void> => {
     if (await hasColumn(table, col)) return;
-    await db.exec(`ALTER TABLE ${table} ADD COLUMN ${ddl}`);
+    try {
+      await db.exec(`ALTER TABLE ${table} ADD COLUMN ${ddl}`);
+    } catch (e) {
+      const errno = (e as { errno?: number }).errno;
+      if (errno === 1060 || errno === 30000) return;
+      throw e;
+    }
   };
 
   // ── id/uid swap: id becomes AUTO_INCREMENT PK, uid holds the UUID ──
@@ -512,7 +518,7 @@ async function runMigrations(db: AsyncDatabase): Promise<void> {
     try {
       await db.exec(`CREATE INDEX idx_issues_owner ON ${tIssues}(owner_daemon_id)`);
     } catch (e) {
-      if (e && typeof e === "object" && "errno" in e && (e as { errno: number }).errno === 1061) {
+      if (e && typeof e === "object" && "errno" in e && ((e as { errno: number }).errno === 1061 || (e as { errno: number }).errno === 30000)) {
         // index already exists — expected on re-runs
       } else {
         throw e;

package/src/opencode.ts

@@ -124,11 +124,27 @@ export class RecloneStrategy implements TakeoverStrategy {
       if (entries.length === 0) {
         const base = this.cfg.gitea.url.replace(/\/$/, "");
         const url = `${base}/${owner}/${repo}.git`;
-        Bun.spawnSync({ cmd: ["git", "clone", url, dir], stdout: "ignore", stderr: "ignore" });
+        const r = Bun.spawnSync({ cmd: ["git", "clone", url, dir], stdout: "ignore", stderr: "ignore" });
+        // git clone deletes the target dir on failure (e.g. gitea shim
+        // without smart-http /info/refs 404). Re-create the workdir so
+        // Bun.spawn later doesn't throw a misleading ENOENT pointing at the
+        // opencode binary path instead of the missing cwd. Fall back to
+        // `git init` so the workdir is at least a valid git repo the agent
+        // can work in.
+        if (r.exitCode !== 0) {
+          if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+          if (existsSync(dir) && readdirSync(dir).length === 0) {
+            Bun.spawnSync({ cmd: ["git", "init", dir], stdout: "ignore", stderr: "ignore" });
+          }
+          log.warn(`acquireWorkdir: git clone failed (exit ${r.exitCode}) for ${url}; fell back to empty workdir`);
+        }
       }
     } catch {
       // directory access failed — leave it; the agent's own tools can clone
     }
+    // Final safety net: git clone may have deleted the dir. Without this
+    // Bun.spawn will throw ENOENT with the binary path, not the cwd path.
+    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
     return dir;
   }
 
@@ -777,11 +793,12 @@ export class Engine {
     if (resumeSessionId) {
       args.push("--session", resumeSessionId);
     }
-    // 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);
+    // Resolve the model: explicit per-message > daemon default > omit.
+    // Without this, opencode's own default (influenced by plugin agent
+    // presets) can pick a non-existent model, causing ProviderModelNotFoundError.
+    const model = msg.model || this.cfg.opencode.defaultModel;
+    if (model) {
+      args.push("--model", model);
     }
     args.push(msg.content);
 
@@ -802,7 +819,7 @@ export class Engine {
     // 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;
+    if (!model) delete childEnv.OPENCODE_MODEL;
 
     try {
       const proc = spawn({