cliclaw 1.0.22 → 1.0.24

package/bin/cli.js

@@ -189,19 +189,18 @@ async function runConfigWizard() {
   console.log(`${c.gray}  Leave empty to configure later.\n${c.reset}`)
   const forumId = await prompt('FORUM_GROUP_ID (Enter to skip)', existing.FORUM_GROUP_ID || '')
 
-  console.log(`\n${c.bold}Permission mode${c.reset}`)
-  console.log(`  ${c.bold}1) auto${c.reset}    — always skip prompts ${c.cyan}(recommended)${c.reset}`)
-  console.log(`  ${c.bold}2) session${c.reset} — ask per /new session`)
-  console.log(`  ${c.bold}3) ask${c.reset}     — prefix message with ! to allow\n`)
-  const permChoice = await prompt('Choose [1/2/3]',
-    existing.PERMISSION_MODE === 'session' ? '2' : existing.PERMISSION_MODE === 'ask' ? '3' : '1')
-  const permMode = permChoice === '2' ? 'session' : permChoice === '3' ? 'ask' : 'auto'
-  ok(`Permission mode: ${permMode}`)
+  console.log(`\n${c.bold}Codex — aprovação de comandos${c.reset}`)
+  console.log(`  ${c.bold}1) ask${c.reset}    — pergunta antes de cada comando ${c.cyan}(recomendado)${c.reset}`)
+  console.log(`  ${c.bold}2) allow${c.reset}  — executa tudo automaticamente\n`)
+  const approvalChoice = await prompt('Escolha [1/2]',
+    existing.CODEX_APPROVAL === 'allow' ? '2' : '1')
+  const codexApproval = approvalChoice === '2' ? 'allow' : 'ask'
+  ok(`Codex approval: ${codexApproval}`)
 
   const dataDir = existing.DATA_DIR || path.join(USER_DIR, 'data')
   let envContent = `TELEGRAM_BOT_TOKEN=${token}\n`
   if (forumId) envContent += `FORUM_GROUP_ID=${forumId}\n`
-  envContent += `PERMISSION_MODE=${permMode}\n`
+  envContent += `CODEX_APPROVAL=${codexApproval}\n`
   envContent += `DATA_DIR=${dataDir}\n`
   fs.writeFileSync(envFile, envContent, 'utf8')
   ok(`.env saved → ${envFile}`)

package/package.json

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

package/src/agents/codex.ts

@@ -14,8 +14,8 @@ const BASE_ENV = {
   LANG: 'en_US.UTF-8',
 }
 
-const SESSION_TTL_MS = 30 * 60 * 1000  // kill idle processes after 30 min
-const RESPONSE_TIMEOUT_MS = 120_000     // 2 min per message
+const SESSION_TTL_MS = 30 * 60 * 1000   // kill idle processes after 30 min
+const RESPONSE_TIMEOUT_MS = 10 * 60_000 // 10 min — allows time for user approval clicks
 
 interface PendingReq {
   resolve: (r: { text: string; usage?: TokenUsage }) => void
@@ -199,11 +199,14 @@ function getOrStart(appSessionId: string): ProtoSession {
 
 // ─── public API ──────────────────────────────────────────────────────────────
 export async function askCodex(
-  session: { id: string; codexThreadId?: string },
-  userMessage: string,
-  _onNewThreadId?: (id: string) => void
+  session:         { id: string; codexThreadId?: string },
+  userMessage:     string,
+  _onNewThreadId?: (id: string) => void,
+  approvalHandler?: (callId: string, commandStr: string) => Promise<boolean>
 ): Promise<{ text: string; usage?: TokenUsage }> {
   const ps = getOrStart(session.id)
+  // Update handler every call (chat context may have changed)
+  if (approvalHandler !== undefined) ps.approvalHandler = approvalHandler
   const msgId = randomUUID()
 
   return new Promise((resolve, reject) => {
@@ -237,15 +240,6 @@ export async function askCodex(
   )
 }
 
-/** Attach a per-session handler that is called whenever codex wants to run a command. */
-export function setCodexApprovalHandler(
-  appSessionId: string,
-  handler: (callId: string, commandStr: string) => Promise<boolean>
-): void {
-  const ps = protoSessions.get(appSessionId)
-  if (ps) ps.approvalHandler = handler
-}
-
 export function killCodexSession(appSessionId: string) {
   const ps = protoSessions.get(appSessionId)
   if (ps) {

package/src/config.ts

@@ -5,6 +5,7 @@ import { homedir } from 'os'
 
 export type AgentName = 'claude' | 'codex'
 export type PermissionMode = 'auto' | 'session' | 'ask'
+export type CodexApproval = 'ask' | 'allow'
 
 export interface Config {
   TELEGRAM_BOT_TOKEN: string
@@ -12,6 +13,7 @@ export interface Config {
   FORUM_GROUP_ID: string
   TELEGRAM_ADMIN_IDS: string[]
   PERMISSION_MODE: PermissionMode
+  CODEX_APPROVAL: CodexApproval
   availableAgents: AgentName[]
 }
 
@@ -59,6 +61,9 @@ export function loadConfig(): Config {
     rawMode === 'session' ? 'session' :
     rawMode === 'ask'     ? 'ask'     : 'auto'
 
+  const rawApproval = (process.env.CODEX_APPROVAL || 'ask').toLowerCase()
+  const codexApproval: CodexApproval = rawApproval === 'allow' ? 'allow' : 'ask'
+
   const config: Config = {
     TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN || '',
     DATA_DIR:           process.env.DATA_DIR || join(USER_DIR, 'data'),
@@ -66,6 +71,7 @@ export function loadConfig(): Config {
     TELEGRAM_ADMIN_IDS: (process.env.TELEGRAM_ADMIN_IDS || '')
       .split(',').map(id => id.trim()).filter(Boolean),
     PERMISSION_MODE:    permMode,
+    CODEX_APPROVAL:     codexApproval,
     availableAgents:    checkAgents(),
   }
 

package/src/handlers/messages.ts

@@ -3,7 +3,7 @@ import type { Bot, Context, Api } from 'grammy'
 import type { Storage, Session } from '../storage'
 import type { Config } from '../config'
 import { askClaude, type TokenUsage } from '../agents/claude'
-import { askCodex, setCodexApprovalHandler } from '../agents/codex'
+import { askCodex } from '../agents/codex'
 import { mdToTg, splitHtml } from '../utils/markdown'
 import { getLang, t } from '../i18n'
 import { registerApproval, respondApproval } from './approvals'
@@ -102,26 +102,24 @@ export function registerMessageHandler(bot: Bot<Context>, storage: Storage, conf
 
     storage.addMessage(chatId, session.id, 'user', text)
 
-    // ── Codex approval handler ──────────────────────────────────────────────
-    if (session.model === 'codex') {
-      setCodexApprovalHandler(session.id, (callId, cmdStr) => {
-        const approvalId = randomUUID()
-        const label = `🔧 <b>Codex quer executar:</b>\n<code>${escapeHtml(cmdStr)}</code>`
-        ctx.api.sendMessage(chatId, label, {
-          ...replyOpts,
-          parse_mode: 'HTML',
-          reply_markup: {
-            inline_keyboard: [[
-              { text: '✅ Aprovar', callback_data: `capprove:${approvalId}` },
-              { text: '❌ Negar',   callback_data: `cdeny:${approvalId}` },
-            ]],
-          },
-        }).catch(() => {})
-        return new Promise<boolean>((resolve) => {
-          registerApproval(approvalId, resolve)
-        })
-      })
-    }
+    // ── build codex approval handler (only if CODEX_APPROVAL=ask) ──────────
+    const codexApprovalHandler = (session.model === 'codex' && config.CODEX_APPROVAL === 'ask')
+      ? (callId: string, cmdStr: string) => {
+          const approvalId = randomUUID()
+          ctx.api.sendMessage(chatId,
+            `🔧 <b>Codex quer executar:</b>\n<code>${escapeHtml(cmdStr)}</code>`,
+            {
+              ...replyOpts,
+              parse_mode: 'HTML',
+              reply_markup: { inline_keyboard: [[
+                { text: '✅ Aprovar', callback_data: `capprove:${approvalId}` },
+                { text: '❌ Negar',   callback_data: `cdeny:${approvalId}` },
+              ]] },
+            }
+          ).catch(() => {})
+          return new Promise<boolean>((resolve) => registerApproval(approvalId, resolve))
+        }
+      : undefined
 
     let response: string
     try {
@@ -131,7 +129,8 @@ export function registerMessageHandler(bot: Bot<Context>, storage: Storage, conf
           (id) => storage.setClaudeSessionId(chatId, session!.id, id))
       } else {
         result = await askCodex(session, text,
-          (id) => storage.setCodexThreadId(chatId, session!.id, id))
+          (id) => storage.setCodexThreadId(chatId, session!.id, id),
+          codexApprovalHandler)
       }
       response = (isFirstMessage && result.usage) ? result.text + formatUsage(result.usage) : result.text
     } catch (err: any) {