dmux 3.1.1 → 3.3.0

package/dist/utils/asciiArt.js

@@ -0,0 +1,75 @@
+import { TmuxService } from "../services/TmuxService.js";
+import { ASCII_ART_RENDER_DELAY } from "../constants/timing.js";
+/**
+ * Render ASCII art centered in a tmux pane with fill characters
+ * Uses a persistent node script that re-renders on resize
+ *
+ * @param options - Rendering options
+ * @param options.paneId - The tmux pane ID to render to
+ * @param options.art - Array of strings representing each line of ASCII art (unused, uses default art)
+ * @param options.fillChar - Character to fill empty space (unused, uses default)
+ * @param options.centerVertically - Center art vertically (unused, always centered)
+ * @param options.centerHorizontally - Center art horizontally (unused, always centered)
+ */
+export async function renderAsciiArt(options) {
+    const { paneId } = options;
+    const tmuxService = TmuxService.getInstance();
+    // Find the decorative pane script - check both dist and src directories
+    const path = await import("path");
+    const { fileURLToPath } = await import("url");
+    const fs = await import("fs");
+    const __dirname = path.dirname(fileURLToPath(import.meta.url));
+    // Try multiple possible locations
+    const possiblePaths = [
+        path.join(__dirname, "..", "..", "dist", "decorative-pane.js"),
+        path.join(__dirname, "..", "decorative-pane.js"),
+        path.join(process.cwd(), "dist", "decorative-pane.js"),
+    ];
+    let scriptPath = possiblePaths[0]; // Default
+    for (const p of possiblePaths) {
+        if (fs.existsSync(p)) {
+            scriptPath = p;
+            break;
+        }
+    }
+    // Verify the script exists
+    if (!fs.existsSync(scriptPath)) {
+        throw new Error(`Decorative pane script not found at ${scriptPath}. Tried: ${possiblePaths.join(", ")}`);
+    }
+    // Kill any existing process in the pane
+    try {
+        await tmuxService.sendKeys(paneId, 'C-c');
+    }
+    catch {
+        // Pane might not have a running process, that's okay
+    }
+    await new Promise((resolve) => setTimeout(resolve, ASCII_ART_RENDER_DELAY));
+    // Run the decorative pane script with absolute path
+    const absolutePath = path.isAbsolute(scriptPath)
+        ? scriptPath
+        : path.resolve(scriptPath);
+    await tmuxService.sendKeys(paneId, `'node "${absolutePath}"' Enter`);
+    await new Promise((resolve) => setTimeout(resolve, 150));
+}
+/**
+ * Predefined ASCII art designs
+ */
+export const ASCII_ART = {
+    dmuxWelcome: `
+╭─────────────────────────────────────────────────────────╮
+│                                                         │
+│           ███                                           │
+│           ███                                           │
+│       ███████  █████████████   ███  ███  ███  ███       │
+│      ███  ███  ███  ███  ████  ███  ███  ███  ███       │
+│      ███  ███  ███  ███  ████  ███  ███    █████        │
+│      ███  ███  ███  ███  ████  ███  ███  ███  ███       │
+│      ████████  ███  ███  ████  ████████  ███  ███       │
+│                                                         │
+│              AI developer agent multiplexer             │
+│              Press [n] to create a new agent            │
+│                                                         │
+╰─────────────────────────────────────────────────────────╯
+  `,
+};
+//# sourceMappingURL=asciiArt.js.map

package/dist/utils/asciiArt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asciiArt.js","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAU/D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAA8B;IAE9B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAA;IAE7C,wEAAwE;IACxE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAA;IACjC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAA;IAE7B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAE9D,kCAAkC;IAClC,MAAM,aAAa,GAAG;QACpB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC;QAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,oBAAoB,CAAC;KACvD,CAAA;IAED,IAAI,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA,CAAC,UAAU;IAC5C,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,UAAU,GAAG,CAAC,CAAA;YACd,MAAK;QACP,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,YAAY,aAAa,CAAC,IAAI,CAC7E,IAAI,CACL,EAAE,CACJ,CAAA;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,qDAAqD;IACvD,CAAC;IACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAA;IAE3E,oDAAoD;IACpD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC9C,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC5B,MAAM,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,YAAY,UAAU,CAAC,CAAA;IACpE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,WAAW,EAAE;;;;;;;;;;;;;;;GAeZ;CACF,CAAA"}

package/dist/utils/conflictMonitor.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Conflict Monitor - Monitors a pane for merge conflict resolution completion
+ *
+ * When conflicts are resolved and merge commit is made, automatically:
+ * 1. Closes the conflict resolution pane
+ * 2. Triggers cleanup flow
+ */
+export interface ConflictMonitorOptions {
+    conflictPaneId: string;
+    repoPath: string;
+    onResolved: () => void;
+    checkIntervalMs?: number;
+    maxChecks?: number;
+}
+/**
+ * Start monitoring a pane for conflict resolution completion
+ * Returns a cleanup function to stop monitoring
+ */
+export declare function startConflictMonitoring(options: ConflictMonitorOptions): () => void;
+//# sourceMappingURL=conflictMonitor.d.ts.map

package/dist/utils/conflictMonitor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictMonitor.d.ts","sourceRoot":"","sources":["../../src/utils/conflictMonitor.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,IAAI,CAiDnF"}

package/dist/utils/conflictMonitor.js

@@ -0,0 +1,113 @@
+/**
+ * Conflict Monitor - Monitors a pane for merge conflict resolution completion
+ *
+ * When conflicts are resolved and merge commit is made, automatically:
+ * 1. Closes the conflict resolution pane
+ * 2. Triggers cleanup flow
+ */
+import { TmuxService } from '../services/TmuxService.js';
+import { execSync } from 'child_process';
+/**
+ * Start monitoring a pane for conflict resolution completion
+ * Returns a cleanup function to stop monitoring
+ */
+export function startConflictMonitoring(options) {
+    const { conflictPaneId, repoPath, onResolved, checkIntervalMs = 2000, // Check every 2 seconds
+    maxChecks = 300, // Stop after 10 minutes (300 * 2s)
+     } = options;
+    const tmuxService = TmuxService.getInstance();
+    let checkCount = 0;
+    let stopped = false;
+    const checkInterval = setInterval(async () => {
+        if (stopped || checkCount >= maxChecks) {
+            clearInterval(checkInterval);
+            return;
+        }
+        checkCount++;
+        try {
+            // Check if pane still exists
+            const paneExists = await checkPaneExists(conflictPaneId, tmuxService);
+            if (!paneExists) {
+                // Pane was manually closed, stop monitoring
+                clearInterval(checkInterval);
+                return;
+            }
+            // Check if conflicts are resolved
+            const conflictsResolved = areConflictsResolved(repoPath);
+            if (conflictsResolved) {
+                // Conflicts resolved! Trigger callback
+                clearInterval(checkInterval);
+                onResolved();
+            }
+        }
+        catch (error) {
+            // Ignore errors, keep monitoring
+            console.error('[conflictMonitor] Error during check:', error);
+        }
+    }, checkIntervalMs);
+    // Return cleanup function
+    return () => {
+        stopped = true;
+        clearInterval(checkInterval);
+    };
+}
+/**
+ * Check if a tmux pane exists
+ */
+async function checkPaneExists(paneId, tmuxService) {
+    return await tmuxService.paneExists(paneId);
+}
+/**
+ * Check if merge conflicts are resolved in a repository
+ * Returns true if:
+ * - A new merge commit was created (HEAD moved and is a merge commit)
+ * - No longer in merge state (MERGE_HEAD removed by commit)
+ */
+function areConflictsResolved(repoPath) {
+    try {
+        // Check if we're still in merge state
+        // In a worktree, MERGE_HEAD is in .git/worktrees/<name>/MERGE_HEAD
+        // Git automatically resolves .git paths correctly in worktrees
+        let mergeHeadExists = false;
+        try {
+            execSync('git rev-parse --verify MERGE_HEAD', {
+                cwd: repoPath,
+                stdio: 'pipe',
+            });
+            mergeHeadExists = true;
+        }
+        catch {
+            mergeHeadExists = false;
+        }
+        // If MERGE_HEAD exists, we're still mid-merge (not yet committed)
+        if (mergeHeadExists) {
+            return false;
+        }
+        // Check if the most recent commit is a merge commit
+        // This indicates the agent successfully committed the merge
+        let isMergeCommit = false;
+        try {
+            execSync('git rev-parse --verify HEAD^2', {
+                cwd: repoPath,
+                stdio: 'pipe',
+            });
+            isMergeCommit = true;
+        }
+        catch {
+            isMergeCommit = false;
+        }
+        // Conflicts are resolved when:
+        // 1. No MERGE_HEAD (merge was committed or aborted)
+        // 2. HEAD is a merge commit (has 2 parents)
+        //
+        // Note: In conflict resolution, we initiated a merge that had conflicts,
+        // so it cannot be fast-forward. The result must be a merge commit.
+        // If there's no MERGE_HEAD but also no merge commit, the agent may have
+        // aborted or done something unexpected - treat as not resolved.
+        return isMergeCommit;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=conflictMonitor.js.map

package/dist/utils/conflictMonitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictMonitor.js","sourceRoot":"","sources":["../../src/utils/conflictMonitor.ts"],"names":[],"mappings":"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"}

package/dist/utils/conflictResolutionPane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflictResolutionPane.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,MAAM,WAAW,6BAA6B;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAgInB"}
+{"version":3,"file":"conflictResolutionPane.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAO5C,MAAM,WAAW,6BAA6B;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAgInB"}

package/dist/utils/conflictResolutionPane.js

@@ -3,59 +3,78 @@
  *
  * Utilities for creating a new pane specifically for AI-assisted merge conflict resolution
  */
-import { execSync } from 'child_process';
-import { applySmartLayout } from './tmux.js';
+import { TmuxService } from '../services/TmuxService.js';
+import { enforceControlPaneSize, splitPane } from './tmux.js';
 import { capturePaneContent } from './paneCapture.js';
+import { SIDEBAR_WIDTH } from './layoutManager.js';
+import { TMUX_LAYOUT_APPLY_DELAY, TMUX_SPLIT_DELAY } from '../constants/timing.js';
 /**
  * Create a pane for resolving merge conflicts with AI assistance
  */
 export async function createConflictResolutionPane(options) {
     const { sourceBranch, targetBranch, targetRepoPath, agent, projectName, existingPanes } = options;
+    const tmuxService = TmuxService.getInstance();
     // Generate slug for this conflict resolution session
     const slug = `merge-${sourceBranch}-into-${targetBranch}`.substring(0, 50);
     // Get current pane info
-    const originalPaneId = execSync('tmux display-message -p "#{pane_id}"', {
-        encoding: 'utf-8',
-    }).trim();
+    const originalPaneId = tmuxService.getCurrentPaneIdSync();
     // Get current pane count
-    const paneCount = parseInt(execSync('tmux list-panes | wc -l', { encoding: 'utf-8' }).trim());
+    const paneCount = tmuxService.getAllPaneIdsSync().length;
     // Enable pane borders to show titles
     try {
-        execSync(`tmux set-option -g pane-border-status top`, { stdio: 'pipe' });
+        tmuxService.setGlobalOptionSync('pane-border-status', 'top');
     }
     catch {
         // Ignore if already set or fails
     }
     // Create new pane
-    const paneInfo = execSync(`tmux split-window -h -P -F '#{pane_id}'`, {
-        encoding: 'utf-8',
-    }).trim();
+    const paneInfo = splitPane();
     // Wait for pane creation to settle
     await new Promise((resolve) => setTimeout(resolve, 500));
     // Set pane title
     try {
-        execSync(`tmux select-pane -t '${paneInfo}' -T "${slug}"`, {
-            stdio: 'pipe',
-        });
+        await tmuxService.setPaneTitle(paneInfo, slug);
     }
     catch {
         // Ignore if setting title fails
     }
-    // Apply smart layout based on pane count
-    const newPaneCount = paneCount + 1;
-    applySmartLayout(newPaneCount);
+    // Don't apply global layouts - just enforce sidebar width
+    try {
+        const controlPaneId = tmuxService.getCurrentPaneIdSync();
+        await enforceControlPaneSize(controlPaneId, SIDEBAR_WIDTH);
+    }
+    catch { }
     // CD into the target repository (where we'll resolve conflicts)
     try {
-        execSync(`tmux send-keys -t '${paneInfo}' 'cd "${targetRepoPath}"' Enter`, {
-            stdio: 'pipe',
-        });
+        await tmuxService.sendShellCommand(paneInfo, `cd "${targetRepoPath}"`);
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
         await new Promise((resolve) => setTimeout(resolve, 500));
     }
     catch (error) {
         console.error('[conflictResolutionPane] Failed to cd into target repo:', error);
     }
+    // CRITICAL: Ensure clean state before starting merge
+    // If a previous merge attempt left MERGE_HEAD, abort it first
+    try {
+        await tmuxService.sendShellCommand(paneInfo, 'git merge --abort 2>/dev/null || true');
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    catch (error) {
+        console.error('[conflictResolutionPane] Failed to abort previous merge:', error);
+    }
+    // CRITICAL: Start the merge to create conflict markers for the agent to resolve
+    // This is necessary because pre-validation or failed execution may have aborted the merge
+    try {
+        await tmuxService.sendShellCommand(paneInfo, `git merge ${targetBranch} --no-edit || true`);
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+        await new Promise((resolve) => setTimeout(resolve, TMUX_LAYOUT_APPLY_DELAY));
+    }
+    catch (error) {
+        console.error('[conflictResolutionPane] Failed to initiate merge:', error);
+    }
     // Construct the AI prompt for conflict resolution
-    const prompt = `There are conflicts merging ${sourceBranch} into ${targetBranch}. Both are valid changes, so please keep both feature sets and merge them intelligently. Check git status to see the conflicting files, then resolve each conflict to preserve both sets of changes.`;
+    const prompt = `There are conflicts merging ${targetBranch} into ${sourceBranch}. Both are valid changes, so please keep both feature sets and merge them intelligently. Check git status to see the conflicting files, then resolve each conflict to preserve both sets of changes. Once all conflicts are resolved, commit the merge.`;
     // Launch agent with the conflict resolution prompt
     if (agent === 'claude') {
         const escapedPrompt = prompt
@@ -64,39 +83,29 @@ export async function createConflictResolutionPane(options) {
             .replace(/`/g, '\\`')
             .replace(/\$/g, '\\$');
         const claudeCmd = `claude "${escapedPrompt}" --permission-mode=acceptEdits`;
-        const escapedCmd = claudeCmd.replace(/'/g, "'\\''");
-        execSync(`tmux send-keys -t '${paneInfo}' '${escapedCmd}'`, {
-            stdio: 'pipe',
-        });
-        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
-        // Auto-approve trust prompts for Claude
+        await tmuxService.sendShellCommand(paneInfo, claudeCmd);
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+        // Auto-approve trust prompts for Claude (workspace trust, not edit permissions)
+        // Note: --permission-mode=acceptEdits handles edit permissions, but not workspace trust
         autoApproveTrustPrompt(paneInfo).catch(() => {
             // Ignore errors in background monitoring
         });
     }
     else if (agent === 'opencode') {
-        const openCoderCmd = `opencode`;
-        const escapedOpenCmd = openCoderCmd.replace(/'/g, "'\\''");
-        execSync(`tmux send-keys -t '${paneInfo}' '${escapedOpenCmd}'`, {
-            stdio: 'pipe',
-        });
-        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
+        await tmuxService.sendShellCommand(paneInfo, 'opencode');
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
         // Wait for opencode to start, then paste the prompt
         await new Promise((resolve) => setTimeout(resolve, 1500));
         const bufName = `dmux_prompt_${Date.now()}`;
         const promptEsc = prompt.replace(/\\/g, '\\\\').replace(/'/g, "'\\''");
-        execSync(`tmux set-buffer -b '${bufName}' -- '${promptEsc}'`, {
-            stdio: 'pipe',
-        });
-        execSync(`tmux paste-buffer -b '${bufName}' -t '${paneInfo}'`, {
-            stdio: 'pipe',
-        });
+        await tmuxService.setBuffer(bufName, promptEsc);
+        await tmuxService.pasteBuffer(bufName, paneInfo);
         await new Promise((resolve) => setTimeout(resolve, 200));
-        execSync(`tmux delete-buffer -b '${bufName}'`, { stdio: 'pipe' });
-        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
+        await tmuxService.deleteBuffer(bufName);
+        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
     }
     // Keep focus on the new pane
-    execSync(`tmux select-pane -t '${paneInfo}'`, { stdio: 'pipe' });
+    await tmuxService.selectPane(paneInfo);
     // Create the pane object
     const newPane = {
         id: `dmux-${Date.now()}`,
@@ -107,10 +116,10 @@ export async function createConflictResolutionPane(options) {
         // Note: No worktreePath - this pane operates directly in the target repo
     };
     // Switch back to the original pane
-    execSync(`tmux select-pane -t '${originalPaneId}'`, { stdio: 'pipe' });
+    await tmuxService.selectPane(originalPaneId);
     // Re-set the title for the dmux pane
     try {
-        execSync(`tmux select-pane -t '${originalPaneId}' -T "dmux-${projectName}"`, { stdio: 'pipe' });
+        await tmuxService.setPaneTitle(originalPaneId, `dmux-${projectName}`);
     }
     catch {
         // Ignore if setting title fails
@@ -121,35 +130,26 @@ export async function createConflictResolutionPane(options) {
  * Auto-approve Claude trust prompts (reused from paneCreation.ts)
  */
 async function autoApproveTrustPrompt(paneInfo) {
-    // Wait for Claude to start up before checking for prompts
-    await new Promise((resolve) => setTimeout(resolve, 800));
+    // Wait longer for Claude to start up before checking for prompts
+    await new Promise((resolve) => setTimeout(resolve, 1200));
     const maxChecks = 100;
     const checkInterval = 100;
     let lastContent = '';
     let stableContentCount = 0;
     let promptHandled = false;
+    // Trust prompt patterns - made more specific to avoid false positives
     const trustPromptPatterns = [
+        // Specific trust/permission questions
         /Do you trust the files in this folder\?/i,
         /Trust the files in this workspace\?/i,
         /Do you trust the authors of the files/i,
         /Do you want to trust this workspace\?/i,
         /trust.*files.*folder/i,
         /trust.*workspace/i,
-        /Do you trust/i,
         /Trust this folder/i,
         /trust.*directory/i,
-        /permission.*grant/i,
-        /allow.*access/i,
         /workspace.*trust/i,
-        /accept.*edits/i,
-        /permission.*mode/i,
-        /allow.*claude/i,
-        /\[y\/n\]/i,
-        /\(y\/n\)/i,
-        /Yes\/No/i,
-        /\[Y\/n\]/i,
-        /press.*enter.*accept/i,
-        /press.*enter.*continue/i,
+        // Claude-specific numbered menu format
         /❯\s*1\.\s*Yes,\s*proceed/i,
         /Enter to confirm.*Esc to exit/i,
         /1\.\s*Yes,\s*proceed/i,
@@ -159,6 +159,12 @@ async function autoApproveTrustPrompt(paneInfo) {
         await new Promise((resolve) => setTimeout(resolve, checkInterval));
         try {
             const paneContent = capturePaneContent(paneInfo, 30);
+            // Early exit: If Claude is already running (prompt has been processed), we're done
+            if (paneContent.includes('Claude') ||
+                paneContent.includes('Assistant') ||
+                paneContent.includes('claude>')) {
+                break;
+            }
             if (paneContent === lastContent) {
                 stableContentCount++;
             }
@@ -166,31 +172,25 @@ async function autoApproveTrustPrompt(paneInfo) {
                 stableContentCount = 0;
                 lastContent = paneContent;
             }
+            // Look for trust prompt using specific patterns only
             const hasTrustPrompt = trustPromptPatterns.some((pattern) => pattern.test(paneContent));
-            const hasClaudePermissionPrompt = paneContent.includes('Do you trust') ||
-                paneContent.includes('trust the files') ||
-                paneContent.includes('permission') ||
-                paneContent.includes('allow') ||
-                (paneContent.includes('folder') && paneContent.includes('?'));
-            if ((hasTrustPrompt || hasClaudePermissionPrompt) && !promptHandled) {
-                if (stableContentCount >= 2) {
+            // Only act if we have high confidence it's a trust prompt
+            if (hasTrustPrompt && !promptHandled) {
+                // Require content to be stable for longer to avoid false positives
+                if (stableContentCount >= 5) {
                     const isNewClaudeFormat = /❯\s*1\.\s*Yes,\s*proceed/i.test(paneContent) ||
                         /Enter to confirm.*Esc to exit/i.test(paneContent);
                     if (isNewClaudeFormat) {
-                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
-                            stdio: 'pipe',
-                        });
+                        const tmuxService = TmuxService.getInstance();
+                        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
                     }
                     else {
-                        execSync(`tmux send-keys -t '${paneInfo}' 'y'`, { stdio: 'pipe' });
+                        const tmuxService = TmuxService.getInstance();
+                        await tmuxService.sendTmuxKeys(paneInfo, 'y');
                         await new Promise((resolve) => setTimeout(resolve, 50));
-                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
-                            stdio: 'pipe',
-                        });
-                        await new Promise((resolve) => setTimeout(resolve, 100));
-                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
-                            stdio: 'pipe',
-                        });
+                        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+                        await new Promise((resolve) => setTimeout(resolve, TMUX_SPLIT_DELAY));
+                        await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
                     }
                     promptHandled = true;
                     await new Promise((resolve) => setTimeout(resolve, 500));
@@ -201,11 +201,6 @@ async function autoApproveTrustPrompt(paneInfo) {
                     }
                 }
             }
-            if (!hasTrustPrompt &&
-                !hasClaudePermissionPrompt &&
-                (paneContent.includes('Claude') || paneContent.includes('Assistant'))) {
-                break;
-            }
         }
         catch {
             // Continue checking

package/dist/utils/conflictResolutionPane.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflictResolutionPane.js","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conflictResolutionPane.js","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"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"}

package/dist/utils/errorHandling.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Error handling categories for catch blocks
+ * Based on MAINTENANCE.md recommendations
+ */
+/**
+ * CATEGORY 1: Optional UI operations
+ * Silent failures are acceptable, but should be documented
+ */
+export declare function handleOptionalOperation<T>(operation: () => T, context?: string): T | undefined;
+/**
+ * CATEGORY 2: Non-critical with fallback
+ * Log the error but continue with fallback value
+ */
+export declare function handleWithFallback<T>(operation: () => T, fallback: T, context: string): T;
+/**
+ * CATEGORY 3: Critical path operation
+ * Log and re-throw - caller must handle
+ */
+export declare function handleCriticalOperation<T>(operation: () => T, context: string): T;
+/**
+ * CATEGORY 4: Expected errors (like checking if something exists)
+ * Log at debug level and return false/null
+ */
+export declare function handleExpectedError<T>(operation: () => T, context: string, defaultValue: T): T;
+/**
+ * Common pattern: Check if a command/resource exists
+ * Returns true if exists, false otherwise
+ */
+export declare function checkExists(checkOperation: () => void, resourceName: string): boolean;
+/**
+ * Async versions of the above
+ */
+export declare function handleOptionalOperationAsync<T>(operation: () => Promise<T>, context?: string): Promise<T | undefined>;
+export declare function handleWithFallbackAsync<T>(operation: () => Promise<T>, fallback: T, context: string): Promise<T>;
+export declare function handleCriticalOperationAsync<T>(operation: () => Promise<T>, context: string): Promise<T>;
+export declare function handleExpectedErrorAsync<T>(operation: () => Promise<T>, context: string, defaultValue: T): Promise<T>;
+//# sourceMappingURL=errorHandling.d.ts.map

package/dist/utils/errorHandling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorHandling.d.ts","sourceRoot":"","sources":["../../src/utils/errorHandling.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,CAAC,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,CAAC,GAAG,SAAS,CAQf;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,SAAS,EAAE,MAAM,CAAC,EAClB,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,MAAM,GACd,CAAC,CAWH;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,CAAC,EAClB,OAAO,EAAE,MAAM,GACd,CAAC,CAWH;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,SAAS,EAAE,MAAM,CAAC,EAClB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,CAAC,GACd,CAAC,CAWH;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,cAAc,EAAE,MAAM,IAAI,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAWT;AAED;;GAEG;AAEH,wBAAsB,4BAA4B,CAAC,CAAC,EAClD,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAOxB;AAED,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAWZ;AAED,wBAAsB,4BAA4B,CAAC,CAAC,EAClD,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAWZ;AAED,wBAAsB,wBAAwB,CAAC,CAAC,EAC9C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,CAAC,GACd,OAAO,CAAC,CAAC,CAAC,CAWZ"}