fix: stabilize env runtime services and panel scrolling

Author: BunsDev

apps/server/integration/OrchestrationEngineHarness.integration.ts

@@ -35,6 +35,7 @@ import { ProviderSessionRuntimeRepositoryLive } from "../src/persistence/Layers/
 import { makeSqlitePersistenceLive } from "../src/persistence/Layers/Sqlite.ts";
 import { ProjectionCheckpointRepository } from "../src/persistence/Services/ProjectionCheckpoints.ts";
 import { ProjectionPendingApprovalRepository } from "../src/persistence/Services/ProjectionPendingApprovals.ts";
+import { EnvironmentVariablesLive } from "../src/persistence/Services/EnvironmentVariables.ts";
 import { ProviderUnsupportedError } from "../src/provider/Errors.ts";
 import { ProviderAdapterRegistry } from "../src/provider/Services/ProviderAdapterRegistry.ts";
 import { ProviderSessionDirectoryLive } from "../src/provider/Layers/ProviderSessionDirectory.ts";
@@ -286,14 +287,15 @@ export const makeOrchestrationIntegrationHarness = (
         );
 
     const checkpointStoreLayer = CheckpointStoreLive.pipe(Layer.provide(GitCoreLive));
-    const runtimeServicesLayer = Layer.mergeAll(
-      orchestrationLayer,
-      OrchestrationProjectionSnapshotQueryLive,
-      ProjectionCheckpointRepositoryLive,
-      ProjectionPendingApprovalRepositoryLive,
-      checkpointStoreLayer,
-      providerLayer,
-      RuntimeReceiptBusLive,
+    const runtimeServicesLayer = Layer.empty.pipe(
+      Layer.provideMerge(EnvironmentVariablesLive),
+      Layer.provideMerge(OrchestrationProjectionSnapshotQueryLive),
+      Layer.provideMerge(orchestrationLayer),
+      Layer.provideMerge(ProjectionCheckpointRepositoryLive),
+      Layer.provideMerge(ProjectionPendingApprovalRepositoryLive),
+      Layer.provideMerge(checkpointStoreLayer),
+      Layer.provideMerge(providerLayer),
+      Layer.provideMerge(RuntimeReceiptBusLive),
     );
     const runtimeIngestionLayer = ProviderRuntimeIngestionLive.pipe(
       Layer.provideMerge(runtimeServicesLayer),

apps/server/src/codexAppServerManager.ts

@@ -20,7 +20,7 @@ import {
   ProviderInteractionMode,
 } from "@okcode/contracts";
 import { normalizeModelSlug } from "@okcode/shared/model";
-import { mergeNodeProcessEnv } from "@okcode/shared/environment";
+import { compactNodeProcessEnv, mergeNodeProcessEnv } from "@okcode/shared/environment";
 import { Effect, ServiceMap } from "effect";
 
 import {
@@ -574,13 +574,15 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
       const codexOptions = readCodexProviderOptions(input);
       const codexBinaryPath = codexOptions.binaryPath ?? "codex";
       const codexHomePath = codexOptions.homePath;
-      const baseEnv = mergeNodeProcessEnv(process.env, input.env);
+      const baseEnv = mergeNodeProcessEnv(
+        process.env,
+        input.env ? compactNodeProcessEnv(input.env) : undefined,
+      );
       const sessionEnv = codexHomePath ? { ...baseEnv, CODEX_HOME: codexHomePath } : baseEnv;
       this.assertSupportedCodexCliVersion({
         binaryPath: codexBinaryPath,
         cwd: resolvedCwd,
         ...(codexHomePath ? { homePath: codexHomePath } : {}),
-        env: sessionEnv,
       });
       const child = spawn(codexBinaryPath, ["app-server"], {
         cwd: resolvedCwd,

apps/server/src/git/Layers/CodexTextGeneration.ts

@@ -9,7 +9,6 @@ import { sanitizeBranchFragment, sanitizeFeatureBranchName } from "@okcode/share
 
 import { resolveAttachmentPath } from "../../attachmentStore.ts";
 import { ServerConfig } from "../../config.ts";
-import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 import { TextGenerationError } from "../Errors.ts";
 import {
   type BranchNameGenerationInput,
@@ -19,7 +18,6 @@ import {
   type TextGenerationShape,
   TextGeneration,
 } from "../Services/TextGeneration.ts";
-import { resolveRuntimeEnvironment } from "../../runtimeEnvironment.ts";
 
 const CODEX_REASONING_EFFORT = "low";
 const CODEX_TIMEOUT_MS = 180_000;
@@ -103,7 +101,6 @@ const makeCodexTextGeneration = Effect.gen(function* () {
   const path = yield* Path.Path;
   const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const serverConfig = yield* Effect.service(ServerConfig);
-  const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 
   type MaterializedImageAttachments = {
     readonly imagePaths: ReadonlyArray<string>;
@@ -210,10 +207,6 @@ const makeCodexTextGeneration = Effect.gen(function* () {
       const outputPath = yield* writeTempFile(operation, "codex-output", "");
 
       const runCodexCommand = Effect.gen(function* () {
-        const runtimeEnv = yield* resolveRuntimeEnvironment({
-          cwd,
-          readModel: yield* projectionSnapshotQuery.getSnapshot(),
-        });
         const command = ChildProcess.make(
           "codex",
           [
@@ -235,7 +228,7 @@ const makeCodexTextGeneration = Effect.gen(function* () {
           {
             cwd,
             shell: process.platform === "win32",
-            env: mergeNodeProcessEnv(process.env, runtimeEnv),
+            env: process.env,
             stdin: {
               stream: Stream.make(new TextEncoder().encode(prompt)),
             },

apps/server/src/git/Layers/GitCore.ts

@@ -17,7 +17,7 @@ import {
   Stream,
 } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { mergeNodeProcessEnv } from "@okcode/shared/environment";
+import { compactNodeProcessEnv, mergeNodeProcessEnv } from "@okcode/shared/environment";
 
 import { GitCommandError } from "../Errors.ts";
 import {
@@ -136,7 +136,6 @@ const EMPTY_STATUS_DETAILS = {
   aheadCount: 0,
   behindCount: 0,
   upstreamRef: null,
-  pr: null,
 } satisfies GitStatusDetails;
 
 function parseBranchLine(line: string): { name: string; current: boolean } | null {
@@ -525,7 +524,6 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
     const fileSystem = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const { worktreesDir } = yield* ServerConfig;
-    const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
 
     let execute: GitCoreShape["execute"];
 
@@ -547,20 +545,16 @@ export const makeGitCore = (options?: { executeOverride?: GitCoreShape["execute"
             Effect.provideService(FileSystem.FileSystem, fileSystem),
             Effect.mapError(toGitCommandError(commandInput, "failed to create trace2 monitor.")),
           );
-          const runtimeEnv =
-            input.env !== undefined
-              ? input.env
-              : yield* resolveRuntimeEnvironment({
-                  cwd: commandInput.cwd,
-                  readModel: yield* projectionSnapshotQuery.getSnapshot(),
-                });
+          const runtimeEnv = input.env ? compactNodeProcessEnv(input.env) : undefined;
           const child = yield* commandSpawner
             .spawn(
               ChildProcess.make("git", commandInput.args, {
                 cwd: commandInput.cwd,
                 env: mergeNodeProcessEnv(
-                  mergeNodeProcessEnv(process.env, runtimeEnv),
-                  trace2Monitor.env,
+                  compactNodeProcessEnv(
+                    mergeNodeProcessEnv(compactNodeProcessEnv(process.env), runtimeEnv),
+                  ),
+                  compactNodeProcessEnv(trace2Monitor.env),
                 ),
               }),
             )

apps/server/src/git/Layers/GitHubCli.ts

@@ -170,21 +170,14 @@ function decodeGitHubJson<S extends Schema.Top>(
 
 const makeGitHubCli = Effect.sync(() => {
   const execute: GitHubCliShape["execute"] = (input) =>
-    Effect.gen(function* () {
-      const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
-      const runtimeEnv = yield* resolveRuntimeEnvironment({
-        cwd: input.cwd,
-        readModel: yield* projectionSnapshotQuery.getSnapshot(),
-      });
-      return yield* Effect.tryPromise({
-        try: () =>
-          runProcess("gh", input.args, {
-            cwd: input.cwd,
-            timeoutMs: input.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-            env: mergeNodeProcessEnv(process.env, runtimeEnv),
-          }),
-        catch: (error) => normalizeGitHubCliError("execute", error),
-      });
+    Effect.tryPromise({
+      try: () =>
+        runProcess("gh", input.args, {
+          cwd: input.cwd,
+          timeoutMs: input.timeoutMs ?? DEFAULT_TIMEOUT_MS,
+          env: process.env,
+        }),
+      catch: (error) => normalizeGitHubCliError("execute", error),
     });
 
   const service = {

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

@@ -22,6 +22,7 @@ import { ProviderAdapterRequestError } from "../../provider/Errors.ts";
 import { OrchestrationEventStoreLive } from "../../persistence/Layers/OrchestrationEventStore.ts";
 import { OrchestrationCommandReceiptRepositoryLive } from "../../persistence/Layers/OrchestrationCommandReceipts.ts";
 import { SqlitePersistenceMemory } from "../../persistence/Layers/Sqlite.ts";
+import { EnvironmentVariablesLive } from "../../persistence/Services/EnvironmentVariables.ts";
 import {
   ProviderService,
   type ProviderServiceShape,
@@ -219,12 +220,14 @@ describe("ProviderCommandReactor", () => {
     );
     const layer = ProviderCommandReactorLive.pipe(
       Layer.provideMerge(orchestrationLayer),
+      Layer.provideMerge(EnvironmentVariablesLive),
       Layer.provideMerge(Layer.succeed(ProviderService, service)),
       Layer.provideMerge(Layer.succeed(GitCore, { renameBranch } as unknown as GitCoreShape)),
       Layer.provideMerge(
         Layer.succeed(TextGeneration, { generateBranchName } as unknown as TextGenerationShape),
       ),
       Layer.provideMerge(ServerConfig.layerTest(process.cwd(), baseDir)),
+      Layer.provideMerge(SqlitePersistenceMemory),
       Layer.provideMerge(NodeServices.layer),
     );
     const runtime = ManagedRuntime.make(layer);

apps/server/src/persistence/Services/EnvironmentVariables.ts

@@ -14,10 +14,10 @@ import path from "node:path";
 import {
   type EnvironmentVariableEntry,
   type GlobalEnvironmentVariablesResult,
-  type ProjectEnvironmentVariablesInput,
+  ProjectEnvironmentVariablesInput,
   type ProjectEnvironmentVariablesResult,
-  type SaveGlobalEnvironmentVariablesInput,
-  type SaveProjectEnvironmentVariablesInput,
+  SaveGlobalEnvironmentVariablesInput,
+  SaveProjectEnvironmentVariablesInput,
 } from "@okcode/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";

apps/server/src/provider/Layers/ClaudeAdapter.ts

@@ -48,7 +48,7 @@ import {
   supportsClaudeThinkingToggle,
   supportsClaudeUltrathinkKeyword,
 } from "@okcode/shared/model";
-import { mergeNodeProcessEnv } from "@okcode/shared/environment";
+import { compactNodeProcessEnv, mergeNodeProcessEnv } from "@okcode/shared/environment";
 import {
   Cause,
   DateTime,
@@ -66,7 +66,6 @@ import {
 
 import { resolveAttachmentPath } from "../../attachmentStore.ts";
 import { ServerConfig } from "../../config.ts";
-import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 import {
   ProviderAdapterProcessError,
   ProviderAdapterRequestError,
@@ -77,7 +76,6 @@ import {
 } from "../Errors.ts";
 import { ClaudeAdapter, type ClaudeAdapterShape } from "../Services/ClaudeAdapter.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
-import { resolveRuntimeEnvironment } from "../../runtimeEnvironment.ts";
 
 const PROVIDER = "claudeAgent" as const;
 type ClaudeTextStreamKind = Extract<RuntimeContentStreamKind, "assistant_text" | "reasoning_text">;
@@ -920,7 +918,6 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
   return Effect.gen(function* () {
     const fileSystem = yield* FileSystem.FileSystem;
     const serverConfig = yield* ServerConfig;
-    const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
     const nativeEventLogger =
       options?.nativeEventLogger ??
       (options?.nativeEventLogPath !== undefined
@@ -2726,15 +2723,7 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
           ...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
           ...(fastMode ? { fastMode: true } : {}),
         };
-        const runtimeEnv =
-          input.env !== undefined
-            ? input.env
-            : input.cwd !== undefined
-              ? yield* resolveRuntimeEnvironment({
-                  cwd: input.cwd,
-                  readModel: yield* projectionSnapshotQuery.getSnapshot(),
-                })
-              : undefined;
+        const runtimeEnv = input.env ? compactNodeProcessEnv(input.env) : undefined;
 
         const queryOptions: ClaudeQueryOptions = {
           ...(input.cwd ? { cwd: input.cwd } : {}),

apps/server/src/provider/Layers/CodexAdapter.ts

@@ -21,6 +21,7 @@ import {
   ThreadId,
   TurnId,
 } from "@okcode/contracts";
+import { compactNodeProcessEnv } from "@okcode/shared/environment";
 import { Effect, FileSystem, Layer, Queue, Schema, ServiceMap, Stream } from "effect";
 
 import {
@@ -38,9 +39,7 @@ import {
 } from "../../codexAppServerManager.ts";
 import { resolveAttachmentPath } from "../../attachmentStore.ts";
 import { ServerConfig } from "../../config.ts";
-import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
-import { resolveRuntimeEnvironment } from "../../runtimeEnvironment.ts";
 
 const PROVIDER = "codex" as const;
 
@@ -1319,7 +1318,6 @@ const makeCodexAdapter = (options?: CodexAdapterLiveOptions) =>
   Effect.gen(function* () {
     const fileSystem = yield* FileSystem.FileSystem;
     const serverConfig = yield* Effect.service(ServerConfig);
-    const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
     const nativeEventLogger =
       options?.nativeEventLogger ??
       (options?.nativeEventLogPath !== undefined
@@ -1355,15 +1353,7 @@ const makeCodexAdapter = (options?: CodexAdapterLiveOptions) =>
         });
       }
 
-      const runtimeEnv =
-        input.env !== undefined
-          ? input.env
-          : input.cwd !== undefined
-            ? yield* resolveRuntimeEnvironment({
-                cwd: input.cwd,
-                readModel: yield* projectionSnapshotQuery.getSnapshot(),
-              })
-            : undefined;
+      const runtimeEnv = input.env ? compactNodeProcessEnv(input.env) : undefined;
 
       const managerInput: CodexAppServerStartSessionInput = {
         threadId: input.threadId,

apps/server/src/provider/Layers/ProviderHealth.ts

@@ -23,7 +23,6 @@ import {
   isCodexCliVersionSupported,
   parseCodexCliVersion,
 } from "../codexCliVersion";
-import { EnvironmentVariables } from "../../persistence/Services/EnvironmentVariables.ts";
 import { ProviderHealth, type ProviderHealthShape } from "../Services/ProviderHealth";
 
 const DEFAULT_TIMEOUT_MS = 4_000;
@@ -190,10 +189,7 @@ const OPENAI_AUTH_PROVIDERS = new Set(["openai"]);
 export const readCodexConfigModelProvider = Effect.gen(function* () {
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
-  const environmentVariables = yield* EnvironmentVariables;
-  const globalEnvironment = yield* environmentVariables.resolveEnvironment();
-  const mergedEnvironment = mergeNodeProcessEnv(process.env, globalEnvironment);
-  const codexHome = mergedEnvironment.CODEX_HOME || path.join(OS.homedir(), ".codex");
+  const codexHome = process.env.CODEX_HOME || path.join(OS.homedir(), ".codex");
   const configPath = path.join(codexHome, "config.toml");
 
   const content = yield* fileSystem
@@ -247,14 +243,9 @@ const collectStreamAsString = <E>(stream: Stream.Stream<Uint8Array, E>): Effect.
 const runCodexCommand = (args: ReadonlyArray<string>) =>
   Effect.gen(function* () {
     const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-    const environmentVariables = yield* EnvironmentVariables;
-    const mergedEnvironment = mergeNodeProcessEnv(
-      process.env,
-      yield* environmentVariables.resolveEnvironment(),
-    );
     const command = ChildProcess.make("codex", [...args], {
       shell: process.platform === "win32",
-      env: mergedEnvironment,
+      env: process.env,
     });
 
     const child = yield* spawner.spawn(command);
@@ -274,14 +265,9 @@ const runCodexCommand = (args: ReadonlyArray<string>) =>
 const runClaudeCommand = (args: ReadonlyArray<string>) =>
   Effect.gen(function* () {
     const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-    const environmentVariables = yield* EnvironmentVariables;
-    const mergedEnvironment = mergeNodeProcessEnv(
-      process.env,
-      yield* environmentVariables.resolveEnvironment(),
-    );
     const command = ChildProcess.make("claude", [...args], {
       shell: process.platform === "win32",
-      env: mergedEnvironment,
+      env: process.env,
     });
 
     const child = yield* spawner.spawn(command);