claude-remote 0.5.2 → 0.6.1

package/lib/ws-server.js

@@ -13,19 +13,19 @@ const {
   LEGACY_REPLAY_DELAY_MS,
   isTTY,
 } = require('./state');
-const {
-  log,
-  broadcast,
-  wsLabel,
-  sendWs,
-  sendTurnState,
-  setTurnState,
-  recomputeEffectiveApprovalMode,
-  setClientApprovalMode,
-  setTurnApprovalFloorMode,
-  latestEventSeq,
-  emitInterrupt,
-} = require('./logger');
+const {
+  log,
+  broadcast,
+  wsLabel,
+  sendWs,
+  sendTurnState,
+  setTurnState,
+  recomputeEffectiveApprovalMode,
+  setClientApprovalMode,
+  setTurnApprovalFloorMode,
+  latestEventSeq,
+  emitInterrupt,
+} = require('./logger');
 const {
   extractSlashCommand,
   markExpectingSwitch,
@@ -34,17 +34,23 @@ const {
   getDirectoryRoots,
   assertDirectoryPath,
 } = require('./transcript');
-const {
-  cleanupImageUpload,
-  cleanupClientUploads,
-  sendUploadStatus,
-  handlePreparedImageUpload,
-  handleImageUpload,
-  createTempImageFile,
-} = require('./image-upload');
-const { restartClaude } = require('./pty-manager');
-
-function sendReplay(ws, lastSeq = null) {
+const {
+  cleanupImageUpload,
+  cleanupClientUploads,
+  sendUploadStatus,
+  handlePreparedImageUpload,
+  handleImageUpload,
+  createTempImageFile,
+} = require('./image-upload');
+const {
+  claimAskUserQuestionSubmissionLock,
+  releaseAskUserQuestionSubmissionLock,
+  buildAskUserQuestionPtyOperations,
+  executePtyOperations,
+} = require('./interactive-questions');
+const { restartClaude } = require('./pty-manager');
+
+function sendReplay(ws, lastSeq = null) {
   const normalizedLastSeq = Number.isInteger(lastSeq) && lastSeq >= 0 ? lastSeq : null;
   const replayFrom = normalizedLastSeq == null ? 0 : normalizedLastSeq;
   const records = replayFrom > 0
@@ -101,11 +107,11 @@ function setupWebSocketServer(server) {
   const wss = new WebSocketServer({ server });
   state.wss = wss;
 
-  wss.on('connection', (ws, req) => {
+  wss.on('connection', (ws, req) => {
     ws._bridgeId = ++state.nextWsId;
     ws._clientInstanceId = '';
-    ws._authenticated = state.AUTH_DISABLED;
-    ws._approvalMode = 'default';
+    ws._authenticated = state.AUTH_DISABLED;
+    ws._approvalMode = 'default';
     ws._authTimer = null;
     log(`WS connected: ${wsLabel(ws)} remote=${req.socket.remoteAddress || '?'} ua=${JSON.stringify(req.headers['user-agent'] || '')} authRequired=${!state.AUTH_DISABLED}`);
 
@@ -226,10 +232,40 @@ function setupWebSocketServer(server) {
           log(`Foreground probe ack -> ${wsLabel(ws)} probeId=${probeId || 'none'} session=${state.currentSessionId ?? 'null'} lastSeq=${latestEventSeq()}`);
           break;
         }
-        case 'input':
-          if (state.claudeProc) state.claudeProc.write(msg.data);
-          break;
-        case 'interrupt': {
+        case 'input':
+          if (state.claudeProc) state.claudeProc.write(msg.data);
+          break;
+        case 'answer_questions': {
+          const submissionKey = claimAskUserQuestionSubmissionLock(
+            state.pendingQuestionSubmissions,
+            msg,
+            wsLabel(ws),
+          );
+          if (!submissionKey) {
+            log(`AskUserQuestion duplicate submit ignored from ${wsLabel(ws)} toolUseId=${msg.toolUseId || 'unknown'}`);
+            break;
+          }
+          try {
+            if (!state.claudeProc) {
+              throw new Error('Claude is not running');
+            }
+            const operations = buildAskUserQuestionPtyOperations(msg);
+            log(`AskUserQuestion submit from ${wsLabel(ws)} toolUseId=${msg.toolUseId || 'unknown'} questions=${Array.isArray(msg.questions) ? msg.questions.length : 0}`);
+            await executePtyOperations(state.claudeProc, operations);
+          } catch (err) {
+            const error = err && err.message ? err.message : 'Failed to submit answers';
+            log(`AskUserQuestion submit error from ${wsLabel(ws)} toolUseId=${msg.toolUseId || 'unknown'}: ${error}`);
+            sendWs(ws, {
+              type: 'question_submission_error',
+              toolUseId: typeof msg.toolUseId === 'string' ? msg.toolUseId : '',
+              error,
+            }, 'answer_questions_error');
+          } finally {
+            releaseAskUserQuestionSubmissionLock(state.pendingQuestionSubmissions, submissionKey);
+          }
+          break;
+        }
+        case 'interrupt': {
           if (!state.claudeProc || state.turnState.phase !== 'running') break;
           log(`Interrupt from ${wsLabel(ws)} — sending Ctrl+C to PTY`);
           state.claudeProc.write('\x03');
@@ -239,23 +275,23 @@ function setupWebSocketServer(server) {
         case 'expect_clear':
           markExpectingSwitch();
           break;
-        case 'chat':
-          if (state.claudeProc) {
-            const text = msg.text;
-            log(`Chat input → PTY: "${text.substring(0, 80)}"`);
-            const slashCommand = extractSlashCommand(text);
-            if (slashCommand === '/clear') {
-              markExpectingSwitch();
-            }
-            if (!slashCommand) {
-              if (state.turnState.phase !== 'running') {
-                setTurnApprovalFloorMode(ws._approvalMode || 'default', `chat by ${wsLabel(ws)}`);
-              }
-              setTurnState('running', { reason: 'chat' });
-            }
-            state.claudeProc.write(text);
-            setTimeout(() => {
-              if (state.claudeProc) state.claudeProc.write('\r');
+        case 'chat':
+          if (state.claudeProc) {
+            const text = msg.text;
+            log(`Chat input → PTY: "${text.substring(0, 80)}"`);
+            const slashCommand = extractSlashCommand(text);
+            if (slashCommand === '/clear') {
+              markExpectingSwitch();
+            }
+            if (!slashCommand) {
+              if (state.turnState.phase !== 'running') {
+                setTurnApprovalFloorMode(ws._approvalMode || 'default', `chat by ${wsLabel(ws)}`);
+              }
+              setTurnState('running', { reason: 'chat' });
+            }
+            state.claudeProc.write(text);
+            setTimeout(() => {
+              if (state.claudeProc) state.claudeProc.write('\r');
             }, 150);
           }
           break;
@@ -264,29 +300,29 @@ function setupWebSocketServer(server) {
             state.claudeProc.resize(msg.cols, msg.rows);
           }
           break;
-        case 'permission_response': {
-          const approval = state.pendingApprovals.get(msg.id);
-          if (approval) {
-            clearTimeout(approval.timer);
-            state.pendingApprovals.delete(msg.id);
+        case 'permission_response': {
+          const approval = state.pendingApprovals.get(msg.id);
+          if (approval) {
+            clearTimeout(approval.timer);
+            state.pendingApprovals.delete(msg.id);
             approval.res.writeHead(200, { 'Content-Type': 'application/json' });
             approval.res.end(JSON.stringify({
               decision: msg.decision,
               reason: msg.reason || '',
-            }));
-            log(`Permission #${msg.id}: ${msg.decision}`);
-            broadcast({
-              type: 'permission_resolved',
-              id: msg.id,
-              decision: msg.decision,
-            });
-          }
-          break;
-        }
-        case 'set_approval_mode': {
-          setClientApprovalMode(ws, msg.mode);
-          break;
-        }
+            }));
+            log(`Permission #${msg.id}: ${msg.decision}`);
+            broadcast({
+              type: 'permission_resolved',
+              id: msg.id,
+              decision: msg.decision,
+            });
+          }
+          break;
+        }
+        case 'set_approval_mode': {
+          setClientApprovalMode(ws, msg.mode);
+          break;
+        }
         case 'image_upload_init': {
           const uploadId = String(msg.uploadId || '');
           if (!uploadId) {
@@ -388,7 +424,7 @@ function setupWebSocketServer(server) {
           sendUploadStatus(ws, uploadId, 'aborted');
           break;
         }
-        case 'image_submit': {
+        case 'image_submit': {
           const uploadId = String(msg.uploadId || '');
           const upload = state.pendingImageUploads.get(uploadId);
           if (!upload || !upload.tmpFile) {
@@ -396,33 +432,33 @@ function setupWebSocketServer(server) {
             break;
           }
           try {
-            await handlePreparedImageUpload({
-              tmpFile: upload.tmpFile,
+            await handlePreparedImageUpload({
+              tmpFile: upload.tmpFile,
               mediaType: upload.mediaType,
               text: msg.text || '',
               logLabel: upload.name || uploadId,
               onCleanup: () => cleanupImageUpload(uploadId),
-            });
-            upload.submitted = true;
-            upload.updatedAt = Date.now();
-            if (state.turnState.phase !== 'running') {
-              setTurnApprovalFloorMode(ws._approvalMode || 'default', `image_submit by ${wsLabel(ws)}`);
-            }
-            setTurnState('running', { reason: 'image_submit' });
-            sendUploadStatus(ws, uploadId, 'submitted');
-          } catch (err) {
-            sendUploadStatus(ws, uploadId, 'error', { message: err.message });
-            cleanupImageUpload(uploadId);
-          }
-          break;
-        }
-        case 'image_upload': {
-          if (state.turnState.phase !== 'running') {
-            setTurnApprovalFloorMode(ws._approvalMode || 'default', `legacy image_upload by ${wsLabel(ws)}`);
+            });
+            upload.submitted = true;
+            upload.updatedAt = Date.now();
+            if (state.turnState.phase !== 'running') {
+              setTurnApprovalFloorMode(ws._approvalMode || 'default', `image_submit by ${wsLabel(ws)}`);
+            }
+            setTurnState('running', { reason: 'image_submit' });
+            sendUploadStatus(ws, uploadId, 'submitted');
+          } catch (err) {
+            sendUploadStatus(ws, uploadId, 'error', { message: err.message });
+            cleanupImageUpload(uploadId);
           }
-          handleImageUpload(msg);
           break;
         }
+        case 'image_upload': {
+          if (state.turnState.phase !== 'running') {
+            setTurnApprovalFloorMode(ws._approvalMode || 'default', `legacy image_upload by ${wsLabel(ws)}`);
+          }
+          handleImageUpload(msg);
+          break;
+        }
         case 'list_sessions': {
           try {
             const sessions = scanSessions(state.CWD, 20);
@@ -475,7 +511,7 @@ function setupWebSocketServer(server) {
       }
     });
 
-    ws.on('close', () => {
+    ws.on('close', () => {
       if (ws._authTimer) {
         clearTimeout(ws._authTimer);
         ws._authTimer = null;
@@ -483,12 +519,12 @@ function setupWebSocketServer(server) {
       if (ws._legacyReplayTimer) {
         clearTimeout(ws._legacyReplayTimer);
         ws._legacyReplayTimer = null;
-      }
-      log(`WS closed: ${wsLabel(ws)}`);
-      cleanupClientUploads(ws);
-      recomputeEffectiveApprovalMode(`client disconnected ${wsLabel(ws)}`);
-    });
-  });
-}
+      }
+      log(`WS closed: ${wsLabel(ws)}`);
+      cleanupClientUploads(ws);
+      recomputeEffectiveApprovalMode(`client disconnected ${wsLabel(ws)}`);
+    });
+  });
+}
 
 module.exports = { setupWebSocketServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "description": "Remote control bridge for Claude Code REPL - drive from phone/WebUI",
   "main": "server.js",
   "bin": {
@@ -10,7 +10,8 @@
     "server.js",
     "lib/",
     "hooks/",
-    "bin/"
+    "bin/",
+    "web/"
   ],
   "scripts": {
     "start": "node server.js"

package/server.js

@@ -1,27 +1,29 @@
 'use strict';
 
-const os = require('os');
-const { state, LOG_FILE } = require('./lib/state');
-const { initConfig } = require('./lib/cli');
-const { log } = require('./lib/logger');
-const { createHttpServer } = require('./lib/http-server');
-const { setupWebSocketServer } = require('./lib/ws-server');
-const { spawnClaude } = require('./lib/pty-manager');
-const { setupHooks } = require('./lib/hooks');
-const { startUploadCleanup } = require('./lib/image-upload');
+const os = require('os');
+const { state, LOG_FILE } = require('./lib/state');
+const { initConfig } = require('./lib/cli');
+const { initLogger, log } = require('./lib/logger');
+const { createHttpServer } = require('./lib/http-server');
+const { setupWebSocketServer } = require('./lib/ws-server');
+const { spawnClaude } = require('./lib/pty-manager');
+const { setupHooks } = require('./lib/hooks');
+const { startUploadCleanup } = require('./lib/image-upload');
 
 // --- Initialize config from CLI args + env ---
 const config = initConfig();
 state.PORT = config.PORT;
 state.CWD = config.CWD;
 state.AUTH_TOKEN = config.AUTH_TOKEN;
-state.AUTH_DISABLED = config.AUTH_DISABLED;
-state.CLAUDE_EXTRA_ARGS = config.CLAUDE_EXTRA_ARGS;
-state.DEBUG_TTY_INPUT = config.DEBUG_TTY_INPUT;
-
-// --- Create servers ---
-const server = createHttpServer();
-setupWebSocketServer(server);
+state.AUTH_DISABLED = config.AUTH_DISABLED;
+state.ENABLE_WEB = config.ENABLE_WEB;
+state.CLAUDE_EXTRA_ARGS = config.CLAUDE_EXTRA_ARGS;
+state.DEBUG_TTY_INPUT = config.DEBUG_TTY_INPUT;
+initLogger();
+
+// --- Create servers ---
+const server = createHttpServer();
+setupWebSocketServer(server);
 
 // --- Start periodic cleanup ---
 startUploadCleanup();
@@ -54,6 +56,11 @@ server.listen(state.PORT, '0.0.0.0', () => {
   } else {
     banner += `  Token:  ${config.AUTH_TOKEN}\n`;
   }
+  if (config.ENABLE_WEB) {
+    banner += `  WebUI:  ENABLED\n`;
+  } else {
+    banner += `  WebUI:  disabled (set ENABLE_WEB=1 to enable)\n`;
+  }
   if (config.unusedLegacyTokenEnv) {
     banner += `  Note:   Ignoring legacy ${config.LEGACY_AUTH_TOKEN_ENV_VAR}; use ${config.AUTH_TOKEN_ENV_VAR} instead\n`;
   }