carmoji 0.3.6 → 0.3.7

package/README.md

@@ -153,10 +153,11 @@ cache-write tokens; cache reads excluded). It's your real consumption, not
 an official percentage of plan quota — there's no public API for that.
 Recomputed at turn boundaries with a 5-minute cache so hooks stay fast.
 
-## Answer permissions from the phone (Claude Code)
+## Answer permissions from the phone (Claude Code and Codex)
 
-`carmoji install claude` hooks Claude Code's `PermissionRequest` event,
-which fires **only when a permission dialog is about to appear** —
+`carmoji install claude` and `carmoji install codex` hook each agent's
+`PermissionRequest` event, which fires **only when a permission dialog is
+about to appear** —
 allowlisted tools and auto-accepted edits never trigger it, so nothing
 ever slows down a call that would have run anyway. When it fires, the
 phone chimes (a doorbell sound used by nothing else), shows big pleading
@@ -165,14 +166,14 @@ settles the prompt on the computer via the hook's official decision
 output. No answer within ~55 s falls through to the normal terminal
 prompt (`npx carmoji test approval` exercises the whole loop).
 
-Simple **AskUserQuestion** pickers ride the same hook: one single-select
-question with 2–4 labeled options becomes a tappable option card on the
-phone (`npx carmoji test question` demos it), and your pick is fed back
-as the answer. Richer questions — several at once, multi-select, free
-text — still show as a pleading toast and are answered in the terminal.
-
-Honest limits: the Codex integration currently treats `PermissionRequest`
-as display-only (answering from the phone is planned next).
+For Claude Code, simple **AskUserQuestion** pickers ride the same hook: one
+single-select question with 2–4 labeled options becomes a tappable option
+card on the phone (`npx carmoji test question` demos it), and your pick is
+fed back as the answer. Richer questions — several at once, multi-select,
+free text — still show as a pleading toast and are answered in the terminal.
+Codex questions use its App Server `requestUserInput` protocol rather than
+lifecycle hooks, so they remain terminal-only; Codex Allow/Deny permission
+approvals do work from the phone.
 
 Older Claude Code versions without the `PermissionRequest` hook can use
 `npx carmoji config gate` instead: a legacy `PreToolUse` gate with a tool

package/carmoji.js

@@ -613,10 +613,14 @@ const APPROVAL_WAIT_MS = 55_000;
 const HOLD_WAIT_MS = 120_000;
 const PERMISSION_HOOK_TIMEOUT_S = 150;
 
-/** Sources whose PermissionRequest hook accepts a decision back via
- *  `hookSpecificOutput.decision` (Claude Code's schema). Codex is the next
- *  candidate once its hooks are verified to honor the reply. */
-const ANSWERABLE_PERMISSION_SOURCES = new Set(['claude']);
+/** Sources whose PermissionRequest hook accepts Allow/Deny through
+ *  `hookSpecificOutput.decision`. */
+const ANSWERABLE_APPROVAL_SOURCES = new Set(['claude', 'codex']);
+
+/** Sources whose question protocol accepts `decision.updatedInput`.
+ *  Codex questions use App Server requestUserInput instead of hooks, so a
+ *  synthetic AskUserQuestion event must remain display-only. */
+const ANSWERABLE_QUESTION_SOURCES = new Set(['claude']);
 
 // ---------------------------------------------------------------------------
 // Multi-tool hook installers (see EVENT_ALIASES for how their events map).
@@ -1245,8 +1249,7 @@ async function main() {
         // to the terminal dialog.
         const canonicalEvent = EVENT_ALIASES[payload.hook_event_name]
           ?? payload.hook_event_name;
-        if (canonicalEvent === 'PermissionRequest'
-            && ANSWERABLE_PERMISSION_SOURCES.has(source)) {
+        if (canonicalEvent === 'PermissionRequest') {
           const common = {
             source,
             session: payload.session_id,
@@ -1260,7 +1263,8 @@ async function main() {
           // looks answers up by it — keying by header yields empty answers)
           // with the original `questions` kept in place (Claude Code crashes
           // on its absence). Richer shapes fall through to display-only.
-          if (payload.tool_name === 'AskUserQuestion') {
+          if (payload.tool_name === 'AskUserQuestion'
+              && ANSWERABLE_QUESTION_SOURCES.has(source)) {
             const question = answerableQuestion(payload.tool_input);
             if (question) {
               const reply = await requestApprovalAll(devices, {
@@ -1292,7 +1296,8 @@ async function main() {
             }
             // No card, no tap, or an unknown label: fall through to the
             // pleading face + toast; the picker stays in the terminal.
-          } else {
+          } else if (payload.tool_name !== 'AskUserQuestion'
+                     && ANSWERABLE_APPROVAL_SOURCES.has(source)) {
             const decision = (await requestApprovalAll(devices, {
               ...common,
               event: 'approval_request',
@@ -1389,7 +1394,7 @@ async function main() {
         }, APPROVAL_WAIT_MS))?.decision;
         console.log(decision
           ? `Decision: ${decision}`
-          : 'No answer — in a real session Claude Code would fall through to the terminal prompt.');
+          : 'No answer — in a real session the coding agent would fall through to the terminal prompt.');
         process.exit(decision ? 0 : 1);
       }
       if (arg === 'question') {
@@ -1599,16 +1604,16 @@ tool's dialect (beforeShellExecution, TaskComplete, permission_request, …);
 see EVENT_ALIASES in carmoji.js for the full mapping. Unknown events are
 silently ignored.
 
-Blocking: a Claude Code PermissionRequest holds the hook open up to ${APPROVAL_WAIT_MS / 1000}s
+Blocking: a Claude Code or Codex PermissionRequest holds the hook open up to ${APPROVAL_WAIT_MS / 1000}s
 while the phone shows a card, then prints the decision for the agent:
   {"hookSpecificOutput":{"hookEventName":"PermissionRequest",
                          "decision":{"behavior":"allow"}}}
-AskUserQuestion gets an option-picker card instead when it's one
-single-select question with 2–4 labeled options; the tapped label — or
-free text typed behind the card's "Other…" button, which sends
+For Claude Code, AskUserQuestion gets an option-picker card instead when
+it's one single-select question with 2–4 labeled options; the tapped label
+— or free text typed behind the card's "Other…" button, which sends
 {hold:true} to stretch the wait to ${HOLD_WAIT_MS / 1000}s — comes back via
 decision.updatedInput.answers. Multi-question and multiSelect stay
-display-only.
+display-only; Codex questions use App Server requestUserInput instead.
 No tap → no output → the normal terminal prompt appears.
 
 Try it:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carmoji",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Bring your CarMoji pet to life from Claude Code / Codex — a LAN bridge that streams coding events to the CarMoji iOS app",
   "type": "module",
   "bin": {