ework-daemon 0.1.3 → 0.2.1

package/src/schema-mysql.sql

@@ -0,0 +1,74 @@
+-- ework-daemon schema (MySQL 8.0+ / MariaDB 10.5+). Applied idempotently on boot:
+-- CREATE TABLE IF NOT EXISTS + CREATE INDEX (no IF NOT EXISTS — MySQL lacks it;
+-- re-runs tolerate ER_DUP_KEYNAME 1061). FK constraint names are {{tokenized}}
+-- so prefixed instances don't collide on constraint-name uniqueness. Date
+-- columns are VARCHAR(40) holding ISO-8601 strings — the app formats dates in
+-- JS, never SQL date arithmetic, so strings avoid Date-vs-string friction
+-- across drivers. FK columns carry their own indexes (MySQL requirement). All
+-- tables InnoDB + utf8mb4 for FK CASCADE + full Unicode (emoji).
+
+CREATE TABLE IF NOT EXISTS {{issues}} (
+  id                  VARCHAR(36) PRIMARY KEY,
+  tracker_type        VARCHAR(64)  NOT NULL,
+  tracker_scope_key   VARCHAR(255) NOT NULL,
+  tracker_scope       TEXT         NOT NULL,
+  tracker_issue_id    VARCHAR(64)  NOT NULL,
+  state               VARCHAR(16)  NOT NULL DEFAULT 'created',
+  title               VARCHAR(512) NOT NULL DEFAULT '',
+  created_at          VARCHAR(40)  NOT NULL,
+  updated_at          VARCHAR(40)  NOT NULL,
+  UNIQUE (tracker_type, tracker_scope_key, tracker_issue_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS {{op_sessions}} (
+  id                  VARCHAR(36) PRIMARY KEY,
+  issue_id            VARCHAR(36) NOT NULL,
+  name                VARCHAR(64)  NOT NULL,
+  state               VARCHAR(16)  NOT NULL DEFAULT 'idle',
+  opencode_session_id VARCHAR(64),
+  opencode_pid        BIGINT,
+  workdir             VARCHAR(1024),
+  created_at          VARCHAR(40)  NOT NULL,
+  started_at          BIGINT,
+  progress_comment_id VARCHAR(64),
+  reaction_comment_id VARCHAR(64),
+  current_prompt      TEXT,
+  UNIQUE (issue_id, name),
+  CONSTRAINT {{fk_sessions_issue}} FOREIGN KEY (issue_id) REFERENCES {{issues}}(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+-- UNIQUE(issue_id, name) above creates a composite index whose leftmost
+-- prefix (issue_id) satisfies the FK's index requirement, so no separate
+-- idx_sessions_issue is needed on MySQL.
+
+CREATE TABLE IF NOT EXISTS {{messages}} (
+  id                  VARCHAR(36) PRIMARY KEY,
+  session_id          VARCHAR(36) NOT NULL,
+  content             LONGTEXT    NOT NULL,
+  source_comment_id   VARCHAR(64),
+  reaction_comment_id VARCHAR(64),
+  status              VARCHAR(16) NOT NULL DEFAULT 'pending',
+  attempts            INT         NOT NULL DEFAULT 0,
+  error               TEXT,
+  created_at          VARCHAR(40) NOT NULL,
+  updated_at          VARCHAR(40) NOT NULL,
+  CONSTRAINT {{fk_messages_session}} FOREIGN KEY (session_id) REFERENCES {{op_sessions}}(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE INDEX idx_messages_session ON {{messages}} (session_id);
+CREATE INDEX idx_messages_status ON {{messages}} (status);
+
+-- Multi-machine coordination (Phase 1). daemons register, heartbeat, and
+-- lease issues via issues.owner_daemon_id. id is a DB-allocated logical slot
+-- (not IP-bound) so a restarted daemon re-adopts an orphan id. Dates are
+-- VARCHAR(40) ISO-8601 to match the rest of the schema. The issues.owner_daemon_id
+-- column + op_sessions runtime-state columns + their indexes are added by
+-- idempotent ALTER in db.ts initDB() so existing DBs upgrade in-place.
+CREATE TABLE IF NOT EXISTS {{daemons}} (
+  id                  BIGINT       PRIMARY KEY AUTO_INCREMENT,
+  display_name        VARCHAR(255) NOT NULL DEFAULT '',
+  internal_endpoint   VARCHAR(255) NOT NULL DEFAULT '',
+  capacity            INT          NOT NULL DEFAULT 4,
+  last_heartbeat      VARCHAR(40)  NOT NULL,
+  registered_at       VARCHAR(40)  NOT NULL,
+  status              VARCHAR(16)  NOT NULL DEFAULT 'active'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE INDEX idx_daemons_heartbeat ON {{daemons}} (last_heartbeat);

package/src/schema-sqlite.sql

@@ -0,0 +1,68 @@
+-- ework-daemon schema (SQLite). Applied idempotently on boot via
+-- CREATE TABLE/INDEX IF NOT EXISTS. See db.ts for PRAGMA setup
+-- (WAL + foreign_keys = ON). {{tokenized}} names so WORK_DB_PREFIX can
+-- share one DB across multiple daemon instances.
+
+CREATE TABLE IF NOT EXISTS {{issues}} (
+  id TEXT PRIMARY KEY,
+  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)
+);
+
+CREATE TABLE IF NOT EXISTS {{op_sessions}} (
+  id TEXT PRIMARY KEY,
+  issue_id TEXT NOT NULL REFERENCES {{issues}}(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)
+);
+
+CREATE TABLE IF NOT EXISTS {{messages}} (
+  id TEXT PRIMARY KEY,
+  session_id TEXT NOT NULL REFERENCES {{op_sessions}}(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
+);
+
+CREATE INDEX IF NOT EXISTS idx_sessions_issue ON {{op_sessions}}(issue_id);
+CREATE INDEX IF NOT EXISTS idx_messages_session ON {{messages}}(session_id);
+CREATE INDEX IF NOT EXISTS idx_messages_status ON {{messages}}(status);
+
+-- Multi-machine coordination (Phase 1). daemons register, heartbeat, and
+-- lease issues via issues.owner_daemon_id. id is a DB-allocated logical slot
+-- (not IP-bound) so a restarted daemon re-adopts an orphan id. Dates are
+-- TEXT ISO-8601 to match the rest of the schema. The issues.owner_daemon_id
+-- column + op_sessions runtime-state columns + their indexes are added by
+-- idempotent ALTER in db.ts initDB() so existing DBs upgrade in-place.
+CREATE TABLE IF NOT EXISTS {{daemons}} (
+  id INTEGER PRIMARY KEY,
+  display_name TEXT NOT NULL DEFAULT '',
+  internal_endpoint TEXT NOT NULL DEFAULT '',
+  capacity INTEGER NOT NULL DEFAULT 4,
+  last_heartbeat TEXT NOT NULL,
+  registered_at TEXT NOT NULL,
+  status TEXT NOT NULL DEFAULT 'active'
+);
+
+CREATE INDEX IF NOT EXISTS idx_daemons_heartbeat ON {{daemons}}(last_heartbeat);

package/src/server.ts

@@ -47,7 +47,7 @@ export function createServer(
 
   async function handleApi(req: Request, pathname: string): Promise<Response> {
     if (pathname === "/api/status") {
-      const status = engine.getStatus();
+      const status = await engine.getStatus();
       return json({
         env: cfg.env,
         daemon: { host: cfg.daemon.host, port: cfg.daemon.port },
@@ -56,36 +56,36 @@ export function createServer(
         pending: status.pendingCount,
         processes: status.processCount,
         observedIssues: status.observedIssues,
-        issues: store.listAllIssues().length,
-        sessions: store.listAllSessions().length,
+        issues: (await store.listAllIssues()).length,
+        sessions: (await store.listAllSessions()).length,
       });
     }
 
     if (pathname === "/api/issues") {
-      return json(store.listAllIssues());
+      return json(await store.listAllIssues());
     }
 
     if (pathname === "/api/sessions") {
-      return json(store.listAllSessions());
+      return json(await store.listAllSessions());
     }
 
     const issueIdMatch = pathname.match(/^\/api\/issues\/([0-9a-f-]+)$/);
     if (issueIdMatch) {
-      const issue = store.getIssue(issueIdMatch[1]!);
+      const issue = await store.getIssue(issueIdMatch[1]!);
       if (!issue) return json({ error: "not found" }, 404);
-      const sessions = store.getSessionsForIssue(issue.id);
+      const sessions = await store.getSessionsForIssue(issue.id);
       return json({ ...issue, sessions });
     }
 
     const sessionIdMatch = pathname.match(/^\/api\/sessions\/([0-9a-f-]+)$/);
     if (sessionIdMatch) {
-      const session = store.getSession(sessionIdMatch[1]!);
+      const session = await store.getSession(sessionIdMatch[1]!);
       if (!session) return json({ error: "not found" }, 404);
       return json(session);
     }
 
     if (pathname === "/api/queue") {
-      return json(engine.getQueue());
+      return json(await engine.getQueue());
     }
 
     if (pathname === "/api/processes") {
@@ -94,16 +94,16 @@ export function createServer(
 
     const sessionMsgsMatch = pathname.match(/^\/api\/sessions\/([0-9a-f-]+)\/messages$/);
     if (sessionMsgsMatch) {
-      const session = store.getSession(sessionMsgsMatch[1]!);
+      const session = await store.getSession(sessionMsgsMatch[1]!);
       if (!session) return json({ error: "not found" }, 404);
-      return json(store.getMessagesForSession(session.id));
+      return json(await store.getMessagesForSession(session.id));
     }
 
     const msgRetryMatch = pathname.match(/^\/api\/messages\/([0-9a-f-]+)\/retry$/);
     if (msgRetryMatch && req.method === "PATCH") {
-      const result = engine.retryMessage(msgRetryMatch[1]!);
+      const result = await engine.retryMessage(msgRetryMatch[1]!);
       if (!result) {
-        const msg = store.getMessage(msgRetryMatch[1]!);
+        const msg = await store.getMessage(msgRetryMatch[1]!);
         if (!msg) return json({ error: "not found" }, 404);
         if (msg.status !== "failed") return json({ error: "only failed messages can be retried" }, 400);
       }
@@ -114,7 +114,7 @@ export function createServer(
     if (forceStopMatch && req.method === "DELETE") {
       const key = decodeURIComponent(forceStopMatch[1]!);
       log.warn(`api: DELETE /api/processes/${key} (force-stop request)`);
-      const wasKilled = engine.forceStop(key);
+      const wasKilled = await engine.forceStop(key);
       return json({ ok: true, stopped: wasKilled });
     }
 

package/src/trackers/types.ts

@@ -65,6 +65,8 @@ export interface Issue {
   title: string;
   createdAt: Date;
   updatedAt: Date;
+  /** Daemon id currently leasing this issue (null/undefined = unclaimed). */
+  ownerDaemonId?: number | null;
 }
 
 export type SessionState = "idle" | "running";
@@ -84,6 +86,12 @@ export interface OpSession {
   progressCommentId?: string;
   reactionCommentId?: string;
   currentPrompt?: string;
+  // Multi-machine runtime state (Phase 1): persisted so a restarted daemon
+  // picks up nudge/generation counters rather than resetting to zero.
+  lastOutputAt?: number;
+  nudgeRounds?: number;
+  stuckNudgeRounds?: number;
+  generation?: number;
 }
 
 /** Message = a prompt enqueued for a session */