carmoji 0.3.9 → 0.3.12

package/carmoji.js

@@ -570,12 +570,27 @@ function applyTranscriptTokenRecord(state, record) {
   return state;
 }
 
+/** One transcript record's assistant prose, if it carries any. */
+function assistantTextOf(record) {
+  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('\n');
+  }
+  if (record.payload?.type === 'agent_message' && record.payload.message) {
+    return String(record.payload.message);
+  }
+  return undefined;
+}
+
 /**
- * Cumulative output tokens for this session, counted incrementally from the
- * Claude or Codex transcript JSONL. A per-session byte offset is cached so
- * each hook only parses lines appended since the previous one.
+ * What the transcript gained since the last hook: the session's cumulative
+ * output tokens, plus any assistant prose that appeared — the play-by-play
+ * an agent narrates between tools, and eventually the turn's reply. A
+ * per-session byte offset is cached so each hook only parses new lines.
  */
-function sessionTokens(payload) {
+function sessionTranscriptNews(payload) {
   const transcript = payload.transcript_path;
   const session = payload.session_id;
   if (!transcript || !session) return undefined;
@@ -584,6 +599,7 @@ function sessionTokens(payload) {
   try { state = JSON.parse(readFileSync(statePath, 'utf8')); } catch {}
   if (!Number.isFinite(state.offset) || state.offset < 0) state.offset = 0;
   if (!Number.isFinite(state.total) || state.total < 0) state.total = 0;
+  const texts = [];
   let size;
   try { size = statSync(transcript).size; } catch { return undefined; }
   if (size < state.offset) state = { offset: 0, total: 0 }; // truncated/rotated
@@ -598,9 +614,14 @@ function sessionTokens(payload) {
     const lastNewline = chunk.lastIndexOf(0x0a);
     if (lastNewline >= 0) {
       for (const line of chunk.subarray(0, lastNewline + 1).toString('utf8').split('\n')) {
-        if (!line.includes('"usage"') && !line.includes('"token_count"')) continue;
+        const wantsTokens = line.includes('"usage"') || line.includes('"token_count"');
+        const wantsText = line.includes('"assistant"') || line.includes('agent_message');
+        if (!wantsTokens && !wantsText) continue;
         try {
-          applyTranscriptTokenRecord(state, JSON.parse(line));
+          const record = JSON.parse(line);
+          if (wantsTokens) applyTranscriptTokenRecord(state, record);
+          const text = assistantTextOf(record);
+          if (text && text.trim().length >= 20) texts.push(text);
         } catch { /* ignore malformed lines */ }
       }
       state.offset += lastNewline + 1;
@@ -608,7 +629,7 @@ function sessionTokens(payload) {
       writeFileSync(statePath, JSON.stringify(state));
     }
   }
-  return state.total;
+  return { total: state.total, texts };
 }
 
 /**
@@ -633,16 +654,8 @@ function lastAssistantText(payload) {
       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);
-        }
+        const text = assistantTextOf(JSON.parse(line));
+        if (text) return text;
       } catch { /* the window's first line may be cut mid-record */ }
     }
   } catch { /* no transcript, no say */ }
@@ -655,6 +668,9 @@ const TEST_EVENTS = {
   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.' },
+  note: { event: 'agent_note',
+          detail: 'Found it — the release threshold on lateral was 0.078g, '
+            + 'which a hand never settles under. Trying a yaw-only exit next.' },
   edit: { event: 'tool_start', tool: 'Edit' },
   read: { event: 'tool_start', tool: 'Read' },
   run: { event: 'tool_start', tool: 'Bash' },
@@ -1418,28 +1434,60 @@ async function main() {
         // sum across them instead of showing whichever reported last.
         const message = { source, session: payload.session_id,
                           host: hostname(), ...event };
-        // Claude and Codex transcripts power the tok/s readout; other formats
-        // quietly produce no token changes.
-        const tokens = sessionTokens(payload);
-        if (tokens !== undefined) message.tokens = tokens;
+        // Claude and Codex transcripts power the tok/s readout and the
+        // play-by-play; other formats quietly produce neither.
+        const news = sessionTranscriptNews(payload);
+        if (news?.total !== undefined) message.tokens = news.total;
         // Gemini and Trae hooks carry no cwd — the hook itself runs in the
         // project directory, so fall back to that.
         const cwd = payload.cwd || process.cwd();
         if (cwd) message.project = basename(cwd);
+
+        // Prose ships whole and verbatim — markdown indentation, code
+        // blocks, and tables all matter to the phone's renderer, and the
+        // history is a review surface, so no length cap either. Only
+        // trailing per-line whitespace goes. Captions are one-liners, so
+        // they still collapse and clip.
+        const clipProse = (text) =>
+          String(text).replace(/[ \t]+$/gm, '').trim();
+        const clipCaption = (text, cap) =>
+          String(text).replace(/\s+/g, ' ').trim().slice(0, cap);
+
+        // On Stop the newest text block is the turn's reply; anything
+        // before it — and everything on other hooks — is mid-procedure
+        // narration, shipped as agent_note for the live play-by-play.
+        const newTexts = news?.texts ?? [];
+        const isTurnDone = event.event === 'turn_done';
+        const noteTexts = isTurnDone ? newTexts.slice(0, -1) : newTexts;
+        for (const text of noteTexts.slice(-4)) {
+          await sendAll(devices, { source, session: payload.session_id,
+                                   host: hostname(), project: message.project,
+                                   event: 'agent_note',
+                                   detail: clipProse(text) });
+        }
+
         // 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.
+        // turn's reply gets room — it feeds the reviewable chat history,
+        // not just a caption — with the tail-window read as fallback when
+        // the incremental scan saw nothing new.
+        // tool_start also names what the tool is chewing on (the command,
+        // the file) so the phone's history can say more than "Bash".
+        const toolInfo = event.event === 'tool_start' && payload.tool_input
+          ? summarizeToolInput(payload) : undefined;
         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)
-            : 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);
+            : isTurnDone
+              ? (newTexts[newTexts.length - 1] ?? lastAssistantText(payload))
+              : (toolInfo !== '{}' ? toolInfo : undefined);
+        if (detail) {
+          message.detail = isTurnDone || event.event === 'prompt'
+            ? clipProse(detail)
+            : clipCaption(detail, 140);
+        }
         // Plan-window usage comes from Claude Code's local transcripts;
         // recompute only at turn boundaries.
         if (source === 'claude') {

package/package.json

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