claude-tg 1.0.5 → 1.0.7

package/bin/claude-tg.js

@@ -276,15 +276,21 @@ program
         const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
         const hooks = settings.hooks || {};
 
+        // Extract script path from hook command (handles optional env prefix)
+        function extractScriptPath(cmd) {
+          const match = cmd.match(/node\s+(.+)$/);
+          return match ? match[1].trim() : null;
+        }
+
         const permHooks = hooks.PermissionRequest || [];
         const permCmd = permHooks[0]?.hooks?.[0]?.command || 'NOT FOUND';
         console.log(`  PermissionRequest: ${permCmd}`);
         if (permCmd !== 'NOT FOUND') {
-          const scriptPath = permCmd.replace(/^node\s+/, '');
-          if (fs.existsSync(scriptPath)) {
+          const scriptPath = extractScriptPath(permCmd);
+          if (scriptPath && fs.existsSync(scriptPath)) {
             console.log('    File exists: YES');
           } else {
-            console.log(`    File exists: NO — ${scriptPath}`);
+            console.log(`    File exists: NO — ${scriptPath || permCmd}`);
             ok = false;
           }
         }
@@ -293,11 +299,11 @@ program
         const notifCmd = notifHooks[0]?.hooks?.[0]?.command || 'NOT FOUND';
         console.log(`  Notification: ${notifCmd}`);
         if (notifCmd !== 'NOT FOUND') {
-          const scriptPath = notifCmd.replace(/^node\s+/, '');
-          if (fs.existsSync(scriptPath)) {
+          const scriptPath = extractScriptPath(notifCmd);
+          if (scriptPath && fs.existsSync(scriptPath)) {
             console.log('    File exists: YES');
           } else {
-            console.log(`    File exists: NO — ${scriptPath}`);
+            console.log(`    File exists: NO — ${scriptPath || notifCmd}`);
             ok = false;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-tg",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Control Claude Code from Telegram — approve permissions, answer questions, reply to idle sessions, send files, all from your phone",
   "bin": {
     "claude-tg": "./bin/claude-tg.js"

package/src/daemon.js

@@ -1,6 +1,8 @@
 const http = require('http');
 const crypto = require('crypto');
-const { execSync } = require('child_process');
+const { execSync, exec } = require('child_process');
+const util = require('util');
+const execAsync = util.promisify(exec);
 const { Telegraf, Markup } = require('telegraf');
 const { loadConfig, LOG_PATH } = require('./config');
 const fs = require('fs');
@@ -91,25 +93,46 @@ function isTtyAlive(ttyPath) {
  * Escape a string for use inside AppleScript double-quoted strings.
  */
 function escapeAppleScript(str) {
-  return str.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+  return str
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '\\r')
+    .replace(/\t/g, '\\t');
 }
 
 /**
  * Send text as input to a terminal session identified by its TTY path.
  * Uses osascript to type into the correct terminal tab/session.
- * Tries iTerm2 first, then Terminal.app.
+ * Tries iTerm2 first, then Terminal.app. Non-blocking (async).
+ * Returns { ok: true } on success, { ok: false, error: string } on failure.
  */
-function sendInputToTerminal(ttyPath, text) {
+async function sendInputToTerminal(ttyPath, text) {
   if (!ttyPath) {
     log('sendInput: no TTY path');
-    return false;
+    return { ok: false, error: 'No TTY path for this session' };
   }
 
-  const escaped = escapeAppleScript(text.trim());
+  const trimmed = text.trim();
+  const escaped = escapeAppleScript(trimmed);
 
-  // Try iTerm2 — write text targets a specific session by TTY, no focus needed
+  // Check which terminal apps are running (fast, non-blocking check)
+  let itermRunning = false;
+  let terminalRunning = false;
   try {
-    const script = `
+    const { stdout } = await execAsync('ps -c -o comm= | grep -E "^(iTerm2|Terminal)$"', { timeout: 2000 });
+    itermRunning = stdout.includes('iTerm2');
+    terminalRunning = stdout.includes('Terminal');
+  } catch {
+    // ps/grep failed, try both
+    itermRunning = true;
+    terminalRunning = true;
+  }
+
+  // Try iTerm2 — write text targets a specific session by TTY, no focus needed
+  if (itermRunning) {
+    try {
+      const script = `
 tell application "iTerm2"
   repeat with w in windows
     repeat with t in tabs of w
@@ -122,50 +145,58 @@ tell application "iTerm2"
     end repeat
   end repeat
 end tell`;
-    execSync(`osascript -e '${script.replace(/'/g, "'\\''")}'`, { timeout: 5000, stdio: 'pipe' });
-    log(`Sent via iTerm2 to ${ttyPath}: ${truncate(text, 80)}`);
-    return true;
-  } catch {}
+      await execAsync(`osascript -e '${script.replace(/'/g, "'\\''")}'`, { timeout: 5000 });
+      log(`Sent via iTerm2 to ${ttyPath}: ${truncate(text, 80)}`);
+      return { ok: true };
+    } catch (err) {
+      log(`iTerm2 attempt: ${(err.message || '').slice(0, 100)}`);
+    }
+  }
 
   // Try Terminal.app — focus the tab, paste text from clipboard, press Enter
-  try {
-    // Use clipboard paste instead of keystroke (reliable for any text length)
-    const tmpTextFile = '/tmp/claude-tg-input.txt';
-    fs.writeFileSync(tmpTextFile, text.trim());
-
-    const script = [
-      'tell application "Terminal"',
-      '  activate',
-      '  repeat with w in windows',
-      '    repeat with t in tabs of w',
-      `      if tty of t is "${ttyPath}" then`,
-      '        set selected tab of w to t',
-      '        set index of w to 1',
-      '      end if',
-      '    end repeat',
-      '  end repeat',
-      'end tell',
-      `do shell script "cat ${tmpTextFile} | /usr/bin/pbcopy"`,
-      'delay 0.5',
-      'tell application "System Events"',
-      '  tell process "Terminal"',
-      '    keystroke "v" using command down',
-      '    delay 0.3',
-      '    key code 36',
-      '  end tell',
-      'end tell',
-    ].join('\n');
-
-    fs.writeFileSync('/tmp/claude-tg-input.scpt', script);
-    execSync('osascript /tmp/claude-tg-input.scpt', { timeout: 10000, stdio: 'pipe' });
-    log(`Sent via Terminal.app to ${ttyPath}: ${truncate(text, 80)}`);
-    return true;
-  } catch (err) {
-    log(`Terminal.app send error: ${err.message}`);
+  if (terminalRunning) {
+    try {
+      const tmpTextFile = '/tmp/claude-tg-input.txt';
+      fs.writeFileSync(tmpTextFile, trimmed);
+
+      const script = [
+        'tell application "Terminal"',
+        '  activate',
+        '  repeat with w in windows',
+        '    repeat with t in tabs of w',
+        `      if tty of t is "${ttyPath}" then`,
+        '        set selected tab of w to t',
+        '        set index of w to 1',
+        '      end if',
+        '    end repeat',
+        '  end repeat',
+        'end tell',
+        `do shell script "cat ${tmpTextFile} | /usr/bin/pbcopy"`,
+        'delay 0.5',
+        'tell application "System Events"',
+        '  tell process "Terminal"',
+        '    keystroke "v" using command down',
+        '    delay 0.3',
+        '    key code 36',
+        '  end tell',
+        'end tell',
+      ].join('\n');
+
+      fs.writeFileSync('/tmp/claude-tg-input.scpt', script);
+      await execAsync('osascript /tmp/claude-tg-input.scpt', { timeout: 15000 });
+      log(`Sent via Terminal.app to ${ttyPath}: ${truncate(text, 80)}`);
+      return { ok: true };
+    } catch (err) {
+      const msg = err.message || err.stderr || '';
+      log(`Terminal.app send error: ${msg.slice(0, 200)}`);
+      if (msg.includes('assistive') || msg.includes('accessibility') || msg.includes('not allowed')) {
+        return { ok: false, error: 'Accessibility permission needed.\nSystem Settings → Privacy & Security → Accessibility → enable Terminal/iTerm2.' };
+      }
+    }
   }
 
   log(`sendInput failed: no terminal found for ${ttyPath}`);
-  return false;
+  return { ok: false, error: `Could not send to terminal (${ttyPath}). Make sure iTerm2 or Terminal.app is open.` };
 }
 
 // --- Transcript reading ---
@@ -424,9 +455,13 @@ async function sendElicitationQuestion(elicId) {
   }
 
   const keyboard = Markup.inlineKeyboard(rows);
-  const sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
-  elic.telegramMessageIds.push(sent.message_id);
-  elic.currentMessageId = sent.message_id;
+  try {
+    const sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
+    elic.telegramMessageIds.push(sent.message_id);
+    elic.currentMessageId = sent.message_id;
+  } catch (err) {
+    log(`Elicitation question send failed: ${err.message}`);
+  }
 }
 
 /**
@@ -467,8 +502,12 @@ async function sendElicitationSummary(elicId) {
   }
   const keyboard = Markup.inlineKeyboard(summaryButtons);
 
-  const sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
-  elic.telegramMessageIds.push(sent.message_id);
+  try {
+    const sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
+    elic.telegramMessageIds.push(sent.message_id);
+  } catch (err) {
+    log(`Elicitation summary send failed: ${err.message}`);
+  }
 }
 
 /**
@@ -503,8 +542,8 @@ async function handleElicitationCallback(ctx, cbData) {
       elic.permissionResolve({ decision: 'allow' });
       try { await ctx.editMessageText(ctx.callbackQuery.message.text + '\n\n✅ Answers submitted — injecting...'); } catch {}
 
-      setTimeout(() => {
-        const ok = injectElicitationAnswers(elic.ttyPath, elic.questions, elic.answers);
+      setTimeout(async () => {
+        const ok = await injectElicitationAnswers(elic.ttyPath, elic.questions, elic.answers);
         log(`Elicitation ${elicId}: ${ok ? 'keystrokes injected' : 'injection failed'}`);
         if (!ok) {
           bot.telegram.sendMessage(config.chatId, '⚠️ Could not inject answers into terminal').catch(() => {});
@@ -512,7 +551,7 @@ async function handleElicitationCallback(ctx, cbData) {
       }, 2000);
     } else {
       // From notification flow — inject immediately
-      const ok = injectElicitationAnswers(elic.ttyPath, elic.questions, elic.answers);
+      const ok = await injectElicitationAnswers(elic.ttyPath, elic.questions, elic.answers);
       try {
         await ctx.editMessageText(ctx.callbackQuery.message.text +
           (ok ? '\n\n✅ Answers submitted' : '\n\n⚠️ Could not send to terminal'));
@@ -565,14 +604,18 @@ async function handleElicitationCallback(ctx, cbData) {
     try { await ctx.editMessageReplyMarkup(undefined); } catch {}
     try { await ctx.editMessageText(ctx.callbackQuery.message.text + '\n\n✏️ Selected: Custom'); } catch {}
 
-    const prompt = await bot.telegram.sendMessage(
-      config.chatId,
-      `✏️ Type your custom answer for: "${q.question}"\n\nReply to this message with your answer.`
-    );
-
-    elic.customWaitingMessageId = prompt.message_id;
-    elic.customWaitingQIdx = qIdx;
-    elic.telegramMessageIds.push(prompt.message_id);
+    try {
+      const prompt = await bot.telegram.sendMessage(
+        config.chatId,
+        `✏️ Type your custom answer for: "${q.question}"\n\nReply to this message with your answer.`
+      );
+
+      elic.customWaitingMessageId = prompt.message_id;
+      elic.customWaitingQIdx = qIdx;
+      elic.telegramMessageIds.push(prompt.message_id);
+    } catch (err) {
+      log(`Elicitation custom prompt send failed: ${err.message}`);
+    }
     log(`Elicitation ${elicId}: waiting for custom answer to q${qIdx}`);
     return;
   }
@@ -671,7 +714,7 @@ async function handleElicitationCallback(ctx, cbData) {
  * Inject elicitation answers into the terminal via osascript keystrokes.
  * Navigates the AskUserQuestion form using arrow keys, space, tab, and enter.
  */
-function injectElicitationAnswers(ttyPath, questions, answers) {
+async function injectElicitationAnswers(ttyPath, questions, answers) {
   if (!ttyPath) {
     log('injectElicitation: no TTY path');
     return false;
@@ -686,44 +729,38 @@ function injectElicitationAnswers(ttyPath, questions, answers) {
     if (!answer) continue;
 
     if (answer.isCustom) {
-      // Navigate to "Other" (last position, after all defined options)
       const otherPos = q.options.length;
       for (let i = 0; i < otherPos; i++) {
         events.push({ type: 'key_code', value: 125 }); // arrow down
       }
       events.push({ type: 'key_code', value: 36 }); // enter to select Other
       events.push({ type: 'delay', value: 0.3 });
-      events.push({ type: 'keystroke', value: answer.customText }); // type custom text
+      events.push({ type: 'keystroke', value: answer.customText });
     } else if (answer.multiSelections) {
-      // MultiSelect: walk through all options, space on selected ones
       const selectedSet = new Set(answer.multiSelections.map((s) => s.optionIndex));
       for (let i = 0; i < q.options.length; i++) {
         if (selectedSet.has(i)) {
-          events.push({ type: 'keystroke', value: ' ' }); // space to toggle
+          events.push({ type: 'keystroke', value: ' ' });
         }
         if (i < q.options.length - 1) {
-          events.push({ type: 'key_code', value: 125 }); // arrow down
+          events.push({ type: 'key_code', value: 125 });
         }
       }
     } else {
-      // Single select: navigate to selected option
       for (let i = 0; i < answer.optionIndex; i++) {
-        events.push({ type: 'key_code', value: 125 }); // arrow down
+        events.push({ type: 'key_code', value: 125 });
       }
     }
 
-    // Tab to next question, or nothing for the last one
     if (qIdx < questions.length - 1) {
       events.push({ type: 'key_code', value: 48 }); // tab
       events.push({ type: 'delay', value: 0.15 });
     }
   }
 
-  // Submit the form
   events.push({ type: 'delay', value: 0.3 });
   events.push({ type: 'key_code', value: 36 }); // Return key
 
-  // Build key action lines for AppleScript
   const keyLines = events.map((e) => {
     if (e.type === 'key_code') return `    key code ${e.value}`;
     if (e.type === 'keystroke') {
@@ -735,7 +772,7 @@ function injectElicitationAnswers(ttyPath, questions, answers) {
     return '';
   }).join('\n');
 
-  // Try iTerm2 first (focus + System Events)
+  // Try iTerm2 first
   try {
     const script = [
       'tell application "iTerm2"',
@@ -759,7 +796,7 @@ function injectElicitationAnswers(ttyPath, questions, answers) {
     ].join('\n');
 
     fs.writeFileSync('/tmp/claude-tg-elicit.scpt', script);
-    execSync('osascript /tmp/claude-tg-elicit.scpt', { timeout: 30000, stdio: 'pipe' });
+    await execAsync('osascript /tmp/claude-tg-elicit.scpt', { timeout: 30000 });
     log(`Elicitation keystrokes sent via iTerm2 to ${ttyPath}`);
     return true;
   } catch {}
@@ -768,11 +805,12 @@ function injectElicitationAnswers(ttyPath, questions, answers) {
   try {
     const script = [
       'tell application "Terminal"',
+      '  activate',
       '  repeat with w in windows',
       '    repeat with t in tabs of w',
       `      if tty of t is "${ttyPath}" then`,
       '        set selected tab of w to t',
-      '        set frontmost of w to true',
+      '        set index of w to 1',
       '      end if',
       '    end repeat',
       '  end repeat',
@@ -786,7 +824,7 @@ function injectElicitationAnswers(ttyPath, questions, answers) {
     ].join('\n');
 
     fs.writeFileSync('/tmp/claude-tg-elicit.scpt', script);
-    execSync('osascript /tmp/claude-tg-elicit.scpt', { timeout: 30000, stdio: 'pipe' });
+    await execAsync('osascript /tmp/claude-tg-elicit.scpt', { timeout: 30000 });
     log(`Elicitation keystrokes sent via Terminal.app to ${ttyPath}`);
     return true;
   } catch (err) {
@@ -888,6 +926,9 @@ function startBot() {
     } else if (action === 'always') {
       label = '✅ Always Allowed';
       pending.resolve({ decision: 'always' });
+    } else {
+      label = '❌ Denied';
+      pending.resolve({ decision: 'deny' });
     }
 
     try { await ctx.answerCbQuery(label); } catch {}
@@ -997,12 +1038,12 @@ function startBot() {
       return;
     }
 
-    const ok = sendInputToTerminal(session.ttyPath, text);
-    if (ok) {
+    const result = await sendInputToTerminal(session.ttyPath, text);
+    if (result.ok) {
       const num = getSessionLabel(targetSessionId);
       try { await ctx.reply(`➡️ Sent to #${num} ${session.label}`); } catch {}
     } else {
-      try { await ctx.reply(`⚠️ Could not send to terminal. Session may have ended, or terminal app not recognized.`); } catch {}
+      try { await ctx.reply(`⚠️ ${result.error}`); } catch {}
     }
   });
 
@@ -1035,7 +1076,13 @@ async function sendPermissionRequest(data) {
     Markup.button.callback('Always Allow', `${rid}:always`),
   ]);
 
-  const sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
+  let sent;
+  try {
+    sent = await bot.telegram.sendMessage(config.chatId, msg, keyboard);
+  } catch (err) {
+    log(`Permission send failed: ${err.message}`);
+    return { decision: 'allow' }; // Fallback: allow if Telegram unreachable
+  }
 
   // Track this message for reply routing
   messageToSession.set(sent.message_id, {
@@ -1134,15 +1181,19 @@ async function sendNotification(data) {
   // Default notification flow
   const context = extractContext(data.transcript_path);
   const msg = formatNotification(data, context);
-  const sent = await bot.telegram.sendMessage(config.chatId, msg);
+  try {
+    const sent = await bot.telegram.sendMessage(config.chatId, msg);
 
-  messageToSession.set(sent.message_id, {
-    sessionId: data.session_id,
-    type: 'notification',
-    createdAt: Date.now(),
-  });
+    messageToSession.set(sent.message_id, {
+      sessionId: data.session_id,
+      type: 'notification',
+      createdAt: Date.now(),
+    });
 
-  log(`Notification sent: ${notifType} (msg ${sent.message_id})`);
+    log(`Notification sent: ${notifType} (msg ${sent.message_id})`);
+  } catch (err) {
+    log(`Notification send failed: ${err.message}`);
+  }
 }
 
 function readBody(req) {

package/src/hooks/notification.js

@@ -6,7 +6,7 @@
 const http = require('http');
 const { execSync } = require('child_process');
 
-const DAEMON_PORT = 7483;
+const DAEMON_PORT = parseInt(process.env.CLAUDE_TG_PORT || '7483', 10);
 const DAEMON_HOST = '127.0.0.1';
 
 function readStdin() {

package/src/hooks/permission-request.js

@@ -7,7 +7,7 @@
 const http = require('http');
 const { execSync } = require('child_process');
 
-const DAEMON_PORT = 7483;
+const DAEMON_PORT = parseInt(process.env.CLAUDE_TG_PORT || '7483', 10);
 const DAEMON_HOST = '127.0.0.1';
 
 function findTty() {

package/src/setup.js

@@ -25,13 +25,14 @@ function telegramApiCall(token, method) {
 }
 
 function getHooksConfig(port) {
+  const envPrefix = port !== 7483 ? `CLAUDE_TG_PORT=${port} ` : '';
   return {
     PermissionRequest: [
       {
         hooks: [
           {
             type: 'command',
-            command: `node ${path.join(HOOKS_DIR, 'permission-request.js')}`,
+            command: `${envPrefix}node ${path.join(HOOKS_DIR, 'permission-request.js')}`,
             timeout: 1800,
             statusMessage: 'Waiting for Telegram approval...',
           },
@@ -44,7 +45,7 @@ function getHooksConfig(port) {
         hooks: [
           {
             type: 'command',
-            command: `node ${path.join(HOOKS_DIR, 'notification.js')}`,
+            command: `${envPrefix}node ${path.join(HOOKS_DIR, 'notification.js')}`,
             async: true,
           },
         ],