astrocode-workflow 0.4.1 → 0.4.3

package/src/tools/repair.ts

@@ -6,56 +6,22 @@ import { withTx } from "../state/db";
 import { repairState, formatRepairReport } from "../workflow/repair";
 import { putArtifact } from "../workflow/artifacts";
 import { nowISO } from "../shared/time";
-import { getLockStatus, tryRemoveStaleLock } from "../state/repo-lock";
 
 
 export function createAstroRepairTool(opts: { ctx: any; config: AstrocodeConfig; db: SqliteDb }): ToolDefinition {
   const { ctx, config, db } = opts;
 
   return tool({
-    description: "Repair Astrocode invariants and recover from inconsistent DB state. Also checks and repairs lock files. Writes a repair report artifact.",
+    description: "Repair Astrocode invariants and recover from inconsistent DB state. Writes a repair report artifact.",
     args: {
       write_report_artifact: tool.schema.boolean().default(true),
-      repair_lock: tool.schema.boolean().default(true).describe("Attempt to remove stale/dead lock files"),
     },
-    execute: async ({ write_report_artifact, repair_lock }) => {
+    execute: async ({ write_report_artifact }) => {
       const repoRoot = ctx.directory as string;
-      const lockPath = path.join(repoRoot, ".astro", "astro.lock");
 
-      // First, check and repair lock if requested
-      const lockLines: string[] = [];
-      const lockStatus = getLockStatus(lockPath);
-
-      if (lockStatus.exists) {
-        lockLines.push("## Lock Status");
-        lockLines.push(`- Lock found: ${lockPath}`);
-        lockLines.push(`- PID: ${lockStatus.pid} (${lockStatus.pidAlive ? 'alive' : 'dead'})`);
-        lockLines.push(`- Age: ${lockStatus.ageMs ? Math.floor(lockStatus.ageMs / 1000) : '?'}s`);
-        lockLines.push(`- Status: ${lockStatus.isStale ? 'stale' : 'fresh'}`);
-
-        if (repair_lock) {
-          const result = tryRemoveStaleLock(lockPath);
-          if (result.removed) {
-            lockLines.push(`- **Removed**: ${result.reason}`);
-          } else {
-            lockLines.push(`- **Not removed**: ${result.reason}`);
-          }
-        } else {
-          if (!lockStatus.pidAlive || lockStatus.isStale) {
-            lockLines.push(`- **Recommendation**: Run with repair_lock=true to remove this ${!lockStatus.pidAlive ? 'dead' : 'stale'} lock`);
-          }
-        }
-        lockLines.push("");
-      }
-
-      // Then repair database state
+      // Repair database state
       const report = withTx(db, () => repairState(db, config));
-      const dbMd = formatRepairReport(report);
-
-      // Combine lock and DB repair
-      const fullMd = lockLines.length > 0
-        ? `# Astrocode Repair Report\n\n${lockLines.join("\n")}\n${dbMd.replace(/^# Astrocode repair report\n*/i, "")}`
-        : dbMd;
+      const fullMd = formatRepairReport(report);
 
       if (write_report_artifact) {
         const rel = `.astro/repair/repair_${nowISO().replace(/[:.]/g, "-")}.md`;

package/src/tools/workflow.ts

@@ -24,8 +24,6 @@ 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";
-import { workflowRepoLock } from "../state/workflow-repo-lock";
 
 // Agent name mapping for case-sensitive resolution
 export const STAGE_TO_AGENT_MAP: Record<string, string> = {
@@ -140,36 +138,33 @@ function buildUiMessage(e: UiEmitEvent): { title: string; message: string; varia
     case "stage_started": {
       const agent = e.agent_name ? ` (${e.agent_name})` : "";
       const title = "Astrocode";
-      const message = `Stage started: ${e.stage_key}${agent}`;
+      const message = `▶ Stage started: ${e.stage_key}${agent}`;
       const chatText = [
-        `[SYSTEM DIRECTIVE: ASTROCODE — STAGE_STARTED]`,
-        ``,
-        `Run: ${e.run_id}`,
-        `Stage: ${e.stage_key}${agent}`,
+        `### ▶ 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 message = `✓ Run completed: ${e.run_id}`;
       const chatText = [
-        `[SYSTEM DIRECTIVE: ASTROCODE — RUN_COMPLETED]`,
-        ``,
-        `Run: ${e.run_id}`,
-        `Story: ${e.story_key}`,
+        `### ✓ 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 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}`,
+        `### ✖ 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 };
     }
@@ -188,20 +183,8 @@ 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 repoRoot = (ctx as any).directory as string;
-      const lockPath = path.join(repoRoot, ".astro", "astro.lock");
       const sessionId = (ctx as any).sessionID as string | undefined;
-
-      return workflowRepoLock(
-        { acquireRepoLock },
-        {
-          lockPath,
-          repoRoot,
-          sessionId,
-          owner: "astro_workflow_proceed",
-          advisory: true, // Advisory mode: warn instead of blocking on lock contention
-          fn: async () => {
-        const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
+      const steps = Math.min(max_steps, config.workflow.loop_max_steps_hard_cap);
 
       const actions: string[] = [];
       const warnings: string[] = [];
@@ -322,14 +305,14 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
             await injectChatPrompt({ ctx, sessionId, text: delegatePrompt, agent: "Astro" });
 
             const continueMessage = [
-              `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_COMPLETION]`,
-              ``,
+              `### ⏳ ASTROCODE: AWAITING 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.`,
+              `**Action Required:** When \`${agentName}\` completes, call:`,
+              `\`\`\`bash`,
+              `astro_stage_complete(run_id="${active.run_id}", stage_key="${next.stage_key}", output_text="...")`,
+              `\`\`\``,
+              `*Then run \`astro_workflow_proceed\` to continue.*`,
             ].join("\n");
 
             await injectChatPrompt({ ctx, sessionId, text: continueMessage, agent: "Astro" });
@@ -353,12 +336,12 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
             });
 
             const prompt = [
-              `[SYSTEM DIRECTIVE: ASTROCODE — AWAIT_STAGE_OUTPUT]`,
-              ``,
+              `### 📥 ASTROCODE: AWAITING 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:`,
+              `**Action Required:** If you have the subagent output, call \`astro_stage_complete\` with \`output_text=the FULL output\`.`,
+              ``,
+              `#### Context Snapshot`,
               context,
             ].join("\n").trim();
 
@@ -424,8 +407,6 @@ export function createAstroWorkflowProceedTool(opts: { ctx: any; config: Astroco
       }
 
       return lines.join("\n").trim();
-          },
-        });
     },
   });
 }