carmoji 0.3.2 → 0.3.4

package/README.md

@@ -38,6 +38,12 @@ approval.
    through the system's `dns-sd`, which handles Macs full of VPN tunnels
    and virtual interfaces; other platforms use a JS mDNS fallback.
 
+   Pairing is additive: pair again with a second phone and every event
+   fans out to all paired devices (approval requests go to all of them
+   too — the first tap wins). When devices are already paired, `pair`
+   asks whether to keep them. `npx carmoji unpair` forgets a device —
+   by name or address, or `unpair all` for a clean slate.
+
 ## Claude Code
 
 Coding in *this* repo works out of the box — the hooks ship in

package/carmoji.js

@@ -5,7 +5,10 @@
 // address + pairing code in ~/.config/carmoji/config.json.
 //
 // Commands:
-//   pair <code>      discover the phone on this Wi-Fi and pair with it
+//   pair <code>      discover phones on this Wi-Fi and pair with the one
+//                    whose Code Buddy sheet shows <code>
+//                    (pairing is additive — events fan out to every device)
+//   unpair [device]  forget a paired device by name or ip[:port], or `all`
 //   install <tool>   install hooks for a tool (or `all`); see `tools`
 //   uninstall <tool> remove CarMoji hooks from a tool's config
 //   tools            list supported tools and where their hooks live
@@ -52,6 +55,30 @@ function saveConfig(config) {
   writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + '\n');
 }
 
+/**
+ * Paired devices from a config of either vintage: the original single
+ * top-level {host, port, code}, or the current {devices: [{name, host,
+ * port, code}, …]}. Saving always writes the multi-device shape.
+ */
+function normalizeDevices(config) {
+  if (!config) return [];
+  const list = Array.isArray(config.devices) ? config.devices
+    : config.host ? [config] : [];
+  return list.filter((d) => d && d.host && d.port && d.code);
+}
+
+function loadDevices() {
+  return normalizeDevices(loadConfig());
+}
+
+function saveDevices(devices) {
+  saveConfig({ devices });
+}
+
+function deviceLabel(device) {
+  return `${device.name ?? device.host} — ${device.host}:${device.port}`;
+}
+
 function readStdin() {
   try {
     return readFileSync(0, 'utf8');
@@ -135,18 +162,23 @@ async function discoverViaMulticastJS() {
   });
 }
 
+async function askTTY(question) {
+  const { createInterface } = await import('node:readline/promises');
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const answer = await rl.question(question);
+  rl.close();
+  return answer.trim();
+}
+
 /** Let the user pick between several discovered phones. */
-async function chooseDevice(devices) {
-  console.log('Multiple CarMoji devices found:');
+async function chooseDevice(devices, heading = 'Multiple CarMoji devices found:') {
+  console.log(heading);
   devices.forEach((d, i) => console.log(`  ${i + 1}. ${d.name} — ${d.host}:${d.port}`));
   if (!process.stdin.isTTY) {
     console.error('\nRe-run with the address of the one you want: carmoji pair <code> <ip[:port]>');
     process.exit(1);
   }
-  const { createInterface } = await import('node:readline/promises');
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = await rl.question(`Pair with which one? [1-${devices.length}] `);
-  rl.close();
+  const answer = await askTTY(`Pair with which one? [1-${devices.length}] `);
   const device = devices[Number(answer) - 1];
   if (!device) {
     console.error('Invalid choice.');
@@ -220,6 +252,30 @@ async function requestApproval(config, message, timeoutMs = 55_000) {
   });
 }
 
+/** Fan one event out to every paired phone in parallel; one slow or
+ *  unreachable device can't delay the others past SEND_TIMEOUT_MS. */
+function sendAll(devices, message) {
+  return Promise.all(devices.map((device) => send(device, message)));
+}
+
+/**
+ * Show the approval card on every paired phone; the first tap anywhere
+ * wins. The other phones' cards drop when this process exits and their
+ * sockets close. Resolves null when nobody answers in time.
+ */
+function requestApprovalAll(devices, message, timeoutMs) {
+  if (devices.length === 0) return Promise.resolve(null);
+  return new Promise((resolve) => {
+    let pending = devices.length;
+    for (const device of devices) {
+      requestApproval(device, message, timeoutMs).then((decision) => {
+        pending -= 1;
+        if (decision || pending === 0) resolve(decision);
+      });
+    }
+  });
+}
+
 function summarizeToolInput(payload) {
   const input = payload.tool_input || {};
   const text = input.command || input.file_path || input.description
@@ -932,10 +988,18 @@ async function main() {
       let target;
       const manual = rest[0];
       if (manual) {
-        // Manual addressing for networks with several phones (the app's
-        // Code Buddy sheet shows the address) or when mDNS is blocked.
+        // Manual addressing (the app's Code Buddy sheet shows the address)
+        // for networks where mDNS is blocked.
         const [host, port] = manual.split(':');
         target = { host, port: Number(port) || 8737, name: host };
+        const result = await send({ ...target, code: arg },
+                                  { source: 'bridge', event: 'turn_done' });
+        if (result !== 'ok') {
+          console.error(result === 'bad-code'
+            ? `"${target.name}" (${target.host}:${target.port}) rejected the pairing code — check that device’s Code Buddy sheet.`
+            : `Found "${target.name}" at ${target.host}:${target.port} but couldn’t talk to it (${result}).`);
+          process.exit(1);
+        }
       } else {
         console.log('Looking for CarMoji on this network…');
         const devices = await discoverAll();
@@ -944,29 +1008,104 @@ async function main() {
           console.error('You can also pair by address: carmoji pair <code> <ip[:port]>');
           process.exit(1);
         }
-        target = devices.length === 1 ? devices[0] : await chooseDevice(devices);
+        // The pairing code identifies the phone: probe every discovered
+        // device with it and pair with whichever accepts — no picking from
+        // a list when several phones share the network.
+        const results = await Promise.all(devices.map((d) =>
+          send({ ...d, code: arg }, { source: 'bridge', event: 'turn_done' })));
+        const accepted = devices.filter((_, i) => results[i] === 'ok');
+        if (accepted.length === 0) {
+          console.error(results.includes('bad-code')
+            ? `No device on this network accepted code ${arg} — check the Code Buddy sheet on the phone you want:`
+            : 'Found CarMoji but couldn’t talk to it:');
+          devices.forEach((d, i) =>
+            console.error(`  ${deviceLabel(d)}: ${results[i]}`));
+          process.exit(1);
+        }
+        // Two phones drew the same 4-digit code — let the user break the
+        // tie instead of guessing.
+        target = accepted.length === 1 ? accepted[0]
+          : await chooseDevice(accepted, 'Several devices accepted this pairing code:');
       }
-      const config = { host: target.host, port: target.port, code: arg };
-      const result = await send(config, { source: 'bridge', event: 'turn_done' });
-      if (result !== 'ok') {
-        console.error(result === 'bad-code'
-          ? `"${target.name}" (${target.host}:${target.port}) rejected the pairing code — check that device’s Code Buddy sheet. (Wrong phone? Pass its address: carmoji pair <code> <ip[:port]>)`
-          : `Found "${target.name}" at ${target.host}:${target.port} but couldn’t talk to it (${result}).`);
-        process.exit(1);
+      const device = { name: target.name, host: target.host,
+                       port: target.port, code: arg };
+      // Pairing the same device again just refreshes its code; other
+      // devices stay paired unless the user says otherwise here.
+      const others = loadDevices().filter(
+        (d) => !(d.host === device.host && Number(d.port) === Number(device.port)));
+      let kept = others;
+      if (others.length > 0) {
+        console.log('Already paired with:');
+        others.forEach((d) => console.log(`  ${deviceLabel(d)}`));
+        if (process.stdin.isTTY) {
+          const answer = await askTTY(
+            'Keep them too? Events go to every paired device. [Y/n] ');
+          if (/^n/i.test(answer)) {
+            kept = [];
+            console.log('Unpaired them — events go only to the new device.');
+          }
+        } else {
+          console.log('Keeping them — events fan out to every paired device.'
+            + ' (`carmoji unpair` removes one.)');
+        }
       }
-      saveConfig(config);
+      saveDevices([...kept, device]);
       console.log(`Paired with "${target.name}" at ${target.host}:${target.port} — the pet should be celebrating!`);
       break;
     }
 
+    case 'unpair': {
+      const devices = loadDevices();
+      if (devices.length === 0) {
+        console.log('Not paired with any device.');
+        break;
+      }
+      let goners;
+      if (arg === 'all') {
+        goners = devices;
+      } else if (arg) {
+        goners = devices.filter((d) => d.name === arg || d.host === arg
+          || `${d.host}:${d.port}` === arg);
+        if (goners.length === 0) {
+          console.error(`No paired device matches "${arg}". Paired:`);
+          devices.forEach((d) => console.error(`  ${deviceLabel(d)}`));
+          process.exit(1);
+        }
+      } else if (devices.length === 1) {
+        goners = devices;
+      } else if (process.stdin.isTTY) {
+        console.log('Paired devices:');
+        devices.forEach((d, i) => console.log(`  ${i + 1}. ${deviceLabel(d)}`));
+        const answer = await askTTY(
+          `Unpair which one? [1-${devices.length}, or "all"] `);
+        if (answer.toLowerCase() === 'all') {
+          goners = devices;
+        } else {
+          const device = devices[Number(answer) - 1];
+          if (!device) {
+            console.error('Invalid choice.');
+            process.exit(1);
+          }
+          goners = [device];
+        }
+      } else {
+        console.error('Several devices are paired — name one: carmoji unpair <name|ip[:port]|all>');
+        devices.forEach((d) => console.error(`  ${deviceLabel(d)}`));
+        process.exit(1);
+      }
+      saveDevices(devices.filter((d) => !goners.includes(d)));
+      goners.forEach((d) => console.log(`Unpaired ${deviceLabel(d)}.`));
+      break;
+    }
+
     case 'hook': {
       // Runs inside the coding agent on every hook — must be silent, quick,
       // and always exit 0 so it can never disturb the session.
       // Flags: --source <tool> (default claude), --event <name> for tools
       // whose stdin lacks the event name, --gate for phone approvals.
       try {
-        const config = loadConfig();
-        if (!config) break;
+        const devices = loadDevices();
+        if (devices.length === 0) break;
         const flags = [arg, ...rest].filter(Boolean);
         const flagValue = (name) => {
           const index = flags.indexOf(name);
@@ -980,7 +1119,7 @@ async function main() {
         // the phone shows Allow/Deny; the printed JSON settles the
         // permission. Timeout falls through to the normal terminal prompt.
         if (flags.includes('--gate') && payload.hook_event_name === 'PreToolUse') {
-          const decision = await requestApproval(config, {
+          const decision = await requestApprovalAll(devices, {
             source,
             session: payload.session_id,
             event: 'approval_request',
@@ -1032,7 +1171,7 @@ async function main() {
           const usage = claudeUsage(recompute);
           if (usage) message.usage = usage;
         }
-        await send(config, message);
+        await sendAll(devices, message);
       } catch {
         // Never surface errors into the coding session.
       }
@@ -1041,14 +1180,14 @@ async function main() {
 
     case 'codex-notify': {
       try {
-        const config = loadConfig();
-        if (!config) break;
+        const devices = loadDevices();
+        if (devices.length === 0) break;
         const payload = JSON.parse(process.argv[process.argv.length - 1] || '{}');
         if (payload.type === 'agent-turn-complete') {
           const session = payload['conversation-id'] || payload.conversation_id;
           const message = { source: 'codex', session, event: 'turn_done' };
           if (payload.cwd) message.project = basename(payload.cwd);
-          await send(config, message);
+          await sendAll(devices, message);
         }
       } catch {
         // Same rule as `hook`: stay silent.
@@ -1062,8 +1201,8 @@ async function main() {
         console.error(`Usage: carmoji test <${Object.keys(TEST_EVENTS).join('|')}> [session] [tokens]`);
         process.exit(1);
       }
-      const config = loadConfig();
-      if (!config) {
+      const devices = loadDevices();
+      if (devices.length === 0) {
         console.error('Not paired yet — run: carmoji pair <code>');
         process.exit(1);
       }
@@ -1073,9 +1212,12 @@ async function main() {
       if (project) message.project = project;
       const usage = claudeUsage(true);
       if (usage) message.usage = usage;
-      const result = await send(config, message);
-      console.log(result === 'ok' ? 'Sent!' : `Failed: ${result}`);
-      process.exit(result === 'ok' ? 0 : 1);
+      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);
       break;
     }
 
@@ -1167,13 +1309,14 @@ async function main() {
       break;
 
     default:
-      console.log('carmoji bridge — usage: pair <code> [ip[:port]] | discover | install <tool>|all | uninstall <tool> | tools | test <event> | hook [--source <tool>] [--event <name>] [--gate] | codex-notify | claude-config | codex-config | gate-config');
+      console.log('carmoji bridge — usage: pair <code> [ip[:port]] | unpair [<name|ip[:port]>|all] | discover | install <tool>|all | uninstall <tool> | tools | test <event> | hook [--source <tool>] [--event <name>] [--gate] | codex-notify | claude-config | codex-config | gate-config');
   }
 }
 
 export {
   applyTranscriptTokenRecord,
   eventFromHook,
+  normalizeDevices,
   stripLegacyCarMojiNotifyLine,
 };
 

package/package.json

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