astrocode-workflow 0.2.0 → 0.2.1

package/dist/state/db.d.ts

@@ -4,7 +4,7 @@ export declare function openSqlite(dbPath: string, opts?: {
     busyTimeoutMs?: number;
 }): SqliteDb;
 export declare function configurePragmas(db: SqliteDb, pragmas: Record<string, any>): void;
-/** BEGIN IMMEDIATE transaction helper. */
+/** BEGIN IMMEDIATE transaction helper (re-entrant). */
 export declare function withTx<T>(db: SqliteDb, fn: () => T, opts?: {
     require?: boolean;
 }): T;

package/dist/state/db.js

@@ -46,7 +46,30 @@ export function configurePragmas(db, pragmas) {
     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();
+function getDepth(db) {
+    return TX_DEPTH.get(db) ?? 0;
+}
+function setDepth(db, depth) {
+    if (depth <= 0)
+        TX_DEPTH.delete(db);
+    else
+        TX_DEPTH.set(db, depth);
+}
+function savepointName(depth) {
+    return `sp_${depth}`;
+}
+/** BEGIN IMMEDIATE transaction helper (re-entrant). */
 export function withTx(db, fn, opts) {
     const adapter = createDatabaseAdapter();
     const available = adapter.isAvailable();
@@ -55,21 +78,56 @@ export function withTx(db, fn, opts) {
             throw new Error("Database adapter unavailable; transaction required.");
         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);
+    }
 }
 export function getSchemaVersion(db) {
     try {

package/dist/tools/workflow.d.ts

@@ -2,9 +2,9 @@ import { type ToolDefinition } from "@opencode-ai/plugin/tool";
 import type { AstrocodeConfig } from "../config/schema";
 import type { SqliteDb } from "../state/db";
 import type { StageKey } from "../state/types";
+import type { AgentConfig } from "@opencode-ai/sdk";
 export declare const STAGE_TO_AGENT_MAP: Record<string, string>;
 export declare function resolveAgentName(stageKey: StageKey, config: AstrocodeConfig, agents?: any, warnings?: string[]): string;
-import { AgentConfig } from "@opencode-ai/sdk";
 export declare function createAstroWorkflowProceedTool(opts: {
     ctx: any;
     config: AstrocodeConfig;

package/dist/tools/workflow.js

@@ -1,7 +1,8 @@
+// src/tools/workflow.ts
 import { tool } from "@opencode-ai/plugin/tool";
 import { withTx } from "../state/db";
 import { buildContextSnapshot } from "../workflow/context";
-import { decideNextAction, createRunForStory, startStage, completeRun, getActiveRun, EVENT_TYPES } from "../workflow/state-machine";
+import { decideNextAction, createRunForStory, startStage, completeRun, failRun, getActiveRun, EVENT_TYPES, } from "../workflow/state-machine";
 import { buildStageDirective, directiveHash } from "../workflow/directives";
 import { injectChatPrompt } from "../ui/inject";
 import { nowISO } from "../shared/time";
@@ -31,24 +32,20 @@ export function resolveAgentName(stageKey, config, agents, warnings) {
     // Validate that the agent actually exists in the registry
     if (agents && !agents[candidate]) {
         const warning = `Agent "${candidate}" not found in registry for stage "${stageKey}". Falling back to General.`;
-        if (warnings) {
+        if (warnings)
             warnings.push(warning);
-        }
-        else {
+        else
             console.warn(`[Astrocode] ${warning}`);
-        }
         candidate = "General";
     }
     // Final guard: ensure General exists, fallback to built-in "general" if not
     if (agents && !agents[candidate]) {
         const finalWarning = `Critical: General agent not found in registry. Falling back to built-in "general".`;
-        if (warnings) {
+        if (warnings)
             warnings.push(finalWarning);
-        }
-        else {
+        else
             console.warn(`[Astrocode] ${finalWarning}`);
-        }
-        return "general"; // built-in, guaranteed by OpenCode
+        return "general";
     }
     return candidate;
 }
@@ -84,9 +81,6 @@ function stageConstraints(stage, cfg) {
     }
     return common;
 }
-function agentNameForStage(stage, cfg) {
-    return cfg.agents.stage_agent_names[stage];
-}
 function buildDelegationPrompt(opts) {
     const { stageDirective, run_id, stage_key, stage_agent_name } = opts;
     const stageUpper = stage_key.toUpperCase();
@@ -108,10 +102,49 @@ function buildDelegationPrompt(opts) {
         ``,
         `Important: do NOT do any stage work yourself in orchestrator mode.`,
     ].join("\n").trim();
-    // Debug log the delegation prompt to troubleshoot agent output issues
     debug(`Delegating stage ${stage_key} to agent ${stage_agent_name}`, { prompt_length: prompt.length });
     return prompt;
 }
+function buildUiMessage(e) {
+    switch (e.kind) {
+        case "stage_started": {
+            const agent = e.agent_name ? ` (${e.agent_name})` : "";
+            const title = "Astrocode";
+            const message = `Stage started: ${e.stage_key}${agent}`;
+            const chatText = [
+                `[SYSTEM DIRECTIVE: ASTROCODE — STAGE_STARTED]`,
+                ``,
+                `Run: ${e.run_id}`,
+                `Stage: ${e.stage_key}${agent}`,
+            ].join("\n");
+            return { title, message, variant: "info", chatText };
+        }
+        case "run_completed": {
+            const title = "Astrocode";
+            const message = `Run completed: ${e.run_id}`;
+            const chatText = [
+                `[SYSTEM DIRECTIVE: ASTROCODE — RUN_COMPLETED]`,
+                ``,
+                `Run: ${e.run_id}`,
+                `Story: ${e.story_key}`,
+            ].join("\n");
+            return { title, message, variant: "success", chatText };
+        }
+        case "run_failed": {
+            const title = "Astrocode";
+            const message = `Run failed: ${e.run_id} (${e.stage_key})`;
+            const chatText = [
+                `[SYSTEM DIRECTIVE: ASTROCODE — RUN_FAILED]`,
+                ``,
+                `Run: ${e.run_id}`,
+                `Story: ${e.story_key}`,
+                `Stage: ${e.stage_key}`,
+                `Error: ${e.error_text}`,
+            ].join("\n");
+            return { title, message, variant: "error", chatText };
+        }
+    }
+}
 export function createAstroWorkflowProceedTool(opts) {
     const { ctx, config, db, agents } = opts;
     const toasts = createToastManager({ ctx, throttleMs: config.ui.toasts.throttle_ms });
@@ -127,6 +160,9 @@ export function createAstroWorkflowProceedTool(opts) {
             const actions = [];
             const warnings = [];
             const startedAt = nowISO();
+            // Collect UI events emitted inside state-machine functions, then flush AFTER tx.
+            const uiEvents = [];
+            const emit = (e) => uiEvents.push(e);
             for (let i = 0; i < steps; i++) {
                 const next = decideNextAction(db, config);
                 if (next.kind === "idle") {
@@ -134,60 +170,24 @@ export function createAstroWorkflowProceedTool(opts) {
                     break;
                 }
                 if (next.kind === "start_run") {
+                    // SINGLE tx boundary: caller owns tx, state-machine is pure.
                     const { run_id } = withTx(db, () => createRunForStory(db, config, next.story_key));
                     actions.push(`started run ${run_id} for story ${next.story_key}`);
-                    if (config.ui.toasts.enabled && config.ui.toasts.show_run_started) {
-                        await toasts.show({ title: "Astrocode", message: `Run started (${run_id})`, variant: "success" });
-                    }
                     if (mode === "step")
                         break;
                     continue;
                 }
                 if (next.kind === "complete_run") {
-                    withTx(db, () => completeRun(db, next.run_id));
+                    withTx(db, () => completeRun(db, next.run_id, emit));
                     actions.push(`completed run ${next.run_id}`);
-                    if (config.ui.toasts.enabled && config.ui.toasts.show_run_completed) {
-                        await toasts.show({ title: "Astrocode", message: `Run completed (${next.run_id})`, variant: "success" });
-                    }
-                    // Inject continuation directive for workflow resumption
-                    if (sessionId) {
-                        const continueDirective = [
-                            `[SYSTEM DIRECTIVE: ASTROCODE — CONTINUE]`,
-                            ``,
-                            `Run ${next.run_id} completed successfully.`,
-                            ``,
-                            `The Clara Forms implementation run has finished all stages. The spec has been analyzed and decomposed into prioritized implementation stories.`,
-                            ``,
-                            `Next actions: Review the generated stories and approve the next one to continue development.`,
-                        ].join("\n");
-                        await injectChatPrompt({
-                            ctx,
-                            sessionId,
-                            text: continueDirective,
-                            agent: "Astro"
-                        });
-                        actions.push(`injected continuation directive for completed run ${next.run_id}`);
-                    }
-                    // Check for next approved story to start
-                    const nextStory = db.prepare("SELECT story_key, title FROM stories WHERE state = 'approved' ORDER BY priority DESC, created_at ASC LIMIT 1").get();
-                    if (nextStory && sessionId) {
-                        const nextDirective = [
-                            `[SYSTEM DIRECTIVE: ASTROCODE — START_NEXT_STORY]`,
-                            ``,
-                            `The previous run completed successfully. Start the next approved story.`,
-                            ``,
-                            `Next Story: ${nextStory.story_key} — ${nextStory.title}`,
-                            ``,
-                            `Action: Call astro_story_approve with story_key="${nextStory.story_key}" to start it, or select a different story.`,
-                        ].join("\n");
-                        await injectChatPrompt({
-                            ctx,
-                            sessionId,
-                            text: nextDirective,
-                            agent: "Astro"
-                        });
-                        actions.push(`injected directive to start next story ${nextStory.story_key}`);
-                    }
+                    if (mode === "step")
+                        break;
+                    continue;
+                }
+                if (next.kind === "failed") {
+                    // Ensure DB state reflects failure in one tx; emit UI event.
+                    withTx(db, () => failRun(db, next.run_id, next.stage_key, next.error_text, emit));
+                    actions.push(`failed: ${next.stage_key} — ${next.error_text}`);
                     if (mode === "step")
                         break;
                     continue;
@@ -198,53 +198,37 @@ export function createAstroWorkflowProceedTool(opts) {
                         throw new Error("Invariant: delegate_stage but no active run.");
                     const run = db.prepare("SELECT * FROM runs WHERE run_id=?").get(active.run_id);
                     const story = db.prepare("SELECT * FROM stories WHERE story_key=?").get(run.story_key);
-                    // Mark stage started + set subagent_type to the stage agent.
                     let agentName = resolveAgentName(next.stage_key, config, agents, warnings);
-                    // Validate agent availability with fallback chain
-                    const systemConfig = config;
-                    // Check both the system config agent map (if present) OR the local agents map passed to the tool
                     const agentExists = (name) => {
-                        // Check local agents map first (populated from src/index.ts)
-                        if (agents && agents[name]) {
-                            return true;
-                        }
-                        // Check system config agent map
-                        if (systemConfig.agent && systemConfig.agent[name]) {
+                        if (agents && agents[name])
                             return true;
-                        }
-                        // For known stage agents, assume they exist (they are system-provided subagents)
-                        const knownStageAgents = ["Frame", "Plan", "Spec", "Implement", "Review", "Verify", "Close"];
-                        if (knownStageAgents.includes(name)) {
+                        const knownStageAgents = ["Frame", "Plan", "Spec", "Implement", "Review", "Verify", "Close", "General", "Astro", "general"];
+                        if (knownStageAgents.includes(name))
                             return true;
-                        }
                         return false;
                     };
                     if (!agentExists(agentName)) {
                         const originalAgent = agentName;
-                        console.warn(`[Astrocode] Agent ${agentName} not found in config. Falling back to orchestrator.`);
-                        // First fallback: orchestrator
+                        console.warn(`[Astrocode] Agent ${agentName} not found. Falling back to orchestrator.`);
                         agentName = config.agents?.orchestrator_name || "Astro";
                         if (!agentExists(agentName)) {
                             console.warn(`[Astrocode] Orchestrator ${agentName} not available. Falling back to General.`);
-                            // Final fallback: General (guaranteed to exist)
                             agentName = "General";
                             if (!agentExists(agentName)) {
                                 throw new Error(`Critical: No agents available for delegation. Primary: ${originalAgent}, Orchestrator: ${config.agents?.orchestrator_name || "Astro"}, General: unavailable`);
                             }
                         }
                     }
+                    // NOTE: startStage owns its own tx (state-machine.ts).
                     withTx(db, () => {
-                        startStage(db, active.run_id, next.stage_key, { subagent_type: agentName });
-                        // Log delegation observability
-                        if (config.debug?.telemetry?.enabled) {
-                            // eslint-disable-next-line no-console
-                            console.log(`[Astrocode:delegate] run_id=${active.run_id} stage=${next.stage_key} agent=${agentName} fallback=${agentName !== resolveAgentName(next.stage_key, config, agents) ? 'yes' : 'no'}`);
-                        }
+                        startStage(db, active.run_id, next.stage_key, { subagent_type: agentName }, emit);
+                    });
+                    const context = buildContextSnapshot({
+                        db,
+                        config,
+                        run_id: active.run_id,
+                        next_action: `delegate stage ${next.stage_key}`,
                     });
-                    if (config.ui.toasts.enabled && config.ui.toasts.show_stage_started) {
-                        await toasts.show({ title: "Astrocode", message: `Stage started: ${next.stage_key}`, variant: "info" });
-                    }
-                    const context = buildContextSnapshot({ db, config, run_id: active.run_id, next_action: `delegate stage ${next.stage_key}` });
                     const stageDirective = buildStageDirective({
                         config,
                         stage_key: next.stage_key,
@@ -262,22 +246,22 @@ export function createAstroWorkflowProceedTool(opts) {
                         stage_key: next.stage_key,
                         stage_agent_name: agentName,
                     });
-                    // Record in continuations as a stage directive (dedupe by hash)
+                    // Record continuation (best-effort; no tx wrapper needed but safe either way)
                     const h = directiveHash(delegatePrompt);
                     const now = nowISO();
                     if (sessionId) {
+                        // This assumes continuations table exists in vNext schema.
                         db.prepare("INSERT INTO continuations (session_id, run_id, directive_hash, kind, reason, created_at) VALUES (?, ?, ?, 'stage', ?, ?)").run(sessionId, active.run_id, h, `delegate ${next.stage_key}`, now);
                     }
-                    // Visible injection so user can see state
+                    // Visible injection so user can see state (awaited)
                     if (sessionId) {
                         await injectChatPrompt({ ctx, sessionId, text: delegatePrompt, agent: "Astro" });
-                        // Inject continuation guidance
                         const continueMessage = [
                             `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_COMPLETION]`,
                             ``,
-                            `Stage ${next.stage_key} delegated to ${agentName}.`,
+                            `Stage \`${next.stage_key}\` delegated to \`${agentName}\`.`,
                             ``,
-                            `When ${agentName} completes, call:`,
+                            `When \`${agentName}\` completes, call:`,
                             `astro_stage_complete(run_id="${active.run_id}", stage_key="${next.stage_key}", output_text="[paste subagent output here]")`,
                             ``,
                             `This advances the workflow.`,
@@ -290,13 +274,17 @@ export function createAstroWorkflowProceedTool(opts) {
                 }
                 if (next.kind === "await_stage_completion") {
                     actions.push(`await stage completion: ${next.stage_key}`);
-                    // Optionally nudge with a short directive
                     if (sessionId) {
-                        const context = buildContextSnapshot({ db, config, run_id: next.run_id, next_action: `complete stage ${next.stage_key}` });
+                        const context = buildContextSnapshot({
+                            db,
+                            config,
+                            run_id: next.run_id,
+                            next_action: `complete stage ${next.stage_key}`,
+                        });
                         const prompt = [
                             `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_OUTPUT]`,
                             ``,
-                            `Run ${next.run_id} is waiting for stage ${next.stage_key} output.`,
+                            `Run \`${next.run_id}\` is waiting for stage \`${next.stage_key}\` output.`,
                             `If you have the subagent output, call astro_stage_complete with output_text=the FULL output.`,
                             ``,
                             `Context snapshot:`,
@@ -309,14 +297,31 @@ export function createAstroWorkflowProceedTool(opts) {
                     }
                     break;
                 }
-                if (next.kind === "failed") {
-                    actions.push(`failed: ${next.stage_key} — ${next.error_text}`);
-                    break;
-                }
-                // safety
                 actions.push(`unhandled next action: ${next.kind}`);
                 break;
             }
+            // Flush UI events (toast + prompt) AFTER state transitions
+            if (uiEvents.length > 0) {
+                for (const e of uiEvents) {
+                    const msg = buildUiMessage(e);
+                    if (config.ui.toasts.enabled) {
+                        await toasts.show({
+                            title: msg.title,
+                            message: msg.message,
+                            variant: msg.variant,
+                        });
+                    }
+                    if (ctx?.sessionID) {
+                        await injectChatPrompt({
+                            ctx,
+                            sessionId: ctx.sessionID,
+                            text: msg.chatText,
+                            agent: "Astro",
+                        });
+                    }
+                }
+                actions.push(`ui: flushed ${uiEvents.length} event(s)`);
+            }
             // Housekeeping event
             db.prepare("INSERT INTO events (event_id, run_id, stage_key, type, body_json, created_at) VALUES (?, NULL, NULL, ?, ?, ?)").run(newEventId(), EVENT_TYPES.WORKFLOW_PROCEED, JSON.stringify({ started_at: startedAt, mode, max_steps: steps, actions }), nowISO());
             const active = getActiveRun(db);

package/dist/ui/inject.d.ts

@@ -1,20 +1,12 @@
-type QueueItem = {
+/**
+ * Inject a visible prompt into the conversation.
+ * - Deterministic ordering per session
+ * - Correct SDK binding (prevents `this._client` undefined)
+ * - Awaitable: resolves when delivered, rejects after max retries
+ */
+export declare function injectChatPrompt(opts: {
     ctx: any;
-    sessionId: string;
+    sessionId?: string;
     text: string;
     agent?: string;
-};
-/**
- * Enqueue an injection and ensure the worker is running.
- * Does NOT wait for delivery — use `flushChatPrompts()` to wait.
- */
-export declare function enqueueChatPrompt(opts: QueueItem): void;
-/**
- * Wait until all queued injections have been processed (sent or exhausted retries).
- */
-export declare function flushChatPrompts(): Promise<void>;
-/**
- * Deterministic helper: enqueue + flush (recommended for stage boundaries).
- */
-export declare function injectChatPrompt(opts: QueueItem): Promise<void>;
-export {};
+}): Promise<void>;