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 desktop server exposure logic into backend (#2591)
Julius Marminge9d919d0bb8d6
diff --git a/apps/desktop/src/app/DesktopApp.ts b/apps/desktop/src/app/DesktopApp.tsindex e13ae08d5..b98175529 100644--- a/apps/desktop/src/app/DesktopApp.ts+++ b/apps/desktop/src/app/DesktopApp.ts@@ -16,7 +16,7 @@ import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts";import * as DesktopEnvironment from "./DesktopEnvironment.ts";import * as DesktopLifecycle from "./DesktopLifecycle.ts";import * as DesktopObservability from "./DesktopObservability.ts";-import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts";import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts";import * as DesktopState from "./DesktopState.ts";diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.test.tsindex de336ffb8..96e56a87c 100644--- a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts+++ b/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts@@ -8,7 +8,7 @@ import * as Schema from "effect/Schema";import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts";import * as DesktopConfig from "../app/DesktopConfig.ts";-import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "./DesktopServerExposure.ts";const PersistedServerObservabilitySettingsDocument = Schema.Struct({observability: Schema.Struct({diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.tsindex 45103bee9..42e4ada43 100644--- a/apps/desktop/src/backend/DesktopBackendConfiguration.ts+++ b/apps/desktop/src/backend/DesktopBackendConfiguration.ts@@ -10,7 +10,7 @@ import * as Ref from "effect/Ref";import * as DesktopBackendManager from "./DesktopBackendManager.ts";import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";import * as DesktopObservability from "../app/DesktopObservability.ts";-import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "./DesktopServerExposure.ts";export interface DesktopBackendConfigurationShape {readonly resolve: Effect.Effect<DesktopBackendManager.DesktopBackendStartConfig>;diff --git a/apps/desktop/src/serverExposure/DesktopServerExposure.test.ts b/apps/desktop/src/backend/DesktopServerExposure.test.tssimilarity index 100%rename from apps/desktop/src/serverExposure/DesktopServerExposure.test.tsrename to apps/desktop/src/backend/DesktopServerExposure.test.tsdiff --git a/apps/desktop/src/serverExposure/DesktopServerExposure.ts b/apps/desktop/src/backend/DesktopServerExposure.tssimilarity index 100%rename from apps/desktop/src/serverExposure/DesktopServerExposure.tsrename to apps/desktop/src/backend/DesktopServerExposure.tsdiff --git a/apps/desktop/src/serverExposure/tailscaleEndpointProvider.test.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.test.tssimilarity index 100%rename from apps/desktop/src/serverExposure/tailscaleEndpointProvider.test.tsrename to apps/desktop/src/backend/tailscaleEndpointProvider.test.tsdiff --git a/apps/desktop/src/serverExposure/tailscaleEndpointProvider.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.tssimilarity index 100%rename from apps/desktop/src/serverExposure/tailscaleEndpointProvider.tsrename to apps/desktop/src/backend/tailscaleEndpointProvider.tsdiff --git a/apps/desktop/src/ipc/methods/serverExposure.ts b/apps/desktop/src/ipc/methods/serverExposure.tsindex 2bbb08c3f..cd0f215e1 100644--- a/apps/desktop/src/ipc/methods/serverExposure.ts+++ b/apps/desktop/src/ipc/methods/serverExposure.ts@@ -7,7 +7,7 @@ import * as Effect from "effect/Effect";import * as Schema from "effect/Schema";import * as DesktopLifecycle from "../../app/DesktopLifecycle.ts";-import * as DesktopServerExposure from "../../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "../../backend/DesktopServerExposure.ts";import * as IpcChannels from "../channels.ts";import { makeIpcMethod } from "../DesktopIpc.ts";diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.tsindex 576c40ddd..f71ff1fbe 100644--- a/apps/desktop/src/main.ts+++ b/apps/desktop/src/main.ts@@ -32,7 +32,7 @@ import * as DesktopBackendManager from "./backend/DesktopBackendManager.ts";import * as DesktopEnvironment from "./app/DesktopEnvironment.ts";import * as DesktopLifecycle from "./app/DesktopLifecycle.ts";import * as DesktopObservability from "./app/DesktopObservability.ts";-import * as DesktopServerExposure from "./serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "./backend/DesktopServerExposure.ts";import * as DesktopClientSettings from "./settings/DesktopClientSettings.ts";import * as DesktopSavedEnvironments from "./settings/DesktopSavedEnvironments.ts";import * as DesktopAppSettings from "./settings/DesktopAppSettings.ts";diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.tsindex e53a02f53..fbcc60934 100644--- a/apps/desktop/src/window/DesktopWindow.test.ts+++ b/apps/desktop/src/window/DesktopWindow.test.ts@@ -16,7 +16,7 @@ import * as ElectronMenu from "../electron/ElectronMenu.ts";import * as ElectronShell from "../electron/ElectronShell.ts";import * as ElectronTheme from "../electron/ElectronTheme.ts";import * as ElectronWindow from "../electron/ElectronWindow.ts";-import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts";import * as DesktopWindow from "./DesktopWindow.ts";const environmentInput = {diff --git a/apps/desktop/src/window/DesktopWindow.ts b/apps/desktop/src/window/DesktopWindow.tsindex 2cf69ae8b..8ebd1041c 100644--- a/apps/desktop/src/window/DesktopWindow.ts+++ b/apps/desktop/src/window/DesktopWindow.ts@@ -16,7 +16,7 @@ import * as ElectronShell from "../electron/ElectronShell.ts";import * as ElectronTheme from "../electron/ElectronTheme.ts";import * as ElectronWindow from "../electron/ElectronWindow.ts";import * as IpcChannels from "../ipc/channels.ts";-import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts";+import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts";const TITLEBAR_HEIGHT = 40;const TITLEBAR_COLOR = "#01000000"; // #00000000 does not work correctly on Linux