astrocode-workflow 0.1.59 → 0.2.1

package/dist/workflow/state-machine.js

@@ -1,8 +1,8 @@
-import { withTx } from "../state/db";
 import { nowISO } from "../shared/time";
 import { newEventId, newRunId, newStageRunId } from "../state/ids";
 import { warn } from "../shared/log";
 import { sha256Hex } from "../shared/hash";
+import { SCHEMA_VERSION } from "../state/schema";
 export const EVENT_TYPES = {
     RUN_STARTED: "run.started",
     RUN_COMPLETED: "run.completed",
@@ -12,6 +12,17 @@ export const EVENT_TYPES = {
     STAGE_STARTED: "stage.started",
     WORKFLOW_PROCEED: "workflow.proceed",
 };
+function tableExists(db, tableName) {
+    try {
+        const row = db
+            .prepare("SELECT name FROM sqlite_master WHERE type='table' AND name=?")
+            .get(tableName);
+        return row?.name === tableName;
+    }
+    catch {
+        return false;
+    }
+}
 export function getActiveRun(db) {
     const row = db
         .prepare("SELECT * FROM runs WHERE status = 'running' ORDER BY started_at DESC, created_at DESC LIMIT 1")
@@ -66,8 +77,7 @@ function getGenesisPlanningMode(config) {
     const raw = config?.workflow?.genesis_planning;
     if (raw === "off" || raw === "first_story_only" || raw === "always")
         return raw;
-    if (raw != null)
-        warn(`Invalid workflow.genesis_planning config: ${String(raw)}. Using default "first_story_only".`);
+    warn(`Invalid genesis_planning config: ${String(raw)}. Using default "first_story_only".`);
     return "first_story_only";
 }
 function shouldAttachPlanningDirective(config, story) {
@@ -79,6 +89,8 @@ function shouldAttachPlanningDirective(config, story) {
     return story.story_key === "S-0001";
 }
 function attachRunPlanningDirective(db, runId, story, pipeline) {
+    if (!tableExists(db, "injects"))
+        return;
     const now = nowISO();
     const injectId = `inj_${runId}_genesis_plan`;
     const body = [
@@ -96,16 +108,8 @@ function attachRunPlanningDirective(db, runId, story, pipeline) {
         `- Pipeline: ${pipeline.join(" → ")}`,
         ``,
     ].join("\n");
-    let hash = null;
+    const hash = sha256Hex(body);
     try {
-        hash = sha256Hex(body);
-    }
-    catch {
-        // Hash is optional; directive must never be blocked by hashing.
-        hash = null;
-    }
-    try {
-        // Do not clobber user edits. If it exists, we leave it.
         db.prepare(`
       INSERT OR IGNORE INTO injects (
         inject_id, type, title, body_md, tags_json, scope, source, priority,
@@ -118,108 +122,95 @@ function attachRunPlanningDirective(db, runId, story, pipeline) {
         db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), runId, EVENT_TYPES.RUN_GENESIS_PLANNING_ATTACHED, JSON.stringify({ story_key: story.story_key, inject_id: injectId }), now);
     }
     catch (e) {
-        // Helpful, never required for correctness.
         warn("Failed to attach genesis planning inject", { run_id: runId, story_key: story.story_key, err: e });
     }
 }
-function updateRepoStateLastEvent(db, now, fields) {
-    // Contract: repo_state row exists. If not, fail deterministically (don’t “bootstrap” here).
-    const res = db
-        .prepare(`
-      UPDATE repo_state
-      SET last_run_id = COALESCE(?, last_run_id),
-          last_story_key = COALESCE(?, last_story_key),
-          last_event_at = ?,
-          updated_at = ?
-      WHERE id = 1
-    `)
-        .run(fields.last_run_id ?? null, fields.last_story_key ?? null, now, now);
-    if (!res || res.changes === 0) {
-        throw new Error("repo_state missing (id=1). Database not initialized; run init must be performed before workflow.");
-    }
-}
 export function createRunForStory(db, config, storyKey) {
-    return withTx(db, () => {
-        const story = getStory(db, storyKey);
-        if (!story)
-            throw new Error(`Story not found: ${storyKey}`);
-        if (story.state !== "approved")
-            throw new Error(`Story must be approved to run: ${storyKey} (state=${story.state})`);
-        const run_id = newRunId();
-        const now = nowISO();
-        const pipeline = getPipelineFromConfig(config);
-        db.prepare("UPDATE stories SET state='in_progress', in_progress=1, locked_by_run_id=?, locked_at=?, updated_at=? WHERE story_key=?").run(run_id, now, now, storyKey);
-        db.prepare("INSERT INTO runs (run_id, story_key, status, pipeline_stages_json, current_stage_key, created_at, started_at, updated_at) VALUES (?, ?, 'running', ?, ?, ?, ?, ?)").run(run_id, storyKey, JSON.stringify(pipeline), pipeline[0] ?? null, now, now, now);
-        const insertStage = db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, stage_index, status, created_at, updated_at) VALUES (?, ?, ?, ?, 'pending', ?, ?)");
-        pipeline.forEach((stageKey, idx) => {
-            insertStage.run(newStageRunId(), run_id, stageKey, idx, now, now);
-        });
-        db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), run_id, EVENT_TYPES.RUN_STARTED, JSON.stringify({ story_key: storyKey, pipeline }), now);
-        if (shouldAttachPlanningDirective(config, story)) {
-            attachRunPlanningDirective(db, run_id, story, pipeline);
-        }
-        updateRepoStateLastEvent(db, now, { last_run_id: run_id, last_story_key: storyKey });
-        return { run_id };
+    const story = getStory(db, storyKey);
+    if (!story)
+        throw new Error(`Story not found: ${storyKey}`);
+    if (story.state !== "approved")
+        throw new Error(`Story must be approved to run: ${storyKey} (state=${story.state})`);
+    const run_id = newRunId();
+    const now = nowISO();
+    const pipeline = getPipelineFromConfig(config);
+    db.prepare("UPDATE stories SET state='in_progress', in_progress=1, locked_by_run_id=?, locked_at=?, updated_at=? WHERE story_key=?").run(run_id, now, now, storyKey);
+    db.prepare("INSERT INTO runs (run_id, story_key, status, pipeline_stages_json, current_stage_key, created_at, started_at, updated_at) VALUES (?, ?, 'running', ?, ?, ?, ?, ?)").run(run_id, storyKey, JSON.stringify(pipeline), pipeline[0] ?? null, now, now, now);
+    const insertStage = db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, stage_index, status, created_at, updated_at) VALUES (?, ?, ?, ?, 'pending', ?, ?)");
+    pipeline.forEach((stageKey, idx) => {
+        insertStage.run(newStageRunId(), run_id, stageKey, idx, now, now);
     });
+    db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), run_id, EVENT_TYPES.RUN_STARTED, JSON.stringify({ story_key: storyKey, pipeline }), now);
+    if (shouldAttachPlanningDirective(config, story)) {
+        attachRunPlanningDirective(db, run_id, story, pipeline);
+    }
+    db.prepare(`
+    INSERT INTO repo_state (id, schema_version, created_at, updated_at, last_run_id, last_story_key, last_event_at)
+    VALUES (1, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(id) DO UPDATE SET
+      last_run_id=excluded.last_run_id,
+      last_story_key=excluded.last_story_key,
+      last_event_at=excluded.last_event_at,
+      updated_at=excluded.updated_at
+  `).run(SCHEMA_VERSION, now, now, now, run_id, storyKey, now);
+    return { run_id };
 }
-export function startStage(db, runId, stageKey, meta) {
-    return withTx(db, () => {
-        const now = nowISO();
-        const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
-        if (!run)
-            throw new Error(`Run not found: ${runId}`);
-        if (run.status !== "running")
-            throw new Error(`Run is not running: ${runId} (status=${run.status})`);
-        const stage = db.prepare("SELECT * FROM stage_runs WHERE run_id=? AND stage_key=?").get(runId, stageKey);
-        if (!stage)
-            throw new Error(`Stage run not found: ${runId}/${stageKey}`);
-        if (stage.status !== "pending")
-            throw new Error(`Stage is not pending: ${stageKey} (status=${stage.status})`);
-        db.prepare("UPDATE stage_runs SET status='running', started_at=?, updated_at=?, subagent_type=COALESCE(?, subagent_type), subagent_session_id=COALESCE(?, subagent_session_id) WHERE stage_run_id=?").run(now, now, meta?.subagent_type ?? null, meta?.subagent_session_id ?? null, stage.stage_run_id);
-        db.prepare("UPDATE runs SET current_stage_key=?, updated_at=? WHERE run_id=?").run(stageKey, now, runId);
-        db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, ?, ?, ?, ?)").run(newEventId(), runId, stageKey, EVENT_TYPES.STAGE_STARTED, JSON.stringify({ subagent_type: meta?.subagent_type ?? null }), now);
-        updateRepoStateLastEvent(db, now, {});
-    });
+export function startStage(db, runId, stageKey, meta, emit) {
+    const now = nowISO();
+    const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
+    if (!run)
+        throw new Error(`Run not found: ${runId}`);
+    if (run.status !== "running")
+        throw new Error(`Run is not running: ${runId} (status=${run.status})`);
+    const stage = db.prepare("SELECT * FROM stage_runs WHERE run_id=? AND stage_key=?").get(runId, stageKey);
+    if (!stage)
+        throw new Error(`Stage run not found: ${runId}/${stageKey}`);
+    if (stage.status !== "pending")
+        throw new Error(`Stage is not pending: ${stageKey} (status=${stage.status})`);
+    db.prepare("UPDATE stage_runs SET status='running', started_at=?, updated_at=?, subagent_type=COALESCE(?, subagent_type), subagent_session_id=COALESCE(?, subagent_session_id) WHERE stage_run_id=?").run(now, now, meta?.subagent_type ?? null, meta?.subagent_session_id ?? null, stage.stage_run_id);
+    db.prepare("UPDATE runs SET current_stage_key=?, updated_at=? WHERE run_id=?").run(stageKey, now, runId);
+    db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, ?, ?, ?, ?)").run(newEventId(), runId, stageKey, EVENT_TYPES.STAGE_STARTED, JSON.stringify({ subagent_type: meta?.subagent_type ?? null }), now);
+    db.prepare("UPDATE repo_state SET last_event_at=?, updated_at=? WHERE id=1").run(now, now);
+    // ✅ Explicit wiring point (requested): stage movement
+    emit?.({ kind: "stage_started", run_id: runId, stage_key: stageKey, agent_name: meta?.subagent_type });
 }
-export function completeRun(db, runId) {
-    return withTx(db, () => {
-        const now = nowISO();
-        const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
-        if (!run)
-            throw new Error(`Run not found: ${runId}`);
-        if (run.status !== "running")
-            throw new Error(`Run not running: ${runId} (status=${run.status})`);
-        const stageRuns = getStageRuns(db, runId);
-        const incomplete = stageRuns.find((s) => s.status !== "completed" && s.status !== "skipped");
-        if (incomplete)
-            throw new Error(`Cannot complete run: stage ${incomplete.stage_key} is ${incomplete.status}`);
-        db.prepare("UPDATE runs SET status='completed', completed_at=?, updated_at=?, current_stage_key=NULL WHERE run_id=?").run(now, now, runId);
-        db.prepare("UPDATE stories SET state='done', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
-        db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), runId, EVENT_TYPES.RUN_COMPLETED, JSON.stringify({ story_key: run.story_key }), now);
-        updateRepoStateLastEvent(db, now, {});
-    });
+export function completeRun(db, runId, emit) {
+    const now = nowISO();
+    const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
+    if (!run)
+        throw new Error(`Run not found: ${runId}`);
+    if (run.status !== "running")
+        throw new Error(`Run not running: ${runId} (status=${run.status})`);
+    const stageRuns = getStageRuns(db, runId);
+    const incomplete = stageRuns.find((s) => s.status !== "completed" && s.status !== "skipped");
+    if (incomplete)
+        throw new Error(`Cannot complete run: stage ${incomplete.stage_key} is ${incomplete.status}`);
+    db.prepare("UPDATE runs SET status='completed', completed_at=?, updated_at=?, current_stage_key=NULL WHERE run_id=?").run(now, now, runId);
+    db.prepare("UPDATE stories SET state='done', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
+    db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), runId, EVENT_TYPES.RUN_COMPLETED, JSON.stringify({ story_key: run.story_key }), now);
+    db.prepare("UPDATE repo_state SET last_event_at=?, updated_at=? WHERE id=1").run(now, now);
+    // ✅ Explicit wiring point (requested): run closed success
+    emit?.({ kind: "run_completed", run_id: runId, story_key: run.story_key });
 }
-export function failRun(db, runId, stageKey, errorText) {
-    return withTx(db, () => {
-        const now = nowISO();
-        const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
-        if (!run)
-            throw new Error(`Run not found: ${runId}`);
-        db.prepare("UPDATE runs SET status='failed', error_text=?, updated_at=?, completed_at=? WHERE run_id=?").run(errorText, now, now, runId);
-        db.prepare("UPDATE stories SET state='blocked', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
-        db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, ?, ?, ?, ?)").run(newEventId(), runId, stageKey, EVENT_TYPES.RUN_FAILED, JSON.stringify({ error_text: errorText }), now);
-        updateRepoStateLastEvent(db, now, {});
-    });
+export function failRun(db, runId, stageKey, errorText, emit) {
+    const now = nowISO();
+    const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
+    if (!run)
+        throw new Error(`Run not found: ${runId}`);
+    db.prepare("UPDATE runs SET status='failed', error_text=?, updated_at=?, completed_at=? WHERE run_id=?").run(errorText, now, now, runId);
+    db.prepare("UPDATE stories SET state='blocked', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
+    db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, ?, ?, ?, ?)").run(newEventId(), runId, stageKey, EVENT_TYPES.RUN_FAILED, JSON.stringify({ error_text: errorText }), now);
+    db.prepare("UPDATE repo_state SET last_event_at=?, updated_at=? WHERE id=1").run(now, now);
+    // ✅ Explicit wiring point (requested): run closed failure
+    emit?.({ kind: "run_failed", run_id: runId, story_key: run.story_key, stage_key: stageKey, error_text: errorText });
 }
 export function abortRun(db, runId, reason) {
-    return withTx(db, () => {
-        const now = nowISO();
-        const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
-        if (!run)
-            throw new Error(`Run not found: ${runId}`);
-        db.prepare("UPDATE runs SET status='aborted', error_text=?, updated_at=?, completed_at=? WHERE run_id=?").run(reason, now, now, runId);
-        db.prepare("UPDATE stories SET state='approved', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
-        db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), runId, EVENT_TYPES.RUN_ABORTED, JSON.stringify({ reason }), now);
-        updateRepoStateLastEvent(db, now, {});
-    });
+    const now = nowISO();
+    const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(runId);
+    if (!run)
+        throw new Error(`Run not found: ${runId}`);
+    db.prepare("UPDATE runs SET status='aborted', error_text=?, updated_at=?, completed_at=? WHERE run_id=?").run(reason, now, now, runId);
+    db.prepare("UPDATE stories SET state='approved', in_progress=0, locked_by_run_id=NULL, locked_at=NULL, updated_at=? WHERE story_key=?").run(now, run.story_key);
+    db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, ?, NULL, ?, ?, ?)").run(newEventId(), runId, EVENT_TYPES.RUN_ABORTED, JSON.stringify({ reason }), now);
+    db.prepare("UPDATE repo_state SET last_event_at=?, updated_at=? WHERE id=1").run(now, now);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astrocode-workflow",
-  "version": "0.1.59",
+  "version": "0.2.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/state/db.ts

@@ -48,7 +48,32 @@ export function configurePragmas(db: SqliteDb, pragmas: Record<string, any>) {
   if (pragmas.temp_store) db.pragma(`temp_store = ${pragmas.temp_store}`);
 }
 
-/** BEGIN IMMEDIATE transaction helper. */
+/**
+ * Re-entrant transaction helper.
+ *
+ * SQLite rejects BEGIN inside BEGIN. We use:
+ * - depth=0: BEGIN IMMEDIATE ... COMMIT/ROLLBACK
+ * - depth>0: SAVEPOINT sp_n ... RELEASE / ROLLBACK TO + RELEASE
+ *
+ * This allows callers to safely nest withTx across layers (tools -> workflow -> state machine)
+ * without "cannot start a transaction within a transaction".
+ */
+const TX_DEPTH = new WeakMap<object, number>();
+
+function getDepth(db: SqliteDb): number {
+  return TX_DEPTH.get(db as any) ?? 0;
+}
+
+function setDepth(db: SqliteDb, depth: number) {
+  if (depth <= 0) TX_DEPTH.delete(db as any);
+  else TX_DEPTH.set(db as any, depth);
+}
+
+function savepointName(depth: number): string {
+  return `sp_${depth}`;
+}
+
+/** BEGIN IMMEDIATE transaction helper (re-entrant). */
 export function withTx<T>(db: SqliteDb, fn: () => T, opts?: { require?: boolean }): T {
   const adapter = createDatabaseAdapter();
   const available = adapter.isAvailable();
@@ -58,18 +83,52 @@ export function withTx<T>(db: SqliteDb, fn: () => T, opts?: { require?: boolean
     return fn();
   }
 
-  db.exec("BEGIN IMMEDIATE");
+  const depth = getDepth(db);
+
+  if (depth === 0) {
+    db.exec("BEGIN IMMEDIATE");
+    setDepth(db, 1);
+    try {
+      const out = fn();
+      db.exec("COMMIT");
+      return out;
+    } catch (e) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {
+        // ignore
+      }
+      throw e;
+    } finally {
+      setDepth(db, 0);
+    }
+  }
+
+  // Nested: use SAVEPOINT
+  const nextDepth = depth + 1;
+  const sp = savepointName(nextDepth);
+
+  db.exec(`SAVEPOINT ${sp}`);
+  setDepth(db, nextDepth);
+
   try {
     const out = fn();
-    db.exec("COMMIT");
+    db.exec(`RELEASE SAVEPOINT ${sp}`);
     return out;
   } catch (e) {
     try {
-      db.exec("ROLLBACK");
+      db.exec(`ROLLBACK TO SAVEPOINT ${sp}`);
+    } catch {
+      // ignore
+    }
+    try {
+      db.exec(`RELEASE SAVEPOINT ${sp}`);
     } catch {
       // ignore
     }
     throw e;
+  } finally {
+    setDepth(db, depth);
   }
 }