carmoji 0.3.0 → 0.3.1

package/carmoji.js

@@ -22,7 +22,7 @@ import {
   copyFileSync, existsSync, readdirSync, unlinkSync,
 } from 'node:fs';
 import { spawn } from 'node:child_process';
-import { homedir } from 'node:os';
+import { homedir, hostname } from 'node:os';
 import { join, dirname, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -763,37 +763,14 @@ function uninstallTool(key) {
   console.log(`Removed CarMoji hooks for ${tool.name} from ${path}`);
 }
 
-/** Merge the CarMoji hooks into ~/.claude/settings.json, keeping a backup. */
+/**
+ * Merge the CarMoji hooks into ~/.claude/settings.json, keeping a backup.
+ * Existing carmoji entries are replaced, not skipped, so switching between
+ * a repo clone (`node …/carmoji.js`) and the npm package (`npx carmoji`)
+ * always leaves the config pointing at whichever one ran the install.
+ */
 function installClaude() {
-  const path = join(homedir(), '.claude', 'settings.json');
-  let settings = {};
-  if (existsSync(path)) {
-    try {
-      settings = JSON.parse(readFileSync(path, 'utf8'));
-    } catch {
-      console.error(`${path} is not valid JSON — fix it first (nothing was changed).`);
-      process.exit(1);
-    }
-  }
-  if (typeof settings.hooks !== 'object' || settings.hooks === null) settings.hooks = {};
-
-  let added = 0;
-  for (const name of CLAUDE_HOOK_EVENTS) {
-    const entries = Array.isArray(settings.hooks[name]) ? settings.hooks[name]
-      : (settings.hooks[name] = []);
-    if (JSON.stringify(entries).includes('carmoji')) continue; // already ours
-    entries.push({ hooks: [{ type: 'command', command: HOOK_COMMAND, timeout: 5 }] });
-    added++;
-  }
-  if (added === 0) {
-    console.log(`CarMoji hooks already installed in ${path}`);
-    return;
-  }
-  const bak = existsSync(path) ? backupFile(path) : null;
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, JSON.stringify(settings, null, 2) + '\n');
-  console.log(`Added CarMoji hooks to ${added} event(s) in ${path}`);
-  if (bak) console.log(`Backup saved to ${bak}`);
+  installJsonHooks('claude', TOOLS.claude);
   console.log('New Claude Code sessions will pick them up.');
 }
 
@@ -922,7 +899,10 @@ async function main() {
 
         const event = eventFromHook(payload);
         if (!event) break;
-        const message = { source, session: payload.session_id, ...event };
+        // host lets the phone attribute plan-window usage per machine and
+        // sum across them instead of showing whichever reported last.
+        const message = { source, session: payload.session_id,
+                          host: hostname(), ...event };
         // Claude-format transcripts power the tok/s readout; the forks share
         // the format, and sessionTokens quietly no-ops for everyone else.
         const tokens = sessionTokens(payload);
@@ -982,7 +962,7 @@ async function main() {
         process.exit(1);
       }
       const [session, tokens, project] = rest;
-      const message = { source: 'test', session, ...event };
+      const message = { source: 'test', session, host: hostname(), ...event };
       if (tokens !== undefined) message.tokens = Number(tokens);
       if (project) message.project = project;
       const usage = claudeUsage(true);

package/package.json

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