@dfosco/storyboard 0.6.1-beta.0 → 0.6.2

package/package.json

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

package/src/core/canvas/terminal-server.js

@@ -1194,34 +1194,6 @@ function handleConnection(ws, widgetId, canvasId, prettyName, widgetStartupComma
         // via a watcher on the pool-keyed capture file — copilot's env is
         // pool-keyed for the life of the warm process, so the user-level
         // hook always writes there, not to the widget-keyed file.)
-        //
-        // Also write the per-widget env.sh here so any future shells in
-        // the session inherit the correct STORYBOARD_WIDGET_ID. Note: the
-        // already-running TUI's process env is fixed at fork time and
-        // still carries the pool id; CLI commands that need the real
-        // widget id should use resolveWidgetId() (which falls back to
-        // .storyboard/terminal-sessions.json keyed by tmux session name).
-        try {
-          const envParts = [
-            `export STORYBOARD_WIDGET_ID="${widgetId}"`,
-            `export STORYBOARD_CANVAS_ID="${canvasId}"`,
-            `export STORYBOARD_BRANCH="${branch}"`,
-            `export STORYBOARD_SERVER_URL="${serverUrl}"`,
-            `export STORYBOARD_PROJECT_ROOT="${cwd}"`,
-          ]
-          const envScriptDir = join(cwd, '.storyboard', 'terminals')
-          mkdirSync(envScriptDir, { recursive: true })
-          writeFileSync(join(envScriptDir, `${widgetId}.env.sh`), envParts.join('\n') + '\n')
-          // Update tmux session env so newly-forked shells see the right id.
-          execSync(
-            `tmux set-environment -t "${tmuxName}" STORYBOARD_WIDGET_ID "${widgetId}" 2>/dev/null`,
-            { stdio: 'ignore' }
-          )
-          execSync(
-            `tmux set-environment -t "${tmuxName}" STORYBOARD_CANVAS_ID "${canvasId}" 2>/dev/null`,
-            { stdio: 'ignore' }
-          )
-        } catch { /* empty */ }
         const postStartup = resolvedAgentCfg?.postStartup || null
         // ── H2 fix: skip readiness re-poll on warm handoff.
         // The hot pool already verified readiness when it warmed this session.

package/src/core/cli/hubCommands.js

@@ -16,7 +16,6 @@
  */
 
 import { parseSimpleArgs, jsonOut, die, post, get } from './cliHelpers.js'
-import { resolveWidgetId } from './resolveWidgetId.js'
 
 const sub = process.argv[3]
 const sub2 = process.argv[4]
@@ -85,7 +84,7 @@ async function run() {
 
     case 'goal': {
       const hubId = flags.hub
-      const senderId = resolveWidgetId(flags.sender)
+      const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
       const goal = flags.goal || positional[0]
       if (!hubId || !senderId || !goal) die('--hub, --sender, and --goal are required')
       const data = await post(`${MESSAGING_BASE}/hub/goal`, { hubId, senderId, goal })
@@ -95,7 +94,7 @@ async function run() {
 
     case 'send': {
       const hubId = flags.hub
-      const senderId = resolveWidgetId(flags.sender)
+      const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
       const body = flags.body || positional[0]
       if (!hubId || !senderId || !body) die('--hub, --sender, and --body are required')
       const payload = { hubId, senderId, body }
@@ -112,7 +111,7 @@ async function run() {
     case 'respond': {
       const hubId = flags.hub
       const messageId = flags.message
-      const widgetId = resolveWidgetId(flags.widget)
+      const widgetId = flags.widget || process.env.STORYBOARD_WIDGET_ID
       const body = flags.body || positional[0]
       if (!hubId || !messageId || !widgetId || !body) die('--hub, --message, --widget, and --body are required')
       const data = await post(`${MESSAGING_BASE}/hub/respond`, { hubId, messageId, widgetId, body })
@@ -161,13 +160,13 @@ async function run() {
 
       if (sub2 === 'start') {
         const hubId = flags.hub
-        const senderId = resolveWidgetId(flags.sender)
+        const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
         if (!hubId || !senderId) die('--hub and --sender are required')
         const data = await post(`${MESSAGING_BASE}/conversation/start`, { hubId, senderId })
         jsonOut(data)
       } else if (sub2 === 'finality') {
         const hubId = flags.hub
-        const senderId = resolveWidgetId(flags.sender)
+        const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
         const summary = flags.summary || ''
         const successor = flags.successor || null
         if (!hubId || !senderId) die('--hub and --sender are required')
@@ -175,7 +174,7 @@ async function run() {
         jsonOut(data)
       } else if (sub2 === 'reopen') {
         const hubId = flags.hub
-        const senderId = resolveWidgetId(flags.sender)
+        const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
         const conversationId = flags.conversation
         const body = flags.body || ''
         if (!hubId || !senderId || !conversationId) die('--hub, --sender, and --conversation are required')

package/src/core/cli/messagesCommands.js

@@ -9,7 +9,6 @@
  */
 
 import { parseSimpleArgs, jsonOut, die, post, get } from './cliHelpers.js'
-import { resolveWidgetId } from './resolveWidgetId.js'
 
 const sub = process.argv[3]
 const MESSAGING_BASE = '/_storyboard/messages'
@@ -48,7 +47,7 @@ async function run() {
     case 'publish': {
       const channel = flags.channel
       const type = flags.type
-      const senderId = resolveWidgetId(flags.sender)
+      const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
       if (!channel) die('--channel is required')
 
       const payload = { channel, senderId }
@@ -68,7 +67,7 @@ async function run() {
     case 'send': {
       const channel = flags.channel
       const type = flags.type
-      const senderId = resolveWidgetId(flags.sender)
+      const senderId = flags.sender || process.env.STORYBOARD_WIDGET_ID
       if (!channel) die('--channel is required')
 
       const payload = { channel, senderId }

package/src/core/cli/terminal-messaging.js

@@ -10,7 +10,6 @@
  */
 
 import { getServerUrl } from './serverUrl.js'
-import { resolveWidgetId } from './resolveWidgetId.js'
 
 function parseArgs(args) {
   const result = { positional: [], flags: {} }
@@ -36,7 +35,7 @@ export async function handleSend() {
   const { positional, flags } = parseArgs(args)
 
   // Resolve sender identity from env
-  const senderWidgetId = resolveWidgetId(null)
+  const senderWidgetId = process.env.STORYBOARD_WIDGET_ID || null
 
   let targetWidgetId = null
   let message = null
@@ -116,7 +115,7 @@ export async function handleOutput() {
   const args = process.argv.slice(4) // skip: node, sb, terminal, output
   const { flags } = parseArgs(args)
 
-  const widgetId = resolveWidgetId(flags.widget)
+  const widgetId = flags.widget || process.env.STORYBOARD_WIDGET_ID
   const summary = flags.summary || ''
   const content = flags.content || ''
 
@@ -185,7 +184,7 @@ export async function handleRead() {
   const args = process.argv.slice(4) // skip: node, sb, terminal, read
   const { positional, flags } = parseArgs(args)
 
-  const widgetId = positional[0] || resolveWidgetId(null)
+  const widgetId = positional[0] || process.env.STORYBOARD_WIDGET_ID
   if (!widgetId) {
     console.error('Usage: storyboard terminal read <widgetId> [--length N]')
     process.exit(1)

package/src/internals/vite/data-plugin.js

@@ -68,6 +68,11 @@ function parseDataFile(filePath, opts = {}) {
     const folderDirMatch = normalized.match(/(?:^|\/)src\/prototypes\/([^/]+)\.folder\//)
     const folderName = folderDirMatch ? folderDirMatch[1] : null
 
+    // Strip leading `~` from each path segment when building the public URL,
+    // so locally-gitignored canvases (e.g. ~notes.canvas.jsonl) are reachable
+    // at the same route as their non-prefixed counterpart. The on-disk `name`
+    // and `id` keep the `~` so they remain unique vs a sibling without it.
+    const stripTilde = (p) => p.split('/').map(seg => seg.replace(/^~/, '')).join('/')
     const canvasCheck = normalized.match(/(?:^|\/)src\/canvas\//)
     if (canvasCheck) {
       const dirPath = normalized.substring(0, normalized.lastIndexOf('/'))
@@ -79,7 +84,7 @@ function parseDataFile(filePath, opts = {}) {
         .replace(/\/+/g, '/')
         .replace(/\/$/, '')
       name = idBase ? `${idBase}/${baseName}` : baseName
-      inferredRoute = '/canvas/' + name
+      inferredRoute = '/canvas/' + stripTilde(name)
       inferredRoute = inferredRoute.replace(/\/+/g, '/').replace(/\/$/, '') || '/canvas'
     }
     const protoCheck = normalized.match(/(?:^|\/)src\/prototypes\//)
@@ -92,7 +97,7 @@ function parseDataFile(filePath, opts = {}) {
         .replace(/\/+/g, '/')
         .replace(/\/$/, '')
       name = idBase ? `${idBase}/${baseName}` : baseName
-      inferredRoute = '/canvas/' + name
+      inferredRoute = '/canvas/' + stripTilde(name)
       inferredRoute = inferredRoute.replace(/\/+/g, '/').replace(/\/$/, '') || '/canvas'
     }
     // Derive group: canvases sharing a directory form a group

package/src/internals/vite/data-plugin.test.js

@@ -1214,10 +1214,17 @@ describe('parseDataFile — canvas path-based IDs', () => {
     const file = parseDataFile('src/canvas/~scratch.canvas.jsonl', { includeTilde: true })
     expect(file).not.toBeNull()
     expect(file.name).toBe('~scratch')
-    expect(file.inferredRoute).toBe('/canvas/~scratch')
+    // Public route strips the `~` so locally-gitignored canvases reuse the
+    // same URL as their non-prefixed counterpart.
+    expect(file.inferredRoute).toBe('/canvas/scratch')
     const inDir = parseDataFile('src/canvas/~private/notes.canvas.jsonl', { includeTilde: true })
     expect(inDir).not.toBeNull()
     expect(inDir.name).toBe('~private/notes')
+    expect(inDir.inferredRoute).toBe('/canvas/private/notes')
+    const inSubdir = parseDataFile('src/canvas/dfosco-explorations/~notes.canvas.jsonl', { includeTilde: true })
+    expect(inSubdir).not.toBeNull()
+    expect(inSubdir.name).toBe('dfosco-explorations/~notes')
+    expect(inSubdir.inferredRoute).toBe('/canvas/dfosco-explorations/notes')
   })
 
   it('canvas outside known directories gets basename-only ID', () => {

package/src/core/cli/resolveWidgetId.js

@@ -1,79 +0,0 @@
-/**
- * resolveWidgetId — robust widget-id resolution for CLI commands invoked
- * from inside a tmux pane (typically a terminal-agent shell tool).
- *
- * Resolution order:
- *   1. Explicit argument (e.g. --widget / --sender flag)
- *   2. $STORYBOARD_WIDGET_ID_OVERRIDE (manual escape hatch)
- *   3. $STORYBOARD_WIDGET_ID — but only if it doesn't look like a hot-pool
- *      session id (e.g. "pool-copilot-1779236104099-t0pg"). Pool ids leak
- *      into the agent's env when a TUI is handed off from the hot pool;
- *      the running process's env stays pinned to the pool id even after
- *      the warm-handoff env.sh is written, so child shells (like the
- *      ones spawned by Copilot/Claude/Codex bash tools) inherit the
- *      stale id.
- *   4. Look up the current tmux session in
- *      .storyboard/terminal-sessions.json and return its bound widgetId.
- *   5. Fall back to whatever $STORYBOARD_WIDGET_ID held (even if pool-*),
- *      so behavior never gets worse than before.
- */
-
-import { readFileSync, existsSync } from 'node:fs'
-import { join } from 'node:path'
-import { execSync } from 'node:child_process'
-
-const POOL_ID_RE = /^pool-/
-
-function looksLikePoolId(value) {
-  return typeof value === 'string' && POOL_ID_RE.test(value)
-}
-
-function getCurrentTmuxSessionName() {
-  if (!process.env.TMUX) return null
-  try {
-    const out = execSync(`tmux display-message -p '#{session_name}'`, {
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      timeout: 500,
-    }).trim()
-    return out || null
-  } catch {
-    return null
-  }
-}
-
-function findWidgetIdByTmuxName(projectRoot, tmuxName) {
-  if (!projectRoot || !tmuxName) return null
-  const registryPath = join(projectRoot, '.storyboard', 'terminal-sessions.json')
-  if (!existsSync(registryPath)) return null
-  try {
-    const raw = readFileSync(registryPath, 'utf8')
-    const parsed = JSON.parse(raw)
-    const arr = Array.isArray(parsed) ? parsed : []
-    const match = arr.find((s) => s && s.tmuxName === tmuxName)
-    return match?.widgetId || null
-  } catch {
-    return null
-  }
-}
-
-/**
- * @param {string|null|undefined} explicit  — explicit override (e.g. CLI flag)
- * @returns {string|null}
- */
-export function resolveWidgetId(explicit) {
-  if (explicit) return explicit
-
-  const override = process.env.STORYBOARD_WIDGET_ID_OVERRIDE
-  if (override) return override
-
-  const envId = process.env.STORYBOARD_WIDGET_ID || null
-  if (envId && !looksLikePoolId(envId)) return envId
-
-  const tmuxName = getCurrentTmuxSessionName()
-  const projectRoot = process.env.STORYBOARD_PROJECT_ROOT || process.cwd()
-  const mapped = findWidgetIdByTmuxName(projectRoot, tmuxName)
-  if (mapped) return mapped
-
-  return envId
-}