Merge upstream/main 13aa882c22 into coder-only (stage 3)

apps/server/src/coderServer.ts

@@ -37,7 +37,6 @@ import * as TerminalManager from "./terminal/Manager.ts";
 import * as ProjectAutoPull from "./vcs/projectAutoPull.ts";
 import * as WorkspacePaths from "./workspace/WorkspacePaths.ts";
 import * as ScreenshotArtifacts from "./workspace/ScreenshotArtifacts.ts";
-import * as LegacyScreenshotArtifacts from "./orchestration-v2/legacy/LegacyScreenshotArtifacts.ts";
 import * as CoderRuntimeStartup from "./serverRuntimeStartup.ts";
 import * as CoderWs from "./ws.ts";
 import * as VcsProcess from "./vcs/VcsProcess.ts";
@@ -214,7 +213,6 @@ const CoderRuntimeCoreLive = Layer.mergeAll(
 
 const CoderRuntimeDependenciesLive = CoderRuntimeCoreLive.pipe(
   Layer.provideMerge(ScreenshotArtifacts.layer),
-  Layer.provideMerge(LegacyScreenshotArtifacts.layer),
   Layer.provideMerge(
     ProjectEnrichmentService.layer.pipe(Layer.provide(ProjectFaviconResolver.layer)),
   ),

apps/server/src/coderWs.ts

@@ -35,7 +35,6 @@ import * as CoderEnvironment from "./coderEnvironment.ts";
 import * as ServerConfig from "./config.ts";
 import * as GitWorkflowService from "./git/GitWorkflowService.ts";
 import { renameBranchWithCompensation } from "./git/renameBranchWithCompensation.ts";
-import * as LegacyScreenshotArtifacts from "./orchestration-v2/legacy/LegacyScreenshotArtifacts.ts";
 import * as Orchestrator from "./orchestration-v2/Orchestrator.ts";
 import * as ThreadManagementService from "./orchestration-v2/ThreadManagementService.ts";
 import {
@@ -76,7 +75,6 @@ export const CODER_WS_METHODS = [
   WS_METHODS.workspaceReadScreenshotArtifact,
   WS_METHODS.workspaceReadTurnItemAsset,
   WS_METHODS.workspaceReadAttachmentFile,
-  WS_METHODS.workspaceListLegacyScreenshotArtifacts,
   WS_METHODS.subscribeVcsRefStatus,
   WS_METHODS.vcsRenameThreadBranch,
   WS_METHODS.reviewOpenDiffFileContents,
@@ -144,7 +142,6 @@ export const makeHandlers = (
     const workspaceFileSystem = yield* WorkspaceFileSystem.WorkspaceFileSystem;
     // Legacy images are read in bounded chunks over helper stdio.
     const screenshotArtifacts = yield* ScreenshotArtifacts.ScreenshotArtifacts;
-    const legacyScreenshotArtifacts = yield* LegacyScreenshotArtifacts.LegacyScreenshotArtifacts;
     const pullRequests = yield* PullRequestService.PullRequestService;
     const path = yield* Path.Path;
     const fileSystem = yield* FileSystem.FileSystem;
@@ -656,8 +653,6 @@ export const makeHandlers = (
       // Coder: a sent file attachment, in place of upstream's signed attachment asset URL.
       [WS_METHODS.workspaceReadAttachmentFile]: (input) =>
         screenshotArtifacts.readAttachmentFileChunk(input),
-      [WS_METHODS.workspaceListLegacyScreenshotArtifacts]: (input) =>
-        legacyScreenshotArtifacts.listAfterMessage(input.messageId),
       // Coder: subscribe to non-mutating local branch status.
       [WS_METHODS.subscribeVcsRefStatus]: ({ cwd }) => vcsStatusBroadcaster.streamRefStatus(cwd),
       // Coder: rename the branch and managed worktree together.

apps/server/src/orchestration-v2/V1ImportBoundary.test.ts

@@ -72,11 +72,9 @@ it("keeps the legacy importer out of reach of new code", () => {
     )
     .map(({ path }) => path)
     .toSorted();
-  // Coder: workspace startup runs in `coderServer.ts`, and `coderWs.ts` serves the read-only
-  // lookup of screenshots that V1 tool activities saved.
+  // Coder: workspace startup runs in `coderServer.ts`.
   assert.deepEqual(importers, [
     "coderServer.ts",
-    "coderWs.ts",
     "orchestration-v2/ThreadManagementService.ts",
     "orchestration-v2/runtimeLayer.ts",
     "project/ProjectService.ts",