claude-remote 0.1.4 → 0.1.6

package/package.json

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

package/server.js

@@ -121,6 +121,7 @@ let switchWatcher = null;
 let expectingSwitch = false;
 let expectingSwitchTimer = null;
 let tailRemainder = Buffer.alloc(0);
+let tailCatchingUp = false; // true while reading historical transcript content
 const isTTY = process.stdin.isTTY && process.stdout.isTTY;
 const LEGACY_REPLAY_DELAY_MS = 1500;
 const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
@@ -196,16 +197,37 @@ 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;
+  // Switching to a different session — apply source-specific guards.
+  if (currentSessionId && currentSessionId !== target.sessionId && !expectingSwitch) {
+    const targetHasContent = fileLooksLikeTranscript(target.full);
+
+    if (source === 'session-start') {
+      // --resume triggers two session-start hooks in unpredictable order.
+      // Don't switch away from a transcript with conversation content to an
+      // empty one — the one with content is the real resumed session.
+      const currentHasContent = transcriptPath && fileLooksLikeTranscript(transcriptPath);
+      if (currentHasContent && !targetHasContent) {
+        log(`Ignored hook session from ${source}: ${target.sessionId} (current has content, target empty)`);
+        return;
+      }
+    } else if (source === 'pre-tool-use') {
+      // pre-tool-use is the most reliable signal — it comes from the actually
+      // running Claude process. Accept it if the transcript has content.
+      if (!targetHasContent) {
+        log(`Ignored hook session from ${source}: ${target.sessionId} (no conversation content)`);
+        return;
+      }
+    } else {
+      // Unknown source — block unexpected switches
+      log(`Ignored hook session from ${source}: ${target.sessionId} (current=${currentSessionId})`);
+      return;
+    }
   }
 
   log(`Hook session attached from ${source}: ${target.sessionId}`);
@@ -826,7 +848,16 @@ function attachTranscript(target, startOffset = 0) {
   eventBuffer = [];
   eventSeq = 0;
 
-  log(`Transcript attached: ${currentSessionId} (offset=${transcriptOffset})`);
+  // If transcript file already has content, mark as catching up so we don't
+  // broadcast working_started for historical user messages.
+  try {
+    const stat = fs.statSync(transcriptPath);
+    tailCatchingUp = stat.size > transcriptOffset;
+  } catch {
+    tailCatchingUp = false;
+  }
+
+  log(`Transcript attached: ${currentSessionId} (offset=${transcriptOffset} catchUp=${tailCatchingUp})`);
   broadcast({
     type: 'transcript_ready',
     transcript: transcriptPath,
@@ -886,7 +917,14 @@ function startTailing() {
     if (!transcriptPath) return;
     try {
       const stat = fs.statSync(transcriptPath);
-      if (stat.size <= transcriptOffset) return;
+      if (stat.size <= transcriptOffset) {
+        // Caught up to file end — initial catch-up phase is over
+        if (tailCatchingUp) {
+          tailCatchingUp = false;
+          log('Tail catch-up complete, live mode');
+        }
+        return;
+      }
 
       const fd = fs.openSync(transcriptPath, 'r');
       const buf = Buffer.alloc(stat.size - transcriptOffset);
@@ -905,7 +943,11 @@ function startTailing() {
           const event = JSON.parse(line);
           // Detect /clear from JSONL events (covers terminal direct input)
           if (event.type === 'user' || (event.message && event.message.role === 'user')) {
-            broadcast({ type: 'working_started' });
+            // Only broadcast working_started for live (new) user messages,
+            // not for historical events during catch-up.
+            if (!tailCatchingUp) {
+              broadcast({ type: 'working_started' });
+            }
             const content = event.message && event.message.content;
             if (typeof content === 'string' && /^\/clear\s*$/i.test(content.trim())) {
               markExpectingSwitch();