cliclaw 1.0.41 → 1.0.43

package/index.ts

@@ -4,6 +4,7 @@ import { Storage } from './src/storage'
 import { registerCommands } from './src/handlers/commands'
 import { registerMessageHandler } from './src/handlers/messages'
 import { respondApproval } from './src/handlers/approvals'
+import { handleSndCallback, handleUsoCallback } from './src/handlers/send'
 
 const config = loadConfig()
 const storage = new Storage(config.DATA_DIR)
@@ -36,10 +37,29 @@ bot.on('callback_query:data', async (ctx) => {
   const data = ctx.callbackQuery.data
   console.log(`[callback] recebido: ${data.slice(0, 60)}`)
 
-  const colonIdx  = data.indexOf(':')
-  const prefix    = data.slice(0, colonIdx)
-  const approvalId = data.slice(colonIdx + 1)
-  const entry     = APPROVAL_PREFIXES[prefix]
+  const colonIdx = data.indexOf(':')
+  const prefix   = data.slice(0, colonIdx)
+  const rest     = data.slice(colonIdx + 1)
+
+  // ── uso:* menu callbacks ────────────────────────────────────────────────
+  if (prefix === 'uso') {
+    await handleUsoCallback(ctx, storage, config, rest).catch(e =>
+      console.error(`[callback] uso erro: ${e.message}`)
+    )
+    return
+  }
+
+  // ── snd:* send/files callbacks ──────────────────────────────────────────
+  if (prefix === 'snd') {
+    await handleSndCallback(ctx, storage, config, rest).catch(e =>
+      console.error(`[callback] snd erro: ${e.message}`)
+    )
+    return
+  }
+
+  // ── codex approval callbacks ────────────────────────────────────────────
+  const approvalId = rest
+  const entry      = APPROVAL_PREFIXES[prefix]
   if (!entry) return
 
   console.log(`[callback] clicou ${prefix} id=${approvalId.slice(0, 8)}...`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cliclaw",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Telegram bot bridging AI CLIs (Claude Code, Codex) to Forum Topics",
   "main": "index.ts",
   "scripts": {

package/src/agents/claude.ts

@@ -34,7 +34,7 @@ interface ClaudeResult {
   usage?: TokenUsage
 }
 
-function spawnClaude(args: string[]): Promise<ClaudeResult> {
+function spawnClaude(args: string[], stdinText?: string): Promise<ClaudeResult> {
   return new Promise((resolve, reject) => {
     let stdout = ''
     let stderr = ''
@@ -43,8 +43,11 @@ function spawnClaude(args: string[]): Promise<ClaudeResult> {
       env: buildEnv(),
       shell: isWin,
       windowsHide: true,
-      stdio: ['ignore', 'pipe', 'pipe'],  // explicit: ignore stdin so headless PM2 doesn't hang
+      stdio: [stdinText !== undefined ? 'pipe' : 'ignore', 'pipe', 'pipe'],
     })
+    if (stdinText !== undefined) {
+      proc.stdin!.end(stdinText, 'utf8')
+    }
     proc.stdout.on('data', (d: Buffer) => { stdout += d.toString() })
     proc.stderr.on('data', (d: Buffer) => { stderr += d.toString() })
     proc.on('close', (code) => {
@@ -80,18 +83,18 @@ export async function askClaude(
     if (session.claudeSessionId) {
       return await spawnClaude([
         '--resume', session.claudeSessionId,
-        '-p', userMessage,
+        '-p',
         '--output-format', 'json',
         '--dangerously-skip-permissions',
-      ])
+      ], userMessage)
     } else {
       const newId = randomUUID()
       const result = await spawnClaude([
-        '-p', userMessage,
+        '-p',
         '--output-format', 'json',
         '--session-id', newId,
         '--dangerously-skip-permissions',
-      ])
+      ], userMessage)
       onNewSessionId?.(result.sessionId ?? newId)
       return result
     }

package/src/handlers/commands.ts

@@ -6,6 +6,7 @@ import { killCodexSession } from '../agents/codex'
 import { formatTelegramMarkdown, splitTelegramMessage, TELEGRAM_MARKDOWN_OPTS } from '../telegram'
 import { dockerHelpText, pm2HelpText, runDockerCommand, runPm2Command } from '../admin'
 import { getLang, t } from '../i18n'
+import { getCacheDir, handleSendCommand } from './send'
 
 // ─── helpers ────────────────────────────────────────────────────────────────
 
@@ -252,6 +253,44 @@ export function registerCommands(bot: Bot<Context>, storage: Storage, config: Co
     await replyChunks(ctx, msg)
   })
 
+  // /uso
+  bot.command('uso', async (ctx) => {
+    const lang     = getLang(ctx)
+    const chatId   = String(ctx.chat!.id)
+    const threadId = ctx.message?.message_thread_id ?? 0
+    const session  = threadId
+      ? (storage.getSessionByThreadId(chatId, threadId) || storage.getActiveSession(chatId))
+      : storage.getActiveSession(chatId)
+
+    const cacheDir = getCacheDir(config.DATA_DIR, chatId)
+    const emoji    = session ? (session.model === 'claude' ? '🟣' : '🟢') : '🤖'
+    const name     = session ? session.name : (lang === 'pt' ? 'Nenhuma sessão' : 'No session')
+    const title    = `${emoji} <b>${name}</b>`
+
+    const keyboard = {
+      inline_keyboard: [
+        [
+          { text: lang === 'pt' ? '📊 Status'   : '📊 Status', callback_data: 'uso:stat' },
+          { text: lang === 'pt' ? '🧹 Limpar'   : '🧹 Clear',  callback_data: 'uso:clr'  },
+        ],
+        [
+          { text: lang === 'pt' ? '📁 Enviar arquivo' : '📁 Send file', callback_data: 'uso:snd' },
+        ],
+      ],
+    }
+
+    const opts: any = { parse_mode: 'HTML', reply_markup: keyboard }
+    if (threadId) opts.message_thread_id = threadId
+    await ctx.reply(title, opts)
+  })
+
+  // /send + /enviar
+  const sendHandler = async (ctx: Context) => {
+    await handleSendCommand(ctx, storage, config)
+  }
+  bot.command('send',   sendHandler)
+  bot.command('enviar', sendHandler)
+
   // /docker
   bot.command('docker', async (ctx) => {
     if (!await guardAdmin(ctx, config)) return

package/src/handlers/send.ts

@@ -0,0 +1,261 @@
+import { existsSync, readdirSync, mkdirSync, statSync } from 'fs'
+import { join } from 'path'
+import { InputFile } from 'grammy'
+import type { Context } from 'grammy'
+import type { Storage } from '../storage'
+import type { Config } from '../config'
+import { getLang } from '../i18n'
+import { mdToTg, splitHtml } from '../utils/markdown'
+import { askClaude } from '../agents/claude'
+import { askCodex } from '../agents/codex'
+
+// ─── cache helpers ────────────────────────────────────────────────────────────
+
+export function getCacheDir(dataDir: string, chatId: string): string {
+  const dir = join(dataDir, 'send_cache', chatId)
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true })
+  return dir
+}
+
+export function listCacheFiles(dataDir: string, chatId: string): string[] {
+  const dir = getCacheDir(dataDir, chatId)
+  try {
+    return readdirSync(dir).filter(f => statSync(join(dir, f)).isFile()).sort()
+  } catch { return [] }
+}
+
+// ─── guide text ──────────────────────────────────────────────────────────────
+
+function getSendGuide(cacheDir: string): string {
+  return (
+    '📁 **Guia de envio de arquivos / File Transfer Guide**\n\n' +
+    '**🇧🇷 Português:**\n' +
+    'O usuário quer receber um arquivo via Telegram. Para enviar:\n' +
+    `1. Copie o arquivo para esta pasta: \`${cacheDir}\`\n` +
+    '2. Avise o usuário para abrir `/send` no bot e clicar em 📥.\n' +
+    `Exemplo: \`cp meu_arquivo.txt "${cacheDir}/"\`\n\n` +
+    '**🇺🇸 English:**\n' +
+    'The user wants to receive a file via Telegram. To send it:\n' +
+    `1. Copy the file to this folder: \`${cacheDir}\`\n` +
+    '2. Tell the user to open `/send` in the bot and click 📥.\n' +
+    `Example: \`cp my_file.txt "${cacheDir}/"\``
+  )
+}
+
+// ─── menu builders ───────────────────────────────────────────────────────────
+
+function escHtml(s: string) {
+  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+}
+
+export function buildSendMenuHtml(cacheDir: string, files: string[], lang: 'pt' | 'en'): string {
+  const title    = lang === 'pt' ? '📁 <b>Arquivos disponíveis</b>' : '📁 <b>Available Files</b>'
+  const pathLine = `${lang === 'pt' ? 'Pasta' : 'Folder'}: <code>${escHtml(cacheDir)}</code>`
+  const none     = lang === 'pt'
+    ? '<i>Nenhum arquivo ainda — copie um para a pasta acima</i>'
+    : '<i>No files yet — copy one to the folder above</i>'
+  const list = files.length
+    ? files.map((f, i) => `${i + 1}. <code>${escHtml(f)}</code>`).join('\n')
+    : none
+  return `${title}\n${pathLine}\n\n${list}`
+}
+
+export function buildSendKeyboard(files: string[], lang: 'pt' | 'en') {
+  const rows: Array<Array<{ text: string; callback_data: string }>> = []
+
+  // File buttons (max 8, 2 per row)
+  const fbtns = files.slice(0, 8).map((f, i) => ({
+    text: `📥 ${f.slice(0, 18)}${f.length > 18 ? '…' : ''}`,
+    callback_data: `snd:f:${i}`,
+  }))
+  for (let i = 0; i < fbtns.length; i += 2) rows.push(fbtns.slice(i, i + 2))
+
+  // Action row
+  rows.push([
+    { text: lang === 'pt' ? '📬 Pedir ao agente' : '📬 Ask agent', callback_data: 'snd:guide' },
+    { text: lang === 'pt' ? '🔄 Atualizar'       : '🔄 Refresh',   callback_data: 'snd:ref'   },
+  ])
+
+  return { inline_keyboard: rows }
+}
+
+// ─── /send command handler ───────────────────────────────────────────────────
+
+export async function handleSendCommand(ctx: Context, storage: Storage, config: Config) {
+  const lang     = getLang(ctx)
+  const chatId   = String(ctx.chat!.id)
+  const threadId = ctx.message?.message_thread_id ?? 0
+  const cacheDir = getCacheDir(config.DATA_DIR, chatId)
+  const files    = listCacheFiles(config.DATA_DIR, chatId)
+
+  const opts: any = {
+    parse_mode:   'HTML',
+    reply_markup: buildSendKeyboard(files, lang),
+  }
+  if (threadId) opts.message_thread_id = threadId
+
+  await ctx.reply(buildSendMenuHtml(cacheDir, files, lang), opts)
+}
+
+// ─── snd:* callback handler ──────────────────────────────────────────────────
+
+export async function handleSndCallback(
+  ctx:     Context,
+  storage: Storage,
+  config:  Config,
+  action:  string,
+) {
+  const lang     = getLang(ctx)
+  const chatId   = String(ctx.chat!.id)
+  const threadId = (ctx.callbackQuery as any)?.message?.message_thread_id ?? 0
+  const cacheDir = getCacheDir(config.DATA_DIR, chatId)
+  const replyOpts: any = threadId ? { message_thread_id: threadId } : {}
+
+  await ctx.answerCallbackQuery().catch(() => {})
+
+  // ── refresh ──────────────────────────────────────────────────────────────
+  if (action === 'ref') {
+    const files = listCacheFiles(config.DATA_DIR, chatId)
+    try {
+      await ctx.editMessageText(buildSendMenuHtml(cacheDir, files, lang), {
+        parse_mode:   'HTML',
+        reply_markup: buildSendKeyboard(files, lang),
+      })
+    } catch {}
+    return
+  }
+
+  // ── inject guide into agent ──────────────────────────────────────────────
+  if (action === 'guide') {
+    const session = threadId
+      ? (storage.getSessionByThreadId(chatId, threadId) || storage.getActiveSession(chatId))
+      : storage.getActiveSession(chatId)
+
+    if (!session) {
+      await ctx.reply(
+        lang === 'pt' ? '⚠️ Nenhuma sessão ativa.' : '⚠️ No active session.',
+        replyOpts
+      )
+      return
+    }
+
+    const guide  = getSendGuide(cacheDir)
+    const emoji  = session.model === 'claude' ? '🟣' : '🟢'
+    const status = await ctx.reply(
+      `${emoji} <i>${lang === 'pt' ? 'Enviando guia ao agente...' : 'Sending guide to agent...'}</i>`,
+      { ...replyOpts, parse_mode: 'HTML' }
+    )
+
+    try {
+      let result: { text: string }
+      if (session.model === 'claude') {
+        result = await askClaude(session, guide,
+          (id) => storage.setClaudeSessionId(chatId, session.id, id))
+      } else {
+        result = await askCodex(session, guide,
+          (id) => storage.setCodexThreadId(chatId, session.id, id))
+      }
+      try { await ctx.api.deleteMessage(chatId, status.message_id) } catch {}
+      const html = mdToTg(result.text)
+      for (const chunk of splitHtml(html)) {
+        if (chunk) await ctx.api.sendMessage(chatId, `${emoji} ${chunk}`, { ...replyOpts, parse_mode: 'HTML' })
+      }
+    } catch (e: any) {
+      try { await ctx.api.deleteMessage(chatId, status.message_id) } catch {}
+      await ctx.reply(`❌ ${e.message}`, replyOpts)
+    }
+    return
+  }
+
+  // ── download file ─────────────────────────────────────────────────────────
+  if (action.startsWith('f:')) {
+    const idx   = parseInt(action.slice(2), 10)
+    const files = listCacheFiles(config.DATA_DIR, chatId)
+    const fname = files[idx]
+
+    if (!fname) {
+      await ctx.reply(
+        lang === 'pt' ? '⚠️ Arquivo não encontrado.' : '⚠️ File not found.',
+        replyOpts
+      )
+      return
+    }
+
+    try {
+      await ctx.replyWithDocument(new InputFile(join(cacheDir, fname), fname), replyOpts)
+    } catch (e: any) {
+      await ctx.reply(`❌ ${e.message}`, replyOpts)
+    }
+  }
+}
+
+// ─── uso:* callback handler ──────────────────────────────────────────────────
+
+export async function handleUsoCallback(
+  ctx:     Context,
+  storage: Storage,
+  config:  Config,
+  action:  string,
+) {
+  const lang     = getLang(ctx)
+  const chatId   = String(ctx.chat!.id)
+  const threadId = (ctx.callbackQuery as any)?.message?.message_thread_id ?? 0
+  const replyOpts: any = threadId ? { message_thread_id: threadId } : {}
+
+  await ctx.answerCallbackQuery().catch(() => {})
+
+  const getSession = () => threadId
+    ? (storage.getSessionByThreadId(chatId, threadId) || storage.getActiveSession(chatId))
+    : storage.getActiveSession(chatId)
+
+  // ── status ───────────────────────────────────────────────────────────────
+  if (action === 'stat') {
+    const session = getSession()
+    if (!session) {
+      await ctx.reply(lang === 'pt' ? '⚠️ Nenhuma sessão ativa.' : '⚠️ No active session.', replyOpts)
+      return
+    }
+    const emoji = session.model === 'claude' ? '🟣' : '🟢'
+    const msgs  = lang === 'pt' ? `${session.history.length} mensagens` : `${session.history.length} messages`
+    const since = lang === 'pt' ? 'desde' : 'since'
+    await ctx.reply(
+      `${emoji} <b>${escHtml(session.name)}</b>\n` +
+      `💬 ${msgs}\n` +
+      `🕐 ${since} ${new Date(session.createdAt).toLocaleString()}`,
+      { ...replyOpts, parse_mode: 'HTML' }
+    )
+    return
+  }
+
+  // ── clear ────────────────────────────────────────────────────────────────
+  if (action === 'clr') {
+    const { killSession }      = await import('../agents/claude')
+    const { killCodexSession } = await import('../agents/codex')
+    const session = getSession()
+    if (!session) {
+      await ctx.reply(lang === 'pt' ? '⚠️ Nenhuma sessão ativa.' : '⚠️ No active session.', replyOpts)
+      return
+    }
+    killSession(session.id)
+    killCodexSession(session.id)
+    storage.clearSession(chatId, session.id)
+    const emoji = session.model === 'claude' ? '🟣' : '🟢'
+    await ctx.reply(
+      `🧹 <b>${escHtml(session.name)}</b> ${lang === 'pt' ? 'reiniciada!' : 'cleared!'}`,
+      { ...replyOpts, parse_mode: 'HTML' }
+    )
+    return
+  }
+
+  // ── send files (show send menu) ───────────────────────────────────────────
+  if (action === 'snd') {
+    const cacheDir = getCacheDir(config.DATA_DIR, chatId)
+    const files    = listCacheFiles(config.DATA_DIR, chatId)
+    await ctx.reply(buildSendMenuHtml(cacheDir, files, lang), {
+      ...replyOpts,
+      parse_mode:   'HTML',
+      reply_markup: buildSendKeyboard(files, lang),
+    })
+    return
+  }
+}

package/src/i18n.ts

@@ -21,6 +21,8 @@ const strings = {
       '`/sessoes` ou `/sessions` — listar sessões\n' +
       '`/limpar` ou `/clear` — reiniciar sessão atual\n' +
       '`/status` — info da sessão ativa\n' +
+      '`/uso` — menu rápido (status, limpar, arquivos)\n' +
+      '`/send` ou `/enviar` — enviar arquivos via Telegram\n' +
       '`/id` — ID deste chat\n' +
       '`/ajuda` ou `/help` — exibir ajuda',
     en:
@@ -29,6 +31,8 @@ const strings = {
       '`/sessions` or `/sessoes` — list sessions\n' +
       '`/clear` or `/limpar` — reset current session\n' +
       '`/status` — active session info\n' +
+      '`/uso` — quick menu (status, clear, files)\n' +
+      '`/send` or `/enviar` — send files via Telegram\n' +
       '`/id` — this chat ID\n' +
       '`/help` or `/ajuda` — show help',
   },