storymode-cli 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storymode-cli",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Play AI-animated pixel art characters in your terminal",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -199,12 +199,11 @@ export async function run(args) {
       const reactive = !flags['no-reactive'];
 
       // Auto-detect graphics protocol for HD rendering
-      // iTerm2 inside tmux can't clear previous inline images (no equivalent of
-      // Kitty's a=d,d=a — \x1b[2J is intercepted by tmux, not forwarded to iTerm2).
-      // So HD only works for: Kitty/Ghostty (any context) or iTerm2 (direct, no tmux).
+      // iTerm2 inside tmux can't clear previous inline images (Kitty has a=d,d=a
+      // but iTerm2's \x1b[2J is intercepted by tmux). So for iTerm2 we use native
+      // splits (AppleScript) instead of tmux, keeping the companion process direct.
       const renderMode = detectGraphicsProtocol();
-      const useHd = renderMode.protocol === 'kitty'
-        || (renderMode.protocol === 'iterm2' && !renderMode.inTmux);
+      const useHd = !!renderMode.protocol;
       const paneWidth = useHd && size === 'full' ? 80 : size === 'full' ? 62 : size === 'tiny' ? 14 : 22;
 
       // If we're already the companion pane (spawned by tmux split), play inline
@@ -241,21 +240,50 @@ export async function run(args) {
         installHooks({ global: true });
       }
 
-      // Open tmux side pane — install tmux if needed
-      if (!await ensureTmux()) process.exit(1);
-      const inTmux = !!process.env.TMUX;
+      // Build companion command flags
       const sextantFlag = flags.sextant ? ' --sextant' : '';
       const reactiveFlag = reactive ? ' --reactive' : '';
       const noAiFlag = noAi ? ' --no-ai' : '';
       const modelFlag = model ? ` --model=${model}` : '';
-      // Enable tmux passthrough for graphics protocols when HD is active
-      const passthroughPrefix = useHd ? 'tmux set allow-passthrough on; ' : '';
-      const companionCmd = `${passthroughPrefix}STORYMODE_COMPANION=1 npx storymode-cli play ${id} --size=${size}${sextantFlag}${reactiveFlag}${noAiFlag}${modelFlag}`;
+      const companionCmd = `STORYMODE_COMPANION=1 npx --yes storymode-cli play ${id} --size=${size}${sextantFlag}${reactiveFlag}${noAiFlag}${modelFlag}`;
+
+      // iTerm2 (not in tmux): use native split to keep HD working.
+      // iTerm2 inline images can't be cleared through tmux passthrough,
+      // so we avoid tmux entirely and use AppleScript to split the pane.
+      if (renderMode.protocol === 'iterm2' && !renderMode.inTmux) {
+        try {
+          // Wrap command so errors stay visible (iTerm2 closes pane on exit)
+          const wrappedCmd = `${companionCmd} || { echo ""; echo "  Companion crashed. Press enter to close."; read; }`;
+          const escapedCmd = wrappedCmd.replace(/"/g, '\\"');
+          execSync(`osascript -e '
+            tell application "iTerm2"
+              tell current session of current tab of current window
+                set newSession to split vertically with default profile command "${escapedCmd}"
+              end tell
+            end tell
+          '`, { stdio: 'ignore' });
+          process.stderr.write(`  Companion opened in iTerm2 pane (${size} HD/${renderMode.protocol}).\n`);
+          process.stderr.write('  Close the pane or press q in it to stop.\n');
+        } catch (err) {
+          console.error(`  iTerm2 split failed: ${err.message}`);
+          console.error('  Falling back to tmux...');
+          // Fall through to tmux path below
+          renderMode.protocol = null;
+        }
+        if (renderMode.protocol) break;
+      }
+
+      // Open tmux side pane — install tmux if needed
+      if (!await ensureTmux()) process.exit(1);
+      const inTmux = !!process.env.TMUX;
+      // Enable tmux passthrough for Kitty/Ghostty graphics protocols
+      const passthroughPrefix = renderMode.protocol === 'kitty' ? 'tmux set allow-passthrough on; ' : '';
+      const tmuxCompanionCmd = `${passthroughPrefix}${companionCmd}`;
 
       try {
         if (inTmux) {
           execSync(
-            `tmux split-window -h -l ${paneWidth} '${companionCmd}'`,
+            `tmux split-window -h -l ${paneWidth} '${tmuxCompanionCmd}'`,
             { stdio: 'ignore' }
           );
           if (!detach) {
@@ -280,7 +308,7 @@ export async function run(args) {
           process.stderr.write('  Starting tmux session with companion pane...\n');
           execSync(
             `tmux new-session -d -s storymode -x 100 -y 30 \\; ` +
-            `split-window -h -l ${paneWidth} '${companionCmd}' \\; ` +
+            `split-window -h -l ${paneWidth} '${tmuxCompanionCmd}' \\; ` +
             `select-pane -L`,
             { stdio: 'ignore' }
           );