@naarang/ccc 1.2.0-beta.9 → 1.2.0

package/dist/hooks/permissions_hook.js

@@ -326,10 +326,13 @@ async function requestPermission(hookInput, projectId) {
     const client = mqtt.connect(connectUrl, connectOptions);
     let resolved = false;
     let timeoutHandle = null;
+    let ackTimeoutHandle = null;
+    let ackReceived = false;
 
     // Topics for communication
     const requestTopic = `permissions/${projectId}/request`;
     const responseTopic = `permissions/${projectId}/response`;
+    const ackTopic = `permissions/${projectId}/ack`;
 
     /**
      * Cleanup and resolve/reject helper
@@ -342,6 +345,10 @@ async function requestPermission(hookInput, projectId) {
         clearTimeout(timeoutHandle);
       }
 
+      if (ackTimeoutHandle) {
+        clearTimeout(ackTimeoutHandle);
+      }
+
       // Clean disconnect
       client.end(true, {}, () => {
         callback();
@@ -363,46 +370,108 @@ async function requestPermission(hookInput, projectId) {
     client.on('connect', () => {
       log('Connected to MQTT broker');
 
-      // Subscribe to response topic
-      client.subscribe(responseTopic, { qos: MQTT_CONFIG.qos }, (err) => {
+      // Subscribe to ACK topic first
+      client.subscribe(ackTopic, { qos: MQTT_CONFIG.qos }, (err) => {
         if (err) {
-          log('Failed to subscribe to response topic', { error: err.message });
+          log('Failed to subscribe to ACK topic', { error: err.message });
           cleanup(() => {
-            reject(new Error(`Failed to subscribe: ${err.message}`));
+            reject(new Error(`Failed to subscribe to ACK: ${err.message}`));
           });
           return;
         }
 
-        log('Subscribed to response topic', { topic: responseTopic });
-
-        // Publish permission request
-        const permissionRequest = {
-          tool_name,
-          tool_input,
-          session_id,
-          cwd,
-          timestamp: Date.now(),
-          project_id: projectId,
-        };
+        log('Subscribed to ACK topic', { topic: ackTopic });
 
-        const payload = JSON.stringify(permissionRequest);
-
-        client.publish(requestTopic, payload, { qos: MQTT_CONFIG.qos, retain: false }, (err) => {
+        // Subscribe to response topic
+        client.subscribe(responseTopic, { qos: MQTT_CONFIG.qos }, (err) => {
           if (err) {
-            log('Failed to publish permission request', { error: err.message });
+            log('Failed to subscribe to response topic', { error: err.message });
             cleanup(() => {
-              reject(new Error(`Failed to publish: ${err.message}`));
+              reject(new Error(`Failed to subscribe: ${err.message}`));
             });
             return;
           }
 
-          log('Published permission request', { topic: requestTopic });
+          log('Subscribed to response topic', { topic: responseTopic });
+
+          // Publish permission request
+          const permissionRequest = {
+            tool_name,
+            tool_input,
+            session_id,
+            cwd,
+            timestamp: Date.now(),
+            project_id: projectId,
+          };
+
+          const payload = JSON.stringify(permissionRequest);
+
+          client.publish(requestTopic, payload, { qos: MQTT_CONFIG.qos, retain: false }, (err) => {
+            if (err) {
+              log('Failed to publish permission request', { error: err.message });
+              cleanup(() => {
+                reject(new Error(`Failed to publish: ${err.message}`));
+              });
+              return;
+            }
+
+            log('Published permission request', { topic: requestTopic });
+
+            // Send notification to all devices
+            const notificationTopic = `notifications/${projectId}/permission`;
+            const notificationPayload = JSON.stringify({
+              type: 'permission_request',
+              tool_name,
+              tool_input,
+              timestamp: Date.now(),
+              project_id: projectId,
+            });
+
+            client.publish(notificationTopic, notificationPayload, { qos: MQTT_CONFIG.qos }, (notifErr) => {
+              if (notifErr) {
+                log('Failed to publish notification', { error: notifErr.message });
+                // Don't fail the whole request if notification fails
+              } else {
+                log('Published permission notification', { topic: notificationTopic });
+              }
+            });
+
+            // Set ACK timeout (2 seconds)
+            ackTimeoutHandle = setTimeout(() => {
+              if (!ackReceived) {
+                log('ACK not received within 2 seconds - user likely not on mobile app');
+                cleanup(() => {
+                  // Exit without response - Claude will continue without permission
+                  process.exit(0);
+                });
+              }
+            }, 5000);
+          });
         });
       });
     });
 
-    // Handle incoming messages (response from frontend)
+    // Handle incoming messages (ACK and response from frontend)
     client.on('message', (topic, payload) => {
+      // Handle ACK
+      if (topic === ackTopic) {
+        try {
+          const ack = JSON.parse(payload.toString());
+          log('Received ACK from mobile app', ack);
+          ackReceived = true;
+
+          // Clear ACK timeout since we received it
+          if (ackTimeoutHandle) {
+            clearTimeout(ackTimeoutHandle);
+            ackTimeoutHandle = null;
+          }
+        } catch (error) {
+          log('Failed to parse ACK', { error: error.message });
+        }
+        return;
+      }
+
+      // Handle response
       if (topic !== responseTopic) return;
 
       try {
@@ -552,11 +621,11 @@ async function main() {
     // Get project ID from session mapping file
     let projectId = getProjectIdFromSession(hookInput.session_id);
 
-    // CRITICAL: If session is not in sessions.json, this is a native Claude Code session
-    // (not managed by CCC backend). Pass through without MQTT check to avoid hanging.
+    // If no project ID found, we can't route the permission request via MQTT
+    // This could happen if the session was started from CLI without backend
+    // In this case, exit without blocking (allow the operation)
     if (!projectId) {
-      log('Session not found in sessions.json - this is a native Claude Code session');
-      log('Passing through to use Claude Code\'s native permission system');
+      log('Session not found in sessions.json - allowing operation without permission check');
       process.exit(0);
     }