dmux 3.2.0 → 3.3.1

package/dist/types.d.ts

@@ -41,6 +41,10 @@ export interface PanePosition {
     width: number;
     height: number;
 }
+export interface WindowDimensions {
+    width: number;
+    height: number;
+}
 export interface ProjectSettings {
     testCommand?: string;
     devCommand?: string;
@@ -72,6 +76,9 @@ export interface DmuxAppProps {
     serverPort?: number;
     server?: any;
     controlPaneId?: string;
+    rerenderRef?: {
+        current: ((element: React.ReactElement) => void) | null;
+    };
 }
 export interface DmuxConfig {
     projectName: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;AAEvE,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uBAAuB,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAE3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC,YAAY,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CACtC;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,YAAY,GAAG,MAAM,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACtC,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAGD,YAAY,EACV,QAAQ,EACR,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAG1B,YAAY,EACV,QAAQ,EACR,QAAQ,GACT,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"asciiArt.d.ts","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAmBD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAkDf;AAED;;GAEG;AACH,eAAO,MAAM,SAAS;;CAiBrB,CAAA"}
+{"version":3,"file":"asciiArt.d.ts","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAiDf;AAED;;GAEG;AACH,eAAO,MAAM,SAAS;;CAiBrB,CAAA"}

package/dist/utils/asciiArt.js

@@ -1,17 +1,5 @@
-import { execSync } from "child_process";
-/**
- * Get dimensions of a tmux pane
- */
-function getPaneDimensions(paneId) {
-    try {
-        const output = execSync(`tmux display-message -t '${paneId}' -p '#{pane_width} #{pane_height}'`, { encoding: "utf-8", stdio: "pipe" }).trim();
-        const [width, height] = output.split(" ").map((n) => parseInt(n));
-        return { width, height };
-    }
-    catch {
-        return { width: 80, height: 24 }; // Fallback
-    }
-}
+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
@@ -25,6 +13,7 @@ function getPaneDimensions(paneId) {
  */
 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");
@@ -32,9 +21,9 @@ export async function renderAsciiArt(options) {
     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"),
+        path.join(__dirname, "..", "panes", "decorative-pane.js"),
+        path.join(__dirname, "..", "..", "dist", "panes", "decorative-pane.js"),
+        path.join(process.cwd(), "dist", "panes", "decorative-pane.js"),
     ];
     let scriptPath = possiblePaths[0]; // Default
     for (const p of possiblePaths) {
@@ -49,19 +38,17 @@ export async function renderAsciiArt(options) {
     }
     // Kill any existing process in the pane
     try {
-        execSync(`tmux send-keys -t '${paneId}' C-c`, { stdio: "pipe" });
+        await tmuxService.sendKeys(paneId, 'C-c');
     }
     catch {
         // Pane might not have a running process, that's okay
     }
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    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);
-    execSync(`tmux send-keys -t '${paneId}' 'node "${absolutePath}"' Enter`, {
-        stdio: "pipe",
-    });
+    await tmuxService.sendKeys(paneId, `'node "${absolutePath}"' Enter`);
     await new Promise((resolve) => setTimeout(resolve, 150));
 }
 /**

package/dist/utils/asciiArt.js.map

@@ -1 +1 @@
-{"version":3,"file":"asciiArt.js","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"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"}
+{"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,OAAO,EAAE,oBAAoB,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,CAAC;QACvE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,CAAC;KAChE,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/atomicWrite.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Atomically writes content to a file using write-and-rename pattern
+ * This prevents readers from seeing partial/incomplete data
+ *
+ * @param filePath - The target file path
+ * @param content - The content to write
+ */
+export declare function atomicWriteFileSync(filePath: string, content: string): void;
+/**
+ * Atomically writes content to a file using write-and-rename pattern (async)
+ * This prevents readers from seeing partial/incomplete data
+ *
+ * @param filePath - The target file path
+ * @param content - The content to write
+ */
+export declare function atomicWriteFile(filePath: string, content: string): Promise<void>;
+/**
+ * Atomically writes a JSON object to a file (sync)
+ *
+ * @param filePath - The target file path
+ * @param data - The data to serialize and write
+ * @param pretty - Whether to pretty-print the JSON (default: true)
+ */
+export declare function atomicWriteJsonSync(filePath: string, data: any, pretty?: boolean): void;
+/**
+ * Atomically writes a JSON object to a file (async)
+ *
+ * @param filePath - The target file path
+ * @param data - The data to serialize and write
+ * @param pretty - Whether to pretty-print the JSON (default: true)
+ */
+export declare function atomicWriteJson(filePath: string, data: any, pretty?: boolean): Promise<void>;
+//# sourceMappingURL=atomicWrite.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"atomicWrite.d.ts","sourceRoot":"","sources":["../../src/utils/atomicWrite.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAwB3E;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBtF;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,GAAE,OAAc,GAAG,IAAI,CAG7F;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAGxG"}

package/dist/utils/atomicWrite.js

@@ -0,0 +1,89 @@
+import * as fs from 'fs';
+import { promises as fsPromises } from 'fs';
+import * as path from 'path';
+import { randomBytes } from 'crypto';
+/**
+ * Atomically writes content to a file using write-and-rename pattern
+ * This prevents readers from seeing partial/incomplete data
+ *
+ * @param filePath - The target file path
+ * @param content - The content to write
+ */
+export function atomicWriteFileSync(filePath, content) {
+    // Create a temporary file in the same directory (ensures same filesystem)
+    const dir = path.dirname(filePath);
+    const tempSuffix = randomBytes(8).toString('hex');
+    const tempPath = path.join(dir, `.${path.basename(filePath)}.${tempSuffix}.tmp`);
+    try {
+        // Write to temp file
+        fs.writeFileSync(tempPath, content, 'utf-8');
+        // Atomically rename temp file to target file
+        // On POSIX systems, rename() is atomic and will replace the target
+        fs.renameSync(tempPath, filePath);
+    }
+    catch (error) {
+        // Clean up temp file if it exists
+        try {
+            if (fs.existsSync(tempPath)) {
+                fs.unlinkSync(tempPath);
+            }
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+}
+/**
+ * Atomically writes content to a file using write-and-rename pattern (async)
+ * This prevents readers from seeing partial/incomplete data
+ *
+ * @param filePath - The target file path
+ * @param content - The content to write
+ */
+export async function atomicWriteFile(filePath, content) {
+    // Create a temporary file in the same directory (ensures same filesystem)
+    const dir = path.dirname(filePath);
+    const tempSuffix = randomBytes(8).toString('hex');
+    const tempPath = path.join(dir, `.${path.basename(filePath)}.${tempSuffix}.tmp`);
+    try {
+        // Write to temp file
+        await fsPromises.writeFile(tempPath, content, 'utf-8');
+        // Atomically rename temp file to target file
+        // On POSIX systems, rename() is atomic and will replace the target
+        await fsPromises.rename(tempPath, filePath);
+    }
+    catch (error) {
+        // Clean up temp file if it exists
+        try {
+            await fsPromises.unlink(tempPath);
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+}
+/**
+ * Atomically writes a JSON object to a file (sync)
+ *
+ * @param filePath - The target file path
+ * @param data - The data to serialize and write
+ * @param pretty - Whether to pretty-print the JSON (default: true)
+ */
+export function atomicWriteJsonSync(filePath, data, pretty = true) {
+    const content = pretty ? JSON.stringify(data, null, 2) : JSON.stringify(data);
+    atomicWriteFileSync(filePath, content);
+}
+/**
+ * Atomically writes a JSON object to a file (async)
+ *
+ * @param filePath - The target file path
+ * @param data - The data to serialize and write
+ * @param pretty - Whether to pretty-print the JSON (default: true)
+ */
+export async function atomicWriteJson(filePath, data, pretty = true) {
+    const content = pretty ? JSON.stringify(data, null, 2) : JSON.stringify(data);
+    await atomicWriteFile(filePath, content);
+}
+//# sourceMappingURL=atomicWrite.js.map

package/dist/utils/atomicWrite.js.map

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

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;AAK5C,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,CAkInB"}
+{"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"}