@getworkle/cli 0.2.6 → 0.2.8

package/dist/cli.js

@@ -21367,6 +21367,7 @@ var AgentService = class _AgentService {
   scheduler;
   relayClient = null;
   unsubscribeRelay = null;
+  relaySendFn = null;
   /** Map of agentId -> agent stub (for name lookups). */
   agentMap = /* @__PURE__ */ new Map();
   /** Map of agentId -> pulled config (for schedule + runtime settings). */
@@ -21396,6 +21397,55 @@ var AgentService = class _AgentService {
       return;
     }
     console.log("[agents] Starting AgentService...");
+    await this.syncConfigsAndSchedules();
+    const relayUrl = deriveRelayUrl(this.apiUrl);
+    this.relayClient = new RelayClient(relayUrl, this.instanceId, this.token);
+    this.unsubscribeRelay = this.relayClient.onMessage((msg) => {
+      this.handleRelayMessage(msg);
+    });
+    await this.relayClient.connect();
+    console.log("[agents] Connected to relay");
+    this.running = true;
+    console.log("[agents] AgentService running");
+  }
+  /**
+   * Start embedded inside SyncService — no own relay connection.
+   * Relay messages are forwarded via ingestRelayMessage().
+   * Progress frames are sent via the provided sendFn.
+   */
+  async startEmbedded(sendFn) {
+    if (this.running) {
+      console.log("[agents] AgentService already running");
+      return;
+    }
+    console.log("[agents] Starting AgentService (embedded)...");
+    this.relaySendFn = sendFn;
+    await this.syncConfigsAndSchedules();
+    this.running = true;
+    console.log("[agents] AgentService running (embedded \u2014 relay via SyncService)");
+  }
+  /**
+   * Handle a relay message forwarded from SyncService.
+   */
+  ingestRelayMessage(msg) {
+    this.handleRelayMessage(msg);
+  }
+  /**
+   * Send a message to the relay — uses own RelayClient in standalone mode,
+   * or the injected sendFn in embedded mode.
+   */
+  sendRelay(msg) {
+    if (this.relaySendFn) {
+      this.relaySendFn(msg);
+    } else if (this.relayClient?.connected) {
+      this.relayClient.send(msg);
+    }
+  }
+  isRelayConnected() {
+    if (this.relaySendFn) return true;
+    return this.relayClient?.connected ?? false;
+  }
+  async syncConfigsAndSchedules() {
     const stubs = await this.materializer.listAgents();
     console.log(`[agents] Found ${stubs.length} claude_code agent(s)`);
     const configs = [];
@@ -21424,16 +21474,7 @@ var AgentService = class _AgentService {
         `[agents] Materialized ${materialized.length} agent config(s)`
       );
     }
-    const relayUrl = deriveRelayUrl(this.apiUrl);
-    this.relayClient = new RelayClient(relayUrl, this.instanceId, this.token);
-    this.unsubscribeRelay = this.relayClient.onMessage((msg) => {
-      this.handleRelayMessage(msg);
-    });
-    await this.relayClient.connect();
-    console.log("[agents] Connected to relay");
     this.refreshSchedules();
-    this.running = true;
-    console.log("[agents] AgentService running");
   }
   /**
    * Trigger an agent run. Prevents concurrent runs of the same agent.
@@ -21446,8 +21487,8 @@ var AgentService = class _AgentService {
       console.log(
         `[agents] Agent ${agentId} is already running \u2014 skipping trigger`
       );
-      if (executionId && this.relayClient?.connected) {
-        this.relayClient.send({
+      if (executionId && this.isRelayConnected()) {
+        this.sendRelay({
           type: "agent.result",
           payload: {
             agentId,
@@ -21466,8 +21507,8 @@ var AgentService = class _AgentService {
     }
     const runExecutionId = executionId ?? randomUUID();
     const sendProgressPart = (part, sessionId) => {
-      if (this.relayClient?.connected) {
-        this.relayClient.send({
+      if (this.isRelayConnected()) {
+        this.sendRelay({
           type: "agent.progress",
           payload: {
             agentId,
@@ -21673,8 +21714,8 @@ var AgentService = class _AgentService {
     this.activeRuns.set(agentId, runPromise);
     try {
       const result = await runPromise;
-      if (this.relayClient?.connected) {
-        this.relayClient.send({
+      if (this.isRelayConnected()) {
+        this.sendRelay({
           type: "agent.result",
           payload: {
             agentId,
@@ -21691,8 +21732,8 @@ var AgentService = class _AgentService {
     } catch (err) {
       const error46 = err instanceof Error ? err.message : String(err);
       sendProgressPart({ type: "error", message: error46 });
-      if (this.relayClient?.connected) {
-        this.relayClient.send({
+      if (this.isRelayConnected()) {
+        this.sendRelay({
           type: "agent.result",
           payload: {
             agentId,
@@ -22162,6 +22203,10 @@ async function stageCliForDaemon(currentCliPath) {
     throw new Error("Cannot determine the current CLI path for daemon install.");
   }
   await setupClawDirectory();
+  const isNpxCache = currentCliPath.includes("/_npx/") || currentCliPath.includes("\\_npx\\");
+  if (!isNpxCache) {
+    return currentCliPath;
+  }
   await fs7.copyFile(currentCliPath, STAGED_CLI_PATH);
   await fs7.chmod(STAGED_CLI_PATH, 448).catch(() => {
   });
@@ -23082,6 +23127,22 @@ var SyncService = class {
   unsubscribeEvents = null;
   unsubscribeRelayMessages = null;
   running = false;
+  externalMessageHandler = null;
+  /**
+   * Register a handler for relay messages that SyncService doesn't handle
+   * (e.g. agent.trigger, agent.cancel, agent.config.updated).
+   * Must be called before start().
+   */
+  onRelayMessage(handler) {
+    this.externalMessageHandler = handler;
+  }
+  /**
+   * Send a message through the relay WebSocket connection.
+   * Used by AgentService in embedded mode to send progress/result frames.
+   */
+  sendRelayMessage(msg) {
+    this.relayClient?.send(msg);
+  }
   get isRunning() {
     return this.running;
   }
@@ -23177,7 +23238,12 @@ var SyncService = class {
         );
       }
       this.unsubscribeRelayMessages = this.relayClient.onMessage((msg) => {
-        if (msg.type !== "rpc.request") return;
+        if (msg.type !== "rpc.request") {
+          if (this.externalMessageHandler) {
+            this.externalMessageHandler(msg);
+          }
+          return;
+        }
         const rpcId = typeof msg.id === "string" ? msg.id : null;
         const method = typeof msg.method === "string" ? msg.method : null;
         const params = msg.params && typeof msg.params === "object" ? msg.params : {};
@@ -23677,9 +23743,11 @@ program2.command("start").description("Start the Workle Claw sync service").opti
   console.log(color.dim("Starting sync service... (Ctrl+C to stop)\n"));
   const processManager = new ProcessManager();
   const syncService = new SyncService();
+  let agentService = null;
   let weSpawnedGateway = false;
   const shutdown = () => {
     console.log("\n" + color.dim("Shutting down..."));
+    agentService?.stop();
     syncService.stop();
     if (weSpawnedGateway) {
       void processManager.stop().then(() => {
@@ -23702,6 +23770,15 @@ program2.command("start").description("Start the Workle Claw sync service").opti
       weSpawnedGateway = true;
     }
     await syncService.start();
+    try {
+      agentService = await createAgentService();
+      syncService.onRelayMessage((msg) => agentService.ingestRelayMessage(msg));
+      await agentService.startEmbedded((msg) => syncService.sendRelayMessage(msg));
+    } catch (err) {
+      console.error(
+        color.dim(`[agents] AgentService failed to start: ${err instanceof Error ? err.message : String(err)}`)
+      );
+    }
     console.log(color.green("\u2713 Running"));
     console.log(color.dim("  Press Ctrl+C to stop\n"));
   } catch (err) {