astrocode-workflow 0.3.3 → 0.3.4

package/package.json

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

package/src/state/repo-lock.ts

@@ -83,6 +83,7 @@ function safeUnlink(p: string) {
 
 /**
  * Reads & validates lock file defensively.
+ * Supports both v2 JSON format and legacy PID-only format for compatibility.
  * Returns null on any parse/validation failure.
  */
 function readLock(lockPath: string): LockFile | null {
@@ -91,23 +92,46 @@ function readLock(lockPath: string): LockFile | null {
     if (!st.isFile()) return null;
     if (st.size <= 0 || st.size > MAX_LOCK_BYTES) return null;
 
-    const raw = fs.readFileSync(lockPath, "utf8");
-    const parsed = JSON.parse(raw) as LockFile;
+    const raw = fs.readFileSync(lockPath, "utf8").trim();
 
-    if (!parsed) return null;
-    if (parsed.v !== LOCK_VERSION) return null;
-
-    if (typeof parsed.pid !== "number") return null;
-    if (typeof parsed.created_at !== "string") return null;
-    if (typeof parsed.updated_at !== "string") return null;
-    if (typeof parsed.repo_root !== "string") return null;
-    if (typeof parsed.instance_id !== "string") return null;
-    if (typeof parsed.lease_id !== "string") return null;
+    // Try v2 JSON first
+    try {
+      const parsed = JSON.parse(raw) as LockFile;
+      if (parsed && typeof parsed === "object" && parsed.v === LOCK_VERSION) {
+        if (typeof parsed.pid !== "number") return null;
+        if (typeof parsed.created_at !== "string") return null;
+        if (typeof parsed.updated_at !== "string") return null;
+        if (typeof parsed.repo_root !== "string") return null;
+        if (typeof parsed.instance_id !== "string") return null;
+        if (typeof parsed.lease_id !== "string") return null;
+
+        if (parsed.session_id !== undefined && typeof parsed.session_id !== "string") return null;
+        if (parsed.owner !== undefined && typeof parsed.owner !== "string") return null;
+
+        return parsed;
+      }
+    } catch {
+      // Not JSON, try legacy format
+    }
 
-    if (parsed.session_id !== undefined && typeof parsed.session_id !== "string") return null;
-    if (parsed.owner !== undefined && typeof parsed.owner !== "string") return null;
+    // Legacy format: just PID as number string
+    const legacyPid = parseInt(raw, 10);
+    if (Number.isNaN(legacyPid) || legacyPid <= 0) return null;
 
-    return parsed;
+    // Convert legacy to v2 format
+    const now = nowISO();
+    const leaseId = crypto.randomUUID();
+    return {
+      v: LOCK_VERSION,
+      pid: legacyPid,
+      created_at: now, // Approximate
+      updated_at: now,
+      repo_root: "", // Unknown, will be filled by caller
+      instance_id: PROCESS_INSTANCE_ID, // Assume same instance
+      session_id: undefined,
+      lease_id: leaseId,
+      owner: "legacy-lock",
+    };
   } catch {
     return null;
   }
@@ -453,8 +477,8 @@ export async function acquireRepoLock(opts: {
       continue;
     }
 
-    // Re-entrant by SAME PROCESS IDENTITY (pid+instance).
-    if (existing.pid === myPid && existing.instance_id === PROCESS_INSTANCE_ID) {
+    // Re-entrant by SAME PROCESS IDENTITY (pid+instance), or legacy lock with same PID.
+    if (existing.pid === myPid && (existing.instance_id === PROCESS_INSTANCE_ID || existing.owner === "legacy-lock")) {
       const leaseId = crypto.randomUUID();
 
       writeLockAtomicish(lockPath, {
@@ -462,6 +486,7 @@ export async function acquireRepoLock(opts: {
         v: LOCK_VERSION,
         updated_at: nowISO(),
         repo_root: repoRoot,
+        instance_id: PROCESS_INSTANCE_ID, // Upgrade legacy
         session_id: sessionId ?? existing.session_id,
         owner: owner ?? existing.owner,
         lease_id: leaseId,