carmoji 0.3.7 → 0.3.9

package/carmoji.js

@@ -245,6 +245,7 @@ async function requestApproval(config, message, timeoutMs = 55_000, requireCap)
         const reply = JSON.parse(data.toString());
         if (reply.ok === false) return finish(null);
         if (reply.decision === 'allow' || reply.decision === 'deny'
+            || reply.decision === 'always'
             || typeof reply.answer === 'string') {
           return finish(reply);
         }
@@ -487,10 +488,41 @@ function normalizePayload(payload, eventFlag) {
   return payload;
 }
 
+/** Tools that carry the agent's own task list in their input. */
+const TODO_TOOLS = new Set(['TodoWrite', 'update_plan']);
+
+/**
+ * The agent's task list, normalized from Claude's TodoWrite
+ * (`todos: [{content, status, activeForm}]`) or Codex's update_plan
+ * (`plan: [{step, status}]`). Every call carries the whole list, so the
+ * phone can render progress and diff for freshly completed items.
+ */
+function todosFromInput(input) {
+  const raw = Array.isArray(input?.todos) ? input.todos
+    : Array.isArray(input?.plan) ? input.plan : undefined;
+  if (!raw) return undefined;
+  const normalize = (status) =>
+    ['completed', 'complete', 'done'].includes(status) ? 'done'
+      : ['in_progress', 'active'].includes(status) ? 'active' : 'pending';
+  const items = raw.slice(0, 12).map((item) => ({
+    text: String(item.content ?? item.step ?? item.text ?? '')
+      .replace(/\s+/g, ' ').trim().slice(0, 80),
+    status: normalize(item.status),
+  })).filter((item) => item.text);
+  return items.length ? items : undefined;
+}
+
 /** Map a normalized hook payload to a wire event, or null to ignore. */
 function eventFromHook(payload) {
   const raw = payload.hook_event_name;
   const tool = payload.tool_name ?? EVENT_TOOL_HINTS[raw];
+  // The task list rides its own event: updating it is bookkeeping, not
+  // "running a command", so it must not pull the nervous tool face.
+  // Pre and Post both carry the list; sending twice is a no-op diff.
+  if (TODO_TOOLS.has(tool)) {
+    const todos = todosFromInput(payload.tool_input);
+    if (todos) return { event: 'todos', todos };
+  }
   switch (EVENT_ALIASES[raw] ?? raw) {
     case 'SessionStart': return { event: 'session_start' };
     case 'UserPromptSubmit': return { event: 'prompt' };
@@ -579,9 +611,50 @@ function sessionTokens(payload) {
   return state.total;
 }
 
+/**
+ * The agent's final say for the turn. Hooks never carry assistant text,
+ * but Stop hands over transcript_path, and the JSONL's tail holds the
+ * reply — Claude records {type:"assistant", message:{content:[{type:
+ * "text",text}]}}, Codex rollouts {payload:{type:"agent_message",message}}.
+ */
+function lastAssistantText(payload) {
+  try {
+    const transcript = payload.transcript_path;
+    if (!transcript) return undefined;
+    const size = statSync(transcript).size;
+    const window = Math.min(size, 256 * 1024);
+    if (window === 0) return undefined;
+    const fd = openSync(transcript, 'r');
+    const buffer = Buffer.alloc(window);
+    const bytesRead = readSync(fd, buffer, 0, window, size - window);
+    closeSync(fd);
+    const lines = buffer.subarray(0, bytesRead).toString('utf8').split('\n');
+    for (let i = lines.length - 1; i >= 0; i -= 1) {
+      const line = lines[i];
+      if (!line.includes('"assistant"') && !line.includes('agent_message')) continue;
+      try {
+        const record = JSON.parse(line);
+        if (record.type === 'assistant') {
+          const texts = (record.message?.content ?? [])
+            .filter((block) => block.type === 'text' && block.text)
+            .map((block) => block.text);
+          if (texts.length) return texts.join(' ');
+        }
+        if (record.payload?.type === 'agent_message' && record.payload.message) {
+          return String(record.payload.message);
+        }
+      } catch { /* the window's first line may be cut mid-record */ }
+    }
+  } catch { /* no transcript, no say */ }
+  return undefined;
+}
+
 const TEST_EVENTS = {
   start: { event: 'session_start' },
-  prompt: { event: 'prompt' },
+  prompt: { event: 'prompt', detail: 'Fix the corner release bug' },
+  say: { event: 'turn_done',
+         detail: 'Done — corners now release on yaw alone with an 8s cap, '
+           + 'and cornerEnded bypasses every gate so the lean never sticks.' },
   edit: { event: 'tool_start', tool: 'Edit' },
   read: { event: 'tool_start', tool: 'Read' },
   run: { event: 'tool_start', tool: 'Bash' },
@@ -617,6 +690,12 @@ const PERMISSION_HOOK_TIMEOUT_S = 150;
  *  `hookSpecificOutput.decision`. */
 const ANSWERABLE_APPROVAL_SOURCES = new Set(['claude', 'codex']);
 
+/** Sources whose decision also honors `updatedPermissions` — lets the phone
+ *  offer "Always allow" (a session-scoped rule, mirroring the terminal
+ *  dialog's don't-ask-again row). Codex hooks ignore updatedPermissions, so
+ *  its card stays Allow/Deny. */
+const ALWAYS_ALLOW_SOURCES = new Set(['claude']);
+
 /** 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. */
@@ -1298,17 +1377,34 @@ async function main() {
             // pleading face + toast; the picker stays in the terminal.
           } else if (payload.tool_name !== 'AskUserQuestion'
                      && ANSWERABLE_APPROVAL_SOURCES.has(source)) {
+            const canAlways = ALWAYS_ALLOW_SOURCES.has(source)
+              && Boolean(payload.tool_name);
             const decision = (await requestApprovalAll(devices, {
               ...common,
               event: 'approval_request',
               tool: payload.tool_name,
               detail: summarizeToolInput(payload),
+              // Tells the phone it may offer an "Always allow" button;
+              // older app builds don't know the field and show Allow/Deny.
+              ...(canAlways ? { always: true } : {}),
             }, APPROVAL_WAIT_MS))?.decision;
             if (decision) {
+              const settled = { behavior: decision === 'always' ? 'allow' : decision };
+              if (decision === 'always' && canAlways) {
+                // Session-scoped don't-ask-again rule. A bare toolName rule
+                // allows every use of the tool; MCP tools (mcp__server__tool)
+                // in particular reject a ruleContent specifier.
+                settled.updatedPermissions = [{
+                  type: 'addRules',
+                  rules: [{ toolName: payload.tool_name }],
+                  behavior: 'allow',
+                  destination: 'session',
+                }];
+              }
               console.log(JSON.stringify({
                 hookSpecificOutput: {
                   hookEventName: 'PermissionRequest',
-                  decision: { behavior: decision },
+                  decision: settled,
                 },
               }));
             }
@@ -1330,15 +1426,20 @@ async function main() {
         // project directory, so fall back to that.
         const cwd = payload.cwd || process.cwd();
         if (cwd) message.project = basename(cwd);
-        // A snippet of human-readable context for the phone to show.
+        // A snippet of human-readable context for the phone to show. The
+        // turn's reply gets more room than a toast line — it feeds the
+        // reviewable chat history, not just a caption.
         const detail = event.event === 'prompt'
           ? firstString(payload.prompt, payload.user_prompt, payload.userPrompt,
                         payload.message, payload.input, payload.text)
           : event.event === 'permission'
             ? firstString(payload.message, payload.detail,
                           payload.tool_input ? summarizeToolInput(payload) : undefined)
-            : undefined;
-        if (detail) message.detail = String(detail).replace(/\s+/g, ' ').slice(0, 140);
+            : event.event === 'turn_done'
+              ? lastAssistantText(payload)
+              : undefined;
+        const detailCap = event.event === 'turn_done' ? 400 : 140;
+        if (detail) message.detail = String(detail).replace(/\s+/g, ' ').slice(0, detailCap);
         // Plan-window usage comes from Claude Code's local transcripts;
         // recompute only at turn boundaries.
         if (source === 'claude') {
@@ -1372,8 +1473,8 @@ async function main() {
 
     case 'test': {
       const event = TEST_EVENTS[arg];
-      if (!event && arg !== 'approval' && arg !== 'question') {
-        console.error(`Usage: carmoji test <${Object.keys(TEST_EVENTS).join('|')}|approval|question> [session] [tokens] [project] — details: carmoji test --help`);
+      if (!event && !['approval', 'question', 'todos'].includes(arg)) {
+        console.error(`Usage: carmoji test <${Object.keys(TEST_EVENTS).join('|')}|approval|question|todos> [session] [tokens] [project] — details: carmoji test --help`);
         process.exit(1);
       }
       const devices = loadDevices();
@@ -1391,6 +1492,7 @@ async function main() {
           event: 'approval_request',
           tool: 'Bash',
           detail: 'carmoji test approval — tap Allow or Deny',
+          always: true,
         }, APPROVAL_WAIT_MS))?.decision;
         console.log(decision
           ? `Decision: ${decision}`
@@ -1422,6 +1524,28 @@ async function main() {
           : 'No answer — in a real session the picker would stay in the terminal.');
         process.exit(answer ? 0 : 1);
       }
+      if (arg === 'todos') {
+        // Seeds a five-step demo list; raise `done` call by call to walk a
+        // task across the board and fire the completed-item flourish:
+        //   carmoji test todos [session] [done 0-5]
+        const [session, doneArg] = rest;
+        const done = Math.max(0, Math.min(5, Number(doneArg ?? 1) || 0));
+        const steps = ['Explore the codebase', 'Write the failing test',
+                       'Implement the fix', 'Run the test suite',
+                       'Update the docs'];
+        const todos = steps.map((text, index) => ({
+          text,
+          status: index < done ? 'done' : index === done ? 'active' : 'pending',
+        }));
+        const message = { source: 'test', session, host: hostname(),
+                          event: 'todos', todos };
+        const results = await sendAll(devices, message);
+        results.forEach((result, index) => {
+          console.log(`  ${deviceLabel(devices[index])}: ${
+            result === 'ok' ? 'sent!' : `failed (${result})`}`);
+        });
+        process.exit(results.every((result) => result === 'ok') ? 0 : 1);
+      }
       const [session, tokens, project] = rest;
       const message = { source: 'test', session, host: hostname(), ...event };
       if (tokens !== undefined) message.tokens = Number(tokens);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carmoji",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "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": {