t3code-cli 0.1.3 → 0.2.0

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as fromIterable, $n as isNotNull, $t as scoped, A as Crypto, An as map$3, At as catchTags, B as make$8, Bn as getOrElse, Bt as ignore, C as decodeUnknownEffect, Cn as doneUnsafe, Ct as acquireRelease, D as optionalKey, Dn as succeed$1, Dt as asVoid, E as optional$3, En as isSuccess, Et as as, F as make$7, Fn as empty$1, Ft as fn, G as FileSystem, Gn as match, Gt as mapError, H as Path$1, Hn as isNone, Ht as isEffect, I as parseFdName, In as make$13, It as fnUntraced, J as WatchBackend, Jn as Prototype, Jt as provide$1, K as FileTypeId, Kn as none, Kt as matchEffect, L as ChildProcessSpawner, Ln as flatMap$1, Lt as forEach, M as fromReadable, Mn as succeed$3, Mt as effectify, N as fromWritable, Nn as Reference, Nt as fail, O as tag, On as ConsoleRef, Ot as callback, P as fdName, Pn as Service, Pt as flatMap, Q as empty, Qn as hasProperty, Qt as runFork, R as ExitCode, Rn as fromNullishOr, Rt as forkScoped, S as decodeTo, Sn as _await, St as transform$1, T as is, Tn as makeUnsafe, Tt as andThen, U as TypeId$6, Un as isSome, Ut as logError, V as makeHandle, Vn as getOrUndefined, Vt as interrupt, W as FileDescriptor, Wn as map$4, Wt as map$2, X as callback$1, Xn as withFiber, Xt as provideService, Y as make$10, Yn as PipeInspectableProto, Yt as provideContext, Z as decodeText, Zn as format, Zt as result, _ as Literals, _n as provide, _t as offer, a as latestAssistantMessage, an as tapError, ar as identity, at as runLast, b as TaggedErrorClass, bn as sync$2, bt as badArgument, c as Environment, cn as try_, cr as __commonJSMin, ct as transduce, d as ArraySchema, dn as TaggedError, dt as make$11, en as serviceOption, er as isNotUndefined, et as isStream, f as Boolean$2, fn as fail$1, ft as drain, g as Literal, gn as mergeAll, gt as make$12, h as Int, hn as effect, ht as failCauseUnsafe, i as ThreadSessionError, in as tapCause, ir as dual, it as runFold, j as make$9, jn as fail$2, jt as catch_, k as toCodecStringTree, kn as sync$1, kt as catchFilter, l as T3Config, ln as uninterruptible, lr as __require, lt as unwrap, m as ErrorClass, mn as squash, mt as endUnsafe, nn as suspend, nr as isUndefined, nt as run$1, o as threadStatus, on as timeoutOrElse, or as pipe, ot as succeed$4, p as Defect, pn as hasInterruptsOnly, pt as isSink, q as Size, qn as some, qt as orDie, r as NodeEnvironmentLive, rn as sync, rr as constVoid, rt as runDrain, s as T3Application, sn as tryPromise, sr as pipeArguments, st as tap, t as AppLayer, tn as succeed, tr as isNullish, tt as merge, u as T3Auth, un as void_, ut as get, v as String$1, vn as provideMerge, vt as offerUnsafe, w as fromJsonString, wn as isDone, wt as addFinalizer, x as Union, xn as MinimumLogLevel, xt as systemError, y as Struct, yn as succeed$2, yt as BadArgument, z as ProcessId, zn as fromUndefinedOr, zt as gen } from "./runtime-0wuYCEoH.js";
+import { $ as fromIterable, $n as isNotNull, $t as scoped, A as Crypto, An as map$3, At as catchTags, B as make$8, Bn as getOrElse, Bt as ignore, C as decodeUnknownEffect, Cn as doneUnsafe, Ct as acquireRelease, D as optionalKey, Dn as succeed$1, Dt as asVoid, E as optional$3, En as isSuccess, Et as as, F as make$7, Fn as empty$1, Ft as fn, G as FileSystem, Gn as match, Gt as mapError, H as Path$1, Hn as isNone, Ht as isEffect, I as parseFdName, In as make$13, It as fnUntraced, J as WatchBackend, Jn as Prototype, Jt as provide$1, K as FileTypeId, Kn as none, Kt as matchEffect, L as ChildProcessSpawner, Ln as flatMap$1, Lt as forEach, M as fromReadable, Mn as succeed$3, Mt as effectify, N as fromWritable, Nn as Reference, Nt as fail, O as tag, On as ConsoleRef, Ot as callback, P as fdName, Pn as Service, Pt as flatMap, Q as empty, Qn as hasProperty, Qt as runFork, R as ExitCode, Rn as fromNullishOr, Rt as forkScoped, S as decodeTo, Sn as _await, St as transform$1, T as is, Tn as makeUnsafe, Tt as andThen, U as TypeId$6, Un as isSome, Ut as logError, V as makeHandle, Vn as getOrUndefined, Vt as interrupt, W as FileDescriptor, Wn as map$4, Wt as map$2, X as callback$1, Xn as withFiber, Xt as provideService, Y as make$10, Yn as PipeInspectableProto, Yt as provideContext, Z as decodeText, Zn as format, Zt as result, _ as Literals, _n as provide, _t as offer, a as latestAssistantMessage, an as tapError, ar as identity, at as runLast, b as TaggedErrorClass, bn as sync$2, bt as badArgument, c as Environment, cn as try_, cr as __commonJSMin, ct as transduce, d as ArraySchema, dn as TaggedError, dt as make$11, en as serviceOption, er as isNotUndefined, et as isStream, f as Boolean$2, fn as fail$1, ft as drain, g as Literal, gn as mergeAll, gt as make$12, h as Int, hn as effect, ht as failCauseUnsafe, i as ThreadSessionError, in as tapCause, ir as dual, it as runFold, j as make$9, jn as fail$2, jt as catch_, k as toCodecStringTree, kn as sync$1, kt as catchFilter, l as T3Config, ln as uninterruptible, lr as __require, lt as unwrap, m as ErrorClass, mn as squash, mt as endUnsafe, nn as suspend, nr as isUndefined, nt as run$1, o as threadStatus, on as timeoutOrElse, or as pipe, ot as succeed$4, p as Defect, pn as hasInterruptsOnly, pt as isSink, q as Size, qn as some, qt as orDie, r as NodeEnvironmentLive, rn as sync, rr as constVoid, rt as runDrain, s as T3Application, sn as tryPromise, sr as pipeArguments, st as tap, t as AppLayer, tn as succeed, tr as isNullish, tt as merge, u as T3Auth, un as void_, ut as get, v as String$1, vn as provideMerge, vt as offerUnsafe, w as fromJsonString, wn as isDone, wt as addFinalizer, x as Union, xn as MinimumLogLevel, xt as systemError, y as Struct, yn as succeed$2, yt as BadArgument, z as ProcessId, zn as fromUndefinedOr, zt as gen } from "./runtime-CMPZpQaG.js";
 import * as NodeChildProcess from "node:child_process";
 import * as NodeCrypto from "node:crypto";
 import * as NFS from "node:fs";
@@ -17822,7 +17822,7 @@ var T3Version = class extends Service()("t3cli/T3Version") {};
 //#endregion
 //#region src/version/layer.ts
 const PackageJsonSchema = fromJsonString(Struct({ version: String$1 }));
-const T3VersionBundledLive = sync$2(T3Version, () => ({ version: "0.1.3" }));
+const T3VersionBundledLive = sync$2(T3Version, () => ({ version: "0.2.0" }));
 effect(T3Version, gen(function* () {
 	const packageJson = yield* (yield* FileSystem).readFileString(fileURLToPath(new URL("../../package.json", import.meta.url)));
 	return { version: (yield* decodeUnknownEffect(PackageJsonSchema)(packageJson)).version };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as AuthAppLayer, r as NodeEnvironmentLive, s as T3Application, t as AppLayer } from "./runtime-0wuYCEoH.js";
+import { n as AuthAppLayer, r as NodeEnvironmentLive, s as T3Application, t as AppLayer } from "./runtime-CMPZpQaG.js";
 export { AppLayer, AuthAppLayer, NodeEnvironmentLive, T3Application };

package/dist/{runtime-0wuYCEoH.js → runtime-CMPZpQaG.js}

@@ -31476,21 +31476,6 @@ const setUrl = /*#__PURE__*/ dual(2, (self, url) => {
 	return makeWith$1(self.method, clone.toString(), urlParams, hash, self.headers, self.body);
 });
 /**
-* Appends a URL segment to the request URL, inserting or trimming one slash as needed.
-*
-* @category combinators
-* @since 4.0.0
-*/
-const appendUrl = /*#__PURE__*/ dual(2, (self, path) => {
-	if (path === "") return self;
-	return makeWith$1(self.method, joinSegments(self.url, path), self.urlParams, self.hash, self.headers, self.body);
-});
-const joinSegments = (first, second) => {
-	const endsWithSlash = first.endsWith("/");
-	const startsWithSlash = second.startsWith("/");
-	return endsWithSlash && startsWithSlash ? first + second.slice(1) : !endsWithSlash && !startsWithSlash ? first + "/" + second : first + second;
-};
-/**
 * Sets one query parameter, replacing existing values for that parameter name.
 *
 * @category combinators
@@ -64342,7 +64327,11 @@ var AuthConfigError = class extends TaggedErrorClass()("AuthConfigError", {
 }) {};
 var AuthTransportError = class extends TaggedErrorClass()("AuthTransportError", {
 	message: String$1,
-	cause: optionalKey(Union([HttpClientErrorSchema, instanceOf(SchemaError)]))
+	cause: optionalKey(Union([
+		HttpClientErrorSchema,
+		instanceOf(SchemaError),
+		UrlError
+	]))
 }) {};
 const AuthLocalErrorCauseSchema = Union([
 	instanceOf(PlatformError),
@@ -64358,10 +64347,13 @@ var AuthLocalError = class extends TaggedErrorClass()("AuthLocalError", {
 function normalizeHttpBaseUrl(value) {
 	return parseUrl$1(value).pipe(flatMap$2((url) => succeed$2(normalizeBaseUrl$1(url))));
 }
-function toWebSocketBaseUrl(httpBaseUrl) {
+function toHttpEndpointUrl(httpBaseUrl, pathname) {
+	return parseUrl$1(httpBaseUrl).pipe(flatMap$2((url) => succeed$2(withPathname(url, pathname).toString())));
+}
+function toWebSocketEndpointUrl(httpBaseUrl, pathname) {
 	return parseUrl$1(httpBaseUrl).pipe(flatMap$2((url) => {
-		if (url.protocol === "http:") return succeed$2(makeWebSocketUrl(url, "ws:"));
-		if (url.protocol === "https:") return succeed$2(makeWebSocketUrl(url, "wss:"));
+		if (url.protocol === "http:") return succeed$2(withPathname(url, pathname, "ws:").toString());
+		if (url.protocol === "https:") return succeed$2(withPathname(url, pathname, "wss:").toString());
 		return fail$2(new UrlError({
 			message: `unsupported server url protocol: ${url.protocol}`,
 			protocol: url.protocol
@@ -64378,16 +64370,22 @@ function normalizeBaseUrl$1(url) {
 	return mutate(url, (current) => {
 		current.hash = "";
 		current.search = "";
-		current.pathname = "";
+		current.pathname = normalizePathname(current.pathname);
 	}).toString().replace(/\/$/, "");
 }
-function makeWebSocketUrl(url, protocol) {
+function withPathname(url, pathname, protocol) {
 	return mutate(url, (current) => {
-		current.protocol = protocol;
-		current.pathname = "/ws";
+		if (protocol !== void 0) current.protocol = protocol;
+		current.pathname = appendPathname(current.pathname, pathname);
 		current.search = "";
 		current.hash = "";
-	}).toString();
+	});
+}
+function normalizePathname(pathname) {
+	return pathname === "/" ? "" : pathname.replace(/\/+$/u, "");
+}
+function appendPathname(basePathname, pathname) {
+	return `${normalizePathname(basePathname)}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
 }
 //#endregion
 //#region src/auth/schema.ts
@@ -64558,7 +64556,7 @@ function parsePairingUrl(value) {
 		if (token.length === 0) return yield* fail$2(new AuthPairingUrlError({ message: "pairing url missing token" }));
 		const hostedHost = url.searchParams.get("host")?.trim();
 		return {
-			baseUrl: normalizeBaseUrl(yield* parseUrl(hostedHost !== void 0 && hostedHost.length > 0 ? hostedHost : url.origin)),
+			baseUrl: normalizeBaseUrl(yield* parseUrl(hostedHost !== void 0 && hostedHost.length > 0 ? hostedHost : new URL(".", url).toString())),
 			credential: token
 		};
 	});
@@ -64573,7 +64571,7 @@ function normalizeBaseUrl(url) {
 	return mutate(url, (current) => {
 		current.hash = "";
 		current.search = "";
-		current.pathname = "";
+		current.pathname = current.pathname === "/" ? "" : current.pathname.replace(/\/+$/u, "");
 	}).toString().replace(/\/$/, "");
 }
 function readPairingToken(url) {
@@ -64589,7 +64587,7 @@ const makeAuthTransport = fn("makeAuthTransport")(function* () {
 	const client = filterStatusOk(yield* HttpClient);
 	return {
 		bootstrapBearer: fn("AuthTransport.bootstrapBearer")(function* (input) {
-			const request = post$1(input.baseUrl).pipe(appendUrl("/api/auth/bootstrap/bearer"), acceptJson, bodyJsonUnsafe({ credential: input.credential }));
+			const request = post$1(yield* makeHttpEndpointUrl(input.baseUrl, "/api/auth/bootstrap/bearer")).pipe(acceptJson, bodyJsonUnsafe({ credential: input.credential }));
 			return yield* (yield* client.execute(request).pipe(catchTags$1({ HttpClientError: (error) => fail$2(new AuthTransportError({
 				message: "auth request failed",
 				cause: HttpClientErrorSchema.fromHttpClientError(error)
@@ -64605,7 +64603,7 @@ const makeAuthTransport = fn("makeAuthTransport")(function* () {
 			}));
 		}),
 		getSession: fn("AuthTransport.getSession")(function* (config) {
-			const request = authenticatedRequest(config, "/api/auth/session", "get");
+			const request = yield* authenticatedRequest(config, "/api/auth/session", "get");
 			return yield* (yield* client.execute(request).pipe(catchTags$1({ HttpClientError: (error) => fail$2(new AuthTransportError({
 				message: "auth request failed",
 				cause: HttpClientErrorSchema.fromHttpClientError(error)
@@ -64621,7 +64619,7 @@ const makeAuthTransport = fn("makeAuthTransport")(function* () {
 			}));
 		}),
 		issueWebSocketToken: fn("AuthTransport.issueWebSocketToken")(function* (config) {
-			const request = authenticatedRequest(config, "/api/auth/ws-token", "post");
+			const request = yield* authenticatedRequest(config, "/api/auth/ws-token", "post");
 			return yield* (yield* client.execute(request).pipe(catchTags$1({ HttpClientError: (error) => fail$2(new AuthTransportError({
 				message: "auth request failed",
 				cause: HttpClientErrorSchema.fromHttpClientError(error)
@@ -64639,7 +64637,13 @@ const makeAuthTransport = fn("makeAuthTransport")(function* () {
 	};
 });
 function authenticatedRequest(config, path, method) {
-	return (method === "get" ? get$1(config.url) : post$1(config.url)).pipe(appendUrl(path), acceptJson, bearerToken(config.token));
+	return makeHttpEndpointUrl(config.url, path).pipe(map$3((url) => method === "get" ? get$1(url) : post$1(url)), map$3((request) => request.pipe(acceptJson, bearerToken(config.token))));
+}
+function makeHttpEndpointUrl(baseUrl, path) {
+	return toHttpEndpointUrl(baseUrl, path).pipe(catchTags$1({ UrlError: (error) => fail$2(new AuthTransportError({
+		message: "auth request failed",
+		cause: error
+	})) }));
 }
 const T3AuthLive = effect(T3Auth, fn("makeT3Auth")(function* () {
 	const config = yield* T3Config;
@@ -68693,7 +68697,7 @@ const makeT3RpcLayer = fn("makeT3RpcLayer")(function* () {
 const makeWsUrl = fn("makeWsUrl")(function* (input) {
 	const resolved = yield* input.config.resolve();
 	const wsToken = yield* input.auth.issueWebSocketToken();
-	return getOrThrow(toUrl(get$1(yield* toWebSocketBaseUrl(resolved.url)).pipe(setUrlParam("wsToken", wsToken.token)))).toString();
+	return getOrThrow(toUrl(get$1(yield* toWebSocketEndpointUrl(resolved.url, "/ws")).pipe(setUrlParam("wsToken", wsToken.token)))).toString();
 });
 function makeProtocolLayer(url) {
 	const socketLayer = layerWebSocket(url).pipe(provide$2(layerWebSocketConstructor));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t3code-cli",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "CLI for t3code",
   "keywords": [
     "claude",

package/src/auth/error.ts

@@ -23,7 +23,11 @@ export class AuthTransportError extends Schema.TaggedErrorClass<AuthTransportErr
   {
     message: Schema.String,
     cause: Schema.optionalKey(
-      Schema.Union([HttpClientError.HttpClientErrorSchema, Schema.instanceOf(Schema.SchemaError)]),
+      Schema.Union([
+        HttpClientError.HttpClientErrorSchema,
+        Schema.instanceOf(Schema.SchemaError),
+        UrlError,
+      ]),
     ),
   },
 ) {}

package/src/auth/pairing.ts

@@ -14,7 +14,11 @@ export function parsePairingUrl(value: string): Effect.Effect<PairingUrl, AuthPa
 
     const hostedHost = url.searchParams.get("host")?.trim();
     const baseUrl = normalizeBaseUrl(
-      yield* parseUrl(hostedHost !== undefined && hostedHost.length > 0 ? hostedHost : url.origin),
+      yield* parseUrl(
+        hostedHost !== undefined && hostedHost.length > 0
+          ? hostedHost
+          : new URL(".", url).toString(),
+      ),
     );
     return { baseUrl, credential: token };
   });
@@ -33,7 +37,7 @@ function normalizeBaseUrl(url: URL) {
   return Url.mutate(url, (current) => {
     current.hash = "";
     current.search = "";
-    current.pathname = "";
+    current.pathname = current.pathname === "/" ? "" : current.pathname.replace(/\/+$/u, "");
   })
     .toString()
     .replace(/\/$/, "");

package/src/auth/transport.ts

@@ -2,6 +2,7 @@ import * as Effect from "effect/Effect";
 import { HttpClient, HttpClientError, HttpClientRequest } from "effect/unstable/http";
 
 import type { ResolvedConfig } from "../config/service.ts";
+import { toHttpEndpointUrl } from "../config/url.ts";
 import { AuthTransportError } from "./error.ts";
 import {
   decodeAuthBearerBootstrapResult,
@@ -16,8 +17,8 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
     readonly baseUrl: string;
     readonly credential: string;
   }) {
-    const request = HttpClientRequest.post(input.baseUrl).pipe(
-      HttpClientRequest.appendUrl("/api/auth/bootstrap/bearer"),
+    const url = yield* makeHttpEndpointUrl(input.baseUrl, "/api/auth/bootstrap/bearer");
+    const request = HttpClientRequest.post(url).pipe(
       HttpClientRequest.acceptJson,
       HttpClientRequest.bodyJsonUnsafe({ credential: input.credential }),
     );
@@ -51,7 +52,7 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
   });
 
   const getSession = Effect.fn("AuthTransport.getSession")(function* (config: ResolvedConfig) {
-    const request = authenticatedRequest(config, "/api/auth/session", "get");
+    const request = yield* authenticatedRequest(config, "/api/auth/session", "get");
     const response = yield* client.execute(request).pipe(
       Effect.catchTags({
         HttpClientError: (error) =>
@@ -84,7 +85,7 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
   const issueWebSocketToken = Effect.fn("AuthTransport.issueWebSocketToken")(function* (
     config: ResolvedConfig,
   ) {
-    const request = authenticatedRequest(config, "/api/auth/ws-token", "post");
+    const request = yield* authenticatedRequest(config, "/api/auth/ws-token", "post");
     const response = yield* client.execute(request).pipe(
       Effect.catchTags({
         HttpClientError: (error) =>
@@ -122,11 +123,21 @@ export const makeAuthTransport = Effect.fn("makeAuthTransport")(function* () {
 });
 
 function authenticatedRequest(config: ResolvedConfig, path: string, method: "get" | "post") {
-  const request =
-    method === "get" ? HttpClientRequest.get(config.url) : HttpClientRequest.post(config.url);
-  return request.pipe(
-    HttpClientRequest.appendUrl(path),
-    HttpClientRequest.acceptJson,
-    HttpClientRequest.bearerToken(config.token),
+  return makeHttpEndpointUrl(config.url, path).pipe(
+    Effect.map((url) =>
+      method === "get" ? HttpClientRequest.get(url) : HttpClientRequest.post(url),
+    ),
+    Effect.map((request) =>
+      request.pipe(HttpClientRequest.acceptJson, HttpClientRequest.bearerToken(config.token)),
+    ),
+  );
+}
+
+function makeHttpEndpointUrl(baseUrl: string, path: string) {
+  return toHttpEndpointUrl(baseUrl, path).pipe(
+    Effect.catchTags({
+      UrlError: (error) =>
+        Effect.fail(new AuthTransportError({ message: "auth request failed", cause: error })),
+    }),
   );
 }

package/src/config/url.ts

@@ -26,6 +26,31 @@ export function toWebSocketBaseUrl(httpBaseUrl: string) {
   );
 }
 
+export function toHttpEndpointUrl(httpBaseUrl: string, pathname: string) {
+  return parseUrl(httpBaseUrl).pipe(
+    Effect.flatMap((url) => Effect.succeed(withPathname(url, pathname).toString())),
+  );
+}
+
+export function toWebSocketEndpointUrl(httpBaseUrl: string, pathname: string) {
+  return parseUrl(httpBaseUrl).pipe(
+    Effect.flatMap((url) => {
+      if (url.protocol === "http:") {
+        return Effect.succeed(withPathname(url, pathname, "ws:").toString());
+      }
+      if (url.protocol === "https:") {
+        return Effect.succeed(withPathname(url, pathname, "wss:").toString());
+      }
+      return Effect.fail(
+        new UrlError({
+          message: `unsupported server url protocol: ${url.protocol}`,
+          protocol: url.protocol,
+        }),
+      );
+    }),
+  );
+}
+
 function parseUrl(value: string): Effect.Effect<URL, UrlError> {
   return Effect.fromResult(Url.fromString(value)).pipe(
     Effect.catchTags({
@@ -39,7 +64,7 @@ function normalizeBaseUrl(url: URL) {
   return Url.mutate(url, (current) => {
     current.hash = "";
     current.search = "";
-    current.pathname = "";
+    current.pathname = normalizePathname(current.pathname);
   })
     .toString()
     .replace(/\/$/, "");
@@ -48,8 +73,27 @@ function normalizeBaseUrl(url: URL) {
 function makeWebSocketUrl(url: URL, protocol: "ws:" | "wss:") {
   return Url.mutate(url, (current) => {
     current.protocol = protocol;
-    current.pathname = "/ws";
+    current.pathname = appendPathname(current.pathname, "/ws");
     current.search = "";
     current.hash = "";
   }).toString();
 }
+
+function withPathname(url: URL, pathname: string, protocol?: "ws:" | "wss:") {
+  return Url.mutate(url, (current) => {
+    if (protocol !== undefined) {
+      current.protocol = protocol;
+    }
+    current.pathname = appendPathname(current.pathname, pathname);
+    current.search = "";
+    current.hash = "";
+  });
+}
+
+function normalizePathname(pathname: string) {
+  return pathname === "/" ? "" : pathname.replace(/\/+$/u, "");
+}
+
+function appendPathname(basePathname: string, pathname: string) {
+  return `${normalizePathname(basePathname)}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
+}

package/src/rpc/layer.ts

@@ -13,7 +13,7 @@ import * as Socket from "effect/unstable/socket/Socket";
 
 import { T3Auth } from "../auth/service.ts";
 import { T3Config } from "../config/service.ts";
-import { toWebSocketBaseUrl } from "../config/url.ts";
+import { toWebSocketEndpointUrl } from "../config/url.ts";
 import { CliWsRpcGroup } from "./ws-group.ts";
 import { RpcError } from "./error.ts";
 import { T3Rpc, type WsClient } from "./service.ts";
@@ -77,7 +77,7 @@ const makeWsUrl = Effect.fn("makeWsUrl")(function* (input: {
 }) {
   const resolved = yield* input.config.resolve();
   const wsToken = yield* input.auth.issueWebSocketToken();
-  const wsUrl = yield* toWebSocketBaseUrl(resolved.url);
+  const wsUrl = yield* toWebSocketEndpointUrl(resolved.url, "/ws");
   const request = HttpClientRequest.get(wsUrl).pipe(
     HttpClientRequest.setUrlParam("wsToken", wsToken.token),
   );