@dfosco/storyboard 0.6.0-beta.13 → 0.6.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dfosco/storyboard",
-  "version": "0.6.0-beta.13",
+  "version": "0.6.0-beta.14",
   "type": "module",
   "license": "MIT",
   "description": "Storyboard prototyping framework — core engine, React integration, and canvas",

package/src/core/canvas/agent-session.js

@@ -226,7 +226,12 @@ export function buildResumeStartupCommand({ startupCommand, sessionId, agentCfg
     : `${cmd} || { ${notice}; ${startupCommand}; }`
 
   // Primary: per-widget captured sessionId → `resumeCommand` with {id}.
-  if (sessionId && isResumableSessionId(sessionId, agentCfg)) {
+  // We attempt resume whenever a UUID-shaped id is stored, even if the
+  // agent's local session-state directory has been GC'd / moved — the
+  // shell-level `|| <fresh fallback>` wrapper handles CLI rejection
+  // gracefully. This makes resume robust across `tmux kill-server`,
+  // disk cleanups, and machine moves.
+  if (sessionId && UUID_RE.test(sessionId)) {
     const template = agentCfg?.resumeCommand
     if (template && template.includes('{id}')) {
       return wrapFallback(template.replace('{id}', sessionId))
@@ -235,9 +240,7 @@ export function buildResumeStartupCommand({ startupCommand, sessionId, agentCfg
 
   // Fallback: agents like Codex provide a `resumeLastCommand` that
   // resumes the most recent session in the current cwd without needing
-  // a captured id (e.g. `codex resume --last`). Useful when the agent's
-  // sessionStart hook requires manual trust before it can capture ids
-  // (Codex case — hook needs `/hooks` approval).
+  // a captured id (e.g. `codex resume --last`).
   const lastCmd = agentCfg?.resumeLastCommand
   if (lastCmd) return wrapFallback(lastCmd)
 

package/src/core/cli/dev.js

@@ -323,18 +323,30 @@ async function main() {
     setTimeout(() => { renderOnce() }, 8000).unref?.()
   }
 
+  let shuttingDown = false
   function shutdown() {
+    if (shuttingDown) {
+      // Second Ctrl+C → hard exit, kill child with SIGKILL.
+      try { child.kill('SIGKILL') } catch { /* empty */ }
+      process.exit(130)
+    }
+    shuttingDown = true
     clearInterval(compactInterval)
     renameWatcher.close()
     // Suppress Vite's shutdown-time esbuild noise ("Pre-transform error:
-    // The service was stopped" for every in-flight transform).
+    // The service was stopped" for every in-flight transform) AND the
+    // orphan-archive log spam from the storyboard-server plugin teardown.
     try { child.stdout?.removeAllListeners('data') } catch { /* empty */ }
     try { child.stderr?.removeAllListeners('data') } catch { /* empty */ }
     try { child.stdout?.destroy() } catch { /* empty */ }
     try { child.stderr?.destroy() } catch { /* empty */ }
-    // SIGINT lets Vite shut down esbuild and HMR cleanly; SIGTERM is harsher
-    // and tends to leave in-flight transforms aborting noisily.
+    // SIGINT first (clean esbuild shutdown), then SIGTERM after 2s if
+    // Vite is still alive (handles plugins that loop on session teardown),
+    // then SIGKILL after 5s as last resort.
     try { child.kill('SIGINT') } catch { /* already dead */ }
+    const term = setTimeout(() => { try { child.kill('SIGTERM') } catch { /* empty */ } }, 2000)
+    const kill = setTimeout(() => { try { child.kill('SIGKILL') } catch { /* empty */ } }, 5000)
+    term.unref?.(); kill.unref?.()
     releasePort(worktreeName)
   }
   process.on('SIGINT', shutdown)