mstro-app 0.3.0 → 0.3.4

package/server/services/terminal/pty-manager.ts

@@ -17,6 +17,7 @@
  */
 
 import { EventEmitter } from 'node:events';
+import { createRequire } from 'node:module';
 import { homedir, platform } from 'node:os';
 import { sanitizeEnvForSandbox } from '../sandbox-utils.js';
 
@@ -26,8 +27,8 @@ let _ptyLoadError: string | null = null;
 
 try {
   pty = await import('node-pty');
-} catch (error: any) {
-  _ptyLoadError = error.message || 'Failed to load node-pty';
+} catch (error: unknown) {
+  _ptyLoadError = error instanceof Error ? error.message : 'Failed to load node-pty';
   console.warn('[PTYManager] node-pty not available - terminal features disabled');
   console.warn('[PTYManager] To enable terminals, run: mstro setup-terminal');
 }
@@ -39,6 +40,32 @@ export function isPtyAvailable(): boolean {
   return pty !== null;
 }
 
+/**
+ * Re-attempt loading node-pty at runtime.
+ * Called after `mstro setup-terminal` compiles the native module
+ * so the running server can pick it up without a restart.
+ *
+ * Uses createRequire (CJS) to bypass ESM's module cache — a failed
+ * ESM import is permanently cached, but CJS require cache entries
+ * can be deleted and re-required.
+ */
+export async function reloadPty(): Promise<boolean> {
+  if (pty) return true;
+  try {
+    const require = createRequire(import.meta.url);
+    // Clear any cached failure so require() retries the native load
+    const resolved = require.resolve('node-pty');
+    delete require.cache[resolved];
+    pty = require('node-pty');
+    _ptyLoadError = null;
+    console.log('[PTYManager] node-pty loaded successfully after reload');
+    return true;
+  } catch (error: unknown) {
+    _ptyLoadError = error instanceof Error ? error.message : 'Failed to load node-pty';
+    return false;
+  }
+}
+
 /**
  * Get installation instructions for node-pty based on platform
  */
@@ -240,7 +267,7 @@ export class PTYManager extends EventEmitter {
       // wraps echoed chars in multi-part ANSI sequences (RPROMPT, syntax highlighting).
       // A longer window on macOS ensures these multi-part sequences arrive as one chunk,
       // which the browser's predictive echo can match correctly.
-      const OUTPUT_COALESCE_MS = platform() === 'darwin' ? 16 : 8;
+      const OUTPUT_COALESCE_MS = platform() === 'darwin' ? 24 : 8;
       // High-water mark: flush immediately when buffer exceeds this size
       // to prevent unbounded memory growth during high-output commands (e.g. `yes`)
       const OUTPUT_HIGH_WATER = 64 * 1024; // 64KB
@@ -284,9 +311,9 @@ export class PTYManager extends EventEmitter {
       });
 
       return { shell: session.shell, cwd, isReconnect: false };
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(`[PTYManager] Failed to create terminal ${terminalId}:`, error);
-      this.emit('error', terminalId, error.message || 'Failed to create terminal');
+      this.emit('error', terminalId, error instanceof Error ? error.message : 'Failed to create terminal');
       throw error;
     }
   }
@@ -304,9 +331,9 @@ export class PTYManager extends EventEmitter {
     try {
       session.pty.write(data);
       return true;
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(`[PTYManager] Error writing to terminal ${terminalId}:`, error);
-      this.emit('error', terminalId, error.message || 'Write failed');
+      this.emit('error', terminalId, error instanceof Error ? error.message : 'Write failed');
       return false;
     }
   }
@@ -324,7 +351,7 @@ export class PTYManager extends EventEmitter {
     try {
       session.pty.resize(cols, rows);
       return true;
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(`[PTYManager] Error resizing terminal ${terminalId}:`, error);
       return false;
     }
@@ -353,7 +380,7 @@ export class PTYManager extends EventEmitter {
       session.pty.kill();
       this.terminals.delete(terminalId);
       return true;
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(`[PTYManager] Error closing terminal ${terminalId}:`, error);
       this.terminals.delete(terminalId);
       return false;

package/server/services/websocket/file-explorer-handlers.ts

@@ -44,7 +44,7 @@ function handleReadFile(ctx: HandlerContext, ws: WSContext, msg: WebSocketMessag
   ctx.send(ws, { type: 'fileContent', tabId, data: readFileContent(msg.data.filePath, workingDir) });
 }
 
-function sendFileResult(ctx: HandlerContext, ws: WSContext, type: WebSocketResponse['type'], tabId: string, result: any, successData?: Record<string, any>): void {
+function sendFileResult(ctx: HandlerContext, ws: WSContext, type: WebSocketResponse['type'], tabId: string, result: { success: boolean; path?: string; error?: string }, successData?: Record<string, unknown>): void {
   const data = result.success
     ? { success: true, path: result.path, ...successData }
     : { success: false, path: result.path, error: result.error };

package/server/services/websocket/file-utils.ts

@@ -7,7 +7,7 @@
  * File type detection, gitignore parsing, and directory scanning utilities.
  */
 
-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync, type Stats, statSync } from 'node:fs';
 import { extname, join, relative, sep } from 'node:path';
 import type { CacheEntry, } from './types.js';
 
@@ -226,6 +226,18 @@ export function isImageFile(filePath: string): boolean {
   return ext ? imageExtensions.includes(`.${ext}`) : false;
 }
 
+/**
+ * Check if a file is a binary file that should be base64-encoded (images + PDFs)
+ */
+export function isBinaryFile(filePath: string): boolean {
+  return isImageFile(filePath) || isPdfFile(filePath);
+}
+
+function isPdfFile(filePath: string): boolean {
+  const ext = filePath.toLowerCase().split('.').pop();
+  return ext === 'pdf';
+}
+
 type FileContentResult = { path: string; fileName: string; content: string; size?: number; modifiedAt?: string; isImage?: boolean; mimeType?: string; error?: string };
 
 function readDirectoryContent(fullPath: string, filePath: string, fileName: string): FileContentResult {
@@ -246,10 +258,17 @@ function readDirectoryContent(fullPath: string, filePath: string, fileName: stri
   }
 }
 
-function readImageContent(fullPath: string, filePath: string, fileName: string, stats: { size: number; mtime: Date }): FileContentResult {
+function getBinaryMimeType(ext: string): string {
+  if (ext === 'svg') return 'image/svg+xml';
+  if (ext === 'jpg') return 'image/jpeg';
+  if (ext === 'pdf') return 'application/pdf';
+  return `image/${ext}`;
+}
+
+function readBinaryContent(fullPath: string, filePath: string, fileName: string, stats: { size: number; mtime: Date }): FileContentResult {
   const buffer = readFileSync(fullPath);
   const ext = fullPath.toLowerCase().split('.').pop() || 'png';
-  const mimeType = ext === 'svg' ? 'image/svg+xml' : ext === 'jpg' ? 'image/jpeg' : `image/${ext}`;
+  const mimeType = getBinaryMimeType(ext);
   return {
     path: filePath, fileName,
     content: buffer.toString('base64'),
@@ -266,6 +285,31 @@ function readTextContent(fullPath: string, filePath: string, fileName: string, s
   };
 }
 
+function validateFileAccess(fullPath: string, filePath: string, fileName: string, workingDir: string): FileContentResult | null {
+  const normalizedPath = join(fullPath);
+  if (!normalizedPath.startsWith(join(workingDir)) && !isPathInSafeLocation(normalizedPath)) {
+    return { path: filePath, fileName, content: '', error: 'Access denied: path outside allowed locations' };
+  }
+  if (!existsSync(fullPath)) {
+    return { path: filePath, fileName, content: '', error: 'File not found' };
+  }
+  return null;
+}
+
+function readValidatedFile(fullPath: string, filePath: string, fileName: string, stats: Stats): FileContentResult {
+  if (stats.isDirectory()) return readDirectoryContent(fullPath, filePath, fileName);
+
+  const isBin = isBinaryFile(fullPath);
+  const MAX_FILE_SIZE = isBin ? 10 * 1024 * 1024 : 1024 * 1024;
+  if (stats.size > MAX_FILE_SIZE) {
+    return { path: filePath, fileName, content: '', size: stats.size, error: `File too large (${Math.round(stats.size / 1024)}KB). Maximum is ${isBin ? '10MB' : '1MB'}.` };
+  }
+
+  return isBin
+    ? readBinaryContent(fullPath, filePath, fileName, stats)
+    : readTextContent(fullPath, filePath, fileName, stats);
+}
+
 /**
  * Read file content for context injection
  */
@@ -274,32 +318,12 @@ export function readFileContent(filePath: string, workingDir: string): FileConte
     const fullPath = filePath.startsWith('/') ? filePath : join(workingDir, filePath);
     const fileName = fullPath.split(sep).pop() || filePath;
 
-    const normalizedPath = join(fullPath);
-    const isInWorkingDir = normalizedPath.startsWith(join(workingDir));
-    if (!isInWorkingDir && !isPathInSafeLocation(normalizedPath)) {
-      return { path: filePath, fileName, content: '', error: 'Access denied: path outside allowed locations' };
-    }
-
-    if (!existsSync(fullPath)) {
-      return { path: filePath, fileName, content: '', error: 'File not found' };
-    }
-
-    const stats = statSync(fullPath);
-    if (stats.isDirectory()) {
-      return readDirectoryContent(fullPath, filePath, fileName);
-    }
-
-    const isImage = isImageFile(fullPath);
-    const MAX_FILE_SIZE = isImage ? 10 * 1024 * 1024 : 1024 * 1024;
-    if (stats.size > MAX_FILE_SIZE) {
-      return { path: filePath, fileName, content: '', size: stats.size, error: `File too large (${Math.round(stats.size / 1024)}KB). Maximum is ${isImage ? '10MB' : '1MB'}.` };
-    }
+    const accessError = validateFileAccess(fullPath, filePath, fileName, workingDir);
+    if (accessError) return accessError;
 
-    return isImage
-      ? readImageContent(fullPath, filePath, fileName, stats)
-      : readTextContent(fullPath, filePath, fileName, stats);
-  } catch (error: any) {
+    return readValidatedFile(fullPath, filePath, fileName, statSync(fullPath));
+  } catch (error: unknown) {
     console.error('[FileUtils] Error reading file:', error);
-    return { path: filePath, fileName: filePath.split(sep).pop() || filePath, content: '', error: error.message || 'Failed to read file' };
+    return { path: filePath, fileName: filePath.split(sep).pop() || filePath, content: '', error: (error instanceof Error ? error.message : String(error)) || 'Failed to read file' };
   }
 }

package/server/services/websocket/git-handlers.ts

@@ -270,8 +270,8 @@ export async function handleGitStatus(ctx: HandlerContext, ws: WSContext, tabId:
     };
 
     ctx.send(ws, { type: 'gitStatus', tabId, data: response });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -293,8 +293,8 @@ async function handleGitStage(ctx: HandlerContext, ws: WSContext, msg: WebSocket
     }
 
     ctx.send(ws, { type: 'gitStaged', tabId, data: { paths: paths || [] } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -313,8 +313,8 @@ async function handleGitUnstage(ctx: HandlerContext, ws: WSContext, msg: WebSock
     }
 
     ctx.send(ws, { type: 'gitUnstaged', tabId, data: { paths } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -342,8 +342,8 @@ async function handleGitCommit(ctx: HandlerContext, ws: WSContext, msg: WebSocke
 
     ctx.send(ws, { type: 'gitCommitted', tabId, data: { hash, message } });
     handleGitStatus(ctx, ws, tabId, workingDir);
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -463,8 +463,8 @@ Respond with ONLY the commit message, nothing else.`;
       claude.kill();
     }, 30000);
 
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -539,8 +539,8 @@ async function handleGitPush(ctx: HandlerContext, ws: WSContext, tabId: string,
     }
 
     ctx.send(ws, { type: 'gitPushed', tabId, data: { output: result.stdout || result.stderr } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -553,8 +553,8 @@ async function handleGitPull(ctx: HandlerContext, ws: WSContext, tabId: string,
     }
 
     ctx.send(ws, { type: 'gitPulled', tabId, data: { output: result.stdout || result.stderr } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -580,8 +580,8 @@ async function handleGitLog(ctx: HandlerContext, ws: WSContext, msg: WebSocketMe
     });
 
     ctx.send(ws, { type: 'gitLog', tabId, data: { entries } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -643,8 +643,8 @@ async function handleGitDiscoverRepos(ctx: HandlerContext, ws: WSContext, tabId:
     };
 
     ctx.send(ws, { type: 'gitReposDiscovered', tabId, data: response });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -712,8 +712,8 @@ async function handleGitListBranches(ctx: HandlerContext, ws: WSContext, tabId:
       .filter(b => b.name !== 'origin/HEAD');
 
     ctx.send(ws, { type: 'gitBranchList', tabId, data: { branches, current: currentBranch } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -746,8 +746,8 @@ async function handleGitCheckout(ctx: HandlerContext, ws: WSContext, msg: WebSoc
 
     ctx.send(ws, { type: 'gitCheckedOut', tabId, data: { branch, previous } });
     handleGitStatus(ctx, ws, tabId, workingDir);
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -773,8 +773,8 @@ async function handleGitCreateBranch(ctx: HandlerContext, ws: WSContext, msg: We
     }
 
     ctx.send(ws, { type: 'gitBranchCreated', tabId, data: { name, hash: hashResult.stdout.trim() } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -799,8 +799,8 @@ async function handleGitDeleteBranch(ctx: HandlerContext, ws: WSContext, msg: We
     }
 
     ctx.send(ws, { type: 'gitBranchDeleted', tabId, data: { name } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -833,8 +833,8 @@ async function handleGitDiff(ctx: HandlerContext, ws: WSContext, msg: WebSocketM
       tabId,
       data: { path, original, modified, staged: !!staged },
     });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -863,8 +863,8 @@ async function handleGitListTags(ctx: HandlerContext, ws: WSContext, tabId: stri
       });
 
     ctx.send(ws, { type: 'gitTagList', tabId, data: { tags } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -893,8 +893,8 @@ async function handleGitCreateTag(ctx: HandlerContext, ws: WSContext, msg: WebSo
 
     const hashResult = await executeGitCommand(['rev-parse', '--short', name], workingDir);
     ctx.send(ws, { type: 'gitTagCreated', tabId, data: { name, hash: hashResult.stdout.trim() } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -918,7 +918,7 @@ async function handleGitPushTag(ctx: HandlerContext, ws: WSContext, msg: WebSock
     }
 
     ctx.send(ws, { type: 'gitTagPushed', tabId, data: { name: name || 'all', output: result.stderr || result.stdout } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }

package/server/services/websocket/git-pr-handlers.ts

@@ -49,8 +49,8 @@ async function handleGitGetRemoteInfo(ctx: HandlerContext, ws: WSContext, tabId:
         preferredBaseBranch,
       },
     });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -171,8 +171,8 @@ async function handleGitCreatePR(ctx: HandlerContext, ws: WSContext, msg: WebSoc
     } else {
       ctx.send(ws, { type: 'gitError', tabId, data: { error: 'Could not determine remote URL format for PR creation' } });
     }
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -357,7 +357,7 @@ Respond with ONLY the title and description, nothing else.`;
 
     setTimeout(() => { claude.kill(); }, 30000);
 
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }

package/server/services/websocket/git-worktree-handlers.ts

@@ -55,8 +55,8 @@ async function handleGitWorktreeList(ctx: HandlerContext, ws: WSContext, tabId:
     }
     const worktrees = parseWorktreePorcelain(result.stdout);
     ctx.send(ws, { type: 'gitWorktreeListResult', tabId, data: { worktrees } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -85,8 +85,8 @@ async function handleGitWorktreeCreate(ctx: HandlerContext, ws: WSContext, msg:
       tabId,
       data: { path: wtPath, branch: branchName, head: headResult.stdout.trim() },
     });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -118,8 +118,8 @@ async function handleGitWorktreeRemove(ctx: HandlerContext, ws: WSContext, msg:
     await executeGitCommand(['worktree', 'prune'], workingDir);
 
     ctx.send(ws, { type: 'gitWorktreeRemoved', tabId, data: { path: wtPath } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -141,8 +141,8 @@ async function handleTabWorktreeSwitch(ctx: HandlerContext, ws: WSContext, msg:
 
     ctx.send(ws, { type: 'tabWorktreeSwitched', tabId: resolvedTabId, data: { tabId: resolvedTabId, worktreePath, branch } });
     handleGitStatus(ctx, ws, resolvedTabId, worktreePath);
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -185,8 +185,8 @@ async function handleGitWorktreePush(ctx: HandlerContext, ws: WSContext, msg: We
       return;
     }
     ctx.send(ws, { type: 'gitWorktreePushed', tabId, data: { output: pushResult.output, upstream: `${pushRemote}/${pushBranch}` } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -218,8 +218,8 @@ async function handleGitWorktreeCreatePR(ctx: HandlerContext, ws: WSContext, msg
     const prNumber = prNumberMatch ? parseInt(prNumberMatch[1], 10) : 0;
 
     ctx.send(ws, { type: 'gitWorktreePRCreated', tabId, data: { prUrl, prNumber } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -263,8 +263,8 @@ async function handleGitMergePreview(ctx: HandlerContext, ws: WSContext, msg: We
       tabId,
       data: { clean, conflicts, stat, commits, ahead: commits.length },
     });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -362,8 +362,8 @@ async function handleGitWorktreeMerge(ctx: HandlerContext, ws: WSContext, msg: W
     await cleanupAfterMerge(mainPath, sourceBranch, strategy, !!deleteWorktree, !!deleteBranch);
 
     ctx.send(ws, { type: 'gitWorktreeMergeResult', tabId, data: { success: true, mergeCommit: commitHashResult.stdout.trim() } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -378,8 +378,8 @@ async function handleGitMergeAbort(ctx: HandlerContext, ws: WSContext, tabId: st
     }
 
     ctx.send(ws, { type: 'gitMergeAborted', tabId, data: { aborted: true } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }
 
@@ -397,7 +397,7 @@ async function handleGitMergeComplete(ctx: HandlerContext, ws: WSContext, _msg:
     const mergeCommit = hashResult.stdout.trim();
 
     ctx.send(ws, { type: 'gitMergeCompleted', tabId, data: { success: true, mergeCommit } });
-  } catch (error: any) {
-    ctx.send(ws, { type: 'gitError', tabId, data: { error: error.message } });
+  } catch (error: unknown) {
+    ctx.send(ws, { type: 'gitError', tabId, data: { error: error instanceof Error ? error.message : String(error) } });
   }
 }

package/server/services/websocket/handler.ts

@@ -103,12 +103,12 @@ export class WebSocketImproviseHandler implements HandlerContext {
       delete msg._permission;
 
       await this.dispatchMessage(ws, msg, tabId, workingDir, permission);
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error('[WebSocketImproviseHandler] Error handling message:', error);
       captureException(error, { context: 'websocket.handleMessage' });
       this.send(ws, {
         type: 'error',
-        data: { message: error.message }
+        data: { message: error instanceof Error ? error.message : String(error) }
       });
     }
   }