@neta-art/cohub-cli 10.0.0 → 10.1.0

package/dist/commands/run.js

@@ -1,3 +1,4 @@
+import { consumeBaseUrlOption } from "../endpoint-options.js";
 import { createClient } from "../client.js";
 import { error, handleHttp, json as outJson, spinner } from "../output.js";
 import { resolveSpaceTarget } from "../space.js";
@@ -18,7 +19,7 @@ function topLevelRunIndex(argv) {
         const token = argv[index] ?? "";
         if (token === "--")
             return -1;
-        if (token === "-s" || token === "--space") {
+        if (token === "-s" || token === "--space" || token === "--base-url") {
             index += 1;
             continue;
         }
@@ -50,6 +51,11 @@ export async function parseRunCliOptions(argv, spaceOptions = {}) {
         return error("Invalid invocation", "Use `cohub run [options] <command>`");
     const beforeRun = argv.slice(0, runIndex);
     const afterRun = argv.slice(runIndex + 1);
+    for (let index = 0; index < beforeRun.length; index += 1) {
+        index = consumeBaseUrlOption(beforeRun, index) ?? index;
+        if (beforeRun[index] === "-s" || beforeRun[index] === "--space")
+            index += 1;
+    }
     const explicitSpaceId = parseSpaceId(beforeRun) ?? process.env.COHUB_SPACE_ID?.trim() ?? "";
     let json = beforeRun.includes("--json");
     let async = false;
@@ -57,6 +63,11 @@ export async function parseRunCliOptions(argv, spaceOptions = {}) {
     let positionalTokens = [];
     for (let index = 0; index < afterRun.length; index += 1) {
         const token = afterRun[index] ?? "";
+        const endpointIndex = consumeBaseUrlOption(afterRun, index);
+        if (endpointIndex !== null) {
+            index = endpointIndex;
+            continue;
+        }
         if (token === "-h" || token === "--help") {
             printRunHelp();
             process.exit(0);
@@ -110,10 +121,11 @@ export async function parseRunCliOptions(argv, spaceOptions = {}) {
 export function printRunHelp() {
     process.stdout.write(`
 Usage:
-  cohub [-s <space>] run [options] -- <shell command>
+  cohub [--base-url <url>] [-s <space>] run [options] -- <shell command>
   cohub [-s <space>] run --command <shell command>
 
 Options:
+      --base-url <url>     API base URL (overrides COHUB_BASE_URL)
   -c, --command <command>  Shell command to execute in the space workspace
       --async              Queue the command and return immediately
       --json               Output as JSON

package/dist/endpoint-options.d.ts

@@ -0,0 +1,4 @@
+import { type Command } from "commander";
+export declare function setApiBaseUrl(value: string): string;
+export declare function registerEndpointOptions(program: Command): Command;
+export declare function consumeBaseUrlOption(tokens: string[], index: number): number | null;

package/dist/endpoint-options.js

@@ -0,0 +1,26 @@
+import { normalizeBaseUrl } from "@neta-art/cohub";
+import { InvalidArgumentError } from "commander";
+export function setApiBaseUrl(value) {
+    const url = normalizeBaseUrl(value);
+    if (!url)
+        throw new InvalidArgumentError("API base URL must not be empty");
+    process.env.COHUB_BASE_URL = url;
+    return url;
+}
+export function registerEndpointOptions(program) {
+    return program.option("--base-url <url>", "API base URL (overrides COHUB_BASE_URL)", setApiBaseUrl);
+}
+export function consumeBaseUrlOption(tokens, index) {
+    const token = tokens[index];
+    if (token?.startsWith("--base-url=")) {
+        setApiBaseUrl(token.slice("--base-url=".length));
+        return index;
+    }
+    if (token !== "--base-url")
+        return null;
+    const value = tokens[index + 1];
+    if (value === undefined)
+        throw new InvalidArgumentError("--base-url requires a value");
+    setApiBaseUrl(value);
+    return index + 1;
+}

package/dist/help-path.js

@@ -73,11 +73,11 @@ function runRemainderRequestsHelp(argv) {
             return true;
         if (token === "--async" || token === "--json")
             continue;
-        if (token === "-c" || token === "--command") {
+        if (token === "-c" || token === "--command" || token === "--base-url") {
             index += 1;
             continue;
         }
-        if (token.startsWith("--command="))
+        if (token.startsWith("--command=") || token.startsWith("--base-url="))
             continue;
         return false;
     }

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import { readFileSync } from "node:fs";
+import { registerEndpointOptions } from "./endpoint-options.js";
 import { registerAuth } from "./commands/auth.js";
 import { registerBoards } from "./commands/boards.js";
 import { registerChannels } from "./commands/channels.js";
@@ -32,7 +33,7 @@ const VERSION = (() => {
         return "1.0.0";
     }
 })();
-const program = new Command("cohub");
+const program = registerEndpointOptions(new Command("cohub"));
 program
     .name("cohub")
     .summary("Work with Cohub from your terminal")
@@ -79,6 +80,9 @@ Target space:
 Environment:
   COHUB_SPACE_ID         Target Space when -s is omitted
   COHUB_EXECUTION_TOKEN  Use this token instead of the stored Logto session
+  COHUB_BASE_URL         Override the API base URL
+  COHUB_WS_URL           Override the realtime WebSocket URL
+  COHUB_WEB_URL          Override the web URL used in links
   ENV=dev                Use the development Cohub environment
   HTTPS_PROXY            Honored for API and uploads (also HTTP_PROXY, NO_PROXY)
   Runtime logs            ~/.local/state/cohub/runtime/<space-id>/diagnostics

package/dist/runtime/supervisor.js

@@ -102,10 +102,10 @@ export async function runRuntime(config, onState, externalSignal, onDiagnostic)
             config.capabilities ?? discoverHarnesses(config.harnesses, config.executables, config.root),
         ]);
         signal.throwIfAborted();
-        const url = new URL(resolveWebsocketUrl({ url: process.env.COHUB_WS_URL }));
-        url.pathname = "/runtime/relay";
+        const url = new URL(resolveWebsocketUrl());
+        url.pathname = url.pathname.replace(/\/ws$/, "/runtime/relay");
         const relay = new URL(url);
-        relay.pathname = "/sandbox/relay";
+        relay.pathname = relay.pathname.replace(/\/runtime\/relay$/, "/sandbox/relay");
         const runBridge = async () => {
             let attempts = 0;
             while (!signal.aborted) {

package/dist/space.d.ts

@@ -11,6 +11,7 @@ export declare class SpaceTargetError extends Error {
  */
 export declare function identityKeyFrom(input: {
     env: string;
+    baseUrl?: string;
     executionToken?: string | null;
     idToken?: string | null;
     accessToken?: string | null;

package/dist/space.js

@@ -1,7 +1,7 @@
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { HOME_SPACE_SLUG, parseSpaceRef, resolveCohubEnvironment } from "@neta-art/cohub";
+import { COHUB_ENVIRONMENTS, HOME_SPACE_SLUG, normalizeBaseUrl, parseSpaceRef, resolveApiBaseUrl, resolveCohubEnvironment } from "@neta-art/cohub";
 import { readAuthSession } from "./auth.js";
 import { createClient } from "./client.js";
 import { getRuntimeSpaceBinding } from "./runtime/space-binding.js";
@@ -40,17 +40,21 @@ function jwtClaim(token, key) {
  * Execution grants identify the actor as `actorUserId`, not `sub`.
  */
 export function identityKeyFrom(input) {
+    const baseUrl = input.baseUrl ? normalizeBaseUrl(input.baseUrl) : "";
+    const defaultBaseUrl = COHUB_ENVIRONMENTS[input.env === "dev" ? "dev" : "prod"].apiBaseUrl;
+    const namespace = baseUrl && baseUrl !== defaultBaseUrl ? `${input.env}:${baseUrl}` : input.env;
     if (input.executionToken) {
         const actor = jwtClaim(input.executionToken, "actorUserId") ?? jwtClaim(input.executionToken, "sub");
-        return actor ? `${input.env}:${actor}` : null;
+        return actor ? `${namespace}:${actor}` : null;
     }
     const sub = jwtClaim(input.idToken, "sub") ?? jwtClaim(input.accessToken, "sub");
-    return sub ? `${input.env}:${sub}` : null;
+    return sub ? `${namespace}:${sub}` : null;
 }
 export function currentIdentityKey() {
     const session = readAuthSession();
     return identityKeyFrom({
         env: resolveCohubEnvironment(),
+        baseUrl: resolveApiBaseUrl(),
         executionToken: process.env.COHUB_EXECUTION_TOKEN?.trim(),
         idToken: session?.idToken,
         accessToken: session?.accessToken,
@@ -81,10 +85,10 @@ function writeHomeSpaceCache(key, spaceId) {
         // Cache is best-effort; never fail the command over it.
     }
 }
-let homeSpacePromise = null;
+const homeSpaces = new Map();
 const spaceRefs = new Map();
 export function clearHomeSpaceCache() {
-    homeSpacePromise = null;
+    homeSpaces.clear();
     spaceRefs.clear();
     try {
         rmSync(CACHE_PATH, { force: true });
@@ -107,17 +111,21 @@ export function explicitSpace(program) {
 }
 /** Cached per identity and memoized per process. */
 export function resolveHomeSpace() {
-    homeSpacePromise ??= (async () => {
-        const key = currentIdentityKey();
-        const cached = key ? readHomeSpaceCache(CACHE_PATH, key) : null;
-        if (cached)
-            return cached;
-        const space = await createClient().spaces.ensureHome();
-        if (key)
-            writeHomeSpaceCache(key, space.id);
-        return space.id;
-    })();
-    return homeSpacePromise;
+    const key = currentIdentityKey();
+    const memoKey = key ?? resolveApiBaseUrl();
+    let resolved = homeSpaces.get(memoKey);
+    if (!resolved)
+        resolved = (async () => {
+            const cached = key ? readHomeSpaceCache(CACHE_PATH, key) : null;
+            if (cached)
+                return cached;
+            const space = await createClient().spaces.ensureHome();
+            if (key)
+                writeHomeSpaceCache(key, space.id);
+            return space.id;
+        })();
+    homeSpaces.set(memoKey, resolved);
+    return resolved;
 }
 async function lookupSpaceRef(value) {
     const ref = parseSpaceRef(value);
@@ -141,10 +149,10 @@ async function lookupSpaceRef(value) {
     }
 }
 export function resolveSpaceRef(value) {
-    const key = value.trim();
+    const key = `${currentIdentityKey() ?? resolveApiBaseUrl()}:${value.trim()}`;
     let resolved = spaceRefs.get(key);
     if (!resolved) {
-        resolved = lookupSpaceRef(key);
+        resolved = lookupSpaceRef(value.trim());
         spaceRefs.set(key, resolved);
     }
     return resolved;

package/dist/web.js

@@ -1,6 +1,4 @@
-import { resolveCohubEnvironment } from "@neta-art/cohub";
+import { resolveWebBaseUrl } from "@neta-art/cohub";
 export function webUrl(path) {
-    const origin = process.env.COHUB_WEB_URL?.replace(/\/+$/, "") ??
-        `https://${resolveCohubEnvironment() === "prod" ? "" : "dev."}cohub.live`;
-    return `${origin}${path}`;
+    return `${resolveWebBaseUrl()}${path}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub-cli",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "CLI for Cohub — spaces, sessions, and agent collaboration.",
   "type": "module",
   "engines": {
@@ -18,7 +18,7 @@
     "NOTICE"
   ],
   "dependencies": {
-    "@neta-art/cohub": "11.0.0",
+    "@neta-art/cohub": "11.1.0",
     "@neta-art/generation": "^0.1.33",
     "commander": "^15.0.0",
     "sharp": "^0.35.4",