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.
Move toolbar below chat input, fix electron preload bundling, and update build configs
Julius Marminged6437a7e131a
diff --git a/README.md b/README.mdindex 1f18c9d30..93f955361 100644--- a/README.md+++ b/README.md@@ -59,8 +59,8 @@ npx t3## Scripts-- `bun run dev` — Starts contracts, server, and web dev tasks via Turborepo's parallel task runner.-- `bun run dev:server` — Starts just the WebSocket server (uses tsx for TS execution).+- `bun run dev` — Starts contracts, server, and web in `turbo watch` mode.+- `bun run dev:server` — Starts just the WebSocket server (uses Bun TypeScript execution).- `bun run dev:web` — Starts just the Vite dev server for the web app.- `bun run start` — Runs the production server (serves built web app as static files).- `bun run build` — Builds contracts, web app, and server through Turbo.diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex 3b4fd30f9..d6afd21ce 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -8,7 +8,7 @@"dev:bundle": "tsdown --watch","dev:electron": "bun run scripts/dev-electron.mjs","build": "tsdown",- "start": "electron dist-electron/main.cjs",+ "start": "electron dist-electron/main.js","typecheck": "tsc --noEmit","test": "vitest run --passWithNoTests","smoke-test": "node scripts/smoke-test.mjs"diff --git a/apps/desktop/scripts/dev-electron.mjs b/apps/desktop/scripts/dev-electron.mjsindex 0c49d1e58..2a6153a7d 100644--- a/apps/desktop/scripts/dev-electron.mjs+++ b/apps/desktop/scripts/dev-electron.mjs@@ -10,7 +10,7 @@ await waitOn({`tcp:${port}`,"file:dist-electron/main.js","file:dist-electron/preload.js",- "file:../server/dist/index.js",+ // "file:../server/dist/index.cjs",],});diff --git a/apps/desktop/scripts/smoke-test.mjs b/apps/desktop/scripts/smoke-test.mjsindex 895d18b8b..883da7203 100644--- a/apps/desktop/scripts/smoke-test.mjs+++ b/apps/desktop/scripts/smoke-test.mjs@@ -1,16 +1,12 @@-import { execSync, spawn } from "node:child_process";+import { spawn } from "node:child_process";import { dirname, resolve } from "node:path";import { fileURLToPath } from "node:url";const __dirname = dirname(fileURLToPath(import.meta.url));const desktopDir = resolve(__dirname, "..");-const rootDir = resolve(__dirname, "../../..");const electronBin = resolve(desktopDir, "node_modules/.bin/electron");const mainJs = resolve(desktopDir, "dist-electron/main.js");-console.log("Building contracts + web + server + desktop...");-execSync("bun run build", { cwd: rootDir, stdio: "inherit" });-console.log("\nLaunching Electron smoke test...");const child = spawn(electronBin, [mainJs], {diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.tsindex 3161a2e9d..66e4b8a33 100644--- a/apps/desktop/src/main.ts+++ b/apps/desktop/src/main.ts@@ -13,7 +13,7 @@ fixPath();const PICK_FOLDER_CHANNEL = "desktop:pick-folder";const ROOT_DIR = path.resolve(__dirname, "../../..");-const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.js");+const BACKEND_ENTRY = path.join(ROOT_DIR, "apps/server/dist/index.mjs");const WEB_ENTRY = path.join(ROOT_DIR, "apps/web/dist/index.html");const STATE_DIR = path.join(os.homedir(), ".t3", "userdata");const isDevelopment = Boolean(process.env.VITE_DEV_SERVER_URL);diff --git a/apps/desktop/tsdown.config.ts b/apps/desktop/tsdown.config.tsindex f87ac594d..4cffbb258 100644--- a/apps/desktop/tsdown.config.ts+++ b/apps/desktop/tsdown.config.ts@@ -1,10 +1,21 @@-import { defineConfig } from "tsup";+import { defineConfig } from "tsdown";-export default defineConfig({- entry: ["src/main.ts", "src/preload.ts"],- format: "cjs",+const shared = {+ format: "cjs" as const,outDir: "dist-electron",sourcemap: true,- clean: true,- noExternal: ["@t3tools/contracts"],-});+ outExtensions: () => ({ js: ".js" }),+};++export default defineConfig([+ {+ ...shared,+ entry: ["src/main.ts"],+ clean: true,+ noExternal: ["@t3tools/contracts"],+ },+ {+ ...shared,+ entry: ["src/preload.ts"],+ },+]);diff --git a/apps/desktop/turbo.jsonc b/apps/desktop/turbo.jsoncindex 843ebb0b2..0f8f5b4b8 100644--- a/apps/desktop/turbo.jsonc+++ b/apps/desktop/turbo.jsonc@@ -9,5 +9,15 @@"dev": {"persistent": true,},+ "start": {+ "dependsOn": ["build", "@t3tools/web#build", "t3#build"],+ "cache": false,+ "persistent": true,+ },+ "smoke-test": {+ "dependsOn": ["build", "@t3tools/web#build", "t3#build"],+ "cache": false,+ "outputs": [],+ },},}diff --git a/apps/server/package.json b/apps/server/package.jsonindex f26426cff..7ed3d1614 100644--- a/apps/server/package.json+++ b/apps/server/package.json@@ -2,17 +2,17 @@"name": "t3","version": "0.1.0","bin": {- "t3": "./dist/index.js"+ "t3": "./dist/index.mjs"},"files": ["dist"],"type": "module",- "main": "./dist/index.js",+ "main": "./dist/index.mjs","scripts": {- "dev": "VITE_DEV_SERVER_URL=http://localhost:5173 tsx src/index.ts",+ "dev": "VITE_DEV_SERVER_URL=http://localhost:5173 bun run src/index.ts","build": "tsdown && node scripts/bundle-client.mjs",- "start": "node dist/index.js",+ "start": "node dist/index.mjs","typecheck": "tsc --noEmit","test": "vitest run"},@@ -26,7 +26,6 @@"@types/node": "^22.10.2","@types/ws": "^8.5.13","tsdown": "^0.20.3",- "tsx": "^4.19.0","typescript": "^5.7.3"}}diff --git a/apps/server/tsdown.config.ts b/apps/server/tsdown.config.tsindex 6708d8e27..e5cd33b05 100644--- a/apps/server/tsdown.config.ts+++ b/apps/server/tsdown.config.ts@@ -2,12 +2,12 @@ import { defineConfig } from "tsup";export default defineConfig({entry: ["src/index.ts"],- format: "esm",+ format: ["esm", "cjs"],outDir: "dist",sourcemap: true,clean: true,noExternal: ["@t3tools/contracts"],banner: {- js: '#!/usr/bin/env node\n',+ js: "#!/usr/bin/env node\n",},});diff --git a/apps/server/turbo.jsonc b/apps/server/turbo.jsoncnew file mode 100644index 000000000..348412533--- /dev/null+++ b/apps/server/turbo.jsonc@@ -0,0 +1,16 @@+{+ "$schema": "https://turbo.build/schema.json",+ "extends": ["//"],+ "tasks": {+ "dev": {+ "dependsOn": ["@t3tools/contracts#dev"],+ "persistent": true,+ "interruptible": true+ },+ "start": {+ "dependsOn": ["build"],+ "cache": false,+ "persistent": true+ }+ }+}diff --git a/apps/web/turbo.jsonc b/apps/web/turbo.jsoncnew file mode 100644index 000000000..619cc63b3--- /dev/null+++ b/apps/web/turbo.jsonc@@ -0,0 +1,9 @@+{+ "$schema": "https://turbo.build/schema.json",+ "extends": ["//"],+ "tasks": {+ "dev": {+ "persistent": true+ }+ }+}diff --git a/bun.lock b/bun.lockindex 5785a3f14..49f27c421 100644--- a/bun.lock+++ b/bun.lock@@ -43,7 +43,6 @@"@types/node": "^22.10.2","@types/ws": "^8.5.13","tsdown": "^0.20.3",- "tsx": "^4.19.0","typescript": "^5.7.3",},},diff --git a/package.json b/package.jsonindex c592c9621..e41205a18 100644--- a/package.json+++ b/package.json@@ -6,20 +6,20 @@"packages/*"],"scripts": {- "dev": "T3CODE_LOG_WS_EVENTS=1 VITE_WS_URL=ws://localhost:3773 turbo run dev --ui=tui --filter=@t3tools/contracts --filter=@t3tools/web --filter=t3 --parallel",- "dev:server": "bun run build:contracts && bun run --cwd apps/server dev",- "dev:web": "VITE_WS_URL=ws://localhost:3773 bun run --cwd apps/web dev",+ "dev": "T3CODE_LOG_WS_EVENTS=1 VITE_WS_URL=ws://localhost:3773 turbo watch dev --ui=tui --filter=@t3tools/contracts --filter=@t3tools/web --filter=t3",+ "dev:server": "turbo watch dev --filter=t3",+ "dev:web": "VITE_WS_URL=ws://localhost:3773 turbo watch dev --filter=@t3tools/web","dev:desktop": "turbo watch dev --filter=@t3tools/desktop --filter=t3 --filter=@t3tools/web",- "start": "node apps/server/dist/index.js",- "start:desktop": "bun run --cwd apps/desktop start",+ "start": "turbo run start --filter=t3",+ "start:desktop": "turbo run start --filter=@t3tools/desktop","build": "turbo run build",- "build:desktop": "bun run build:contracts && bun run --cwd apps/web build && bun run --cwd apps/server build && bun run --cwd apps/desktop build",+ "build:desktop": "turbo run build --filter=@t3tools/desktop --filter=t3","typecheck": "turbo run typecheck","lint": "oxlint --report-unused-disable-directives","test": "turbo run test",- "test:desktop-smoke": "bun run --cwd apps/desktop smoke-test",+ "test:desktop-smoke": "turbo run smoke-test --filter=@t3tools/desktop","fmt": "oxfmt",- "build:contracts": "bun run --cwd packages/contracts build"+ "build:contracts": "turbo run build --filter=@t3tools/contracts"},"devDependencies": {"oxfmt": "^0.28.0",diff --git a/turbo.json b/turbo.jsonindex 6d0970bf9..d797982de 100644--- a/turbo.json+++ b/turbo.json@@ -18,9 +18,9 @@"outputs": ["dist/**", "dist-electron/**"]},"dev": {- "dependsOn": ["@t3tools/contracts#build"],+ "dependsOn": ["^dev"],"cache": false,- "persistent": true+ "persistent": false},"typecheck": {"dependsOn": ["^typecheck"],diff --git a/vitest.config.ts b/vitest.config.tsindex 8fb6f2dcf..b8c4e89a2 100644--- a/vitest.config.ts+++ b/vitest.config.ts@@ -1,3 +1,13 @@+import * as path from "node:path";import { defineConfig } from "vitest/config";-export default defineConfig({});+export default defineConfig({+ resolve: {+ alias: [+ {+ find: /^@t3tools\/contracts$/,+ replacement: path.resolve(import.meta.dirname, "./packages/contracts/src/index.ts"),+ },+ ],+ },+});