@onklave/agent-cli 0.1.40 → 0.1.42

package/main.js

@@ -127,6 +127,7 @@ var CredentialStore = class {
 
 // _apps/@onklave/agent-cli/src/services/auth.service.ts
 var DEFAULT_PLATFORM_URL = "https://api.onklave.app";
+var DEFAULT_COMMS_URL = "wss://comms.onklave.app";
 var AuthService = class {
   constructor() {
     this.store = new CredentialStore();
@@ -147,6 +148,7 @@ var AuthService = class {
       ...existing,
       token,
       platformUrl: metadata?.platformUrl ?? existing?.platformUrl ?? DEFAULT_PLATFORM_URL,
+      commsUrl: metadata?.commsUrl ?? existing?.commsUrl,
       userId: metadata?.userId ?? existing?.userId,
       orgId: metadata?.orgId ?? existing?.orgId,
       expiresAt: metadata?.expiresAt ?? existing?.expiresAt
@@ -206,6 +208,15 @@ var AuthService = class {
     const creds = await this.getCredentials();
     return creds?.platformUrl ?? DEFAULT_PLATFORM_URL;
   }
+  /*
+   * Get the comms (Socket.IO) URL from credentials or fallback to default.
+   * Resolved separately from the platform URL because comms is reached on a
+   * dedicated host, not through the gateway.
+   */
+  async getCommsUrl() {
+    const creds = await this.getCredentials();
+    return creds?.commsUrl ?? DEFAULT_COMMS_URL;
+  }
 };
 
 // _apps/@onklave/agent-cli/src/utils.ts
@@ -257,10 +268,11 @@ async function loginCommand(args) {
   const authService = new AuthService();
   const token = flags["token"];
   const platformUrl = flags["platform-url"];
+  const commsUrl = flags["comms-url"];
   if (typeof token !== "string" || !token) {
     console.log("Onklave Agent CLI \u2014 Login\n");
     console.log(
-      "Usage: onklave login --token <token> [--platform-url <url>]\n"
+      "Usage: onklave login --token <token> [--platform-url <url>] [--comms-url <url>]\n"
     );
     console.log("To obtain a token:");
     console.log(
@@ -277,6 +289,9 @@ async function loginCommand(args) {
   if (typeof platformUrl === "string") {
     metadata.platformUrl = platformUrl;
   }
+  if (typeof commsUrl === "string") {
+    metadata.commsUrl = commsUrl;
+  }
   try {
     await authService.saveToken(token, metadata);
     console.log("Successfully authenticated with Onklave platform.");
@@ -284,6 +299,9 @@ async function loginCommand(args) {
     if (typeof platformUrl === "string") {
       console.log(`Platform URL: ${platformUrl}`);
     }
+    if (typeof commsUrl === "string") {
+      console.log(`Comms URL: ${commsUrl}`);
+    }
   } catch (err) {
     console.error(`Login failed: ${err.message}`);
     process.exitCode = 1;
@@ -319,6 +337,7 @@ async function whoamiCommand() {
   const isValid = await authService.isAuthenticated();
   console.log("Onklave Agent CLI \u2014 Identity\n");
   console.log(`  Platform URL:  ${creds.platformUrl}`);
+  console.log(`  Comms URL:     ${await authService.getCommsUrl()}`);
   console.log(`  User ID:       ${creds.userId ?? "(not set)"}`);
   console.log(`  Org ID:        ${creds.orgId ?? "(not set)"}`);
   console.log(`  Machine ID:    ${creds.machineId ?? "(not registered)"}`);
@@ -354,6 +373,7 @@ var ConfigResolver = class {
       headless: false,
       dryRun: false,
       apiKey: null,
+      oauthToken: null,
       apiEndpoint: DEFAULT_PLATFORM_URL2,
       platformUrl: DEFAULT_PLATFORM_URL2,
       orgId: null,
@@ -417,6 +437,8 @@ var ConfigResolver = class {
       fromEnv.orgId = process.env["ONKLAVE_ORG_ID"];
     if (process.env["ANTHROPIC_API_KEY"])
       fromEnv.apiKey = process.env["ANTHROPIC_API_KEY"];
+    if (process.env["CLAUDE_CODE_OAUTH_TOKEN"])
+      fromEnv.oauthToken = process.env["CLAUDE_CODE_OAUTH_TOKEN"];
     const fromFlags = {};
     if (typeof flags["task"] === "string") fromFlags.task = flags["task"];
     if (typeof flags["context"] === "string")
@@ -545,6 +567,7 @@ var ConfigResolver = class {
 };
 
 // _apps/@onklave/agent-cli/src/services/platform-client.ts
+var GATEWAY_SERVICE_PREFIX = "/agent-orchestration";
 var PlatformClient = class {
   constructor(baseUrl, token) {
     this.baseUrl = baseUrl;
@@ -713,7 +736,7 @@ var PlatformClient = class {
    * Make an authenticated HTTP request to the platform.
    */
   async request(method, path8, body, extraHeaders) {
-    const url = `${this.baseUrl}${path8}`;
+    const url = `${this.baseUrl}${GATEWAY_SERVICE_PREFIX}${path8}`;
     const headers = {
       Authorization: `Bearer ${this.token}`,
       "Content-Type": "application/json",
@@ -762,13 +785,15 @@ var CommsClient = class {
   }
   /*
    * Connect to the Onklave comms service via Socket.IO.
+   * `commsUrl` is the comms service host (e.g. wss://comms.onklave.app) — NOT
+   * the gateway/platform URL; comms is reached on its own dedicated ingress.
    * Pass `machineId` so the server can route inbound runner events
    * (e.g. `assignment:claim-available`) to this specific runner.
    */
-  async connect(platformUrl, token, extra) {
+  async connect(commsUrl, token, extra) {
     return new Promise((resolve3, reject) => {
-      const commsUrl = platformUrl.replace(/\/+$/, "");
-      this.socket = io(`${commsUrl}/agent-cli`, {
+      const baseUrl = commsUrl.replace(/\/+$/, "");
+      this.socket = io(`${baseUrl}/agent-cli`, {
         auth: {
           token,
           machineId: extra?.machineId,
@@ -911,7 +936,10 @@ var SessionManager = class {
       args.push("--append-system-prompt", config.systemPromptAppend);
     }
     const env = { ...process.env };
-    if (config.apiKey) {
+    if (config.oauthToken) {
+      env["CLAUDE_CODE_OAUTH_TOKEN"] = config.oauthToken;
+      delete env["ANTHROPIC_API_KEY"];
+    } else if (config.apiKey) {
       env["ANTHROPIC_API_KEY"] = config.apiKey;
     }
     const child = spawn("claude", args, {
@@ -1381,7 +1409,7 @@ var HeartbeatService = class {
     };
     try {
       const response = await fetch(
-        `${this.opts.platformUrl}/api/v1/runner/heartbeat`,
+        `${this.opts.platformUrl}/agent-orchestration/api/v1/runner/heartbeat`,
         {
           method: "POST",
           headers: {
@@ -2031,7 +2059,7 @@ async function runCommand(args) {
   const auditStreamer = new AuditStreamer(commsClient);
   try {
     console.log("Connecting to Onklave comms service...");
-    await commsClient.connect(resolvedConfig.platformUrl, creds.token, {
+    await commsClient.connect(await authService.getCommsUrl(), creds.token, {
       machineId: creds.machineId,
       deviceToken: creds.deviceToken,
       orgId: creds.orgId
@@ -2097,6 +2125,7 @@ async function runCommand(args) {
     deniedTools: resolvedConfig.deniedTools,
     addDirs,
     apiKey: resolvedConfig.apiKey,
+    oauthToken: resolvedConfig.oauthToken,
     headless: resolvedConfig.headless,
     platformUrl: resolvedConfig.platformUrl,
     orgId: resolvedConfig.orgId,
@@ -2688,7 +2717,7 @@ async function checkWebSocket() {
   }
   const commsClient = new CommsClient();
   try {
-    await commsClient.connect(creds.platformUrl, creds.token);
+    await commsClient.connect(await authService.getCommsUrl(), creds.token);
     commsClient.disconnect();
     return {
       name: "WebSocket",
@@ -3004,7 +3033,7 @@ var DaemonCommsService = class {
     let attempt = 0;
     while (!this.stopRequested) {
       try {
-        await this.client.connect(this.opts.platformUrl, this.opts.token, {
+        await this.client.connect(this.opts.commsUrl, this.opts.token, {
           machineId: this.opts.machineId,
           deviceToken: this.opts.deviceToken,
           orgId: this.opts.orgId
@@ -3408,7 +3437,7 @@ var PlatformBrokerClient = class {
     );
   }
   async request(method, path8, body) {
-    const url = `${this.baseUrl}${path8}`;
+    const url = `${this.baseUrl}/agent-orchestration${path8}`;
     const response = await fetch(url, {
       method,
       headers: {
@@ -3513,6 +3542,9 @@ var WorkItemRunner = class {
       deniedTools: [],
       addDirs,
       apiKey: null,
+      // Honour a Claude Pro/Max subscription token if the runner was started
+      // with one; otherwise Claude Code falls back to ambient ANTHROPIC_API_KEY.
+      oauthToken: process.env["CLAUDE_CODE_OAUTH_TOKEN"] ?? null,
       headless: true,
       platformUrl: "",
       orgId: null,
@@ -3685,6 +3717,7 @@ var DaemonSpawner = class {
       allowedTools: [],
       deniedTools: [],
       apiKey: req.apiKey ?? null,
+      oauthToken: process.env["CLAUDE_CODE_OAUTH_TOKEN"] ?? null,
       headless: true,
       platformUrl: this.platformUrl,
       orgId: req.orgId,
@@ -4221,8 +4254,9 @@ async function daemonStart() {
     creds.machineId
   );
   const platformUrl = await authService.getPlatformUrl();
+  const commsUrl = await authService.getCommsUrl();
   const comms = new DaemonCommsService({
-    platformUrl,
+    commsUrl,
     token: creds.token,
     machineId: creds.machineId,
     deviceToken: creds.deviceToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onklave/agent-cli",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "Onklave Agent CLI — local agent runner with cloud orchestration",
   "bin": {
     "onklave": "./main.js"