ework-daemon 0.4.42 → 0.4.44

package/package.json

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

package/src/db.ts

@@ -543,6 +543,15 @@ async function runMigrations(db: AsyncDatabase): Promise<void> {
     sqlite ? "generation INTEGER NOT NULL DEFAULT 0" : "generation INT NOT NULL DEFAULT 0"
   );
 
+  // messages.model — per-message model override from the webhook payload.
+  // Persisted so queued/nudged/recovered messages keep their model instead of
+  // silently falling back to the daemon default.
+  await ensureColumn(
+    tMessages,
+    "model",
+    sqlite ? "model TEXT" : "model VARCHAR(128)"
+  );
+
   // Index over owner_daemon_id — added after the column exists. SQLite tolerates
   // IF NOT EXISTS; MySQL lacks it, so we tolerate ER_DUP_KEYNAME (1061) on re-runs.
   if (sqlite) {

package/src/op.ts

@@ -42,6 +42,7 @@ interface MessageRow {
   content: string;
   source_comment_id: string | null;
   reaction_comment_id: string | null;
+  model: string | null;
   status: string;
   attempts: number;
   error: string | null;
@@ -96,6 +97,7 @@ function rowToMessage(row: MessageRow): Message {
     content: row.content,
     sourceCommentId: row.source_comment_id ?? undefined,
     reactionCommentId: row.reaction_comment_id ?? undefined,
+    model: row.model ?? undefined,
     status: row.status as Message["status"],
     attempts: row.attempts,
     error: row.error ?? undefined,
@@ -287,8 +289,8 @@ export class Store {
     const now = new Date().toISOString();
     const id = crypto.randomUUID();
     await getDB().run(
-      "INSERT OR IGNORE INTO {{messages}} (uid, session_id, content, source_comment_id, reaction_comment_id, status, attempts, error, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-      [id, sessionId, content, sourceCommentId ?? null, reactionCommentId ?? null, "pending", 0, null, now, now]
+      "INSERT OR IGNORE INTO {{messages}} (uid, session_id, content, source_comment_id, reaction_comment_id, model, status, attempts, error, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+      [id, sessionId, content, sourceCommentId ?? null, reactionCommentId ?? null, model ?? null, "pending", 0, null, now, now]
     );
     return {
       id, sessionId, content, sourceCommentId, reactionCommentId,

package/src/opencode.ts

@@ -207,15 +207,28 @@ export class RecloneStrategy implements TakeoverStrategy {
         const gitArgs = ["git"];
         if (credHelper) gitArgs.push("-c", `credential.helper=${credHelper}`);
         gitArgs.push("clone", url, dir);
-        const r = Bun.spawnSync({ cmd: gitArgs, stdout: "ignore", stderr: "pipe", env: { ...process.env, ...env } });
-        if (r.exitCode !== 0) {
+        let r: { exitCode: number | null; stderr?: Uint8Array | undefined };
+        try {
+          // async spawn: a slow/hung remote (e.g. SSH host-key prompt) must never
+          // block the daemon event loop — spawnSync froze healthz+heartbeats for
+          // the whole clone duration. Capped at 10 minutes.
+          const proc = Bun.spawn({ cmd: gitArgs, stdout: "ignore", stderr: "pipe", env: { ...process.env, ...env } });
+          const killTimer = setTimeout(() => proc.kill("SIGKILL"), 10 * 60_000);
+          const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).arrayBuffer()]);
+          clearTimeout(killTimer);
+          r = { exitCode, stderr: new Uint8Array(stderr) };
+        } catch {
+          r = { exitCode: -1 };
+        }
+        const exitCode = r.exitCode ?? -1;
+        if (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" });
           }
           const stderrBuf = r.stderr as Uint8Array | undefined;
           const stderrText = stderrBuf ? new TextDecoder().decode(stderrBuf).slice(0, 500) : "";
-          log.warn(`acquireWorkdir: git clone failed (exit ${r.exitCode}) for ${url}${stderrText ? `: ${stderrText}` : ""}; fell back to empty workdir`);
+          log.warn(`acquireWorkdir: git clone failed (exit ${exitCode}) for ${url}${stderrText ? `: ${stderrText}` : ""}; fell back to empty workdir`);
         }
       }
     } catch {

package/src/schema-mysql.sql

@@ -49,6 +49,7 @@ CREATE TABLE IF NOT EXISTS {{messages}} (
   content             LONGTEXT    NOT NULL,
   source_comment_id   VARCHAR(64),
   reaction_comment_id VARCHAR(64),
+  model               VARCHAR(128),
   status              VARCHAR(16) NOT NULL DEFAULT 'pending',
   attempts            INT         NOT NULL DEFAULT 0,
   error               TEXT,

package/src/schema-sqlite.sql

@@ -41,6 +41,7 @@ CREATE TABLE IF NOT EXISTS {{messages}} (
   content TEXT NOT NULL,
   source_comment_id TEXT,
   reaction_comment_id TEXT,
+  model TEXT,
   status TEXT NOT NULL DEFAULT 'pending',
   attempts INTEGER NOT NULL DEFAULT 0,
   error TEXT,