agentp 0.3.0 → 0.5.0

package/bin/ocmux

@@ -6,6 +6,16 @@ const crypto = require('crypto');
 const readline = require('readline');
 const { spawnSync, execSync } = require('child_process');
 const os = require('os');
+const {
+  readState,
+  statefileFor,
+  tuiPaneId,
+  windowByDir,
+  windowNameByIndex,
+  activeWindowIndex,
+  paneCount,
+  listServers,
+} = require('../lib/ocmux');
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -43,18 +53,6 @@ function logfileFor(dir) {
   return `/tmp/opencode-serve-${hashDir(dir)}.log`;
 }
 
-function statefileFor(dir) {
-  return path.join(dir, '.ocmux.json');
-}
-
-function readState(file) {
-  try {
-    return JSON.parse(fs.readFileSync(file, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
 function findParentStatefile(startDir) {
   let dir = path.resolve(startDir);
   while (true) {
@@ -98,7 +96,7 @@ function resolveGitDir(startDir, requireDir, flagLabel) {
   if (!result.dir) {
     const label = requireDir ? '.git directory' : '.git entry';
     console.error(`Error: no ${label} found in ${startDir} or any of its parents.`);
-    console.error(`Run '${SCRIPT} new' without ${flagLabel} to create a server in the current directory.`);
+    console.error(`Run '${SCRIPT} serve' without ${flagLabel} to create a server in the current directory.`);
     process.exit(1);
   }
 
@@ -112,52 +110,6 @@ function resolveGitDir(startDir, requireDir, flagLabel) {
   return result.dir;
 }
 
-function windowByDir(dir) {
-  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
-  if (r.status !== 0) return null;
-  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
-    const [idx, name] = line.split('\t');
-    if (name === dir) return parseInt(idx, 10);
-  }
-  return null;
-}
-
-function windowNameByIndex(idx) {
-  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
-  if (r.status !== 0) return null;
-  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
-    const [wi, name] = line.split('\t');
-    if (parseInt(wi, 10) === idx) return name;
-  }
-  return null;
-}
-
-function activeWindowIndex() {
-  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index} #{window_active}']);
-  if (r.status !== 0) return null;
-  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
-    const [idx, active] = line.split(' ');
-    if (active === '1') return parseInt(idx, 10);
-  }
-  return null;
-}
-
-function tuiPaneId(windowIndex) {
-  const r = tmux(['list-panes', '-t', `${SESSION}:${windowIndex}`, '-F', '#{pane_id}\t#{pane_current_command}']);
-  if (r.status !== 0) return null;
-  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
-    const [paneId, cmd] = line.split('\t');
-    if (cmd === 'node') return paneId;
-  }
-  return null;
-}
-
-function paneCount(windowIndex) {
-  const r = tmux(['list-panes', '-t', `${SESSION}:${windowIndex}`, '-F', '#{pane_id}']);
-  if (r.status !== 0) return 0;
-  return r.stdout.trim().split('\n').filter(Boolean).length;
-}
-
 function findWindowsByBasename(name) {
   const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_name}']);
   if (r.status !== 0) return [];
@@ -233,7 +185,8 @@ function printHelp() {
   console.error('that session is used.');
   console.error('');
   console.error('Subcommands:');
-  console.error('  new     Create a new server in <directory> (default: $PWD).');
+  console.error('  serve   Create a server in <directory> (default: $PWD) and attach a TUI.');
+  console.error('          Aliased as "new" for backwards compatibility.');
   console.error('          Errors if one already exists there.');
   console.error('          Warns if a parent directory already has a server.');
   console.error('          --git  Use the nearest parent with a .git entry (file or dir).');
@@ -247,7 +200,7 @@ function printHelp() {
   console.error('            a subcommand name (e.g. "ocmux -- kill").');
   console.error('');
   console.error('Options:');
-  console.error('  -l       Long output: append " → <dir>" after the URL (new/default).');
+  console.error('  -l       Long output: append " → <dir>" after the URL (serve/default).');
   console.error('  --version  Show version');
   console.error('  -h       Show this help');
   console.error('');
@@ -275,7 +228,7 @@ function cmdSwitch(statefile, longMode) {
     const found = windowByDir(serverDir);
     if (found == null) {
       console.error(`Error: tmux window for ${serverDir} not found`);
-      console.error("Run 'ocmux new' to create a new server.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     winIdx = found;
@@ -315,29 +268,7 @@ function cmdSwitch(statefile, longMode) {
 // ---------------------------------------------------------------------------
 
 function cmdList() {
-  const sessionR = tmux(['has-session', '-t', SESSION]);
-  if (sessionR.status !== 0) {
-    console.log('No opencode servers running.');
-    return;
-  }
-
-  const listR = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
-  if (listR.status !== 0 || !listR.stdout.trim()) {
-    console.log('No opencode servers running.');
-    return;
-  }
-
-  const rows = [];
-  for (const line of listR.stdout.trim().split('\n').filter(Boolean)) {
-    const [idx, dir] = line.split('\t');
-    const sf = path.join(dir, '.ocmux.json');
-    if (!fs.existsSync(sf)) continue;
-    const state = readState(sf);
-    if (!state || !state.url) continue;
-    const tui = tuiPaneId(parseInt(idx, 10));
-    rows.push({ url: state.url, dir, status: tui ? 'alive' : 'dead' });
-  }
-
+  const rows = listServers();
   if (rows.length === 0) {
     console.log('No opencode servers running.');
     return;
@@ -393,13 +324,28 @@ function doNew(targetDir, longMode) {
 
   console.error(`Starting opencode server for ${targetDir}...`);
 
-  const rc = tmux(['new-window', '-d', '-t', SESSION, '-n', targetDir, '-c', targetDir,
-    `opencode serve --port 0 2>&1 | tee '${lf}'`]);
+  // Create window with interactive shell so .bashrc/.zshrc is sourced
+  const rc = tmux(['new-window', '-d', '-t', SESSION, '-n', targetDir, '-c', targetDir]);
   if (rc.status !== 0) {
     console.error(`Error: failed to create tmux window: ${rc.stderr}`);
     process.exit(1);
   }
 
+  const winIdx = windowByDir(targetDir);
+  if (winIdx == null) {
+    console.error('Error: window was not created properly');
+    process.exit(1);
+  }
+
+  pinWindowName(winIdx);
+
+  // Truncate log file so stale URL from previous run can't be matched by polling
+  try { fs.truncateSync(lf); } catch { /* may not exist yet */ }
+
+  // Send the command to the interactive shell (like typing it manually)
+  tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`,
+    `opencode serve --port 0 2>&1 | tee '${lf}'`, 'Enter']);
+
   // Wait up to 10s for the URL in the logfile
   let url = null;
   for (let i = 0; i < 50; i++) {
@@ -416,21 +362,16 @@ function doNew(targetDir, longMode) {
     process.exit(1);
   }
 
-  const winIdx = windowByDir(targetDir);
-  if (winIdx == null) {
-    console.error('Error: window was not created properly');
-    process.exit(1);
-  }
-
-  pinWindowName(winIdx);
-
   const state = { url, logfile: lf, window_index: winIdx };
   fs.writeFileSync(path.join(targetDir, '.ocmux.json'), JSON.stringify(state) + '\n');
 
-  tmux(['split-window', '-v', '-t', `${SESSION}:${winIdx}`, '-c', targetDir,
-    `opencode attach --continue '${url}'`]);
+  const splitResult = tmux(['split-window', '-v', '-P', '-F', '#{pane_id}', '-t', `${SESSION}:${winIdx}`, '-c', targetDir]);
+  const tuiPane = splitResult.stdout.trim();
+  sleep(0.2);
+  tmux(['send-keys', '-t', tuiPane,
+    `opencode attach --continue '${url}'`, 'Enter']);
   sleep(0.5);
-  ensureTuiZoomed(winIdx);
+  if (tuiPane) tmux(['resize-pane', '-Z', '-t', tuiPane]);
 
   const activeWin = activeWindowIndex();
   if (activeWin !== winIdx) {
@@ -515,8 +456,10 @@ function main() {
     } else if (arg === '--') {
       dirIsForced = true;
     } else if (arg.startsWith('-')) {
-      if (arg === '--new' || arg === '--kill') {
-        console.error(`Error: '${arg}' is no longer a flag. Use 'ocmux ${arg.slice(2)}' instead.`);
+      if (arg === '--new') {
+        console.error("Error: '--new' is no longer a flag. Use 'ocmux serve' instead.");
+      } else if (arg === '--kill') {
+        console.error("Error: '--kill' is no longer a flag. Use 'ocmux kill' instead.");
       } else {
         console.error(`Error: unknown option '${arg}'`);
         console.error(`Run '${SCRIPT} -h' for help.`);
@@ -538,7 +481,7 @@ function main() {
         process.exit(1);
       }
       targetDir = resolveDir(arg);
-    } else if (arg === 'new' || arg === 'kill' || arg === 'list') {
+    } else if (arg === 'serve' || arg === 'new' || arg === 'kill' || arg === 'list') {
       if (subcommand) {
         console.error(`Error: multiple subcommands specified: '${subcommand}' and '${arg}'`);
         process.exit(1);
@@ -558,7 +501,7 @@ function main() {
   // Dispatch
   if (subcommand === 'list') {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
       process.exit(1);
     }
     if (targetDir !== process.cwd()) {
@@ -568,17 +511,17 @@ function main() {
     cmdList();
   } else if (subcommand === 'kill') {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
       process.exit(1);
     }
     const sf = findParentStatefile(targetDir);
     if (!sf) {
       console.error(`Error: no opencode server found in ${targetDir} or any of its parents.`);
-      console.error("Run 'ocmux new' to create a new server.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     cmdKill(sf);
-  } else if (subcommand === 'new') {
+  } else if (subcommand === 'serve' || subcommand === 'new') {
     if (gitMode) {
       const flagLabel = gitMode === 'root' ? '--GIT' : '--git';
       targetDir = resolveGitDir(targetDir, gitMode === 'root', flagLabel);
@@ -586,14 +529,14 @@ function main() {
     cmdNew(targetDir, longMode);
   } else {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
       process.exit(1);
     }
     // Default mode
     const sf = findParentStatefile(targetDir);
     if (!sf) {
       console.error(`Error: no opencode server found in ${targetDir} or any of its parents.`);
-      console.error("Run 'ocmux new' to create a new server.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     ensureSession();