cliclaw 1.0.35 → 1.0.37

package/index.ts

@@ -27,7 +27,7 @@ registerMessageHandler(bot, storage, config)
 // ── Codex exec approval callbacks ──────────────────────────────────────────
 const APPROVAL_PREFIXES: Record<string, { decision: string; label: string }> = {
   capprove:  { decision: 'approved',             label: '✅ Aprovado'  },
-  csession:  { decision: 'approved_for_session', label: '🔁 Sessão'    },
+  csession:  { decision: 'approved_for_session', label: '🔓 Sessão aprovada!' },
   cdeny:     { decision: 'denied',               label: '❌ Negado'    },
   cabort:    { decision: 'abort',                label: '🛑 Abortado'  },
 }

package/package.json

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

package/src/agents/codex.ts

@@ -26,12 +26,13 @@ interface PendingReq {
 }
 
 interface ProtoSession {
-  proc:            ChildProcess
-  sessionId:       string
-  lastUsed:        number
-  pending:         Map<string, PendingReq>
-  buf:             string   // incomplete stdout line buffer
+  proc:             ChildProcess
+  sessionId:        string
+  lastUsed:         number
+  pending:          Map<string, PendingReq>
+  buf:              string   // incomplete stdout line buffer
   approvalHandler?: (callId: string, commandStr: string) => Promise<string>
+  sessionApproved:  boolean  // true after user clicks "Aprovar Sessão"
 }
 
 // Map from cliclaw session.id → ProtoSession
@@ -74,6 +75,7 @@ function startProto(appSessionId: string): ProtoSession {
     lastUsed: Date.now(),
     pending: new Map(),
     buf: '',
+    sessionApproved: false,
   }
 
   proc.stdout!.on('data', (d: Buffer) => {
@@ -84,7 +86,9 @@ function startProto(appSessionId: string): ProtoSession {
       try {
         const obj = JSON.parse(line)
         handleProtoEvent(ps, obj)
-      } catch {}
+      } catch (e: any) {
+        console.error('[Codex proto] parse error:', e?.message, '| line:', line.slice(0, 120))
+      }
     }
   })
 
@@ -129,18 +133,37 @@ function handleProtoEvent(ps: ProtoSession, obj: any) {
     const subId      = msg.sub_id ?? msg.call_id ?? msgId
     const commandStr = formatApprovalCommand(msg.command ?? msg.cmd)
     console.log(`[Codex approval] request recebido sub_id=${subId} cmd="${commandStr.slice(0, 80)}"`)
+
+    // Codex uses JSON-RPC 2.0 with its own decision strings
+    const DECISION_MAP: Record<string, string> = {
+      approved:             'accept',
+      approved_for_session: 'acceptForSession',
+      denied:               'decline',
+      abort:                'cancel',
+    }
     const respond = (decision: string) => {
-      console.log(`[Codex approval] enviando exec_approval sub_id=${subId} decision=${decision}`)
+      if (decision === 'approved_for_session') ps.sessionApproved = true
+      const codexDecision = DECISION_MAP[decision] ?? 'decline'
+      console.log(`[Codex approval] enviando exec_approval id=${msgId} decision=${codexDecision}`)
       try {
         ps.proc.stdin!.write(JSON.stringify({
-          id:  randomUUID(),
-          op:  { type: 'exec_approval', sub_id: subId, decision },
+          jsonrpc: '2.0',
+          id:      msgId,
+          result:  { decision: codexDecision },
         }) + '\n')
         console.log(`[Codex approval] enviado ok`)
       } catch (e: any) {
         console.error(`[Codex approval] erro ao enviar: ${e.message}`)
       }
     }
+
+    // If the user already approved the whole session, skip the prompt
+    if (ps.sessionApproved) {
+      console.log(`[Codex approval] sessão aprovada — auto-aprovando`)
+      respond('approved')
+      return
+    }
+
     if (ps.approvalHandler) {
       console.log(`[Codex approval] aguardando usuário via Telegram...`)
       ps.approvalHandler(subId, commandStr)

package/src/handlers/messages.ts

@@ -115,8 +115,8 @@ async function processMessage(ctx: Context, storage: Storage, config: Config) {
             parse_mode: 'HTML',
             reply_markup: { inline_keyboard: [
               [
-                { text: '✅ Aprovar',   callback_data: `capprove:${approvalId}` },
-                { text: '🔁 Sessão',    callback_data: `csession:${approvalId}` },
+                { text: '✅ Aprovar',         callback_data: `capprove:${approvalId}` },
+                { text: '🔓 Aprovar Sessão',  callback_data: `csession:${approvalId}` },
               ],
               [
                 { text: '❌ Negar',     callback_data: `cdeny:${approvalId}` },