Sync upstream 337c5858c3 into coder-only (two stages)

apps/coder-gateway/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "start": "node src/bin.ts",
     "test": "node --test src/*.test.ts",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "effect-tsgo tsrs --noEmit"
   },
   "dependencies": {
     "@effect/platform-node": "catalog:",

apps/coder-gateway/src/assetProxy.test.ts

@@ -1,3 +1,7 @@
+// @effect-diagnostics nodeBuiltinImport:off -- Coder: drives the real loopback server with Node HTTP and fetch, as a browser would.
+// @effect-diagnostics globalFetch:off -- Coder: drives the real loopback server with fetch, as a browser would.
+// @effect-diagnostics globalDate:off -- Coder: polls the real server against wall-clock deadlines.
+// @effect-diagnostics globalTimers:off -- Coder: polls the real server against wall-clock deadlines.
 import assert from "node:assert/strict";
 import * as NodeHttp from "node:http";
 import type { AddressInfo } from "node:net";

apps/coder-gateway/src/assetProxy.ts

@@ -1,3 +1,4 @@
+// @effect-diagnostics nodeBuiltinImport:off -- Coder: streams workspace assets through the gateway's Node loopback HTTP server.
 import type * as NodeHttp from "node:http";
 
 import type { CoderHelperConnection } from "@t3tools/coder-cli/helperConnection";

apps/coder-gateway/src/bin.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics nodeBuiltinImport:off -- Coder: the CLI entry point reads its static files with Node fs.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: the entry point runs the gateway whose route errors stay untyped (rendered by message).
 import { readFile } from "node:fs/promises";
 // @effect-diagnostics nodeBuiltinImport:off
 import { spawn } from "node:child_process";

apps/coder-gateway/src/coderCommands.ts

@@ -1,3 +1,6 @@
+// @effect-diagnostics globalDate:off -- Coder: formats Coder's build deadline from `coder list` JSON synchronously.
+// @effect-diagnostics globalErrorInEffectFailure:off -- Coder: a cancelled connection fails with the message the settings UI shows.
+// @effect-diagnostics globalJsonInEffect:off -- Coder: parses `coder` CLI JSON output; the caller treats a parse failure as unavailable.
 import type { DiscoveredCoderWorkspace } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
 
@@ -55,7 +58,7 @@ export function checkCoderAuthStatus(
         ? "unauthenticated"
         : "unavailable";
     }),
-    Effect.catch(() => Effect.succeed("unavailable" as const)),
+    Effect.orElseSucceed(() => "unavailable" as const),
   );
 }
 

apps/coder-gateway/src/configChanges.ts

@@ -1,5 +1,6 @@
 import type { CoderProfileConfig } from "@t3tools/coder-cli/configStore";
 
+// @effect-diagnostics-next-line extendsNativeError:off -- Coder: native error the gateway matches with instanceof and renders by message at the HTTP boundary.
 export class CoderConfigConflictError extends Error {}
 
 /**

apps/coder-gateway/src/connectionShutdown.test.ts

@@ -1,3 +1,6 @@
+// @effect-diagnostics nodeBuiltinImport:off -- Coder: spawns and drives the real gateway over Node HTTP.
+// @effect-diagnostics globalFetch:off -- Coder: drives the real gateway over loopback HTTP, as a browser would.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: test helpers run untyped gateway effects.
 import { it } from "node:test";
 import { channel } from "node:diagnostics_channel";
 import type { IncomingMessage } from "node:http";

apps/coder-gateway/src/hub.test.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics globalDate:off -- Coder: waits in real time for fake helper stdio traffic.
+// @effect-diagnostics globalTimers:off -- Coder: waits in real time for fake helper stdio traffic.
 import assert from "node:assert/strict";
 import { test } from "node:test";
 
@@ -36,7 +38,7 @@ interface FakeHelper {
 function fakeHelper(environmentId: string, protocolVersion = 3): FakeHelper {
   const sent: Array<SentRequest> = [];
   const listeners = new Set<(message: unknown) => void>();
-  const closed = Effect.runSync(Deferred.make<CoderHelperExit>());
+  const closed = Deferred.makeUnsafe<CoderHelperExit>();
   const requests = (tag: string) => sent.filter((message) => message.tag === tag);
   const outboxId = () => {
     const outbox = requests(CODER_HUB_OUTBOX_METHOD)[0];

apps/coder-gateway/src/lifecycleState.ts

@@ -11,6 +11,7 @@ import type { WorkspaceRpcBridge } from "./rpcBridge.ts";
 export type RunPromise = <A, E>(effect: Effect.Effect<A, E>) => Promise<A>;
 export type RunFork = <A, E>(effect: Effect.Effect<A, E>) => Fiber.Fiber<A, E>;
 
+// @effect-diagnostics-next-line extendsNativeError:off -- Coder: native error the gateway matches with instanceof and renders by message at the HTTP boundary.
 export class WorkspaceActionConflictError extends Error {}
 
 export interface DeferredPromise<A> {

apps/coder-gateway/src/portForwards.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics globalErrorInEffectFailure:off -- Coder: port-forward errors reach the settings UI by message.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: coder port-forward process errors are untyped in coder-cli.
 import type { DiscoveredCoderWorkspace } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";

apps/coder-gateway/src/process.ts

@@ -7,6 +7,7 @@ import * as Effect from "effect/Effect";
 import type { CoderInvocation } from "@t3tools/coder-cli/command";
 import { terminateChildProcess } from "@t3tools/coder-cli/processTermination";
 
+// @effect-diagnostics-next-line extendsNativeError:off -- Coder: native error the gateway matches with instanceof and renders by message at the HTTP boundary.
 export class GatewayProcessError extends Error {
   readonly _tag = "GatewayProcessError";
 
@@ -73,10 +74,7 @@ const terminateGatewayProcess = (
     child: process.child,
     exit: process.exited,
     graceMs: terminationGraceMs,
-  }).pipe(
-    Effect.catchCause(() => Effect.void),
-    Effect.ensuring(Effect.sync(process.cleanupListeners)),
-  );
+  }).pipe(Effect.ignoreCause, Effect.ensuring(Effect.sync(process.cleanupListeners)));
 
 export function runGatewayProcess(
   invocation: CoderInvocation,

apps/coder-gateway/src/rpcBridge.test.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics globalDate:off -- Coder: waits in real time for fake helper stdio traffic.
+// @effect-diagnostics globalTimers:off -- Coder: waits in real time for fake helper stdio traffic.
 import assert from "node:assert/strict";
 import { test } from "node:test";
 

apps/coder-gateway/src/rpcBridge.ts

@@ -36,6 +36,7 @@ export interface WorkspaceRpcBridgeOptions {
   readonly cleanupTimeout?: Duration.Input;
 }
 
+// @effect-diagnostics-next-line extendsNativeError:off -- Coder: native error the gateway matches with instanceof and renders by message at the HTTP boundary.
 export class RpcBridgeConflictError extends Error {
   readonly _tag = "RpcBridgeConflictError";
 
@@ -45,6 +46,7 @@ export class RpcBridgeConflictError extends Error {
   }
 }
 
+// @effect-diagnostics-next-line extendsNativeError:off -- Coder: native error the gateway matches with instanceof and renders by message at the HTTP boundary.
 export class RpcBridgeSessionError extends Error {
   readonly _tag = "RpcBridgeSessionError";
   readonly kind: "protocol" | "helper";
@@ -179,7 +181,7 @@ export function makeWorkspaceRpcBridge(
     const runFork = yield* FiberSet.runtime(fibers)();
     const cleanupTimeout = options?.cleanupTimeout ?? DEFAULT_CLEANUP_TIMEOUT;
 
-    const closeHelper = helper.close.pipe(Effect.catchCause(() => Effect.void));
+    const closeHelper = helper.close.pipe(Effect.ignoreCause);
 
     const scheduleCleanupCheck = (sessionId: number): void => {
       runFork(

apps/coder-gateway/src/server.test.ts

@@ -1,3 +1,4 @@
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: test helpers run untyped gateway effects.
 import {
   startLocalCoderGateway,
   type PromiseCoderHelperConnection as CoderHelperConnection,

apps/coder-gateway/src/server.ts

@@ -1,3 +1,7 @@
+// @effect-diagnostics unknownInEffectCatch:off -- Coder: route failures are rendered by message at the HTTP boundary.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: route failures are rendered by message at the HTTP boundary.
+// @effect-diagnostics globalErrorInEffectCatch:off -- Coder: route failures are rendered by message at the HTTP boundary.
+// @effect-diagnostics globalErrorInEffectFailure:off -- Coder: route failures are rendered by message at the HTTP boundary.
 import type { DiscoveredCoderWorkspace } from "@t3tools/contracts";
 export type {
   DiscoveredCoderWorkspace,
@@ -179,7 +183,7 @@ export function makeLocalCoderGateway(
     const helperBundlePath = options?.helperBundlePath;
     const helperBundleHash =
       helperBundlePath === undefined
-        ? Effect.succeed(undefined)
+        ? Effect.undefined
         : yield* Effect.cached(
             Effect.tryPromise({
               try: () => hashCoderHelperBundle(helperBundlePath),

apps/coder-gateway/src/testUtils/gateway.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics unknownInEffectCatch:off -- Coder: test harness wraps the gateway's untyped effects.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: test harness wraps the gateway's untyped effects.
 import { CoderHelperConnectionError } from "@t3tools/coder-cli/helperConnection";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";

apps/coder-gateway/src/workspaceConnections.ts

@@ -1,3 +1,7 @@
+// @effect-diagnostics globalDate:off -- Coder: diagnostic phase durations use wall-clock milliseconds.
+// @effect-diagnostics globalErrorInEffectFailure:off -- Coder: connection errors reach the settings UI by message.
+// @effect-diagnostics anyUnknownInErrorContext:off -- Coder: coder ssh and helper errors are untyped in coder-cli.
+// @effect-diagnostics unknownInEffectCatch:off -- Coder: start-is-current checks rethrow the conflict error unchanged.
 import type { WorkspaceDiagnosticEvent, WorkspaceDiagnosticPhase } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";

apps/coder-helper/package.json

@@ -6,12 +6,13 @@
     "build": "node src/build.ts",
     "start": "node src/bin.ts",
     "test": "node --test src/*.test.ts",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "effect-tsgo tsrs --noEmit"
   },
   "dependencies": {
     "@effect/platform-node": "catalog:",
     "@t3tools/coder-cli": "workspace:*",
     "@t3tools/contracts": "workspace:*",
+    "@t3tools/shared": "workspace:*",
     "effect": "catalog:",
     "t3": "workspace:*"
   },

apps/coder-helper/src/build.ts

@@ -1,3 +1,4 @@
+// @effect-diagnostics nodeBuiltinImport:off -- Coder: esbuild script that runs outside any Effect runtime.
 import { readBuildVersion } from "../../../scripts/build-info.ts";
 import { build } from "esbuild";
 import * as NodeFS from "node:fs/promises";

apps/coder-helper/src/bundle.test.ts

@@ -1,4 +1,5 @@
 // @effect-diagnostics nodeBuiltinImport:off
+// @effect-diagnostics globalTimers:off -- Coder: waits in real time for the spawned helper bundle.
 import { deepStrictEqual, doesNotMatch, match, strictEqual } from "node:assert";
 import { spawn } from "node:child_process";
 import { once } from "node:events";

apps/coder-helper/src/helper.ts

@@ -1,6 +1,7 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeStdio from "@effect/platform-node/NodeStdio";
 import { CoderWsRpcGroup } from "@t3tools/contracts";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
@@ -46,9 +47,10 @@ const coderServerConfigLayer = Layer.effect(
   ServerConfig.ServerConfig,
   Effect.gen(function* () {
     const path = yield* Path.Path;
-    const baseDir =
-      process.env.T3_CODER_HOME?.trim() || path.join(process.env.HOME ?? ".", ".t3-coder");
-    const cwd = process.env.T3_CODER_CWD?.trim() || process.env.HOME?.trim() || process.cwd();
+    const env = yield* HostProcess.Environment;
+    const baseDir = env.T3_CODER_HOME?.trim() || path.join(env.HOME ?? ".", ".t3-coder");
+    const cwd =
+      env.T3_CODER_CWD?.trim() || env.HOME?.trim() || (yield* HostProcess.WorkingDirectory);
     const derivedPaths = yield* ServerConfig.deriveServerPaths(baseDir);
     yield* ServerConfig.ensureServerDirectories(derivedPaths);
     return ServerConfig.ServerConfig.of({

apps/server/package.json

@@ -1,10 +1,10 @@
 {
   "name": "t3",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "typecheck": "tsc --noEmit",
+    "typecheck": "effect-tsgo tsrs --noEmit",
     "test": "vp test run"
   },
   "dependencies": {
@@ -29,7 +29,7 @@
     "yauzl": "^3.4.0"
   },
   "devDependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.276",
+    "@anthropic-ai/claude-agent-sdk": "0.3.316",
     "@anthropic-ai/sdk": "0.93.0",
     "@effect/vitest": "catalog:",
     "@t3tools/contracts": "workspace:*",

apps/server/scripts/acp-mock-agent.ts

@@ -43,6 +43,9 @@ const omitInitializeModelState = process.env.T3_ACP_OMIT_INITIALIZE_MODEL_STATE
 const completeFirstPromptOnCancel = process.env.T3_ACP_COMPLETE_FIRST_PROMPT_ON_CANCEL === "1";
 const floodStderr = process.env.T3_ACP_FLOOD_STDERR === "1";
 const hangPromptForever = process.env.T3_ACP_HANG_PROMPT_FOREVER === "1";
+const agentVersion = process.env.T3_ACP_AGENT_VERSION ?? "0.0.0";
+const geminiApiKey = process.env.GEMINI_API_KEY;
+const idleError = process.env.T3_ACP_IDLE_ERROR;
 const emitTrackedToolCallKindThenHang = process.env.T3_ACP_EMIT_TRACKED_TOOL_CALL_KIND_THEN_HANG;
 const clientFsProbePath = process.env.T3_ACP_CLIENT_FS_PROBE_PATH;
 const clientFsProbeLogPath = process.env.T3_ACP_CLIENT_FS_PROBE_LOG_PATH;
@@ -516,7 +519,7 @@ const program = Effect.gen(function* () {
       parameterizedModelPicker = request.capabilities?._meta?.parameterizedModelPicker === true;
       return {
         protocolVersion: 2,
-        info: { name: "t3-acp-mock-agent", version: process.env.T3_ACP_AGENT_VERSION ?? "0.0.0" },
+        info: { name: "t3-acp-mock-agent", version: agentVersion },
         ...(omitInitializeModelState ? {} : { _meta: { modelState: modelState() } }),
         capabilities: {
           session: {
@@ -554,7 +557,7 @@ const program = Effect.gen(function* () {
       if (antigravityProfile) {
         if (
           request.methodId !== "oauth-personal" &&
-          !(request.methodId === "gemini-api-key" && process.env.GEMINI_API_KEY)
+          !(request.methodId === "gemini-api-key" && geminiApiKey)
         ) {
           return yield* AcpError.AcpRequestError.invalidParams(
             `Mock Antigravity rejected auth method ${request.methodId}.`,
@@ -840,7 +843,6 @@ const program = Effect.gen(function* () {
       const requestedSessionId = String(request.sessionId ?? sessionId);
       beginAcpMockPrompt(cancelledSessions, requestedSessionId);
       promptCount += 1;
-      const idleError = process.env.T3_ACP_IDLE_ERROR;
       if (idleError === "grok-background" && promptCount === 1) {
         // The structured completion lands before the prompt settles, so it is buffered.
         const taskId = "call-idle-error-background";
@@ -1877,6 +1879,11 @@ const program = Effect.gen(function* () {
     if (method === "_test/finish-cancel") {
       return Deferred.succeed(nativeCancelRelease, undefined).pipe(Effect.as({}));
     }
+    if (method === "_test/emit-update") {
+      return agent.client
+        .sessionUpdate(params as AcpSchema.SessionNotification)
+        .pipe(Effect.as({}));
+    }
     if (method === "_test/startup-metadata") {
       return Effect.gen(function* () {
         for (const [metadataSessionId, commandName, modeId] of [

apps/server/scripts/acp-replay-agent.ts

@@ -50,7 +50,27 @@ const transcript = JSON.parse(
     ? Buffer.from(encodedTranscript ?? "", "base64").toString("utf8")
     : NodeFS.readFileSync(transcriptPath, "utf8"),
 ) as ReplayTranscript;
-let cursor = 0;
+/**
+ * A recording can span processes: a `runtime_exit` mid-transcript marks where
+ * one agent process ended, and a respawned replay agent continues from the
+ * cursor the previous one left in the status file.
+ */
+function resumedCursor(): number {
+  try {
+    const previous = JSON.parse(NodeFS.readFileSync(statusPath ?? "", "utf8")) as {
+      readonly cursor?: unknown;
+      readonly failure?: unknown;
+    };
+    const resumeAt = typeof previous.cursor === "number" ? previous.cursor : 0;
+    return previous.failure === undefined &&
+      transcript.entries[resumeAt - 1]?.type === "runtime_exit"
+      ? resumeAt
+      : 0;
+  } catch {
+    return 0;
+  }
+}
+let cursor = resumedCursor();
 let stopped = false;
 let nextAgentRequestId = 1;
 const pendingClientRequestIds = new Map<string, string | number>();
@@ -232,6 +252,8 @@ function flushInbound(): void {
         break;
       }
       cursor += 1;
+      // Frames after a mid-transcript exit belong to the next process.
+      if (cursor < transcript.entries.length) break;
       continue;
     }
     const frame = entry.frame as LogicalFrame;
@@ -294,7 +316,8 @@ input.on("line", (line) => {
 });
 
 input.on("close", () => {
-  if (!stopped && cursor !== transcript.entries.length) {
+  const processEnded = transcript.entries[cursor - 1]?.type === "runtime_exit";
+  if (!stopped && cursor !== transcript.entries.length && !processEnded) {
     stopWithFailure("ACP replay input closed before transcript completion");
   }
 });