astrocode-workflow 0.2.1 → 0.2.2

package/dist/index.js

@@ -9,6 +9,7 @@ import { createInjectProvider } from "./hooks/inject-provider";
 import { createToastManager } from "./ui/toasts";
 import { createAstroAgents } from "./agents/registry";
 import { info, warn } from "./shared/log";
+import { acquireRepoLock } from "./state/repo-lock";
 // Safe config cloning with structuredClone preference (fallback for older Node versions)
 // CONTRACT: Config is guaranteed JSON-serializable (enforced by loadAstrocodeConfig validation)
 const cloneConfig = (v) => {
@@ -37,6 +38,9 @@ const Astrocode = async (ctx) => {
         throw new Error("Astrocode requires ctx.directory to be a string repo root.");
     }
     const repoRoot = ctx.directory;
+    // Acquire exclusive repo lock to prevent multiple processes from corrupting the database
+    const lockPath = `${repoRoot}/.astro/astro.lock`;
+    const repoLock = acquireRepoLock(lockPath);
     // Always load config first - this provides defaults even in limited mode
     let pluginConfig;
     try {
@@ -280,6 +284,8 @@ const Astrocode = async (ctx) => {
         },
         // Best-effort cleanup
         close: async () => {
+            // Release repo lock first (important for process termination)
+            repoLock.release();
             if (db && typeof db.close === "function") {
                 try {
                     db.close();

package/dist/state/repo-lock.d.ts

@@ -0,0 +1,3 @@
+export declare function acquireRepoLock(lockPath: string): {
+    release: () => void;
+};

package/dist/state/repo-lock.js

@@ -0,0 +1,29 @@
+// src/state/repo-lock.ts
+import fs from "node:fs";
+import path from "node:path";
+export function acquireRepoLock(lockPath) {
+    fs.mkdirSync(path.dirname(lockPath), { recursive: true });
+    let fd;
+    try {
+        fd = fs.openSync(lockPath, "wx"); // exclusive create
+    }
+    catch (e) {
+        const msg = e?.code === "EEXIST"
+            ? `Astrocode lock is already held (${lockPath}). Another opencode process is running in this repo.`
+            : `Failed to acquire lock (${lockPath}): ${e?.message ?? String(e)}`;
+        throw new Error(msg);
+    }
+    fs.writeFileSync(fd, `${process.pid}\n`, "utf8");
+    return {
+        release: () => {
+            try {
+                fs.closeSync(fd);
+            }
+            catch { }
+            try {
+                fs.unlinkSync(lockPath);
+            }
+            catch { }
+        },
+    };
+}

package/dist/tools/workflow.js

@@ -9,6 +9,7 @@ import { nowISO } from "../shared/time";
 import { newEventId } from "../state/ids";
 import { debug } from "../shared/log";
 import { createToastManager } from "../ui/toasts";
+import { acquireRepoLock } from "../state/repo-lock";
 // Agent name mapping for case-sensitive resolution
 export const STAGE_TO_AGENT_MAP = {
     frame: "Frame",
@@ -155,191 +156,200 @@ export function createAstroWorkflowProceedTool(opts) {
             max_steps: tool.schema.number().int().positive().default(config.workflow.default_max_steps),
         },
         execute: async ({ mode, max_steps }) => {
-            const sessionId = ctx.sessionID;
-            const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
-            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") {
-                    actions.push("idle: no approved stories");
-                    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 (mode === "step")
-                        break;
-                    continue;
-                }
-                if (next.kind === "complete_run") {
-                    withTx(db, () => completeRun(db, next.run_id, emit));
-                    actions.push(`completed run ${next.run_id}`);
-                    if (mode === "step")
+            // Acquire repo lock to ensure no concurrent workflow operations
+            const lockPath = `${ctx.directory}/.astro/astro.lock`;
+            const repoLock = acquireRepoLock(lockPath);
+            try {
+                const sessionId = ctx.sessionID;
+                const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
+                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") {
+                        actions.push("idle: no approved stories");
                         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;
-                }
-                if (next.kind === "delegate_stage") {
-                    const active = getActiveRun(db);
-                    if (!active)
-                        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);
-                    let agentName = resolveAgentName(next.stage_key, config, agents, warnings);
-                    const agentExists = (name) => {
-                        if (agents && agents[name])
-                            return true;
-                        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. Falling back to orchestrator.`);
-                        agentName = config.agents?.orchestrator_name || "Astro";
+                    }
+                    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 (mode === "step")
+                            break;
+                        continue;
+                    }
+                    if (next.kind === "complete_run") {
+                        withTx(db, () => completeRun(db, next.run_id, emit));
+                        actions.push(`completed run ${next.run_id}`);
+                        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;
+                    }
+                    if (next.kind === "delegate_stage") {
+                        const active = getActiveRun(db);
+                        if (!active)
+                            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);
+                        let agentName = resolveAgentName(next.stage_key, config, agents, warnings);
+                        const agentExists = (name) => {
+                            if (agents && agents[name])
+                                return true;
+                            const knownStageAgents = ["Frame", "Plan", "Spec", "Implement", "Review", "Verify", "Close", "General", "Astro", "general"];
+                            if (knownStageAgents.includes(name))
+                                return true;
+                            return false;
+                        };
                         if (!agentExists(agentName)) {
-                            console.warn(`[Astrocode] Orchestrator ${agentName} not available. Falling back to General.`);
-                            agentName = "General";
+                            const originalAgent = agentName;
+                            console.warn(`[Astrocode] Agent ${agentName} not found. Falling back to orchestrator.`);
+                            agentName = config.agents?.orchestrator_name || "Astro";
                             if (!agentExists(agentName)) {
-                                throw new Error(`Critical: No agents available for delegation. Primary: ${originalAgent}, Orchestrator: ${config.agents?.orchestrator_name || "Astro"}, General: unavailable`);
+                                console.warn(`[Astrocode] Orchestrator ${agentName} not available. Falling back to General.`);
+                                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 }, emit);
-                    });
-                    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,
-                        run_id: active.run_id,
-                        story_key: run.story_key,
-                        story_title: story?.title ?? "(missing)",
-                        stage_agent_name: agentName,
-                        stage_goal: stageGoal(next.stage_key, config),
-                        stage_constraints: stageConstraints(next.stage_key, config),
-                        context_snapshot_md: context,
-                    }).body;
-                    const delegatePrompt = buildDelegationPrompt({
-                        stageDirective,
-                        run_id: active.run_id,
-                        stage_key: next.stage_key,
-                        stage_agent_name: agentName,
-                    });
-                    // 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 (awaited)
-                    if (sessionId) {
-                        await injectChatPrompt({ ctx, sessionId, text: delegatePrompt, agent: "Astro" });
-                        const continueMessage = [
-                            `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_COMPLETION]`,
-                            ``,
-                            `Stage \`${next.stage_key}\` delegated to \`${agentName}\`.`,
-                            ``,
-                            `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.`,
-                        ].join("\n");
-                        await injectChatPrompt({ ctx, sessionId, text: continueMessage, agent: "Astro" });
-                    }
-                    actions.push(`delegated stage ${next.stage_key} via ${agentName}`);
-                    // Stop here; subagent needs to run.
-                    break;
-                }
-                if (next.kind === "await_stage_completion") {
-                    actions.push(`await stage completion: ${next.stage_key}`);
-                    if (sessionId) {
+                        // NOTE: startStage owns its own tx (state-machine.ts).
+                        withTx(db, () => {
+                            startStage(db, active.run_id, next.stage_key, { subagent_type: agentName }, emit);
+                        });
                         const context = buildContextSnapshot({
                             db,
                             config,
-                            run_id: next.run_id,
-                            next_action: `complete stage ${next.stage_key}`,
+                            run_id: active.run_id,
+                            next_action: `delegate stage ${next.stage_key}`,
+                        });
+                        const stageDirective = buildStageDirective({
+                            config,
+                            stage_key: next.stage_key,
+                            run_id: active.run_id,
+                            story_key: run.story_key,
+                            story_title: story?.title ?? "(missing)",
+                            stage_agent_name: agentName,
+                            stage_goal: stageGoal(next.stage_key, config),
+                            stage_constraints: stageConstraints(next.stage_key, config),
+                            context_snapshot_md: context,
+                        }).body;
+                        const delegatePrompt = buildDelegationPrompt({
+                            stageDirective,
+                            run_id: active.run_id,
+                            stage_key: next.stage_key,
+                            stage_agent_name: agentName,
                         });
-                        const prompt = [
-                            `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_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:`,
-                            context,
-                        ].join("\n").trim();
-                        const h = directiveHash(prompt);
+                        // Record continuation (best-effort; no tx wrapper needed but safe either way)
+                        const h = directiveHash(delegatePrompt);
                         const now = nowISO();
-                        db.prepare("INSERT INTO continuations (session_id, run_id, directive_hash, kind, reason, created_at) VALUES (?, ?, ?, 'continue', ?, ?)").run(sessionId, next.run_id, h, `await ${next.stage_key}`, now);
-                        await injectChatPrompt({ ctx, sessionId, text: prompt, agent: "Astro" });
+                        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 (awaited)
+                        if (sessionId) {
+                            await injectChatPrompt({ ctx, sessionId, text: delegatePrompt, agent: "Astro" });
+                            const continueMessage = [
+                                `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_COMPLETION]`,
+                                ``,
+                                `Stage \`${next.stage_key}\` delegated to \`${agentName}\`.`,
+                                ``,
+                                `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.`,
+                            ].join("\n");
+                            await injectChatPrompt({ ctx, sessionId, text: continueMessage, agent: "Astro" });
+                        }
+                        actions.push(`delegated stage ${next.stage_key} via ${agentName}`);
+                        // Stop here; subagent needs to run.
+                        break;
+                    }
+                    if (next.kind === "await_stage_completion") {
+                        actions.push(`await stage completion: ${next.stage_key}`);
+                        if (sessionId) {
+                            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.`,
+                                `If you have the subagent output, call astro_stage_complete with output_text=the FULL output.`,
+                                ``,
+                                `Context snapshot:`,
+                                context,
+                            ].join("\n").trim();
+                            const h = directiveHash(prompt);
+                            const now = nowISO();
+                            db.prepare("INSERT INTO continuations (session_id, run_id, directive_hash, kind, reason, created_at) VALUES (?, ?, ?, 'continue', ?, ?)").run(sessionId, next.run_id, h, `await ${next.stage_key}`, now);
+                            await injectChatPrompt({ ctx, sessionId, text: prompt, agent: "Astro" });
+                        }
+                        break;
                     }
+                    actions.push(`unhandled next action: ${next.kind}`);
                     break;
                 }
-                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",
-                        });
+                // 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);
+                const lines = [];
+                lines.push(`# astro_workflow_proceed`);
+                lines.push(`- mode: ${mode}`);
+                lines.push(`- steps requested: ${max_steps} (cap=${steps})`);
+                if (active)
+                    lines.push(`- active run: \`${active.run_id}\` (stage=${active.current_stage_key ?? "?"})`);
+                lines.push(``, `## Actions`);
+                for (const a of actions)
+                    lines.push(`- ${a}`);
+                if (warnings.length > 0) {
+                    lines.push(``, `## Warnings`);
+                    for (const w of warnings)
+                        lines.push(`⚠️ ${w}`);
                 }
-                actions.push(`ui: flushed ${uiEvents.length} event(s)`);
+                return lines.join("\n").trim();
             }
-            // 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);
-            const lines = [];
-            lines.push(`# astro_workflow_proceed`);
-            lines.push(`- mode: ${mode}`);
-            lines.push(`- steps requested: ${max_steps} (cap=${steps})`);
-            if (active)
-                lines.push(`- active run: \`${active.run_id}\` (stage=${active.current_stage_key ?? "?"})`);
-            lines.push(``, `## Actions`);
-            for (const a of actions)
-                lines.push(`- ${a}`);
-            if (warnings.length > 0) {
-                lines.push(``, `## Warnings`);
-                for (const w of warnings)
-                    lines.push(`⚠️ ${w}`);
+            finally {
+                // Always release the lock
+                repoLock.release();
             }
-            return lines.join("\n").trim();
         },
     });
 }

package/package.json

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

package/src/index.ts

@@ -13,6 +13,7 @@ import { createToastManager, type ToastOptions } from "./ui/toasts";
 import { createAstroAgents } from "./agents/registry";
 import type { AgentConfig } from "@opencode-ai/sdk";
 import { info, warn } from "./shared/log";
+import { acquireRepoLock } from "./state/repo-lock";
 
 // Type definitions for plugin components
 type ConfigHandler = (config: Record<string, any>) => Promise<void>;
@@ -58,6 +59,10 @@ const Astrocode: Plugin = async (ctx) => {
   }
   const repoRoot = ctx.directory;
 
+  // Acquire exclusive repo lock to prevent multiple processes from corrupting the database
+  const lockPath = `${repoRoot}/.astro/astro.lock`;
+  const repoLock = acquireRepoLock(lockPath);
+
   // Always load config first - this provides defaults even in limited mode
   let pluginConfig: AstrocodeConfig;
   try {
@@ -325,6 +330,9 @@ const Astrocode: Plugin = async (ctx) => {
 
     // Best-effort cleanup
     close: async () => {
+      // Release repo lock first (important for process termination)
+      repoLock.release();
+
       if (db && typeof db.close === "function") {
         try {
           db.close();

package/src/state/repo-lock.ts

@@ -0,0 +1,26 @@
+// src/state/repo-lock.ts
+import fs from "node:fs";
+import path from "node:path";
+
+export function acquireRepoLock(lockPath: string): { release: () => void } {
+  fs.mkdirSync(path.dirname(lockPath), { recursive: true });
+
+  let fd: number;
+  try {
+    fd = fs.openSync(lockPath, "wx"); // exclusive create
+  } catch (e: any) {
+    const msg = e?.code === "EEXIST"
+      ? `Astrocode lock is already held (${lockPath}). Another opencode process is running in this repo.`
+      : `Failed to acquire lock (${lockPath}): ${e?.message ?? String(e)}`;
+    throw new Error(msg);
+  }
+
+  fs.writeFileSync(fd, `${(process as any).pid}\n`, "utf8");
+
+  return {
+    release: () => {
+      try { fs.closeSync(fd); } catch {}
+      try { fs.unlinkSync(lockPath); } catch {}
+    },
+  };
+}

package/src/tools/workflow.ts

@@ -22,6 +22,7 @@ import { newEventId } from "../state/ids";
 import { debug } from "../shared/log";
 import { createToastManager } from "../ui/toasts";
 import type { AgentConfig } from "@opencode-ai/sdk";
+import { acquireRepoLock } from "../state/repo-lock";
 
 // Agent name mapping for case-sensitive resolution
 export const STAGE_TO_AGENT_MAP: Record<string, string> = {
@@ -184,8 +185,13 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
       max_steps: tool.schema.number().int().positive().default(config.workflow.default_max_steps),
     },
     execute: async ({ mode, max_steps }) => {
-      const sessionId = (ctx as any).sessionID as string | undefined;
-      const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
+      // Acquire repo lock to ensure no concurrent workflow operations
+      const lockPath = `${(ctx as any).directory}/.astro/astro.lock`;
+      const repoLock = acquireRepoLock(lockPath);
+
+      try {
+        const sessionId = (ctx as any).sessionID as string | undefined;
+        const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
 
       const actions: string[] = [];
       const warnings: string[] = [];
@@ -408,6 +414,10 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
       }
 
       return lines.join("\n").trim();
+      } finally {
+        // Always release the lock
+        repoLock.release();
+      }
     },
   });
 }