@devries-cameron20 / t3code Mirror · read-only / commits / e304dab94b
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 21:00 UTC

fix(server): t3 theme updates a dev server running in the default home (#34700)

Julius Marminge committed Nov 11, 2026 at 18:54 UTC e304dab94b4672fcc41a402532a600cf107305eb
2 files changed +54 -1
apps/server/src/cli/theme.test.ts
+35
@@ -7,6 +7,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7 import * as NodeServices from "@effect/platform-node/NodeServices";
8 import * as NetService from "@t3tools/shared/Net";
9 import { assert, describe, it } from "@effect/vitest";
10 +import * as ConfigProvider from "effect/ConfigProvider";
11 import * as Effect from "effect/Effect";
12 import * as Layer from "effect/Layer";
13 import * as TestConsole from "effect/testing/TestConsole";
@@ -80,6 +81,40 @@ describe("t3 theme", () => {
81 }),
82 );
83
84 + it.effect("sets the theme of a dev server running in the default home", () =>
85 + Effect.gen(function* () {
86 + const home = makeBaseDir();
87 + const devStateDir = NodePath.join(home, ".t3", "dev");
88 + NodeFS.mkdirSync(devStateDir, { recursive: true });
89 + NodeFS.writeFileSync(
90 + NodePath.join(devStateDir, "server-runtime.json"),
91 + `${JSON.stringify({
92 + version: 1,
93 + pid: process.pid,
94 + port: 4888,
95 + origin: "http://127.0.0.1:4888",
96 + devUrl: "http://127.0.0.1:5999",
97 + startedAt: "1970-01-01T00:00:00.000Z",
98 + })}\n`,
99 + );
100 +
101 + const result = yield* runCli(["theme", "set", "ocean"]).pipe(
102 + Effect.provideService(HostProcess.HomeDirectory, home),
103 + Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }))),
104 + Effect.result,
105 + );
106 +
107 + assert.equal(
108 + NodeFS.existsSync(NodePath.join(home, ".t3", "userdata", "settings.json")),
109 + false,
110 + );
111 + if (result._tag === "Success") {
112 + const devSettings = NodePath.join(devStateDir, "settings.json");
113 + assert.equal(JSON.parse(NodeFS.readFileSync(devSettings, "utf8")).defaultTheme, "ocean");
114 + }
115 + }),
116 + );
117 +
118 it.effect("publishes a theme file under its filename and sets it", () =>
119 Effect.gen(function* () {
120 const baseDir = makeBaseDir();
apps/server/src/cli/theme.ts
+19 -1
@@ -28,6 +28,7 @@ import {
28 readThemeFileGuarded,
29 } from "../environmentTheme.ts";
30 import { expandHomePath, resolveBaseDir } from "../os-jank.ts";
31 +import { isProcessAlive, readPersistedServerRuntimeState } from "../serverRuntimeState.ts";
32 import { baseDirFlag } from "./config.ts";
33
34 const SparseSettings = Schema.Record(Schema.String, Schema.Unknown);
@@ -159,14 +160,31 @@ export class ThemeTargetMissingError extends Schema.TaggedError<ThemeTargetMissi
160 }
161
162 const envT3Home = Config.String("T3CODE_HOME").pipe(Config.option);
163 +const DEV_STATE_PLACEHOLDER_URL = new URL("http://localhost");
164 +
165 +const hasLiveServer = (statePath: string) =>
166 + readPersistedServerRuntimeState(statePath).pipe(
167 + Effect.map((state) => Option.isSome(state) && isProcessAlive(state.value.pid)),
168 + Effect.orElseSucceed(() => false),
169 + );
170
171 const resolveThemePaths = Effect.fn(function* (explicitBaseDir: Option.Option<string>) {
172 const envHome = Option.filter(yield* envT3Home, (value) => value.trim().length > 0);
173 const configuredBaseDir = Option.orElse(explicitBaseDir, () => envHome);
174 const baseDir = yield* resolveBaseDir(Option.getOrUndefined(configuredBaseDir));
167 - const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined, {
175 + const userdataPaths = yield* ServerConfig.deriveServerPaths(baseDir, undefined, {
176 baseDirIsExplicit: Option.isSome(configuredBaseDir),
177 });
178 + // A dev server with an implicit home keeps its state in `dev`; follow it unless a
179 + // `userdata` server is running too, the same order `t3 pair` checks.
180 + let derivedPaths = userdataPaths;
181 + if (
182 + Option.isNone(configuredBaseDir) &&
183 + !(yield* hasLiveServer(userdataPaths.serverRuntimeStatePath))
184 + ) {
185 + const devPaths = yield* ServerConfig.deriveServerPaths(baseDir, DEV_STATE_PLACEHOLDER_URL);
186 + if (yield* hasLiveServer(devPaths.serverRuntimeStatePath)) derivedPaths = devPaths;
187 + }
188 return {
189 settingsPath: derivedPaths.settingsPath,
190 themesDir: derivedPaths.environmentThemesDir,