@averyyy/pi-client 0.80.3-piclient.5 → 0.80.3-piclient.6

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 - Initial `pi-client` package as a lightweight wrapper that exposes only the `pi-client` bin without `pi`.
 - Global install wrapper that launches the local forked coding-agent entrypoint while sharing the original `~/.pi/agent` configuration.
 - `pi-client update` command for updating the fork checkout and reinstalling both `pi-client` and `pi-server`.
-- npm global package updates and proxy warning acknowledgement during `pi-client update`.
+- npm global package updates during `pi-client update`.
 - `pi-client web` command that starts the PI WEB client GUI on port `1838` by default.
 - Pi Server status, URL settings, client actions, project visibility, and global `AGENTS.md` editing inside `pi-client web`.
+
+### Fixed
+
+- Used `--legacy-peer-deps` for npm-global fork updates and documented installs so existing upstream Pi installs do not trigger peer override warnings for forked prerelease aliases.
+- Fixed `pi-client web` startup on Windows by using PI WEB's TCP session daemon mode instead of the default Unix socket path.

package/README.md

@@ -5,9 +5,11 @@ Client CLI for connecting Pi to a `pi-server` instance.
 ## Install
 
 ```bash
-npm i -g @averyyy/pi-client
+npm i -g --ignore-scripts --legacy-peer-deps @averyyy/pi-client
 ```
 
+`--legacy-peer-deps` avoids npm peer override warnings when upstream Pi is already installed globally.
+
 ## Use
 
 Connect to the hosted server:
@@ -43,5 +45,5 @@ PI_SERVER_AUTH_TOKEN=your-token PI_SERVER_URL=http://127.0.0.1:4217 pi-client
 Install the server separately:
 
 ```bash
-npm i -g @averyyy/pi-server
+npm i -g --ignore-scripts @averyyy/pi-server
 ```

package/bin/update.js

@@ -1,19 +1,8 @@
 import { spawnSync } from "node:child_process";
-import { Buffer } from "node:buffer";
 import { readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
-const H_PROXY_WARNING_URL_PATTERN =
-	/https?:\/\/114\.114\.114\.114:\d+\/proxycontrolwarn\/httpwarning_\d+\.html\?ori_url=[A-Za-z0-9+/=]+(?:&uid=\d+)?/;
-const H_PROXY_WARNING_HOST = "114.114.114.114:9421";
-const H_PROXY_HEADERS = {
-	"User-Agent":
-		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121 Safari/537.36",
-	Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-	"Accept-Language": "en-US,en;q=0.5",
-};
-
 function defaultPackageRoot() {
 	return dirname(dirname(fileURLToPath(import.meta.url)));
 }
@@ -30,173 +19,23 @@ function runStep(runner, command, args, cwd, stdio = "inherit") {
 	return runner(command, args, { cwd, stdio, encoding: "utf-8" });
 }
 
-function responseStatus(response) {
-	return response.statusText ? `${response.status} ${response.statusText}` : String(response.status);
-}
-
-function getQueryValue(url, name) {
-	const match = new RegExp(`[?&]${name}=([^&]+)`).exec(url);
-	return match?.[1] ?? "";
-}
-
-function getInputValue(html, id) {
-	const match = new RegExp(`id="${id}"[^>]*value="([^"]*)"`).exec(html);
-	return match?.[1] ?? "";
-}
-
-function bitReverse(value) {
-	return (
-		((1 & value) << 7) |
-		((2 & value) << 5) |
-		((4 & value) << 3) |
-		((8 & value) << 1) |
-		((16 & value) >> 1) |
-		((32 & value) >> 3) |
-		((64 & value) >> 5) |
-		((128 & value) >> 7)
-	);
-}
-
-function encodeWarningByte(value) {
-	if (value === 32) return "+";
-	if (
-		(value < 48 && value !== 45 && value !== 46) ||
-		(value < 65 && value > 57) ||
-		(value > 90 && value < 97 && value !== 95) ||
-		value > 122
-	) {
-		return `%${value.toString(16).toUpperCase().padStart(2, "0")}`;
-	}
-	return String.fromCharCode(value);
-}
-
-function md6(value) {
-	let result = "";
-	for (let index = 0; index < value.length; index++) {
-		result += encodeWarningByte(53 ^ bitReverse(value.charCodeAt(index)) ^ (255 & index));
-	}
-	return result;
-}
-
-function b64(value) {
-	return Buffer.from(value, "utf-8").toString("base64");
-}
-
-async function findHProxyWarningUrl(response) {
-	const location = response.headers.get("location") ?? "";
-	if (response.status === 302 && H_PROXY_WARNING_URL_PATTERN.test(location)) return location;
-	if (H_PROXY_WARNING_URL_PATTERN.test(response.url)) return response.url;
-
-	const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
-	if (!contentType.includes("text/html")) return undefined;
-
-	const body = await response.clone().text();
-	return H_PROXY_WARNING_URL_PATTERN.exec(body)?.[0];
-}
-
-async function approveHProxyWarning(warningUrl, fetchImpl) {
-	const warningResponse = await fetchImpl(warningUrl, {
-		method: "GET",
-		headers: H_PROXY_HEADERS,
-		redirect: "manual",
-	});
-	const html = await warningResponse.text();
-	if (!warningResponse.ok) {
-		throw new Error(`Proxy warning page fetch failed: ${responseStatus(warningResponse)}`);
-	}
-
-	const oriUrl = getQueryValue(warningUrl, "ori_url");
-	const sessionId = getInputValue(html, "sessionid");
-	if (!oriUrl || !sessionId) {
-		throw new Error("Proxy warning page did not include approval fields");
-	}
-
-	const pid = getInputValue(html, "pid");
-	const uid = getInputValue(html, "uid");
-	const payload = `ori_url=${oriUrl}&sessionid=${sessionId}&pid=${pid}&uid=${uid}`;
-	const checkUrl = `http://${H_PROXY_WARNING_HOST}/proxycontrolwarn/check?${b64(md6(b64(payload)))}`;
-	const checkResponse = await fetchImpl(checkUrl, {
-		method: "GET",
-		headers: H_PROXY_HEADERS,
-		redirect: "manual",
-	});
-	const checkBody = await checkResponse.text();
-	if (!checkResponse.ok) {
-		throw new Error(`Proxy approval failed: ${responseStatus(checkResponse)} ${checkBody.slice(0, 80)}`);
-	}
-}
-
-async function approveHProxyTarget(url, fetchImpl) {
-	let response;
-	try {
-		response = await fetchImpl(url, { method: "GET", headers: H_PROXY_HEADERS, redirect: "manual" });
-	} catch {
-		return false;
-	}
-
-	const warningUrl = await findHProxyWarningUrl(response);
-	if (!warningUrl) return false;
-
-	await approveHProxyWarning(warningUrl, fetchImpl);
-	return true;
-}
-
-function maybeGitHttpUrl(value) {
-	const trimmed = value.trim();
-	if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) return trimmed;
-	const ssh = /^git@([^:]+):(.+)$/.exec(trimmed);
-	if (ssh) return `https://${ssh[1]}/${ssh[2]}`;
-	return undefined;
-}
-
-function maybeHttpUrl(value) {
-	const trimmed = value.trim();
-	return trimmed.startsWith("http://") || trimmed.startsWith("https://") ? trimmed : undefined;
-}
-
-function getProxyApprovalTargets(runner, repoRoot, includeGitRemote = true) {
-	const targets = [];
-	if (includeGitRemote) {
-		const remote = runStep(runner, "git", ["config", "--get", "remote.origin.url"], repoRoot, "pipe");
-		if (remote.status === 0) {
-			const url = maybeGitHttpUrl(String(remote.stdout ?? ""));
-			if (url) targets.push(url);
-		}
-	}
-
-	const registry = runStep(runner, "npm", ["config", "get", "registry"], repoRoot, "pipe");
-	if (registry.status === 0) {
-		const url = maybeHttpUrl(String(registry.stdout ?? ""));
-		if (url) targets.push(url);
-	}
-
-	return [...new Set(targets)];
-}
-
-async function approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl, includeGitRemote = true) {
-	for (const target of getProxyApprovalTargets(runner, repoRoot, includeGitRemote)) {
-		if (await approveHProxyTarget(target, fetchImpl)) {
-			stdout.write(`Approved proxy warning for ${target}\n`);
-		}
-	}
-}
-
 function isMissingGitCheckout(result) {
 	const text = `${String(result.stdout ?? "")}\n${String(result.stderr ?? "")}`;
 	return result.status !== 0 && text.includes("not a git repository");
 }
 
-async function runNpmGlobalUpdate(runner, repoRoot, stdout, stderr, fetchImpl) {
-	await approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl, false);
+async function runNpmGlobalUpdate(runner, repoRoot, stdout, stderr) {
 	stdout.write("Updating npm packages: @averyyy/pi-client@latest @averyyy/pi-server@latest\n");
 	const result = runStep(
 		runner,
 		"npm",
-		["install", "-g", "--ignore-scripts", "@averyyy/pi-client@latest", "@averyyy/pi-server@latest"],
+		["install", "-g", "--ignore-scripts", "--legacy-peer-deps", "@averyyy/pi-client@latest", "@averyyy/pi-server@latest"],
 		repoRoot,
 	);
 	if (result.status !== 0) {
-		stderr.write("pi-client update failed: npm install -g --ignore-scripts @averyyy/pi-client@latest @averyyy/pi-server@latest\n");
+		stderr.write(
+			"pi-client update failed: npm install -g --ignore-scripts --legacy-peer-deps @averyyy/pi-client@latest @averyyy/pi-server@latest\n",
+		);
 		return result.status ?? 1;
 	}
 	stdout.write("pi-client update complete\n");
@@ -207,7 +46,6 @@ export async function runPiClientUpdate(_args = [], options = {}) {
 	const packageRoot = options.packageRoot ?? defaultPackageRoot();
 	const repoRoot = options.repoRoot ?? defaultRepoRoot();
 	const runner = options.runner ?? spawnSync;
-	const fetchImpl = options.fetch ?? globalThis.fetch;
 	const stdout = options.stdout ?? process.stdout;
 	const stderr = options.stderr ?? process.stderr;
 	const pkg = readPackageMetadata(packageRoot);
@@ -220,7 +58,7 @@ export async function runPiClientUpdate(_args = [], options = {}) {
 	const status = runStep(runner, "git", ["status", "--porcelain"], repoRoot, "pipe");
 	if (status.status !== 0) {
 		if (isMissingGitCheckout(status)) {
-			return runNpmGlobalUpdate(runner, repoRoot, stdout, stderr, fetchImpl);
+			return runNpmGlobalUpdate(runner, repoRoot, stdout, stderr);
 		}
 		stderr.write("pi-client update failed: unable to inspect git status\n");
 		return status.status ?? 1;
@@ -230,8 +68,6 @@ export async function runPiClientUpdate(_args = [], options = {}) {
 		return 1;
 	}
 
-	await approveUpdateProxyTargets(runner, repoRoot, stdout, fetchImpl);
-
 	const steps = [
 		["git", ["pull", "--ff-only"]],
 		["npm", ["install", "--ignore-scripts"]],

package/bin/web.js

@@ -3,6 +3,7 @@ import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
+import { createServer } from "node:net";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -19,6 +20,24 @@ const binDir = dirname(fileURLToPath(import.meta.url));
 const defaultPort = "1838";
 const defaultPiServerUrl = "http://127.0.0.1:4217";
 
+export async function piClientWebSessiondEnv(env = process.env, platform = process.platform) {
+	if (platform !== "win32") return {};
+	if (env.PI_WEB_SESSIOND_URL !== undefined && env.PI_WEB_SESSIOND_URL !== "") return {};
+	if (env.PI_WEB_SESSIOND_SOCKET !== undefined && env.PI_WEB_SESSIOND_SOCKET !== "") return {};
+
+	const host = env.PI_WEB_SESSIOND_HOST !== undefined && env.PI_WEB_SESSIOND_HOST !== "" ? env.PI_WEB_SESSIOND_HOST : "127.0.0.1";
+	const port =
+		env.PI_WEB_SESSIOND_PORT !== undefined && env.PI_WEB_SESSIOND_PORT !== ""
+			? env.PI_WEB_SESSIOND_PORT
+			: String(await findOpenTcpPort(host));
+	const urlHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
+	return {
+		PI_WEB_SESSIOND_HOST: host,
+		PI_WEB_SESSIOND_PORT: port,
+		PI_WEB_SESSIOND_URL: `http://${urlHost}:${port}`,
+	};
+}
+
 export async function runPiClientWeb(args = process.argv.slice(2)) {
 	const parsed = parseArgs(args);
 	if (parsed.help) {
@@ -28,8 +47,11 @@ export async function runPiClientWeb(args = process.argv.slice(2)) {
 
 	process.title = "pi-client web";
 	const piServer = await effectivePiServerSettings(process.env);
+	const sessiondEnv = await piClientWebSessiondEnv(process.env);
+	Object.assign(process.env, sessiondEnv);
 	const childEnv = {
 		...process.env,
+		...sessiondEnv,
 		PI_CODING_AGENT: "true",
 		PI_SERVER_MODE: "true",
 		PI_SERVER_URL: piServer.serverUrl,
@@ -77,6 +99,21 @@ export async function runPiClientWeb(args = process.argv.slice(2)) {
 	});
 }
 
+async function findOpenTcpPort(host) {
+	return await new Promise((resolve, reject) => {
+		const server = createServer();
+		server.once("error", reject);
+		server.listen(0, host, () => {
+			const address = server.address();
+			if (address === null || typeof address === "string") {
+				server.close(() => reject(new Error("Could not reserve a session daemon TCP port")));
+				return;
+			}
+			server.close(() => resolve(address.port));
+		});
+	});
+}
+
 function registerPiClientRoutes(app, state) {
 	app.get("/api/pi-client/pi-server", async (_request, _reply) => piServerStatus(state));
 	app.put("/api/pi-client/pi-server", async (request, reply) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@averyyy/pi-client",
-	"version": "0.80.3-piclient.5",
+	"version": "0.80.3-piclient.6",
 	"description": "Lightweight CLI wrapper that connects to a pi-server instance",
 	"type": "module",
 	"piClient": {
@@ -25,7 +25,7 @@
 		"prepublishOnly": "npm run build"
 	},
 	"dependencies": {
-		"@earendil-works/pi-coding-agent": "npm:@averyyy/pi-coding-agent@0.80.3-piclient.5",
+		"@earendil-works/pi-coding-agent": "npm:@averyyy/pi-coding-agent@0.80.3-piclient.6",
 		"@jmfederico/pi-web": "1.202606.7"
 	},
 	"devDependencies": {