Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Simplify workspace package builds and deps (#2676)

Julius Marmingef92e1e1b06ec
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 24bb96dde..0099f9df7 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -16,6 +16,10 @@
},
"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"
@@ -23,13 +27,7 @@
"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:"
diff --git a/apps/desktop/src/backend/DesktopServerExposure.ts b/apps/desktop/src/backend/DesktopServerExposure.ts
index b83355368..bd0939a77 100644
--- a/apps/desktop/src/backend/DesktopServerExposure.ts
+++ b/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,
diff --git a/apps/desktop/src/backend/tailscaleEndpointProvider.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.ts
index d066f18b9..bd46e9f03 100644
--- a/apps/desktop/src/backend/tailscaleEndpointProvider.ts
+++ b/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,
diff --git a/apps/desktop/tsdown.config.ts b/apps/desktop/tsdown.config.ts
index 74067b127..53b003934 100644
--- a/apps/desktop/tsdown.config.ts
+++ b/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,
diff --git a/apps/server/package.json b/apps/server/package.json
index 304242a1f..8d813de54 100644
--- a/apps/server/package.json
+++ b/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:",
diff --git a/apps/server/tsdown.config.ts b/apps/server/tsdown.config.ts
index 184909f0e..8f1cfc213 100644
--- a/apps/server/tsdown.config.ts
+++ b/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",
diff --git a/bun.lock b/bun.lock
index f3ca61fda..476c50c00 100644
--- a/bun.lock
+++ b/bun.lock
@@ -20,6 +20,10 @@
"version": "0.0.23",
"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",
@@ -27,13 +31,7 @@
"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:",
@@ -60,6 +58,7 @@
"@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:",
@@ -153,7 +152,6 @@
},
"packages/client-runtime": {
"name": "@t3tools/client-runtime",
- "version": "0.0.0-alpha.1",
"dependencies": {
"@t3tools/contracts": "workspace:*",
"effect": "catalog:",
@@ -173,7 +171,6 @@
"devDependencies": {
"@effect/language-service": "catalog:",
"@effect/vitest": "catalog:",
- "tsdown": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:",
},
@@ -188,7 +185,6 @@
"@effect/openapi-generator": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/vitest": "catalog:",
- "tsdown": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:",
},
@@ -203,14 +199,12 @@
"@effect/openapi-generator": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/vitest": "catalog:",
- "tsdown": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:",
},
},
"packages/shared": {
"name": "@t3tools/shared",
- "version": "0.0.0-alpha.1",
"dependencies": {
"@t3tools/contracts": "workspace:*",
"effect": "catalog:",
@@ -226,7 +220,6 @@
},
"packages/ssh": {
"name": "@t3tools/ssh",
- "version": "0.0.0-alpha.1",
"dependencies": {
"@t3tools/contracts": "workspace:*",
"@t3tools/shared": "workspace:*",
@@ -243,7 +236,6 @@
},
"packages/tailscale": {
"name": "@t3tools/tailscale",
- "version": "0.0.0-alpha.1",
"dependencies": {
"@effect/platform-node": "catalog:",
"effect": "catalog:",
diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json
index d0da49212..58bc576a2 100644
--- a/packages/client-runtime/package.json
+++ b/packages/client-runtime/package.json
@@ -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": {
diff --git a/packages/client-runtime/src/advertisedEndpoint.ts b/packages/client-runtime/src/advertisedEndpoint.ts
index 314d8272c..da7d766fa 100644
--- a/packages/client-runtime/src/advertisedEndpoint.ts
+++ b/packages/client-runtime/src/advertisedEndpoint.ts
@@ -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";
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 97b77a234..8d3ed2188 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -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:"
}
diff --git a/packages/effect-acp/package.json b/packages/effect-acp/package.json
index 1edd88775..c6233cb42 100644
--- a/packages/effect-acp/package.json
+++ b/packages/effect-acp/package.json
@@ -33,8 +33,6 @@
}
},
"scripts": {
- "dev": "tsdown src/client.ts src/agent.ts src/_generated/schema.gen.ts src/rpc.ts src/protocol.ts src/terminal.ts --format esm,cjs --dts --watch --clean",
- "build": "tsdown src/client.ts src/agent.ts src/_generated/schema.gen.ts src/rpc.ts src/protocol.ts src/terminal.ts --format esm,cjs --dts --clean",
"typecheck": "tsc --noEmit",
"test": "vitest run",
"generate": "bun run scripts/generate.ts"
@@ -47,7 +45,6 @@
"@effect/openapi-generator": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/vitest": "catalog:",
- "tsdown": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:"
}
diff --git a/packages/effect-codex-app-server/package.json b/packages/effect-codex-app-server/package.json
index 3d69c18f8..fb2df2444 100644
--- a/packages/effect-codex-app-server/package.json
+++ b/packages/effect-codex-app-server/package.json
@@ -25,8 +25,6 @@
}
},
"scripts": {
- "dev": "tsdown src/client.ts src/rpc.ts src/protocol.ts src/schema.ts --format esm,cjs --dts --watch --clean",
- "build": "tsdown src/client.ts src/rpc.ts src/protocol.ts src/schema.ts --format esm,cjs --dts --clean",
"typecheck": "tsc --noEmit",
"test": "vitest run",
"generate": "bun run scripts/generate.ts",
@@ -40,7 +38,6 @@
"@effect/openapi-generator": "catalog:",
"@effect/platform-node": "catalog:",
"@effect/vitest": "catalog:",
- "tsdown": "catalog:",
"typescript": "catalog:",
"vitest": "catalog:"
}
diff --git a/packages/shared/package.json b/packages/shared/package.json
index c499bf3c6..c27a95ea9 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,5 @@
{
"name": "@t3tools/shared",
- "version": "0.0.0-alpha.1",
"private": true,
"type": "module",
"exports": {
@@ -8,6 +7,10 @@
"types": "./src/model.ts",
"import": "./src/model.ts"
},
+ "./advertisedEndpoint": {
+ "types": "./src/advertisedEndpoint.ts",
+ "import": "./src/advertisedEndpoint.ts"
+ },
"./git": {
"types": "./src/git.ts",
"import": "./src/git.ts"
diff --git a/packages/shared/src/advertisedEndpoint.ts b/packages/shared/src/advertisedEndpoint.ts
new file mode 100644
index 000000000..314d8272c
--- /dev/null
+++ b/packages/shared/src/advertisedEndpoint.ts
@@ -0,0 +1,78 @@
+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 }),
+ };
+}
diff --git a/packages/ssh/package.json b/packages/ssh/package.json
index dd66e3288..a3df6fea2 100644
--- a/packages/ssh/package.json
+++ b/packages/ssh/package.json
@@ -1,6 +1,5 @@
{
"name": "@t3tools/ssh",
- "version": "0.0.0-alpha.1",
"private": true,
"type": "module",
"exports": {
diff --git a/packages/tailscale/package.json b/packages/tailscale/package.json
index c046851fb..85fdde36e 100644
--- a/packages/tailscale/package.json
+++ b/packages/tailscale/package.json
@@ -1,6 +1,5 @@
{
"name": "@t3tools/tailscale",
- "version": "0.0.0-alpha.1",
"private": true,
"type": "module",
"exports": {