@jxtools/promptline 1.3.13 → 1.3.15

package/bin/promptline.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { existsSync, readFileSync, writeFileSync, copyFileSync, chmodSync } from 'fs'
+import { existsSync, readFileSync, writeFileSync, copyFileSync, chmodSync, readdirSync, mkdirSync, renameSync, unlinkSync } from 'fs'
 import { resolve, dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 import { spawn, execSync } from 'child_process'
@@ -94,11 +94,59 @@ vite.stderr.on('data', (data) => {
 vite.on('close', (code) => process.exit(code ?? 0))
 
 process.on('SIGINT', () => {
+  cancelAllPendingPrompts()
   vite.kill('SIGINT')
   console.log('\n\x1b[33m⏹\x1b[0m PromptLine stopped.')
   process.exit(0)
 })
 
+// --- Cleanup ---
+
+function cancelAllPendingPrompts() {
+  const queuesDir = join(homedir(), '.promptline', 'queues')
+  let projectDirs
+  try {
+    projectDirs = readdirSync(queuesDir, { withFileTypes: true }).filter(d => d.isDirectory())
+  } catch {
+    return
+  }
+
+  const now = new Date().toISOString()
+  for (const dir of projectDirs) {
+    const projectPath = join(queuesDir, dir.name)
+    let files
+    try {
+      files = readdirSync(projectPath).filter(f => f.endsWith('.json'))
+    } catch {
+      continue
+    }
+
+    for (const file of files) {
+      const filePath = join(projectPath, file)
+      try {
+        const data = JSON.parse(readFileSync(filePath, 'utf-8'))
+        if (data.closedAt) continue
+        let changed = false
+        for (const p of data.prompts || []) {
+          if (p.status === 'pending' || p.status === 'running') {
+            p.status = 'cancelled'
+            p.completedAt = now
+            changed = true
+          }
+        }
+        if (changed) {
+          data.lastActivity = now
+          const tmpPath = `${filePath}.tmp.${process.pid}`
+          writeFileSync(tmpPath, JSON.stringify(data, null, 2))
+          renameSync(tmpPath, filePath)
+        }
+      } catch {
+        continue
+      }
+    }
+  }
+}
+
 // --- Helpers ---
 
 function installHooks() {

package/package.json

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

package/promptline-prompt-queue.sh

@@ -176,7 +176,7 @@ try:
             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
+    all_done = all(p.get("status") in ("completed", "cancelled") for p in prompts) and len(prompts) > 0
     if all_done and not data.get("completedAt"):
         data["completedAt"] = now
 

package/promptline-session-end.sh

@@ -51,9 +51,14 @@ def atomic_write(path, obj):
         except OSError: pass
         raise
 
-def close_session(path, now):
-    with open(path, "r") as f:
-        data = json.load(f)
+def close_session(path, now, data=None):
+    if data is None:
+        with open(path, "r") as f:
+            data = json.load(f)
+    for p in data.get("prompts", []):
+        if p.get("status") in ("pending", "running"):
+            p["status"] = "cancelled"
+            p["completedAt"] = now
     data["closedAt"] = now
     data["lastActivity"] = now
     atomic_write(path, data)
@@ -80,10 +85,7 @@ for project_dir in glob.glob(os.path.join(queues_base, "*")):
                 data = json.load(f)
             if data.get("closedAt") is not None:
                 continue
-            has_pending = any(p.get("status") in ("pending", "running") for p in data.get("prompts", []))
-            if has_pending:
-                continue
-            close_session(path, now)
+            close_session(path, now, data)
         except (json.JSONDecodeError, IOError, OSError):
             continue
 

package/src/backend/queue-store.ts

@@ -3,8 +3,7 @@ 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_EMPTY_IDLE_TIMEOUT_MS = SESSION_ACTIVE_TIMEOUT_MS;
-export const SESSION_ABANDONED_TIMEOUT_MS = 24 * 60 * 60_000; // 24h safety net
+export const SESSION_ABANDONED_TIMEOUT_MS = 24 * 60 * 60_000;
 const LOCK_STALE_MS = 10_000;
 
 function acquireLockSync(lockPath: string): void {
@@ -92,9 +91,6 @@ export function withComputedStatus(session: SessionQueue): SessionQueue & { stat
 export function isSessionVisible(session: SessionQueue, now: number = Date.now()): boolean {
   if (hasPendingWork(session)) return true;
   if (session.closedAt != null) return false;
-  if (session.prompts.length === 0 && msSinceLastActivity(session, now) > SESSION_EMPTY_IDLE_TIMEOUT_MS) {
-    return false;
-  }
   const msSinceStart = now - new Date(session.startedAt).getTime();
   return msSinceStart <= SESSION_ABANDONED_TIMEOUT_MS;
 }
@@ -123,7 +119,7 @@ export function loadProjectView(queuesDir: string, project: string): ProjectView
 
   const hasPrompts = sessions.some(s => s.prompts.length > 0);
   const allCompleted = hasPrompts && sessions.every(s =>
-    s.prompts.length > 0 && s.prompts.every(p => p.status === 'completed')
+    s.prompts.length > 0 && s.prompts.every(p => p.status === 'completed' || p.status === 'cancelled')
   );
   const queueStatus: QueueStatus = allCompleted ? 'completed' : hasPrompts ? 'active' : 'empty';
 
@@ -178,7 +174,7 @@ export function updatePrompt(
   }
   if (updates.status !== undefined) {
     session.prompts[idx].status = updates.status;
-    if (updates.status === 'completed') {
+    if (updates.status === 'completed' || updates.status === 'cancelled') {
       session.prompts[idx].completedAt = new Date().toISOString();
     }
   }

package/src/components/PromptCard.tsx

@@ -32,6 +32,11 @@ const STATUS_STYLES: Record<Prompt['status'], { color: string; badge: string; la
     badge: 'bg-[var(--color-completed)]/15 text-[var(--color-completed)]',
     label: 'completed',
   },
+  cancelled: {
+    color: 'var(--color-cancelled)',
+    badge: 'bg-[var(--color-cancelled)]/15 text-[var(--color-cancelled)]',
+    label: 'cancelled',
+  },
 };
 
 export function PromptCard({
@@ -52,7 +57,7 @@ export function PromptCard({
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 
   const styles = STATUS_STYLES[prompt.status];
-  const isCompleted = prompt.status === 'completed';
+  const isDone = prompt.status === 'completed' || prompt.status === 'cancelled';
   const isPending = prompt.status === 'pending';
   const isRunning = prompt.status === 'running';
 
@@ -167,7 +172,7 @@ export function PromptCard({
         className={[
           'flex gap-0 bg-white/5 backdrop-blur-sm border border-white/10 rounded-lg overflow-hidden',
           'transition-all duration-150',
-          isCompleted ? 'opacity-60' : '',
+          isDone ? 'opacity-60' : '',
           isPending && !editing ? 'cursor-pointer hover:border-white/20 hover:bg-white/8' : '',
           isRunning ? 'border-l-0' : '',
           isDragging ? 'opacity-40 scale-[0.98]' : '',

package/src/components/SessionSection.tsx

@@ -46,8 +46,8 @@ export function SessionSection({ session, project, onMutate, defaultExpanded = t
     }
   }
 
-  const activePrompts = session.prompts.filter(p => p.status !== 'completed');
-  const completedPrompts = session.prompts.filter(p => p.status === 'completed').reverse();
+  const activePrompts = session.prompts.filter(p => p.status !== 'completed' && p.status !== 'cancelled');
+  const donePrompts = session.prompts.filter(p => p.status === 'completed' || p.status === 'cancelled').reverse();
   const pendingCount = session.prompts.filter(p => p.status === 'pending').length;
 
   const displayName = session.sessionName || '(session)';
@@ -168,7 +168,7 @@ export function SessionSection({ session, project, onMutate, defaultExpanded = t
       {/* Session content */}
       {expanded && (
         <div className="px-4 pb-4 space-y-2">
-          {activePrompts.length === 0 && completedPrompts.length === 0 && (
+          {activePrompts.length === 0 && donePrompts.length === 0 && (
             <p className="text-xs text-[var(--color-muted)] py-2">No prompts yet</p>
           )}
 
@@ -180,9 +180,9 @@ export function SessionSection({ session, project, onMutate, defaultExpanded = t
 
           <AddPromptForm project={project} sessionId={session.sessionId} onAdded={onMutate} />
 
-          {completedPrompts.length > 0 && (
+          {donePrompts.length > 0 && (
             <div className="pt-1 space-y-2 opacity-60" role="list" aria-label="Completed prompts">
-              {renderPromptList(completedPrompts, false)}
+              {renderPromptList(donePrompts, false)}
             </div>
           )}
         </div>

package/src/index.css

@@ -11,6 +11,7 @@
   --color-pending: #60a5fa;
   --color-idle: #f472b6;
   --color-completed: #34d399;
+  --color-cancelled: #f87171;
 }
 
 html {

package/src/types/queue.ts

@@ -1,4 +1,4 @@
-export type PromptStatus = 'pending' | 'running' | 'completed';
+export type PromptStatus = 'pending' | 'running' | 'completed' | 'cancelled';
 export type SessionStatus = 'active' | 'idle';
 export type QueueStatus = 'active' | 'completed' | 'empty';
 

package/vite-plugin-api.ts

@@ -269,7 +269,7 @@ async function handleApi(
         updates.text = body.text as string;
       }
       if (body.status !== undefined) {
-        const validStatuses: PromptStatus[] = ['pending', 'running', 'completed'];
+        const validStatuses: PromptStatus[] = ['pending', 'running', 'completed', 'cancelled'];
         if (!validStatuses.includes(body.status as PromptStatus)) {
           return jsonError(res, 400, `Invalid status. Must be one of: ${validStatuses.join(', ')}`);
         }