@markus-global/cli 0.7.3-rc.0 → 0.7.3-rc.2

package/dist/markus.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S node --disable-warning=ExperimentalWarning
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
+import { createRequire as _createRequire } from 'module';
+const require = _createRequire(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -56416,7 +56416,7 @@ async function runMcpTest() {
     let requestId = 1;
     const pending = /* @__PURE__ */ new Map();
     let cleaned = false;
-    const cleanup2 = () => {
+    const cleanup = () => {
       if (cleaned)
         return;
       cleaned = true;
@@ -56426,13 +56426,13 @@ async function runMcpTest() {
       }
     };
     const timeout = setTimeout(() => {
-      cleanup2();
+      cleanup();
       const stderr = stderrChunks.join("").slice(0, 300);
       rejectTest(new Error(`MCP test timed out after 60s${stderr ? ` (stderr: ${stderr})` : ""}`));
     }, 6e4);
     proc.on("error", (err) => {
       clearTimeout(timeout);
-      cleanup2();
+      cleanup();
       rejectTest(err);
     });
     proc.stderr?.on("data", (data) => {
@@ -56498,11 +56498,11 @@ async function runMcpTest() {
         const text = navResult?.content?.[0]?.text ?? "";
         const navigated = !text.toLowerCase().includes("error");
         clearTimeout(timeout);
-        cleanup2();
+        cleanup();
         resolveTest({ navigated, title: navigated ? "example.com" : void 0 });
       } catch (err) {
         clearTimeout(timeout);
-        cleanup2();
+        cleanup();
         rejectTest(err instanceof Error ? err : new Error(String(err)));
       }
     })();
@@ -83415,7 +83415,7 @@ ${cleanText}`,
           }
           if (action === "message") {
             const body = await this.readBody(req);
-            const stream2 = body["stream"];
+            const stream = body["stream"];
             const senderId = authUser.userId;
             const sessionId = body["sessionId"] ?? void 0;
             const images = body["images"]?.filter(Boolean);
@@ -83449,7 +83449,7 @@ ${cleanText}`,
               }
               return dbSessId;
             };
-            if (stream2) {
+            if (stream) {
               const sseHandler = new SSEHandler({
                 agentId: agentId2,
                 agent,
@@ -86072,8 +86072,8 @@ EXPLANATION_END`;
           const senderInfo = this.orgService.resolveHumanIdentity(senderId);
           const agent = this.orgService.getAgentManager().getAgent(targetAgentId);
           this.ws.broadcastAgentUpdate(targetAgentId, "working");
-          const stream2 = body["stream"];
-          if (stream2) {
+          const stream = body["stream"];
+          if (stream) {
             const userText = body["text"];
             const sseHandler = new SSEHandler({
               agentId: targetAgentId,
@@ -98985,135 +98985,22 @@ var init_init = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/node-datachannel.js
-import { createRequire } from "module";
-var require2, nodeDataChannel, node_datachannel_default;
-var init_node_datachannel = __esm({
-  "../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/node-datachannel.js"() {
-    require2 = createRequire(import.meta.url);
-    nodeDataChannel = require2("../build/Release/node_datachannel.node");
-    node_datachannel_default = nodeDataChannel;
-  }
-});
-
-// ../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/datachannel-stream.js
-import stream from "stream";
-var DataChannelStream;
-var init_datachannel_stream = __esm({
-  "../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/datachannel-stream.js"() {
-    DataChannelStream = class extends stream.Duplex {
-      constructor(rawChannel, streamOptions) {
-        super({
-          allowHalfOpen: false,
-          // Default to autoclose on end().
-          ...streamOptions,
-          objectMode: true
-          // Preserve the string/buffer distinction (WebRTC treats them differently)
-        });
-        this._rawChannel = rawChannel;
-        this._readActive = true;
-        rawChannel.onMessage((msg) => {
-          if (!this._readActive) return;
-          this._readActive = this.push(msg);
-        });
-        rawChannel.onClosed(() => {
-          this.push(null);
-          this.destroy();
-        });
-        rawChannel.onError((errMsg) => {
-          this.destroy(new Error(`DataChannel error: ${errMsg}`));
-        });
-        if (!rawChannel.isOpen()) {
-          this.cork();
-          rawChannel.onOpen(() => this.uncork());
-        }
-      }
-      _read() {
-        this._readActive = true;
-      }
-      _write(chunk, encoding, callback) {
-        let sentOk;
-        try {
-          if (Buffer.isBuffer(chunk)) {
-            sentOk = this._rawChannel.sendMessageBinary(chunk);
-          } else if (typeof chunk === "string") {
-            sentOk = this._rawChannel.sendMessage(chunk);
-          } else {
-            const typeName = chunk.constructor.name || typeof chunk;
-            throw new Error(`Cannot write ${typeName} to DataChannel stream`);
-          }
-        } catch (err) {
-          return callback(err);
-        }
-        if (sentOk) {
-          callback(null);
-        } else {
-          callback(new Error("Failed to write to DataChannel"));
-        }
-      }
-      _final(callback) {
-        if (!this.allowHalfOpen) this.destroy();
-        callback(null);
-      }
-      _destroy(maybeErr, callback) {
-        this._rawChannel.close();
-        callback(maybeErr);
-      }
-      get label() {
-        return this._rawChannel.getLabel();
-      }
-      get id() {
-        return this._rawChannel.getId();
-      }
-      get protocol() {
-        return this._rawChannel.getProtocol();
-      }
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/websocket-server.js
-var init_websocket_server = __esm({
-  "../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/websocket-server.js"() {
-    init_node_datachannel();
-  }
-});
-
-// ../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/index.js
-var initLogger, cleanup, preload, setSctpSettings, RtcpReceivingSession, Track, Video, Audio, DataChannel, PeerConnection, WebSocket2, DescriptionType;
-var init_lib = __esm({
-  "../../node_modules/.pnpm/node-datachannel@0.12.0/node_modules/node-datachannel/lib/index.js"() {
-    init_node_datachannel();
-    init_datachannel_stream();
-    init_websocket_server();
-    ({
-      initLogger,
-      cleanup,
-      preload,
-      setSctpSettings,
-      RtcpReceivingSession,
-      Track,
-      Video,
-      Audio,
-      DataChannel,
-      PeerConnection,
-      WebSocket: WebSocket2
-    } = node_datachannel_default);
-    DescriptionType = {
-      Unspec: "unspec",
-      Offer: "offer",
-      Answer: "answer",
-      Pranswer: "pranswer",
-      Rollback: "rollback"
-    };
-  }
-});
-
 // ../remote/dist/agent.js
-import { WebSocket as WebSocket3 } from "ws";
+import { WebSocket as WebSocket2 } from "ws";
 import { request as httpRequest } from "node:http";
 import { request as httpsRequest } from "node:https";
 import { createHmac as createHmac2 } from "node:crypto";
+async function loadRtcModule() {
+  if (!_rtcModule) {
+    _rtcModule = await import("node-datachannel");
+  }
+  return _rtcModule;
+}
+function getRtcModule() {
+  if (!_rtcModule)
+    throw new Error("node-datachannel not loaded \u2014 call loadRtcModule() first");
+  return _rtcModule;
+}
 function base64url(buf) {
   return buf.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
@@ -99123,13 +99010,13 @@ function signJwt(payload, secret) {
   const sig = base64url(createHmac2("sha256", secret).update(`${header}.${body}`).digest());
   return `${header}.${body}.${sig}`;
 }
-var log86, STUN_SERVERS, RECONNECT_BASE_MS, RECONNECT_MAX_MS, HEARTBEAT_INTERVAL_MS, PEER_PING_INTERVAL_MS, PEER_PING_TIMEOUT_MS, RELAY_INACTIVITY_TIMEOUT_MS, RemoteAccessAgent;
+var log86, _rtcModule, STUN_SERVERS, RECONNECT_BASE_MS, RECONNECT_MAX_MS, HEARTBEAT_INTERVAL_MS, PEER_PING_INTERVAL_MS, PEER_PING_TIMEOUT_MS, RELAY_INACTIVITY_TIMEOUT_MS, RemoteAccessAgent;
 var init_agent3 = __esm({
   "../remote/dist/agent.js"() {
     "use strict";
     init_dist();
-    init_lib();
     log86 = createLogger("remote");
+    _rtcModule = null;
     STUN_SERVERS = [
       "stun:stun.l.google.com:19302",
       "stun:stun.cloudflare.com:3478"
@@ -99153,12 +99040,13 @@ var init_agent3 = __esm({
       statusListeners = /* @__PURE__ */ new Set();
       constructor(config) {
         this.config = config;
-        initLogger("Warning");
       }
       // ── Public API ────────────────────────────────────────────────────────────
       async start() {
         this.destroyed = false;
         log86.info("Starting remote access agent...");
+        const rtc = await loadRtcModule();
+        rtc.initLogger("Warning");
         await this.discoverLocalOwner();
         try {
           this.registration = await this.registerInstance();
@@ -99231,7 +99119,7 @@ var init_agent3 = __esm({
         log86.info("Remote access agent stopped");
       }
       getStatus() {
-        const wsOpen = this.ws?.readyState === WebSocket3.OPEN;
+        const wsOpen = this.ws?.readyState === WebSocket2.OPEN;
         let state = "idle";
         if (!this.destroyed) {
           if (wsOpen)
@@ -99338,7 +99226,7 @@ var init_agent3 = __esm({
         const { signalUrl, signalingToken } = this.registration;
         const wsUrl = `${signalUrl}?token=${encodeURIComponent(signalingToken)}`;
         log86.info("Connecting to signal server...", { signalUrl });
-        const ws = new WebSocket3(wsUrl);
+        const ws = new WebSocket2(wsUrl);
         this.ws = ws;
         ws.on("open", () => {
           log86.info("Signal server connected");
@@ -99430,7 +99318,7 @@ var init_agent3 = __esm({
         } else {
           log86.info("Received offer for existing peer (ICE restart)", { peerId });
         }
-        session.pc.setRemoteDescription(sdp, DescriptionType.Offer);
+        session.pc.setRemoteDescription(sdp, getRtcModule().DescriptionType.Offer);
       }
       handleIce(peerId, candidate, mid) {
         const session = this.peers.get(peerId);
@@ -99466,6 +99354,7 @@ var init_agent3 = __esm({
             }
           }
         }
+        const { PeerConnection } = getRtcModule();
         const pc = new PeerConnection(`markus-${peerId}`, {
           iceServers
         });
@@ -99731,7 +99620,7 @@ var init_agent3 = __esm({
         if (session?.markusToken) {
           headers["cookie"] = `markus_token=${session.markusToken}`;
         }
-        const ws = new WebSocket3(wsUrl, { headers });
+        const ws = new WebSocket2(wsUrl, { headers });
         const key2 = `${peerId}:${wsId}`;
         ws.on("open", () => {
           this.wsConnections.set(key2, ws);
@@ -99757,7 +99646,7 @@ var init_agent3 = __esm({
         const wsId = msg.wsId;
         const key2 = `${peerId}:${wsId}`;
         const ws = this.wsConnections.get(key2);
-        if (ws?.readyState === WebSocket3.OPEN) {
+        if (ws?.readyState === WebSocket2.OPEN) {
           ws.send(msg.data);
         }
       }
@@ -99805,14 +99694,14 @@ var init_agent3 = __esm({
             log86.warn("DataChannel send failed, falling back to relay", { peerId, error: String(err) });
           }
         }
-        if (this.ws?.readyState === WebSocket3.OPEN) {
+        if (this.ws?.readyState === WebSocket2.OPEN) {
           this.send({ type: "relay_frame", peerId, data });
           return;
         }
         log86.warn("No transport available for peer", { peerId });
       }
       send(msg) {
-        if (this.ws?.readyState === WebSocket3.OPEN) {
+        if (this.ws?.readyState === WebSocket2.OPEN) {
           this.ws.send(JSON.stringify(msg));
         }
       }

package/dist/tray.d.ts

@@ -1,8 +1,6 @@
 /**
  * Cross-platform system tray controller for Markus.
- * Provides start/stop controls and quick access to the Web UI.
- *
- * Launched by the desktop shortcut / .app instead of `markus start` directly.
+ * Launches the server on start, provides "Open Console" and "Quit" controls.
  */
 export {};
 //# sourceMappingURL=tray.d.ts.map

package/dist/tray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tray.d.ts","sourceRoot":"","sources":["../src/tray.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
+{"version":3,"file":"tray.d.ts","sourceRoot":"","sources":["../src/tray.ts"],"names":[],"mappings":"AAAA;;;GAGG"}