cliclaw 1.0.37 → 1.0.39

package/package.json

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

package/src/agents/codex.ts

@@ -130,27 +130,19 @@ function handleProtoEvent(ps: ProtoSession, obj: any) {
 
   // ── exec approval request ───────────────────────────────────────────────────
   if (msg?.type === 'exec_approval_request') {
-    const subId      = msg.sub_id ?? msg.call_id ?? msgId
+    // effective_approval_id() in Codex uses approval_id ?? call_id
+    const approvalId = msg.approval_id ?? msg.call_id ?? msg.sub_id ?? msgId
+    const turnId     = msg.turn_id as string | undefined
     const commandStr = formatApprovalCommand(msg.command ?? msg.cmd)
-    console.log(`[Codex approval] request recebido sub_id=${subId} cmd="${commandStr.slice(0, 80)}"`)
+    console.log(`[Codex approval] request: outer_id=${msgId} approval_id=${approvalId} turn_id=${turnId} raw=${JSON.stringify(msg)}`)
 
-    // 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) => {
       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}`)
+      const op: Record<string, unknown> = { type: 'exec_approval', id: approvalId, decision }
+      if (turnId) op.turn_id = turnId
+      console.log(`[Codex approval] enviando: ${JSON.stringify({ id: '...', op })}`)
       try {
-        ps.proc.stdin!.write(JSON.stringify({
-          jsonrpc: '2.0',
-          id:      msgId,
-          result:  { decision: codexDecision },
-        }) + '\n')
+        ps.proc.stdin!.write(JSON.stringify({ id: randomUUID(), op }) + '\n')
         console.log(`[Codex approval] enviado ok`)
       } catch (e: any) {
         console.error(`[Codex approval] erro ao enviar: ${e.message}`)