happy-coder 0.1.11 → 0.1.12

package/bin/happy

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
+process.env.NODE_NO_WARNINGS = '1';
 import '../dist/index.mjs'

package/bin/happy.cmd

@@ -1,2 +1,3 @@
 @echo off
+set NODE_NO_WARNINGS=1
 node "%~dp0\happy" %*

package/dist/index.cjs

@@ -264,7 +264,7 @@ async function claudeRemote(opts) {
   try {
     types.logger.debug(`[claudeRemote] Starting to iterate over response`);
     for await (const message of response) {
-      types.logger.debug(`[claudeRemote] Received message from SDK: ${message.type}`);
+      types.logger.debugLargeJson(`[claudeRemote] Message ${message.type}`, message);
       formatClaudeMessage(message, opts.onAssistantResult);
       if (message.type === "system" && message.subtype === "init") {
         types.logger.debug(`[claudeRemote] Waiting for session file to be written to disk: ${message.session_id}`);
@@ -600,8 +600,8 @@ function createSessionScanner(opts) {
   let pendingSessions = /* @__PURE__ */ new Set();
   let currentSessionId = null;
   let watchers = /* @__PURE__ */ new Map();
-  let processedMessages = /* @__PURE__ */ new Set();
-  let seenRemoteUserMessageCounters = /* @__PURE__ */ new Map();
+  let processedMessageKeys = /* @__PURE__ */ new Set();
+  let unmatchedServerMessageContents = /* @__PURE__ */ new Set();
   const sync = new InvalidateSync(async () => {
     types.logger.debug(`[SESSION_SCANNER] Syncing...`);
     let sessions = [];
@@ -633,16 +633,16 @@ function createSessionScanner(opts) {
             continue;
           }
           let key = getMessageKey(parsed.data);
-          if (processedMessages.has(key)) {
+          if (processedMessageKeys.has(key)) {
             continue;
           }
-          processedMessages.add(key);
+          processedMessageKeys.add(key);
           types.logger.debugLargeJson(`[SESSION_SCANNER] Processing message`, parsed.data);
           types.logger.debug(`[SESSION_SCANNER] Message key (new): ${key}`);
           if (parsed.data.type === "user" && typeof parsed.data.message.content === "string" && parsed.data.isSidechain !== true && parsed.data.isMeta !== true) {
-            const currentCounter = seenRemoteUserMessageCounters.get(parsed.data.message.content);
-            if (currentCounter && currentCounter > 0) {
-              seenRemoteUserMessageCounters.set(parsed.data.message.content, currentCounter - 1);
+            if (unmatchedServerMessageContents.has(parsed.data.message.content)) {
+              types.logger.debug(`[SESSION_SCANNER] Matched server message echo: ${parsed.data.uuid}`);
+              unmatchedServerMessageContents.delete(parsed.data.message.content);
               continue;
             }
           }
@@ -703,13 +703,18 @@ function createSessionScanner(opts) {
       sync.invalidate();
     },
     onRemoteUserMessageForDeduplication: (messageContent) => {
-      seenRemoteUserMessageCounters.set(messageContent, (seenRemoteUserMessageCounters.get(messageContent) || 0) + 1);
+      types.logger.debug(`[SESSION_SCANNER] Adding unmatched server message content: ${messageContent.substring(0, 50)}...`);
+      unmatchedServerMessageContents.add(messageContent);
     }
   };
 }
 function getMessageKey(message) {
   if (message.type === "user") {
-    return `user:${message.uuid}`;
+    if (Array.isArray(message.message.content) && message.message.content.length > 0 && typeof message.message.content[0] === "object" && "text" in message.message.content[0]) {
+      return `user-message-content:${stableStringify(message.message.content[0].text)}`;
+    } else {
+      return `user-message-content:${stableStringify(message.message.content)}`;
+    }
   } else if (message.type === "assistant") {
     const { usage, ...messageWithoutUsage } = message.message;
     return stableStringify(messageWithoutUsage);
@@ -721,6 +726,9 @@ function getMessageKey(message) {
   return `unknown:<error, this should be unreachable>`;
 }
 function stableStringify(obj) {
+  if (!obj) {
+    return "null";
+  }
   return JSON.stringify(sortKeys(obj), null, 2);
 }
 function sortKeys(value) {
@@ -784,6 +792,11 @@ async function loop(opts) {
           interactiveAbortController.abort();
         }
       });
+      opts.session.setHandler("abort", () => {
+        if (onMessage) {
+          onMessage();
+        }
+      });
       onMessage = () => {
         if (!interactiveAbortController.signal.aborted) {
           abortedOutside = true;
@@ -793,18 +806,32 @@ async function loop(opts) {
               opts.onModeChange(mode);
             }
           }
+          opts.session.sendSessionEvent({ type: "message", message: "Inference aborted" });
           interactiveAbortController.abort();
         }
         onMessage = null;
       };
-      await claudeLocal({
-        path: opts.path,
-        sessionId,
-        onSessionFound,
-        abort: interactiveAbortController.signal,
-        claudeEnvVars: opts.claudeEnvVars,
-        claudeArgs: opts.claudeArgs
-      });
+      try {
+        if (opts.onProcessStart) {
+          opts.onProcessStart("local");
+        }
+        await claudeLocal({
+          path: opts.path,
+          sessionId,
+          onSessionFound,
+          abort: interactiveAbortController.signal,
+          claudeEnvVars: opts.claudeEnvVars,
+          claudeArgs: opts.claudeArgs
+        });
+      } catch (e) {
+        if (!interactiveAbortController.signal.aborted) {
+          opts.session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+        }
+      } finally {
+        if (opts.onProcessStop) {
+          opts.onProcessStop("local");
+        }
+      }
       onMessage = null;
       if (!abortedOutside) {
         return;
@@ -829,6 +856,7 @@ async function loop(opts) {
               opts.onModeChange(mode);
             }
           }
+          opts.session.sendSessionEvent({ type: "message", message: "Inference aborted" });
           remoteAbortController.abort();
         }
         if (process.stdin.isTTY) {
@@ -843,6 +871,9 @@ async function loop(opts) {
       process.stdin.on("data", abortHandler);
       try {
         types.logger.debug(`Starting claudeRemote with messages: ${currentMessageQueue.size()}`);
+        if (opts.onProcessStart) {
+          opts.onProcessStart("remote");
+        }
         await claudeRemote({
           abort: remoteAbortController.signal,
           sessionId,
@@ -856,7 +887,14 @@ async function loop(opts) {
           claudeEnvVars: opts.claudeEnvVars,
           claudeArgs: opts.claudeArgs
         });
+      } catch (e) {
+        if (!remoteAbortController.signal.aborted) {
+          opts.session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+        }
       } finally {
+        if (opts.onProcessStop) {
+          opts.onProcessStop("remote");
+        }
         process.stdin.off("data", abortHandler);
         if (process.stdin.isTTY) {
           process.stdin.setRawMode(false);
@@ -971,7 +1009,7 @@ class InterruptController {
   }
 }
 
-var version = "0.1.11";
+var version = "0.1.12";
 var packageJson = {
 	version: version};
 
@@ -1027,11 +1065,22 @@ function registerHandlers(session, interruptController, permissionCallbacks, onS
         return;
       }
       session.updateAgentState((currentState) => {
+        const request = currentState.requests?.[id];
+        if (!request) return currentState;
         let r = { ...currentState.requests };
         delete r[id];
         return {
           ...currentState,
-          requests: r
+          requests: r,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [id]: {
+              ...request,
+              completedAt: Date.now(),
+              status: message.approved ? "approved" : "denied",
+              reason: message.reason
+            }
+          }
         };
       });
     });
@@ -1287,59 +1336,96 @@ async function startHTTPDirectProxy(options) {
 }
 
 async function startClaudeActivityTracker(onThinking) {
+  types.logger.debug(`[ClaudeActivityTracker] Starting activity tracker`);
   let requestCounter = 0;
-  const activeRequests = /* @__PURE__ */ new Set();
+  const activeRequests = /* @__PURE__ */ new Map();
   let stopThinkingTimeout = null;
   let isThinking = false;
+  const REQUEST_TIMEOUT = 5 * 60 * 1e3;
+  const checkAndStopThinking = () => {
+    if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
+      stopThinkingTimeout = setTimeout(() => {
+        if (isThinking && activeRequests.size === 0) {
+          isThinking = false;
+          onThinking(false);
+        }
+        stopThinkingTimeout = null;
+      }, 500);
+    }
+  };
   const proxyUrl = await startHTTPDirectProxy({
     target: process.env.ANTHROPIC_BASE_URL || "https://api.anthropic.com",
     onRequest: (req, proxyReq) => {
       if (req.method === "POST" && req.url?.startsWith("/v1/messages")) {
         const requestId = ++requestCounter;
-        activeRequests.add(requestId);
         req._requestId = requestId;
         if (stopThinkingTimeout) {
           clearTimeout(stopThinkingTimeout);
           stopThinkingTimeout = null;
         }
+        const timeout = setTimeout(() => {
+          activeRequests.delete(requestId);
+          checkAndStopThinking();
+        }, REQUEST_TIMEOUT);
+        activeRequests.set(requestId, timeout);
         if (!isThinking) {
-          types.logger.debug(`[ClaudeActivityTracker] Thinking started`);
           isThinking = true;
           onThinking(true);
         }
       }
     },
     onResponse: (req, proxyRes) => {
+      proxyRes.headers["connection"] = "close";
       if (req.method === "POST" && req.url?.startsWith("/v1/messages")) {
         const requestId = req._requestId;
-        proxyRes.on("end", () => {
-          activeRequests.delete(requestId);
-          if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
-            stopThinkingTimeout = setTimeout(() => {
-              if (isThinking) {
-                isThinking = false;
-                types.logger.debug(`[ClaudeActivityTracker] Thinking stopped`);
-                onThinking(false);
-              }
-            }, 500);
+        const timeout = activeRequests.get(requestId);
+        if (timeout) {
+          clearTimeout(timeout);
+        }
+        let cleaned = false;
+        const cleanupRequest = () => {
+          if (!cleaned) {
+            cleaned = true;
+            activeRequests.delete(requestId);
+            checkAndStopThinking();
           }
+        };
+        proxyRes.on("end", () => {
+          cleanupRequest();
         });
-        proxyRes.on("error", () => {
-          activeRequests.delete(requestId);
-          if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
-            stopThinkingTimeout = setTimeout(() => {
-              if (isThinking) {
-                isThinking = false;
-                types.logger.debug(`[ClaudeActivityTracker] Thinking stopped`);
-                onThinking(false);
-              }
-            }, 500);
-          }
+        proxyRes.on("error", (err) => {
+          cleanupRequest();
+        });
+        proxyRes.on("aborted", () => {
+          cleanupRequest();
+        });
+        proxyRes.on("close", () => {
+          cleanupRequest();
+        });
+        req.on("close", () => {
+          cleanupRequest();
         });
       }
     }
   });
-  return proxyUrl;
+  const reset = () => {
+    for (const [requestId, timeout] of activeRequests) {
+      clearTimeout(timeout);
+    }
+    activeRequests.clear();
+    if (stopThinkingTimeout) {
+      clearTimeout(stopThinkingTimeout);
+      stopThinkingTimeout = null;
+    }
+    if (isThinking) {
+      isThinking = false;
+      onThinking(false);
+    }
+  };
+  return {
+    proxyUrl,
+    reset
+  };
 }
 
 async function start(credentials, options = {}) {
@@ -1357,11 +1443,11 @@ async function start(credentials, options = {}) {
   let pingInterval = setInterval(() => {
     session.keepAlive(thinking, mode);
   }, 2e3);
-  const proxyUrl = await startClaudeActivityTracker((newThinking) => {
+  const activityTracker = await startClaudeActivityTracker((newThinking) => {
     thinking = newThinking;
     session.keepAlive(thinking, mode);
   });
-  process.env.ANTHROPIC_BASE_URL = proxyUrl;
+  process.env.ANTHROPIC_BASE_URL = activityTracker.proxyUrl;
   const logPath = await types.logger.logFilePathPromise;
   types.logger.infoDeveloper(`Session: ${response.id}`);
   types.logger.infoDeveloper(`Logs: ${logPath}`);
@@ -1380,11 +1466,22 @@ async function start(credentials, options = {}) {
       }
       requests.delete(id);
       session.updateAgentState((currentState) => {
+        const request2 = currentState.requests?.[id];
+        if (!request2) return currentState;
         let r = { ...currentState.requests };
         delete r[id];
         return {
           ...currentState,
-          requests: r
+          requests: r,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [id]: {
+              ...request2,
+              completedAt: Date.now(),
+              status: "canceled",
+              reason: "Timeout"
+            }
+          }
         };
       });
     }, 1e3 * 60 * 4.5);
@@ -1410,7 +1507,8 @@ async function start(credentials, options = {}) {
         ...currentState.requests,
         [id]: {
           tool: request.name,
-          arguments: request.arguments
+          arguments: request.arguments,
+          createdAt: Date.now()
         }
       }
     }));
@@ -1446,10 +1544,58 @@ async function start(credentials, options = {}) {
       mode = newMode;
       session.sendSessionEvent({ type: "switch", mode: newMode });
       session.keepAlive(thinking, mode);
-      session.updateAgentState((currentState) => ({
-        ...currentState,
-        controlledByUser: newMode === "local" ? true : false
-      }));
+      if (newMode === "local") {
+        types.logger.debug("Switching to local mode - clearing pending permission requests");
+        for (const [id, resolve] of requests) {
+          types.logger.debug(`Rejecting pending permission request: ${id}`);
+          resolve({ approved: false, reason: "Session switched to local mode" });
+        }
+        requests.clear();
+        session.updateAgentState((currentState) => {
+          const pendingRequests = currentState.requests || {};
+          const completedRequests = { ...currentState.completedRequests };
+          for (const [id, request] of Object.entries(pendingRequests)) {
+            completedRequests[id] = {
+              ...request,
+              completedAt: Date.now(),
+              status: "canceled",
+              reason: "Session switched to local mode"
+            };
+          }
+          return {
+            ...currentState,
+            controlledByUser: true,
+            requests: {},
+            // Clear all pending requests
+            completedRequests
+          };
+        });
+      } else {
+        session.updateAgentState((currentState) => ({
+          ...currentState,
+          controlledByUser: false
+        }));
+      }
+    },
+    onProcessStart: (processMode) => {
+      types.logger.debug(`[Process Lifecycle] Starting ${processMode} mode`);
+      activityTracker.reset();
+      types.logger.debug("Starting process - clearing any stale permission requests");
+      for (const [id, resolve] of requests) {
+        types.logger.debug(`Rejecting stale permission request: ${id}`);
+        resolve({ approved: false, reason: "Process restarted" });
+      }
+      requests.clear();
+    },
+    onProcessStop: (processMode) => {
+      types.logger.debug(`[Process Lifecycle] Stopped ${processMode} mode`);
+      activityTracker.reset();
+      types.logger.debug("Stopping process - clearing any stale permission requests");
+      for (const [id, resolve] of requests) {
+        types.logger.debug(`Rejecting stale permission request: ${id}`);
+        resolve({ approved: false, reason: "Process restarted" });
+      }
+      requests.clear();
     },
     mcpServers: {
       "permission": {
@@ -2068,9 +2214,7 @@ Currently only supported on macOS.
         options.model = args[++i];
       } else if (arg === "-p" || arg === "--permission-mode") {
         options.permissionMode = z.z.enum(["auto", "default", "plan"]).parse(args[++i]);
-      } else if (arg === "--local") {
-        i++;
-      } else if (arg === "--happy-starting-mode") {
+      } else if (arg === "--local") ; else if (arg === "--happy-starting-mode") {
         options.startingMode = z.z.enum(["local", "remote"]).parse(args[++i]);
       } else if (arg === "--claude-env") {
         const envVar = args[++i];

package/dist/index.mjs

@@ -243,7 +243,7 @@ async function claudeRemote(opts) {
   try {
     logger.debug(`[claudeRemote] Starting to iterate over response`);
     for await (const message of response) {
-      logger.debug(`[claudeRemote] Received message from SDK: ${message.type}`);
+      logger.debugLargeJson(`[claudeRemote] Message ${message.type}`, message);
       formatClaudeMessage(message, opts.onAssistantResult);
       if (message.type === "system" && message.subtype === "init") {
         logger.debug(`[claudeRemote] Waiting for session file to be written to disk: ${message.session_id}`);
@@ -579,8 +579,8 @@ function createSessionScanner(opts) {
   let pendingSessions = /* @__PURE__ */ new Set();
   let currentSessionId = null;
   let watchers = /* @__PURE__ */ new Map();
-  let processedMessages = /* @__PURE__ */ new Set();
-  let seenRemoteUserMessageCounters = /* @__PURE__ */ new Map();
+  let processedMessageKeys = /* @__PURE__ */ new Set();
+  let unmatchedServerMessageContents = /* @__PURE__ */ new Set();
   const sync = new InvalidateSync(async () => {
     logger.debug(`[SESSION_SCANNER] Syncing...`);
     let sessions = [];
@@ -612,16 +612,16 @@ function createSessionScanner(opts) {
             continue;
           }
           let key = getMessageKey(parsed.data);
-          if (processedMessages.has(key)) {
+          if (processedMessageKeys.has(key)) {
             continue;
           }
-          processedMessages.add(key);
+          processedMessageKeys.add(key);
           logger.debugLargeJson(`[SESSION_SCANNER] Processing message`, parsed.data);
           logger.debug(`[SESSION_SCANNER] Message key (new): ${key}`);
           if (parsed.data.type === "user" && typeof parsed.data.message.content === "string" && parsed.data.isSidechain !== true && parsed.data.isMeta !== true) {
-            const currentCounter = seenRemoteUserMessageCounters.get(parsed.data.message.content);
-            if (currentCounter && currentCounter > 0) {
-              seenRemoteUserMessageCounters.set(parsed.data.message.content, currentCounter - 1);
+            if (unmatchedServerMessageContents.has(parsed.data.message.content)) {
+              logger.debug(`[SESSION_SCANNER] Matched server message echo: ${parsed.data.uuid}`);
+              unmatchedServerMessageContents.delete(parsed.data.message.content);
               continue;
             }
           }
@@ -682,13 +682,18 @@ function createSessionScanner(opts) {
       sync.invalidate();
     },
     onRemoteUserMessageForDeduplication: (messageContent) => {
-      seenRemoteUserMessageCounters.set(messageContent, (seenRemoteUserMessageCounters.get(messageContent) || 0) + 1);
+      logger.debug(`[SESSION_SCANNER] Adding unmatched server message content: ${messageContent.substring(0, 50)}...`);
+      unmatchedServerMessageContents.add(messageContent);
     }
   };
 }
 function getMessageKey(message) {
   if (message.type === "user") {
-    return `user:${message.uuid}`;
+    if (Array.isArray(message.message.content) && message.message.content.length > 0 && typeof message.message.content[0] === "object" && "text" in message.message.content[0]) {
+      return `user-message-content:${stableStringify(message.message.content[0].text)}`;
+    } else {
+      return `user-message-content:${stableStringify(message.message.content)}`;
+    }
   } else if (message.type === "assistant") {
     const { usage, ...messageWithoutUsage } = message.message;
     return stableStringify(messageWithoutUsage);
@@ -700,6 +705,9 @@ function getMessageKey(message) {
   return `unknown:<error, this should be unreachable>`;
 }
 function stableStringify(obj) {
+  if (!obj) {
+    return "null";
+  }
   return JSON.stringify(sortKeys(obj), null, 2);
 }
 function sortKeys(value) {
@@ -763,6 +771,11 @@ async function loop(opts) {
           interactiveAbortController.abort();
         }
       });
+      opts.session.setHandler("abort", () => {
+        if (onMessage) {
+          onMessage();
+        }
+      });
       onMessage = () => {
         if (!interactiveAbortController.signal.aborted) {
           abortedOutside = true;
@@ -772,18 +785,32 @@ async function loop(opts) {
               opts.onModeChange(mode);
             }
           }
+          opts.session.sendSessionEvent({ type: "message", message: "Inference aborted" });
           interactiveAbortController.abort();
         }
         onMessage = null;
       };
-      await claudeLocal({
-        path: opts.path,
-        sessionId,
-        onSessionFound,
-        abort: interactiveAbortController.signal,
-        claudeEnvVars: opts.claudeEnvVars,
-        claudeArgs: opts.claudeArgs
-      });
+      try {
+        if (opts.onProcessStart) {
+          opts.onProcessStart("local");
+        }
+        await claudeLocal({
+          path: opts.path,
+          sessionId,
+          onSessionFound,
+          abort: interactiveAbortController.signal,
+          claudeEnvVars: opts.claudeEnvVars,
+          claudeArgs: opts.claudeArgs
+        });
+      } catch (e) {
+        if (!interactiveAbortController.signal.aborted) {
+          opts.session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+        }
+      } finally {
+        if (opts.onProcessStop) {
+          opts.onProcessStop("local");
+        }
+      }
       onMessage = null;
       if (!abortedOutside) {
         return;
@@ -808,6 +835,7 @@ async function loop(opts) {
               opts.onModeChange(mode);
             }
           }
+          opts.session.sendSessionEvent({ type: "message", message: "Inference aborted" });
           remoteAbortController.abort();
         }
         if (process.stdin.isTTY) {
@@ -822,6 +850,9 @@ async function loop(opts) {
       process.stdin.on("data", abortHandler);
       try {
         logger.debug(`Starting claudeRemote with messages: ${currentMessageQueue.size()}`);
+        if (opts.onProcessStart) {
+          opts.onProcessStart("remote");
+        }
         await claudeRemote({
           abort: remoteAbortController.signal,
           sessionId,
@@ -835,7 +866,14 @@ async function loop(opts) {
           claudeEnvVars: opts.claudeEnvVars,
           claudeArgs: opts.claudeArgs
         });
+      } catch (e) {
+        if (!remoteAbortController.signal.aborted) {
+          opts.session.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
+        }
       } finally {
+        if (opts.onProcessStop) {
+          opts.onProcessStop("remote");
+        }
         process.stdin.off("data", abortHandler);
         if (process.stdin.isTTY) {
           process.stdin.setRawMode(false);
@@ -950,7 +988,7 @@ class InterruptController {
   }
 }
 
-var version = "0.1.11";
+var version = "0.1.12";
 var packageJson = {
 	version: version};
 
@@ -1006,11 +1044,22 @@ function registerHandlers(session, interruptController, permissionCallbacks, onS
         return;
       }
       session.updateAgentState((currentState) => {
+        const request = currentState.requests?.[id];
+        if (!request) return currentState;
         let r = { ...currentState.requests };
         delete r[id];
         return {
           ...currentState,
-          requests: r
+          requests: r,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [id]: {
+              ...request,
+              completedAt: Date.now(),
+              status: message.approved ? "approved" : "denied",
+              reason: message.reason
+            }
+          }
         };
       });
     });
@@ -1266,59 +1315,96 @@ async function startHTTPDirectProxy(options) {
 }
 
 async function startClaudeActivityTracker(onThinking) {
+  logger.debug(`[ClaudeActivityTracker] Starting activity tracker`);
   let requestCounter = 0;
-  const activeRequests = /* @__PURE__ */ new Set();
+  const activeRequests = /* @__PURE__ */ new Map();
   let stopThinkingTimeout = null;
   let isThinking = false;
+  const REQUEST_TIMEOUT = 5 * 60 * 1e3;
+  const checkAndStopThinking = () => {
+    if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
+      stopThinkingTimeout = setTimeout(() => {
+        if (isThinking && activeRequests.size === 0) {
+          isThinking = false;
+          onThinking(false);
+        }
+        stopThinkingTimeout = null;
+      }, 500);
+    }
+  };
   const proxyUrl = await startHTTPDirectProxy({
     target: process.env.ANTHROPIC_BASE_URL || "https://api.anthropic.com",
     onRequest: (req, proxyReq) => {
       if (req.method === "POST" && req.url?.startsWith("/v1/messages")) {
         const requestId = ++requestCounter;
-        activeRequests.add(requestId);
         req._requestId = requestId;
         if (stopThinkingTimeout) {
           clearTimeout(stopThinkingTimeout);
           stopThinkingTimeout = null;
         }
+        const timeout = setTimeout(() => {
+          activeRequests.delete(requestId);
+          checkAndStopThinking();
+        }, REQUEST_TIMEOUT);
+        activeRequests.set(requestId, timeout);
         if (!isThinking) {
-          logger.debug(`[ClaudeActivityTracker] Thinking started`);
           isThinking = true;
           onThinking(true);
         }
       }
     },
     onResponse: (req, proxyRes) => {
+      proxyRes.headers["connection"] = "close";
       if (req.method === "POST" && req.url?.startsWith("/v1/messages")) {
         const requestId = req._requestId;
-        proxyRes.on("end", () => {
-          activeRequests.delete(requestId);
-          if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
-            stopThinkingTimeout = setTimeout(() => {
-              if (isThinking) {
-                isThinking = false;
-                logger.debug(`[ClaudeActivityTracker] Thinking stopped`);
-                onThinking(false);
-              }
-            }, 500);
+        const timeout = activeRequests.get(requestId);
+        if (timeout) {
+          clearTimeout(timeout);
+        }
+        let cleaned = false;
+        const cleanupRequest = () => {
+          if (!cleaned) {
+            cleaned = true;
+            activeRequests.delete(requestId);
+            checkAndStopThinking();
           }
+        };
+        proxyRes.on("end", () => {
+          cleanupRequest();
         });
-        proxyRes.on("error", () => {
-          activeRequests.delete(requestId);
-          if (activeRequests.size === 0 && isThinking && !stopThinkingTimeout) {
-            stopThinkingTimeout = setTimeout(() => {
-              if (isThinking) {
-                isThinking = false;
-                logger.debug(`[ClaudeActivityTracker] Thinking stopped`);
-                onThinking(false);
-              }
-            }, 500);
-          }
+        proxyRes.on("error", (err) => {
+          cleanupRequest();
+        });
+        proxyRes.on("aborted", () => {
+          cleanupRequest();
+        });
+        proxyRes.on("close", () => {
+          cleanupRequest();
+        });
+        req.on("close", () => {
+          cleanupRequest();
         });
       }
     }
   });
-  return proxyUrl;
+  const reset = () => {
+    for (const [requestId, timeout] of activeRequests) {
+      clearTimeout(timeout);
+    }
+    activeRequests.clear();
+    if (stopThinkingTimeout) {
+      clearTimeout(stopThinkingTimeout);
+      stopThinkingTimeout = null;
+    }
+    if (isThinking) {
+      isThinking = false;
+      onThinking(false);
+    }
+  };
+  return {
+    proxyUrl,
+    reset
+  };
 }
 
 async function start(credentials, options = {}) {
@@ -1336,11 +1422,11 @@ async function start(credentials, options = {}) {
   let pingInterval = setInterval(() => {
     session.keepAlive(thinking, mode);
   }, 2e3);
-  const proxyUrl = await startClaudeActivityTracker((newThinking) => {
+  const activityTracker = await startClaudeActivityTracker((newThinking) => {
     thinking = newThinking;
     session.keepAlive(thinking, mode);
   });
-  process.env.ANTHROPIC_BASE_URL = proxyUrl;
+  process.env.ANTHROPIC_BASE_URL = activityTracker.proxyUrl;
   const logPath = await logger.logFilePathPromise;
   logger.infoDeveloper(`Session: ${response.id}`);
   logger.infoDeveloper(`Logs: ${logPath}`);
@@ -1359,11 +1445,22 @@ async function start(credentials, options = {}) {
       }
       requests.delete(id);
       session.updateAgentState((currentState) => {
+        const request2 = currentState.requests?.[id];
+        if (!request2) return currentState;
         let r = { ...currentState.requests };
         delete r[id];
         return {
           ...currentState,
-          requests: r
+          requests: r,
+          completedRequests: {
+            ...currentState.completedRequests,
+            [id]: {
+              ...request2,
+              completedAt: Date.now(),
+              status: "canceled",
+              reason: "Timeout"
+            }
+          }
         };
       });
     }, 1e3 * 60 * 4.5);
@@ -1389,7 +1486,8 @@ async function start(credentials, options = {}) {
         ...currentState.requests,
         [id]: {
           tool: request.name,
-          arguments: request.arguments
+          arguments: request.arguments,
+          createdAt: Date.now()
         }
       }
     }));
@@ -1425,10 +1523,58 @@ async function start(credentials, options = {}) {
       mode = newMode;
       session.sendSessionEvent({ type: "switch", mode: newMode });
       session.keepAlive(thinking, mode);
-      session.updateAgentState((currentState) => ({
-        ...currentState,
-        controlledByUser: newMode === "local" ? true : false
-      }));
+      if (newMode === "local") {
+        logger.debug("Switching to local mode - clearing pending permission requests");
+        for (const [id, resolve] of requests) {
+          logger.debug(`Rejecting pending permission request: ${id}`);
+          resolve({ approved: false, reason: "Session switched to local mode" });
+        }
+        requests.clear();
+        session.updateAgentState((currentState) => {
+          const pendingRequests = currentState.requests || {};
+          const completedRequests = { ...currentState.completedRequests };
+          for (const [id, request] of Object.entries(pendingRequests)) {
+            completedRequests[id] = {
+              ...request,
+              completedAt: Date.now(),
+              status: "canceled",
+              reason: "Session switched to local mode"
+            };
+          }
+          return {
+            ...currentState,
+            controlledByUser: true,
+            requests: {},
+            // Clear all pending requests
+            completedRequests
+          };
+        });
+      } else {
+        session.updateAgentState((currentState) => ({
+          ...currentState,
+          controlledByUser: false
+        }));
+      }
+    },
+    onProcessStart: (processMode) => {
+      logger.debug(`[Process Lifecycle] Starting ${processMode} mode`);
+      activityTracker.reset();
+      logger.debug("Starting process - clearing any stale permission requests");
+      for (const [id, resolve] of requests) {
+        logger.debug(`Rejecting stale permission request: ${id}`);
+        resolve({ approved: false, reason: "Process restarted" });
+      }
+      requests.clear();
+    },
+    onProcessStop: (processMode) => {
+      logger.debug(`[Process Lifecycle] Stopped ${processMode} mode`);
+      activityTracker.reset();
+      logger.debug("Stopping process - clearing any stale permission requests");
+      for (const [id, resolve] of requests) {
+        logger.debug(`Rejecting stale permission request: ${id}`);
+        resolve({ approved: false, reason: "Process restarted" });
+      }
+      requests.clear();
     },
     mcpServers: {
       "permission": {
@@ -2047,9 +2193,7 @@ Currently only supported on macOS.
         options.model = args[++i];
       } else if (arg === "-p" || arg === "--permission-mode") {
         options.permissionMode = z$1.enum(["auto", "default", "plan"]).parse(args[++i]);
-      } else if (arg === "--local") {
-        i++;
-      } else if (arg === "--happy-starting-mode") {
+      } else if (arg === "--local") ; else if (arg === "--happy-starting-mode") {
         options.startingMode = z$1.enum(["local", "remote"]).parse(args[++i]);
       } else if (arg === "--claude-env") {
         const envVar = args[++i];

package/dist/lib.d.cts

@@ -369,6 +369,17 @@ type AgentState = {
         [id: string]: {
             tool: string;
             arguments: any;
+            createdAt: number;
+        };
+    };
+    completedRequests?: {
+        [id: string]: {
+            tool: string;
+            arguments: any;
+            createdAt: number;
+            completedAt: number;
+            status: 'canceled' | 'denied' | 'approved';
+            reason?: string;
         };
     };
 };
@@ -396,6 +407,9 @@ declare class ApiSessionClient extends EventEmitter {
     sendSessionEvent(event: {
         type: 'switch';
         mode: 'local' | 'remote';
+    } | {
+        type: 'message';
+        message: string;
     }, id?: string): void;
     /**
      * Send a ping message to keep the connection alive

package/dist/lib.d.mts

@@ -369,6 +369,17 @@ type AgentState = {
         [id: string]: {
             tool: string;
             arguments: any;
+            createdAt: number;
+        };
+    };
+    completedRequests?: {
+        [id: string]: {
+            tool: string;
+            arguments: any;
+            createdAt: number;
+            completedAt: number;
+            status: 'canceled' | 'denied' | 'approved';
+            reason?: string;
         };
     };
 };
@@ -396,6 +407,9 @@ declare class ApiSessionClient extends EventEmitter {
     sendSessionEvent(event: {
         type: 'switch';
         mode: 'local' | 'remote';
+    } | {
+        type: 'message';
+        message: string;
     }, id?: string): void;
     /**
      * Send a ping message to keep the connection alive

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-coder",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Claude Code session sharing CLI",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "dev:local-server": "HANDY_SERVER_URL=http://localhost:3005 npx tsx --env-file .env.sample src/index.ts"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "^1.0.51",
+    "@anthropic-ai/claude-code": "^1.0.68",
     "@anthropic-ai/sdk": "^0.56.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@stablelib/base64": "^2.0.1",