@cluesmith/codev 3.3.6 → 3.3.7

package/dist/agent-farm/lib/ide-prefix.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The IDE forward prefix (Issue #1668 §D1) and its matcher. Dependency-free on
+ * purpose: the auth seam (`utils/server-utils.ts`) imports it, and it must stay
+ * a light leaf (Issue #1869). `ide-record.ts` re-exports both.
+ */
+/** The fixed Tower prefix that routes to the IDE server (Issue #1668 §D1). */
+export declare const IDE_DEFAULT_PREFIX = "/ide/";
+/** True if `pathname` targets the IDE forward prefix (`/ide` or `/ide/…`, never `/ideas`). */
+export declare function matchIdePrefix(pathname: string): boolean;
+//# sourceMappingURL=ide-prefix.d.ts.map

package/dist/agent-farm/lib/ide-prefix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ide-prefix.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-prefix.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAE1C,8FAA8F;AAC9F,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxD"}

package/dist/agent-farm/lib/ide-prefix.js

@@ -0,0 +1,13 @@
+/**
+ * The IDE forward prefix (Issue #1668 §D1) and its matcher. Dependency-free on
+ * purpose: the auth seam (`utils/server-utils.ts`) imports it, and it must stay
+ * a light leaf (Issue #1869). `ide-record.ts` re-exports both.
+ */
+/** The fixed Tower prefix that routes to the IDE server (Issue #1668 §D1). */
+export const IDE_DEFAULT_PREFIX = '/ide/';
+/** True if `pathname` targets the IDE forward prefix (`/ide` or `/ide/…`, never `/ideas`). */
+export function matchIdePrefix(pathname) {
+    const bare = IDE_DEFAULT_PREFIX.replace(/\/$/, ''); // "/ide"
+    return pathname === bare || pathname.startsWith(IDE_DEFAULT_PREFIX);
+}
+//# sourceMappingURL=ide-prefix.js.map

package/dist/agent-farm/lib/ide-prefix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ide-prefix.js","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-prefix.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAE1C,8FAA8F;AAC9F,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;IAC7D,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AACtE,CAAC"}

package/dist/agent-farm/lib/ide-record.d.ts

@@ -12,8 +12,7 @@
  * never hand-edited. Tower is the sole writer; `afx ide` drives it through the
  * local `/api/ide` endpoint.
  */
-/** The fixed Tower prefix that routes to the IDE server (Issue #1668 §D1). */
-export declare const IDE_DEFAULT_PREFIX = "/ide/";
+export { IDE_DEFAULT_PREFIX, matchIdePrefix } from './ide-prefix.js';
 /** Default port the local IDE server listens on when `--port` is not given. */
 export declare const IDE_DEFAULT_PORT = 8200;
 /**
@@ -60,11 +59,24 @@ export declare function deleteIdeRecord(): void;
  * Tower injects it at the forward instead.
  */
 export declare function readIdeConnectionToken(): string | null;
+/**
+ * Write a fresh connection token (randomBytes(32) hex, 0600), replacing any
+ * existing one, and return it (Issue #1869). Called before every IDE server
+ * SPAWN (never on adopt: a live server keeps the token it was started with), so
+ * a token that ever leaked into a browser jar is valid only for that server's
+ * uptime. Tower reads the token from this file on every forwarded request and
+ * overwrites any browser-held copy, so rotation breaks no client.
+ */
+export declare function rotateIdeConnectionToken(): string;
 /**
  * Return the Tower-owned connection token, generating and persisting one (0600)
  * on first use. This token is the IDE server's own inner auth layer (passed via
  * `--connection-token-file`); it is NOT a substitute for Tower's key check on
  * the forward (Issue #1668 §D2).
+ *
+ * TEST SEAM: production code no longer calls this. Every spawn uses
+ * `rotateIdeConnectionToken` (Issue #1869), and the forward only reads the
+ * file. Tests use it to provision a token without forcing a new one.
  */
 export declare function ensureIdeConnectionToken(): string;
 //# sourceMappingURL=ide-record.d.ts.map

package/dist/agent-farm/lib/ide-record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ide-record.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAcH,8EAA8E;AAC9E,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAE1C,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAKrC;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,yGAAyG;IACzG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oGAAoG;IACpG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oGAAoG;IACpG,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,yDAAyD;AACzD,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,eAAe,GAAG,IAAI,CA2BtD;AAOD,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAQ5D;AAED,gEAAgE;AAChE,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAKtD;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAajD"}
+{"version":3,"file":"ide-record.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAiBH,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAErE,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAKrC;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,yGAAyG;IACzG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oGAAoG;IACpG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oGAAoG;IACpG,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,yDAAyD;AACzD,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,eAAe,GAAG,IAAI,CA2BtD;AAOD,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAQ5D;AAED,gEAAgE;AAChE,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAKtD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CASjD;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAajD"}

package/dist/agent-farm/lib/ide-record.js

@@ -16,8 +16,10 @@ import { readFileSync, writeFileSync, unlinkSync, existsSync, mkdirSync, chmodSy
 import { randomBytes } from 'node:crypto';
 import { resolve } from 'node:path';
 import { AGENT_FARM_DIR } from './tower-client.js';
-/** The fixed Tower prefix that routes to the IDE server (Issue #1668 §D1). */
-export const IDE_DEFAULT_PREFIX = '/ide/';
+// The prefix and its matcher live in a dependency-free module so the auth seam
+// (`utils/server-utils.ts`) can use them without importing this file's
+// filesystem and tower-client dependencies (Issue #1869).
+export { IDE_DEFAULT_PREFIX, matchIdePrefix } from './ide-prefix.js';
 /** Default port the local IDE server listens on when `--port` is not given. */
 export const IDE_DEFAULT_PORT = 8200;
 const IDE_RECORD_FILENAME = 'ide-server.json';
@@ -101,11 +103,33 @@ export function readIdeConnectionToken() {
     const token = readFileSync(path, 'utf-8').trim();
     return token.length > 0 ? token : null;
 }
+/**
+ * Write a fresh connection token (randomBytes(32) hex, 0600), replacing any
+ * existing one, and return it (Issue #1869). Called before every IDE server
+ * SPAWN (never on adopt: a live server keeps the token it was started with), so
+ * a token that ever leaked into a browser jar is valid only for that server's
+ * uptime. Tower reads the token from this file on every forwarded request and
+ * overwrites any browser-held copy, so rotation breaks no client.
+ */
+export function rotateIdeConnectionToken() {
+    const path = getIdeConnectionTokenPath();
+    if (!existsSync(AGENT_FARM_DIR)) {
+        mkdirSync(AGENT_FARM_DIR, { recursive: true, mode: 0o700 });
+    }
+    const token = randomBytes(32).toString('hex');
+    writeFileSync(path, token + '\n', { mode: 0o600 });
+    chmodSync(path, 0o600);
+    return token;
+}
 /**
  * Return the Tower-owned connection token, generating and persisting one (0600)
  * on first use. This token is the IDE server's own inner auth layer (passed via
  * `--connection-token-file`); it is NOT a substitute for Tower's key check on
  * the forward (Issue #1668 §D2).
+ *
+ * TEST SEAM: production code no longer calls this. Every spawn uses
+ * `rotateIdeConnectionToken` (Issue #1869), and the forward only reads the
+ * file. Tests use it to provision a token without forcing a new one.
  */
 export function ensureIdeConnectionToken() {
     const path = getIdeConnectionTokenPath();

package/dist/agent-farm/lib/ide-record.js.map

@@ -1 +1 @@
-{"version":3,"file":"ide-record.js","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-record.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,YAAY,EACZ,aAAa,EACb,UAAU,EACV,UAAU,EACV,SAAS,EACT,SAAS,GACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,8EAA8E;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAE1C,+EAA+E;AAC/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAErC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAC9C,MAAM,6BAA6B,GAAG,sBAAsB,CAAC;AAsB7D,+CAA+C;AAC/C,MAAM,UAAU,gBAAgB;IAC9B,OAAO,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,yBAAyB;IACvC,OAAO,OAAO,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa;IAC3B,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAA6B,CAAC;QACnF,IACE,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;YACjC,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;YAC/B,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;YACrC,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;YAC9B,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EACpC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC;YACnD,aAAa,EAAE,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC;YACnD,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC;SACtD,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,cAAc,CAAC,MAAuB;IACpD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7E,8EAA8E;IAC9E,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAChC,IAAI,UAAU,CAAC,IAAI,CAAC;QAAE,UAAU,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB;IACpC,MAAM,IAAI,GAAG,yBAAyB,EAAE,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB;IACtC,MAAM,IAAI,GAAG,yBAAyB,EAAE,CAAC;IACzC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,QAAQ,CAAC;IAC3C,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,4CAA4C;IACpE,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"ide-record.js","sourceRoot":"","sources":["../../../src/agent-farm/lib/ide-record.ts"],"names":[],"mappings":"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"}

package/dist/agent-farm/servers/ide-forward.d.ts

@@ -14,6 +14,7 @@
  */
 import http from 'node:http';
 import type net from 'node:net';
+import { matchIdePrefix } from '../lib/ide-record.js';
 /** The tunnel's public authority, for stamping `x-forwarded-*` on tunnel-borne requests. */
 export interface PublicAuthority {
     host: string;
@@ -21,11 +22,20 @@ export interface PublicAuthority {
     prefix: string;
 }
 /**
- * Merge the IDE connection token into a Cookie header value as `vscode-tkn=…`,
- * preserving every existing cookie and never clobbering an already-present
- * `vscode-tkn` (Issue #1668). Exported for testing.
+ * Set the IDE connection token in a Cookie header value as `vscode-tkn=…`,
+ * preserving every other cookie. Tower's token REPLACES any incoming
+ * `vscode-tkn` (Issue #1869): Tower is the sole legitimate source, so a
+ * browser-held copy (a hand-built `?tkn=` URL, a pre-fix session, a token
+ * stale after rotation) is never authoritative. Exported for testing.
  */
 export declare function mergeConnectionTokenCookie(existing: string | string[] | undefined, token: string): string;
+/**
+ * Remove one cookie (exact name) from a Cookie header value, preserving every
+ * other pair in order. Accepts the string | string[] shape. Returns '' when no
+ * pair remains. Used to keep Tower's forward cookie (Issue #1869) away from the
+ * IDE server, the way the key header is stripped. Exported for testing.
+ */
+export declare function stripCookie(existing: string | string[] | undefined, name: string): string;
 /**
  * Derive the tunnel's public authority from the cloud config, matching the
  * `accessUrl` Tower advertises (`tower-tunnel.ts`: `${server_url}/t/${tower_name}/`).
@@ -43,8 +53,44 @@ export declare function getPublicAuthority(): PublicAuthority | null;
  * Pure and exported for unit testing.
  */
 export declare function buildForwardHeaders(incoming: http.IncomingHttpHeaders, port: number, publicAuthority: PublicAuthority | null, connectionToken: string | null): Record<string, string | string[]>;
-/** True if `pathname` targets the IDE forward prefix (`/ide` or `/ide/…`). */
-export declare function matchIdePrefix(pathname: string): boolean;
+/** True if `pathname` targets the IDE forward prefix; defined beside the prefix constant. */
+export { matchIdePrefix };
+/**
+ * Drop every `vscode-tkn` cookie the IDE server tries to set in the browser
+ * (Issue #1869). The server answers an authenticated request with
+ * `Set-Cookie: vscode-tkn=<connection token>` (7 days, SameSite=Lax); cookies
+ * are not port-scoped, so a browser holding it could open the remote protocol
+ * on the IDE server's own port from any localhost page, bypassing Tower. Tower
+ * injects the token on every forwarded request, so the browser never needs it.
+ * Returns undefined when nothing remains. Exported for testing.
+ */
+export declare function stripConnectionTokenSetCookie(value: string | string[] | undefined): string[] | undefined;
+/**
+ * Copy response headers, dropping hop-by-hop; preserves `Cache-Control` /
+ * `ETag`. With `stripTokenCookie` (a LOCAL request, Issue #1869) it also drops
+ * the IDE server's `vscode-tkn` Set-Cookie; the tunnel path relays it unchanged
+ * (the cloud variant is a separate follow-up). Exported for testing.
+ */
+export declare function copyResponseHeaders(headers: http.IncomingHttpHeaders, stripTokenCookie: boolean): Record<string, string | string[] | number>;
+/** Largest workbench page Tower will buffer to rewrite; anything bigger streams unchanged. */
+export declare const MAX_WORKBENCH_HTML_BYTES: number;
+/**
+ * Hand the workbench its connection token through its own configuration
+ * instead of the browser cookie jar (Issue #1869). The workbench takes
+ * `connectionToken` from its configuration first and falls back to the
+ * `vscode-tkn` cookie, which Tower strips locally because a cookie is readable
+ * by every localhost port. Same shape as Tower's same-origin key injection into
+ * the dashboard shell: post-auth only, never cross-origin readable.
+ *
+ * Inserts `"connectionToken":"<token>"` as the first key of the HTML-escaped
+ * JSON in `data-settings` (no trailing comma for an empty `{}`). Returns null,
+ * so the caller relays the page unchanged, when the token is not
+ * `^[A-Za-z0-9-]+$`, the page carries no workbench configuration, the
+ * configuration does not parse, it already names a `connectionToken`, or the
+ * rewritten configuration would not decode to valid JSON carrying the token.
+ * Exported for testing.
+ */
+export declare function injectWorkbenchConnectionToken(html: string, token: string): string | null;
 /**
  * Forward a plain HTTP request to the local IDE server. Assumes authorization
  * has already passed. Path and query are forwarded unchanged (the workbench
@@ -59,4 +105,10 @@ export declare function forwardIdeHttp(req: http.IncomingMessage, res: http.Serv
  * parse. Mirrors `tunnel-client.ts handleWebSocketConnect`'s pipe.
  */
 export declare function forwardIdeWebSocket(req: http.IncomingMessage, socket: net.Socket, head: Buffer, log: (level: 'INFO' | 'ERROR' | 'WARN', message: string) => void): Promise<void>;
+/**
+ * Reconstruct the HTTP/1.1 101 switching-protocols response line + headers.
+ * With `stripTokenCookie` (a LOCAL request) it drops the IDE server's
+ * `vscode-tkn` Set-Cookie like the HTTP path does. Exported for testing.
+ */
+export declare function rebuildUpgradeResponse(res: Pick<http.IncomingMessage, 'statusCode' | 'statusMessage' | 'headers'>, stripTokenCookie: boolean): string;
 //# sourceMappingURL=ide-forward.d.ts.map

package/dist/agent-farm/servers/ide-forward.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ide-forward.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/ide-forward.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAuChC,4FAA4F;AAC5F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAUD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMzG;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,GAAG,IAAI,CAa3D;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAClC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,eAAe,GAAG,IAAI,EACvC,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CA0BnC;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxD;AAaD;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CAmCf;AAaD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CA2Df"}
+{"version":3,"file":"ide-forward.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/ide-forward.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAKhC,OAAO,EAAsB,cAAc,EAA0B,MAAM,sBAAsB,CAAC;AAmDlG,4FAA4F;AAC5F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAUD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAIzG;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAazF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,GAAG,IAAI,CAa3D;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAClC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,eAAe,GAAG,IAAI,EACvC,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CA4CnC;AAED,6FAA6F;AAC7F,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAKxG;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,gBAAgB,EAAE,OAAO,GACxB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,CAe5C;AAKD,8FAA8F;AAC9F,eAAO,MAAM,wBAAwB,QAAkB,CAAC;AA4BxD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAoBzF;AA0DD;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAaD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAC/D,OAAO,CAAC,IAAI,CAAC,CA2Df;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,GAAG,eAAe,GAAG,SAAS,CAAC,EAC3E,gBAAgB,EAAE,OAAO,GACxB,MAAM,CAeR"}

package/dist/agent-farm/servers/ide-forward.js

@@ -17,8 +17,9 @@ import { URL } from 'node:url';
 import { readCloudConfig } from '../lib/cloud-config.js';
 import { TUNNEL_PROXY_HEADER } from '../lib/tunnel-client.js';
 import { TOWER_KEY_HEADER, LEGACY_WEB_KEY_HEADER } from '@cluesmith/codev-types';
-import { IDE_DEFAULT_PREFIX, readIdeConnectionToken } from '../lib/ide-record.js';
+import { IDE_DEFAULT_PREFIX, matchIdePrefix, readIdeConnectionToken } from '../lib/ide-record.js';
 import { getRecordedIdePort, ensureIdeServerLive } from './ide-server.js';
+import { IDE_FORWARD_COOKIE } from '../utils/server-utils.js';
 /** Hop-by-hop headers not forwarded between connections (RFC 7230 §6.1). */
 const HOP_BY_HOP = new Set([
     'connection',
@@ -38,16 +39,31 @@ const HOP_BY_HOP = new Set([
  *   server must never see it.
  * - `x-codev-tunnel-proxy`: Tower's tunnel marker — never forwarded, so it
  *   cannot leak or be trusted downstream (marker integrity, #1674).
+ * - `x-forwarded-host` / `-proto` / `-prefix`: only Tower's own stamps reach the
+ *   IDE server (Issue #1869); a client copy could steer the workbench's
+ *   `remoteAuthority` or base path.
  * - `host`: replaced with the loopback target authority below.
  */
 const STRIP_BEFORE_FORWARD = new Set([
     'x-forwarded-port',
     'x-original-host',
+    // Tower's own x-forwarded-* stamps are the only ones the IDE server may see
+    // (Issue #1869): client-supplied copies are dropped on every path.
+    'x-forwarded-host',
+    'x-forwarded-proto',
+    'x-forwarded-prefix',
     TOWER_KEY_HEADER,
     LEGACY_WEB_KEY_HEADER,
     TUNNEL_PROXY_HEADER,
     'host',
 ]);
+/**
+ * Response headers never relayed from the IDE server, on any path (Issue #1869):
+ * Tower must NEVER send `Access-Control-Allow-Credentials` (Tower reflects any
+ * loopback `Origin`, so with it another localhost page could read
+ * cookie-authorized `/ide` responses).
+ */
+const STRIP_FROM_RESPONSE = new Set(['access-control-allow-credentials']);
 /** True if this request arrived over the tunnel (stamped by `TunnelClient`, #1588). */
 function isTunnelBorne(headers) {
     return headers[TUNNEL_PROXY_HEADER] === '1';
@@ -55,17 +71,38 @@ function isTunnelBorne(headers) {
 /** The connection-token cookie name the VS Code server reads. */
 const IDE_TOKEN_COOKIE = 'vscode-tkn';
 /**
- * Merge the IDE connection token into a Cookie header value as `vscode-tkn=…`,
- * preserving every existing cookie and never clobbering an already-present
- * `vscode-tkn` (Issue #1668). Exported for testing.
+ * Set the IDE connection token in a Cookie header value as `vscode-tkn=…`,
+ * preserving every other cookie. Tower's token REPLACES any incoming
+ * `vscode-tkn` (Issue #1869): Tower is the sole legitimate source, so a
+ * browser-held copy (a hand-built `?tkn=` URL, a pre-fix session, a token
+ * stale after rotation) is never authoritative. Exported for testing.
  */
 export function mergeConnectionTokenCookie(existing, token) {
-    const current = Array.isArray(existing) ? existing.join('; ') : existing ?? '';
-    // Never clobber: if a vscode-tkn is already present, leave the header as-is.
-    if (new RegExp(`(^|;\\s*)${IDE_TOKEN_COOKIE}=`).test(current))
-        return current;
+    const others = stripCookie(existing, IDE_TOKEN_COOKIE);
     const pair = `${IDE_TOKEN_COOKIE}=${token}`;
-    return current ? `${current}; ${pair}` : pair;
+    return others ? `${others}; ${pair}` : pair;
+}
+/**
+ * Remove one cookie (exact name) from a Cookie header value, preserving every
+ * other pair in order. Accepts the string | string[] shape. Returns '' when no
+ * pair remains. Used to keep Tower's forward cookie (Issue #1869) away from the
+ * IDE server, the way the key header is stripped. Exported for testing.
+ */
+export function stripCookie(existing, name) {
+    if (existing === undefined)
+        return '';
+    const joined = Array.isArray(existing) ? existing.join('; ') : existing;
+    return joined
+        .split(';')
+        .map((pair) => pair.trim())
+        .filter((pair) => {
+        if (pair.length === 0)
+            return false;
+        const eq = pair.indexOf('=');
+        const pairName = eq < 0 ? pair : pair.slice(0, eq).trim();
+        return pairName !== name;
+    })
+        .join('; ');
 }
 /**
  * Derive the tunnel's public authority from the cloud config, matching the
@@ -111,38 +148,216 @@ export function buildForwardHeaders(incoming, port, publicAuthority, connectionT
         out[key] = value;
     }
     out['host'] = `127.0.0.1:${port}`;
-    if (isTunnelBorne(incoming) && publicAuthority) {
-        out['x-forwarded-host'] = publicAuthority.host;
-        out['x-forwarded-proto'] = publicAuthority.proto;
-        out['x-forwarded-prefix'] = publicAuthority.prefix;
+    if (isTunnelBorne(incoming)) {
+        if (publicAuthority) {
+            out['x-forwarded-host'] = publicAuthority.host;
+            out['x-forwarded-proto'] = publicAuthority.proto;
+            out['x-forwarded-prefix'] = publicAuthority.prefix;
+        }
+    }
+    else if (typeof incoming.host === 'string' && incoming.host.length > 0) {
+        // Local browser (Issue #1869): the IDE server builds the workbench's
+        // `remoteAuthority` from the Host it sees, and the rewrite above makes that
+        // its own port, so the workbench would dial the IDE server directly and
+        // bypass Tower's forward seam. Stamp Tower's own authority (the incoming
+        // Host, already Host-guarded) so the workbench's sockets and remote
+        // resources come back through Tower. No prefix: locally `/ide` IS the
+        // server's base path.
+        out['x-forwarded-host'] = incoming.host;
+        out['x-forwarded-proto'] = 'http';
     }
     // Present the IDE server's connection token as a cookie. The server is
-    // spawned with `--connection-token-file` and 403s without it, and it cannot
-    // ride the browser's cookie jar through the relay (Set-Cookie Path=/ide never
-    // matches /t/<tower>/ide/), so Tower injects it here — merging with, never
-    // clobbering, any existing Cookie header (Issue #1668).
+    // spawned with `--connection-token-file` and 403s without it, and the
+    // browser never holds the token (Tower strips the server's Set-Cookie,
+    // Issue #1869), so Tower injects it here on every request (Issue #1668),
+    // REPLACING any browser-held `vscode-tkn` and keeping every other cookie.
+    // Tower's own forward cookie is stripped first: the IDE server must never
+    // see it (Issue #1869).
+    const cookie = stripCookie(incoming.cookie, IDE_FORWARD_COOKIE);
+    delete out['cookie'];
     if (connectionToken) {
-        out['cookie'] = mergeConnectionTokenCookie(incoming.cookie, connectionToken);
+        out['cookie'] = mergeConnectionTokenCookie(cookie, connectionToken);
+    }
+    else if (cookie) {
+        out['cookie'] = cookie;
     }
     return out;
 }
-/** True if `pathname` targets the IDE forward prefix (`/ide` or `/ide/…`). */
-export function matchIdePrefix(pathname) {
-    const bare = IDE_DEFAULT_PREFIX.replace(/\/$/, ''); // "/ide"
-    return pathname === bare || pathname.startsWith(IDE_DEFAULT_PREFIX);
+/** True if `pathname` targets the IDE forward prefix; defined beside the prefix constant. */
+export { matchIdePrefix };
+/**
+ * Drop every `vscode-tkn` cookie the IDE server tries to set in the browser
+ * (Issue #1869). The server answers an authenticated request with
+ * `Set-Cookie: vscode-tkn=<connection token>` (7 days, SameSite=Lax); cookies
+ * are not port-scoped, so a browser holding it could open the remote protocol
+ * on the IDE server's own port from any localhost page, bypassing Tower. Tower
+ * injects the token on every forwarded request, so the browser never needs it.
+ * Returns undefined when nothing remains. Exported for testing.
+ */
+export function stripConnectionTokenSetCookie(value) {
+    if (value === undefined)
+        return undefined;
+    const entries = Array.isArray(value) ? value : [value];
+    const kept = entries.filter((entry) => !new RegExp(`^\\s*${IDE_TOKEN_COOKIE}=`).test(entry));
+    return kept.length > 0 ? kept : undefined;
 }
-/** Copy response headers, dropping hop-by-hop; preserves `Cache-Control` / `ETag`. */
-function copyResponseHeaders(headers) {
+/**
+ * Copy response headers, dropping hop-by-hop; preserves `Cache-Control` /
+ * `ETag`. With `stripTokenCookie` (a LOCAL request, Issue #1869) it also drops
+ * the IDE server's `vscode-tkn` Set-Cookie; the tunnel path relays it unchanged
+ * (the cloud variant is a separate follow-up). Exported for testing.
+ */
+export function copyResponseHeaders(headers, stripTokenCookie) {
     const out = {};
     for (const [key, value] of Object.entries(headers)) {
         if (value === undefined)
             continue;
-        if (HOP_BY_HOP.has(key.toLowerCase()))
+        const lower = key.toLowerCase();
+        if (HOP_BY_HOP.has(lower))
+            continue;
+        if (STRIP_FROM_RESPONSE.has(lower))
+            continue;
+        if (stripTokenCookie && lower === 'set-cookie') {
+            const kept = stripConnectionTokenSetCookie(value);
+            if (kept)
+                out[key] = kept;
             continue;
+        }
         out[key] = value;
     }
     return out;
 }
+/** Opening of the workbench configuration the IDE server embeds in its page. */
+const WORKBENCH_CONFIG_OPEN = '<meta id="vscode-workbench-web-configuration" data-settings="{';
+/** Largest workbench page Tower will buffer to rewrite; anything bigger streams unchanged. */
+export const MAX_WORKBENCH_HTML_BYTES = 2 * 1024 * 1024;
+/** Only a plain alphanumeric token is ever written into the page. */
+const SAFE_TOKEN = /^[A-Za-z0-9-]+$/;
+/** Decode the HTML character references the server uses in `data-settings`. */
+function decodeAttribute(value) {
+    return value
+        .replace(/&#x([0-9a-fA-F]+);/g, (_m, hex) => String.fromCodePoint(parseInt(hex, 16)))
+        .replace(/&#(\d+);/g, (_m, dec) => String.fromCodePoint(parseInt(dec, 10)))
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;|&apos;/g, "'")
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&');
+}
+/** The decoded `data-settings` JSON object, or null when it does not parse as one. */
+function parseSettings(attribute) {
+    try {
+        const parsed = JSON.parse(decodeAttribute(attribute));
+        if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed))
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Hand the workbench its connection token through its own configuration
+ * instead of the browser cookie jar (Issue #1869). The workbench takes
+ * `connectionToken` from its configuration first and falls back to the
+ * `vscode-tkn` cookie, which Tower strips locally because a cookie is readable
+ * by every localhost port. Same shape as Tower's same-origin key injection into
+ * the dashboard shell: post-auth only, never cross-origin readable.
+ *
+ * Inserts `"connectionToken":"<token>"` as the first key of the HTML-escaped
+ * JSON in `data-settings` (no trailing comma for an empty `{}`). Returns null,
+ * so the caller relays the page unchanged, when the token is not
+ * `^[A-Za-z0-9-]+$`, the page carries no workbench configuration, the
+ * configuration does not parse, it already names a `connectionToken`, or the
+ * rewritten configuration would not decode to valid JSON carrying the token.
+ * Exported for testing.
+ */
+export function injectWorkbenchConnectionToken(html, token) {
+    if (!SAFE_TOKEN.test(token))
+        return null;
+    const start = html.indexOf(WORKBENCH_CONFIG_OPEN);
+    if (start < 0)
+        return null;
+    const valueStart = start + WORKBENCH_CONFIG_OPEN.length - 1; // at the "{"
+    const valueEnd = html.indexOf('"', valueStart);
+    if (valueEnd < 0)
+        return null;
+    const original = html.slice(valueStart, valueEnd);
+    const settings = parseSettings(original);
+    if (!settings || 'connectionToken' in settings)
+        return null;
+    const isEmpty = Object.keys(settings).length === 0;
+    const entry = `&quot;connectionToken&quot;:&quot;${token}&quot;`;
+    let rewritten = `{${entry},${original.slice(1)}`;
+    if (isEmpty)
+        rewritten = `{${entry}}`;
+    const check = parseSettings(rewritten);
+    if (!check || check.connectionToken !== token)
+        return null;
+    return html.slice(0, valueStart) + rewritten + html.slice(valueEnd);
+}
+/**
+ * True for a response Tower may rewrite: 200, uncompressed `text/html`, and not
+ * declared larger than the bound. Everything else streams unchanged.
+ */
+function isRewritableWorkbenchPage(res) {
+    if (res.statusCode !== 200)
+        return false;
+    const type = res.headers['content-type'] ?? '';
+    if (!type.startsWith('text/html'))
+        return false;
+    if (res.headers['content-encoding'] !== undefined)
+        return false;
+    const declared = Number(res.headers['content-length']);
+    if (Number.isFinite(declared) && declared > MAX_WORKBENCH_HTML_BYTES)
+        return false;
+    return true;
+}
+/**
+ * Buffer a workbench page (up to the bound), inject the connection token, and
+ * relay it with a corrected Content-Length. A body that outgrows the bound
+ * mid-stream is relayed unchanged: the buffered bytes, then a pipe of the rest.
+ */
+function relayWorkbenchHtml(proxyRes, res, token) {
+    const chunks = [];
+    let size = 0;
+    let streaming = false;
+    const onData = (chunk) => {
+        chunks.push(chunk);
+        size += chunk.length;
+        if (size <= MAX_WORKBENCH_HTML_BYTES)
+            return;
+        streaming = true;
+        proxyRes.off('data', onData);
+        res.writeHead(proxyRes.statusCode ?? 502, copyResponseHeaders(proxyRes.headers, true));
+        for (const buffered of chunks)
+            res.write(buffered);
+        proxyRes.pipe(res);
+    };
+    proxyRes.on('data', onData);
+    proxyRes.on('end', () => {
+        if (streaming)
+            return;
+        const original = Buffer.concat(chunks).toString('utf8');
+        const rewritten = injectWorkbenchConnectionToken(original, token);
+        const body = Buffer.from(rewritten ?? original, 'utf8');
+        const out = copyResponseHeaders(proxyRes.headers, true);
+        for (const key of Object.keys(out)) {
+            const lower = key.toLowerCase();
+            if (lower === 'content-length' || lower === 'transfer-encoding')
+                delete out[key];
+        }
+        out['content-length'] = body.length;
+        res.writeHead(proxyRes.statusCode ?? 502, out);
+        res.end(body);
+    });
+    proxyRes.on('error', () => {
+        if (!res.headersSent)
+            res.writeHead(502, { 'Content-Type': 'application/json' });
+        if (!res.writableEnded)
+            res.end();
+    });
+}
 /**
  * Forward a plain HTTP request to the local IDE server. Assumes authorization
  * has already passed. Path and query are forwarded unchanged (the workbench
@@ -158,9 +373,17 @@ export async function forwardIdeHttp(req, res, log) {
         res.end(JSON.stringify({ error: 'IDE server unavailable' }));
         return;
     }
-    const headers = buildForwardHeaders(req.headers, port, getPublicAuthority(), readIdeConnectionToken());
+    const connectionToken = readIdeConnectionToken();
+    const local = !isTunnelBorne(req.headers);
+    const headers = buildForwardHeaders(req.headers, port, getPublicAuthority(), connectionToken);
     const proxyReq = http.request({ hostname: '127.0.0.1', port, path: req.url || '/', method: req.method, headers }, (proxyRes) => {
-        res.writeHead(proxyRes.statusCode ?? 502, copyResponseHeaders(proxyRes.headers));
+        // Local only (Issue #1869): the browser gets the token through the
+        // workbench configuration, never as a cookie. The tunnel path is unchanged.
+        if (local && connectionToken && isRewritableWorkbenchPage(proxyRes)) {
+            relayWorkbenchHtml(proxyRes, res, connectionToken);
+            return;
+        }
+        res.writeHead(proxyRes.statusCode ?? 502, copyResponseHeaders(proxyRes.headers, local));
         proxyRes.pipe(res);
         proxyRes.on('error', () => {
             if (!res.writableEnded)
@@ -221,7 +444,7 @@ export async function forwardIdeWebSocket(req, socket, head, log) {
     });
     upstream.on('upgrade', (_upstreamRes, upstreamSocket, upstreamHead) => {
         // Replay the handshake response and any buffered bytes, then pipe both ways.
-        socket.write(rebuildUpgradeResponse(_upstreamRes));
+        socket.write(rebuildUpgradeResponse(_upstreamRes, !isTunnelBorne(req.headers)));
         if (upstreamHead.length > 0)
             socket.write(upstreamHead);
         if (head.length > 0)
@@ -254,11 +477,20 @@ export async function forwardIdeWebSocket(req, socket, head, log) {
     });
     upstream.end();
 }
-/** Reconstruct the HTTP/1.1 101 switching-protocols response line + headers. */
-function rebuildUpgradeResponse(res) {
+/**
+ * Reconstruct the HTTP/1.1 101 switching-protocols response line + headers.
+ * With `stripTokenCookie` (a LOCAL request) it drops the IDE server's
+ * `vscode-tkn` Set-Cookie like the HTTP path does. Exported for testing.
+ */
+export function rebuildUpgradeResponse(res, stripTokenCookie) {
     const statusLine = `HTTP/1.1 ${res.statusCode ?? 101} ${res.statusMessage ?? 'Switching Protocols'}`;
     const lines = [statusLine];
-    for (const [key, value] of Object.entries(res.headers)) {
+    for (const [key, raw] of Object.entries(res.headers)) {
+        if (STRIP_FROM_RESPONSE.has(key.toLowerCase()))
+            continue;
+        let value = raw;
+        if (stripTokenCookie && key.toLowerCase() === 'set-cookie')
+            value = stripConnectionTokenSetCookie(raw);
         if (value === undefined)
             continue;
         if (Array.isArray(value)) {