agentp 0.11.11 → 1.12.1

package/bin/tgagentp

@@ -264,46 +264,80 @@ async function cmdHelp(token, chatId, args, chatState) {
     const topic = args[0].toLowerCase();
     if (topic === 'servers') {
       await sendLongMessage(token, chatState,
-        '`/servers` ─ list all opencode servers (ocmux sessions)\n' +
-        '`/servers switch <name>` ─ switch target server\n' +
-        '`/force-switch <name>` ─ take over a server from another chat\n\n' +
-        'Name matching: case-insensitive first, then case-sensitive. ' +
-        '`<name>` can be a full path or basename of the project directory.');
+        '`/servers` ─ list running servers\n' +
+        '  • Shows alive and dead servers\n' +
+        '  • Your server marked with ▶\n\n' +
+        '`/server <name>` ─ switch to a server by directory path or basename\n' +
+        '`/server --force <name>` ─ take over a server from another chat');
+      return;
+    }
+    if (topic === 'agents') {
+      await sendLongMessage(token, chatState,
+        '`/agents` ─ list primary agents\n' +
+        '  • Current agent marked with ▶\n' +
+        '  • Shows model and description\n\n' +
+        '`/agent <name>` ─ switch to an agent');
+      return;
+    }
+    if (topic === 'sessions') {
+      await sendLongMessage(token, chatState,
+        '`/sessions` ─ list sessions\n' +
+        '  • Primary-agent sessions shown by default (includes subagent sessions to maintain context)\n' +
+        '  • Active session marked with ▶\n' +
+        '  • Grouped by recency: Today, this week, older months\n\n' +
+        '`/session <name-or-number>` ─ switch to a session by name or position\n' +
+        '`/session new [name]` ─ create a new session\n' +
+        '`/session rename <name>` ─ rename the active session');
       return;
     }
     if (topic === 'sessions') {
       await sendLongMessage(token, chatState,
         '`/sessions` ─ list active sessions (numbered, newest first, max 50)\n' +
-        '`/sessions switch <number-or-name>` ─ send messages to a specific session\n' +
-        '`/sessions new [name]` ─ create a new session\n' +
-        '`/sessions rename <name>` ─ rename the active session\n\n' +
+        '`/session <name-or-number>` ─ switch to a session by name or position\n' +
+        '`/session new [name]` ─ create a new session\n' +
+        '`/session rename <name>` ─ rename the active session\n\n' +
         'Switch by number (from the list) or by case-insensitive partial name match.\n' +
         'Use `/sessions` to find session numbers.');
       return;
     }
-    if (topic === 'shutdown') {
+    if (topic === 'servers') {
+      await sendLongMessage(token, chatState,
+        '`/servers` ─ list running servers\n' +
+        '  • Shows alive and dead servers\n' +
+        '  • Your server marked with ▶\n\n' +
+        '`/server <name>` ─ switch to a server by directory path or basename\n' +
+        '`/server --force <name>` ─ take over a server from another chat');
+      return;
+    }
+    if (topic === 'server') {
       await sendLongMessage(token, chatState,
-        '`/shutdown` ─ stop tgagentp process\n' +
-        '`/shutdown force` ─ force shutdown even if busy (in-flight work will be lost)\n\n' +
-        'Only available when tgagentp is started with `--dev` flag.\n' +
-        'Useful when running tgagentp in a restart loop:\n' +
-        '`while true; do tgagentp --dev; done`');
+        '`/server <name>` ─ switch to a server by directory path or basename.\n' +
+        '`/server --force <name>` ─ take over a server from another chat.\n\n' +
+        'Matches by full directory path, basename, or case-insensitive substring.\n' +
+        'Use `/servers` to see available servers.');
       return;
     }
     if (topic === 'agents') {
       await sendLongMessage(token, chatState,
         '`/agents` ─ list primary agents (with ▶ marker for the active one).\n' +
-        '`/agents switch <name>` ─ switch the active agent. Subsequent messages will use this agent.\n\n' +
-        'Agent switching requires an active session (`/sessions switch` or `/sessions new`).');
+        '`/agent <name>` ─ switch the active agent. Subsequent messages will use this agent.\n\n' +
+        'Agent switching requires an active session (`/session <name>` or `/session new`).');
+      return;
+    }
+    if (topic === 'agent') {
+      await sendLongMessage(token, chatState,
+        '`/agent <name>` ─ switch the active agent.\n\n' +
+        'Matches by exact name first, then case-insensitive substring.\n' +
+        'The agent is synced to the server session via API.\n' +
+        'Use `/agents` to list available agents.');
       return;
     }
     if (topic === 'session') {
       await sendLongMessage(token, chatState,
-        '`/session` is an alias for `/sessions`.\n\n' +
-        '`/sessions` ─ list active sessions\n' +
-        '`/sessions switch <number-or-name>` ─ switch to a session\n' +
-        '`/sessions new [name]` ─ create a new session\n' +
-        '`/sessions rename <name>` ─ rename the active session');
+        '`/session <name-or-number>` ─ switch to a session by name or position\n' +
+        '`/session new [name]` ─ create a new session\n' +
+        '`/session rename <name>` ─ rename the active session\n\n' +
+        'Use `/sessions` to list available sessions with numbers.');
       return;
     }
     if (topic === 'models') {
@@ -390,7 +424,7 @@ async function cmdHelp(token, chatId, args, chatState) {
     if (topic === 'disconnect') {
       await sendLongMessage(token, chatState,
         '`/disconnect` ─ disconnect this chat from its server\n\n' +
-        'Clears the server connection for this chat. Use `/servers switch <name>` to reconnect.');
+        'Clears the server connection for this chat. Use `/server <name>` to reconnect.');
       return;
     }
     if (topic === 'status') {
@@ -453,7 +487,7 @@ async function cmdHelp(token, chatId, args, chatState) {
       return;
     }
     await sendLongMessage(token, chatState,
-      'Unknown topic. Try `/help servers`, `/help sessions`, `/help agents`, `/help models`, `/help allow`, `/help think`, `/help record`, `/help queue`, `/help flush`, `/help note`, `/help comment`, `/help disconnect`, `/help serve`, `/help new`, `/help markdown`, or just `/help`.');
+      'Unknown topic. Try `/help servers`, `/help server`, `/help sessions`, `/help session`, `/help agents`, `/help agent`, `/help models`, `/help model`, `/help allow`, `/help think`, `/help record`, `/help queue`, `/help flush`, `/help note`, `/help comment`, `/help disconnect`, `/help serve`, `/help new`, `/help markdown`, or just `/help`.');
     return;
   }
   await sendLongMessage(token, chatState,
@@ -462,16 +496,16 @@ async function cmdHelp(token, chatId, args, chatState) {
     '`/status` ─ show current server and session\n' +
     '`/cancel` ─ cancel the running prompt\n' +
     '`/servers` ─ list running opencode servers\n' +
-    '`/servers switch <name>` ─ switch to a different server\n' +
-    '`/force-switch <name>` ─ take over a server from another chat\n' +
-    '`/sessions` ─ list/create/switch/rename sessions\n' +
-    '`/sessions switch <number-or-name>` ─ switch to a session\n' +
-    '`/sessions new [name]` ─ create a new session\n' +
-    '`/sessions rename <name>` ─ rename the active session\n' +
-    '`/session` ─ alias for `/sessions`\n' +
+    '`/server <name>` ─ switch to a different server\n' +
+    '`/server --force <name>` ─ take over a server from another chat\n' +
+    '`/sessions` ─ list sessions\n' +
+    '`/session <name-or-number>` ─ switch to a session\n' +
+    '`/session new [name]` ─ create a new session\n' +
+    '`/session rename <name>` ─ rename the active session\n' +
     '`/agents` ─ list available agents\n' +
-    '`/agents switch <name>` ─ switch active agent\n' +
+    '`/agent <name>` ─ switch active agent\n' +
     '`/models` ─ list providers and models\n' +
+    '`/model <provider/model>` ─ switch session model\n' +
     '`/think` ─ toggle thinking message forwarding\n' +
     '`/record` ─ record Telegram conversation for agentp context\n' +
     '`/queue <message>` ─ queue a message when server is busy\n' +
@@ -489,90 +523,18 @@ async function cmdHelp(token, chatId, args, chatState) {
     'Everything else is forwarded to the active server as `[Telegram] <text>`.');
 }
 
-async function cmdForceSwitch(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
-  return cmdServers(token, chatId, ['switch', '--force', ...args], chatState, setServerForChat, setActiveSessionForChat);
-}
-
 async function cmdServers(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
-  const isForce = args.length > 0 && args[0].toLowerCase() === 'force-switch';
-  if (args.length > 0 && (args[0].toLowerCase() === 'switch' || isForce)) {
-    const forceIdx = args.indexOf('--force');
-    const force = forceIdx !== -1 || isForce;
-    const switchArgs = args.slice(1).filter(a => a !== '--force');
-    if (switchArgs.length < 1) {
-      await sendLongMessage(token, chatState,
-        'Usage: `/servers switch <name>`\n' +
-        'To force-switch (take over a server from another chat), use `/force-switch <name>`.\n' +
-        '`<name>` can be a full directory path or a basename.');
-      return;
-    }
-    const name = switchArgs.join(' ');
-    const servers = listServers();
-    if (servers.length === 0) {
-      await sendLongMessage(token, chatState, 'No servers running.');
-      return;
-    }
-
-    // Phase 1: case-insensitive exact match on dir or basename
-    let matches = servers.filter(s => s.dir.toLowerCase() === name.toLowerCase());
-    if (matches.length === 0) {
-      matches = servers.filter(s => path.basename(s.dir).toLowerCase() === name.toLowerCase());
-    }
-    // Fallback: case-insensitive substring match
-    if (matches.length === 0) {
-      const lowerName = name.toLowerCase();
-      matches = servers.filter(s => s.dir.toLowerCase().includes(lowerName) || path.basename(s.dir).toLowerCase().includes(lowerName));
-    }
-
-    if (matches.length === 1) {
-      // Phase 1 found a single match — use it directly
-    } else if (matches.length === 0) {
-      await sendLongMessage(token, chatState, `No server found matching "${name}".`);
-      return;
-    } else {
-      // Phase 2: case-sensitive exact match to disambiguate
-      let exact = servers.filter(s => s.dir === name);
-      if (exact.length === 0) {
-        exact = servers.filter(s => path.basename(s.dir) === name);
-      }
-      if (exact.length === 1) {
-        matches = exact;
-      } else {
-        const list = matches.map(s => `  ${s.url} → ${s.dir}`).join('\n');
-        await sendLongMessage(token, chatState,
-          `Multiple matches for "${name}":\n${list}\n\nPlease be more specific.`);
-        return;
-      }
+  // Backward compatibility: redirect old subcommands to singular commands
+  if (args.length > 0) {
+    const sub = args[0].toLowerCase();
+    if (sub === 'switch') {
+      const rest = args.slice(1).filter(a => a !== '--force');
+      const force = args.includes('--force');
+      return cmdServer(token, chatId, force ? ['--force', ...rest] : rest, chatState, setServerForChat, setActiveSessionForChat);
     }
-    const target = matches[0];
-    const existing = serverOwners[target.url];
-    if (existing && existing.chatId !== chatState.chatId && !force) {
-      await sendLongMessage(token, chatState,
-        `⚠️ Server \`${target.url}\` is already connected to another chat.\n\n` +
-        `Use \`/servers force-switch ${name}\` to take over (the other chat will be disconnected).`);
-      return;
+    if (sub === 'force-switch') {
+      return cmdServer(token, chatId, ['--force', ...args.slice(1)], chatState, setServerForChat, setActiveSessionForChat);
     }
-    if (existing && existing.chatId === chatState.chatId) {
-      // Already connected — re-run setup to refresh state
-    }
-    if (force && existing && existing.chatId !== chatState.chatId) {
-      // Reset the old owner's server and notify them
-      const oldState = getChatState(existing.chatId, existing.threadId);
-      oldState.serverBase = null;
-      sendLongMessage(token, oldState,
-        `⚠️ Server \`${target.url}\` has been taken over by another chat.\n\n` +
-        `Use \`/servers\` to see available servers and reconnect.`).catch(() => {});
-    }
-    const pending = await setServerForChat(chatState, target.url);
-    activateServer(target.dir, target.index, target.url);
-    let msg = `Switched to server: ${target.url} → ${target.dir}`;
-    if (pending && pending.trim()) {
-      await sendLongMessage(token, chatState, msg);
-      await sendLongMessage(token, chatState, pending.trim());
-    } else {
-      await sendLongMessage(token, chatState, msg);
-    }
-    return;
   }
 
   // Default: list servers (alive + dead)
@@ -650,106 +612,19 @@ async function discoverActiveSession(server) {
 
 async function cmdSessions(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
   const server = chatState.serverBase;
+  // Backward compatibility: redirect old subcommands to singular commands
   if (args.length > 0) {
     const sub = args[0].toLowerCase();
-
-    if (sub === 'new') {
-      const title = args.slice(1).join(' ') || undefined;
-      try {
-        const session = await createSession(server, title);
-        const name = session.title || session.slug || session.id;
-        setActiveSessionForChat(chatState, session.id, name);
-        selectSession(server, session.id);
-        await sendLongMessage(token, chatState,
-          `Created session: \`${name}\`\nIt is now the active session.`);
-      } catch (err) {
-        await sendLongMessage(token, chatState, `Error creating session: ${err.message}`);
-      }
-      return;
+    if (sub === 'switch' || sub === 'new' || sub === 'rename') {
+      return cmdSession(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat);
     }
-
-    if (sub === 'rename') {
-      if (args.length < 2) {
-        await sendLongMessage(token, chatState, 'Usage: `/sessions rename <name>`');
-        return;
-      }
-      const st = getState(server);
-      if (!st.activeSessionId) {
-        await sendLongMessage(token, chatState, 'No active session. Use `/sessions switch` or `/sessions new` first.');
-        return;
-      }
-      const newTitle = args.slice(1).join(' ');
-      try {
-        const session = await updateSession(server, st.activeSessionId, newTitle);
-        const name = session.title || session.slug || session.id;
-        await sendLongMessage(token, chatState,
-          `Renamed session to: \`${name}\``);
-      } catch (err) {
-        await sendLongMessage(token, chatState, `Error renaming session: ${err.message}`);
-      }
-      return;
-    }
-
-    if (sub === 'switch') {
-      if (args.length < 2) {
-        await sendLongMessage(token, chatState,
-          'Usage: `/sessions switch <number-or-name>`\n' +
-          'Use `/sessions` to see numbered list. You can switch by number or by name (case-insensitive partial match).');
-        return;
-      }
-      const query = args.slice(1).join(' ');
-      try {
-        const projectDir = serverDir(server);
-        const sessions = await listSessions(server, projectDir);
-        const activeId = getState(server).activeSessionId;
-        const filtered = sessions.filter(s =>
-          (s.agent || s.directory || s.id === activeId) && (!projectDir || s.directory === projectDir));
-        const sorted = sortedSessions(filtered, 50);
-
-        // Try by position number first
-        const num = parseInt(query, 10);
-        if (/^\d+$/.test(query) && num >= 1 && num <= sorted.length) {
-          const target = sorted[num - 1];
-          setActiveSessionForChat(chatState, target.id, sessionName(target));
-          selectSession(server, target.id);
-          await sendLongMessage(token, chatState,
-            `Switched to session #${num}: \`${sessionName(target)}\`\nSubsequent messages will be sent to this session.`);
-          return;
-        }
-
-        // Try by name (case-insensitive partial match)
-        const q = query.toLowerCase();
-        const matches = sorted.filter(s => sessionName(s).toLowerCase().includes(q));
-        if (matches.length === 0) {
-          await sendLongMessage(token, chatState,
-            `No session matching "${query}". Use /sessions to list active sessions.`);
-          return;
-        }
-        if (matches.length > 1) {
-          const list = matches.map(s => `  \`${sessionName(s)}\``).join('\n');
-          await sendLongMessage(token, chatState,
-            `Multiple matches for "${query}":\n${list}\n\nPlease be more specific or use a number.`);
-          return;
-        }
-        const target = matches[0];
-        setActiveSessionForChat(chatState, target.id);
-        selectSession(server, target.id);
-        await sendLongMessage(token, chatState,
-          `Switched to session: \`${sessionName(target)}\`\nSubsequent messages will be sent to this session.`);
-      } catch (err) {
-        await sendLongMessage(token, chatState, `Error switching session: ${err.message}`);
-      }
-      return;
-    }
-
-    // Unknown subcommand
     await sendLongMessage(token, chatState,
       `Unknown subcommand: /sessions ${sub}\n\n` +
       'Usage:\n' +
       '  `/sessions` ─ list sessions\n' +
-      '  `/sessions switch <number-or-name>` ─ switch to a session\n' +
-      '  `/sessions new [name]` ─ create a new session\n' +
-      '  `/sessions rename <name>` ─ rename the active session');
+      '  `/session <name-or-number>` ─ switch to a session\n' +
+      '  `/session new [name]` ─ create a new session\n' +
+      '  `/session rename <name>` ─ rename the active session');
     return;
   }
 
@@ -823,48 +698,9 @@ async function cmdSessions(token, chatId, args, chatState, setServerForChat, set
 
 async function cmdAgents(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
   const server = chatState.serverBase;
+  // Backward compatibility: redirect /agents switch to /agent
   if (args.length > 0 && args[0].toLowerCase() === 'switch') {
-    if (args.length < 2) {
-      await sendLongMessage(token, chatState,
-        'Usage: `/agents switch <name>`\n' +
-        'Use `/agents` to list available agents.');
-      return;
-    }
-    const name = args.slice(1).join(' ');
-    try {
-      const agents = await listAgents(server);
-      if (!agents || agents.length === 0) {
-        await sendLongMessage(token, chatState, 'No agents available.');
-        return;
-      }
-      let matches = agents.filter(a => a.name === name);
-      if (matches.length === 0) {
-        matches = agents.filter(a => a.name.toLowerCase().includes(name.toLowerCase()));
-      }
-      if (matches.length === 0) {
-        await sendLongMessage(token, chatState, `No agent matching "${name}".`);
-        return;
-      }
-      if (matches.length > 1) {
-        const list = matches.map(a => `  \`${a.name}\``).join('\n');
-        await sendLongMessage(token, chatState,
-          `Multiple matches for "${name}":\n${list}\n\nPlease be more specific.`);
-        return;
-      }
-      const target = matches[0];
-      getState(server).activeAgentName = target.name;
-      const st = getState(server);
-      if (st.activeSessionId) {
-        updateSession(server, st.activeSessionId, undefined, target.name);
-        selectSession(server, st.activeSessionId);
-      }
-      const model = target.model ? ` ─ \`${target.model.providerID}/${target.model.modelID}\`` : '';
-      await sendLongMessage(token, chatState,
-        `Switched to agent: **${target.name}**${model}\nSubsequent messages will use this agent.`);
-    } catch (err) {
-      await sendLongMessage(token, chatState, `Error switching agent: ${err.message}`);
-    }
-    return;
+    return cmdAgent(token, chatId, args.slice(1), chatState, setServerForChat, setActiveSessionForChat);
   }
 
   try {
@@ -1181,20 +1017,38 @@ async function processTelegramCommands(text, server, token, chatState) {
   const filesSent = [];
   const dir = serverDir(server);
 
+  // Resolve a file path: absolute paths used directly, relative paths resolved
+  // against the server's working directory. Returns null and sends an error
+  // message if the resolved path is outside the server's working directory.
+  function resolveUploadPath(p, errPrefix) {
+    const absolute = path.isAbsolute(p) ? p : path.resolve(dir || '', p);
+    if (!dir) return absolute; // no server dir — trust the path
+    let realDir, realPath;
+    try { realDir = fs.realpathSync(dir); } catch { realDir = dir; }
+    try { realPath = fs.realpathSync(absolute); } catch { realPath = absolute; }
+    if (!realPath.startsWith(realDir + path.sep) && realPath !== realDir) {
+      sendLongMessage(token, chatState,
+        `❌ ${errPrefix}: path outside project directory.\n` +
+        `  Path: \`${p}\`\n` +
+        `  Project: \`${realDir}\`\n\n` +
+        `Use a full path (starting with /) or a path relative to the project root.`).catch(() => {});
+      return null;
+    }
+    return absolute;
+  }
+
   for (let i = 0; i < lines.length; i++) {
     const payload = parseTelegramLine(lines[i]);
     if (!payload) continue;
 
     if (payload.command === 'upload' && payload.path) {
       toStrip.add(i);
-      const resolved = dir ? path.resolve(dir, payload.path) : path.resolve(payload.path);
-      if (dir && !resolved.startsWith(dir + path.sep)) {
-        log.error(`processTelegramCommands: path outside project rejected: ${payload.path}`);
-        continue;
-      }
+      const resolved = resolveUploadPath(payload.path, 'Upload');
+      if (!resolved) continue;
       try {
         if (!fs.existsSync(resolved)) {
-          log.error(`processTelegramCommands: file not found: ${resolved}`);
+          await sendLongMessage(token, chatState,
+            `❌ File not found: \`${resolved}\``);
           continue;
         }
         const fileData = fs.readFileSync(resolved);
@@ -1203,22 +1057,21 @@ async function processTelegramCommands(text, server, token, chatState) {
         await sendTelegramDocument(token, chatState, fileData, fileName, caption);
         filesSent.push(fileName);
       } catch (err) {
-        log.error(`processTelegramCommands: failed to send file ${resolved}: ${err.message}`);
+        await sendLongMessage(token, chatState,
+          `❌ Failed to upload \`${resolved}\`: ${err.message}`);
       }
     } else if (payload.command === 'download' && payload.fileId && payload.path) {
       toStrip.add(i);
-      const resolved = dir ? path.resolve(dir, payload.path) : path.resolve(payload.path);
-      if (dir && !resolved.startsWith(dir + path.sep)) {
-        log.error(`processTelegramCommands: download path outside project rejected: ${payload.path}`);
-        continue;
-      }
+      const resolved = resolveUploadPath(payload.path, 'Download');
+      if (!resolved) continue;
       try {
         const fileData = await downloadTelegramFile(token, payload.fileId);
         fs.mkdirSync(path.dirname(resolved), { recursive: true });
         fs.writeFileSync(resolved, fileData);
         filesSent.push(path.basename(resolved));
       } catch (err) {
-        log.error(`processTelegramCommands: failed to download file: ${err.message}`);
+        await sendLongMessage(token, chatState,
+          `❌ Failed to download file to \`${resolved}\`: ${err.message}`);
       }
     } else if (payload.command === 'help') {
       toStrip.add(i);
@@ -1638,7 +1491,7 @@ async function cmdServe(token, chatId, args, chatState, setServerForChat, setAct
     } else {
       await sendLongMessage(token, chatState,
         `⚠️ Server already exists for \`${relPath}\`.\n` +
-        'Use `/servers switch <name>` to connect to it.');
+        'Use `/server <name>` to connect to it.');
     }
     return;
   }
@@ -1836,6 +1689,210 @@ async function cmdModel(token, chatId, args, chatState, setServerForChat, setAct
   }
 }
 
+async function cmdServer(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
+  if (args.length === 0) {
+    await sendLongMessage(token, chatState,
+      'Usage: `/server <name>`\n' +
+      'To force-switch (take over a server from another chat), use `/server --force <name>`.\n' +
+      '`<name>` can be a full directory path or a basename.\n' +
+      'Use `/servers` to list available servers.');
+    return;
+  }
+  const forceIdx = args.indexOf('--force');
+  const force = forceIdx !== -1;
+  const nameArgs = args.filter((a, i) => a !== '--force');
+  if (nameArgs.length === 0) {
+    await sendLongMessage(token, chatState,
+      'Usage: `/server <name>`\n' +
+      'To force-switch, use `/server --force <name>`.');
+    return;
+  }
+  const name = nameArgs.join(' ');
+  const servers = listServers();
+  if (servers.length === 0) {
+    await sendLongMessage(token, chatState, 'No servers running.');
+    return;
+  }
+  let matches = servers.filter(s => s.dir.toLowerCase() === name.toLowerCase());
+  if (matches.length === 0) {
+    matches = servers.filter(s => path.basename(s.dir).toLowerCase() === name.toLowerCase());
+  }
+  if (matches.length === 0) {
+    const lowerName = name.toLowerCase();
+    matches = servers.filter(s => s.dir.toLowerCase().includes(lowerName) || path.basename(s.dir).toLowerCase().includes(lowerName));
+  }
+  if (matches.length === 0) {
+    await sendLongMessage(token, chatState, `No server found matching "${name}".`);
+    return;
+  }
+  if (matches.length > 1) {
+    let exact = servers.filter(s => s.dir === name);
+    if (exact.length === 0) exact = servers.filter(s => path.basename(s.dir) === name);
+    if (exact.length === 1) {
+      matches = exact;
+    } else {
+      const list = matches.map(s => `  ${s.url} → ${s.dir}`).join('\n');
+      await sendLongMessage(token, chatState,
+        `Multiple matches for "${name}":\n${list}\n\nPlease be more specific.`);
+      return;
+    }
+  }
+  const target = matches[0];
+  const existing = serverOwners[target.url];
+  if (existing && existing.chatId !== chatState.chatId && !force) {
+    await sendLongMessage(token, chatState,
+      `⚠️ Server \`${target.url}\` is already connected to another chat.\n\n` +
+      `Use \`/server --force ${name}\` to take over (the other chat will be disconnected).`);
+    return;
+  }
+  if (force && existing && existing.chatId !== chatState.chatId) {
+    const oldState = getChatState(existing.chatId, existing.threadId);
+    oldState.serverBase = null;
+    sendLongMessage(token, oldState,
+      `⚠️ Server \`${target.url}\` has been taken over by another chat.\n\n` +
+      `Use \`/servers\` to see available servers and reconnect.`).catch(() => {});
+  }
+  const pending = await setServerForChat(chatState, target.url);
+  activateServer(target.dir, target.index, target.url);
+  let msg = `Switched to server: ${target.url} → ${target.dir}`;
+  if (pending && pending.trim()) {
+    await sendLongMessage(token, chatState, msg);
+    await sendLongMessage(token, chatState, pending.trim());
+  } else {
+    await sendLongMessage(token, chatState, msg);
+  }
+}
+
+async function cmdSession(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
+  const server = chatState.serverBase;
+  if (args.length === 0) {
+    await sendLongMessage(token, chatState,
+      '`/session <name-or-number>` ─ switch to a session\n' +
+      '`/session new [name]` ─ create a new session\n' +
+      '`/session rename <name>` ─ rename the active session\n' +
+      'Use `/sessions` to list available sessions.');
+    return;
+  }
+  const sub = args[0].toLowerCase();
+  if (sub === 'new') {
+    const title = args.slice(1).join(' ') || undefined;
+    try {
+      const session = await createSession(server, title);
+      const name = session.title || session.slug || session.id;
+      setActiveSessionForChat(chatState, session.id, name);
+      selectSession(server, session.id);
+      await sendLongMessage(token, chatState,
+        `Created session: \`${name}\`\nIt is now the active session.`);
+    } catch (err) {
+      await sendLongMessage(token, chatState, `Error creating session: ${err.message}`);
+    }
+    return;
+  }
+  if (sub === 'rename') {
+    if (args.length < 2) {
+      await sendLongMessage(token, chatState, 'Usage: `/session rename <name>`');
+      return;
+    }
+    const st = getState(server);
+    if (!st.activeSessionId) {
+      await sendLongMessage(token, chatState, 'No active session. Use `/session <name>` to select one first.');
+      return;
+    }
+    const newTitle = args.slice(1).join(' ');
+    try {
+      const session = await updateSession(server, st.activeSessionId, newTitle);
+      const name = session.title || session.slug || session.id;
+      await sendLongMessage(token, chatState, `Renamed session to: \`${name}\``);
+    } catch (err) {
+      await sendLongMessage(token, chatState, `Error renaming session: ${err.message}`);
+    }
+    return;
+  }
+  // Switch to session by name or number
+  const query = args.join(' ');
+  try {
+    const projectDir = serverDir(server);
+    const sessions = await listSessions(server, projectDir);
+    const activeId = getState(server).activeSessionId;
+    const filtered = sessions.filter(s =>
+      (s.agent || s.directory || s.id === activeId) && (!projectDir || s.directory === projectDir));
+    const sorted = sortedSessions(filtered, 50);
+    const num = parseInt(query, 10);
+    if (/^\d+$/.test(query) && num >= 1 && num <= sorted.length) {
+      const target = sorted[num - 1];
+      setActiveSessionForChat(chatState, target.id, sessionName(target));
+      selectSession(server, target.id);
+      await sendLongMessage(token, chatState,
+        `Switched to session #${num}: \`${sessionName(target)}\`\nSubsequent messages will be sent to this session.`);
+      return;
+    }
+    const q = query.toLowerCase();
+    const matches = sorted.filter(s => sessionName(s).toLowerCase().includes(q));
+    if (matches.length === 0) {
+      await sendLongMessage(token, chatState,
+        `No session matching "${query}". Use /sessions to list active sessions.`);
+      return;
+    }
+    if (matches.length > 1) {
+      const list = matches.map(s => `  \`${sessionName(s)}\``).join('\n');
+      await sendLongMessage(token, chatState,
+        `Multiple matches for "${query}":\n${list}\n\nPlease be more specific or use a number.`);
+      return;
+    }
+    const target = matches[0];
+    setActiveSessionForChat(chatState, target.id);
+    selectSession(server, target.id);
+    await sendLongMessage(token, chatState,
+      `Switched to session: \`${sessionName(target)}\`\nSubsequent messages will be sent to this session.`);
+  } catch (err) {
+    await sendLongMessage(token, chatState, `Error switching session: ${err.message}`);
+  }
+}
+
+async function cmdAgent(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat) {
+  const server = chatState.serverBase;
+  if (args.length === 0) {
+    await sendLongMessage(token, chatState,
+      'Usage: `/agent <name>`\n' +
+      'Use `/agents` to list available agents.');
+    return;
+  }
+  const name = args.join(' ');
+  try {
+    const agents = await listAgents(server);
+    if (!agents || agents.length === 0) {
+      await sendLongMessage(token, chatState, 'No agents available.');
+      return;
+    }
+    let matches = agents.filter(a => a.name === name);
+    if (matches.length === 0) {
+      matches = agents.filter(a => a.name.toLowerCase().includes(name.toLowerCase()));
+    }
+    if (matches.length === 0) {
+      await sendLongMessage(token, chatState, `No agent matching "${name}".`);
+      return;
+    }
+    if (matches.length > 1) {
+      const list = matches.map(a => `  \`${a.name}\``).join('\n');
+      await sendLongMessage(token, chatState,
+        `Multiple matches for "${name}":\n${list}\n\nPlease be more specific.`);
+      return;
+    }
+    const target = matches[0];
+    getState(server).activeAgentName = target.name;
+    const st = getState(server);
+    if (st.activeSessionId) {
+      updateSession(server, st.activeSessionId, undefined, target.name);
+      selectSession(server, st.activeSessionId);
+    }
+    const model = target.model ? ` ─ \`${target.model.providerID}/${target.model.modelID}\`` : '';
+    await sendLongMessage(token, chatState,
+      `Switched to agent: **${target.name}**${model}\nSubsequent messages will use this agent.`);
+  } catch (err) {
+    await sendLongMessage(token, chatState, `Error switching agent: ${err.message}`);
+  }
+}
+
 async function cmdMarkdown(token, chatId, args, chatState, setServerForChat, setActiveSessionForChat, replyTo, replyToMsgId) {
   let entry = null;
   if (replyToMsgId) {
@@ -1859,10 +1916,11 @@ async function cmdMarkdown(token, chatId, args, chatState, setServerForChat, set
 const COMMANDS = {
   'help': cmdHelp,
   'servers': cmdServers,
-  'force-switch': cmdForceSwitch,
+  'server': cmdServer,
   'sessions': cmdSessions,
-  'session': cmdSessions,
+  'session': cmdSession,
   'agents': cmdAgents,
+  'agent': cmdAgent,
   'models': cmdModels,
   'model': cmdModel,
   'think': cmdThink,
@@ -2113,8 +2171,13 @@ async function main() {
     'Do NOT use CLI tools to generate them — just include them directly in your response:\n\n' +
     'To send a file to the user:\n' +
     '[Telegram]{"command":"upload","path":"<relative-path>","msg":"<optional caption>"}\n\n' +
+    '**Important:** `path` is relative to the project root (the OpenCode server\'s working directory).\n' +
+    'If the project uses a git worktree, the worktree directory IS the project root.\n' +
+    'Use CLI commands like `cat ./path/to/file` to verify the file exists before uploading.\n\n' +
     'To download a file the user sent:\n' +
     '[Telegram]{"command":"download","fileId":"<id>","path":"<relative-destination>"}\n\n' +
+    '**Important:** `path` is also relative to the project root (the OpenCode server\'s working directory).\n' +
+    'Use `ls` or `pwd` to confirm the current working directory before specifying download paths.\n\n' +
     'For more details about a command:\n' +
     '[Telegram]{"command":"help","topic":"<upload|download|help>"}';
 
@@ -2133,6 +2196,7 @@ async function main() {
     const monRef = { current: null };
     st._monitorRef = monRef;
     st._monitorStarted = true;
+    st._monitoredSessionId = sessionId;
 
     const notifiedPerms = new Set();
 
@@ -2198,6 +2262,7 @@ async function main() {
       if (getState(server)._monitorRef === monRef) {
         getState(server)._monitorRef = null;
         getState(server)._monitorStarted = false;
+        getState(server)._monitoredSessionId = null;
       }
     });
   }
@@ -2230,6 +2295,20 @@ async function main() {
 
   async function processMessageAsync(chatId, text, url, useSession, sessionId, myTaskId, replyTo, threadId) {
     const st = getState(url);
+    // Auto-discover active session if not set
+    if (!sessionId) {
+      try {
+        const discovered = await discoverActiveSession(url);
+        if (discovered) {
+          st.activeSessionId = discovered.id;
+          st.activeSessionName = discovered.name;
+          sessionId = discovered.id;
+          useSession = true;
+        }
+      } catch (err) {
+        log.debug(`processMessageAsync: auto-discover error: ${err.message}`);
+      }
+    }
     const isCancelled = () => getState(url).taskId !== myTaskId;
     const cancelRef = { current: null };
     const chatState = { chatId, threadId };
@@ -2240,11 +2319,12 @@ async function main() {
     st._cancelRef = cancelRef;
     st._sessionReq = sessionCancelRef;
 
-    // Ensure the persistent session monitor is running so question/permission
-    // events from any source (agentp, tgagentp, TUI) are caught, not just
-    // those triggered by this message's per-request SSE listener.
-    if (useSession && sessionId && !st._monitorStarted) {
-      startSessionMonitor(url, sessionId);
+    // Ensure the persistent session monitor is running and tracking the current session.
+    // Always restart when sessionId changes so TUI-initiated session switches are followed.
+    if (useSession && sessionId) {
+      if (!st._monitorStarted || st._monitoredSessionId !== sessionId) {
+        startSessionMonitor(url, sessionId);
+      }
     }
 
     try {
@@ -2338,7 +2418,7 @@ async function main() {
           ? `⚠️ Server \`${url}\` is unreachable. The message has been requeued and will be sent when the server is available again.\n\n` +
             `**Options:**\n` +
             `• Restart it: \`/resurrect\`\n` +
-            `• Switch to another server: \`/servers switch <name>\`\n` +
+            `• Switch to another server: \`/server <name>\`\n` +
             `• Flush the queue: \`/flush\``
           : `Error: ${err.message}`;
         try { await sendLongMessage(token, chatState, msg, replyTo, threadId); } catch (_) {}
@@ -2576,7 +2656,7 @@ async function main() {
             await sendLongMessage(token, cs,
               '🔄 Bot started. Previously connected to `' + dir + '`.\n' +
               '⚠️ The server at `' + state.url + '` is not reachable.\n' +
-              'Use `/resurrect` to restart it, or `/servers switch <name>` to connect elsewhere.');
+              'Use `/resurrect` to restart it, or `/server <name>` to connect elsewhere.');
           } catch (_) {}
         }
       }
@@ -2725,7 +2805,7 @@ async function main() {
               `Your file upload has been queued (#${qlen}). It will be sent when the server becomes available.\n\n` +
               `**Options:**\n` +
               `• Restart it: \`/resurrect\`\n` +
-              `• Switch to another server: \`/servers switch <name>\`\n` +
+              `• Switch to another server: \`/server <name>\`\n` +
               `• Flush the queue: \`/flush\``);
             continue;
           }
@@ -2875,11 +2955,11 @@ 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, /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') {
+          // Disconnected guard: /help, /servers, /server, /start, /comment, /shutdown, /serve, /new, and /resurrect work without a server
+          if (!cs.serverBase && cmd !== 'help' && cmd !== 'servers' && cmd !== 'server' && 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.');
+              'Use `/servers` to see available servers and `/server <name>` to connect.');
             continue;
           }
           try {
@@ -2891,7 +2971,7 @@ async function main() {
           }
         } else {
           await sendLongMessage(token, cs,
-            `Unknown command: /${cmd}\n\nAvailable commands: /help, /status, /servers, /sessions, /agents, /models, /model, /think, /record, /queue, /flush, /note, /comment, /disconnect, /serve, /new, /markdown`);
+            `Unknown command: /${cmd}\n\nAvailable commands: /help, /status, /servers, /server, /sessions, /session, /agents, /agent, /models, /model, /think, /record, /queue, /flush, /note, /comment, /disconnect, /serve, /new, /markdown`);
         }
         continue;
       }
@@ -2900,7 +2980,7 @@ async function main() {
       if (!cs.serverBase) {
         await sendLongMessage(token, cs,
           '🔌 Not connected to any server.\n\n' +
-          'Use `/servers` to see available servers and `/servers switch <name>` to connect.');
+          'Use `/servers` to see available servers and `/server <name>` to connect.');
         continue;
       }
 
@@ -2927,7 +3007,7 @@ async function main() {
         const suggestions = [];
         suggestions.push(`• Restart it: \`/resurrect\``);
         if (servers.length > 0) {
-          suggestions.push(`• Switch to another server: \`/servers switch <name>\``);
+          suggestions.push(`• Switch to another server: \`/server <name>\``);
         }
         suggestions.push(`• Flush the queue: \`/flush\``);
         await sendLongMessage(token, cs,