claude-remote 0.1.1 → 0.1.2

package/hooks/bridge-session-start.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+// Bridge session-start hook — binds the spawned Claude session to its transcript.
+
+const http = require('http');
+
+if (!process.env.BRIDGE_PORT) process.exit(0);
+
+const PORT = process.env.BRIDGE_PORT;
+
+let input = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', chunk => (input += chunk));
+process.stdin.on('end', () => {
+  const body = input || '{}';
+  const req = http.request({
+    hostname: '127.0.0.1',
+    port: PORT,
+    path: '/hook/session-start',
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Content-Length': Buffer.byteLength(body),
+    },
+  }, () => {
+    process.exit(0);
+  });
+
+  req.on('error', () => process.exit(0));
+  req.setTimeout(10000, () => { req.destroy(); process.exit(0); });
+  req.write(body);
+  req.end();
+});

package/package.json

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

package/server.js

@@ -22,13 +22,10 @@ let eventSeq = 0;
 const EVENT_BUFFER_MAX = 5000;
 let nextWsId = 0;
 let tailTimer = null;
-let discoveryTimer = null;
-let switchWatcher = null;
-let expectingSwitch = false;
-let expectingSwitchTimer = null;
-let preExistingFiles = new Set();
-let preExistingFileSizes = new Map();
-let tailRemainder = Buffer.alloc(0);
+let switchWatcher = null;
+let expectingSwitch = false;
+let expectingSwitchTimer = null;
+let tailRemainder = Buffer.alloc(0);
 const isTTY = process.stdin.isTTY && process.stdout.isTTY;
 const LEGACY_REPLAY_DELAY_MS = 1500;
 const IMAGE_UPLOAD_TTL_MS = 15 * 60 * 1000;
@@ -66,6 +63,57 @@ function sendWs(ws, msg, context = '') {
   }
   return true;
 }
+
+function normalizeFsPath(value) {
+  const resolved = path.resolve(String(value || ''));
+  return process.platform === 'win32' ? resolved.toLowerCase() : resolved;
+}
+
+function projectTranscriptDir() {
+  return path.join(PROJECTS_DIR, getProjectSlug(CWD));
+}
+
+function resolveHookTranscript(data) {
+  if (!data || typeof data !== 'object') return null;
+
+  const hookCwd = data.cwd ? path.resolve(String(data.cwd)) : '';
+  if (hookCwd && normalizeFsPath(hookCwd) !== normalizeFsPath(CWD)) return null;
+
+  const sessionId = data.session_id ? String(data.session_id) : '';
+  const expectedDir = projectTranscriptDir();
+  const transcriptPath = data.transcript_path ? path.resolve(String(data.transcript_path)) : '';
+
+  if (transcriptPath) {
+    const transcriptDir = path.dirname(transcriptPath);
+    const transcriptSessionId = path.basename(transcriptPath, '.jsonl');
+    const dirMatches = normalizeFsPath(transcriptDir) === normalizeFsPath(expectedDir);
+    const idMatches = !sessionId || transcriptSessionId === sessionId;
+    if (dirMatches && idMatches) {
+      return { full: transcriptPath, sessionId: transcriptSessionId };
+    }
+  }
+
+  if (!sessionId) return null;
+  return { full: path.join(expectedDir, `${sessionId}.jsonl`), sessionId };
+}
+
+function maybeAttachHookSession(data, source) {
+  const target = resolveHookTranscript(data);
+  if (!target) return;
+
+  if (currentSessionId === target.sessionId && transcriptPath &&
+      normalizeFsPath(transcriptPath) === normalizeFsPath(target.full)) {
+    return;
+  }
+
+  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}`);
+  attachTranscript({ full: target.full }, 0);
+}
 
 // ============================================================
 //  1. Static file server
@@ -94,7 +142,9 @@ const server = http.createServer((req, res) => {
         return;
       }
 
-      if (ALWAYS_AUTO_ALLOW.has(data.tool_name)) {
+      maybeAttachHookSession(data, 'pre-tool-use');
+
+      if (ALWAYS_AUTO_ALLOW.has(data.tool_name)) {
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify({ decision: 'allow' }));
         log(`Permission auto-allowed (always): ${data.tool_name}`);
@@ -147,13 +197,30 @@ const server = http.createServer((req, res) => {
     return;
   }
 
-  // --- API: Stop hook endpoint ---
+  // --- API: Session start hook endpoint ---
+  if (req.method === 'POST' && url === '/hook/session-start') {
+    let body = '';
+    req.on('data', chunk => (body += chunk));
+    req.on('end', () => {
+      try {
+        maybeAttachHookSession(JSON.parse(body), 'session-start');
+      } catch {}
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end('{}');
+    });
+    return;
+  }
+
+  // --- API: Stop hook endpoint ---
   if (req.method === 'POST' && url === '/hook/stop') {
     let body = '';
     req.on('data', chunk => (body += chunk));
     req.on('end', () => {
       log('/hook/stop received — broadcasting turn_complete');
-      broadcast({ type: 'turn_complete' });
+      try {
+        maybeAttachHookSession(JSON.parse(body), 'stop');
+      } catch {}
+      broadcast({ type: 'turn_complete' });
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end('{}');
     });
@@ -552,10 +619,8 @@ wss.on('connection', (ws, req) => {
 // ============================================================
 //  4. PTY Manager — local terminal passthrough
 // ============================================================
-function spawnClaude() {
-  snapshotExistingFiles();
-
-  const isWin = process.platform === 'win32';
+function spawnClaude() {
+  const isWin = process.platform === 'win32';
   const shell = isWin ? 'powershell.exe' : (process.env.SHELL || '/bin/bash');
   const args = isWin
     ? ['-NoLogo', '-NoProfile', '-Command', 'claude']
@@ -668,82 +733,9 @@ function attachTranscript(target, startOffset = 0) {
     sessionId: currentSessionId,
     lastSeq: 0,
   });
-
-  if (discoveryTimer) {
-    clearInterval(discoveryTimer);
-    discoveryTimer = null;
-  }
-  startTailing();
-  startSwitchWatcher();
-}
-
-function snapshotExistingFiles() {
-  const slug = getProjectSlug(CWD);
-  const projectDir = path.join(PROJECTS_DIR, slug);
-  preExistingFiles.clear();
-  preExistingFileSizes.clear();
-  try {
-    if (fs.existsSync(projectDir)) {
-      for (const f of fs.readdirSync(projectDir)) {
-        if (!f.endsWith('.jsonl')) continue;
-        const full = path.join(projectDir, f);
-        const stat = fs.statSync(full);
-        preExistingFiles.add(f);
-        preExistingFileSizes.set(f, stat.size);
-      }
-    }
-  } catch {}
-  log(`Pre-existing transcripts: ${preExistingFiles.size} files`);
-}
-
-function startDiscovery() {
-  const slug = getProjectSlug(CWD);
-  const projectDir = path.join(PROJECTS_DIR, slug);
-  log(`Watching for NEW transcript in: ${projectDir}`);
-
-  discoveryTimer = setInterval(() => {
-    if (!fs.existsSync(projectDir)) return;
-
-    try {
-      const targets = fs.readdirSync(projectDir)
-        .filter(f => f.endsWith('.jsonl'))
-        .map(f => {
-          const full = path.join(projectDir, f);
-          const stat = fs.statSync(full);
-          return {
-            name: f,
-            full,
-            mtime: stat.mtimeMs,
-            size: stat.size,
-          };
-        })
-        .sort((a, b) => b.mtime - a.mtime);
-
-      const newTargets = targets.filter(t => !preExistingFiles.has(t.name));
-      const newTranscript = newTargets.find(t => fileLooksLikeTranscript(t.full));
-      if (newTranscript) {
-        log(`NEW transcript found: ${path.basename(newTranscript.full, '.jsonl')}`);
-        attachTranscript(newTranscript, 0);
-        return;
-      }
-
-      for (const t of newTargets) {
-        preExistingFiles.add(t.name);
-        preExistingFileSizes.set(t.name, t.size);
-      }
-
-      // Fallback: reuse a pre-existing transcript if it keeps growing.
-      const grownTargets = targets.filter(t => t.size > (preExistingFileSizes.get(t.name) || 0));
-      const grownTranscript = grownTargets.find(t => fileLooksLikeTranscript(t.full));
-      if (grownTranscript) {
-        const baseOffset = preExistingFileSizes.get(grownTranscript.name) || 0;
-        log(`Reusing growing transcript: ${path.basename(grownTranscript.full, '.jsonl')} (from offset ${baseOffset})`);
-        attachTranscript(grownTranscript, baseOffset);
-        return;
-      }
-    } catch {}
-  }, 500);
-}
+  startTailing();
+  startSwitchWatcher();
+}
 
 function markExpectingSwitch() {
   expectingSwitch = true;
@@ -836,12 +828,11 @@ function startTailing() {
   }, 300);
 }
 
-function stopTailing() {
-  if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
-  if (discoveryTimer) { clearInterval(discoveryTimer); discoveryTimer = null; }
-  if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
-  if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
-  expectingSwitch = false;
+function stopTailing() {
+  if (tailTimer) { clearInterval(tailTimer); tailTimer = null; }
+  if (switchWatcher) { clearInterval(switchWatcher); switchWatcher = null; }
+  if (expectingSwitchTimer) { clearTimeout(expectingSwitchTimer); expectingSwitchTimer = null; }
+  expectingSwitch = false;
   tailRemainder = Buffer.alloc(0);
 }
 
@@ -978,12 +969,28 @@ function setupHooks() {
     existingStop[stopBridgeIdx] = stopEntry;
   } else {
     existingStop.push(stopEntry);
-  }
-  settings.hooks.Stop = existingStop;
-
-  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-  log(`Hooks configured: ${settingsPath}`);
-}
+  }
+  settings.hooks.Stop = existingStop;
+
+  const sessionStartScript = path.resolve(__dirname, 'hooks', 'bridge-session-start.js').replace(/\\/g, '/');
+  const sessionStartCmd = `node "${sessionStartScript}"`;
+  const existingSessionStart = settings.hooks.SessionStart || [];
+  const sessionStartBridgeIdx = existingSessionStart.findIndex(e =>
+    e.hooks?.some(h => h.command?.includes('bridge-session-start'))
+  );
+  const sessionStartEntry = {
+    hooks: [{ type: 'command', command: sessionStartCmd, timeout: 10 }],
+  };
+  if (sessionStartBridgeIdx >= 0) {
+    existingSessionStart[sessionStartBridgeIdx] = sessionStartEntry;
+  } else {
+    existingSessionStart.push(sessionStartEntry);
+  }
+  settings.hooks.SessionStart = existingSessionStart;
+
+  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+  log(`Hooks configured: ${settingsPath}`);
+}
 
 // ============================================================
 //  7. Startup
@@ -1014,8 +1021,7 @@ server.listen(PORT, '0.0.0.0', () => {
   Phone:  ${lan}
   ─────────────────────────────
 
-`);
-  setupHooks();
-  spawnClaude();
-  startDiscovery();
-});
+`);
+  setupHooks();
+  spawnClaude();
+});