@pixelbyte-software/pixcode 1.53.11 → 1.53.13

package/server/services/telegram/bot.js

@@ -7,6 +7,7 @@ import {
   handleTelegramControlCallback,
   handleTelegramControlMessage,
   isTelegramControlCommand,
+  sendActiveTerminalAttachedNotice,
   showMainMenu,
 } from './control-center.js';
 import { t } from './translations.js';
@@ -359,6 +360,20 @@ export const notifyUser = async ({ userId, kind, title, error }) => {
   return sendToUser(userId, text);
 };
 
+export const notifyTelegramTerminalAttached = async ({ userId, terminal }) => {
+  const link = telegramLinksDb.getByUserId(userId);
+  if (!bot) return { ok: false, reason: 'bot_not_running' };
+  if (!link?.chat_id || !link?.verified_at) return { ok: false, reason: 'telegram_not_paired' };
+  if (!terminal) return { ok: false, reason: 'missing_terminal' };
+  try {
+    await sendActiveTerminalAttachedNotice({ bot, chatId: link.chat_id, link, terminal });
+    return { ok: true };
+  } catch (err) {
+    console.warn('[telegram] terminal attach notice failed:', err?.message || err);
+    return { ok: false, reason: err?.message || String(err) };
+  }
+};
+
 // Boot the bot automatically if a token was previously persisted. This runs
 // once during server startup so a restart doesn't silently un-pair everyone.
 export const restoreBotFromConfig = async () => {

package/server/services/telegram/control-center.js

@@ -75,6 +75,8 @@ const CONTROL_COMMANDS = new Set([
   '/workflow',
   '/orchestrate',
   '/cancel',
+  '/terminal',
+  '/detach',
   'menu',
 ]);
 
@@ -509,16 +511,27 @@ function startActivityHeartbeat({ bot, chatId, activity }) {
 }
 
 function stateSummary(lang, state) {
-  return [
+  const lines = [
     `${t(lang, 'control.summary.project')}: ${state.selectedProjectName || t(lang, 'control.notSelected')}`,
     `${t(lang, 'control.summary.provider')}: ${state.selectedProvider}${state.selectedModel ? ` / ${state.selectedModel}` : ''}`,
     `${t(lang, 'control.summary.workflow')}: ${state.selectedWorkflowId || t(lang, 'control.notSelected')}`,
     `${t(lang, 'control.summary.progress')}: ${state.progressMode}`,
-  ].join('\n');
+  ];
+  if (state.activeTerminal) {
+    lines.push(`${t(lang, 'control.summary.terminal')}: ${state.activeTerminal.provider} / ${state.activeTerminal.projectLabel || state.activeTerminal.projectName || compact(state.activeTerminal.projectPath, 50)}`);
+  }
+  return lines.join('\n');
 }
 
-function mainMenuKeyboard(lang) {
+function terminalControlKeyboard(lang) {
   return [
+    [button(t(lang, 'control.button.terminalRefresh'), 'terminal_status'), button(t(lang, 'control.button.detachTerminal'), 'detach_terminal')],
+    [button(t(lang, 'control.button.mainMenu'), 'menu')],
+  ];
+}
+
+function mainMenuKeyboard(lang, state = null) {
+  const keyboard = [
     [button(t(lang, 'control.button.projects'), 'projects'), button(t(lang, 'control.button.provider'), 'providers')],
     [button(t(lang, 'control.button.models'), 'models'), button(t(lang, 'control.button.workflows'), 'workflows')],
     [button(t(lang, 'control.button.runs'), 'runs'), button(t(lang, 'control.button.approvals'), 'approvals')],
@@ -527,6 +540,10 @@ function mainMenuKeyboard(lang) {
     [button(t(lang, 'control.button.install'), 'install_menu'), button(t(lang, 'control.button.auth'), 'auth_menu')],
     [button(t(lang, 'control.button.settings'), 'settings')],
   ];
+  if (state?.activeTerminal) {
+    keyboard.splice(1, 0, [button(t(lang, 'control.button.terminal'), 'terminal_status'), button(t(lang, 'control.button.detachTerminal'), 'detach_terminal')]);
+  }
+  return keyboard;
 }
 
 export async function showMainMenu({ bot, chatId, link, editMessageId, notice }) {
@@ -535,7 +552,7 @@ export async function showMainMenu({ bot, chatId, link, editMessageId, notice })
   const prefix = notice ? `${notice}\n\n` : '';
   await send(bot, chatId, `${prefix}${t(lang, 'control.menu')}\n\n${stateSummary(lang, state)}`, {
     editMessageId,
-    reply_markup: { inline_keyboard: mainMenuKeyboard(lang) },
+    reply_markup: { inline_keyboard: mainMenuKeyboard(lang, state) },
   });
 }
 
@@ -549,8 +566,165 @@ async function showCommandPalette({ bot, chatId, link, editMessageId, unknown =
   const prefix = unknown ? `${t(lang, 'control.unknownCommand')}\n\n` : '';
   await send(bot, chatId, `${prefix}${t(lang, 'control.help')}\n\n${t(lang, 'control.examples')}`, {
     editMessageId,
-    reply_markup: { inline_keyboard: mainMenuKeyboard(lang) },
+    reply_markup: { inline_keyboard: mainMenuKeyboard(lang, getState(link.user_id)) },
+  });
+}
+
+function getActiveTerminal(state) {
+  const terminal = state?.activeTerminal;
+  if (
+    !terminal ||
+    !PROVIDERS.includes(terminal.provider) ||
+    typeof terminal.projectPath !== 'string' ||
+    !terminal.projectPath.trim()
+  ) {
+    return null;
+  }
+  return terminal;
+}
+
+function terminalProjectLabel(terminal) {
+  return terminal?.projectLabel || terminal?.projectName || terminal?.projectPath || '-';
+}
+
+function terminalOutputUrl(terminal, maxChars = 3200) {
+  const params = new URLSearchParams({
+    provider: terminal.provider,
+    projectPath: terminal.projectPath,
+    maxChars: String(maxChars),
+  });
+  if (terminal.tabId) params.set('tabId', terminal.tabId);
+  if (terminal.sessionId) params.set('sessionId', terminal.sessionId);
+  return `/api/shell/sessions/provider-output?${params.toString()}`;
+}
+
+function renderTerminalSnapshot(lang, terminal, data, { prefix = '', includeOutput = false } = {}) {
+  const active = data?.active !== false;
+  const lifecycle = data?.terminalState || data?.lifecycleState || (active ? 'running' : 'not running');
+  const output = String(data?.output || '').trim();
+  const lines = [
+    prefix || t(lang, active ? 'control.terminalAttached' : 'control.terminalNotRunning'),
+    '',
+    `🤖 ${t(lang, 'control.activity.provider')}: ${terminal.provider}`,
+    `📁 ${t(lang, 'control.activity.project')}: ${compact(terminalProjectLabel(terminal), 90)}`,
+    `📌 ${t(lang, 'control.activity.status')}: ${lifecycle}`,
+  ];
+  if (terminal.sessionId || data?.sessionId) {
+    lines.push(`🧵 ${t(lang, 'control.activity.session')}: ${terminal.sessionId || data.sessionId}`);
+  }
+  if (includeOutput && output) {
+    lines.push('', `💬 ${t(lang, 'control.activity.output')}:`);
+    lines.push(truncate(output, 2400));
+  } else {
+    lines.push('', t(lang, 'control.terminalOutputHidden'));
+  }
+  return truncate(lines.join('\n'), 3400);
+}
+
+export async function sendActiveTerminalAttachedNotice({ bot, chatId, link, terminal }) {
+  const lang = languageFor(link);
+  const lines = [
+    t(lang, 'control.terminalAttached'),
+    '',
+    `🤖 ${t(lang, 'control.activity.provider')}: ${terminal.provider}`,
+    `📁 ${t(lang, 'control.activity.project')}: ${compact(terminalProjectLabel(terminal), 90)}`,
+    `📌 ${t(lang, 'control.activity.status')}: ${t(lang, 'control.terminalReadyStatus')}`,
+  ];
+  if (terminal.sessionId) {
+    lines.push(`🧵 ${t(lang, 'control.activity.session')}: ${terminal.sessionId}`);
+  }
+  lines.push('', t(lang, 'control.terminalReadyPrompt'));
+  await send(bot, chatId, truncate(lines.join('\n'), 3400), {
+    parse_mode: undefined,
+    reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
+  });
+}
+
+async function showActiveTerminalStatus({ bot, chatId, link, editMessageId }) {
+  const lang = languageFor(link);
+  const state = getState(link.user_id);
+  const terminal = getActiveTerminal(state);
+  if (!terminal) {
+    await send(bot, chatId, t(lang, 'control.noActiveTerminal'), {
+      editMessageId,
+      reply_markup: { inline_keyboard: [[button(t(lang, 'control.button.mainMenu'), 'menu')]] },
+    });
+    return;
+  }
+  try {
+    const data = await localApi(link.user_id, terminalOutputUrl(terminal), { timeoutMs: 12_000 });
+    await send(bot, chatId, renderTerminalSnapshot(lang, terminal, data), {
+      editMessageId,
+      parse_mode: undefined,
+      reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
+    });
+  } catch (error) {
+    await send(bot, chatId, t(lang, 'control.terminalStatusFailed', { error: error?.message || String(error) }), {
+      editMessageId,
+      reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
+    });
+  }
+}
+
+async function detachActiveTerminal({ bot, chatId, link, editMessageId }) {
+  const lang = languageFor(link);
+  updateTelegramControlState(link.user_id, { activeTerminal: null });
+  await send(bot, chatId, t(lang, 'control.terminalDetached'), {
+    editMessageId,
+    reply_markup: { inline_keyboard: [[button(t(lang, 'control.button.mainMenu'), 'menu')]] },
+  });
+}
+
+async function sendToActiveTerminal({ bot, chatId, link, text }) {
+  const lang = languageFor(link);
+  const state = getState(link.user_id);
+  const terminal = getActiveTerminal(state);
+  if (!terminal) return false;
+  if (state.remoteControlEnabled === false) {
+    await send(bot, chatId, t(lang, 'control.disabled'));
+    return true;
+  }
+
+  const sent = await send(bot, chatId, t(lang, 'control.terminalSending', {
+    provider: terminal.provider,
+    project: terminalProjectLabel(terminal),
+  }), {
+    parse_mode: undefined,
+    reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
   });
+  const editMessageId = sent?.message_id || sent?.message?.message_id || null;
+
+  try {
+    await localApi(link.user_id, '/api/shell/sessions/provider-input', {
+      method: 'POST',
+      timeoutMs: 15_000,
+      body: {
+        provider: terminal.provider,
+        projectPath: terminal.projectPath,
+        tabId: terminal.tabId,
+        sessionId: terminal.sessionId,
+        input: text,
+        submit: true,
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 700));
+    const data = await localApi(link.user_id, terminalOutputUrl(terminal), { timeoutMs: 12_000 });
+    await send(bot, chatId, renderTerminalSnapshot(lang, terminal, data, {
+      prefix: t(lang, 'control.terminalSent'),
+    }), {
+      editMessageId,
+      parse_mode: undefined,
+      reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
+    });
+  } catch (error) {
+    await send(bot, chatId, t(lang, 'control.terminalSendFailed', {
+      error: error?.message || String(error),
+    }), {
+      editMessageId,
+      reply_markup: { inline_keyboard: terminalControlKeyboard(lang) },
+    });
+  }
+  return true;
 }
 
 async function listProjects() {
@@ -1646,6 +1820,14 @@ async function handleCommand({ bot, chatId, link, text }) {
     await showSessions({ bot, chatId, link });
     return true;
   }
+  if (command === '/terminal') {
+    await showActiveTerminalStatus({ bot, chatId, link });
+    return true;
+  }
+  if (command === '/detach') {
+    await detachActiveTerminal({ bot, chatId, link });
+    return true;
+  }
   if (command === '/newchat') {
     await startNewChat({ bot, chatId, link });
     return true;
@@ -1736,6 +1918,9 @@ async function handleTelegramControlMessageInternal({ bot, msg, link }) {
   if (await handleCommand({ bot, chatId, link, text })) return true;
 
   const state = getState(link.user_id);
+  if (getActiveTerminal(state)) {
+    return sendToActiveTerminal({ bot, chatId, link, text });
+  }
   if (state.routerEnabled === false) return false;
   if (!state.remoteControlEnabled) {
     await send(bot, chatId, t(languageFor(link), 'control.disabled'));
@@ -1836,6 +2021,8 @@ async function handleTelegramControlCallbackInternal({ bot, query, link }) {
   if (action === 'control_room') return showControlRoom({ bot, chatId, link, editMessageId });
   if (action === 'webhooks') return showWebhookMenu({ bot, chatId, link, editMessageId });
   if (action === 'sessions') return showSessions({ bot, chatId, link, editMessageId });
+  if (action === 'terminal_status') return showActiveTerminalStatus({ bot, chatId, link, editMessageId });
+  if (action === 'detach_terminal') return detachActiveTerminal({ bot, chatId, link, editMessageId });
   if (action === 'new_chat') return startNewChat({ bot, chatId, link, editMessageId });
   if (action === 'install_menu') return showInstallMenu({ bot, chatId, link, editMessageId });
   if (action === 'auth_menu') return showAuthMenu({ bot, chatId, link, editMessageId });

package/server/services/telegram/translations.js

@@ -18,7 +18,7 @@ const EN = {
   'bridge.queued': '📨 Message forwarded to your latest session. I will reply when the agent responds.',
   'bridge.disabled': 'Message bridge is disabled. Enable it in Pixcode → Settings → Telegram.',
   'control.menu': 'Pixcode Telegram control center',
-  'control.help': 'Commands: /menu, /projects, /provider, /model, /workflows, /runs, /approvals, /control-room, /webhooks, /sessions, /newchat, /chat <prompt>, /workflow <prompt>, /install, /auth, /settings, /progress final|steps|errors|all, /control on|off.',
+  'control.help': 'Commands: /menu, /projects, /provider, /model, /workflows, /runs, /approvals, /control-room, /webhooks, /sessions, /terminal, /detach, /newchat, /chat <prompt>, /workflow <prompt>, /install, /auth, /settings, /progress final|steps|errors|all, /control on|off.',
   'control.examples': 'Examples:\n/chat summarize this project\n/chat fix the last error\n/workflow review the current changes\n/settings to change language and progress mode',
   'control.unknownCommand': 'I do not know that command yet. Here are the available Pixcode commands:',
   'control.onboarding': 'How to start:\n/projects to pick a project\n/provider to pick the CLI\n/model to choose the model\n/chat <prompt> to run the current agent\n/workflow <prompt> to run orchestration\n/help to see all commands',
@@ -26,6 +26,7 @@ const EN = {
   'control.summary.provider': 'Provider',
   'control.summary.workflow': 'Workflow',
   'control.summary.progress': 'Progress',
+  'control.summary.terminal': 'Terminal',
   'control.notSelected': 'not selected',
   'control.button.projects': 'Projects',
   'control.button.provider': 'Provider',
@@ -57,6 +58,9 @@ const EN = {
   'control.button.deny': 'Deny',
   'control.button.confirm': 'Confirm',
   'control.button.cancel': 'Cancel',
+  'control.button.terminal': 'Active terminal',
+  'control.button.terminalRefresh': 'Refresh terminal',
+  'control.button.detachTerminal': 'Detach terminal',
   'control.noProjects': 'No Pixcode projects were found yet. Add/open a project in Pixcode first.',
   'control.pickProject': 'Pick the project Telegram should control:',
   'control.projectNotFound': 'No project matched "{{query}}". Pick one from the list.',
@@ -73,6 +77,18 @@ const EN = {
   'control.noWebhooks': 'No webhooks are configured yet.',
   'control.noSessions': 'No sessions were found for the selected project.',
   'control.recentSessions': 'Recent sessions:',
+  'control.noActiveTerminal': 'No web CLI session is attached to this Telegram chat. Open a CLI tab in Pixcode and press the Telegram button.',
+  'control.terminalAttached': '📲 Telegram is attached to this web CLI session. New plain messages will be sent to the terminal.',
+  'control.terminalReadyStatus': 'attached',
+  'control.terminalReadyPrompt': 'Write your next message here to continue this web CLI session. Use /detach to return Telegram to the normal AI router.',
+  'control.terminalNotRunning': 'The attached CLI terminal is not running anymore.',
+  'control.terminalNoOutput': 'No terminal output yet.',
+  'control.terminalOutputHidden': 'Live CLI screen output is not dumped into Telegram because full-screen terminal UIs are noisy. Keep sending messages here, or open Pixcode for the live terminal.',
+  'control.terminalSending': '📲 Sending to {{provider}} terminal on {{project}}...',
+  'control.terminalSent': '📲 Sent to the active terminal.',
+  'control.terminalSendFailed': 'Could not send to the active terminal: {{error}}',
+  'control.terminalStatusFailed': 'Could not read the active terminal: {{error}}',
+  'control.terminalDetached': 'Telegram is detached from the web CLI session. Plain messages will use the normal AI router again.',
   'control.newChatReady': 'New chat is ready. Send the prompt you want to run.',
   'control.disabled': 'Telegram remote control is disabled. Enable it in Pixcode → Settings → Telegram or send /control on.',
   'control.selectProjectFirst': 'Select a project first with /projects.',
@@ -162,7 +178,7 @@ const TR = {
   'bridge.queued': '📨 Mesaj son oturumuna iletildi. Ajan cevap verince sana yazacağım.',
   'bridge.disabled': 'Mesaj köprüsü kapalı. Pixcode → Ayarlar → Telegram\'dan açabilirsin.',
   'control.menu': 'Pixcode Telegram kontrol merkezi',
-  'control.help': 'Komutlar: /menu, /projects, /provider, /model, /workflows, /runs, /approvals, /control-room, /webhooks, /sessions, /newchat, /chat <prompt>, /workflow <prompt>, /install, /auth, /settings, /progress final|steps|errors|all, /control on|off.',
+  'control.help': 'Komutlar: /menu, /projects, /provider, /model, /workflows, /runs, /approvals, /control-room, /webhooks, /sessions, /terminal, /detach, /newchat, /chat <prompt>, /workflow <prompt>, /install, /auth, /settings, /progress final|steps|errors|all, /control on|off.',
   'control.examples': 'Örnekler:\n/chat bu projeyi özetle\n/chat son hatayı düzelt\n/workflow mevcut değişiklikleri incele\n/settings ile dil ve ilerleme modunu değiştir',
   'control.unknownCommand': 'Bu komutu henüz tanımıyorum. Kullanabileceğin Pixcode komutları:',
   'control.onboarding': 'Nasıl başlarsın:\n/projects ile proje seç\n/provider ile CLI seç\n/model ile modeli seç\n/chat <prompt> ile ajanı çalıştır\n/workflow <prompt> ile orkestrasyon başlat\n/help ile tüm komutları gör',
@@ -170,6 +186,7 @@ const TR = {
   'control.summary.provider': 'Sağlayıcı',
   'control.summary.workflow': 'İş akışı',
   'control.summary.progress': 'İlerleme',
+  'control.summary.terminal': 'Terminal',
   'control.notSelected': 'seçilmedi',
   'control.button.projects': 'Projeler',
   'control.button.provider': 'Sağlayıcı',
@@ -201,6 +218,9 @@ const TR = {
   'control.button.deny': 'Reddet',
   'control.button.confirm': 'Onayla',
   'control.button.cancel': 'Vazgeç',
+  'control.button.terminal': 'Aktif terminal',
+  'control.button.terminalRefresh': 'Terminali yenile',
+  'control.button.detachTerminal': 'Terminalden ayrıl',
   'control.noProjects': 'Henüz Pixcode projesi bulunamadı. Önce Pixcode içinde proje ekle/aç.',
   'control.pickProject': 'Telegramın kontrol edeceği projeyi seç:',
   'control.projectNotFound': '"{{query}}" ile eşleşen proje bulunamadı. Listeden birini seç.',
@@ -217,6 +237,18 @@ const TR = {
   'control.noWebhooks': 'Henüz webhook yapılandırılmadı.',
   'control.noSessions': 'Seçili proje için oturum bulunamadı.',
   'control.recentSessions': 'Son oturumlar:',
+  'control.noActiveTerminal': 'Bu Telegram sohbetine bağlı web CLI oturumu yok. Pixcode içinde CLI tabı açıp Telegram butonuna bas.',
+  'control.terminalAttached': '📲 Telegram bu web CLI oturumuna bağlı. Düz mesajlar terminale gönderilecek.',
+  'control.terminalReadyStatus': 'bağlandı',
+  'control.terminalReadyPrompt': 'Bu web CLI oturumuna devam etmek için sonraki mesajını buraya yaz. Telegramı normal AI router akışına döndürmek için /detach kullan.',
+  'control.terminalNotRunning': 'Bağlı CLI terminali artık çalışmıyor.',
+  'control.terminalNoOutput': 'Henüz terminal çıktısı yok.',
+  'control.terminalOutputHidden': 'Canlı CLI ekran çıktısı Telegrama dökülmez; tam ekran terminal arayüzleri burada gürültülü görünür. Buradan mesaj göndermeye devam et veya canlı terminal için Pixcodeu aç.',
+  'control.terminalSending': '📲 {{project}} üzerinde {{provider}} terminaline gönderiliyor...',
+  'control.terminalSent': '📲 Aktif terminale gönderildi.',
+  'control.terminalSendFailed': 'Aktif terminale gönderilemedi: {{error}}',
+  'control.terminalStatusFailed': 'Aktif terminal okunamadı: {{error}}',
+  'control.terminalDetached': 'Telegram web CLI oturumundan ayrıldı. Düz mesajlar tekrar normal AI router akışına gidecek.',
   'control.newChatReady': 'Yeni sohbet hazır. Çalıştırmak istediğin promptu gönder.',
   'control.disabled': 'Telegram uzaktan kontrol kapalı. Pixcode → Ayarlar → Telegram içinden aç veya /control on gönder.',
   'control.selectProjectFirst': 'Önce /projects ile proje seç.',