@agentuity/cli 2.0.6 → 2.0.8

package/src/keychain.ts

@@ -7,6 +7,8 @@
 
 const SERVICE_PREFIX = 'com.agentuity.cli';
 const KEY_ACCOUNT = 'aes-encryption-key';
+const AUTH_ACCOUNT = 'auth-token';
+const CODER_API_KEY_ACCOUNT = 'coder-hub-api-key';
 
 /**
  * Check if we're running on macOS
@@ -88,26 +90,15 @@ async function decrypt(combined: Uint8Array, keyBytes: Uint8Array): Promise<stri
 	return new TextDecoder().decode(plaintext);
 }
 
-/**
- * Store auth data in macOS Keychain
- */
-export async function saveAuthToKeychain(
-	profileName: string,
-	authData: { api_key: string; user_id: string; expires: number }
+async function saveEncryptedValueToKeychain(
+	service: string,
+	account: string,
+	value: string
 ): Promise<void> {
-	const service = `${SERVICE_PREFIX}.${profileName}`;
-	const account = 'auth-token';
-
-	// Get or create encryption key
 	const key = await ensureEncryptionKey(service);
-
-	// Encrypt the auth data
-	const json = JSON.stringify(authData);
-	const encrypted = await encrypt(json, key);
+	const encrypted = await encrypt(value, key);
 	const b64 = Buffer.from(encrypted).toString('base64');
 
-	// Store encrypted auth in keychain
-	// First try to delete if exists, then add
 	const del = Bun.spawn(['security', 'delete-generic-password', '-s', service, '-a', account], {
 		stderr: 'ignore',
 	});
@@ -127,6 +118,43 @@ export async function saveAuthToKeychain(
 	await add.exited;
 }
 
+async function getEncryptedValueFromKeychain(
+	service: string,
+	account: string
+): Promise<string | null> {
+	const find = Bun.spawn(
+		['security', 'find-generic-password', '-s', service, '-a', account, '-w'],
+		{ stderr: 'ignore' }
+	);
+
+	const stdout = await new Response(find.stdout).text();
+	if (stdout.length === 0) {
+		return null;
+	}
+
+	const encrypted = Uint8Array.from(Buffer.from(stdout.trim(), 'base64'));
+	const key = await ensureEncryptionKey(service);
+	return decrypt(encrypted, key);
+}
+
+async function deleteValueFromKeychain(service: string, account: string): Promise<void> {
+	const del = Bun.spawn(['security', 'delete-generic-password', '-s', service, '-a', account], {
+		stderr: 'ignore',
+	});
+	await del.exited;
+}
+
+/**
+ * Store auth data in macOS Keychain
+ */
+export async function saveAuthToKeychain(
+	profileName: string,
+	authData: { api_key: string; user_id: string; expires: number }
+): Promise<void> {
+	const service = `${SERVICE_PREFIX}.${profileName}`;
+	await saveEncryptedValueToKeychain(service, AUTH_ACCOUNT, JSON.stringify(authData));
+}
+
 /**
  * Retrieve auth data from macOS Keychain
  */
@@ -134,28 +162,12 @@ export async function getAuthFromKeychain(
 	profileName: string
 ): Promise<{ api_key: string; user_id: string; expires: number } | null> {
 	const service = `${SERVICE_PREFIX}.${profileName}`;
-	const account = 'auth-token';
 
 	try {
-		// Get the encrypted auth data
-		const find = Bun.spawn(
-			['security', 'find-generic-password', '-s', service, '-a', account, '-w'],
-			{ stderr: 'ignore' }
-		);
-
-		const stdout = await new Response(find.stdout).text();
-		if (stdout.length === 0) {
+		const json = await getEncryptedValueFromKeychain(service, AUTH_ACCOUNT);
+		if (!json) {
 			return null;
 		}
-
-		const b64 = stdout.trim();
-		const encrypted = Uint8Array.from(Buffer.from(b64, 'base64'));
-
-		// Get the encryption key
-		const key = await ensureEncryptionKey(service);
-
-		// Decrypt the auth data
-		const json = await decrypt(encrypted, key);
 		return JSON.parse(json);
 	} catch {
 		return null;
@@ -167,10 +179,27 @@ export async function getAuthFromKeychain(
  */
 export async function deleteAuthFromKeychain(profileName: string): Promise<void> {
 	const service = `${SERVICE_PREFIX}.${profileName}`;
-	const account = 'auth-token';
+	await deleteValueFromKeychain(service, AUTH_ACCOUNT);
+}
 
-	const del = Bun.spawn(['security', 'delete-generic-password', '-s', service, '-a', account], {
-		stderr: 'ignore',
-	});
-	await del.exited;
+export async function saveCoderApiKeyToKeychain(
+	profileName: string,
+	apiKey: string
+): Promise<void> {
+	const service = `${SERVICE_PREFIX}.${profileName}`;
+	await saveEncryptedValueToKeychain(service, CODER_API_KEY_ACCOUNT, apiKey);
+}
+
+export async function getCoderApiKeyFromKeychain(profileName: string): Promise<string | null> {
+	const service = `${SERVICE_PREFIX}.${profileName}`;
+	try {
+		return await getEncryptedValueFromKeychain(service, CODER_API_KEY_ACCOUNT);
+	} catch {
+		return null;
+	}
+}
+
+export async function deleteCoderApiKeyFromKeychain(profileName: string): Promise<void> {
+	const service = `${SERVICE_PREFIX}.${profileName}`;
+	await deleteValueFromKeychain(service, CODER_API_KEY_ACCOUNT);
 }

package/dist/cmd/coder/hub-url.d.ts

@@ -1,36 +0,0 @@
-/**
- * Hub URL resolution for Coder CLI commands.
- *
- * Resolution priority:
- *   1. --hub-url flag (explicit per-command override)
- *   2. AGENTUITY_CODER_HUB_URL env var
- *   3. AGENTUITY_DEVMODE_URL env var (dev tunnel URL)
- */
-/**
- * Resolve the Hub HTTP base URL for REST API calls.
- * Converts ws:// URLs to http:// automatically.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns HTTP base URL (e.g. "http://localhost:3500") or null if Hub is unreachable
- */
-export declare function resolveHubUrl(flagUrl?: string): Promise<string | null>;
-/**
- * Resolve the Hub WebSocket URL for Pi extension connections.
- * Converts http:// URLs to ws:// automatically and ensures /api/ws path.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
- */
-export declare function resolveHubWsUrl(flagUrl?: string): Promise<string | null>;
-export declare function toHubWsUrl(hubHttpUrl: string): string;
-/**
- * Resolve the API key for Hub authentication.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export declare function resolveApiKey(): string | null;
-/**
- * Build headers object with API key if available.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export declare function hubFetchHeaders(extra?: Record<string, string>): Record<string, string>;
-//# sourceMappingURL=hub-url.d.ts.map

package/dist/cmd/coder/hub-url.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hub-url.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAa5E;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAI9E;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAErD;AA4CD;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAE7C;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtF"}

package/dist/cmd/coder/hub-url.js

@@ -1,106 +0,0 @@
-/**
- * Hub URL resolution for Coder CLI commands.
- *
- * Resolution priority:
- *   1. --hub-url flag (explicit per-command override)
- *   2. AGENTUITY_CODER_HUB_URL env var
- *   3. AGENTUITY_DEVMODE_URL env var (dev tunnel URL)
- */
-import { getVersion } from '../../version';
-/**
- * Resolve the Hub HTTP base URL for REST API calls.
- * Converts ws:// URLs to http:// automatically.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns HTTP base URL (e.g. "http://localhost:3500") or null if Hub is unreachable
- */
-export async function resolveHubUrl(flagUrl) {
-    // 1. Explicit flag
-    if (flagUrl)
-        return normalizeToHttp(flagUrl);
-    // 2. Env var (explicit)
-    const envUrl = process.env.AGENTUITY_CODER_HUB_URL;
-    if (envUrl)
-        return normalizeToHttp(envUrl);
-    // 3. Dev mode URL (tunnel)
-    const devUrl = process.env.AGENTUITY_DEVMODE_URL;
-    if (devUrl)
-        return normalizeToHttp(devUrl);
-    return null;
-}
-/**
- * Resolve the Hub WebSocket URL for Pi extension connections.
- * Converts http:// URLs to ws:// automatically and ensures /api/ws path.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
- */
-export async function resolveHubWsUrl(flagUrl) {
-    const httpUrl = await resolveHubUrl(flagUrl);
-    if (!httpUrl)
-        return null;
-    return toHubWsUrl(httpUrl);
-}
-export function toHubWsUrl(hubHttpUrl) {
-    return normalizeToWs(hubHttpUrl);
-}
-/**
- * Convert any URL form to an HTTP base URL (strip paths, convert ws->http).
- */
-function normalizeToHttp(url) {
-    let normalized = url.trim().replace(/\/+$/, '');
-    // ws:// -> http://
-    if (normalized.startsWith('ws://'))
-        normalized = 'http://' + normalized.slice(5);
-    else if (normalized.startsWith('wss://'))
-        normalized = 'https://' + normalized.slice(6);
-    // Strip known Hub transport/helper paths to get the HTTP base URL.
-    // Accept `/ws` as a convenience alias because users often copy the raw route name.
-    normalized = normalized.replace(/\/api\/ws\b.*$/, '');
-    normalized = normalized.replace(/\/ws\b.*$/, '');
-    normalized = normalized.replace(/\/api\/hub\b.*$/, '');
-    return normalized.replace(/\/+$/, '');
-}
-/**
- * Convert an HTTP base URL to a WebSocket URL with /api/ws path.
- */
-function normalizeToWs(httpUrl) {
-    let wsUrl = httpUrl;
-    if (wsUrl.startsWith('http://'))
-        wsUrl = 'ws://' + wsUrl.slice(7);
-    else if (wsUrl.startsWith('https://'))
-        wsUrl = 'wss://' + wsUrl.slice(8);
-    try {
-        const parsed = new URL(wsUrl);
-        if (parsed.pathname !== '/api/ws') {
-            parsed.pathname = '/api/ws';
-            wsUrl = parsed.toString().replace(/\/$/, '');
-        }
-    }
-    catch {
-        if (!wsUrl.endsWith('/api/ws')) {
-            wsUrl = wsUrl.replace(/\/?$/, '/api/ws');
-        }
-    }
-    return wsUrl;
-}
-/**
- * Resolve the API key for Hub authentication.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export function resolveApiKey() {
-    return process.env.AGENTUITY_CODER_API_KEY || null;
-}
-/**
- * Build headers object with API key if available.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export function hubFetchHeaders(extra) {
-    const headers = { ...extra };
-    headers['User-Agent'] = `Agentuity Coder/${getVersion()}`;
-    const apiKey = resolveApiKey();
-    if (apiKey)
-        headers['x-agentuity-auth-api-key'] = apiKey;
-    return headers;
-}
-//# sourceMappingURL=hub-url.js.map

package/dist/cmd/coder/hub-url.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hub-url.js","sourceRoot":"","sources":["../../../src/cmd/coder/hub-url.ts"],"names":[],"mappings":"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"}

package/dist/cmd/coder/inspect.d.ts

@@ -1,2 +0,0 @@
-export declare const inspectSubcommand: import("../..").SubcommandDefinition;
-//# sourceMappingURL=inspect.d.ts.map

package/dist/cmd/coder/inspect.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/cmd/coder/inspect.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,iBAAiB,sCAyK5B,CAAC"}

package/dist/cmd/coder/inspect.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/cmd/coder/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE3D,SAAS,kBAAkB,CAAC,OAAe;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,OAAO,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,OAAO,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACvC,IAAI,KAAK,GAAG,EAAE;QAAE,OAAO,GAAG,KAAK,OAAO,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACpC,OAAO,GAAG,IAAI,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,cAAc,CAAC,EAAU;IACjC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,GAAG,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,OAAO,GAAG,EAAE,CAAC;IAC/B,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,KAAK,SAAS,GAAG,CAAC;IACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,GAAG,EAAE,CAAC;IAC/B,OAAO,GAAG,KAAK,KAAK,SAAS,GAAG,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;IACjD,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,qDAAqD;IAClE,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,eAAe,CAAC;IAC5C,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,UAAU,CAAC,+BAA+B,CAAC;YACpD,WAAW,EAAE,yBAAyB;SACtC;QACD;YACC,OAAO,EAAE,UAAU,CAAC,sCAAsC,CAAC;YAC3D,WAAW,EAAE,6BAA6B;SAC1C;KACD;IACD,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;SAC9D,CAAC;QACF,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC;SAC1D,CAAC;KACF;IACD,KAAK,CAAC,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CACR,oKAAoK,EACpK,SAAS,CAAC,aAAa,CACvB,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,IAoCH,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,MAAM,oBAAoB,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAAE;gBACtF,OAAO,EAAE,eAAe,EAAE;gBAC1B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;aACnC,CAAC,CAAC;YACH,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACzB,GAAG,CAAC,KAAK,CAAC,sBAAsB,SAAS,EAAE,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBAC3E,OAAO;YACR,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACzB,GAAG,CAAC,KAAK,CAAC,0BAA0B,SAAS,EAAE,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBAC/E,OAAO;YACR,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACd,GAAG,CAAC,KAAK,CACR,gBAAgB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,UAAU,iCAAiC,MAAM,GAAG,EACzF,SAAS,CAAC,SAAS,CACnB,CAAC;gBACF,OAAO;YACR,CAAC;YACD,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAgB,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,GAAG,CAAC,KAAK,CACR,qCAAqC,MAAM,KAAK,GAAG,oEAAoE,EACvH,SAAS,CAAC,aAAa,CACvB,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACb,CAAC;QAED,SAAS;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC;QAC3C,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,KAAK,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAE5C,eAAe;QACf,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACP,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACnC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtC,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW;oBAC9B,CAAC,CAAC,eAAe,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE;oBACpD,CAAC,CAAC,EAAE,CAAC;gBACN,OAAO,CAAC,GAAG,CACV,OAAO,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,GAAG,IAAI,EAAE,CAC/E,CAAC;YACH,CAAC;QACF,CAAC;QAED,QAAQ;QACR,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC1D,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC/E,OAAO,CAAC,GAAG,CACV,OAAO,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CACrG,CAAC;YACH,CAAC;QACF,CAAC;QAED,iBAAiB;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACjC,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;gBACxB,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW;oBACzB,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,aAAa,SAAS;oBAC/C,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,QAAQ,CAAC;gBAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,YAAY;oBAC7B,CAAC,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;oBAC5D,CAAC,CAAC,GAAG,CAAC;gBACP,OAAO,CAAC,GAAG,CACV,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,OAAO,EAAE,CACpF,CAAC;YACH,CAAC;QACF,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAC,CAAC"}

package/src/cmd/coder/hub-url.ts

@@ -1,111 +0,0 @@
-/**
- * Hub URL resolution for Coder CLI commands.
- *
- * Resolution priority:
- *   1. --hub-url flag (explicit per-command override)
- *   2. AGENTUITY_CODER_HUB_URL env var
- *   3. AGENTUITY_DEVMODE_URL env var (dev tunnel URL)
- */
-
-import { getVersion } from '../../version';
-
-/**
- * Resolve the Hub HTTP base URL for REST API calls.
- * Converts ws:// URLs to http:// automatically.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns HTTP base URL (e.g. "http://localhost:3500") or null if Hub is unreachable
- */
-export async function resolveHubUrl(flagUrl?: string): Promise<string | null> {
-	// 1. Explicit flag
-	if (flagUrl) return normalizeToHttp(flagUrl);
-
-	// 2. Env var (explicit)
-	const envUrl = process.env.AGENTUITY_CODER_HUB_URL;
-	if (envUrl) return normalizeToHttp(envUrl);
-
-	// 3. Dev mode URL (tunnel)
-	const devUrl = process.env.AGENTUITY_DEVMODE_URL;
-	if (devUrl) return normalizeToHttp(devUrl);
-
-	return null;
-}
-
-/**
- * Resolve the Hub WebSocket URL for Pi extension connections.
- * Converts http:// URLs to ws:// automatically and ensures /api/ws path.
- *
- * @param flagUrl  Optional --hub-url flag value
- * @returns WebSocket URL (e.g. "ws://127.0.0.1:3500/api/ws") or null
- */
-export async function resolveHubWsUrl(flagUrl?: string): Promise<string | null> {
-	const httpUrl = await resolveHubUrl(flagUrl);
-	if (!httpUrl) return null;
-	return toHubWsUrl(httpUrl);
-}
-
-export function toHubWsUrl(hubHttpUrl: string): string {
-	return normalizeToWs(hubHttpUrl);
-}
-
-/**
- * Convert any URL form to an HTTP base URL (strip paths, convert ws->http).
- */
-function normalizeToHttp(url: string): string {
-	let normalized = url.trim().replace(/\/+$/, '');
-
-	// ws:// -> http://
-	if (normalized.startsWith('ws://')) normalized = 'http://' + normalized.slice(5);
-	else if (normalized.startsWith('wss://')) normalized = 'https://' + normalized.slice(6);
-
-	// Strip known Hub transport/helper paths to get the HTTP base URL.
-	// Accept `/ws` as a convenience alias because users often copy the raw route name.
-	normalized = normalized.replace(/\/api\/ws\b.*$/, '');
-	normalized = normalized.replace(/\/ws\b.*$/, '');
-	normalized = normalized.replace(/\/api\/hub\b.*$/, '');
-
-	return normalized.replace(/\/+$/, '');
-}
-
-/**
- * Convert an HTTP base URL to a WebSocket URL with /api/ws path.
- */
-function normalizeToWs(httpUrl: string): string {
-	let wsUrl = httpUrl;
-	if (wsUrl.startsWith('http://')) wsUrl = 'ws://' + wsUrl.slice(7);
-	else if (wsUrl.startsWith('https://')) wsUrl = 'wss://' + wsUrl.slice(8);
-
-	try {
-		const parsed = new URL(wsUrl);
-		if (parsed.pathname !== '/api/ws') {
-			parsed.pathname = '/api/ws';
-			wsUrl = parsed.toString().replace(/\/$/, '');
-		}
-	} catch {
-		if (!wsUrl.endsWith('/api/ws')) {
-			wsUrl = wsUrl.replace(/\/?$/, '/api/ws');
-		}
-	}
-
-	return wsUrl;
-}
-
-/**
- * Resolve the API key for Hub authentication.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export function resolveApiKey(): string | null {
-	return process.env.AGENTUITY_CODER_API_KEY || null;
-}
-
-/**
- * Build headers object with API key if available.
- * TODO: Remove/Change when we get Agentuity service level auth enabled, this is just temporary
- */
-export function hubFetchHeaders(extra?: Record<string, string>): Record<string, string> {
-	const headers: Record<string, string> = { ...extra };
-	headers['User-Agent'] = `Agentuity Coder/${getVersion()}`;
-	const apiKey = resolveApiKey();
-	if (apiKey) headers['x-agentuity-auth-api-key'] = apiKey;
-	return headers;
-}