claude-remote 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Remote control bridge for Claude Code REPL - drive from phone/WebUI",
   "main": "server.js",
   "bin": {

package/server.js

@@ -197,16 +197,41 @@ function maybeAttachHookSession(data, source) {
   const target = resolveHookTranscript(data);
   if (!target) return;
 
+  // Already attached to this exact session — no-op
   if (currentSessionId === target.sessionId && transcriptPath &&
       normalizeFsPath(transcriptPath) === normalizeFsPath(target.full)) {
     return;
   }
 
-  // session-start is authoritative — always allow it to switch sessions.
-  // pre-tool-use is opportunistic — only accept if expecting a switch.
-  if (currentSessionId && currentSessionId !== target.sessionId && !expectingSwitch && source !== 'session-start') {
-    log(`Ignored hook session from ${source}: ${target.sessionId} (current=${currentSessionId})`);
-    return;
+  const targetHasContent = fileLooksLikeTranscript(target.full);
+
+  if (source === 'session-start') {
+    // session-start is unreliable for --resume (fires twice, one is a
+    // snapshot-only session). Only accept when:
+    // 1. No session bound yet (first attach), OR
+    // 2. Expecting a switch (/clear), OR
+    // 3. Target has conversation content and current doesn't
+    if (currentSessionId && !expectingSwitch) {
+      const currentHasContent = transcriptPath && fileLooksLikeTranscript(transcriptPath);
+      if (!targetHasContent || currentHasContent) {
+        log(`Ignored session-start: ${target.sessionId} (current=${currentSessionId} currentHasContent=${currentHasContent} targetHasContent=${targetHasContent})`);
+        return;
+      }
+    }
+  } else if (source === 'pre-tool-use') {
+    // pre-tool-use is the authoritative source — comes from the actually
+    // running Claude process. Always allow it to correct the session,
+    // as long as the target transcript has conversation content.
+    if (currentSessionId && currentSessionId !== target.sessionId && !targetHasContent) {
+      log(`Ignored pre-tool-use: ${target.sessionId} (no conversation content)`);
+      return;
+    }
+  } else {
+    // Other sources (e.g. stop) — only accept if matching current or no session
+    if (currentSessionId && currentSessionId !== target.sessionId && !expectingSwitch) {
+      log(`Ignored hook session from ${source}: ${target.sessionId} (current=${currentSessionId})`);
+      return;
+    }
   }
 
   log(`Hook session attached from ${source}: ${target.sessionId}`);