agentp 0.11.11 → 1.12.1

package/lib/ocmux.js

@@ -233,13 +233,29 @@ function resurrectServer(dir, printLogs) {
       const actualName = windowNameByIndex(winIdx);
       if (actualName !== dir) {
         const found = windowByDir(dir);
-        if (found != null) winIdx = found;
+        if (found == null) {
+          // No window exists for this directory — old server is already dead, skip kill
+          winIdx = null;
+        } else {
+          winIdx = found;
+        }
       }
       if (winIdx != null) {
         _tmux(['select-window', '-t', `${SESSION}:${winIdx}`]);
         _tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`, 'C-c']);
         sleep(0.3);
-        _tmux(['kill-window', '-t', `${SESSION}:${winIdx}`]);
+        const killR = _tmux(['kill-window', '-t', `${SESSION}:${winIdx}`]);
+        if (killR.status !== 0) {
+          throw new Error(`Failed to kill old tmux window ${winIdx}: ${killR.stderr || 'unknown error'}`);
+        }
+        // Wait for window to actually disappear (up to 2s)
+        for (let i = 0; i < 10; i++) {
+          if (windowByDir(dir) == null) break;
+          sleep(0.2);
+        }
+        if (windowByDir(dir) != null) {
+          throw new Error(`Old tmux window for ${dir} still exists after kill`);
+        }
       }
     }
   }
@@ -260,11 +276,14 @@ function startServer(dir, printLogs) {
   ensureSession();
   const lf = logfileFor(dir);
 
-  const rc = _tmux(['new-window', '-d', '-t', SESSION, '-n', dir, '-c', dir]);
-  if (rc.status !== 0) throw new Error(`failed to create tmux window for ${dir}`);
-
-  const winIdx = windowByDir(dir);
-  if (winIdx == null) throw new Error('window was not created properly');
+  // Create a new tmux window and capture its index directly from the -P output
+  const newWinR = _tmux(['new-window', '-d', '-P', '-F', '#{window_index}', '-t', SESSION, '-n', dir, '-c', dir]);
+  if (newWinR.status !== 0) throw new Error(`failed to create tmux window for ${dir}`);
+  let winIdx = parseInt(newWinR.stdout.trim(), 10);
+  if (isNaN(winIdx)) {
+    winIdx = windowByDir(dir);
+    if (winIdx == null) throw new Error('could not determine new window index');
+  }
 
   pinWindowName(winIdx);
 
@@ -283,8 +302,7 @@ function startServer(dir, printLogs) {
   }
 
   if (!url) {
-    const wi = windowByDir(dir);
-    if (wi != null) _tmux(['kill-window', '-t', `${SESSION}:${wi}`]);
+    _tmux(['kill-window', '-t', `${SESSION}:${winIdx}`]);
     throw new Error('opencode server did not start within 10 seconds');
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentp",
-  "version": "0.11.11",
+  "version": "1.12.1",
   "description": "Pipe prompts into a running OpenCode TUI session and stream the final answer",
   "bin": {
     "agentp": "bin/agentp",