ework-daemon 0.4.4 → 0.4.6

package/package.json

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

package/src/db.ts

@@ -323,6 +323,111 @@ async function runMigrations(db: AsyncDatabase): Promise<void> {
     await db.exec(`ALTER TABLE ${table} ADD COLUMN ${ddl}`);
   };
 
+  // ── uid: surrogate AUTO_INCREMENT PK on issues/op_sessions/messages ──
+  // SQLite cannot ADD PRIMARY KEY via ALTER — must rebuild. Runs before
+  // owner_daemon_id etc. so rebuild only copies base columns; ephemeral
+  // coordination data (owner_daemon_id, nudge state) is re-added below.
+  const tMessages = `${prefix}messages`;
+  if (sqlite) {
+    const UID_REBUILDS: { table: string; createSql: string; dataCols: string }[] = [
+      {
+        table: tIssues,
+        createSql: `CREATE TABLE ${tIssues} (
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
+  tracker_type TEXT NOT NULL,
+  tracker_scope_key TEXT NOT NULL,
+  tracker_scope TEXT NOT NULL,
+  tracker_issue_id TEXT NOT NULL,
+  state TEXT NOT NULL DEFAULT 'created',
+  title TEXT NOT NULL DEFAULT '',
+  created_at TEXT NOT NULL,
+  updated_at TEXT NOT NULL,
+  UNIQUE(tracker_type, tracker_scope_key, tracker_issue_id)
+)`,
+        dataCols:
+          "id, tracker_type, tracker_scope_key, tracker_scope, tracker_issue_id, state, title, created_at, updated_at",
+      },
+      {
+        table: tSessions,
+        createSql: `CREATE TABLE ${tSessions} (
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
+  issue_id TEXT NOT NULL REFERENCES ${tIssues}(id) ON DELETE CASCADE,
+  name TEXT NOT NULL,
+  state TEXT NOT NULL DEFAULT 'idle',
+  opencode_session_id TEXT,
+  opencode_pid INTEGER,
+  workdir TEXT,
+  created_at TEXT NOT NULL,
+  started_at INTEGER,
+  progress_comment_id TEXT,
+  reaction_comment_id TEXT,
+  current_prompt TEXT,
+  UNIQUE(issue_id, name)
+)`,
+        dataCols:
+          "id, issue_id, name, state, opencode_session_id, opencode_pid, workdir, created_at, started_at, progress_comment_id, reaction_comment_id, current_prompt",
+      },
+      {
+        table: tMessages,
+        createSql: `CREATE TABLE ${tMessages} (
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
+  session_id TEXT NOT NULL REFERENCES ${tSessions}(id) ON DELETE CASCADE,
+  content TEXT NOT NULL,
+  source_comment_id TEXT,
+  reaction_comment_id TEXT,
+  status TEXT NOT NULL DEFAULT 'pending',
+  attempts INTEGER NOT NULL DEFAULT 0,
+  error TEXT,
+  created_at TEXT NOT NULL,
+  updated_at TEXT NOT NULL
+)`,
+        dataCols:
+          "id, session_id, content, source_comment_id, reaction_comment_id, status, attempts, error, created_at, updated_at",
+      },
+    ];
+
+    for (const { table, createSql, dataCols } of UID_REBUILDS) {
+      if (await hasColumn(table, "uid")) continue;
+      const exists = await db.get<{ cnt: number }>(
+        `SELECT COUNT(*) AS cnt FROM sqlite_master WHERE type='table' AND name='${table}'`
+      );
+      if (Number(exists?.cnt ?? 0) === 0) continue;
+
+      await db.exec("PRAGMA foreign_keys = OFF");
+      try {
+        await db.transaction(async () => {
+          await db.exec(`ALTER TABLE ${table} RENAME TO ${table}__old_uid`);
+          await db.exec(createSql);
+          await db.exec(
+            `CREATE INDEX IF NOT EXISTS idx_${table}__id ON ${table}(id)`
+          );
+          await db.exec(`INSERT INTO ${table} (${dataCols}) SELECT ${dataCols} FROM ${table}__old_uid`);
+          await db.exec(`DROP TABLE ${table}__old_uid`);
+        });
+      } finally {
+        await db.exec("PRAGMA foreign_keys = ON");
+      }
+    }
+  } else {
+    const uidMySqlTables = [tIssues, tSessions, tMessages];
+    for (const tbl of uidMySqlTables) {
+      if (await hasColumn(tbl, "uid")) continue;
+      try {
+        await db.exec(
+          `ALTER TABLE ${tbl} DROP PRIMARY KEY, ` +
+            `ADD COLUMN uid BIGINT AUTO_INCREMENT PRIMARY KEY FIRST, ` +
+            `ADD UNIQUE INDEX uk_${tbl}_id (id)`
+        );
+      } catch (e) {
+        if (e && typeof e === "object" && "errno" in e && (e as { errno: number }).errno === 1146) continue;
+        throw e;
+      }
+    }
+  }
+
   // issues.owner_daemon_id — points at the leasing daemon (nullable = unclaimed).
   await ensureColumn(
     tIssues,

package/src/opencode.ts

@@ -1,5 +1,5 @@
 import { spawn, type Subprocess } from "bun";
-import { mkdirSync, writeFileSync, readdirSync } from "fs";
+import { mkdirSync, writeFileSync, readdirSync, existsSync } from "fs";
 import { join, resolve, isAbsolute } from "path";
 import { homedir } from "os";
 import { log } from "./logger";
@@ -27,6 +27,71 @@ export interface TakeoverStrategy {
   resumeOpenCodeSession(session: OpSession): Promise<string | null>;
 }
 
+export interface GroupConfig {
+  workdirTemplate?: string;
+  initScript?: string;
+  destroyScript?: string;
+  envInitScript?: string;
+}
+
+/** Substitute {owner}/{repo}/{issue}/{session} in a workdir template. */
+export function resolveTemplatedWorkdir(
+  template: string,
+  issue: { trackerScopeKey: string; trackerScope: Record<string, unknown>; trackerIssueId: string | number },
+  session: { name: string },
+  baseWorkdir?: string,
+): string {
+  const parts = issue.trackerScopeKey.split("/");
+  const owner = (issue.trackerScope["owner"] as string) || parts[0] || "default";
+  const repo = (issue.trackerScope["repo"] as string) || parts[parts.length - 1] || "default";
+  // Use replacer functions to avoid `$&`/`$1` interpretation in replacement strings.
+  let dir = template
+    .replace(/\{owner\}/g, () => String(owner))
+    .replace(/\{repo\}/g, () => String(repo))
+    .replace(/\{issue\}/g, () => String(issue.trackerIssueId))
+    .replace(/\{session\}/g, () => session.name);
+  if (dir.startsWith("~")) {
+    dir = join(homedir(), dir.slice(1));
+  } else if (!isAbsolute(dir) && baseWorkdir) {
+    dir = resolve(baseWorkdir, dir);
+  }
+  return dir;
+}
+
+/** Run a lifecycle script via `bash -c` with cwd=workdir. Uses async Bun.spawn
+ *  (not spawnSync) so the event loop is not blocked. A 60s hard timeout kills
+ *  hung scripts. Failures are logged and swallowed — never throws — so a broken
+ *  init/destroy never blocks the opencode task flow. */
+const HOOK_SCRIPT_TIMEOUT_MS = 60_000;
+export async function runHookScript(script: string | undefined, workdir: string, label: string, env: Record<string, string> = {}, timeoutMs?: number): Promise<void> {
+  if (!script || !script.trim()) return;
+  const effectiveTimeout = timeoutMs ?? HOOK_SCRIPT_TIMEOUT_MS;
+  try {
+    mkdirSync(workdir, { recursive: true });
+    const proc = Bun.spawn({
+      cmd: ["bash", "-c", script],
+      cwd: workdir,
+      stdout: "pipe",
+      stderr: "pipe",
+      env: { ...process.env, ...env },
+    });
+    const timer = setTimeout(() => { try { proc.kill("SIGKILL"); } catch { /* already dead */ } }, effectiveTimeout);
+    try {
+      const exitCode = await proc.exited;
+      const stderr = await new Response(proc.stderr).text().catch(() => "");
+      if (exitCode !== 0) {
+        log.warn(`engine: ${label} exited ${exitCode}: ${stderr.slice(0, 500)}`);
+      } else if (stderr) {
+        log.info(`engine: ${label} stderr: ${stderr.slice(0, 300)}`);
+      }
+    } finally {
+      clearTimeout(timer);
+    }
+  } catch (e) {
+    log.warn(`engine: ${label} failed: ${(e as Error).message}`);
+  }
+}
+
 /**
  * Default TakeoverStrategy: deterministic per-issue workdir under
  * `<baseWorkdir>/<owner>--<repo>/<issueId>/<sessionName>`, with a best-effort
@@ -158,6 +223,8 @@ export class Engine {
   private observedIssues = new Set<string>();
   private observerTimer?: ReturnType<typeof setInterval>;
 
+  private groupConfigs = new Map<string, GroupConfig>();
+
   private static MAX_INLINE_SIZE = 4000;
   private static MAX_NUDGE_ROUNDS = 1;
   private static MAX_STUCK_NUDGE_ROUNDS = 1;
@@ -234,9 +301,44 @@ export class Engine {
   }
 
   private async resolveWorkdir(session: OpSession, issue: Issue): Promise<string> {
+    const gc = this.groupConfigFor(issue);
+    if (gc?.workdirTemplate && !session.workdir) {
+      const dir = resolveTemplatedWorkdir(gc.workdirTemplate, issue, session, this.cfg.opencode.baseWorkdir);
+      mkdirSync(dir, { recursive: true });
+      return dir;
+    }
     return this.takeover.acquireWorkdir(session, issue);
   }
 
+  private hookEnvFor(issue: Issue, session: OpSession, workdir: string): Record<string, string> {
+    const parts = issue.trackerScopeKey.split("/");
+    const owner = (issue.trackerScope["owner"] as string) || parts[0] || "";
+    const repo = (issue.trackerScope["repo"] as string) || parts[parts.length - 1] || "";
+    return {
+      EWORK_OWNER: String(owner),
+      EWORK_REPO: String(repo),
+      EWORK_ISSUE: String(issue.trackerIssueId),
+      EWORK_SESSION: session.name,
+      EWORK_WORKDIR: workdir,
+    };
+  }
+
+  private workdirPathFor(session: OpSession, issue: Issue): string {
+    if (session.workdir) {
+      let dir = session.workdir;
+      if (dir.startsWith("~")) dir = join(homedir(), dir.slice(1));
+      return isAbsolute(dir) ? dir : resolve(this.cfg.opencode.baseWorkdir, dir);
+    }
+    const gc = this.groupConfigFor(issue);
+    if (gc?.workdirTemplate) {
+      return resolveTemplatedWorkdir(gc.workdirTemplate, issue, session, this.cfg.opencode.baseWorkdir);
+    }
+    const parts = issue.trackerScopeKey.split("/");
+    const owner = (issue.trackerScope["owner"] as string) || parts[0] || "default";
+    const repo = (issue.trackerScope["repo"] as string) || parts[parts.length - 1] || "default";
+    return join(this.cfg.opencode.baseWorkdir, `${owner}--${repo}`, String(issue.trackerIssueId), session.name);
+  }
+
   private async persistRuntimeState(sessionId: string) {
     const session = await this.store.getSession(sessionId);
     if (!session) return;
@@ -314,11 +416,15 @@ export class Engine {
 
   // ─── Event Dispatch ───
 
-  async handleEvent(event: TrackerEvent) {
+  async handleEvent(event: TrackerEvent, groupConfig?: GroupConfig) {
     const { ref, issue: issueData } = event;
     const tracker = this.getTracker(ref.trackerType);
     const scopeKey = tracker.formatScopeKey(ref.scope);
 
+    if (groupConfig) {
+      this.groupConfigs.set(`${ref.trackerType}:${scopeKey}#${ref.issueId}`, groupConfig);
+    }
+
     switch (event.type) {
       case "issue_opened":
         return this.handleOpened(ref, scopeKey, issueData, tracker, event.model);
@@ -329,6 +435,10 @@ export class Engine {
     }
   }
 
+  private groupConfigFor(issue: Issue): GroupConfig | undefined {
+    return this.groupConfigs.get(`${issue.trackerType}:${issue.trackerScopeKey}#${issue.trackerIssueId}`);
+  }
+
   private async handleOpened(
     ref: TrackerRef,
     scopeKey: string,
@@ -515,6 +625,7 @@ export class Engine {
   ) {
     const issue = await this.store.findIssue(ref.trackerType, scopeKey, ref.issueId);
     if (!issue) return;
+    if (issue.state === "closed") return;
 
     await this.store.updateIssueState(issue.id, "closed");
     this.stopObserver(issue.id);
@@ -528,19 +639,30 @@ export class Engine {
         this.stopping.add(k);
         try { this.killProcessTree(proc.pid, "SIGTERM"); } catch { /* already dead */ }
       }
-      // Clear runtime state
       this.clearRuntimeState(k);
-      // Mark pending/running messages as interrupted
       const msgs = await this.store.getMessagesForSession(session.id);
       for (const msg of msgs) {
         if (msg.status === "pending" || msg.status === "running") {
           await this.store.updateMessageStatus(msg.id, "interrupted", "issue closed");
         }
       }
-      // Update session state
       await this.store.updateSession(session.id, { state: "idle", opencodePid: undefined });
     }
 
+    const gcKey = `${ref.trackerType}:${scopeKey}#${ref.issueId}`;
+    const gc = this.groupConfigFor(issue);
+    if (gc?.destroyScript) {
+      const workdirs = new Set<string>();
+      for (const session of sessions) {
+        const workdir = this.workdirPathFor(session, issue);
+        if (existsSync(workdir)) workdirs.add(workdir);
+      }
+      for (const workdir of workdirs) {
+        await runHookScript(gc.destroyScript, workdir, `destroyScript for ${scopeKey}#${ref.issueId}`, this.hookEnvFor(issue, { name: "" } as OpSession, workdir));
+      }
+    }
+    if (this.groupConfigs.get(gcKey) === gc) this.groupConfigs.delete(gcKey);
+
     log.info(`engine: issue closed, ${sessions.length} sessions paused for ${scopeKey}#${ref.issueId}`);
   }
 
@@ -635,6 +757,11 @@ export class Engine {
 
     const workdir = await this.resolveWorkdir(session, issue);
 
+    const gc = this.groupConfigFor(issue);
+    if (gc?.initScript) {
+      await runHookScript(gc.initScript, workdir, `initScript for ${k}`, this.hookEnvFor(issue, session, workdir));
+    }
+
     const ref = this.sessionToRef(session, issue);
     const tracker = this.getTracker(issue.trackerType);
 

package/src/schema-mysql.sql

@@ -8,7 +8,8 @@
 -- tables InnoDB + utf8mb4 for FK CASCADE + full Unicode (emoji).
 
 CREATE TABLE IF NOT EXISTS {{issues}} (
-  id                  VARCHAR(36) PRIMARY KEY,
+  uid                 BIGINT       AUTO_INCREMENT PRIMARY KEY,
+  id                  VARCHAR(36)  NOT NULL UNIQUE,
   tracker_type        VARCHAR(64)  NOT NULL,
   tracker_scope_key   VARCHAR(255) NOT NULL,
   tracker_scope       TEXT         NOT NULL,
@@ -21,7 +22,8 @@ CREATE TABLE IF NOT EXISTS {{issues}} (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS {{op_sessions}} (
-  id                  VARCHAR(36) PRIMARY KEY,
+  uid                 BIGINT       AUTO_INCREMENT PRIMARY KEY,
+  id                  VARCHAR(36)  NOT NULL UNIQUE,
   issue_id            VARCHAR(36) NOT NULL,
   name                VARCHAR(64)  NOT NULL,
   state               VARCHAR(16)  NOT NULL DEFAULT 'idle',
@@ -41,7 +43,8 @@ CREATE TABLE IF NOT EXISTS {{op_sessions}} (
 -- idx_sessions_issue is needed on MySQL.
 
 CREATE TABLE IF NOT EXISTS {{messages}} (
-  id                  VARCHAR(36) PRIMARY KEY,
+  uid                 BIGINT       AUTO_INCREMENT PRIMARY KEY,
+  id                  VARCHAR(36)  NOT NULL UNIQUE,
   session_id          VARCHAR(36) NOT NULL,
   content             LONGTEXT    NOT NULL,
   source_comment_id   VARCHAR(64),

package/src/schema-sqlite.sql

@@ -4,7 +4,8 @@
 -- share one DB across multiple daemon instances.
 
 CREATE TABLE IF NOT EXISTS {{issues}} (
-  id TEXT PRIMARY KEY,
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
   tracker_type TEXT NOT NULL,
   tracker_scope_key TEXT NOT NULL,
   tracker_scope TEXT NOT NULL,
@@ -17,7 +18,8 @@ CREATE TABLE IF NOT EXISTS {{issues}} (
 );
 
 CREATE TABLE IF NOT EXISTS {{op_sessions}} (
-  id TEXT PRIMARY KEY,
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
   issue_id TEXT NOT NULL REFERENCES {{issues}}(id) ON DELETE CASCADE,
   name TEXT NOT NULL,
   state TEXT NOT NULL DEFAULT 'idle',
@@ -33,7 +35,8 @@ CREATE TABLE IF NOT EXISTS {{op_sessions}} (
 );
 
 CREATE TABLE IF NOT EXISTS {{messages}} (
-  id TEXT PRIMARY KEY,
+  uid INTEGER PRIMARY KEY AUTOINCREMENT,
+  id TEXT NOT NULL UNIQUE,
   session_id TEXT NOT NULL REFERENCES {{op_sessions}}(id) ON DELETE CASCADE,
   content TEXT NOT NULL,
   source_comment_id TEXT,

package/src/server.ts

@@ -1,6 +1,7 @@
 import type { Config } from "./config";
 import type { Store } from "./op";
 import type { Engine } from "./opencode";
+import type { GroupConfig } from "./opencode";
 import type { IssueTracker, TrackerEvent } from "./trackers/types";
 import { OpencodeReader, OpencodeReaderError } from "./opencode-reader";
 import { listDir, readFile, readFileSince, FileApiError } from "./file-api";
@@ -8,6 +9,24 @@ import { log, uptimeSeconds, version } from "./logger";
 
 type TrackerMap = Map<string, IssueTracker>;
 
+export function parseGroupConfigHeader(raw: string | null): GroupConfig | undefined {
+  if (!raw) return undefined;
+  if (raw.length > 16_384) return undefined;
+  try {
+    const decoded = Buffer.from(raw, "base64").toString("utf8");
+    const parsed = JSON.parse(decoded);
+    if (typeof parsed !== "object" || parsed === null) return undefined;
+    const gc = parsed as Record<string, unknown>;
+    if (gc.workdirTemplate !== undefined && typeof gc.workdirTemplate !== "string") return undefined;
+    if (gc.initScript !== undefined && typeof gc.initScript !== "string") return undefined;
+    if (gc.destroyScript !== undefined && typeof gc.destroyScript !== "string") return undefined;
+    if (gc.envInitScript !== undefined && typeof gc.envInitScript !== "string") return undefined;
+    return gc as GroupConfig;
+  } catch {
+  }
+  return undefined;
+}
+
 function json(data: unknown, status = 200) {
   return new Response(JSON.stringify(data, null, 2), {
     status,
@@ -41,7 +60,9 @@ export function createServer(
       `webhook: type=${event.type} ref=${event.ref.trackerType}:${event.ref.scope.owner ?? ""}/${event.ref.scope.repo ?? ""}#${event.ref.issueId}`
     );
 
-    engine.handleEvent(event).catch((err) => {
+    const groupConfig = parseGroupConfigHeader(req.headers.get("x-ework-group-config"));
+
+    engine.handleEvent(event, groupConfig).catch((err) => {
       log.error("webhook: handler error:", err);
     });