agentp 0.9.0 → 0.11.0

package/bin/ocmux

@@ -2,11 +2,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const crypto = require('crypto');
 const readline = require('readline');
-const { spawnSync, execSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const os = require('os');
 const {
+  SESSION,
   readState,
   statefileFor,
   tuiPaneId,
@@ -15,6 +15,13 @@ const {
   activeWindowIndex,
   paneCount,
   listServers,
+  ensureSession,
+  pinWindowName,
+  sleep,
+  hashDir,
+  logfileFor,
+  URL_RE,
+  resurrectServer,
 } = require('../lib/ocmux');
 
 // ---------------------------------------------------------------------------
@@ -23,10 +30,8 @@ const {
 
 const { version } = require('../package.json');
 
-const SESSION = 'Opencode';
 const SCRIPT = path.basename(process.argv[1] || 'ocmux');
 const HOME = os.homedir();
-const URL_RE = /opencode server listening on (http:\/\/[^\s]*)/;
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -41,18 +46,6 @@ function tmux(args) {
   return result;
 }
 
-function sleep(seconds) {
-  execSync(`sleep ${seconds}`, { stdio: 'ignore' });
-}
-
-function hashDir(dir) {
-  return crypto.createHash('md5').update(dir).digest('hex').slice(0, 12);
-}
-
-function logfileFor(dir) {
-  return `/tmp/opencode-serve-${hashDir(dir)}.log`;
-}
-
 function findParentStatefile(startDir) {
   let dir = path.resolve(startDir);
   while (true) {
@@ -150,20 +143,7 @@ function ensureTuiZoomed(windowIndex) {
   if (paneId) tmux(['resize-pane', '-Z', '-t', paneId]);
 }
 
-function pinWindowName(windowIndex) {
-  tmux(['set-window-option', '-t', `${SESSION}:${windowIndex}`, 'automatic-rename', 'off']);
-}
 
-function ensureSession() {
-  const r = tmux(['has-session', '-t', SESSION]);
-  if (r.status !== 0) {
-    const rc = tmux(['new-session', '-d', '-s', SESSION]);
-    if (rc.status !== 0) {
-      console.error('Error: failed to create tmux session');
-      process.exit(1);
-    }
-  }
-}
 
 function outputUrl(url, dir, longMode) {
   if (longMode) {
@@ -185,17 +165,21 @@ function printHelp() {
   console.error('that session is used.');
   console.error('');
   console.error('Subcommands:');
-  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).');
-  console.error('          --GIT  Use the nearest parent with a .git directory only.');
-  console.error('          Refuses to create above an existing .ocmux.json found while searching.');
-  console.error(          '          --print-logs  Pass --print-logs to opencode serve (prints server logs to stderr).');
-  console.error('  kill    Kill the server found upward from <directory>.');
-  console.error('          Removes its tmux window and state file.');
-  console.error('  list    List all running servers with their directories and URLs.');
+  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).');
+  console.error('            --GIT  Use the nearest parent with a .git directory only.');
+  console.error('            Refuses to create above an existing .ocmux.json found while searching.');
+  console.error('            --print-logs  Pass --print-logs to opencode serve (prints server logs to stderr).');
+  console.error('  kill      Kill the server found upward from <directory>.');
+  console.error('            Removes its tmux window and state file.');
+  console.error('  resurrect Recover a dead server: kills the old window, removes the state file,');
+  console.error('            then creates a fresh server + TUI in the same directory.');
+  console.error('            Works even if no tmux window exists (stale state file).');
+  console.error('            --print-logs  Pass --print-logs to the new opencode serve.');
+  console.error('  list      List all running servers with their directories and URLs.');
   console.error('');
   console.error('  --         Treat the next argument as a directory even if it matches');
   console.error('            a subcommand name (e.g. "ocmux -- kill").');
@@ -207,6 +191,7 @@ function printHelp() {
   console.error('  -h       Show this help');
   console.error('');
   console.error('See also: agentp -- pipe prompts into OpenCode from stdin');
+  console.error('          tgagentp -- Telegram bridge for OpenCode (tgagentp --help)');
   process.exit(0);
 }
 
@@ -428,6 +413,30 @@ function cmdKill(statefile) {
   console.error('Done.');
 }
 
+// ---------------------------------------------------------------------------
+// Subcommand: resurrect — kill dead server and create a fresh one
+// ---------------------------------------------------------------------------
+
+function cmdResurrect(targetDir, longMode, printLogs) {
+  const sf = findParentStatefile(targetDir);
+  if (!sf) {
+    console.error(`Error: no .ocmux.json found in ${targetDir} or any of its parents.`);
+    console.error("Run 'ocmux serve' to create a new server.");
+    process.exit(1);
+  }
+
+  const serverDir = path.dirname(sf);
+  console.error(`Resurrecting server for ${serverDir}...`);
+
+  try {
+    const { url } = resurrectServer(serverDir, printLogs);
+    outputUrl(url, serverDir, longMode);
+  } catch (err) {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Argument parsing
 // ---------------------------------------------------------------------------
@@ -489,7 +498,7 @@ function main() {
         process.exit(1);
       }
       targetDir = resolveDir(arg);
-    } else if (arg === 'serve' || arg === 'new' || arg === 'kill' || arg === 'list') {
+    } else if (arg === 'serve' || arg === 'new' || arg === 'kill' || arg === 'list' || arg === 'resurrect') {
       if (subcommand) {
         console.error(`Error: multiple subcommands specified: '${subcommand}' and '${arg}'`);
         process.exit(1);
@@ -537,6 +546,12 @@ function main() {
       process.exit(1);
     }
     cmdKill(sf);
+  } else if (subcommand === 'resurrect') {
+    if (gitMode) {
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
+      process.exit(1);
+    }
+    cmdResurrect(targetDir, longMode, printLogs);
   } else if (subcommand === 'serve' || subcommand === 'new') {
     if (gitMode) {
       const flagLabel = gitMode === 'root' ? '--GIT' : '--git';