happy-coder 0.6.2 → 0.6.4

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var types$1 = require('./types-iMUxaPkI.cjs');
+var types$1 = require('./types-BDtHM1DY.cjs');
 var node_crypto = require('node:crypto');
 var node_child_process = require('node:child_process');
 var node_path = require('node:path');
@@ -93,6 +93,13 @@ class Session {
   onSessionFound = (sessionId) => {
     this.sessionId = sessionId;
   };
+  /**
+   * Clear the current session ID (used by /clear command)
+   */
+  clearSessionId = () => {
+    this.sessionId = null;
+    types$1.logger.debug("[Session] Session ID cleared");
+  };
 }
 
 function getProjectPath(workingDirectory) {
@@ -1237,6 +1244,50 @@ class PushableAsyncIterable {
   }
 }
 
+function parseCompact(message) {
+  const trimmed = message.trim();
+  if (trimmed === "/compact") {
+    return {
+      isCompact: true,
+      originalMessage: trimmed
+    };
+  }
+  if (trimmed.startsWith("/compact ")) {
+    return {
+      isCompact: true,
+      originalMessage: trimmed
+    };
+  }
+  return {
+    isCompact: false,
+    originalMessage: message
+  };
+}
+function parseClear(message) {
+  const trimmed = message.trim();
+  return {
+    isClear: trimmed === "/clear"
+  };
+}
+function parseSpecialCommand(message) {
+  const compactResult = parseCompact(message);
+  if (compactResult.isCompact) {
+    return {
+      type: "compact",
+      originalMessage: compactResult.originalMessage
+    };
+  }
+  const clearResult = parseClear(message);
+  if (clearResult.isClear) {
+    return {
+      type: "clear"
+    };
+  }
+  return {
+    type: null
+  };
+}
+
 async function claudeRemote(opts) {
   let startFrom = opts.sessionId;
   if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
@@ -1270,6 +1321,21 @@ async function claudeRemote(opts) {
     sdkOptions.executableArgs = [...sdkOptions.executableArgs || [], ...opts.claudeArgs];
   }
   types$1.logger.debug(`[claudeRemote] Starting query with permission mode: ${opts.permissionMode}, model: ${opts.model || "default"}, fallbackModel: ${opts.fallbackModel || "none"}, customSystemPrompt: ${opts.customSystemPrompt ? "set" : "none"}, appendSystemPrompt: ${opts.appendSystemPrompt ? "set" : "none"}, allowedTools: ${opts.allowedTools ? opts.allowedTools.join(",") : "none"}, disallowedTools: ${opts.disallowedTools ? opts.disallowedTools.join(",") : "none"}`);
+  const specialCommand = parseSpecialCommand(opts.message);
+  if (specialCommand.type === "clear") {
+    types$1.logger.debug("[claudeRemote] /clear command detected - should not reach here, handled in start.ts");
+    if (opts.onCompletionEvent) {
+      opts.onCompletionEvent("Context was reset");
+    }
+    if (opts.onSessionReset) {
+      opts.onSessionReset();
+    }
+    return;
+  }
+  if (specialCommand.type === "compact") {
+    types$1.logger.debug("[claudeRemote] /compact command detected - will process as normal but with compaction behavior");
+  }
+  const isCompactCommand = specialCommand.type === "compact";
   let message = new PushableAsyncIterable();
   message.push({
     type: "user",
@@ -1309,10 +1375,22 @@ async function claudeRemote(opts) {
           types$1.logger.debug(`[claudeRemote] Session file found: ${systemInit.session_id} ${found}`);
           opts.onSessionFound(systemInit.session_id);
         }
+        if (isCompactCommand) {
+          types$1.logger.debug("[claudeRemote] Compaction started");
+          if (opts.onCompletionEvent) {
+            opts.onCompletionEvent("Compaction started");
+          }
+        }
       }
       if (message2.type === "result") {
         updateThinking(false);
         types$1.logger.debug("[claudeRemote] Result received, exiting claudeRemote");
+        if (isCompactCommand) {
+          types$1.logger.debug("[claudeRemote] Compaction completed");
+          if (opts.onCompletionEvent) {
+            opts.onCompletionEvent("Compaction completed");
+          }
+        }
         return;
       }
       if (message2.type === "user") {
@@ -2177,6 +2255,14 @@ async function claudeRemoteLauncher(session) {
           claudeEnvVars: session.claudeEnvVars,
           claudeArgs: session.claudeArgs,
           onMessage,
+          onCompletionEvent: (message) => {
+            types$1.logger.debug(`[remote]: Completion event: ${message}`);
+            session.client.sendSessionEvent({ type: "message", message });
+          },
+          onSessionReset: () => {
+            types$1.logger.debug("[remote]: Session reset");
+            session.clearSessionId();
+          },
           signal: abortController.signal
         });
         if (!exitReason && abortController.signal.aborted) {
@@ -2233,6 +2319,9 @@ async function loop(opts) {
     messageQueue: opts.messageQueue,
     onModeChange: opts.onModeChange
   });
+  if (opts.onSessionReady) {
+    opts.onSessionReady(session);
+  }
   let mode = opts.startingMode ?? "local";
   while (true) {
     types$1.logger.debug(`[loop] Iteration with mode: ${mode}`);
@@ -2262,7 +2351,7 @@ async function loop(opts) {
 }
 
 var name = "happy-coder";
-var version = "0.6.2";
+var version = "0.6.4";
 var description = "Claude Code session sharing CLI";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -2669,6 +2758,7 @@ class MessageQueue2 {
     types$1.logger.debug(`[MessageQueue2] Initialized`);
   }
   queue = [];
+  // Made public for testing
   waiter = null;
   closed = false;
   onMessageHandler = null;
@@ -2690,7 +2780,8 @@ class MessageQueue2 {
     this.queue.push({
       message,
       mode,
-      modeHash
+      modeHash,
+      isolate: false
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -2703,6 +2794,62 @@ class MessageQueue2 {
     }
     types$1.logger.debug(`[MessageQueue2] push() completed. Queue size: ${this.queue.length}`);
   }
+  /**
+   * Push a message immediately without batching delay.
+   * Does not clear the queue or enforce isolation.
+   */
+  pushImmediate(message, mode) {
+    if (this.closed) {
+      throw new Error("Cannot push to closed queue");
+    }
+    const modeHash = this.modeHasher(mode);
+    types$1.logger.debug(`[MessageQueue2] pushImmediate() called with mode hash: ${modeHash}`);
+    this.queue.push({
+      message,
+      mode,
+      modeHash,
+      isolate: false
+    });
+    if (this.onMessageHandler) {
+      this.onMessageHandler(message, mode);
+    }
+    if (this.waiter) {
+      types$1.logger.debug(`[MessageQueue2] Notifying waiter for immediate message`);
+      const waiter = this.waiter;
+      this.waiter = null;
+      waiter(true);
+    }
+    types$1.logger.debug(`[MessageQueue2] pushImmediate() completed. Queue size: ${this.queue.length}`);
+  }
+  /**
+   * Push a message that must be processed in complete isolation.
+   * Clears any pending messages and ensures this message is never batched with others.
+   * Used for special commands that require dedicated processing.
+   */
+  pushIsolateAndClear(message, mode) {
+    if (this.closed) {
+      throw new Error("Cannot push to closed queue");
+    }
+    const modeHash = this.modeHasher(mode);
+    types$1.logger.debug(`[MessageQueue2] pushIsolateAndClear() called with mode hash: ${modeHash} - clearing ${this.queue.length} pending messages`);
+    this.queue = [];
+    this.queue.push({
+      message,
+      mode,
+      modeHash,
+      isolate: true
+    });
+    if (this.onMessageHandler) {
+      this.onMessageHandler(message, mode);
+    }
+    if (this.waiter) {
+      types$1.logger.debug(`[MessageQueue2] Notifying waiter for isolated message`);
+      const waiter = this.waiter;
+      this.waiter = null;
+      waiter(true);
+    }
+    types$1.logger.debug(`[MessageQueue2] pushIsolateAndClear() completed. Queue size: ${this.queue.length}`);
+  }
   /**
    * Push a message to the beginning of the queue with a mode.
    */
@@ -2715,7 +2862,8 @@ class MessageQueue2 {
     this.queue.unshift({
       message,
       mode,
-      modeHash
+      modeHash,
+      isolate: false
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -2779,7 +2927,7 @@ class MessageQueue2 {
     return this.collectBatch();
   }
   /**
-   * Collect a batch of messages with the same mode
+   * Collect a batch of messages with the same mode, respecting isolation requirements
    */
   collectBatch() {
     if (this.queue.length === 0) {
@@ -2789,12 +2937,18 @@ class MessageQueue2 {
     const sameModeMessages = [];
     let mode = firstItem.mode;
     const targetModeHash = firstItem.modeHash;
-    while (this.queue.length > 0 && this.queue[0].modeHash === targetModeHash) {
+    if (firstItem.isolate) {
       const item = this.queue.shift();
       sameModeMessages.push(item.message);
+      types$1.logger.debug(`[MessageQueue2] Collected isolated message with mode hash: ${targetModeHash}`);
+    } else {
+      while (this.queue.length > 0 && this.queue[0].modeHash === targetModeHash && !this.queue[0].isolate) {
+        const item = this.queue.shift();
+        sameModeMessages.push(item.message);
+      }
+      types$1.logger.debug(`[MessageQueue2] Collected batch of ${sameModeMessages.length} messages with mode hash: ${targetModeHash}`);
     }
     const combinedMessage = sameModeMessages.join("\n");
-    types$1.logger.debug(`[MessageQueue2] Collected batch of ${sameModeMessages.length} messages with mode hash: ${targetModeHash}`);
     return {
       message: combinedMessage,
       mode
@@ -3089,7 +3243,7 @@ async function start(credentials, options = {}) {
   types$1.logger.infoDeveloper(`Logs: ${logPath}`);
   session.updateAgentState((currentState) => ({
     ...currentState,
-    controlledByUser: options.startingMode === "local"
+    controlledByUser: options.startingMode !== "remote"
   }));
   const caffeinateStarted = startCaffeinate();
   if (caffeinateStarted) {
@@ -3166,6 +3320,37 @@ async function start(credentials, options = {}) {
     } else {
       types$1.logger.debug(`[loop] User message received with no disallowed tools override, using current: ${currentDisallowedTools ? currentDisallowedTools.join(", ") : "none"}`);
     }
+    const specialCommand = parseSpecialCommand(message.content.text);
+    if (specialCommand.type === "compact") {
+      types$1.logger.debug("[start] Detected /compact command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
+    if (specialCommand.type === "clear") {
+      types$1.logger.debug("[start] Detected /clear command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      types$1.logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
     const enhancedMode = {
       permissionMode: messagePermissionMode || "default",
       model: messageModel,
@@ -3192,6 +3377,8 @@ async function start(credentials, options = {}) {
         controlledByUser: newMode === "local"
       }));
     },
+    onSessionReady: (sessionInstance) => {
+    },
     mcpServers: {},
     session,
     claudeEnvVars: options.claudeEnvVars,

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { l as logger, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as encodeBase64, A as ApiClient, g as encodeBase64Url, h as decodeBase64, j as encrypt, b as initializeConfiguration, i as initLoggerWithGlobalConfiguration } from './types-DKVMGtcN.mjs';
+import { l as logger, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as encodeBase64, A as ApiClient, g as encodeBase64Url, h as decodeBase64, j as encrypt, b as initializeConfiguration, i as initLoggerWithGlobalConfiguration } from './types-Dz5kZrVh.mjs';
 import { randomUUID, randomBytes } from 'node:crypto';
 import { spawn, execSync } from 'node:child_process';
 import { resolve, join, dirname as dirname$1 } from 'node:path';
@@ -72,6 +72,13 @@ class Session {
   onSessionFound = (sessionId) => {
     this.sessionId = sessionId;
   };
+  /**
+   * Clear the current session ID (used by /clear command)
+   */
+  clearSessionId = () => {
+    this.sessionId = null;
+    logger.debug("[Session] Session ID cleared");
+  };
 }
 
 function getProjectPath(workingDirectory) {
@@ -1216,6 +1223,50 @@ class PushableAsyncIterable {
   }
 }
 
+function parseCompact(message) {
+  const trimmed = message.trim();
+  if (trimmed === "/compact") {
+    return {
+      isCompact: true,
+      originalMessage: trimmed
+    };
+  }
+  if (trimmed.startsWith("/compact ")) {
+    return {
+      isCompact: true,
+      originalMessage: trimmed
+    };
+  }
+  return {
+    isCompact: false,
+    originalMessage: message
+  };
+}
+function parseClear(message) {
+  const trimmed = message.trim();
+  return {
+    isClear: trimmed === "/clear"
+  };
+}
+function parseSpecialCommand(message) {
+  const compactResult = parseCompact(message);
+  if (compactResult.isCompact) {
+    return {
+      type: "compact",
+      originalMessage: compactResult.originalMessage
+    };
+  }
+  const clearResult = parseClear(message);
+  if (clearResult.isClear) {
+    return {
+      type: "clear"
+    };
+  }
+  return {
+    type: null
+  };
+}
+
 async function claudeRemote(opts) {
   let startFrom = opts.sessionId;
   if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
@@ -1249,6 +1300,21 @@ async function claudeRemote(opts) {
     sdkOptions.executableArgs = [...sdkOptions.executableArgs || [], ...opts.claudeArgs];
   }
   logger.debug(`[claudeRemote] Starting query with permission mode: ${opts.permissionMode}, model: ${opts.model || "default"}, fallbackModel: ${opts.fallbackModel || "none"}, customSystemPrompt: ${opts.customSystemPrompt ? "set" : "none"}, appendSystemPrompt: ${opts.appendSystemPrompt ? "set" : "none"}, allowedTools: ${opts.allowedTools ? opts.allowedTools.join(",") : "none"}, disallowedTools: ${opts.disallowedTools ? opts.disallowedTools.join(",") : "none"}`);
+  const specialCommand = parseSpecialCommand(opts.message);
+  if (specialCommand.type === "clear") {
+    logger.debug("[claudeRemote] /clear command detected - should not reach here, handled in start.ts");
+    if (opts.onCompletionEvent) {
+      opts.onCompletionEvent("Context was reset");
+    }
+    if (opts.onSessionReset) {
+      opts.onSessionReset();
+    }
+    return;
+  }
+  if (specialCommand.type === "compact") {
+    logger.debug("[claudeRemote] /compact command detected - will process as normal but with compaction behavior");
+  }
+  const isCompactCommand = specialCommand.type === "compact";
   let message = new PushableAsyncIterable();
   message.push({
     type: "user",
@@ -1288,10 +1354,22 @@ async function claudeRemote(opts) {
           logger.debug(`[claudeRemote] Session file found: ${systemInit.session_id} ${found}`);
           opts.onSessionFound(systemInit.session_id);
         }
+        if (isCompactCommand) {
+          logger.debug("[claudeRemote] Compaction started");
+          if (opts.onCompletionEvent) {
+            opts.onCompletionEvent("Compaction started");
+          }
+        }
       }
       if (message2.type === "result") {
         updateThinking(false);
         logger.debug("[claudeRemote] Result received, exiting claudeRemote");
+        if (isCompactCommand) {
+          logger.debug("[claudeRemote] Compaction completed");
+          if (opts.onCompletionEvent) {
+            opts.onCompletionEvent("Compaction completed");
+          }
+        }
         return;
       }
       if (message2.type === "user") {
@@ -2156,6 +2234,14 @@ async function claudeRemoteLauncher(session) {
           claudeEnvVars: session.claudeEnvVars,
           claudeArgs: session.claudeArgs,
           onMessage,
+          onCompletionEvent: (message) => {
+            logger.debug(`[remote]: Completion event: ${message}`);
+            session.client.sendSessionEvent({ type: "message", message });
+          },
+          onSessionReset: () => {
+            logger.debug("[remote]: Session reset");
+            session.clearSessionId();
+          },
           signal: abortController.signal
         });
         if (!exitReason && abortController.signal.aborted) {
@@ -2212,6 +2298,9 @@ async function loop(opts) {
     messageQueue: opts.messageQueue,
     onModeChange: opts.onModeChange
   });
+  if (opts.onSessionReady) {
+    opts.onSessionReady(session);
+  }
   let mode = opts.startingMode ?? "local";
   while (true) {
     logger.debug(`[loop] Iteration with mode: ${mode}`);
@@ -2241,7 +2330,7 @@ async function loop(opts) {
 }
 
 var name = "happy-coder";
-var version = "0.6.2";
+var version = "0.6.4";
 var description = "Claude Code session sharing CLI";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -2648,6 +2737,7 @@ class MessageQueue2 {
     logger.debug(`[MessageQueue2] Initialized`);
   }
   queue = [];
+  // Made public for testing
   waiter = null;
   closed = false;
   onMessageHandler = null;
@@ -2669,7 +2759,8 @@ class MessageQueue2 {
     this.queue.push({
       message,
       mode,
-      modeHash
+      modeHash,
+      isolate: false
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -2682,6 +2773,62 @@ class MessageQueue2 {
     }
     logger.debug(`[MessageQueue2] push() completed. Queue size: ${this.queue.length}`);
   }
+  /**
+   * Push a message immediately without batching delay.
+   * Does not clear the queue or enforce isolation.
+   */
+  pushImmediate(message, mode) {
+    if (this.closed) {
+      throw new Error("Cannot push to closed queue");
+    }
+    const modeHash = this.modeHasher(mode);
+    logger.debug(`[MessageQueue2] pushImmediate() called with mode hash: ${modeHash}`);
+    this.queue.push({
+      message,
+      mode,
+      modeHash,
+      isolate: false
+    });
+    if (this.onMessageHandler) {
+      this.onMessageHandler(message, mode);
+    }
+    if (this.waiter) {
+      logger.debug(`[MessageQueue2] Notifying waiter for immediate message`);
+      const waiter = this.waiter;
+      this.waiter = null;
+      waiter(true);
+    }
+    logger.debug(`[MessageQueue2] pushImmediate() completed. Queue size: ${this.queue.length}`);
+  }
+  /**
+   * Push a message that must be processed in complete isolation.
+   * Clears any pending messages and ensures this message is never batched with others.
+   * Used for special commands that require dedicated processing.
+   */
+  pushIsolateAndClear(message, mode) {
+    if (this.closed) {
+      throw new Error("Cannot push to closed queue");
+    }
+    const modeHash = this.modeHasher(mode);
+    logger.debug(`[MessageQueue2] pushIsolateAndClear() called with mode hash: ${modeHash} - clearing ${this.queue.length} pending messages`);
+    this.queue = [];
+    this.queue.push({
+      message,
+      mode,
+      modeHash,
+      isolate: true
+    });
+    if (this.onMessageHandler) {
+      this.onMessageHandler(message, mode);
+    }
+    if (this.waiter) {
+      logger.debug(`[MessageQueue2] Notifying waiter for isolated message`);
+      const waiter = this.waiter;
+      this.waiter = null;
+      waiter(true);
+    }
+    logger.debug(`[MessageQueue2] pushIsolateAndClear() completed. Queue size: ${this.queue.length}`);
+  }
   /**
    * Push a message to the beginning of the queue with a mode.
    */
@@ -2694,7 +2841,8 @@ class MessageQueue2 {
     this.queue.unshift({
       message,
       mode,
-      modeHash
+      modeHash,
+      isolate: false
     });
     if (this.onMessageHandler) {
       this.onMessageHandler(message, mode);
@@ -2758,7 +2906,7 @@ class MessageQueue2 {
     return this.collectBatch();
   }
   /**
-   * Collect a batch of messages with the same mode
+   * Collect a batch of messages with the same mode, respecting isolation requirements
    */
   collectBatch() {
     if (this.queue.length === 0) {
@@ -2768,12 +2916,18 @@ class MessageQueue2 {
     const sameModeMessages = [];
     let mode = firstItem.mode;
     const targetModeHash = firstItem.modeHash;
-    while (this.queue.length > 0 && this.queue[0].modeHash === targetModeHash) {
+    if (firstItem.isolate) {
       const item = this.queue.shift();
       sameModeMessages.push(item.message);
+      logger.debug(`[MessageQueue2] Collected isolated message with mode hash: ${targetModeHash}`);
+    } else {
+      while (this.queue.length > 0 && this.queue[0].modeHash === targetModeHash && !this.queue[0].isolate) {
+        const item = this.queue.shift();
+        sameModeMessages.push(item.message);
+      }
+      logger.debug(`[MessageQueue2] Collected batch of ${sameModeMessages.length} messages with mode hash: ${targetModeHash}`);
     }
     const combinedMessage = sameModeMessages.join("\n");
-    logger.debug(`[MessageQueue2] Collected batch of ${sameModeMessages.length} messages with mode hash: ${targetModeHash}`);
     return {
       message: combinedMessage,
       mode
@@ -3068,7 +3222,7 @@ async function start(credentials, options = {}) {
   logger.infoDeveloper(`Logs: ${logPath}`);
   session.updateAgentState((currentState) => ({
     ...currentState,
-    controlledByUser: options.startingMode === "local"
+    controlledByUser: options.startingMode !== "remote"
   }));
   const caffeinateStarted = startCaffeinate();
   if (caffeinateStarted) {
@@ -3145,6 +3299,37 @@ async function start(credentials, options = {}) {
     } else {
       logger.debug(`[loop] User message received with no disallowed tools override, using current: ${currentDisallowedTools ? currentDisallowedTools.join(", ") : "none"}`);
     }
+    const specialCommand = parseSpecialCommand(message.content.text);
+    if (specialCommand.type === "compact") {
+      logger.debug("[start] Detected /compact command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
+    if (specialCommand.type === "clear") {
+      logger.debug("[start] Detected /clear command");
+      const enhancedMode2 = {
+        permissionMode: messagePermissionMode || "default",
+        model: messageModel,
+        fallbackModel: messageFallbackModel,
+        customSystemPrompt: messageCustomSystemPrompt,
+        appendSystemPrompt: messageAppendSystemPrompt,
+        allowedTools: messageAllowedTools,
+        disallowedTools: messageDisallowedTools
+      };
+      messageQueue.pushIsolateAndClear(specialCommand.originalMessage || message.content.text, enhancedMode2);
+      logger.debugLargeJson("[start] /compact command pushed to queue:", message);
+      return;
+    }
     const enhancedMode = {
       permissionMode: messagePermissionMode || "default",
       model: messageModel,
@@ -3171,6 +3356,8 @@ async function start(credentials, options = {}) {
         controlledByUser: newMode === "local"
       }));
     },
+    onSessionReady: (sessionInstance) => {
+    },
     mcpServers: {},
     session,
     claudeEnvVars: options.claudeEnvVars,

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-iMUxaPkI.cjs');
+var types = require('./types-BDtHM1DY.cjs');
 require('axios');
 require('chalk');
 require('fs');

package/dist/lib.d.cts

@@ -449,6 +449,8 @@ declare class ApiSessionClient extends EventEmitter {
     private pendingMessages;
     private pendingMessageCallback;
     private rpcHandlers;
+    private agentStateLock;
+    private metadataLock;
     constructor(token: string, secret: Uint8Array, session: Session);
     onUserMessage(callback: (data: UserMessage) => void): void;
     /**

package/dist/lib.d.mts

@@ -449,6 +449,8 @@ declare class ApiSessionClient extends EventEmitter {
     private pendingMessages;
     private pendingMessageCallback;
     private rpcHandlers;
+    private agentStateLock;
+    private metadataLock;
     constructor(token: string, secret: Uint8Array, session: Session);
     onUserMessage(callback: (data: UserMessage) => void): void;
     /**

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, i as initLoggerWithGlobalConfiguration, b as initializeConfiguration, l as logger } from './types-DKVMGtcN.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, i as initLoggerWithGlobalConfiguration, b as initializeConfiguration, l as logger } from './types-Dz5kZrVh.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';

package/dist/{types-iMUxaPkI.cjs → types-BDtHM1DY.cjs}

@@ -358,6 +358,40 @@ function createBackoff(opts) {
 }
 let backoff = createBackoff();
 
+class AsyncLock {
+  permits = 1;
+  promiseResolverQueue = [];
+  async inLock(func) {
+    try {
+      await this.lock();
+      return await func();
+    } finally {
+      this.unlock();
+    }
+  }
+  async lock() {
+    if (this.permits > 0) {
+      this.permits = this.permits - 1;
+      return;
+    }
+    await new Promise((resolve) => this.promiseResolverQueue.push(resolve));
+  }
+  unlock() {
+    this.permits += 1;
+    if (this.permits > 1 && this.promiseResolverQueue.length > 0) {
+      throw new Error("this.permits should never be > 0 when there is someone waiting.");
+    } else if (this.permits === 1 && this.promiseResolverQueue.length > 0) {
+      this.permits -= 1;
+      const nextResolver = this.promiseResolverQueue.shift();
+      if (nextResolver) {
+        setTimeout(() => {
+          nextResolver(true);
+        }, 0);
+      }
+    }
+  }
+}
+
 class ApiSessionClient extends node_events.EventEmitter {
   token;
   secret;
@@ -370,6 +404,8 @@ class ApiSessionClient extends node_events.EventEmitter {
   pendingMessages = [];
   pendingMessageCallback = null;
   rpcHandlers = /* @__PURE__ */ new Map();
+  agentStateLock = new AsyncLock();
+  metadataLock = new AsyncLock();
   constructor(token, secret, session) {
     super();
     this.token = token;
@@ -589,19 +625,21 @@ class ApiSessionClient extends node_events.EventEmitter {
    * @param handler - Handler function that returns the updated metadata
    */
   updateMetadata(handler) {
-    backoff(async () => {
-      let updated = handler(this.metadata);
-      const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(updated, this.secret)) });
-      if (answer.result === "success") {
-        this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
-        this.metadataVersion = answer.version;
-      } else if (answer.result === "version-mismatch") {
-        if (answer.version > this.metadataVersion) {
-          this.metadataVersion = answer.version;
+    this.metadataLock.inLock(async () => {
+      await backoff(async () => {
+        let updated = handler(this.metadata);
+        const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(updated, this.secret)) });
+        if (answer.result === "success") {
           this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
-        }
-        throw new Error("Metadata version mismatch");
-      } else if (answer.result === "error") ;
+          this.metadataVersion = answer.version;
+        } else if (answer.result === "version-mismatch") {
+          if (answer.version > this.metadataVersion) {
+            this.metadataVersion = answer.version;
+            this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
+          }
+          throw new Error("Metadata version mismatch");
+        } else if (answer.result === "error") ;
+      });
     });
   }
   /**
@@ -610,20 +648,22 @@ class ApiSessionClient extends node_events.EventEmitter {
    */
   updateAgentState(handler) {
     exports.logger.debugLargeJson("Updating agent state", this.agentState);
-    backoff(async () => {
-      let updated = handler(this.agentState || {});
-      const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(updated, this.secret)) : null });
-      if (answer.result === "success") {
-        this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
-        this.agentStateVersion = answer.version;
-        exports.logger.debug("Agent state updated", this.agentState);
-      } else if (answer.result === "version-mismatch") {
-        if (answer.version > this.agentStateVersion) {
-          this.agentStateVersion = answer.version;
+    this.agentStateLock.inLock(async () => {
+      await backoff(async () => {
+        let updated = handler(this.agentState || {});
+        const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(updated, this.secret)) : null });
+        if (answer.result === "success") {
           this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
-        }
-        throw new Error("Agent state version mismatch");
-      } else if (answer.result === "error") ;
+          this.agentStateVersion = answer.version;
+          exports.logger.debug("Agent state updated", this.agentState);
+        } else if (answer.result === "version-mismatch") {
+          if (answer.version > this.agentStateVersion) {
+            this.agentStateVersion = answer.version;
+            this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
+          }
+          throw new Error("Agent state version mismatch");
+        } else if (answer.result === "error") ;
+      });
     });
   }
   /**

package/dist/{types-DKVMGtcN.mjs → types-Dz5kZrVh.mjs}

@@ -356,6 +356,40 @@ function createBackoff(opts) {
 }
 let backoff = createBackoff();
 
+class AsyncLock {
+  permits = 1;
+  promiseResolverQueue = [];
+  async inLock(func) {
+    try {
+      await this.lock();
+      return await func();
+    } finally {
+      this.unlock();
+    }
+  }
+  async lock() {
+    if (this.permits > 0) {
+      this.permits = this.permits - 1;
+      return;
+    }
+    await new Promise((resolve) => this.promiseResolverQueue.push(resolve));
+  }
+  unlock() {
+    this.permits += 1;
+    if (this.permits > 1 && this.promiseResolverQueue.length > 0) {
+      throw new Error("this.permits should never be > 0 when there is someone waiting.");
+    } else if (this.permits === 1 && this.promiseResolverQueue.length > 0) {
+      this.permits -= 1;
+      const nextResolver = this.promiseResolverQueue.shift();
+      if (nextResolver) {
+        setTimeout(() => {
+          nextResolver(true);
+        }, 0);
+      }
+    }
+  }
+}
+
 class ApiSessionClient extends EventEmitter {
   token;
   secret;
@@ -368,6 +402,8 @@ class ApiSessionClient extends EventEmitter {
   pendingMessages = [];
   pendingMessageCallback = null;
   rpcHandlers = /* @__PURE__ */ new Map();
+  agentStateLock = new AsyncLock();
+  metadataLock = new AsyncLock();
   constructor(token, secret, session) {
     super();
     this.token = token;
@@ -587,19 +623,21 @@ class ApiSessionClient extends EventEmitter {
    * @param handler - Handler function that returns the updated metadata
    */
   updateMetadata(handler) {
-    backoff(async () => {
-      let updated = handler(this.metadata);
-      const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(updated, this.secret)) });
-      if (answer.result === "success") {
-        this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
-        this.metadataVersion = answer.version;
-      } else if (answer.result === "version-mismatch") {
-        if (answer.version > this.metadataVersion) {
-          this.metadataVersion = answer.version;
+    this.metadataLock.inLock(async () => {
+      await backoff(async () => {
+        let updated = handler(this.metadata);
+        const answer = await this.socket.emitWithAck("update-metadata", { sid: this.sessionId, expectedVersion: this.metadataVersion, metadata: encodeBase64(encrypt(updated, this.secret)) });
+        if (answer.result === "success") {
           this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
-        }
-        throw new Error("Metadata version mismatch");
-      } else if (answer.result === "error") ;
+          this.metadataVersion = answer.version;
+        } else if (answer.result === "version-mismatch") {
+          if (answer.version > this.metadataVersion) {
+            this.metadataVersion = answer.version;
+            this.metadata = decrypt(decodeBase64(answer.metadata), this.secret);
+          }
+          throw new Error("Metadata version mismatch");
+        } else if (answer.result === "error") ;
+      });
     });
   }
   /**
@@ -608,20 +646,22 @@ class ApiSessionClient extends EventEmitter {
    */
   updateAgentState(handler) {
     logger.debugLargeJson("Updating agent state", this.agentState);
-    backoff(async () => {
-      let updated = handler(this.agentState || {});
-      const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(updated, this.secret)) : null });
-      if (answer.result === "success") {
-        this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
-        this.agentStateVersion = answer.version;
-        logger.debug("Agent state updated", this.agentState);
-      } else if (answer.result === "version-mismatch") {
-        if (answer.version > this.agentStateVersion) {
-          this.agentStateVersion = answer.version;
+    this.agentStateLock.inLock(async () => {
+      await backoff(async () => {
+        let updated = handler(this.agentState || {});
+        const answer = await this.socket.emitWithAck("update-state", { sid: this.sessionId, expectedVersion: this.agentStateVersion, agentState: updated ? encodeBase64(encrypt(updated, this.secret)) : null });
+        if (answer.result === "success") {
           this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
-        }
-        throw new Error("Agent state version mismatch");
-      } else if (answer.result === "error") ;
+          this.agentStateVersion = answer.version;
+          logger.debug("Agent state updated", this.agentState);
+        } else if (answer.result === "version-mismatch") {
+          if (answer.version > this.agentStateVersion) {
+            this.agentStateVersion = answer.version;
+            this.agentState = answer.agentState ? decrypt(decodeBase64(answer.agentState), this.secret) : null;
+          }
+          throw new Error("Agent state version mismatch");
+        } else if (answer.result === "error") ;
+      });
     });
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-coder",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Claude Code session sharing CLI",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",