claudescreenfix-hardwicksoftware 2.3.0 → 2.4.0

package/bin/claude-fixed.js

@@ -2,25 +2,60 @@
 'use strict';
 
 /**
- * wrapper script - runs claude with the terminal fix loaded
+ * claude-fixed wrapper - runs Claude in a PTY and filters background colors
  *
- * finds your claude binary and runs it with our fix injected
- * no manual setup needed, just run claude-fixed instead of claude
+ * Claude is a compiled binary that needs a TTY for its Ink-based TUI.
+ * We spawn it in a pseudo-terminal (PTY) and filter its output in real-time,
+ * stripping background colors that cause VTE rendering glitches on Xvfb/VNC.
+ *
+ * Just run `claude-fixed` instead of `claude`
  */
 
-const { spawn, execSync } = require('child_process');
+const { execSync } = require('child_process');
 const path = require('path');
-const fs = require('fs');
 
-// find the loader path
-const loaderPath = path.join(__dirname, '..', 'loader.cjs');
+// ANSI background color patterns that cause VTE glitches on Xvfb/VNC
+const ANSI_BG_PATTERNS = [
+  /\x1b\[48;5;\d+m/g,           // 256-color background
+  /\x1b\[48;2;\d+;\d+;\d+m/g,   // true color background (RGB)
+  /\x1b\[4[0-7]m/g,             // standard background colors 40-47
+  /\x1b\[10[0-7]m/g,            // bright background colors 100-107
+  /\x1b\[7m/g,                  // inverse video (swaps FG/BG)
+  /\x1b\[27m/g,                 // inverse off
+  /\x1b\[49m/g,                 // default background
+];
 
-if (!fs.existsSync(loaderPath)) {
-  console.error('loader not found at ' + loaderPath);
-  process.exit(1);
+function stripBackgroundColors(data) {
+  let str = data;
+  for (const pattern of ANSI_BG_PATTERNS) {
+    str = str.replace(pattern, '');
+  }
+  return str;
+}
+
+// Check if we should strip colors (headless/VNC environment)
+function isHeadless() {
+  if (process.env.CLAUDE_HEADLESS_MODE === '1') return true;
+  if (process.env.CLAUDE_HEADLESS_MODE === '0') return false;
+
+  const display = process.env.DISPLAY;
+  if (!display) return true;
+
+  try {
+    const xdpyinfo = execSync(`xdpyinfo -display ${display} 2>/dev/null`, { encoding: 'utf8', timeout: 2000 });
+    if (xdpyinfo.toLowerCase().includes('xvfb') || xdpyinfo.toLowerCase().includes('virtual')) {
+      return true;
+    }
+    const vnc = execSync(`pgrep -a "x11vnc|Xvnc|vncserver" 2>/dev/null || true`, { encoding: 'utf8', timeout: 2000 });
+    if (vnc.includes(display) || vnc.includes('x11vnc')) {
+      return true;
+    }
+  } catch (e) {}
+
+  return false;
 }
 
-// find claude binary
+// Find claude binary
 let claudeBin;
 try {
   claudeBin = execSync('which claude', { encoding: 'utf8' }).trim();
@@ -29,16 +64,102 @@ try {
   process.exit(1);
 }
 
-// run claude with our fix loaded via NODE_OPTIONS
-const env = Object.assign({}, process.env, {
-  NODE_OPTIONS: '--require ' + loaderPath + ' ' + (process.env.NODE_OPTIONS || '')
-});
+const headless = isHeadless();
+const debug = process.env.CLAUDE_TERMINAL_FIX_DEBUG === '1';
+
+if (debug) {
+  console.error('[claude-fixed] headless mode:', headless);
+  console.error('[claude-fixed] claude binary:', claudeBin);
+}
+
+if (!headless) {
+  // Not headless, just exec claude directly (replaces this process)
+  const { spawn } = require('child_process');
+  const child = spawn(claudeBin, process.argv.slice(2), {
+    stdio: 'inherit'
+  });
+  child.on('exit', (code) => process.exit(code || 0));
+} else {
+  // Headless - use PTY to preserve TTY behavior while filtering output
+  let pty;
+  try {
+    // Try to find node-pty (might be in different locations)
+    const possiblePaths = [
+      'node-pty',
+      path.join('/usr/lib/node_modules/specmem-hardwicksoftware/node_modules/node-pty'),
+    ];
 
-const child = spawn(claudeBin, process.argv.slice(2), {
-  stdio: 'inherit',
-  env: env
-});
+    for (const p of possiblePaths) {
+      try {
+        pty = require(p);
+        if (debug) console.error('[claude-fixed] loaded node-pty from:', p);
+        break;
+      } catch (e) {}
+    }
 
-child.on('exit', (code) => {
-  process.exit(code || 0);
-});
+    if (!pty) throw new Error('node-pty not found');
+  } catch (e) {
+    console.error('[claude-fixed] node-pty not available, falling back to direct spawn');
+    console.error('[claude-fixed] Install with: npm install -g node-pty');
+    // Fallback to direct spawn (may have TTY issues but better than nothing)
+    const { spawn } = require('child_process');
+    const child = spawn(claudeBin, process.argv.slice(2), {
+      stdio: 'inherit'
+    });
+    child.on('exit', (code) => process.exit(code || 0));
+    return;
+  }
+
+  // Get terminal size
+  const cols = process.stdout.columns || 80;
+  const rows = process.stdout.rows || 24;
+
+  if (debug) {
+    console.error('[claude-fixed] terminal size:', cols, 'x', rows);
+  }
+
+  // Spawn Claude in a PTY
+  const ptyProcess = pty.spawn(claudeBin, process.argv.slice(2), {
+    name: 'xterm-256color',
+    cols: cols,
+    rows: rows,
+    cwd: process.cwd(),
+    env: process.env
+  });
+
+  // Filter PTY output and write to real stdout
+  ptyProcess.onData((data) => {
+    const filtered = stripBackgroundColors(data);
+    process.stdout.write(filtered);
+  });
+
+  // Forward stdin to PTY
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(true);
+  }
+  process.stdin.resume();
+  process.stdin.on('data', (data) => {
+    ptyProcess.write(data);
+  });
+
+  // Handle terminal resize
+  process.stdout.on('resize', () => {
+    ptyProcess.resize(process.stdout.columns || 80, process.stdout.rows || 24);
+  });
+
+  // Handle exit
+  ptyProcess.onExit(({ exitCode }) => {
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(false);
+    }
+    process.exit(exitCode);
+  });
+
+  // Handle signals
+  process.on('SIGINT', () => ptyProcess.kill('SIGINT'));
+  process.on('SIGTERM', () => ptyProcess.kill('SIGTERM'));
+  process.on('SIGHUP', () => ptyProcess.kill('SIGHUP'));
+  process.on('SIGWINCH', () => {
+    ptyProcess.resize(process.stdout.columns || 80, process.stdout.rows || 24);
+  });
+}

package/install-hook.cjs

@@ -1,24 +1,28 @@
 #!/usr/bin/env node
 /**
  * Auto-install Claude hook on npm install
+ * - Creates hook file in ~/.claude/hooks/
+ * - Registers hook in ~/.claude/settings.json (without clobbering existing settings)
  */
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
 const HOOK_NAME = 'screenfix-loader.js';
-const CLAUDE_HOOKS_DIR = path.join(os.homedir(), '.claude', 'hooks');
+const CLAUDE_DIR = path.join(os.homedir(), '.claude');
+const CLAUDE_HOOKS_DIR = path.join(CLAUDE_DIR, 'hooks');
+const SETTINGS_FILE = path.join(CLAUDE_DIR, 'settings.json');
 
 const HOOK_CONTENT = `#!/usr/bin/env node
 /**
  * CLAUDE SCREENFIX LOADER HOOK
  * ============================
- * 
+ *
  * SessionStart hook that loads claudescreenfix-hardwicksoftware
  * to fix VTE rendering glitches on headless/VNC displays.
- * 
+ *
  * Auto-installed by: npm install claudescreenfix-hardwicksoftware
- * 
+ *
  * Hook Event: SessionStart
  */
 
@@ -41,30 +45,79 @@ try {
 }
 `;
 
+// The hook config to add to settings.json
+const HOOK_CONFIG = {
+  hooks: [{
+    type: 'command',
+    command: 'node ' + path.join(CLAUDE_HOOKS_DIR, HOOK_NAME),
+    timeout: 5
+  }]
+};
+
 function install() {
   try {
-    // Create hooks dir if needed
+    // Create dirs if needed
+    if (!fs.existsSync(CLAUDE_DIR)) {
+      fs.mkdirSync(CLAUDE_DIR, { recursive: true });
+    }
     if (!fs.existsSync(CLAUDE_HOOKS_DIR)) {
       fs.mkdirSync(CLAUDE_HOOKS_DIR, { recursive: true });
       console.log('[screenfix] Created ' + CLAUDE_HOOKS_DIR);
     }
 
+    // Write the hook file
     const hookPath = path.join(CLAUDE_HOOKS_DIR, HOOK_NAME);
-    
-    // Check if hook already exists
-    if (fs.existsSync(hookPath)) {
-      console.log('[screenfix] Hook already exists at ' + hookPath);
-      return;
-    }
-
-    // Write the hook
     fs.writeFileSync(hookPath, HOOK_CONTENT, { mode: 0o755 });
     console.log('[screenfix] Installed hook to ' + hookPath);
+
+    // Register in settings.json
+    registerHook();
+
     console.log('[screenfix] Restart Claude Code to activate headless mode fix');
   } catch (e) {
     console.error('[screenfix] Failed to install hook:', e.message);
   }
 }
 
+function registerHook() {
+  let settings = {};
+
+  // Read existing settings
+  if (fs.existsSync(SETTINGS_FILE)) {
+    try {
+      settings = JSON.parse(fs.readFileSync(SETTINGS_FILE, 'utf8'));
+    } catch (e) {
+      console.log('[screenfix] Could not parse settings.json, creating new');
+    }
+  }
+
+  // Ensure hooks object exists
+  if (!settings.hooks) {
+    settings.hooks = {};
+  }
+
+  // Ensure SessionStart array exists
+  if (!settings.hooks.SessionStart) {
+    settings.hooks.SessionStart = [];
+  }
+
+  // Check if our hook is already registered
+  const alreadyRegistered = settings.hooks.SessionStart.some(h =>
+    h.hooks && h.hooks.some(hh => hh.command && hh.command.includes('screenfix-loader'))
+  );
+
+  if (alreadyRegistered) {
+    console.log('[screenfix] Hook already registered in settings.json');
+    return;
+  }
+
+  // Add our hook to the BEGINNING so it loads first
+  settings.hooks.SessionStart.unshift(HOOK_CONFIG);
+
+  // Write back settings
+  fs.writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 2));
+  console.log('[screenfix] Registered hook in settings.json');
+}
+
 // Run install
 install();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "claudescreenfix-hardwicksoftware",
-  "version": "2.3.0",
-  "description": "fixes scroll glitch + VNC/headless rendering in claude code cli - auto-installs hook, strips BG colors on Xvfb",
+  "version": "2.4.0",
+  "description": "fixes scroll glitch + VNC/headless rendering in claude code cli - use claude-fixed command to strip BG colors that break VTE on Xvfb",
   "main": "index.cjs",
   "bin": {
     "claude-fixed": "./bin/claude-fixed.js"