agentp 0.11.8 → 0.11.9

package/README.md

@@ -233,22 +233,9 @@ Non-text Telegram updates (photos, stickers, etc.) are silently ignored.
 | Command | Action |
 |---|---|
 | `/help [topic]` | Show general help or help for a topic (`servers`, `sessions`, `agents`, `models`, `allow`, `think`, `record`, `queue`) |
-| `/servers` | List all running ocmux-served projects with URL + status (✅ idle / ⏳ busy) |
+| `/servers` | List all ocmux-served projects (▶ active, 🔌 disconnected, 💀 dead) |
 | `/servers switch <name> [--force]` | Switch active server; matches by full path, basename, or substring; `--force` takes over from another chat |
-| `/serve <path>` | Start a server in an existing directory under `TGAGENTP_ROOT` |
-| `/new <path>` | Create a directory, init git, and start a server under `TGAGENTP_ROOT` |
-| `/sessions` | List recent sessions for the current server (max 50, with date headings) |
-| `/sessions switch <number\|name>` | Switch active session by position or partial name match |
-| `/agents` | List primary agents (▶ marker for the active one) |
-| `/agents switch <name>` | Switch active agent — persists on session and refreshes TUI |
-| `/models` | List connected providers with model counts, context limits, and costs |
-| `/status` | Show current server path, URL, busy status, and active session |
-| `/cancel` | Cancel the current AI response for the active server |
-| `/think [on\|off\|switch]` | Toggle forwarding of model thinking messages to the chat |
-| `/record [stop]` | Toggle recording of Telegram conversation for agentp context; `/record stop` clears and stops |
-| `/queue <message>` | Queue a message when the server is busy; auto-sent when current task finishes |
-| `/flush` | Clear all queued messages (manual and auto-queued) |
-| `/resurrect` | Recover a dead server — restart processes in the same directory, reconnect chat |
+| `/resurrect [path]` | Restart a crashed server from its `.ocmux.json`; accepts optional directory path |
 | `/allow` | Approve a permission request once |
 | `/reject` | Deny a permission request |
 | `/always` | Approve and remember for the session |

package/bin/ocmux

@@ -22,6 +22,7 @@ const {
   logfileFor,
   URL_RE,
   resurrectServer,
+  startServer,
   getActiveServer,
 } = require('../lib/ocmux');
 
@@ -332,7 +333,7 @@ function doNew(targetDir, longMode, printLogs) {
   try { fs.truncateSync(lf); } catch { /* may not exist yet */ }
 
   // Send the command to the interactive shell (like typing it manually)
-  const serveFlags = printLogs ? '--port 0 --print-logs' : '--port 0';
+  const serveFlags = printLogs ? '--print-logs' : '';
   tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`,
     `opencode serve ${serveFlags} 2>&1 | tee '${lf}'`, 'Enter']);
 

package/bin/tgagentp

@@ -18,7 +18,7 @@ const TGAGENTP_PORT = parseInt(process.env.TGAGENTP_PORT || '0', 10);
 const PORT_FILE = '/tmp/tgagentp-port';
 const TGAGENTP_DEBOUNCE_MS = parseInt(process.env.TGAGENTP_DEBOUNCE_MS || '5000', 10);
 const CONNECTIONS_FILE = '/tmp/tgagentp-connections.json';
-const { listServers, activateServer, resurrectServer, statefileFor, readState, tuiPaneId } = require('../lib/ocmux.js');
+const { listServers, activateServer, resurrectServer, statefileFor, readState, tuiPaneId, serverStatus, listDeadServers } = require('../lib/ocmux.js');
 const { executeTuiCommand } = require('../lib/tui-cmd.js');
 const { getUpdates, downloadTelegramFile, sendTelegramDocument } = require('../lib/telegram-api.js');
 const { sendLongMessage } = require('../lib/telegram-format.js');
@@ -559,14 +559,21 @@ async function cmdServers(token, chatId, args, chatState, setServerForChat, setA
     return;
   }
 
-  // Default: list servers
+  // Default: list servers (alive + dead)
   const servers = listServers();
-  if (servers.length === 0) {
-    await sendLongMessage(token, chatState, 'No servers running.');
+  // Also find dead servers from saved connections
+  let savedData;
+  try { savedData = JSON.parse(fs.readFileSync(CONNECTIONS_FILE, 'utf8')); } catch {}
+  const knownDirs = savedData && Array.isArray(savedData.connections)
+    ? savedData.connections.map(c => c.dir).filter(Boolean) : [];
+  const dead = listDeadServers(knownDirs);
+  const all = [...servers, ...dead.map(d => ({ url: d.url, dir: d.dir, index: d.windowIndex, status: 'dead' }))];
+  if (all.length === 0) {
+    await sendLongMessage(token, chatState, 'No servers found.');
     return;
   }
   const activeUrl = chatState.serverBase ? normalizeUrl(chatState.serverBase) : null;
-  const lines = servers.map(s => {
+  const lines = all.map(s => {
     const normalizedUrl = normalizeUrl(s.url);
     const isActive = activeUrl && normalizedUrl === activeUrl;
     const isOwned = Object.keys(serverOwners).some(url => normalizeUrl(url) === normalizedUrl);
@@ -575,12 +582,14 @@ async function cmdServers(token, chatId, args, chatState, setServerForChat, setA
       bullet = '▶ ';
     } else if (isOwned) {
       bullet = ' · ';
+    } else if (s.status === 'dead') {
+      bullet = '💀 ';
     } else {
       bullet = '🔌 ';
     }
     return bullet + `${s.url} → ${s.dir} (${s.status})`;
   });
-  const prefix = chatState.serverBase ? 'Active servers:' : 'Available servers:';
+  const prefix = chatState.serverBase ? 'All servers:' : 'Available servers:';
   await sendLongMessage(token, chatState, prefix + '\n' + lines.join('\n'));
 }
 
@@ -1363,31 +1372,53 @@ async function cmdComment(token, chatId, args, chatState) {
 }
 
 async function cmdResurrect(token, chatId, args, chatState) {
-  const url = chatState.serverBase;
-  if (!url) {
-    await sendLongMessage(token, chatState, '🔌 Not connected to any server. Nothing to resurrect.');
-    return;
-  }
-
-  let dir = serverDir(url);
-  if (!dir) {
-    // Fallback: look up directory from saved connections
-    try {
-      const savedData = JSON.parse(fs.readFileSync(CONNECTIONS_FILE, 'utf8'));
-      if (savedData && Array.isArray(savedData.connections)) {
-        const match = savedData.connections.find(c =>
-          String(c.chatId) === String(chatId) && (c.threadId || null) === (chatState.threadId || null)
-        );
-        if (match && match.dir) dir = match.dir;
+  let dir = null;
+  let url = null;
+  const dirArg = args && args.length > 0 ? args.join(' ') : null;
+  if (dirArg) {
+    // User specified a directory: resolve it
+    if (TGAGENTP_ROOT) {
+      const resolved = path.resolve(TGAGENTP_ROOT, dirArg);
+      if (resolved.startsWith(TGAGENTP_ROOT) && fs.existsSync(resolved)) {
+        dir = resolved;
       }
-    } catch {}
-  }
-  if (!dir) {
-    await sendLongMessage(token, chatState,
-      'Could not find the directory for this server.\n' +
-      'The tmux window may have been removed.\n' +
-      'Use `ocmux resurrect` from the terminal to recover it.');
-    return;
+    }
+    if (!dir) {
+      // Resolve against home or absolute path
+      const resolved = path.resolve(dirArg);
+      if (fs.existsSync(resolved)) dir = resolved;
+    }
+    if (!dir) {
+      await sendLongMessage(token, chatState, `❌ Directory not found: \`${dirArg}\``);
+      return;
+    }
+    // Read the old URL from the state file
+    const state = readState(statefileFor(dir));
+    url = state ? state.url : null;
+  } else {
+    url = chatState.serverBase;
+    if (!url) {
+      await sendLongMessage(token, chatState, '🔌 Not connected to any server. Specify a directory or switch to a server first.');
+      return;
+    }
+    dir = serverDir(url);
+    if (!dir) {
+      try {
+        const savedData = JSON.parse(fs.readFileSync(CONNECTIONS_FILE, 'utf8'));
+        if (savedData && Array.isArray(savedData.connections)) {
+          const match = savedData.connections.find(c =>
+            String(c.chatId) === String(chatId) && (c.threadId || null) === (chatState.threadId || null)
+          );
+          if (match && match.dir) dir = match.dir;
+        }
+      } catch {}
+    }
+    if (!dir) {
+      await sendLongMessage(token, chatState,
+        'Could not find the directory for this server.\n' +
+        'Use `ocmux resurrect` from the terminal or specify a directory: `/resurrect <path>`.');
+      return;
+    }
   }
 
   await sendLongMessage(token, chatState,
@@ -1486,9 +1517,16 @@ async function cmdServe(token, chatId, args, chatState, setServerForChat, setAct
   }
   const sf = statefileFor(targetDir);
   if (fs.existsSync(sf)) {
-    await sendLongMessage(token, chatState,
-      `⚠️ Server already exists for \`${relPath}\`.\n` +
-      'Use `/servers switch <name>` to connect to it.');
+    const status = serverStatus(targetDir);
+    if (status && status.status === 'dead') {
+      await sendLongMessage(token, chatState,
+        `💀 A dead server exists at \`${relPath}\` (${status.url}).\n` +
+        `Use \`/resurrect ${relPath}\` to restart it.`);
+    } else {
+      await sendLongMessage(token, chatState,
+        `⚠️ Server already exists for \`${relPath}\`.\n` +
+        'Use `/servers switch <name>` to connect to it.');
+    }
     return;
   }
   await sendLongMessage(token, chatState,
@@ -2020,7 +2058,7 @@ async function main() {
         const msg = isConnError
           ? `⚠️ Server \`${url}\` is unreachable. The message has been requeued and will be sent when the server is available again.\n\n` +
             `**Options:**\n` +
-            `• Start the server: \`ocmux serve\`\n` +
+            `• Restart it: \`/resurrect\`\n` +
             `• Switch to another server: \`/servers switch <name>\`\n` +
             `• Flush the queue: \`/flush\``
           : `Error: ${err.message}`;
@@ -2251,7 +2289,7 @@ async function main() {
             await sendLongMessage(token, cs,
               '🔄 Bot started. Previously connected to `' + dir + '`.\n' +
               '⚠️ The server at `' + state.url + '` is not reachable.\n' +
-              'Options: start the server with `ocmux serve`, or switch with `/servers switch <name>`.');
+              'Use `/resurrect` to restart it, or `/servers switch <name>` to connect elsewhere.');
           } catch (_) {}
         }
       }
@@ -2387,7 +2425,7 @@ async function main() {
               `⚠️ Server \`${cs.serverBase}\` is not reachable.\n\n` +
               `Your file upload has been queued (#${qlen}). It will be sent when the server becomes available.\n\n` +
               `**Options:**\n` +
-              `• Start the server: \`ocmux serve\`\n` +
+              `• Restart it: \`/resurrect\`\n` +
               `• Switch to another server: \`/servers switch <name>\`\n` +
               `• Flush the queue: \`/flush\``);
             continue;
@@ -2538,8 +2576,8 @@ async function main() {
         const cmdArgs = parts.slice(1);
         const handler = cmds[cmd];
         if (handler) {
-          // Disconnected guard: only /help, /servers, /force-switch, /start, /comment, /shutdown, /serve, and /new work without a server
-          if (!cs.serverBase && cmd !== 'help' && cmd !== 'servers' && cmd !== 'force-switch' && cmd !== 'start' && cmd !== 'comment' && cmd !== 'shutdown' && cmd !== 'serve' && cmd !== 'new') {
+          // Disconnected guard: only /help, /servers, /force-switch, /start, /comment, /shutdown, /serve, /new, and /resurrect work without a server
+          if (!cs.serverBase && cmd !== 'help' && cmd !== 'servers' && cmd !== 'force-switch' && cmd !== 'start' && cmd !== 'comment' && cmd !== 'shutdown' && cmd !== 'serve' && cmd !== 'new' && cmd !== 'resurrect') {
             await sendLongMessage(token, cs,
               '🔌 Not connected to any server.\n\n' +
               'Use `/servers` to see available servers and `/servers switch <name>` to connect.');
@@ -2588,7 +2626,7 @@ async function main() {
         const qlen = st.messageQueue.length;
         const servers = listServers();
         const suggestions = [];
-        suggestions.push(`• Start the server: \`ocmux serve\``);
+        suggestions.push(`• Restart it: \`/resurrect\``);
         if (servers.length > 0) {
           suggestions.push(`• Switch to another server: \`/servers switch <name>\``);
         }

package/lib/ocmux.js

@@ -130,6 +130,37 @@ function listServers() {
   return rows;
 }
 
+// Check the state of a server in a given directory.
+// Returns null if no .ocmux.json exists, or an object with status.
+function serverStatus(dir) {
+  const sf = statefileFor(dir);
+  const state = readState(sf);
+  if (!state || !state.url) return null;
+  const winIdx = windowByDir(dir);
+  const tui = winIdx != null ? tuiPaneId(winIdx) : null;
+  return {
+    dir,
+    url: state.url,
+    status: winIdx != null ? 'alive' : 'dead',
+    windowIndex: winIdx,
+    hasTui: tui != null,
+  };
+}
+
+// List dead servers by scanning known directories for orphaned .ocmux.json files.
+// dirs: array of directories to check (e.g. from connections file).
+// Returns entries with status 'dead' that are not already in listServers().
+function listDeadServers(knownDirs) {
+  const alive = new Set(listServers().map(s => s.dir));
+  const dead = [];
+  for (const dir of knownDirs) {
+    if (alive.has(dir)) continue;
+    const status = serverStatus(dir);
+    if (status) dead.push(status);
+  }
+  return dead;
+}
+
 // Switch tmux focus to the given server window and ensure the TUI pane is alive and zoomed.
 function activateServer(dir, index, url) {
   const winIdx = index;
@@ -182,6 +213,7 @@ function activateServer(dir, index, url) {
 
 // Recover a dead/crashed server: kill old window, remove state file,
 // create fresh server + TUI in the same directory.
+// Delegates to startServer for the actual server creation.
 // Returns { url, dir } on success, throws on error.
 function resurrectServer(dir, printLogs) {
   const sf = path.join(dir, '.ocmux.json');
@@ -209,7 +241,14 @@ function resurrectServer(dir, printLogs) {
   // Remove old state file so we can create a fresh one
   try { fs.unlinkSync(sf); } catch {}
 
-  // Create fresh server + TUI
+  // Start fresh server (same logic as ocmux serve)
+  return startServer(dir, printLogs);
+}
+
+// Start a new opencode server in the given directory.
+// Creates a tmux window, starts opencode serve, waits for the URL,
+// and writes .ocmux.json. Returns { url, dir } on success.
+function startServer(dir, printLogs) {
   ensureSession();
   const lf = logfileFor(dir);
 
@@ -223,16 +262,16 @@ function resurrectServer(dir, printLogs) {
 
   try { fs.truncateSync(lf); } catch {}
 
-  const serveFlags = printLogs ? '--port 0 --print-logs' : '--port 0';
+  const serveFlags = printLogs ? '--print-logs' : '';
   _tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`,
-    `opencode serve ${serveFlags} 2>&1 | tee '${lf}'`, 'Enter']);
+    'opencode serve' + (serveFlags ? ' ' + serveFlags : '') + ` 2>&1 | tee '${lf}'`, 'Enter']);
 
   let url = null;
   for (let i = 0; i < 50; i++) {
     sleep(0.2);
     const log = (() => { try { return fs.readFileSync(lf, 'utf8'); } catch { return ''; } })();
     const m = log.match(URL_RE);
-    if (m) url = m[1];
+    if (m) { url = m[1]; break; }
   }
 
   if (!url) {
@@ -242,7 +281,7 @@ function resurrectServer(dir, printLogs) {
   }
 
   const newState = { url, logfile: lf, window_index: winIdx };
-  fs.writeFileSync(sf, JSON.stringify(newState) + '\n');
+  fs.writeFileSync(path.join(dir, '.ocmux.json'), JSON.stringify(newState) + '\n');
 
   const splitResult = _tmux(['split-window', '-v', '-P', '-F', '#{pane_id}', '-t', `${SESSION}:${winIdx}`, '-c', dir]);
   const tuiPane = splitResult.stdout.trim();
@@ -278,4 +317,7 @@ module.exports = {
   ensureSession,
   pinWindowName,
   resurrectServer,
+  startServer,
+  serverStatus,
+  listDeadServers,
 };

package/package.json

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