cliclaw 1.0.24 → 1.0.26

package/bin/cli.js

@@ -189,18 +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}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}`)
+  console.log(`\n${c.bold}Aprovação de comandos${c.reset} ${c.gray}(todos os agentes)${c.reset}`)
+  console.log(`  ${c.bold}1) ask${c.reset}    — pergunta antes de executar cada comando ${c.cyan}(recomendado)${c.reset}`)
+  console.log(`  ${c.bold}2) allow${c.reset}  — executa tudo automaticamente sem perguntar\n`)
+  const permChoice = await prompt('Escolha [1/2]',
+    (existing.PERMISSION_MODE || existing.CODEX_APPROVAL) === 'allow' ? '2' : '1')
+  const permMode = permChoice === '2' ? 'allow' : 'ask'
+  ok(`Permission mode: ${permMode}`)
 
   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 += `CODEX_APPROVAL=${codexApproval}\n`
+  envContent += `PERMISSION_MODE=${permMode}\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.24",
+  "version": "1.0.26",
   "description": "Telegram bot bridging AI CLIs (Claude Code, Codex) to Forum Topics",
   "main": "index.ts",
   "scripts": {

package/src/agents/codex.ts

@@ -121,13 +121,6 @@ function handleProtoEvent(ps: ProtoSession, obj: any) {
 
   if (msg?.type === 'session_configured') {
     ps.sessionId = msg.session_id ?? ''
-    // Ask codex to route exec approvals to us instead of auto-approving
-    try {
-      ps.proc.stdin!.write(JSON.stringify({
-        id: 'cfg-approval',
-        op: { type: 'configure', config: { approval_policy: 'user_approval' } },
-      }) + '\n')
-    } catch {}
     return
   }
 
@@ -139,7 +132,7 @@ function handleProtoEvent(ps: ProtoSession, obj: any) {
       try {
         ps.proc.stdin!.write(JSON.stringify({
           id:  randomUUID(),
-          op:  { type: 'exec_approval_response', call_id: callId, approved },
+          op:  { type: 'exec_approval', call_id: callId, approved },
         }) + '\n')
       } catch {}
     }

package/src/config.ts

@@ -4,8 +4,8 @@ import { join } from 'path'
 import { homedir } from 'os'
 
 export type AgentName = 'claude' | 'codex'
-export type PermissionMode = 'auto' | 'session' | 'ask'
-export type CodexApproval = 'ask' | 'allow'
+/** ask = ask before each command | allow = auto-approve everything */
+export type PermissionMode = 'ask' | 'allow'
 
 export interface Config {
   TELEGRAM_BOT_TOKEN: string
@@ -13,7 +13,6 @@ export interface Config {
   FORUM_GROUP_ID: string
   TELEGRAM_ADMIN_IDS: string[]
   PERMISSION_MODE: PermissionMode
-  CODEX_APPROVAL: CodexApproval
   availableAgents: AgentName[]
 }
 
@@ -56,13 +55,9 @@ export function loadConfig(): Config {
     }
   }
 
-  const rawMode = (process.env.PERMISSION_MODE || 'auto').toLowerCase()
-  const permMode: PermissionMode =
-    rawMode === 'session' ? 'session' :
-    rawMode === 'ask'     ? 'ask'     : 'auto'
-
-  const rawApproval = (process.env.CODEX_APPROVAL || 'ask').toLowerCase()
-  const codexApproval: CodexApproval = rawApproval === 'allow' ? 'allow' : 'ask'
+  // Support both PERMISSION_MODE and legacy CODEX_APPROVAL
+  const rawMode = (process.env.PERMISSION_MODE || process.env.CODEX_APPROVAL || 'ask').toLowerCase()
+  const permMode: PermissionMode = rawMode === 'allow' ? 'allow' : 'ask'
 
   const config: Config = {
     TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN || '',
@@ -71,7 +66,6 @@ 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(),
   }
 
@@ -86,7 +80,7 @@ export function loadConfig(): Config {
   if (config.availableAgents.length === 0) {
     console.warn('\n⚠️  No AI CLIs found in PATH. Run /start in Telegram for setup instructions.\n')
   } else {
-    console.log(`✅ Available agents: ${config.availableAgents.join(', ')} | Permission mode: ${config.PERMISSION_MODE}`)
+    console.log(`✅ Available agents: ${config.availableAgents.join(', ')} | Approval: ${config.PERMISSION_MODE}`)
   }
 
   return config

package/src/handlers/messages.ts

@@ -102,8 +102,8 @@ export function registerMessageHandler(bot: Bot<Context>, storage: Storage, conf
 
     storage.addMessage(chatId, session.id, 'user', text)
 
-    // ── build codex approval handler (only if CODEX_APPROVAL=ask) ──────────
-    const codexApprovalHandler = (session.model === 'codex' && config.CODEX_APPROVAL === 'ask')
+    // ── build codex approval handler (only if PERMISSION_MODE=ask) ─────────
+    const codexApprovalHandler = (session.model === 'codex' && config.PERMISSION_MODE === 'ask')
       ? (callId: string, cmdStr: string) => {
           const approvalId = randomUUID()
           ctx.api.sendMessage(chatId,