Simplify workspace package builds and deps (pingdotgg#2676)

Author: juliusmarminge

apps/desktop/package.json

@@ -16,20 +16,18 @@
   },
   "dependencies": {
     "@effect/platform-node": "catalog:",
+    "@t3tools/contracts": "workspace:*",
+    "@t3tools/shared": "workspace:*",
+    "@t3tools/ssh": "workspace:*",
+    "@t3tools/tailscale": "workspace:*",
     "effect": "catalog:",
     "electron": "41.5.0",
     "electron-updater": "^6.6.2"
   },
   "devDependencies": {
     "@effect/language-service": "catalog:",
     "@effect/vitest": "catalog:",
-    "@t3tools/client-runtime": "workspace:*",
-    "@t3tools/contracts": "workspace:*",
-    "@t3tools/shared": "workspace:*",
-    "@t3tools/ssh": "workspace:*",
-    "@t3tools/tailscale": "workspace:*",
     "@types/node": "catalog:",
-    "effect-acp": "workspace:*",
     "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"

apps/desktop/src/backend/DesktopServerExposure.ts

@@ -3,7 +3,7 @@ import * as NodeOS from "node:os";
 import {
   createAdvertisedEndpoint,
   type CreateAdvertisedEndpointInput,
-} from "@t3tools/client-runtime";
+} from "@t3tools/shared/advertisedEndpoint";
 import type {
   AdvertisedEndpoint,
   AdvertisedEndpointProvider,

apps/desktop/src/backend/tailscaleEndpointProvider.ts

@@ -1,4 +1,4 @@
-import { createAdvertisedEndpoint } from "@t3tools/client-runtime";
+import { createAdvertisedEndpoint } from "@t3tools/shared/advertisedEndpoint";
 import type { AdvertisedEndpoint, AdvertisedEndpointProvider } from "@t3tools/contracts";
 import {
   buildTailscaleHttpsBaseUrl,

apps/desktop/tsdown.config.ts

@@ -12,7 +12,7 @@ export default defineConfig([
     ...shared,
     entry: ["src/main.ts"],
     clean: true,
-    noExternal: (id) => id.startsWith("@t3tools/") || id.startsWith("effect-acp"),
+    noExternal: (id) => id.startsWith("@t3tools/"),
   },
   {
     ...shared,

apps/server/package.json

@@ -20,13 +20,13 @@
     "build:bundle": "tsdown",
     "start": "node dist/bin.mjs",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:process-reaper": "vitest run src/server.test.ts src/provider/Layers/ClaudeAdapter.test.ts src/provider/Layers/ProviderSessionDirectory.test.ts src/provider/Layers/ProviderSessionReaper.test.ts src/provider/Layers/CodexAdapter.test.ts"
+    "test": "vitest run"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.111",
     "@effect/platform-bun": "catalog:",
     "@effect/platform-node": "catalog:",
+    "@effect/platform-node-shared": "catalog:",
     "@effect/sql-sqlite-bun": "catalog:",
     "@opencode-ai/sdk": "^1.3.15",
     "@pierre/diffs": "catalog:",

apps/server/tsdown.config.ts

@@ -1,15 +1,13 @@
 import { defineConfig } from "tsdown";
 
+const internalPackagePrefixes = ["@t3tools/", "effect-acp", "effect-codex-app-server"];
+
 export default defineConfig({
   entry: ["src/bin.ts"],
-  format: ["esm", "cjs"],
-  checks: {
-    legacyCjs: false,
-  },
   outDir: "dist",
   sourcemap: true,
   clean: true,
-  noExternal: (id) => id.startsWith("@t3tools/") || id.startsWith("effect-acp"),
+  noExternal: (id) => internalPackagePrefixes.some((prefix) => id.startsWith(prefix)),
   inlineOnly: false,
   banner: {
     js: "#!/usr/bin/env node\n",

bun.lock

@@ -1,6 +1,5 @@
 {
   "name": "@t3tools/client-runtime",
-  "version": "0.0.0-alpha.1",
   "private": true,
   "type": "module",
   "exports": {
@@ -15,6 +14,7 @@
   },
   "dependencies": {
     "@t3tools/contracts": "workspace:*",
+    "@t3tools/shared": "workspace:*",
     "effect": "catalog:"
   },
   "devDependencies": {

packages/client-runtime/package.json

@@ -1,78 +1 @@
-import type {
-  AdvertisedEndpoint,
-  AdvertisedEndpointHostedHttpsCompatibility,
-  AdvertisedEndpointProvider,
-  AdvertisedEndpointReachability,
-  AdvertisedEndpointSource,
-  AdvertisedEndpointStatus,
-} from "@t3tools/contracts";
-
-export interface CreateAdvertisedEndpointInput {
-  readonly id: string;
-  readonly label: string;
-  readonly provider: AdvertisedEndpointProvider;
-  readonly httpBaseUrl: string;
-  readonly reachability: AdvertisedEndpointReachability;
-  readonly hostedHttpsCompatibility?: AdvertisedEndpointHostedHttpsCompatibility;
-  readonly desktopCompatibility?: "compatible" | "unknown";
-  readonly source: AdvertisedEndpointSource;
-  readonly status?: AdvertisedEndpointStatus;
-  readonly isDefault?: boolean;
-  readonly description?: string;
-}
-
-export function normalizeHttpBaseUrl(rawValue: string): string {
-  const url = new URL(rawValue);
-  if (url.protocol === "ws:") {
-    url.protocol = "http:";
-  } else if (url.protocol === "wss:") {
-    url.protocol = "https:";
-  }
-
-  if (url.protocol !== "http:" && url.protocol !== "https:") {
-    throw new Error(`Endpoint must use HTTP or HTTPS. Received ${url.protocol}`);
-  }
-
-  url.pathname = "/";
-  url.search = "";
-  url.hash = "";
-  return url.toString();
-}
-
-export function deriveWsBaseUrl(httpBaseUrl: string): string {
-  const url = new URL(normalizeHttpBaseUrl(httpBaseUrl));
-  url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
-  return url.toString();
-}
-
-export function classifyHostedHttpsCompatibility(
-  httpBaseUrl: string,
-  fallback: AdvertisedEndpointHostedHttpsCompatibility = "unknown",
-): AdvertisedEndpointHostedHttpsCompatibility {
-  const url = new URL(normalizeHttpBaseUrl(httpBaseUrl));
-  if (url.protocol === "http:") {
-    return "mixed-content-blocked";
-  }
-  return fallback === "mixed-content-blocked" ? "unknown" : fallback;
-}
-
-export function createAdvertisedEndpoint(input: CreateAdvertisedEndpointInput): AdvertisedEndpoint {
-  const httpBaseUrl = normalizeHttpBaseUrl(input.httpBaseUrl);
-  return {
-    id: input.id,
-    label: input.label,
-    provider: input.provider,
-    httpBaseUrl,
-    wsBaseUrl: deriveWsBaseUrl(httpBaseUrl),
-    reachability: input.reachability,
-    compatibility: {
-      hostedHttpsApp:
-        input.hostedHttpsCompatibility ?? classifyHostedHttpsCompatibility(httpBaseUrl),
-      desktopApp: input.desktopCompatibility ?? "compatible",
-    },
-    source: input.source,
-    status: input.status ?? "available",
-    ...(input.isDefault === undefined ? {} : { isDefault: input.isDefault }),
-    ...(input.description === undefined ? {} : { description: input.description }),
-  };
-}
+export * from "@t3tools/shared/advertisedEndpoint";

packages/client-runtime/src/advertisedEndpoint.ts

@@ -6,24 +6,17 @@
     "dist"
   ],
   "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./src/index.ts",
   "exports": {
-    "./settings": {
-      "types": "./src/settings.ts",
-      "import": "./src/settings.ts",
-      "require": "./src/settings.ts"
-    },
     ".": {
       "types": "./src/index.ts",
-      "import": "./src/index.ts",
-      "require": "./dist/index.cjs"
+      "import": "./src/index.ts"
+    },
+    "./settings": {
+      "types": "./src/settings.ts",
+      "import": "./src/settings.ts"
     }
   },
   "scripts": {
-    "dev": "tsdown src/index.ts --format esm,cjs --dts --watch --clean",
-    "build": "tsdown src/index.ts --format esm,cjs --dts --clean",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   },
@@ -33,7 +26,6 @@
   "devDependencies": {
     "@effect/language-service": "catalog:",
     "@effect/vitest": "catalog:",
-    "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"
   }