@jxtools/promptline 1.3.9 → 1.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxtools/promptline",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "type": "module",
   "license": "ISC",
   "bin": {

package/promptline-prompt-queue.sh

@@ -52,9 +52,40 @@ RESULT=$(python3 << 'PYEOF'
 import json
 import sys
 import os
+import time
 import tempfile
 from datetime import datetime, timezone
 
+
+def acquire_lock(lock_path, timeout=3):
+    deadline = time.time() + timeout
+    while True:
+        try:
+            fd = os.open(lock_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL)
+            os.close(fd)
+            return
+        except FileExistsError:
+            try:
+                if time.time() - os.path.getmtime(lock_path) > 10:
+                    os.unlink(lock_path)
+                    continue
+            except OSError:
+                continue
+            if time.time() >= deadline:
+                try:
+                    os.unlink(lock_path)
+                except OSError:
+                    pass
+                return
+            time.sleep(0.01)
+
+
+def release_lock(lock_path):
+    try:
+        os.unlink(lock_path)
+    except OSError:
+        pass
+
 def atomic_write(path, obj):
     """Write JSON atomically: temp file + rename to prevent corruption."""
     dir_name = os.path.dirname(path)
@@ -105,82 +136,87 @@ if not queue_file:
     print("STOP")
     sys.exit(0)
 
-if not os.path.isfile(queue_file):
-    cwd = os.environ.get("CWD", "")
-    project = os.environ.get("PROJECT", "")
-    now = datetime.now(timezone.utc).isoformat()
-    data = {
-        "sessionId": session_id,
-        "project": project,
-        "directory": cwd,
-        "sessionName": extract_session_name(transcript_path),
-        "prompts": [],
-        "startedAt": now,
-        "lastActivity": now,
-        "currentPromptId": None,
-        "completedAt": None,
-        "closedAt": None,
-    }
-    atomic_write(queue_file, data)
-    print("STOP")
-    sys.exit(0)
-
+lock_path = queue_file + ".lock"
+acquire_lock(lock_path)
 try:
-    with open(queue_file, "r") as f:
-        data = json.load(f)
-except (json.JSONDecodeError, IOError):
-    print("0")
-    sys.exit(0)
-
-prompts = data.get("prompts", [])
-now = datetime.now(timezone.utc).isoformat()
-
-# Step 1: Mark any currently "running" prompts as "completed"
-for p in prompts:
-    if p.get("status") == "running":
-        p["status"] = "completed"
-        p["completedAt"] = now
+    if not os.path.isfile(queue_file):
+        cwd = os.environ.get("CWD", "")
+        project = os.environ.get("PROJECT", "")
+        now = datetime.now(timezone.utc).isoformat()
+        data = {
+            "sessionId": session_id,
+            "project": project,
+            "directory": cwd,
+            "sessionName": extract_session_name(transcript_path),
+            "prompts": [],
+            "startedAt": now,
+            "lastActivity": now,
+            "currentPromptId": None,
+            "completedAt": None,
+            "closedAt": None,
+        }
+        atomic_write(queue_file, data)
+        print("STOP")
+        sys.exit(0)
 
-# Step 1b: Track completedAt when all prompts are done
-all_done = all(p.get("status") == "completed" for p in prompts) and len(prompts) > 0
-if all_done and not data.get("completedAt"):
-    data["completedAt"] = now
-
-# Step 1c: Update sessionName if still null
-if not data.get("sessionName"):
-    data["sessionName"] = extract_session_name(transcript_path)
-
-# Step 2: Find the first "pending" prompt
-next_prompt = None
-for p in prompts:
-    if p.get("status") == "pending":
-        next_prompt = p
-        break
+    try:
+        with open(queue_file, "r") as f:
+            data = json.load(f)
+    except (json.JSONDecodeError, IOError):
+        print("0")
+        sys.exit(0)
 
-# Step 3: Update session tracking
-data["lastActivity"] = now
+    prompts = data.get("prompts", [])
+    now = datetime.now(timezone.utc).isoformat()
 
-if next_prompt is None:
+    # Step 1: Mark any currently "running" prompts as "completed"
+    for p in prompts:
+        if p.get("status") == "running":
+            p["status"] = "completed"
+            p["completedAt"] = now
+
+    # Step 1b: Track completedAt when all prompts are done
+    all_done = all(p.get("status") == "completed" for p in prompts) and len(prompts) > 0
+    if all_done and not data.get("completedAt"):
+        data["completedAt"] = now
+
+    # Step 1c: Update sessionName if still null
+    if not data.get("sessionName"):
+        data["sessionName"] = extract_session_name(transcript_path)
+
+    # Step 2: Find the first "pending" prompt
+    next_prompt = None
+    for p in prompts:
+        if p.get("status") == "pending":
+            next_prompt = p
+            break
+
+    # Step 3: Update session tracking
+    data["lastActivity"] = now
+
+    if next_prompt is None:
+        data["prompts"] = prompts
+        data["currentPromptId"] = None
+        atomic_write(queue_file, data)
+        print("STOP")
+        sys.exit(0)
+
+    # We have a pending prompt -> mark it as running
+    next_prompt["status"] = "running"
+    data["currentPromptId"] = next_prompt["id"]
     data["prompts"] = prompts
-    data["currentPromptId"] = None
-    atomic_write(queue_file, data)
-    print("STOP")
-    sys.exit(0)
-
-# We have a pending prompt -> mark it as running
-next_prompt["status"] = "running"
-data["currentPromptId"] = next_prompt["id"]
-data["prompts"] = prompts
 
-atomic_write(queue_file, data)
+    atomic_write(queue_file, data)
 
-# Count remaining pending prompts (excluding the one we just took)
-remaining = sum(1 for p in prompts if p.get("status") == "pending")
+    # Count remaining pending prompts (excluding the one we just took)
+    remaining = sum(1 for p in prompts if p.get("status") == "pending")
 
-reason = f"PromptLine ({remaining} queued)\n\n{next_prompt['text']}"
-decision = {"decision": "block", "reason": reason}
-print("CONTINUE")
-print(json.dumps(decision))
+    reason = f"PromptLine ({remaining} queued)\n\n{next_prompt['text']}"
+    decision = {"decision": "block", "reason": reason}
+    print("CONTINUE")
+    print(json.dumps(decision))
+finally:
+    release_lock(lock_path)
 PYEOF
 )
 

package/src/backend/queue-store.ts

@@ -1,9 +1,48 @@
-import { mkdirSync, readFileSync, writeFileSync, readdirSync, unlinkSync, renameSync, rmSync } from 'node:fs';
+import { mkdirSync, readFileSync, writeFileSync, readdirSync, unlinkSync, renameSync, rmSync, openSync, closeSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import type { SessionQueue, Prompt, PromptStatus, SessionStatus, QueueStatus, ProjectView, SessionWithStatus } from '../types/queue.ts';
 
 export const SESSION_ACTIVE_TIMEOUT_MS = 60_000;
 export const SESSION_ABANDONED_TIMEOUT_MS = 24 * 60 * 60_000; // 24h safety net
+const LOCK_STALE_MS = 10_000;
+
+function acquireLockSync(lockPath: string): void {
+  for (let i = 0; i < 100; i++) {
+    try {
+      const fd = openSync(lockPath, 'wx');
+      closeSync(fd);
+      return;
+    } catch (err: unknown) {
+      if ((err as NodeJS.ErrnoException).code !== 'EEXIST') throw err;
+      try {
+        if (Date.now() - statSync(lockPath).mtimeMs > LOCK_STALE_MS) {
+          unlinkSync(lockPath);
+          continue;
+        }
+      } catch { continue; }
+      const end = Date.now() + 10;
+      while (Date.now() < end) { /* spin */ }
+    }
+  }
+  try { unlinkSync(lockPath); } catch { /* ignore */ }
+}
+
+function releaseLockSync(lockPath: string): void {
+  try { unlinkSync(lockPath); } catch { /* ignore */ }
+}
+
+export function withSessionLock<T>(
+  queuesDir: string, project: string, sessionId: string,
+  fn: () => T,
+): T {
+  const lockPath = sessionPath(queuesDir, project, sessionId) + '.lock';
+  acquireLockSync(lockPath);
+  try {
+    return fn();
+  } finally {
+    releaseLockSync(lockPath);
+  }
+}
 
 export function ensureProjectDir(queuesDir: string, project: string): void {
   mkdirSync(join(queuesDir, project), { recursive: true });

package/vite-plugin-api.ts

@@ -19,6 +19,7 @@ import {
   deletePrompt,
   clearPrompts,
   reorderPrompts,
+  withSessionLock,
 } from './src/backend/queue-store.ts';
 
 const QUEUES_DIR = join(homedir(), '.promptline', 'queues');
@@ -232,8 +233,6 @@ async function handleApi(
   ) {
     const project = segments[1];
     const sessionId = segments[3];
-    const session = readSession(QUEUES_DIR, project, sessionId);
-    if (!session) return jsonError(res, 404, 'Session not found');
 
     const body = await parseBody(req);
     const order = body.order as string[] | undefined;
@@ -241,11 +240,16 @@ async function handleApi(
       return jsonError(res, 400, 'Field "order" (string[]) is required');
     }
 
-    const error = reorderPrompts(session, order);
-    if (error) return jsonError(res, 400, error);
+    return withSessionLock(QUEUES_DIR, project, sessionId, () => {
+      const session = readSession(QUEUES_DIR, project, sessionId);
+      if (!session) return jsonError(res, 404, 'Session not found');
+
+      const error = reorderPrompts(session, order);
+      if (error) return jsonError(res, 400, error);
 
-    writeSession(QUEUES_DIR, project, session);
-    return json(res, 200, session);
+      writeSession(QUEUES_DIR, project, session);
+      return json(res, 200, session);
+    });
   }
 
   // /api/projects/:project/sessions/:sessionId/prompts/:promptId
@@ -256,8 +260,6 @@ async function handleApi(
     const project = segments[1];
     const sessionId = segments[3];
     const promptId = segments[5];
-    const session = readSession(QUEUES_DIR, project, sessionId);
-    if (!session) return jsonError(res, 404, 'Session not found');
 
     if (method === 'PATCH') {
       const body = await parseBody(req);
@@ -274,19 +276,29 @@ async function handleApi(
         updates.status = body.status as PromptStatus;
       }
 
-      const updated = updatePrompt(session, promptId, updates);
-      if (!updated) return jsonError(res, 404, `Prompt "${promptId}" not found`);
+      return withSessionLock(QUEUES_DIR, project, sessionId, () => {
+        const session = readSession(QUEUES_DIR, project, sessionId);
+        if (!session) return jsonError(res, 404, 'Session not found');
 
-      writeSession(QUEUES_DIR, project, session);
-      return json(res, 200, updated);
+        const updated = updatePrompt(session, promptId, updates);
+        if (!updated) return jsonError(res, 404, `Prompt "${promptId}" not found`);
+
+        writeSession(QUEUES_DIR, project, session);
+        return json(res, 200, updated);
+      });
     }
 
     if (method === 'DELETE') {
-      const removed = deletePrompt(session, promptId);
-      if (!removed) return jsonError(res, 404, `Prompt "${promptId}" not found`);
+      return withSessionLock(QUEUES_DIR, project, sessionId, () => {
+        const session = readSession(QUEUES_DIR, project, sessionId);
+        if (!session) return jsonError(res, 404, 'Session not found');
 
-      writeSession(QUEUES_DIR, project, session);
-      return json(res, 200, removed);
+        const removed = deletePrompt(session, promptId);
+        if (!removed) return jsonError(res, 404, `Prompt "${promptId}" not found`);
+
+        writeSession(QUEUES_DIR, project, session);
+        return json(res, 200, removed);
+      });
     }
 
     return jsonError(res, 405, `Method ${method} not allowed`);
@@ -299,12 +311,15 @@ async function handleApi(
   ) {
     const project = segments[1];
     const sessionId = segments[3];
-    const session = readSession(QUEUES_DIR, project, sessionId);
-    if (!session) return jsonError(res, 404, 'Session not found');
 
-    const removed = clearPrompts(session);
-    writeSession(QUEUES_DIR, project, session);
-    return json(res, 200, { cleared: removed.length });
+    return withSessionLock(QUEUES_DIR, project, sessionId, () => {
+      const session = readSession(QUEUES_DIR, project, sessionId);
+      if (!session) return jsonError(res, 404, 'Session not found');
+
+      const removed = clearPrompts(session);
+      writeSession(QUEUES_DIR, project, session);
+      return json(res, 200, { cleared: removed.length });
+    });
   }
 
   // /api/projects/:project/sessions/:sessionId/prompts
@@ -314,17 +329,20 @@ async function handleApi(
   ) {
     const project = segments[1];
     const sessionId = segments[3];
-    const session = readSession(QUEUES_DIR, project, sessionId);
-    if (!session) return jsonError(res, 404, 'Session not found');
 
     const body = await parseBody(req);
     if (!body.text || typeof body.text !== 'string') {
       return jsonError(res, 400, 'Field "text" (string) is required');
     }
 
-    const prompt = addPrompt(session, uuidv4(), body.text as string);
-    writeSession(QUEUES_DIR, project, session);
-    return json(res, 201, prompt);
+    return withSessionLock(QUEUES_DIR, project, sessionId, () => {
+      const session = readSession(QUEUES_DIR, project, sessionId);
+      if (!session) return jsonError(res, 404, 'Session not found');
+
+      const prompt = addPrompt(session, uuidv4(), body.text as string);
+      writeSession(QUEUES_DIR, project, session);
+      return json(res, 201, prompt);
+    });
   }
 
   return jsonError(res, 404, 'Not found');