happy-coder 0.6.2 → 0.6.3

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');
@@ -2262,7 +2262,7 @@ async function loop(opts) {
 }
 
 var name = "happy-coder";
-var version = "0.6.2";
+var version = "0.6.3";
 var description = "Claude Code session sharing CLI";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -3089,7 +3089,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) {

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';
@@ -2241,7 +2241,7 @@ async function loop(opts) {
 }
 
 var name = "happy-coder";
-var version = "0.6.2";
+var version = "0.6.3";
 var description = "Claude Code session sharing CLI";
 var author = "Kirill Dubovitskiy";
 var license = "MIT";
@@ -3068,7 +3068,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) {

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.3",
   "description": "Claude Code session sharing CLI",
   "author": "Kirill Dubovitskiy",
   "license": "MIT",