astrocode-workflow 0.4.1 → 0.4.2

package/src/state/workflow-repo-lock.ts

@@ -1,111 +0,0 @@
-// src/state/workflow-repo-lock.ts
-import type { acquireRepoLock } from "./repo-lock";
-
-type RepoLockAcquire = typeof acquireRepoLock;
-
-type Held = {
-  release: () => void;
-  depth: number;
-};
-
-const HELD_BY_KEY = new Map<string, Held>();
-
-function key(lockPath: string, sessionId?: string) {
-  return `${lockPath}::${sessionId ?? ""}`;
-}
-
-/**
- * Acquire ONCE per workflow/session in this process.
- * Nested calls reuse the same held lock (no reacquire, no churn).
- *
- * ADVISORY LOCK MODE:
- * - Creates lock file to signal other sessions
- * - If lock held by another session: WARN and proceed anyway
- * - Database constraints provide actual safety (single running run)
- * - Better UX: no blocking, just helpful warnings
- */
-export async function workflowRepoLock<T>(
-  deps: { acquireRepoLock: RepoLockAcquire },
-  opts: {
-    lockPath: string;
-    repoRoot: string;
-    sessionId?: string;
-    owner?: string;
-    fn: () => Promise<T>;
-    advisory?: boolean; // If true, warn instead of error on contention
-  }
-): Promise<T> {
-  const k = key(opts.lockPath, opts.sessionId);
-  const existing = HELD_BY_KEY.get(k);
-
-  if (existing) {
-    existing.depth += 1;
-    try {
-      return await opts.fn();
-    } finally {
-      existing.depth -= 1;
-      if (existing.depth <= 0) {
-        HELD_BY_KEY.delete(k);
-        existing.release();
-      }
-    }
-  }
-
-  // IMPORTANT: this is tuned for "hold for whole workflow".
-  let handle: { release: () => void } | null = null;
-
-  try {
-    handle = await deps.acquireRepoLock({
-      lockPath: opts.lockPath,
-      repoRoot: opts.repoRoot,
-      sessionId: opts.sessionId,
-      owner: opts.owner,
-
-      retryMs: opts.advisory ? 1000 : 30_000, // Advisory: fail fast, hard: wait longer
-      staleMs: 30_000, // Reduced from 2 minutes to 30 seconds for faster stale lock recovery
-      heartbeatMs: 200,
-      minWriteMs: 800,
-      pollMs: 20,
-      pollMaxMs: 250,
-    });
-  } catch (err: any) {
-    // Lock acquisition failed - check if advisory mode
-    if (opts.advisory) {
-      // Advisory mode: warn and proceed without lock
-      // eslint-disable-next-line no-console
-      console.warn(`⚠️  [Astrocode] Another session may be active. Proceeding anyway (advisory lock mode).`);
-      // eslint-disable-next-line no-console
-      console.warn(`    ${err.message}`);
-
-      // Proceed without lock - database constraints will ensure safety
-      try {
-        return await opts.fn();
-      } catch (dbErr: any) {
-        // Check if this is a concurrency error
-        if (dbErr.message?.includes('UNIQUE constraint') || dbErr.message?.includes('SQLITE_BUSY')) {
-          throw new Error(
-            `Another session is actively working on this story. Database prevented concurrent modification. ` +
-            `Please wait for the other session to complete, or work on a different story.`
-          );
-        }
-        throw dbErr;
-      }
-    }
-
-    // Hard lock mode: propagate error
-    throw err;
-  }
-
-  const held: Held = { release: handle.release, depth: 1 };
-  HELD_BY_KEY.set(k, held);
-
-  try {
-    return await opts.fn();
-  } finally {
-    held.depth -= 1;
-    if (held.depth <= 0) {
-      HELD_BY_KEY.delete(k);
-      held.release();
-    }
-  }
-}

package/src/tools/lock.ts

@@ -1,75 +0,0 @@
-import path from "node:path";
-import { tool, type ToolDefinition } from "@opencode-ai/plugin/tool";
-import { getLockStatus, tryRemoveStaleLock } from "../state/repo-lock";
-
-export function createAstroLockStatusTool(opts: { ctx: any }): ToolDefinition {
-  const { ctx } = opts;
-
-  return tool({
-    description: "Check Astrocode lock status and attempt repair. Shows diagnostics (PID, age, session) and can remove stale/dead locks.",
-    args: {
-      attempt_repair: tool.schema.boolean().default(false).describe("If true, attempt to remove stale or dead locks"),
-    },
-    execute: async ({ attempt_repair }) => {
-      const repoRoot = ctx.directory as string;
-      const lockPath = path.join(repoRoot, ".astro", "astro.lock");
-
-      const status = getLockStatus(lockPath);
-
-      if (!status.exists) {
-        return "✅ No lock file found. Repository is unlocked.";
-      }
-
-      const lines: string[] = [];
-      lines.push("# Astrocode Lock Status");
-      lines.push("");
-      lines.push("## Lock Details");
-      lines.push(`- **Path**: ${status.path}`);
-      lines.push(`- **PID**: ${status.pid} (${status.pidAlive ? '🟢 ALIVE' : '🔴 DEAD'})`);
-      lines.push(`- **Age**: ${status.ageMs ? Math.floor(status.ageMs / 1000) : '?'}s`);
-      lines.push(`- **Status**: ${status.isStale ? '⚠️ STALE' : '✅ FRESH'}`);
-      if (status.sessionId) lines.push(`- **Session**: ${status.sessionId}`);
-      if (status.owner) lines.push(`- **Owner**: ${status.owner}`);
-      if (status.instanceId) lines.push(`- **Instance**: ${status.instanceId.substring(0, 8)}...`);
-      if (status.leaseId) lines.push(`- **Lease**: ${status.leaseId.substring(0, 8)}...`);
-      if (status.createdAt) lines.push(`- **Created**: ${status.createdAt}`);
-      if (status.updatedAt) lines.push(`- **Updated**: ${status.updatedAt}`);
-      if (status.repoRoot) lines.push(`- **Repo**: ${status.repoRoot}`);
-      lines.push(`- **Version**: ${status.version ?? 'unknown'}`);
-      lines.push("");
-
-      if (attempt_repair) {
-        lines.push("## Repair Attempt");
-        const result = tryRemoveStaleLock(lockPath);
-
-        if (result.removed) {
-          lines.push(`✅ **Lock removed**: ${result.reason}`);
-          lines.push("");
-          lines.push("The repository is now unlocked and ready for use.");
-        } else {
-          lines.push(`⚠️ **Lock NOT removed**: ${result.reason}`);
-          lines.push("");
-          lines.push("**Recommendations**:");
-          lines.push("- If the owning process has crashed, wait 30 seconds for automatic stale detection");
-          lines.push("- If the process is still running, wait for it to complete");
-          lines.push("- As a last resort, manually stop the process and run this tool again with attempt_repair=true");
-        }
-      } else {
-        lines.push("## Recommendations");
-        if (!status.pidAlive) {
-          lines.push("🔧 **Action Required**: Lock belongs to dead process. Run with `attempt_repair=true` to remove it.");
-        } else if (status.isStale) {
-          lines.push("🔧 **Action Suggested**: Lock is stale (not updated recently). Run with `attempt_repair=true` to remove it.");
-        } else {
-          lines.push("✅ Lock is active and healthy. The owning process is running normally.");
-          lines.push("");
-          lines.push("If you believe this is incorrect:");
-          lines.push("- Wait 30 seconds and check again (automatic stale detection)");
-          lines.push("- Run with `attempt_repair=true` only if you're certain the process has crashed");
-        }
-      }
-
-      return lines.join("\n");
-    },
-  });
-}