coderaft 0.0.25 → 0.0.27

package/README.md

@@ -135,6 +135,34 @@ interface CodeServerHandle {
 }
 ```
 
+### `spawnCodeServer(options)`
+
+Runs the code-server in a forked Node.js child process — useful for isolating VS Code's singletons from the host or restarting the server without taking the host down. Accepts the same options as `startCodeServer`, plus a `spawn` sub-object (`env`, `execArgv`, `stdio`, `startupTimeout`).
+
+```ts
+import { spawnCodeServer } from "coderaft";
+
+const instance = await spawnCodeServer({
+  port: 6063,
+  defaultFolder: "/path/to/workspace",
+});
+
+console.log(`Ready at ${instance.url}`);
+
+// Notify on unexpected worker exits (not fired during close/reload):
+instance.on("exit", (code, signal) => {
+  console.warn(`worker died code=${code} signal=${signal}`);
+});
+
+// Restart the worker in place (reads fresh url/port/connectionToken after):
+await instance.reload();
+
+// Graceful shutdown — SIGTERM to the worker, then SIGKILL after 5s:
+await instance.close();
+```
+
+Options cross an IPC boundary, so nested values (`vscode`, etc.) must be JSON-compatible.
+
 ## CLI Options
 
 ### Server

package/ThirdPartyNotices.txt

@@ -375,6 +375,214 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
+codex
+https://github.com/openai/codex
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1.  Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+2.  Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+3.  Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+4.  Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+    Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+    stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work,
+    excluding those notices that do not pertain to any part of
+    the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute must
+    include a readable copy of the attribution notices contained
+    within such NOTICE file, excluding those notices that do not
+    pertain to any part of the Derivative Works, in at least one
+    of the following places: within a NOTICE text file distributed
+    as part of the Derivative Works; within the Source form or
+    documentation, if provided along with the Derivative Works; or,
+    within a display generated by the Derivative Works, if and
+    wherever such third-party notices normally appear. The contents
+    of the NOTICE file are for informational purposes only and
+    do not modify the License. You may add Your own attribution
+    notices within Derivative Works that You distribute, alongside
+    or as an addendum to the NOTICE text from the Work, provided
+    that such additional attribution notices cannot be construed
+    as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+5.  Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+6.  Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+7.  Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+8.  Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+9.  Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+Copyright 2025 OpenAI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 Colorsublime-Themes 0.1.0
 https://github.com/Colorsublime/Colorsublime-Themes
 
@@ -528,7 +736,7 @@ dompurify 3.2.7 - Apache 2.0
 https://github.com/cure53/DOMPurify
 
 DOMPurify
-Copyright 2025 Dr.-Ing. Mario Heiderich, Cure53
+Copyright 2025-2026 Dr.-Ing. Mario Heiderich, Cure53
 
 DOMPurify is free software; you can redistribute it and/or modify it under the
 terms of either:
@@ -726,7 +934,7 @@ b) the Mozilla Public License Version 2.0
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+Copyright 2025-2026 Dr.-Ing. Mario Heiderich, Cure53
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1985,7 +2193,7 @@ THE SOFTWARE.
 marked 14.0.0 - MIT
 https://github.com/markedjs/marked
 
-information
+# License information
 
 ## Contribution License Agreement
 

package/code.mjs

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
 
 // Auto-updated by scripts/pack.ts
-const codeArchiveHash = "096c26773369f84b";
+const codeArchiveHash = "c433dbc9db2649ca";
 
 const archivePath = fileURLToPath(new URL("./code.tar.zst", import.meta.url));
 

package/dist/_chunks/libs/httpxy.mjs

@@ -39,6 +39,10 @@ function setupOutgoing(outgoing, options, req, forward) {
 		const value = options[forward || "target"][e];
 		if (value !== void 0) outgoing[e] = value;
 	}
+	if (outgoing.host === void 0 && typeof outgoing.hostname === "string") {
+		const bracketedHost = outgoing.hostname.includes(":") && !outgoing.hostname.startsWith("[") ? `[${outgoing.hostname}]` : outgoing.hostname;
+		outgoing.host = outgoing.port ? `${bracketedHost}:${outgoing.port}` : bracketedHost;
+	}
 	outgoing.method = options.method || req.method;
 	outgoing.headers = { ...req.headers };
 	if (req.headers?.[":authority"]) outgoing.headers.host = req.headers[":authority"];
@@ -48,7 +52,7 @@ function setupOutgoing(outgoing, options, req, forward) {
 	if (options.ca) outgoing.ca = options.ca;
 	if (isSSL.test(options[forward || "target"].protocol ?? "http")) outgoing.rejectUnauthorized = options.secure === void 0 ? true : options.secure;
 	if (options.agent !== void 0) outgoing.agent = options.agent || false;
-	else if (req.httpVersionMajor > 1) outgoing.agent = false;
+	else if (req.httpVersionMajor > 1 || upgradeHeader.test(req.headers.connection || "")) outgoing.agent = false;
 	else {
 		const targetProto = options[forward || "target"].protocol ?? "http";
 		outgoing.agent = isSSL.test(targetProto) ? defaultAgents.https : defaultAgents.http;
@@ -76,7 +80,7 @@ function setupOutgoing(outgoing, options, req, forward) {
 }
 function joinURL(base, path) {
 	if (!base || base === "/") return path || "/";
-	if (!path || path === "/") return base || "/";
+	if (!path) return base;
 	const baseHasTrailing = base[base.length - 1] === "/";
 	const pathHasLeading = path[0] === "/";
 	if (baseHasTrailing && pathHasLeading) return base + path.slice(1);
@@ -235,7 +239,7 @@ const webIncomingMiddleware = [
 			"proto"
 		]) {
 			const key = "x-forwarded-" + header;
-			if (!req.headers[key]) req.headers[key] = values[header];
+			if (!req.headers[key] && values[header] !== void 0) req.headers[key] = values[header];
 		}
 		req.headers["x-forwarded-host"] = req.headers["x-forwarded-host"] || req.headers[":authority"] || req.headers.host || "";
 	}),
@@ -393,7 +397,7 @@ const websocketIncomingMiddleware = [
 			"proto"
 		]) {
 			const key = "x-forwarded-" + header;
-			if (!req.headers[key]) req.headers[key] = values[header];
+			if (!req.headers[key] && values[header] !== void 0) req.headers[key] = values[header];
 		}
 	}),
 	defineProxyMiddleware((req, socket, options, server, head, callback) => {
@@ -464,7 +468,7 @@ var ProxyServer = class extends EventEmitter {
 		this.web = _createProxyFn("web", this);
 		this.ws = _createProxyFn("ws", this);
 	}
-	listen(port, hostname) {
+	listen(port, hostname, listeningListener) {
 		const closure = (req, res) => {
 			return this.web(req, res);
 		};
@@ -479,7 +483,7 @@ var ProxyServer = class extends EventEmitter {
 		if (this.options.ws) this._server.on("upgrade", (req, socket, head) => {
 			this.ws(req, socket, this.options, head).catch(() => {});
 		});
-		this._server.listen(port, hostname);
+		this._server.listen(port, hostname, listeningListener);
 		return this;
 	}
 	close(callback) {
@@ -537,15 +541,15 @@ function _createProxyFn(type, server) {
 		for (const pass of server._getPasses(type)) {
 			let stop;
 			try {
-				stop = pass(req, res, requestOptions, server, head, (error) => {
+				stop = pass(req, res, requestOptions, server, head, (error, _req, _res, url) => {
 					if (server.listenerCount("error") > 0) {
-						server.emit("error", error, req, res);
+						server.emit("error", error, req, res, url);
 						_resolve();
 					} else _reject(error);
 				});
 			} catch (error) {
 				if (server.listenerCount("error") > 0) {
-					server.emit("error", error, req, res);
+					server.emit("error", error, req, res, requestOptions.target || requestOptions.forward);
 					_resolve();
 				} else _reject(error);
 				break;

package/dist/_chunks/server.mjs

@@ -317,11 +317,19 @@ async function startCodeServer(opts = {}) {
 	const address = server.address();
 	const actualPort = address && typeof address === "object" && "port" in address ? address.port : void 0;
 	const basePath = normalizeBaseURL(opts.baseURL ?? opts.vscode?.["server-base-path"]);
+	let url;
+	if (socketPath) url = `unix:${socketPath}`;
+	else {
+		const baseUrl = new URL(`http://localhost:${actualPort}${basePath}/`);
+		if (handler.connectionToken) baseUrl.searchParams.set("tkn", handler.connectionToken);
+		const rawUrl = opts.formatURL ? opts.formatURL(baseUrl) ?? baseUrl : baseUrl;
+		url = rawUrl instanceof URL ? rawUrl.toString() : rawUrl;
+	}
 	return {
 		server,
 		port: actualPort,
 		socketPath,
-		url: socketPath ? `unix:${socketPath}` : handler.connectionToken ? `http://localhost:${actualPort}${basePath}/?tkn=${handler.connectionToken}` : `http://localhost:${actualPort}${basePath}/`,
+		url,
 		connectionToken: handler.connectionToken,
 		async close() {
 			await handler.dispose();

package/dist/index.d.mts

@@ -1,4 +1,6 @@
+import { ChildProcess } from "node:child_process";
 import { IncomingMessage, Server, ServerResponse } from "node:http";
+import { EventEmitter } from "node:events";
 import { Duplex } from "node:stream";
 /**
  * Options for `createServer()` from VS Code server
@@ -81,6 +83,12 @@ interface VSCodeServerOptions {
 interface CreateCodeServerOptions {
   /** Workspace folder opened when no input is given in the URL. */
   defaultFolder?: string;
+  /**
+   * Customize the URL returned by the server. Called with the base URL after
+   * auth params are applied. Return a modified URL, a string, or `undefined`
+   * to keep the original.
+   */
+  formatURL?: (url: URL) => string | URL | undefined;
   /** Connection token (shared auth secret). Auto-generated if omitted. */
   connectionToken?: string;
   /** Host/interface to bind (used to infer local-only access for token default). */
@@ -120,4 +128,59 @@ interface CodeServerHandle {
 }
 declare function createCodeServer(opts?: CreateCodeServerOptions): Promise<CodeServerHandler>;
 declare function startCodeServer(opts?: StartCodeServerOptions): Promise<CodeServerHandle>;
-export { type CodeServerHandle, type CodeServerHandler, type CreateCodeServerOptions, type StartCodeServerOptions, createCodeServer, startCodeServer };
+interface SpawnProcessOptions {
+  /** Extra environment variables merged into the worker's `process.env`. */
+  env?: NodeJS.ProcessEnv;
+  /** Node.js exec argv forwarded to the worker (e.g. `["--inspect"]`). */
+  execArgv?: string[];
+  /**
+   * stdio for the forked worker. Defaults to `"inherit"` for stdout/stderr and
+   * `"ignore"` for stdin. Pass `"pipe"` to capture output via `handle.proc`.
+   */
+  stdio?: "inherit" | "pipe" | "ignore";
+  /**
+   * Max ms to wait for the worker to report `ready`. Defaults to 60000.
+   * On timeout, the worker is killed and the promise rejects.
+   */
+  startupTimeout?: number;
+}
+interface SpawnCodeServerOptions extends StartCodeServerOptions {
+  /** Options for the forked worker process. */
+  spawn?: SpawnProcessOptions;
+}
+interface SpawnedCodeServer {
+  /**
+   * Emitted when the handle loses its worker: crash, explicit kill, or a
+   * `reload()` whose respawn failed (the old worker is already gone; the
+   * failure also rejects the `reload()` promise). Not emitted for `close()`
+   * or the successful half of `reload()`.
+   */
+  on(event: "exit", listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
+  /**
+   * Emitted for worker `error` events (spawn failure, IPC send failure) and
+   * for post-ready fatal errors forwarded by the worker (uncaughtException,
+   * unhandledRejection).
+   */
+  on(event: "error", listener: (err: Error) => void): this;
+  on(event: string, listener: (...args: unknown[]) => void): this;
+}
+declare class SpawnedCodeServer extends EventEmitter {
+  #private;
+  /** The forked worker process (changes after `reload`). */
+  proc: ChildProcess;
+  url: string;
+  /** TCP port the server is bound to, or `undefined` when listening on a unix socket. */
+  port?: number;
+  /** Unix socket path the server is bound to, or `undefined` when listening on TCP. */
+  socketPath?: string;
+  connectionToken: string;
+  private constructor();
+  /** Spawn a new worker and resolve with a handle once it reports ready. */
+  static spawn(opts?: SpawnCodeServerOptions): Promise<SpawnedCodeServer>;
+  /** Terminate the worker process. Sends SIGTERM, then SIGKILL after 5s. Idempotent. */
+  close(): Promise<void>;
+  /** Kill the current worker and spawn a new one with the original options. */
+  reload(): Promise<void>;
+}
+declare function spawnCodeServer(opts?: SpawnCodeServerOptions): Promise<SpawnedCodeServer>;
+export { type CodeServerHandle, type CodeServerHandler, type CreateCodeServerOptions, type SpawnCodeServerOptions, type SpawnProcessOptions, SpawnedCodeServer, type StartCodeServerOptions, createCodeServer, spawnCodeServer, startCodeServer };

package/dist/index.mjs

@@ -1,2 +1,171 @@
 import { r as startCodeServer, t as createCodeServer } from "./_chunks/server.mjs";
-export { createCodeServer, startCodeServer };
+import { fileURLToPath } from "node:url";
+import { fork } from "node:child_process";
+import { EventEmitter } from "node:events";
+var SpawnedCodeServer = class SpawnedCodeServer extends EventEmitter {
+	proc;
+	url;
+	port;
+	socketPath;
+	connectionToken;
+	#opts;
+	#detach;
+	#reloading;
+	#closed = false;
+	constructor(opts, state) {
+		super();
+		this.#opts = opts;
+		this.#adopt(state);
+	}
+	static async spawn(opts = {}) {
+		return new SpawnedCodeServer(opts, await spawnWorker(opts));
+	}
+	async close() {
+		if (this.#closed) return;
+		this.#closed = true;
+		if (this.#reloading) try {
+			await this.#reloading;
+		} catch {}
+		this.#detach();
+		await terminateChild(this.proc);
+	}
+	async reload() {
+		if (this.#closed) throw new Error("SpawnedCodeServer is closed");
+		if (this.#reloading) return this.#reloading;
+		this.#reloading = (async () => {
+			this.#detach();
+			await terminateChild(this.proc);
+			if (this.#closed) throw new Error("SpawnedCodeServer was closed during reload");
+			let next;
+			try {
+				next = await spawnWorker(this.#opts);
+			} catch (err) {
+				const dead = this.proc;
+				queueMicrotask(() => this.emit("exit", dead.exitCode, dead.signalCode));
+				throw err;
+			}
+			if (this.#closed) {
+				await terminateChild(next.proc);
+				throw new Error("SpawnedCodeServer was closed during reload");
+			}
+			this.#adopt(next);
+		})();
+		try {
+			await this.#reloading;
+		} finally {
+			this.#reloading = void 0;
+		}
+	}
+	#adopt(state) {
+		this.proc = state.proc;
+		this.url = state.url;
+		this.port = state.port;
+		this.socketPath = state.socketPath;
+		this.connectionToken = state.connectionToken;
+		this.#detach = this.#attachListeners(state.proc);
+	}
+	#attachListeners(proc) {
+		const onExit = (code, signal) => this.emit("exit", code, signal);
+		const onError = (err) => this.emit("error", err);
+		const onMessage = (msg) => {
+			if (msg?.type === "error") this.emit("error", new Error(msg.message ?? "worker error"));
+		};
+		proc.on("exit", onExit);
+		proc.on("error", onError);
+		proc.on("message", onMessage);
+		return () => {
+			proc.off("exit", onExit);
+			proc.off("error", onError);
+			proc.off("message", onMessage);
+		};
+	}
+};
+function spawnCodeServer(opts = {}) {
+	return SpawnedCodeServer.spawn(opts);
+}
+async function spawnWorker(opts) {
+	const { spawn: spawnOpts = {}, ...serverOpts } = opts;
+	const { env, execArgv, stdio = "inherit", startupTimeout = 6e4 } = spawnOpts;
+	const workerPath = fileURLToPath(import.meta.resolve("#worker"));
+	const childEnv = {
+		...process.env,
+		...env
+	};
+	delete childEnv.CODE_SERVER_PARENT_PID;
+	const proc = fork(workerPath, {
+		stdio: [
+			"ignore",
+			stdio,
+			stdio,
+			"ipc"
+		],
+		env: childEnv,
+		...execArgv !== void 0 ? { execArgv } : {}
+	});
+	const ready = await new Promise((resolve, reject) => {
+		const onMessage = (msg) => {
+			if (msg?.type === "ready") {
+				cleanup();
+				resolve(msg);
+			} else if (msg?.type === "error") {
+				cleanup();
+				reject(new Error(msg.message ?? "worker error"));
+			}
+		};
+		const onExit = (code) => {
+			cleanup();
+			reject(/* @__PURE__ */ new Error(`coderaft worker exited before ready (code=${code})`));
+		};
+		const onError = (err) => {
+			cleanup();
+			proc.kill("SIGKILL");
+			reject(err);
+		};
+		const timer = setTimeout(() => {
+			cleanup();
+			proc.kill("SIGKILL");
+			reject(/* @__PURE__ */ new Error(`coderaft worker did not become ready within ${startupTimeout}ms`));
+		}, startupTimeout);
+		timer.unref?.();
+		const cleanup = () => {
+			clearTimeout(timer);
+			proc.off("message", onMessage);
+			proc.off("exit", onExit);
+			proc.off("error", onError);
+		};
+		proc.on("message", onMessage);
+		proc.once("exit", onExit);
+		proc.once("error", onError);
+		proc.send({
+			type: "start",
+			opts: serverOpts
+		}, (err) => {
+			if (err) {
+				cleanup();
+				reject(err);
+			}
+		});
+	});
+	return {
+		proc,
+		url: ready.url,
+		port: ready.port,
+		socketPath: ready.socketPath,
+		connectionToken: ready.connectionToken
+	};
+}
+async function terminateChild(proc) {
+	if (proc.exitCode !== null || proc.signalCode !== null) return;
+	await new Promise((resolve) => {
+		const timer = setTimeout(() => {
+			if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGKILL");
+		}, 5e3);
+		timer.unref?.();
+		proc.once("exit", () => {
+			clearTimeout(timer);
+			resolve();
+		});
+		proc.kill("SIGTERM");
+	});
+}
+export { SpawnedCodeServer, createCodeServer, spawnCodeServer, startCodeServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderaft",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "repository": "pithings/coderaft",
   "bin": {
     "coderaft": "./dist/cli.mjs"
@@ -11,6 +11,7 @@
     "ThirdPartyNotices.txt",
     "tar.mjs",
     "code.mjs",
+    "worker.mjs",
     "android-preload.cjs",
     "code.tar.zst"
   ],
@@ -21,12 +22,14 @@
   },
   "imports": {
     "#code": "./code.mjs",
+    "#worker": "./worker.mjs",
     "#android-preload": "./android-preload.cjs"
   },
   "scripts": {
     "build": "obuild"
   },
   "devDependencies": {
+    "code-server": "^4.117.0",
     "@github/copilot": "workspace:*",
     "@github/copilot-sdk": "workspace:*",
     "@microsoft/1ds-core-js": "workspace:*",
@@ -39,21 +42,21 @@
     "@vscode/proxy-agent": "workspace:*",
     "@vscode/ripgrep": "workspace:*",
     "@vscode/spdlog": "workspace:*",
-    "@vscode/tree-sitter-wasm": "^0.3.0",
+    "@vscode/sqlite3": "workspace:*",
+    "@vscode/tree-sitter-wasm": "^0.3.1",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "workspace:*",
     "@vscode/windows-registry": "workspace:*",
-    "@xterm/addon-clipboard": "^0.3.0-beta.191",
-    "@xterm/addon-image": "^0.10.0-beta.191",
-    "@xterm/addon-ligatures": "^0.11.0-beta.191",
-    "@xterm/addon-progress": "^0.3.0-beta.191",
-    "@xterm/addon-search": "^0.17.0-beta.191",
-    "@xterm/addon-serialize": "^0.15.0-beta.191",
-    "@xterm/addon-unicode11": "^0.10.0-beta.191",
-    "@xterm/addon-webgl": "^0.20.0-beta.190",
-    "@xterm/headless": "^6.1.0-beta.191",
-    "@xterm/xterm": "^6.1.0-beta.191",
-    "code-server": "^4.114.1",
+    "@xterm/addon-clipboard": "^0.3.0-beta.197",
+    "@xterm/addon-image": "^0.10.0-beta.197",
+    "@xterm/addon-ligatures": "^0.11.0-beta.197",
+    "@xterm/addon-progress": "^0.3.0-beta.197",
+    "@xterm/addon-search": "^0.17.0-beta.197",
+    "@xterm/addon-serialize": "^0.15.0-beta.197",
+    "@xterm/addon-unicode11": "^0.10.0-beta.197",
+    "@xterm/addon-webgl": "^0.20.0-beta.196",
+    "@xterm/headless": "^6.1.0-beta.197",
+    "@xterm/xterm": "^6.1.0-beta.197",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -63,8 +66,9 @@
     "kerberos": "workspace:*",
     "minimist": "^1.2.8",
     "node-pty": "workspace:*",
+    "ssh2": "workspace:*",
     "tas-client": "0.3.1",
-    "typescript": "^6.0.2",
+    "typescript": "^6.0.3",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "^9.3.2",

package/worker.mjs

@@ -0,0 +1,64 @@
+// Forked worker entry used by `spawnCodeServer`. Starts a coderaft code server
+// on IPC `{ type: "start", opts }` and replies with `{ type: "ready", ... }`.
+// On SIGTERM/SIGINT, gracefully closes the server before exiting so the parent's
+// `handle.close()` cleanly disposes VS Code and releases sockets/locks.
+import { startCodeServer } from "./dist/index.mjs";
+
+let handle;
+let shuttingDown = false;
+
+process.on("message", async (msg) => {
+  if (msg?.type !== "start") return;
+  try {
+    handle = await startCodeServer(msg.opts);
+    process.send?.({
+      type: "ready",
+      url: handle.url,
+      port: handle.port,
+      socketPath: handle.socketPath,
+      connectionToken: handle.connectionToken,
+    });
+  } catch (err) {
+    // Flush the error message over IPC before exiting — `process.exit` can
+    // tear down the channel before the message reaches the parent, which
+    // would leave the parent rejecting with the generic `exited before ready`.
+    const exit = () => process.exit(1);
+    if (process.send) {
+      process.send({ type: "error", message: err?.message ?? String(err) }, exit);
+    } else {
+      exit();
+    }
+  }
+});
+
+const shutdown = async (signal) => {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  try {
+    await handle?.close();
+  } catch (err) {
+    console.error(`[coderaft worker] close failed on ${signal}:`, err);
+  }
+  process.exit(0);
+};
+
+process.on("SIGTERM", () => shutdown("SIGTERM"));
+process.on("SIGINT", () => shutdown("SIGINT"));
+
+// Forward fatal async errors to the parent before exiting. Without this, the
+// parent only sees an anonymous non-zero exit and has to scrape stderr for the
+// reason — which is the exact failure mode the pre-ready IPC flush avoids.
+const forwardFatal = (kind) => (err) => {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  const detail = err?.stack ?? err?.message ?? String(err);
+  const exit = () => process.exit(1);
+  if (process.send) {
+    process.send({ type: "error", message: `[${kind}] ${detail}` }, exit);
+  } else {
+    exit();
+  }
+};
+
+process.on("uncaughtException", forwardFatal("uncaughtException"));
+process.on("unhandledRejection", forwardFatal("unhandledRejection"));