fix: honor provider environment homes

t3-code[bot] committed 2 months ago

Commit 42d46691 parent 29ab4d43 files · +35 −11Browse files

Unified · Split

3 files

apps/server/src/usage/UsageService.test.ts +22 −3
apps/server/src/usage/UsageService.ts +10 −2
apps/web/src/components/usage/UsagePage.tsx +3 −6

apps/server/src/usage/UsageService.test.ts+22−3

@@ -1,5 +1,10 @@
1	import * as NodeServices from "@effect/platform-node/NodeServices";	1	import * as NodeServices from "@effect/platform-node/NodeServices";
2	import { ProviderDriverKind, ProviderInstanceId, type UsageDay } from "@t3tools/contracts";	2	import {
		3	ProviderDriverKind,
		4	ProviderInstanceEnvironmentVariableName,
		5	ProviderInstanceId,
		6	type UsageDay,
		7	} from "@t3tools/contracts";
3	import { expect, it } from "@effect/vitest";	8	import { expect, it } from "@effect/vitest";
4	import * as Effect from "effect/Effect";	9	import * as Effect from "effect/Effect";
5	import * as Layer from "effect/Layer";	10	import * as Layer from "effect/Layer";
@@ -85,12 +90,26 @@ it.layer(NodeServices.layer)("UsageService", (it) => { · 79 unmodified lines
85	[ProviderInstanceId.make("codex-work")]: {	90	[ProviderInstanceId.make("codex-work")]: {
86	driver: ProviderDriverKind.make("codex"),	91	driver: ProviderDriverKind.make("codex"),
87	enabled: true,	92	enabled: true,
88	config: { homePath: "/virtual/codex-work" },	93	config: {},
		94	environment: [
		95	{
		96	name: ProviderInstanceEnvironmentVariableName.make("CODEX_HOME"),
		97	value: "/virtual/codex-work",
		98	sensitive: false,
		99	},
		100	],
89	},	101	},
90	[ProviderInstanceId.make("codex-work-copy")]: {	102	[ProviderInstanceId.make("codex-work-copy")]: {
91	driver: ProviderDriverKind.make("codex"),	103	driver: ProviderDriverKind.make("codex"),
92	enabled: true,	104	enabled: true,
93	config: { homePath: "/virtual/codex-work" },	105	config: {},
		106	environment: [
		107	{
		108	name: ProviderInstanceEnvironmentVariableName.make("CODEX_HOME"),
		109	value: "/virtual/codex-work",
		110	sensitive: false,
		111	},
		112	],
94	},	113	},
95	},	114	},
96	}),	115	}),

apps/server/src/usage/UsageService.ts+10−2

 import * as ServerSettings from "../serverSettings.ts";
 import { resolveClaudeHomePath } from "../provider/Drivers/ClaudeHome.ts";
 import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
+import { mergeProviderInstanceEnvironment } from "../provider/ProviderInstanceEnvironment.ts";
 import { UsageAggregator } from "./usageAggregation.ts";
 import { parseRateTable, type RateTable } from "./usagePricing.ts";
 import {
     )) {
       const config = decodeClaudeSettings(instance.config ?? {});
       if (Option.isNone(config)) continue;
-      const claudeHome = yield* resolveClaudeHomePath(config.value);
+      const processEnv = mergeProviderInstanceEnvironment(instance.environment);
+      const claudeHome = yield* resolveClaudeHomePath({
+        homePath: config.value.homePath || processEnv.CLAUDE_CONFIG_DIR || "",
+      });
       addDir("claude", yield* resolveClaudeTranscriptDir(claudeHome));
     }
     )) {
       const config = decodeCodexSettings(instance.config ?? {});
       if (Option.isNone(config)) continue;
-      const codexLayout = yield* resolveCodexHomeLayout(config.value);
+      const processEnv = mergeProviderInstanceEnvironment(instance.environment);
+      const codexLayout = yield* resolveCodexHomeLayout({
+        ...config.value,
+        homePath: config.value.homePath || processEnv.CODEX_HOME || "",
+      });
       addDir("codex", path.join(codexLayout.sharedHomePath, "sessions"));
     }
     return dirs;

apps/web/src/components/usage/UsagePage.tsx+3−6

     }
     return PROVIDER_ORDER.filter((provider) => enabled.has(provider));
   }, [environments, merged.staleEnvironments]);
-  const skeletonProviders = environments.some((environment) => environment.summary !== null)
-    ? providers
-    : PROVIDER_ORDER;
   // Hold the content until every environment is terminal. Rendering merged
   // totals while devices are still answering makes every number on the page
             {settling ? (
               <>
                 {environments.length > 1 ? <UsageDeviceStrip environments={environments} /> : null}
-                <UsageSkeleton providers={skeletonProviders} />
+                <UsageSkeleton />
               </>
             ) : (
               <>
  * Static stand-in with the loaded page's shape. No shimmer; blocks fill in
  * exactly once when the last device answers.
  */
-function UsageSkeleton({ providers }: { readonly providers: readonly UsageProviderKind[] }) {
+function UsageSkeleton() {
   return (
     <>
       <section className="grid gap-6 lg:grid-cols-[minmax(0,16rem)_minmax(0,1fr)]">
             <div className="h-10 w-36 rounded-sm bg-muted" />
             <div className="h-4 w-32 rounded-sm bg-muted" />
           </div>
-          {providers.map((provider) => (
+          {PROVIDER_ORDER.map((provider) => (
             <div key={provider} className="flex flex-col gap-1">
               <div className="flex min-h-5 items-center justify-between gap-4">
                 <span className="flex items-center gap-2">

fix: honor provider environment homes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code