@dfosco/storyboard 0.5.0-alpha.5 → 0.5.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dfosco/storyboard",
-  "version": "0.5.0-alpha.5",
+  "version": "0.5.0-alpha.7",
   "type": "module",
   "license": "MIT",
   "description": "Storyboard prototyping framework — core engine, React integration, and canvas",

package/src/core/cli/index.js

@@ -123,6 +123,8 @@ function helpScreen(version) {
     cmd('branch', 'Switch to a branch (interactive worktree guide)'),
     cmd('branch <name>', 'Switch to a specific branch directly'),
     cmd('branch --worktree=<name>', 'Non-interactive branch switch'),
+    cmd('pull', 'Pull latest changes from remote (untracked-safe)'),
+    cmd('publish', 'Push local commits to remote (pulls first)'),
     cmd('proxy start', 'Start or reload Caddy proxy'),
     cmd('proxy close', 'Stop Caddy proxy'),
     '',
@@ -152,6 +154,12 @@ switch (command) {
   case 'branch':
     import('./branch.js')
     break
+  case 'pull':
+    import('./pull.js')
+    break
+  case 'publish':
+    import('./publish.js')
+    break
   case 'proxy':
     import('./proxy.js')
     break

package/src/core/cli/publish.js

@@ -0,0 +1,148 @@
+/**
+ * storyboard publish — Push local commits to the remote branch (untracked-safe).
+ *
+ * Deterministic flow (no AI):
+ *   1. Stash uncommitted work (including untracked files)
+ *   2. Pull --rebase from origin (stay up to date)
+ *   3. If conflict: abort rebase, restore stash, inform user
+ *   4. Push to origin
+ *   5. Re-apply stash
+ *
+ * Usage:
+ *   npx storyboard publish
+ *   npx sb publish
+ */
+
+import * as p from '@clack/prompts'
+import { execFileSync } from 'child_process'
+import { detectWorktreeName, worktreeDir, repoRoot } from '../worktree/port.js'
+import { hasUncommittedChanges } from './dev-helpers.js'
+import { dim, green, bold } from './intro.js'
+
+function currentBranch(cwd) {
+  try {
+    return execFileSync('git', ['branch', '--show-current'], { cwd, encoding: 'utf8' }).trim()
+  } catch {
+    return 'unknown'
+  }
+}
+
+function hasUnpushedCommits(cwd, branch) {
+  try {
+    const count = execFileSync(
+      'git', ['rev-list', '--count', `origin/${branch}..${branch}`],
+      { cwd, encoding: 'utf8' }
+    ).trim()
+    return parseInt(count, 10) > 0
+  } catch {
+    // Remote branch may not exist yet — that's fine, we'll push anyway
+    return true
+  }
+}
+
+p.intro('storyboard publish')
+
+const wtName = detectWorktreeName()
+const root = repoRoot()
+const cwd = wtName === 'main' ? root : worktreeDir(wtName)
+const branch = currentBranch(cwd)
+
+p.log.info(`Branch: ${bold(branch)}`)
+
+// 1. Stash uncommitted work (including untracked files)
+let stashSha = null
+if (hasUncommittedChanges(cwd)) {
+  const ts = new Date().toISOString().replace(/[:.]/g, '-')
+  const message = `publish-stash-${branch}-${ts}`
+  p.log.step('Stashing uncommitted work…')
+  try {
+    execFileSync('git', ['stash', 'push', '-u', '-m', message], { cwd, stdio: 'pipe' })
+    stashSha = execFileSync('git', ['stash', 'list', '--format=%H', '-1'], { cwd, encoding: 'utf8' }).trim()
+    p.log.success(`Work stashed: ${dim(message)}`)
+  } catch {
+    p.log.warning('Could not stash changes — proceeding anyway')
+  }
+}
+
+// 2. Pull --rebase from origin first
+const pullSpin = p.spinner()
+pullSpin.start('Pulling latest from remote…')
+
+try {
+  execFileSync('git', ['pull', '--rebase', 'origin', branch], { cwd, stdio: 'pipe' })
+  pullSpin.stop('Up to date with origin')
+} catch {
+  pullSpin.stop('Pull failed — conflict detected')
+
+  // Abort rebase to restore clean state
+  try {
+    execFileSync('git', ['rebase', '--abort'], { cwd, stdio: 'pipe' })
+    p.log.step('Rebase aborted — working tree restored')
+  } catch {
+    // May not be in rebase state
+  }
+
+  // Re-apply stash
+  if (stashSha) {
+    try {
+      execFileSync('git', ['stash', 'apply', stashSha], { cwd, stdio: 'pipe' })
+      p.log.success('Stashed work restored')
+    } catch {
+      p.log.warning(`Could not restore stash — find it with: ${dim('git stash list')}`)
+    }
+  }
+
+  p.log.error('Could not publish — there are conflicts with the remote branch.')
+  p.log.info('')
+  p.log.info(`  Resolve conflicts manually:`)
+  p.log.info(`    ${green('git pull --rebase origin ' + branch)}`)
+  p.log.info(`    ${dim('Fix conflicts, then:')} ${green('git rebase --continue')}`)
+  p.log.info(`    ${green('git push origin ' + branch)}`)
+  p.log.info('')
+  p.log.info(`  Or ask an agent to help resolve the conflicts.`)
+  p.outro('')
+  process.exit(1)
+}
+
+// 3. Push to origin
+const pushSpin = p.spinner()
+pushSpin.start('Publishing to remote…')
+
+try {
+  execFileSync('git', ['push', 'origin', branch], { cwd, stdio: 'pipe' })
+  pushSpin.stop('Published to origin')
+} catch (err) {
+  pushSpin.stop('Push failed')
+
+  // Re-apply stash before exiting
+  if (stashSha) {
+    try {
+      execFileSync('git', ['stash', 'apply', stashSha], { cwd, stdio: 'pipe' })
+      p.log.success('Stashed work restored')
+    } catch {
+      p.log.warning(`Could not restore stash — find it with: ${dim('git stash list')}`)
+    }
+  }
+
+  p.log.error('Could not push to remote.')
+  p.log.info('')
+  p.log.info(`  Try manually:`)
+  p.log.info(`    ${green('git push origin ' + branch)}`)
+  p.log.info('')
+  p.outro('')
+  process.exit(1)
+}
+
+// 4. Re-apply stash
+if (stashSha) {
+  try {
+    execFileSync('git', ['stash', 'apply', stashSha], { cwd, stdio: 'pipe' })
+    p.log.success('Previous work restored')
+  } catch {
+    p.log.warning('Stash apply had conflicts — resolve them manually')
+    p.log.info(`  Your work is safe in ${dim('git stash list')}`)
+  }
+}
+
+p.log.success(`${bold(branch)} published to origin`)
+p.outro('')

package/src/core/cli/pull.js

@@ -0,0 +1,109 @@
+/**
+ * storyboard pull — Pull latest changes from remote (untracked-safe).
+ *
+ * Deterministic flow (no AI):
+ *   1. Stash uncommitted work (including untracked files)
+ *   2. Pull --rebase from origin
+ *   3. If conflict: abort rebase, restore stash, inform user
+ *   4. If clean: re-apply stash
+ *
+ * Usage:
+ *   npx storyboard pull
+ *   npx sb pull
+ */
+
+import * as p from '@clack/prompts'
+import { execFileSync } from 'child_process'
+import { detectWorktreeName, worktreeDir, repoRoot } from '../worktree/port.js'
+import { hasUncommittedChanges } from './dev-helpers.js'
+import { dim, green, bold } from './intro.js'
+
+function currentBranch(cwd) {
+  try {
+    return execFileSync('git', ['branch', '--show-current'], { cwd, encoding: 'utf8' }).trim()
+  } catch {
+    return 'unknown'
+  }
+}
+
+p.intro('storyboard pull')
+
+const wtName = detectWorktreeName()
+const root = repoRoot()
+const cwd = wtName === 'main' ? root : worktreeDir(wtName)
+const branch = currentBranch(cwd)
+
+p.log.info(`Branch: ${bold(branch)}`)
+
+// 1. Stash uncommitted work (including untracked files)
+let stashSha = null
+if (hasUncommittedChanges(cwd)) {
+  const ts = new Date().toISOString().replace(/[:.]/g, '-')
+  const message = `pull-stash-${branch}-${ts}`
+  p.log.step('Stashing uncommitted work…')
+  try {
+    execFileSync('git', ['stash', 'push', '-u', '-m', message], { cwd, stdio: 'pipe' })
+    stashSha = execFileSync('git', ['stash', 'list', '--format=%H', '-1'], { cwd, encoding: 'utf8' }).trim()
+    p.log.success(`Work stashed: ${dim(message)}`)
+  } catch {
+    p.log.warning('Could not stash changes — proceeding anyway')
+  }
+}
+
+// 2. Pull --rebase from origin
+const spin = p.spinner()
+spin.start('Pulling latest changes…')
+
+let pullFailed = false
+try {
+  execFileSync('git', ['pull', '--rebase', 'origin', branch], { cwd, stdio: 'pipe' })
+  spin.stop('Up to date with origin')
+} catch (err) {
+  spin.stop('Pull failed — conflict detected')
+  pullFailed = true
+
+  // 3. Abort the rebase to restore clean state
+  try {
+    execFileSync('git', ['rebase', '--abort'], { cwd, stdio: 'pipe' })
+    p.log.step('Rebase aborted — working tree restored')
+  } catch {
+    // May not be in rebase state
+  }
+
+  // Re-apply stash if we stashed
+  if (stashSha) {
+    try {
+      execFileSync('git', ['stash', 'apply', stashSha], { cwd, stdio: 'pipe' })
+      p.log.success('Stashed work restored')
+    } catch {
+      p.log.warning(`Could not restore stash — find it with: ${dim('git stash list')}`)
+    }
+  }
+
+  p.log.error('Could not pull — there are conflicts with the remote branch.')
+  p.log.info('')
+  p.log.info(`  Resolve conflicts manually:`)
+  p.log.info(`    ${green('git pull --rebase origin ' + branch)}`)
+  p.log.info(`    ${dim('Fix conflicts, then:')} ${green('git rebase --continue')}`)
+  p.log.info('')
+  p.log.info(`  Or ask an agent to help resolve the conflicts.`)
+  p.outro('')
+  process.exit(1)
+}
+
+// 4. Re-apply stash
+if (stashSha) {
+  try {
+    execFileSync('git', ['stash', 'apply', stashSha], { cwd, stdio: 'pipe' })
+    p.log.success('Previous work restored')
+  } catch {
+    p.log.warning('Stash apply had conflicts — resolve them manually')
+    p.log.info(`  Your work is safe in ${dim('git stash list')}`)
+  }
+}
+
+if (!pullFailed) {
+  p.log.success(`${bold(branch)} is up to date`)
+}
+
+p.outro('')

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

@@ -393,16 +393,16 @@ async function welcomeLoop() {
 
     // Build the first option based on number of configured agents
     const agentOption = agents.length > 1
-      ? { value: 'agents', label: '✦ Start a new agent session' }
-      : { value: 'copilot', label: `✦ Start a new ${agents[0]?.label || 'Copilot'} session` }
+      ? { value: 'agents', label: '> Start a new agent session' }
+      : { value: 'copilot', label: `> Start a new ${agents[0]?.label || 'Copilot'} session` }
 
     drainStdin()
     const action = await p.select({
       message: 'How would you like to start?',
       options: [
         agentOption,
-        { value: 'shell', label: '▸ Start a new terminal session' },
-        { value: 'sessions', label: '⊞ Browse existing sessions' },
+        { value: 'shell', label: '> Start a new terminal session' },
+        { value: 'sessions', label: '> Browse existing sessions' },
       ],
     })
 
@@ -418,7 +418,7 @@ async function welcomeLoop() {
         message: 'Which agent?',
         options: agents.map(a => ({
           value: a.id,
-          label: `✦ Start a new ${a.label} session`,
+          label: `> Start a new ${a.label} session`,
         })),
       })
 
@@ -461,9 +461,9 @@ async function welcomeLoop() {
       const sessionOptions = [
         ...resumableAgents.map(a => ({
           value: `agent:${a.id}`,
-          label: `✦ ${a.label} sessions`,
+          label: `> ${a.label} sessions`,
         })),
-        { value: 'terminal', label: '⊞ Terminal sessions' },
+        { value: 'terminal', label: '> Terminal sessions' },
       ]
 
       drainStdin()

package/src/internals/CommandPalette/CommandPalette.jsx

@@ -1213,6 +1213,7 @@ export default function StoryboardCommandPalette({ basePath }) {
         }}
       >
       <Command.Input
+        autoFocus
         placeholder={activePage === 'root'
           ? 'Search commands, prototypes, canvases, stories...'
           : `Search ${toolMenus.find(m => m.id === activePage)?.label || ''}...`