carmoji 0.3.3 → 0.3.4

package/carmoji.js

@@ -5,7 +5,8 @@
 // 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`
@@ -170,8 +171,8 @@ async function askTTY(question) {
 }
 
 /** 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]>');
@@ -987,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();
@@ -999,17 +1008,27 @@ 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 device = { name: target.name, host: target.host,
                        port: target.port, code: arg };
-      const result = await send(device, { 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);
-      }
       // Pairing the same device again just refreshes its code; other
       // devices stay paired unless the user says otherwise here.
       const others = loadDevices().filter(

package/package.json

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