claude-remote 0.2.0 → 0.2.1

package/package.json

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

package/server.js

@@ -120,6 +120,7 @@ let tailTimer = null;
 let switchWatcher = null;
 let expectingSwitch = false;
 let expectingSwitchTimer = null;
+let pendingSwitchTarget = null;
 let tailRemainder = Buffer.alloc(0);
 let tailCatchingUp = false; // true while reading historical transcript content
 const isTTY = process.stdin.isTTY && process.stdout.isTTY;
@@ -214,6 +215,10 @@ function maybeAttachHookSession(data, source) {
     if (currentSessionId && !expectingSwitch) {
       const currentHasContent = transcriptPath && fileLooksLikeTranscript(transcriptPath);
       if (!targetHasContent || currentHasContent) {
+        if (currentSessionId !== target.sessionId) {
+          pendingSwitchTarget = { ...target, seenAt: Date.now(), source };
+          log(`Queued pending session-start: ${target.sessionId} (current=${currentSessionId} currentHasContent=${currentHasContent} targetHasContent=${targetHasContent})`);
+        }
         log(`Ignored session-start: ${target.sessionId} (current=${currentSessionId} currentHasContent=${currentHasContent} targetHasContent=${targetHasContent})`);
         return;
       }
@@ -238,6 +243,31 @@ function maybeAttachHookSession(data, source) {
   attachTranscript({ full: target.full }, 0);
 }
 
+function maybeAttachPendingSwitchTarget(reason, requireReady = true) {
+  if (!pendingSwitchTarget) return false;
+  if ((Date.now() - pendingSwitchTarget.seenAt) > 15000) {
+    log(`Dropped stale pending switch target: ${pendingSwitchTarget.sessionId}`);
+    pendingSwitchTarget = null;
+    return false;
+  }
+  if (pendingSwitchTarget.sessionId === currentSessionId) {
+    pendingSwitchTarget = null;
+    return false;
+  }
+
+  if (requireReady && !fileLooksLikeTranscript(pendingSwitchTarget.full)) {
+    return false;
+  }
+
+  const target = pendingSwitchTarget;
+  pendingSwitchTarget = null;
+  log(`Attaching pending switch target from ${reason}: ${target.sessionId}`);
+  if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
+  if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
+  attachTranscript({ full: target.full }, 0);
+  return true;
+}
+
 // ============================================================
 //  1. Static file server
 // ============================================================
@@ -875,6 +905,9 @@ function extractSlashCommand(content) {
 function attachTranscript(target, startOffset = 0) {
   transcriptPath = target.full;
   currentSessionId = path.basename(transcriptPath, '.jsonl');
+  if (pendingSwitchTarget && pendingSwitchTarget.sessionId === currentSessionId) {
+    pendingSwitchTarget = null;
+  }
   transcriptOffset = Math.max(0, startOffset);
   tailRemainder = Buffer.alloc(0);
   eventBuffer = [];
@@ -915,6 +948,7 @@ function markExpectingSwitch() {
     log('Expecting-switch flag expired (no new transcript found)');
   }, 15000);
   log('Expecting session switch (/clear detected)');
+  if (maybeAttachPendingSwitchTarget('markExpectingSwitch')) return;
 }
 
 function startSwitchWatcher() {
@@ -952,6 +986,7 @@ function startSwitchWatcher() {
 function startTailing() {
   tailRemainder = Buffer.alloc(0);
   tailTimer = setInterval(() => {
+    if (maybeAttachPendingSwitchTarget('tail_pending_target')) return;
     if (!transcriptPath) return;
     try {
       const stat = fs.statSync(transcriptPath);
@@ -1039,6 +1074,7 @@ function stopTailing() {
   if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
   if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
   expectingSwitch = false;
+  pendingSwitchTarget = null;
   tailRemainder = Buffer.alloc(0);
 }