astrocode-workflow 0.1.12 → 0.1.17

package/dist/agents/registry.d.ts

@@ -1,6 +1,6 @@
 import type { AgentConfig } from "@opencode-ai/sdk";
 import type { AstrocodeConfig } from "../config/schema";
 export declare function createAstroAgents(opts: {
-    systemDefaultModel: string;
+    systemDefaultModel?: string;
     pluginConfig: AstrocodeConfig;
 }): Record<string, AgentConfig>;

package/dist/index.js

@@ -6,11 +6,14 @@ import { createAstroTools } from "./tools";
 import { createContinuationEnforcer } from "./hooks/continuation-enforcer";
 import { createToolOutputTruncatorHook } from "./hooks/tool-output-truncator";
 import { createToastManager } from "./ui/toasts";
+import { createAstroAgents } from "./agents/registry";
 console.log("Astrocode plugin loading...");
 const Astrocode = async (ctx) => {
     const repoRoot = ctx.directory;
     // Always load config first - this provides defaults even in limited mode
     let pluginConfig = loadAstrocodeConfig(repoRoot);
+    // Create agents for registration
+    const agents = createAstroAgents({ pluginConfig });
     // Always ensure .astro directories exist, even in limited mode
     const paths = getAstroPaths(repoRoot, pluginConfig.db.path);
     ensureAstroDirs(paths);
@@ -26,7 +29,7 @@ const Astrocode = async (ctx) => {
         ensureSchema(db, { allowAutoMigrate: pluginConfig.db.allow_auto_migrate, failOnDowngrade: pluginConfig.db.fail_on_downgrade });
         // Database initialized successfully
         configHandler = createConfigHandler({ pluginConfig });
-        tools = createAstroTools({ ctx, config: pluginConfig, db });
+        tools = createAstroTools({ ctx, config: pluginConfig, db, agents });
         continuation = createContinuationEnforcer({ ctx, config: pluginConfig, db });
         truncatorHook = createToolOutputTruncatorHook({ ctx, config: pluginConfig, db });
         toasts = createToastManager({ ctx, throttleMs: pluginConfig.ui.toasts.throttle_ms });
@@ -41,17 +44,19 @@ const Astrocode = async (ctx) => {
         // Create limited functionality
         db = null;
         configHandler = createConfigHandler({ pluginConfig });
-        tools = createAstroTools({ ctx, config: pluginConfig, db });
+        tools = createAstroTools({ ctx, config: pluginConfig, db, agents });
         continuation = null;
         truncatorHook = null;
         toasts = null;
     }
     return {
         name: "Astrocode",
+        // Register agents
+        agents,
         // Merge agents + slash commands into system config
         config: configHandler,
         // Register tools
-        tool: tools,
+        tool: createAstroTools({ ctx, config: pluginConfig, db, agents }),
         // Limit created subagents from spawning more subagents (OMO-style).
         "tool.execute.before": async (input, output) => {
             if (!pluginConfig.permissions.enforce_task_tool_restrictions)

package/dist/tools/index.d.ts

@@ -1,8 +1,10 @@
 import type { ToolDefinition } from "@opencode-ai/plugin/tool";
 import type { AstrocodeConfig } from "../config/schema";
 import type { SqliteDb } from "../state/db";
+import { AgentConfig } from "@opencode-ai/sdk";
 export declare function createAstroTools(opts: {
     ctx: any;
     config: AstrocodeConfig;
     db: SqliteDb;
+    agents?: Record<string, AgentConfig>;
 }): Record<string, ToolDefinition>;

package/dist/tools/index.js

@@ -9,7 +9,7 @@ import { createAstroArtifactPutTool, createAstroArtifactListTool, createAstroArt
 import { createAstroInjectPutTool, createAstroInjectListTool, createAstroInjectSearchTool, createAstroInjectGetTool } from "./injects";
 import { createAstroRepairTool } from "./repair";
 export function createAstroTools(opts) {
-    const { ctx, config, db } = opts;
+    const { ctx, config, db, agents } = opts;
     const hasDatabase = !!db;
     const tools = {};
     // Always available tools
@@ -27,7 +27,7 @@ export function createAstroTools(opts) {
         tools.astro_spec_set = createAstroSpecSetTool({ ctx, config, db });
         tools.astro_run_get = createAstroRunGetTool({ ctx, config, db });
         tools.astro_run_abort = createAstroRunAbortTool({ ctx, config, db });
-        tools.astro_workflow_proceed = createAstroWorkflowProceedTool({ ctx, config, db });
+        tools.astro_workflow_proceed = createAstroWorkflowProceedTool({ ctx, config, db, agents });
         tools.astro_stage_start = createAstroStageStartTool({ ctx, config, db });
         tools.astro_stage_complete = createAstroStageCompleteTool({ ctx, config, db });
         tools.astro_stage_fail = createAstroStageFailTool({ ctx, config, db });

package/dist/tools/stage.js

@@ -219,8 +219,9 @@ export function createAstroStageCompleteTool(opts) {
                     const specPath = path.join(repoRoot, ".astro", "spec.md");
                     if (fs.existsSync(specPath) && fs.statSync(specPath).size > 100) {
                         // Skip spec
-                        db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, status, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)")
-                            .run(newId("stage"), rid, "spec", "skipped", now, now);
+                        const specIndex = pipeline.indexOf("spec");
+                        db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, stage_index, status, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)")
+                            .run(newId("stage"), rid, "spec", specIndex, "skipped", now, now);
                         next = "implement";
                     }
                 }

package/dist/tools/workflow.d.ts

@@ -1,8 +1,10 @@
 import { type ToolDefinition } from "@opencode-ai/plugin/tool";
 import type { AstrocodeConfig } from "../config/schema";
 import type { SqliteDb } from "../state/db";
+import { AgentConfig } from "@opencode-ai/sdk";
 export declare function createAstroWorkflowProceedTool(opts: {
     ctx: any;
     config: AstrocodeConfig;
     db: SqliteDb;
+    agents?: Record<string, AgentConfig>;
 }): ToolDefinition;

package/dist/tools/workflow.js

@@ -83,7 +83,7 @@ function buildDelegationPrompt(opts) {
     ].join("\n").trim();
 }
 export function createAstroWorkflowProceedTool(opts) {
-    const { ctx, config, db } = opts;
+    const { ctx, config, db, agents } = opts;
     const toasts = createToastManager({ ctx, throttleMs: config.ui.toasts.throttle_ms });
     return tool({
         description: "Deterministic harness: advances the DB-driven pipeline by one step (or loops bounded). Stops when LLM work is required (delegation/await).",
@@ -134,15 +134,23 @@ export function createAstroWorkflowProceedTool(opts) {
                     console.log(`[Astrocode] Available agents:`, Object.keys(config.agent || {}));
                     // Validate agent availability with fallback chain
                     const systemConfig = config;
-                    if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+                    // Check both the system config agent map (if present) OR the local agents map passed to the tool
+                    const agentExists = (name) => {
+                        if (agents && agents[name])
+                            return true;
+                        if (systemConfig.agent && systemConfig.agent[name])
+                            return true;
+                        return false;
+                    };
+                    if (!agentExists(agentName)) {
                         console.warn(`[Astrocode] Agent ${agentName} not found in config. Falling back to General.`);
                         console.warn(`[Astrocode] Agent check: config.agent exists: ${!!systemConfig.agent}, agentName in config: ${systemConfig.agent ? agentName in systemConfig.agent : 'N/A'}`);
                         agentName = "General";
                         // Second fallback to orchestrator if General also unavailable
-                        if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+                        if (!agentExists(agentName)) {
                             console.warn(`[Astrocode] General agent also unavailable. Falling back to orchestrator.`);
                             agentName = config.agents?.orchestrator_name || "Astro";
-                            if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+                            if (!agentExists(agentName)) {
                                 throw new Error(`Critical: No agents available for delegation. Primary: ${resolveAgentName(next.stage_key, config)}, General, Orchestrator: ${agentName}`);
                             }
                         }

package/dist/workflow/directives.js

@@ -85,11 +85,15 @@ export function buildStageDirective(opts) {
         `Output contract (strict):`,
         `1) Baton markdown (short, structured)`,
         `2) ASTRO JSON between markers:`,
-        `   ${"```"}`,
         `   ${"<!-- ASTRO_JSON_BEGIN -->"}`,
-        `   {...}`,
+        `   {`,
+        `     "schema_version": 1,`,
+        `     "stage_key": "${stage_key}",`,
+        `     "status": "ok",`,
+        `     "summary": "Brief summary of work done",`,
+        `     ...`,
+        `   }`,
         `   ${"<!-- ASTRO_JSON_END -->"}`,
-        `   ${"```"}`,
         ``,
         `ASTRO JSON requirements:`,
         `- stage_key must be "${stage_key}"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astrocode-workflow",
-  "version": "0.1.12",
+  "version": "0.1.17",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@opencode-ai/plugin": "^1.1.19",
     "@opencode-ai/sdk": "^1.1.19",
-    "astrocode-workflow": "^0.1.8",
+    "astrocode-workflow": "^0.1.16",
     "jsonc-parser": "^3.2.0",
     "zod": "4.1.8"
   },

package/src/agents/registry.ts

@@ -116,7 +116,7 @@ function stageVerifyPermissions(): PermissionMap {
 }
 
 export function createAstroAgents(opts: {
-  systemDefaultModel: string;
+  systemDefaultModel?: string;
   pluginConfig: AstrocodeConfig;
 }): Record<string, AgentConfig> {
   const { systemDefaultModel, pluginConfig } = opts;

package/src/index.ts

@@ -7,6 +7,7 @@ import { createAstroTools } from "./tools";
 import { createContinuationEnforcer } from "./hooks/continuation-enforcer";
 import { createToolOutputTruncatorHook } from "./hooks/tool-output-truncator";
 import { createToastManager } from "./ui/toasts";
+import { createAstroAgents } from "./agents/registry";
 import { info, warn } from "./shared/log";
 
 console.log("Astrocode plugin loading...");
@@ -17,6 +18,9 @@ const Astrocode: Plugin = async (ctx) => {
   // Always load config first - this provides defaults even in limited mode
   let pluginConfig = loadAstrocodeConfig(repoRoot);
 
+  // Create agents for registration
+  const agents = createAstroAgents({ pluginConfig });
+
   // Always ensure .astro directories exist, even in limited mode
   const paths = getAstroPaths(repoRoot, pluginConfig.db.path);
   ensureAstroDirs(paths);
@@ -36,7 +40,7 @@ const Astrocode: Plugin = async (ctx) => {
 
     // Database initialized successfully
     configHandler = createConfigHandler({ pluginConfig });
-    tools = createAstroTools({ ctx, config: pluginConfig, db });
+    tools = createAstroTools({ ctx, config: pluginConfig, db, agents });
     continuation = createContinuationEnforcer({ ctx, config: pluginConfig, db });
     truncatorHook = createToolOutputTruncatorHook({ ctx, config: pluginConfig, db });
     toasts = createToastManager({ ctx, throttleMs: pluginConfig.ui.toasts.throttle_ms });
@@ -53,7 +57,7 @@ const Astrocode: Plugin = async (ctx) => {
     // Create limited functionality
     db = null;
     configHandler = createConfigHandler({ pluginConfig });
-    tools = createAstroTools({ ctx, config: pluginConfig, db });
+    tools = createAstroTools({ ctx, config: pluginConfig, db, agents });
     continuation = null;
     truncatorHook = null;
     toasts = null;
@@ -62,11 +66,14 @@ const Astrocode: Plugin = async (ctx) => {
   return {
     name: "Astrocode",
 
+    // Register agents
+    agents,
+
     // Merge agents + slash commands into system config
     config: configHandler,
 
     // Register tools
-    tool: tools,
+    tool: createAstroTools({ ctx, config: pluginConfig, db, agents }),
 
     // Limit created subagents from spawning more subagents (OMO-style).
     "tool.execute.before": async (input: any, output: any) => {

package/src/tools/index.ts

@@ -13,8 +13,10 @@ import { createAstroArtifactPutTool, createAstroArtifactListTool, createAstroArt
 import { createAstroInjectPutTool, createAstroInjectListTool, createAstroInjectSearchTool, createAstroInjectGetTool } from "./injects";
 import { createAstroRepairTool } from "./repair";
 
-export function createAstroTools(opts: { ctx: any; config: AstrocodeConfig; db: SqliteDb }): Record<string, ToolDefinition> {
-  const { ctx, config, db } = opts;
+import { AgentConfig } from "@opencode-ai/sdk";
+
+export function createAstroTools(opts: { ctx: any; config: AstrocodeConfig; db: SqliteDb; agents?: Record<string, AgentConfig> }): Record<string, ToolDefinition> {
+  const { ctx, config, db, agents } = opts;
   const hasDatabase = !!db;
 
   const tools: Record<string, ToolDefinition> = {};
@@ -36,7 +38,7 @@ export function createAstroTools(opts: { ctx: any; config: AstrocodeConfig; db:
     tools.astro_spec_set = createAstroSpecSetTool({ ctx, config, db });
     tools.astro_run_get = createAstroRunGetTool({ ctx, config, db });
     tools.astro_run_abort = createAstroRunAbortTool({ ctx, config, db });
-    tools.astro_workflow_proceed = createAstroWorkflowProceedTool({ ctx, config, db });
+    tools.astro_workflow_proceed = createAstroWorkflowProceedTool({ ctx, config, db, agents });
     tools.astro_stage_start = createAstroStageStartTool({ ctx, config, db });
     tools.astro_stage_complete = createAstroStageCompleteTool({ ctx, config, db });
     tools.astro_stage_fail = createAstroStageFailTool({ ctx, config, db });

package/src/tools/stage.ts

@@ -300,8 +300,9 @@ export function createAstroStageCompleteTool(opts: { ctx: any; config: Astrocode
           const specPath = path.join(repoRoot, ".astro", "spec.md");
           if (fs.existsSync(specPath) && fs.statSync(specPath).size > 100) {
             // Skip spec
-            db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, status, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)")
-              .run(newId("stage"), rid, "spec", "skipped", now, now);
+            const specIndex = pipeline.indexOf("spec");
+            db.prepare("INSERT INTO stage_runs (stage_run_id, run_id, stage_key, stage_index, status, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)")
+              .run(newId("stage"), rid, "spec", specIndex, "skipped", now, now);
             next = "implement";
           }
         }

package/src/tools/workflow.ts

@@ -99,8 +99,10 @@ function buildDelegationPrompt(opts: {
   ].join("\n").trim();
 }
 
-export function createAstroWorkflowProceedTool(opts: { ctx: any; config: AstrocodeConfig; db: SqliteDb }): ToolDefinition {
-  const { ctx, config, db } = opts;
+import { AgentConfig } from "@opencode-ai/sdk";
+
+export function createAstroWorkflowProceedTool(opts: { ctx: any; config: AstrocodeConfig; db: SqliteDb; agents?: Record<string, AgentConfig> }): ToolDefinition {
+  const { ctx, config, db, agents } = opts;
   const toasts = createToastManager({ ctx, throttleMs: config.ui.toasts.throttle_ms });
 
   return tool({
@@ -163,15 +165,22 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
 
           // Validate agent availability with fallback chain
           const systemConfig = config as any;
-          if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+          // Check both the system config agent map (if present) OR the local agents map passed to the tool
+          const agentExists = (name: string) => {
+             if (agents && agents[name]) return true;
+             if (systemConfig.agent && systemConfig.agent[name]) return true;
+             return false;
+          };
+
+          if (!agentExists(agentName)) {
             console.warn(`[Astrocode] Agent ${agentName} not found in config. Falling back to General.`);
             console.warn(`[Astrocode] Agent check: config.agent exists: ${!!systemConfig.agent}, agentName in config: ${systemConfig.agent ? agentName in systemConfig.agent : 'N/A'}`);
             agentName = "General";
             // Second fallback to orchestrator if General also unavailable
-            if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+            if (!agentExists(agentName)) {
               console.warn(`[Astrocode] General agent also unavailable. Falling back to orchestrator.`);
               agentName = config.agents?.orchestrator_name || "Astro";
-              if (!systemConfig.agent || !systemConfig.agent[agentName]) {
+              if (!agentExists(agentName)) {
                 throw new Error(`Critical: No agents available for delegation. Primary: ${resolveAgentName(next.stage_key, config)}, General, Orchestrator: ${agentName}`);
               }
             }

package/src/workflow/directives.ts

@@ -140,11 +140,15 @@ export function buildStageDirective(opts: {
         `Output contract (strict):`,
         `1) Baton markdown (short, structured)`,
         `2) ASTRO JSON between markers:`,
-        `   ${"```"}`,
         `   ${"<!-- ASTRO_JSON_BEGIN -->"}`,
-        `   {...}`,
+        `   {`,
+        `     "schema_version": 1,`,
+        `     "stage_key": "${stage_key}",`,
+        `     "status": "ok",`,
+        `     "summary": "Brief summary of work done",`,
+        `     ...`,
+        `   }`,
         `   ${"<!-- ASTRO_JSON_END -->"}`,
-        `   ${"```"}`,
         ``,
         `ASTRO JSON requirements:`,
         `- stage_key must be "${stage_key}"`,