Fix prepare hooks for Effect language service patch (#113)

Replace package prepare hooks with a shared patch script
Clean up related TypeScript and sorting usage across server and web

Author: BunsDev

.claude/commands/rec.md

@@ -5,6 +5,7 @@ argument-hint: <option>
 Respond with ONLY the exact text for the matching option below. No extra commentary.
 
 Options:
+
 - `lgtm` → "LGTM — approved."
 - `ack` → "Acknowledged."
 - `done` → "Done."

apps/desktop/src/main.ts

@@ -1171,7 +1171,7 @@ function registerIpcHandlers(): void {
   });
 
   ipcMain.removeHandler(SET_SIDEBAR_OPACITY_CHANNEL);
-  ipcMain.handle(SET_SIDEBAR_OPACITY_CHANNEL, async (_event, rawOpacity: unknown) => {
+  ipcMain.handle(SET_SIDEBAR_OPACITY_CHANNEL, async (_event, _rawOpacity: unknown) => {
     // Sidebar opacity is handled purely on the renderer side via CSS.
     // This channel exists so the bridge contract is satisfied; the renderer
     // applies the value through a CSS custom-property.

apps/desktop/src/previewController.ts

@@ -26,19 +26,6 @@ interface TabEntry {
   state: PreviewTabState;
 }
 
-function createClosedTabState(tabId: PreviewTabId): PreviewTabState {
-  return {
-    tabId,
-    status: "closed",
-    url: null,
-    title: null,
-    error: null,
-    canGoBack: false,
-    canGoForward: false,
-    devToolsOpen: false,
-  };
-}
-
 export class DesktopPreviewController {
   private tabs: Map<PreviewTabId, TabEntry> = new Map();
   private activeTabId: PreviewTabId | null = null;
@@ -67,16 +54,6 @@ export class DesktopPreviewController {
     if (!validatedUrl.ok) {
       // Still create the tab but in error state
       const tabId = randomUUID();
-      const tabState: PreviewTabState = {
-        tabId,
-        status: "error",
-        url: null,
-        title: null,
-        error: validatedUrl.error,
-        canGoBack: false,
-        canGoForward: false,
-        devToolsOpen: false,
-      };
       // Don't actually create a view for invalid URLs
       return { tabId, state: this.buildTabsState() };
     }

apps/server/package.json

@@ -18,7 +18,7 @@
     "dev": "bun run src/index.ts",
     "build": "node scripts/cli.ts build",
     "start": "node dist/index.mjs",
-    "prepare": "node -e \"process.exit(process.env.CI ? 0 : 1)\" || effect-language-service patch",
+    "prepare": "node -e \"process.exit(process.env.CI ? 0 : 1)\" || node ../../scripts/patch-effect-language-service.ts",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   },

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

@@ -4,7 +4,6 @@ import { Effect, FileSystem, Layer, Option, Path, Schema, Stream } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
 import { DEFAULT_GIT_TEXT_GENERATION_MODEL } from "@okcode/contracts";
-import { mergeNodeProcessEnv } from "@okcode/shared/environment";
 import { sanitizeBranchFragment, sanitizeFeatureBranchName } from "@okcode/shared/git";
 
 import { resolveAttachmentPath } from "../../attachmentStore.ts";

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

@@ -33,8 +33,6 @@ import {
 } from "../Services/GitCore.ts";
 import { ServerConfig } from "../../config.ts";
 import { decodeJsonResult } from "@okcode/shared/schemaJson";
-import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
-import { resolveRuntimeEnvironment } from "../../runtimeEnvironment.ts";
 
 function safeRealpath(value: string): string {
   try {

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

@@ -1,6 +1,5 @@
 import { Effect, Layer, Schema } from "effect";
 import { PositiveInt, TrimmedNonEmptyString } from "@okcode/contracts";
-import { mergeNodeProcessEnv } from "@okcode/shared/environment";
 
 import { runProcess } from "../../processRunner";
 import { GitHubCliError } from "../Errors.ts";
@@ -10,8 +9,6 @@ import {
   type GitHubCliShape,
   type GitHubPullRequestSummary,
 } from "../Services/GitHubCli.ts";
-import { ProjectionSnapshotQuery } from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
-import { resolveRuntimeEnvironment } from "../../runtimeEnvironment.ts";
 
 const DEFAULT_TIMEOUT_MS = 30_000;
 

apps/server/src/orchestration/decider.ts

@@ -93,19 +93,22 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       }
 
       const archiveEvents: Omit<OrchestrationEvent, "sequence">[] = projectsToArchive.map(
-        (project) => ({
-          ...withEventBase({
-            aggregateKind: "project" as const,
-            aggregateId: project.id,
-            occurredAt: command.createdAt,
-            commandId: command.commandId,
-          }),
-          type: "project.deleted" as const,
-          payload: {
-            projectId: project.id,
-            deletedAt: command.createdAt,
-          },
-        }),
+        (project) =>
+          Object.assign(
+            withEventBase({
+              aggregateKind: "project" as const,
+              aggregateId: project.id,
+              occurredAt: command.createdAt,
+              commandId: command.commandId,
+            }),
+            {
+              type: "project.deleted" as const,
+              payload: {
+                projectId: project.id,
+                deletedAt: command.createdAt,
+              },
+            },
+          ),
       );
       return [...archiveEvents, projectCreatedEvent];
     }
@@ -198,20 +201,22 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
         return threadCreatedEvent;
       }
 
-      const archiveEvents: Omit<OrchestrationEvent, "sequence">[] = threadsToArchive.map(
-        (thread) => ({
-          ...withEventBase({
+      const archiveEvents: Omit<OrchestrationEvent, "sequence">[] = threadsToArchive.map((thread) =>
+        Object.assign(
+          withEventBase({
             aggregateKind: "thread" as const,
             aggregateId: thread.id,
             occurredAt: command.createdAt,
             commandId: command.commandId,
           }),
-          type: "thread.deleted" as const,
-          payload: {
-            threadId: thread.id,
-            deletedAt: command.createdAt,
+          {
+            type: "thread.deleted" as const,
+            payload: {
+              threadId: thread.id,
+              deletedAt: command.createdAt,
+            },
           },
-        }),
+        ),
       );
       return [...archiveEvents, threadCreatedEvent];
     }

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

@@ -182,7 +182,7 @@ async function readOrCreateSecretKey(secretKeyPath: string): Promise<Buffer> {
         const existing = await fs.readFile(secretKeyPath, "utf8");
         const decoded = Buffer.from(existing.trim(), "base64");
         if (decoded.byteLength !== SECRET_KEY_BYTES) {
-          throw new Error("Invalid vault key length.");
+          throw new Error("Invalid vault key length.", { cause: writeError });
         }
         return decoded;
       }

apps/server/src/prReview/Layers/PrReview.ts

@@ -1,6 +1,5 @@
 import { Effect, Layer } from "effect";
 import type {
-  GitHubUserPreview,
   PrConflictAnalysis,
   PrReviewAddThreadInput,
   PrReviewComment,
@@ -9,17 +8,13 @@ import type {
   PrReviewDashboardResult,
   PrReviewFile,
   PrReviewPatchInput,
-  PrReviewPatchResult,
   PrReviewParticipant,
   PrReviewReplyToThreadInput,
   PrReviewResolveThreadInput,
   PrReviewSearchUsersInput,
-  PrReviewSearchUsersResult,
   PrReviewSummary,
   PrReviewUserPreviewInput,
   PrSubmitReviewInput,
-  PrSubmitReviewResult,
-  PrWorkflowStepResolution,
   PrWorkflowStepRunResult,
 } from "@okcode/contracts";
 import { GitHubCli } from "../../git/Services/GitHubCli.ts";
@@ -356,11 +351,7 @@ function normalizeDashboardResponse(
             startSide: asString(record.startDiffSide),
             isResolved: Boolean(record.isResolved),
             isOutdated: Boolean(record.isOutdated),
-            state: Boolean(record.isResolved)
-              ? "resolved"
-              : Boolean(record.isOutdated)
-                ? "outdated"
-                : "open",
+            state: record.isResolved ? "resolved" : record.isOutdated ? "outdated" : "open",
             comments,
           } as PrReviewDashboardResult["threads"][number];
         })
@@ -643,7 +634,7 @@ const makePrReview = Effect.gen(function* () {
         const dashboard = yield* refreshDashboard({ cwd: input.cwd, prNumber: input.prNumber });
         const thread = dashboard.threads.find((entry) => entry.id === input.threadId);
         const targetCommentId = [...(thread?.comments ?? [])]
-          .reverse()
+          .toReversed()
           .find((comment) => comment.databaseId !== null)?.databaseId;
         if (!thread || targetCommentId === undefined || targetCommentId === null) {
           return yield* new PrReviewError({