relay-companion 0.1.84 → 0.1.85

package/overlay/main.cjs

@@ -2110,17 +2110,27 @@ async function openPacketInCurrent(packetId) {
         },
       });
     };
-    // WAKE TIER (live-proven): when exactly one relay-channel session is alive,
-    // push the instruction as a channel event — the session takes a REAL turn on
-    // it even when idle, which hook staging can never cause. One instance only:
-    // queue events are claimed first-rename-wins, so with several live channel
-    // sessions the event could wake a chat the user is not looking at; the
-    // session-targeted hook path stays correct for that world. If the claimed
-    // event somehow never gets picked up (server died between heartbeats), the
-    // watcher falls through to hook staging — the click never dead-ends.
+    // WAKE TIER (live-proven): when the resolved CURRENT chat is itself a
+    // relay-channel session, push the instruction as a channel event — the
+    // session takes a REAL turn on it even when idle, which hook staging can
+    // never cause. The join is by working directory: the channel instance's
+    // recorded cwd must uniquely match the target session's rendezvous cwd, so
+    // a click aimed at a desktop chat NEVER wakes some other terminal session.
+    // If the claimed event somehow never gets picked up (server died between
+    // heartbeats), the watcher falls back to hook staging — never a dead end.
     const tryChannelWake = () =>
       loadChannelDeps().then((channel) => {
-        if (channel.countLiveChannelInstances(RELAY_HOME) !== 1) return false;
+        let targetCwd = "";
+        try {
+          const rendezvousPath = path.join(
+            claudeInject.rendezvousDir(RELAY_HOME),
+            `${claudeInject.safeSessionKey(target.sessionId)}.json`,
+          );
+          targetCwd = String(JSON.parse(fs.readFileSync(rendezvousPath, "utf8")).cwd || "");
+        } catch {
+          return false; // no rendezvous -> no join evidence -> hook path
+        }
+        if (!channel.liveChannelInstanceForCwd(RELAY_HOME, targetCwd)) return false;
         const instruction = claudeInject.buildInjectionInstruction({
           relayId: packetId,
           senderName: row.senderName || "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-companion",
-  "version": "0.1.84",
+  "version": "0.1.85",
   "description": "Relay companion for ordinary messages, with dormant coordination features available only by explicit opt-in.",
   "type": "module",
   "bin": {

package/src/channel-server.js

@@ -83,6 +83,32 @@ export function channelInstanceAlive(homeDir = storeDir(), opts = {}) {
   return countLiveChannelInstances(homeDir, opts) > 0;
 }
 
+// The single live channel instance matching a session's working directory, or
+// null. "Current chat" means the chat the user is looking at: the wake tier
+// must fire only when the channel session IS the resolved target, and the only
+// join available today is cwd (channel presence records its process cwd; hook
+// rendezvous records the session's). One instance per cwd; ambiguity -> null.
+export function liveChannelInstanceForCwd(homeDir = storeDir(), cwd, { maxAgeMs = PRESENCE_MS * 3, nowMs = Date.now() } = {}) {
+  const wanted = String(cwd || "").replace(/\/+$/, "");
+  if (!wanted) return null;
+  let entries = [];
+  try {
+    entries = fs.readdirSync(channelPresenceDir(homeDir));
+  } catch {
+    return null;
+  }
+  const matches = [];
+  for (const name of entries) {
+    if (!name.endsWith(".json")) continue;
+    try {
+      const row = JSON.parse(fs.readFileSync(path.join(channelPresenceDir(homeDir), name), "utf8"));
+      if (nowMs - (Number(row.heartbeatAt) || 0) > maxAgeMs) continue;
+      if (String(row.cwd || "").replace(/\/+$/, "") === wanted) matches.push(row);
+    } catch {}
+  }
+  return matches.length === 1 ? matches[0] : null;
+}
+
 function consumeEventFile(file) {
   const claimed = `${file}.${process.pid}.claimed`;
   try {