@averyyy/pi-server 0.82.1-piclient.3 → 0.82.1-piclient.5

package/CHANGELOG.md

@@ -20,8 +20,20 @@
 ### Fixed
 
 - Used `--legacy-peer-deps` for npm-global fork updates so existing upstream Pi installs do not trigger peer override warnings for forked prerelease aliases.
+- Fixed provider streams that close without a terminal event and made duplicate `runId` requests single-flight, replayable, and bounded by count and retention time.
+- Fixed static-context hashes to include canonical constrained-sampling tool configuration.
+- Fixed Windows updates to invoke the validated npm CLI through the active Node executable and terminate stalled git or npm steps with actionable errors.
+- Added durable provider-run journals with cursor replay, terminal acknowledgement, restart-uncertainty handling, bounded lossless persistence backpressure, and immediate provider cancellation.
+- Reworked session persistence as checksummed append-only WAL records plus periodic snapshots, with strict revision/digest validation and narrow torn-write recovery.
+- Made server-side compaction authoritative, replayable, heartbeat-streamed, branch-local, and compatible with native Pi compaction hooks and cancellation.
+- Bounded session history, request, response, SSE, subscriber, run-journal, and upload resources with explicit structured failures instead of silent truncation, and reduced chunk reassembly peak memory with independently decoded base64 segments.
+- Made session tree mutation and file receive retries idempotent while rejecting divergent duplicate IDs or destination contents.
+- Added per-filesystem-operation no-progress watchdogs for durable run persistence and a bounded CLI fatal-shutdown grace, without imposing a total provider-run deadline or retrying indeterminate writes.
+- Made compaction capacity admission exact and atomic before provider execution and journal settlement, serialized deletion against queued work, and enforced single-owner fail-stop persistence within and across processes.
+- Removed provider-execution fingerprint admission checks so established custom-provider pi-client sessions are accepted again.
 
 ### Changed
 
 - Updated the upstream Pi base through commit `0e6909f0`, including the latest provider and compaction fixes.
 - Rebased the server on upstream Pi `0.80.6`, including GPT-5.6 model metadata and `max` thinking support.
+- Added structured, secret-free provider-stream failure logs with response metadata preserved across the proxy.

package/README.md

@@ -36,6 +36,31 @@ PI_SERVER_UPLOAD_DIR=/path/to/upload_files
 
 Received files default to `~/.pi/upload_files`.
 
+Long-run safety limits are explicit and configurable:
+
+```bash
+PI_SERVER_SESSION_MAX_ENTRIES=250000
+PI_SERVER_SESSION_MAX_LOGICAL_BYTES=268435456
+PI_SERVER_SESSIONS_MAX_ENTRIES=500000
+PI_SERVER_SESSIONS_MAX_LOGICAL_BYTES=536870912
+PI_SERVER_MAX_LOADED_SESSIONS=1024
+```
+
+The server rejects a mutation with structured HTTP `507` before exceeding these limits. It does not truncate,
+delete, or compact durable history to make room.
+
+Transport and persistence watchdogs measure continuous lack of progress, not total operation duration:
+
+```bash
+PI_SERVER_REQUEST_BODY_NO_PROGRESS_TIMEOUT_MS=90000
+PI_SERVER_STREAM_DRAIN_IDLE_TIMEOUT_MS=90000
+PI_SERVER_STREAM_RUN_IO_NO_PROGRESS_TIMEOUT_MS=120000
+PI_SERVER_COMPACT_RUN_IO_NO_PROGRESS_TIMEOUT_MS=120000
+```
+
+An active provider or compaction run has no short total-duration deadline; it continues while making progress and
+remaining within configured capacity.
+
 ## Connect A Client
 
 ```bash

package/bin/update.js

@@ -1,8 +1,13 @@
 import { spawnSync } from "node:child_process";
-import { readFileSync } from "node:fs";
+import { readFileSync, statSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
+const GIT_STATUS_TIMEOUT_MS = 30_000;
+const GIT_UPDATE_TIMEOUT_MS = 5 * 60_000;
+const NPM_UPDATE_TIMEOUT_MS = 20 * 60_000;
+const UPDATE_KILL_SIGNAL = "SIGTERM";
+
 function defaultPackageRoot() {
 	return dirname(dirname(fileURLToPath(import.meta.url)));
 }
@@ -15,28 +20,126 @@ function readPackageMetadata(packageRoot) {
 	return JSON.parse(readFileSync(resolve(packageRoot, "package.json"), "utf-8"));
 }
 
-function runStep(runner, command, args, cwd, stdio = "inherit") {
-	return runner(command, args, { cwd, stdio, encoding: "utf-8" });
+function isFile(path) {
+	try {
+		return statSync(path).isFile();
+	} catch {
+		return false;
+	}
+}
+
+function resolveNpmInvocation(platform, nodePath) {
+	if (platform !== "win32") {
+		return { command: "npm", argsPrefix: [] };
+	}
+
+	if (!isFile(nodePath)) {
+		throw new Error(`Node executable not found: ${nodePath}`);
+	}
+
+	const npmPackagePath = resolve(dirname(nodePath), "node_modules", "npm", "package.json");
+	if (!isFile(npmPackagePath)) {
+		throw new Error(`npm package metadata not found: ${npmPackagePath}`);
+	}
+
+	let npmPackage;
+	try {
+		npmPackage = JSON.parse(readFileSync(npmPackagePath, "utf-8"));
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`unable to read npm package metadata ${npmPackagePath}: ${message}`, { cause: error });
+	}
+
+	const npmBin = typeof npmPackage.bin === "string" ? npmPackage.bin : npmPackage.bin?.npm;
+	if (typeof npmBin !== "string" || npmBin.length === 0) {
+		throw new Error(`npm CLI entry missing from package metadata: ${npmPackagePath}`);
+	}
+
+	const npmCliPath = resolve(dirname(npmPackagePath), npmBin);
+	if (!isFile(npmCliPath)) {
+		throw new Error(`npm CLI not found: ${npmCliPath}`);
+	}
+
+	return { command: nodePath, argsPrefix: [npmCliPath] };
+}
+
+function runStep(runner, command, args, cwd, timeout, stdio = "inherit") {
+	try {
+		return runner(command, args, {
+			cwd,
+			stdio,
+			encoding: "utf-8",
+			timeout,
+			killSignal: UPDATE_KILL_SIGNAL,
+		});
+	} catch (error) {
+		return { status: null, error };
+	}
+}
+
+function reportStepFailure(stderr, displayCommand, result, timeout) {
+	if (result.error?.code === "ETIMEDOUT") {
+		stderr.write(
+			`pi-server update failed: ${displayCommand} timed out after ${timeout} ms and was terminated with ${UPDATE_KILL_SIGNAL}\n`,
+		);
+		return 1;
+	}
+
+	if (result.error) {
+		const errorCode = typeof result.error.code === "string" ? ` (${result.error.code})` : "";
+		const message = result.error instanceof Error ? result.error.message : String(result.error);
+		stderr.write(`pi-server update failed: unable to start ${displayCommand}${errorCode}: ${message}\n`);
+		return 1;
+	}
+
+	if (result.signal) {
+		stderr.write(`pi-server update failed: ${displayCommand} was terminated by signal ${result.signal}\n`);
+		return 1;
+	}
+
+	if (typeof result.status === "number") {
+		stderr.write(`pi-server update failed: ${displayCommand} exited with code ${result.status}\n`);
+		return result.status === 0 ? 1 : result.status;
+	}
+
+	stderr.write(`pi-server update failed: ${displayCommand} ended without an exit status\n`);
+	return 1;
 }
 
 function isMissingGitCheckout(result) {
 	const text = `${String(result.stdout ?? "")}\n${String(result.stderr ?? "")}`;
-	return result.status !== 0 && text.includes("not a git repository");
+	return !result.error && !result.signal && result.status !== 0 && text.includes("not a git repository");
 }
 
-async function runNpmGlobalUpdate(runner, repoRoot, stdout, stderr) {
+function getNpmInvocation(platform, nodePath, stderr) {
+	try {
+		return resolveNpmInvocation(platform, nodePath);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		stderr.write(`pi-server update failed: ${message}\n`);
+		return null;
+	}
+}
+
+async function runNpmGlobalUpdate(runner, npmInvocation, repoRoot, stdout, stderr) {
 	stdout.write("Updating npm packages: @averyyy/pi-client@latest @averyyy/pi-server@latest\n");
+	const npmArgs = [
+		"install",
+		"-g",
+		"--ignore-scripts",
+		"--legacy-peer-deps",
+		"@averyyy/pi-client@latest",
+		"@averyyy/pi-server@latest",
+	];
 	const result = runStep(
 		runner,
-		"npm",
-		["install", "-g", "--ignore-scripts", "--legacy-peer-deps", "@averyyy/pi-client@latest", "@averyyy/pi-server@latest"],
+		npmInvocation.command,
+		[...npmInvocation.argsPrefix, ...npmArgs],
 		repoRoot,
+		NPM_UPDATE_TIMEOUT_MS,
 	);
 	if (result.status !== 0) {
-		stderr.write(
-			"pi-server update failed: npm install -g --ignore-scripts --legacy-peer-deps @averyyy/pi-client@latest @averyyy/pi-server@latest\n",
-		);
-		return result.status ?? 1;
+		return reportStepFailure(stderr, `npm ${npmArgs.join(" ")}`, result, NPM_UPDATE_TIMEOUT_MS);
 	}
 	stdout.write("pi-server update complete\n");
 	return 0;
@@ -48,36 +151,66 @@ export async function runPiServerUpdate(_args = [], options = {}) {
 	const runner = options.runner ?? spawnSync;
 	const stdout = options.stdout ?? process.stdout;
 	const stderr = options.stderr ?? process.stderr;
+	const platform = options.platform ?? process.platform;
+	const nodePath = options.nodePath ?? process.execPath;
 	const pkg = readPackageMetadata(packageRoot);
 
 	stdout.write(`pi-server ${pkg.version}\n`);
 	stdout.write(`Updating checkout: ${repoRoot}\n`);
 
-	const status = runStep(runner, "git", ["status", "--porcelain"], repoRoot, "pipe");
+	const statusArgs = ["status", "--porcelain"];
+	const status = runStep(runner, "git", statusArgs, repoRoot, GIT_STATUS_TIMEOUT_MS, "pipe");
 	if (status.status !== 0) {
 		if (isMissingGitCheckout(status)) {
-			return runNpmGlobalUpdate(runner, repoRoot, stdout, stderr);
+			const npmInvocation = getNpmInvocation(platform, nodePath, stderr);
+			if (!npmInvocation) {
+				return 1;
+			}
+			return runNpmGlobalUpdate(runner, npmInvocation, repoRoot, stdout, stderr);
 		}
-		stderr.write("pi-server update failed: unable to inspect git status\n");
-		return status.status ?? 1;
+		return reportStepFailure(stderr, `git ${statusArgs.join(" ")}`, status, GIT_STATUS_TIMEOUT_MS);
 	}
 	if (String(status.stdout ?? "").trim().length > 0) {
 		stderr.write("pi-server update failed: working tree has uncommitted changes\n");
 		return 1;
 	}
 
+	const npmInvocation = getNpmInvocation(platform, nodePath, stderr);
+	if (!npmInvocation) {
+		return 1;
+	}
+
 	const steps = [
-		["git", ["pull", "--ff-only"]],
-		["npm", ["install", "--ignore-scripts"]],
-		["npm", ["run", "install:pi-client"]],
-		["npm", ["run", "install:pi-server"]],
+		{
+			command: "git",
+			args: ["pull", "--ff-only"],
+			displayCommand: "git pull --ff-only",
+			timeout: GIT_UPDATE_TIMEOUT_MS,
+		},
+		{
+			command: npmInvocation.command,
+			args: [...npmInvocation.argsPrefix, "install", "--ignore-scripts"],
+			displayCommand: "npm install --ignore-scripts",
+			timeout: NPM_UPDATE_TIMEOUT_MS,
+		},
+		{
+			command: npmInvocation.command,
+			args: [...npmInvocation.argsPrefix, "run", "install:pi-client"],
+			displayCommand: "npm run install:pi-client",
+			timeout: NPM_UPDATE_TIMEOUT_MS,
+		},
+		{
+			command: npmInvocation.command,
+			args: [...npmInvocation.argsPrefix, "run", "install:pi-server"],
+			displayCommand: "npm run install:pi-server",
+			timeout: NPM_UPDATE_TIMEOUT_MS,
+		},
 	];
 
-	for (const [command, args] of steps) {
-		const result = runStep(runner, command, args, repoRoot);
+	for (const step of steps) {
+		const result = runStep(runner, step.command, step.args, repoRoot, step.timeout);
 		if (result.status !== 0) {
-			stderr.write(`pi-server update failed: ${command} ${args.join(" ")}\n`);
-			return result.status ?? 1;
+			return reportStepFailure(stderr, step.displayCommand, result, step.timeout);
 		}
 	}
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { loadConfig, type ServerConfig } from "./config.ts";
 export { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from "./event-encoding.ts";
-export { createPiServer, startServer } from "./server.ts";
-export { appendAssistantResponse, appendMessages, clearAllSessions, deleteSession, exportSessionState, getOrCreateSession, getSession, hashSessionEntries, listSessions, type PersistedSessionState, restoreSessionState, type SessionState, type SessionStaticContext, type SessionSummary, setStaticContext, } from "./session-store.ts";
+export { createPiServer, type PiServerOptions, startServer } from "./server.ts";
+export { appendAssistantResponse, appendMessages, applySessionMutation, calculateSessionLogicalBytes, clearAllSessions, configureSessionCapacityLimits, DEFAULT_SESSION_CAPACITY_LIMITS, deleteSession, exportSessionState, getOrCreateSession, getSession, getSessionCapacityLimits, getSessionCapacityUsage, hashSessionEntries, listSessions, type PersistedSessionState, preflightSessionCapacityMutation, resetSessionCapacityLimits, restoreSessionState, SessionCapacityError, type SessionCapacityLimits, type SessionCapacityMutation, type SessionCapacityProjection, type SessionCapacityUsage, type SessionState, type SessionStaticContext, type SessionSummary, setStaticContext, } from "./session-store.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EACN,uBAAuB,EACvB,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,KAAK,qBAAqB,EAC1B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,gBAAgB,GAChB,MAAM,oBAAoB,CAAC","sourcesContent":["export { loadConfig, type ServerConfig } from \"./config.ts\";\nexport { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from \"./event-encoding.ts\";\nexport { createPiServer, startServer } from \"./server.ts\";\nexport {\n\tappendAssistantResponse,\n\tappendMessages,\n\tclearAllSessions,\n\tdeleteSession,\n\texportSessionState,\n\tgetOrCreateSession,\n\tgetSession,\n\thashSessionEntries,\n\tlistSessions,\n\ttype PersistedSessionState,\n\trestoreSessionState,\n\ttype SessionState,\n\ttype SessionStaticContext,\n\ttype SessionSummary,\n\tsetStaticContext,\n} from \"./session-store.ts\";\n"]}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EACN,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,4BAA4B,EAC5B,gBAAgB,EAChB,8BAA8B,EAC9B,+BAA+B,EAC/B,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,YAAY,EACZ,KAAK,qBAAqB,EAC1B,gCAAgC,EAChC,0BAA0B,EAC1B,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,gBAAgB,GAChB,MAAM,oBAAoB,CAAC","sourcesContent":["export { loadConfig, type ServerConfig } from \"./config.ts\";\nexport { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from \"./event-encoding.ts\";\nexport { createPiServer, type PiServerOptions, startServer } from \"./server.ts\";\nexport {\n\tappendAssistantResponse,\n\tappendMessages,\n\tapplySessionMutation,\n\tcalculateSessionLogicalBytes,\n\tclearAllSessions,\n\tconfigureSessionCapacityLimits,\n\tDEFAULT_SESSION_CAPACITY_LIMITS,\n\tdeleteSession,\n\texportSessionState,\n\tgetOrCreateSession,\n\tgetSession,\n\tgetSessionCapacityLimits,\n\tgetSessionCapacityUsage,\n\thashSessionEntries,\n\tlistSessions,\n\ttype PersistedSessionState,\n\tpreflightSessionCapacityMutation,\n\tresetSessionCapacityLimits,\n\trestoreSessionState,\n\tSessionCapacityError,\n\ttype SessionCapacityLimits,\n\ttype SessionCapacityMutation,\n\ttype SessionCapacityProjection,\n\ttype SessionCapacityUsage,\n\ttype SessionState,\n\ttype SessionStaticContext,\n\ttype SessionSummary,\n\tsetStaticContext,\n} from \"./session-store.ts\";\n"]}

package/dist/index.js

@@ -1,5 +1,5 @@
 export { loadConfig } from "./config.js";
 export { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from "./event-encoding.js";
 export { createPiServer, startServer } from "./server.js";
-export { appendAssistantResponse, appendMessages, clearAllSessions, deleteSession, exportSessionState, getOrCreateSession, getSession, hashSessionEntries, listSessions, restoreSessionState, setStaticContext, } from "./session-store.js";
+export { appendAssistantResponse, appendMessages, applySessionMutation, calculateSessionLogicalBytes, clearAllSessions, configureSessionCapacityLimits, DEFAULT_SESSION_CAPACITY_LIMITS, deleteSession, exportSessionState, getOrCreateSession, getSession, getSessionCapacityLimits, getSessionCapacityUsage, hashSessionEntries, listSessions, preflightSessionCapacityMutation, resetSessionCapacityLimits, restoreSessionState, SessionCapacityError, setStaticContext, } from "./session-store.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EACN,uBAAuB,EACvB,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,YAAY,EAEZ,mBAAmB,EAInB,gBAAgB,GAChB,MAAM,oBAAoB,CAAC","sourcesContent":["export { loadConfig, type ServerConfig } from \"./config.ts\";\nexport { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from \"./event-encoding.ts\";\nexport { createPiServer, startServer } from \"./server.ts\";\nexport {\n\tappendAssistantResponse,\n\tappendMessages,\n\tclearAllSessions,\n\tdeleteSession,\n\texportSessionState,\n\tgetOrCreateSession,\n\tgetSession,\n\thashSessionEntries,\n\tlistSessions,\n\ttype PersistedSessionState,\n\trestoreSessionState,\n\ttype SessionState,\n\ttype SessionStaticContext,\n\ttype SessionSummary,\n\tsetStaticContext,\n} from \"./session-store.ts\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAwB,WAAW,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EACN,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,4BAA4B,EAC5B,gBAAgB,EAChB,8BAA8B,EAC9B,+BAA+B,EAC/B,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,YAAY,EAEZ,gCAAgC,EAChC,0BAA0B,EAC1B,mBAAmB,EACnB,oBAAoB,EAQpB,gBAAgB,GAChB,MAAM,oBAAoB,CAAC","sourcesContent":["export { loadConfig, type ServerConfig } from \"./config.ts\";\nexport { encodeErrorEvent, encodeProxyEvent, parseProxyEvent } from \"./event-encoding.ts\";\nexport { createPiServer, type PiServerOptions, startServer } from \"./server.ts\";\nexport {\n\tappendAssistantResponse,\n\tappendMessages,\n\tapplySessionMutation,\n\tcalculateSessionLogicalBytes,\n\tclearAllSessions,\n\tconfigureSessionCapacityLimits,\n\tDEFAULT_SESSION_CAPACITY_LIMITS,\n\tdeleteSession,\n\texportSessionState,\n\tgetOrCreateSession,\n\tgetSession,\n\tgetSessionCapacityLimits,\n\tgetSessionCapacityUsage,\n\thashSessionEntries,\n\tlistSessions,\n\ttype PersistedSessionState,\n\tpreflightSessionCapacityMutation,\n\tresetSessionCapacityLimits,\n\trestoreSessionState,\n\tSessionCapacityError,\n\ttype SessionCapacityLimits,\n\ttype SessionCapacityMutation,\n\ttype SessionCapacityProjection,\n\ttype SessionCapacityUsage,\n\ttype SessionState,\n\ttype SessionStaticContext,\n\ttype SessionSummary,\n\tsetStaticContext,\n} from \"./session-store.ts\";\n"]}

package/dist/pi-server-protocol.d.ts

@@ -4,6 +4,22 @@ export interface PiServerStaticContext {
     systemPrompt?: string;
     tools?: Tool[];
 }
+export interface PiServerSessionIdentity {
+    staticContextHash: string;
+    treeHash: string;
+    entryCount: number;
+    leafId: string | null;
+    revision: number;
+}
+export interface PiServerStreamBaseIdentity {
+    baseStaticContextHash: string;
+    baseTreeHash: string;
+    baseEntryCount: number;
+    baseLeafId: string | null;
+    baseRevision: number;
+}
+export declare function matchesPiServerStreamBase(base: PiServerStreamBaseIdentity, session: PiServerSessionIdentity): boolean;
+export declare function canonicalJsonStringify(value: unknown): string | undefined;
 export declare function hashPiServerStaticContext(context: PiServerStaticContext | undefined): string;
 export declare const PI_SERVER_EMPTY_TREE_HASH: string;
 export declare function hashPiServerTreeEntry(entry: SessionTreeEntry): string;

package/dist/pi-server-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi-server-protocol.d.ts","sourceRoot":"","sources":["../src/pi-server-protocol.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;CACf;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,qBAAqB,GAAG,SAAS,GAAG,MAAM,CAW5F;AAED,eAAO,MAAM,yBAAyB,QAA0D,CAAC;AAEjG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAErE;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,EAAE,CAMnF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAE9E","sourcesContent":["import { createHash } from \"node:crypto\";\nimport type { SessionTreeEntry } from \"@earendil-works/pi-agent-core\";\nimport type { Tool } from \"@earendil-works/pi-ai\";\n\nexport interface PiServerStaticContext {\n\tsystemPrompt?: string;\n\ttools?: Tool[];\n}\n\nexport function hashPiServerStaticContext(context: PiServerStaticContext | undefined): string {\n\tif (!context) return \"\";\n\tconst canonical = {\n\t\tsystemPrompt: context.systemPrompt,\n\t\ttools: context.tools?.map((tool) => ({\n\t\t\tname: tool.name,\n\t\t\tdescription: tool.description,\n\t\t\tparameters: tool.parameters,\n\t\t})),\n\t};\n\treturn createHash(\"sha256\").update(JSON.stringify(canonical)).digest(\"hex\");\n}\n\nexport const PI_SERVER_EMPTY_TREE_HASH = createHash(\"sha256\").update(\"pi-tree-v1\").digest(\"hex\");\n\nexport function hashPiServerTreeEntry(entry: SessionTreeEntry): string {\n\treturn createHash(\"sha256\").update(JSON.stringify(entry)).digest(\"hex\");\n}\n\nexport function appendPiServerTreeHash(previousHash: string, entryHash: string): string {\n\treturn createHash(\"sha256\").update(`${previousHash}:${entryHash}`).digest(\"hex\");\n}\n\nexport function buildPiServerTreePrefixHashes(entries: SessionTreeEntry[]): string[] {\n\tconst hashes = [PI_SERVER_EMPTY_TREE_HASH];\n\tfor (const entry of entries) {\n\t\thashes.push(appendPiServerTreeHash(hashes[hashes.length - 1], hashPiServerTreeEntry(entry)));\n\t}\n\treturn hashes;\n}\n\nexport function hashPiServerSessionEntries(entries: SessionTreeEntry[]): string {\n\treturn buildPiServerTreePrefixHashes(entries)[entries.length];\n}\n"]}
+{"version":3,"file":"pi-server-protocol.d.ts","sourceRoot":"","sources":["../src/pi-server-protocol.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,WAAW,qBAAqB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,0BAA0B;IAC1C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAQrH;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgBzE;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,qBAAqB,GAAG,SAAS,GAAG,MAAM,CAgB5F;AAED,eAAO,MAAM,yBAAyB,QAA0D,CAAC;AAEjG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAErE;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,EAAE,CAMnF;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAE9E","sourcesContent":["import { createHash } from \"node:crypto\";\nimport type { SessionTreeEntry } from \"@earendil-works/pi-agent-core\";\nimport type { Tool } from \"@earendil-works/pi-ai\";\n\nexport interface PiServerStaticContext {\n\tsystemPrompt?: string;\n\ttools?: Tool[];\n}\n\nexport interface PiServerSessionIdentity {\n\tstaticContextHash: string;\n\ttreeHash: string;\n\tentryCount: number;\n\tleafId: string | null;\n\trevision: number;\n}\n\nexport interface PiServerStreamBaseIdentity {\n\tbaseStaticContextHash: string;\n\tbaseTreeHash: string;\n\tbaseEntryCount: number;\n\tbaseLeafId: string | null;\n\tbaseRevision: number;\n}\n\nexport function matchesPiServerStreamBase(base: PiServerStreamBaseIdentity, session: PiServerSessionIdentity): boolean {\n\treturn (\n\t\tbase.baseStaticContextHash === session.staticContextHash &&\n\t\tbase.baseTreeHash === session.treeHash &&\n\t\tbase.baseEntryCount === session.entryCount &&\n\t\tbase.baseLeafId === session.leafId &&\n\t\tbase.baseRevision === session.revision\n\t);\n}\n\nexport function canonicalJsonStringify(value: unknown): string | undefined {\n\tif (Array.isArray(value)) {\n\t\treturn `[${Array.from(value, (item) => canonicalJsonStringify(item) ?? \"null\").join(\",\")}]`;\n\t}\n\tif (value !== null && typeof value === \"object\") {\n\t\tconst record = value as Record<string, unknown>;\n\t\tconst properties: string[] = [];\n\t\tfor (const key of Object.keys(record).sort()) {\n\t\t\tconst serialized = canonicalJsonStringify(record[key]);\n\t\t\tif (serialized !== undefined) {\n\t\t\t\tproperties.push(`${JSON.stringify(key)}:${serialized}`);\n\t\t\t}\n\t\t}\n\t\treturn `{${properties.join(\",\")}}`;\n\t}\n\treturn JSON.stringify(value);\n}\n\nexport function hashPiServerStaticContext(context: PiServerStaticContext | undefined): string {\n\tif (!context) return \"\";\n\tconst canonical = {\n\t\tsystemPrompt: context.systemPrompt,\n\t\ttools: context.tools?.map((tool) => ({\n\t\t\tname: tool.name,\n\t\t\tdescription: tool.description,\n\t\t\tparameters: tool.parameters,\n\t\t\tconstrainedSampling: tool.constrainedSampling,\n\t\t})),\n\t};\n\tconst serialized = canonicalJsonStringify(canonical);\n\tif (serialized === undefined) {\n\t\tthrow new Error(\"Failed to serialize pi-server static context\");\n\t}\n\treturn createHash(\"sha256\").update(serialized).digest(\"hex\");\n}\n\nexport const PI_SERVER_EMPTY_TREE_HASH = createHash(\"sha256\").update(\"pi-tree-v1\").digest(\"hex\");\n\nexport function hashPiServerTreeEntry(entry: SessionTreeEntry): string {\n\treturn createHash(\"sha256\").update(JSON.stringify(entry)).digest(\"hex\");\n}\n\nexport function appendPiServerTreeHash(previousHash: string, entryHash: string): string {\n\treturn createHash(\"sha256\").update(`${previousHash}:${entryHash}`).digest(\"hex\");\n}\n\nexport function buildPiServerTreePrefixHashes(entries: SessionTreeEntry[]): string[] {\n\tconst hashes = [PI_SERVER_EMPTY_TREE_HASH];\n\tfor (const entry of entries) {\n\t\thashes.push(appendPiServerTreeHash(hashes[hashes.length - 1], hashPiServerTreeEntry(entry)));\n\t}\n\treturn hashes;\n}\n\nexport function hashPiServerSessionEntries(entries: SessionTreeEntry[]): string {\n\treturn buildPiServerTreePrefixHashes(entries)[entries.length];\n}\n"]}

package/dist/pi-server-protocol.js

@@ -1,4 +1,28 @@
 import { createHash } from "node:crypto";
+export function matchesPiServerStreamBase(base, session) {
+    return (base.baseStaticContextHash === session.staticContextHash &&
+        base.baseTreeHash === session.treeHash &&
+        base.baseEntryCount === session.entryCount &&
+        base.baseLeafId === session.leafId &&
+        base.baseRevision === session.revision);
+}
+export function canonicalJsonStringify(value) {
+    if (Array.isArray(value)) {
+        return `[${Array.from(value, (item) => canonicalJsonStringify(item) ?? "null").join(",")}]`;
+    }
+    if (value !== null && typeof value === "object") {
+        const record = value;
+        const properties = [];
+        for (const key of Object.keys(record).sort()) {
+            const serialized = canonicalJsonStringify(record[key]);
+            if (serialized !== undefined) {
+                properties.push(`${JSON.stringify(key)}:${serialized}`);
+            }
+        }
+        return `{${properties.join(",")}}`;
+    }
+    return JSON.stringify(value);
+}
 export function hashPiServerStaticContext(context) {
     if (!context)
         return "";
@@ -8,9 +32,14 @@ export function hashPiServerStaticContext(context) {
             name: tool.name,
             description: tool.description,
             parameters: tool.parameters,
+            constrainedSampling: tool.constrainedSampling,
         })),
     };
-    return createHash("sha256").update(JSON.stringify(canonical)).digest("hex");
+    const serialized = canonicalJsonStringify(canonical);
+    if (serialized === undefined) {
+        throw new Error("Failed to serialize pi-server static context");
+    }
+    return createHash("sha256").update(serialized).digest("hex");
 }
 export const PI_SERVER_EMPTY_TREE_HASH = createHash("sha256").update("pi-tree-v1").digest("hex");
 export function hashPiServerTreeEntry(entry) {

package/dist/pi-server-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"pi-server-protocol.js","sourceRoot":"","sources":["../src/pi-server-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AASzC,MAAM,UAAU,yBAAyB,CAAC,OAA0C,EAAU;IAC7F,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,MAAM,SAAS,GAAG;QACjB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC3B,CAAC,CAAC;KACH,CAAC;IACF,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CAC5E;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAEjG,MAAM,UAAU,qBAAqB,CAAC,KAAuB,EAAU;IACtE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CACxE;AAED,MAAM,UAAU,sBAAsB,CAAC,YAAoB,EAAE,SAAiB,EAAU;IACvF,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CACjF;AAED,MAAM,UAAU,6BAA6B,CAAC,OAA2B,EAAY;IACpF,MAAM,MAAM,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC3C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,MAAM,CAAC;AAAA,CACd;AAED,MAAM,UAAU,0BAA0B,CAAC,OAA2B,EAAU;IAC/E,OAAO,6BAA6B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAAA,CAC9D","sourcesContent":["import { createHash } from \"node:crypto\";\nimport type { SessionTreeEntry } from \"@earendil-works/pi-agent-core\";\nimport type { Tool } from \"@earendil-works/pi-ai\";\n\nexport interface PiServerStaticContext {\n\tsystemPrompt?: string;\n\ttools?: Tool[];\n}\n\nexport function hashPiServerStaticContext(context: PiServerStaticContext | undefined): string {\n\tif (!context) return \"\";\n\tconst canonical = {\n\t\tsystemPrompt: context.systemPrompt,\n\t\ttools: context.tools?.map((tool) => ({\n\t\t\tname: tool.name,\n\t\t\tdescription: tool.description,\n\t\t\tparameters: tool.parameters,\n\t\t})),\n\t};\n\treturn createHash(\"sha256\").update(JSON.stringify(canonical)).digest(\"hex\");\n}\n\nexport const PI_SERVER_EMPTY_TREE_HASH = createHash(\"sha256\").update(\"pi-tree-v1\").digest(\"hex\");\n\nexport function hashPiServerTreeEntry(entry: SessionTreeEntry): string {\n\treturn createHash(\"sha256\").update(JSON.stringify(entry)).digest(\"hex\");\n}\n\nexport function appendPiServerTreeHash(previousHash: string, entryHash: string): string {\n\treturn createHash(\"sha256\").update(`${previousHash}:${entryHash}`).digest(\"hex\");\n}\n\nexport function buildPiServerTreePrefixHashes(entries: SessionTreeEntry[]): string[] {\n\tconst hashes = [PI_SERVER_EMPTY_TREE_HASH];\n\tfor (const entry of entries) {\n\t\thashes.push(appendPiServerTreeHash(hashes[hashes.length - 1], hashPiServerTreeEntry(entry)));\n\t}\n\treturn hashes;\n}\n\nexport function hashPiServerSessionEntries(entries: SessionTreeEntry[]): string {\n\treturn buildPiServerTreePrefixHashes(entries)[entries.length];\n}\n"]}
+{"version":3,"file":"pi-server-protocol.js","sourceRoot":"","sources":["../src/pi-server-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAyBzC,MAAM,UAAU,yBAAyB,CAAC,IAAgC,EAAE,OAAgC,EAAW;IACtH,OAAO,CACN,IAAI,CAAC,qBAAqB,KAAK,OAAO,CAAC,iBAAiB;QACxD,IAAI,CAAC,YAAY,KAAK,OAAO,CAAC,QAAQ;QACtC,IAAI,CAAC,cAAc,KAAK,OAAO,CAAC,UAAU;QAC1C,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,MAAM;QAClC,IAAI,CAAC,YAAY,KAAK,OAAO,CAAC,QAAQ,CACtC,CAAC;AAAA,CACF;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAc,EAAsB;IAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAC7F,CAAC;IACD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,KAAgC,CAAC;QAChD,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACvD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC;YACzD,CAAC;QACF,CAAC;QACD,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAAA,CAC7B;AAED,MAAM,UAAU,yBAAyB,CAAC,OAA0C,EAAU;IAC7F,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,MAAM,SAAS,GAAG;QACjB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAC7C,CAAC,CAAC;KACH,CAAC;IACF,MAAM,UAAU,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACrD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CAC7D;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAEjG,MAAM,UAAU,qBAAqB,CAAC,KAAuB,EAAU;IACtE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CACxE;AAED,MAAM,UAAU,sBAAsB,CAAC,YAAoB,EAAE,SAAiB,EAAU;IACvF,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAAA,CACjF;AAED,MAAM,UAAU,6BAA6B,CAAC,OAA2B,EAAY;IACpF,MAAM,MAAM,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC3C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,MAAM,CAAC;AAAA,CACd;AAED,MAAM,UAAU,0BAA0B,CAAC,OAA2B,EAAU;IAC/E,OAAO,6BAA6B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAAA,CAC9D","sourcesContent":["import { createHash } from \"node:crypto\";\nimport type { SessionTreeEntry } from \"@earendil-works/pi-agent-core\";\nimport type { Tool } from \"@earendil-works/pi-ai\";\n\nexport interface PiServerStaticContext {\n\tsystemPrompt?: string;\n\ttools?: Tool[];\n}\n\nexport interface PiServerSessionIdentity {\n\tstaticContextHash: string;\n\ttreeHash: string;\n\tentryCount: number;\n\tleafId: string | null;\n\trevision: number;\n}\n\nexport interface PiServerStreamBaseIdentity {\n\tbaseStaticContextHash: string;\n\tbaseTreeHash: string;\n\tbaseEntryCount: number;\n\tbaseLeafId: string | null;\n\tbaseRevision: number;\n}\n\nexport function matchesPiServerStreamBase(base: PiServerStreamBaseIdentity, session: PiServerSessionIdentity): boolean {\n\treturn (\n\t\tbase.baseStaticContextHash === session.staticContextHash &&\n\t\tbase.baseTreeHash === session.treeHash &&\n\t\tbase.baseEntryCount === session.entryCount &&\n\t\tbase.baseLeafId === session.leafId &&\n\t\tbase.baseRevision === session.revision\n\t);\n}\n\nexport function canonicalJsonStringify(value: unknown): string | undefined {\n\tif (Array.isArray(value)) {\n\t\treturn `[${Array.from(value, (item) => canonicalJsonStringify(item) ?? \"null\").join(\",\")}]`;\n\t}\n\tif (value !== null && typeof value === \"object\") {\n\t\tconst record = value as Record<string, unknown>;\n\t\tconst properties: string[] = [];\n\t\tfor (const key of Object.keys(record).sort()) {\n\t\t\tconst serialized = canonicalJsonStringify(record[key]);\n\t\t\tif (serialized !== undefined) {\n\t\t\t\tproperties.push(`${JSON.stringify(key)}:${serialized}`);\n\t\t\t}\n\t\t}\n\t\treturn `{${properties.join(\",\")}}`;\n\t}\n\treturn JSON.stringify(value);\n}\n\nexport function hashPiServerStaticContext(context: PiServerStaticContext | undefined): string {\n\tif (!context) return \"\";\n\tconst canonical = {\n\t\tsystemPrompt: context.systemPrompt,\n\t\ttools: context.tools?.map((tool) => ({\n\t\t\tname: tool.name,\n\t\t\tdescription: tool.description,\n\t\t\tparameters: tool.parameters,\n\t\t\tconstrainedSampling: tool.constrainedSampling,\n\t\t})),\n\t};\n\tconst serialized = canonicalJsonStringify(canonical);\n\tif (serialized === undefined) {\n\t\tthrow new Error(\"Failed to serialize pi-server static context\");\n\t}\n\treturn createHash(\"sha256\").update(serialized).digest(\"hex\");\n}\n\nexport const PI_SERVER_EMPTY_TREE_HASH = createHash(\"sha256\").update(\"pi-tree-v1\").digest(\"hex\");\n\nexport function hashPiServerTreeEntry(entry: SessionTreeEntry): string {\n\treturn createHash(\"sha256\").update(JSON.stringify(entry)).digest(\"hex\");\n}\n\nexport function appendPiServerTreeHash(previousHash: string, entryHash: string): string {\n\treturn createHash(\"sha256\").update(`${previousHash}:${entryHash}`).digest(\"hex\");\n}\n\nexport function buildPiServerTreePrefixHashes(entries: SessionTreeEntry[]): string[] {\n\tconst hashes = [PI_SERVER_EMPTY_TREE_HASH];\n\tfor (const entry of entries) {\n\t\thashes.push(appendPiServerTreeHash(hashes[hashes.length - 1], hashPiServerTreeEntry(entry)));\n\t}\n\treturn hashes;\n}\n\nexport function hashPiServerSessionEntries(entries: SessionTreeEntry[]): string {\n\treturn buildPiServerTreePrefixHashes(entries)[entries.length];\n}\n"]}

package/dist/receive-upload.d.ts

@@ -1,3 +1,8 @@
+export declare const RECEIVE_UPLOAD_MAX_ENTRIES = 10000;
+export declare const RECEIVE_UPLOAD_MAX_NAME_CHARS = 255;
+export declare const RECEIVE_UPLOAD_MAX_PATH_CHARS = 4096;
+export declare const RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS = 255;
+export declare const RECEIVE_UPLOAD_MAX_DECODED_BYTES: number;
 export declare class ReceiveUploadError extends Error {
     status: number;
     constructor(status: number, message: string);

package/dist/receive-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"receive-upload.d.ts","sourceRoot":"","sources":["../src/receive-upload.ts"],"names":[],"mappings":"AASA,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAG1C;CACD;AA8DD,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAqB/F","sourcesContent":["import { existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from \"node:fs\";\nimport { dirname, join } from \"node:path\";\n\ninterface UploadEntry {\n\tpath: string;\n\ttype: \"file\" | \"directory\";\n\tdata?: Buffer;\n}\n\nexport class ReceiveUploadError extends Error {\n\tstatus: number;\n\n\tconstructor(status: number, message: string) {\n\t\tsuper(message);\n\t\tthis.status = status;\n\t}\n}\n\nfunction invalid(message: string): never {\n\tthrow new ReceiveUploadError(400, message);\n}\n\nfunction validatePath(path: unknown): string {\n\tif (typeof path !== \"string\") invalid(\"entry path must be a string\");\n\tif (path.includes(\"\\\\\") || path.includes(\"\\0\")) invalid(`invalid entry path: ${path}`);\n\tif (path !== \"\" && path.split(\"/\").some((part) => part === \"\" || part === \".\" || part === \"..\")) {\n\t\tinvalid(`invalid entry path: ${path}`);\n\t}\n\treturn path;\n}\n\nfunction validateBody(body: unknown): { name: string; entries: UploadEntry[] } {\n\tif (typeof body !== \"object\" || body === null) invalid(\"upload body must be an object\");\n\tconst upload = body as { name?: unknown; entries?: unknown };\n\tif (\n\t\ttypeof upload.name !== \"string\" ||\n\t\tupload.name === \"\" ||\n\t\tupload.name === \".\" ||\n\t\tupload.name === \"..\" ||\n\t\tupload.name.includes(\"/\") ||\n\t\tupload.name.includes(\"\\\\\") ||\n\t\tupload.name.includes(\"\\0\")\n\t) {\n\t\tinvalid(\"invalid upload name\");\n\t}\n\tif (!Array.isArray(upload.entries) || upload.entries.length === 0) invalid(\"entries must be a non-empty array\");\n\n\tconst entries: UploadEntry[] = [];\n\tconst entryTypes = new Map<string, \"file\" | \"directory\">();\n\tfor (const value of upload.entries) {\n\t\tif (typeof value !== \"object\" || value === null) invalid(\"each entry must be an object\");\n\t\tconst entry = value as { path?: unknown; type?: unknown; data?: unknown };\n\t\tconst path = validatePath(entry.path);\n\t\tif (entry.type !== \"file\" && entry.type !== \"directory\") invalid(`invalid entry type: ${String(entry.type)}`);\n\t\tif (entryTypes.has(path)) invalid(`duplicate entry path: ${path}`);\n\t\tentryTypes.set(path, entry.type);\n\t\tif (entry.type === \"directory\") {\n\t\t\tif (entry.data !== undefined) invalid(`directory entry must not contain data: ${path}`);\n\t\t\tentries.push({ path, type: \"directory\" });\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof entry.data !== \"string\") invalid(`file entry data must be base64: ${path}`);\n\t\tconst data = Buffer.from(entry.data, \"base64\");\n\t\tif (data.toString(\"base64\") !== entry.data) invalid(`file entry data must be valid base64: ${path}`);\n\t\tentries.push({ path, type: \"file\", data });\n\t}\n\n\tconst rootType = entryTypes.get(\"\");\n\tif (!rootType) invalid(\"entries must include the root path\");\n\tif (rootType === \"file\" && entries.length !== 1) invalid(\"a file upload cannot contain child entries\");\n\tfor (const entry of entries) {\n\t\tif (entry.path === \"\") continue;\n\t\tconst parent = entry.path.includes(\"/\") ? entry.path.slice(0, entry.path.lastIndexOf(\"/\")) : \"\";\n\t\tif (entryTypes.get(parent) !== \"directory\") invalid(`missing directory entry: ${parent}`);\n\t}\n\treturn { name: upload.name, entries };\n}\n\nexport function receiveUpload(uploadDir: string, body: unknown): { path: string; files: number } {\n\tconst upload = validateBody(body);\n\tmkdirSync(uploadDir, { recursive: true });\n\tconst destination = join(uploadDir, upload.name);\n\tif (existsSync(destination)) throw new ReceiveUploadError(409, `destination already exists: ${destination}`);\n\tconst temporaryDir = mkdtempSync(join(uploadDir, \".upload-\"));\n\tconst temporaryRoot = join(temporaryDir, upload.name);\n\ttry {\n\t\tfor (const entry of upload.entries.filter((entry) => entry.type === \"directory\")) {\n\t\t\tmkdirSync(join(temporaryRoot, entry.path), { recursive: true });\n\t\t}\n\t\tfor (const entry of upload.entries.filter((entry) => entry.type === \"file\")) {\n\t\t\tconst path = join(temporaryRoot, entry.path);\n\t\t\tmkdirSync(dirname(path), { recursive: true });\n\t\t\twriteFileSync(path, entry.data!);\n\t\t}\n\t\trenameSync(temporaryRoot, destination);\n\t} finally {\n\t\trmSync(temporaryDir, { recursive: true, force: true });\n\t}\n\treturn { path: destination, files: upload.entries.filter((entry) => entry.type === \"file\").length };\n}\n"]}
+{"version":3,"file":"receive-upload.d.ts","sourceRoot":"","sources":["../src/receive-upload.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,6BAA6B,MAAM,CAAC;AACjD,eAAO,MAAM,6BAA6B,OAAO,CAAC;AAClD,eAAO,MAAM,qCAAqC,MAAM,CAAC;AACzD,eAAO,MAAM,gCAAgC,QAAmB,CAAC;AAEjE,qBAAa,kBAAmB,SAAQ,KAAK;IAC5C,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAG1C;CACD;AAuID,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA2B/F","sourcesContent":["import {\n\tcloseSync,\n\texistsSync,\n\tlstatSync,\n\tmkdirSync,\n\tmkdtempSync,\n\topenSync,\n\treaddirSync,\n\treadSync,\n\trenameSync,\n\trmSync,\n\twriteFileSync,\n} from \"node:fs\";\nimport { dirname, join, relative, sep } from \"node:path\";\n\ninterface UploadEntry {\n\tpath: string;\n\ttype: \"file\" | \"directory\";\n\tdata?: Buffer;\n}\n\nexport const RECEIVE_UPLOAD_MAX_ENTRIES = 10_000;\nexport const RECEIVE_UPLOAD_MAX_NAME_CHARS = 255;\nexport const RECEIVE_UPLOAD_MAX_PATH_CHARS = 4096;\nexport const RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS = 255;\nexport const RECEIVE_UPLOAD_MAX_DECODED_BYTES = 64 * 1024 * 1024;\n\nexport class ReceiveUploadError extends Error {\n\tstatus: number;\n\n\tconstructor(status: number, message: string) {\n\t\tsuper(message);\n\t\tthis.status = status;\n\t}\n}\n\nfunction invalid(message: string): never {\n\tthrow new ReceiveUploadError(400, message);\n}\n\nfunction validatePath(path: unknown): string {\n\tif (typeof path !== \"string\") invalid(\"entry path must be a string\");\n\tif (path.length > RECEIVE_UPLOAD_MAX_PATH_CHARS) {\n\t\tinvalid(`entry path must not exceed ${RECEIVE_UPLOAD_MAX_PATH_CHARS} characters`);\n\t}\n\tif (path.includes(\"\\\\\") || path.includes(\"\\0\")) invalid(`invalid entry path: ${path}`);\n\tif (path !== \"\" && path.split(\"/\").some((part) => part === \"\" || part === \".\" || part === \"..\")) {\n\t\tinvalid(`invalid entry path: ${path}`);\n\t}\n\tif (path.split(\"/\").some((part) => part.length > RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS)) {\n\t\tinvalid(`entry path segment must not exceed ${RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS} characters`);\n\t}\n\treturn path;\n}\n\nfunction validateBody(body: unknown): { name: string; entries: UploadEntry[] } {\n\tif (typeof body !== \"object\" || body === null) invalid(\"upload body must be an object\");\n\tconst upload = body as { name?: unknown; entries?: unknown };\n\tif (\n\t\ttypeof upload.name !== \"string\" ||\n\t\tupload.name === \"\" ||\n\t\tupload.name === \".\" ||\n\t\tupload.name === \"..\" ||\n\t\tupload.name.includes(\"/\") ||\n\t\tupload.name.includes(\"\\\\\") ||\n\t\tupload.name.includes(\"\\0\") ||\n\t\tupload.name.length > RECEIVE_UPLOAD_MAX_NAME_CHARS\n\t) {\n\t\tinvalid(\"invalid upload name\");\n\t}\n\tif (!Array.isArray(upload.entries) || upload.entries.length === 0) invalid(\"entries must be a non-empty array\");\n\tif (upload.entries.length > RECEIVE_UPLOAD_MAX_ENTRIES) {\n\t\tinvalid(`entries must not exceed ${RECEIVE_UPLOAD_MAX_ENTRIES}`);\n\t}\n\n\tconst entries: UploadEntry[] = [];\n\tconst entryTypes = new Map<string, \"file\" | \"directory\">();\n\tlet decodedBytes = 0;\n\tfor (const value of upload.entries) {\n\t\tif (typeof value !== \"object\" || value === null) invalid(\"each entry must be an object\");\n\t\tconst entry = value as { path?: unknown; type?: unknown; data?: unknown };\n\t\tconst path = validatePath(entry.path);\n\t\tif (entry.type !== \"file\" && entry.type !== \"directory\") invalid(`invalid entry type: ${String(entry.type)}`);\n\t\tif (entryTypes.has(path)) invalid(`duplicate entry path: ${path}`);\n\t\tentryTypes.set(path, entry.type);\n\t\tif (entry.type === \"directory\") {\n\t\t\tif (entry.data !== undefined) invalid(`directory entry must not contain data: ${path}`);\n\t\t\tentries.push({ path, type: \"directory\" });\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof entry.data !== \"string\") invalid(`file entry data must be base64: ${path}`);\n\t\tconst data = Buffer.from(entry.data, \"base64\");\n\t\tif (data.toString(\"base64\") !== entry.data) invalid(`file entry data must be valid base64: ${path}`);\n\t\tdecodedBytes += data.byteLength;\n\t\tif (decodedBytes > RECEIVE_UPLOAD_MAX_DECODED_BYTES) {\n\t\t\tinvalid(`decoded upload data must not exceed ${RECEIVE_UPLOAD_MAX_DECODED_BYTES} bytes`);\n\t\t}\n\t\tentries.push({ path, type: \"file\", data });\n\t}\n\n\tconst rootType = entryTypes.get(\"\");\n\tif (!rootType) invalid(\"entries must include the root path\");\n\tif (rootType === \"file\" && entries.length !== 1) invalid(\"a file upload cannot contain child entries\");\n\tfor (const entry of entries) {\n\t\tif (entry.path === \"\") continue;\n\t\tconst parent = entry.path.includes(\"/\") ? entry.path.slice(0, entry.path.lastIndexOf(\"/\")) : \"\";\n\t\tif (entryTypes.get(parent) !== \"directory\") invalid(`missing directory entry: ${parent}`);\n\t}\n\treturn { name: upload.name, entries };\n}\n\nfunction fileMatches(path: string, expected: Buffer): boolean {\n\tconst stat = lstatSync(path);\n\tif (!stat.isFile() || stat.size !== expected.byteLength) return false;\n\tconst handle = openSync(path, \"r\");\n\tconst buffer = Buffer.allocUnsafe(Math.min(64 * 1024, Math.max(1, expected.byteLength)));\n\tlet offset = 0;\n\ttry {\n\t\twhile (offset < expected.byteLength) {\n\t\t\tconst bytesRead = readSync(\n\t\t\t\thandle,\n\t\t\t\tbuffer,\n\t\t\t\t0,\n\t\t\t\tMath.min(buffer.byteLength, expected.byteLength - offset),\n\t\t\t\toffset,\n\t\t\t);\n\t\t\tif (bytesRead === 0 || !buffer.subarray(0, bytesRead).equals(expected.subarray(offset, offset + bytesRead))) {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t\toffset += bytesRead;\n\t\t}\n\t\treturn true;\n\t} finally {\n\t\tcloseSync(handle);\n\t}\n}\n\nfunction existingDestinationMatches(destination: string, entries: UploadEntry[]): boolean {\n\tconst expected = new Map(entries.map((entry) => [entry.path, entry]));\n\tconst root = expected.get(\"\");\n\tif (!root) return false;\n\tconst destinationStat = lstatSync(destination);\n\tif (root.type === \"file\") {\n\t\treturn !destinationStat.isSymbolicLink() && fileMatches(destination, root.data!);\n\t}\n\tif (!destinationStat.isDirectory() || destinationStat.isSymbolicLink()) return false;\n\n\tlet visited = 1;\n\tconst visitDirectory = (directory: string): boolean => {\n\t\tfor (const child of readdirSync(directory, { withFileTypes: true })) {\n\t\t\tif (child.isSymbolicLink()) return false;\n\t\t\tconst childPath = join(directory, child.name);\n\t\t\tconst entryPath = relative(destination, childPath).split(sep).join(\"/\");\n\t\t\tconst entry = expected.get(entryPath);\n\t\t\tif (!entry) return false;\n\t\t\tvisited++;\n\t\t\tif (visited > expected.size) return false;\n\t\t\tif (entry.type === \"directory\") {\n\t\t\t\tif (!child.isDirectory() || !visitDirectory(childPath)) return false;\n\t\t\t} else if (!child.isFile() || !fileMatches(childPath, entry.data!)) {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t}\n\t\treturn true;\n\t};\n\n\treturn visitDirectory(destination) && visited === expected.size;\n}\n\nexport function receiveUpload(uploadDir: string, body: unknown): { path: string; files: number } {\n\tconst upload = validateBody(body);\n\tmkdirSync(uploadDir, { recursive: true });\n\tconst destination = join(uploadDir, upload.name);\n\tconst fileCount = upload.entries.filter((entry) => entry.type === \"file\").length;\n\tif (existsSync(destination)) {\n\t\tif (existingDestinationMatches(destination, upload.entries)) {\n\t\t\treturn { path: destination, files: fileCount };\n\t\t}\n\t\tthrow new ReceiveUploadError(409, `destination already exists with different contents: ${destination}`);\n\t}\n\tconst temporaryDir = mkdtempSync(join(uploadDir, \".upload-\"));\n\tconst temporaryRoot = join(temporaryDir, upload.name);\n\ttry {\n\t\tfor (const entry of upload.entries.filter((entry) => entry.type === \"directory\")) {\n\t\t\tmkdirSync(join(temporaryRoot, entry.path), { recursive: true });\n\t\t}\n\t\tfor (const entry of upload.entries.filter((entry) => entry.type === \"file\")) {\n\t\t\tconst path = join(temporaryRoot, entry.path);\n\t\t\tmkdirSync(dirname(path), { recursive: true });\n\t\t\twriteFileSync(path, entry.data!);\n\t\t}\n\t\trenameSync(temporaryRoot, destination);\n\t} finally {\n\t\trmSync(temporaryDir, { recursive: true, force: true });\n\t}\n\treturn { path: destination, files: fileCount };\n}\n"]}

package/dist/receive-upload.js

@@ -1,5 +1,10 @@
-import { existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { closeSync, existsSync, lstatSync, mkdirSync, mkdtempSync, openSync, readdirSync, readSync, renameSync, rmSync, writeFileSync, } from "node:fs";
+import { dirname, join, relative, sep } from "node:path";
+export const RECEIVE_UPLOAD_MAX_ENTRIES = 10_000;
+export const RECEIVE_UPLOAD_MAX_NAME_CHARS = 255;
+export const RECEIVE_UPLOAD_MAX_PATH_CHARS = 4096;
+export const RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS = 255;
+export const RECEIVE_UPLOAD_MAX_DECODED_BYTES = 64 * 1024 * 1024;
 export class ReceiveUploadError extends Error {
     status;
     constructor(status, message) {
@@ -13,11 +18,17 @@ function invalid(message) {
 function validatePath(path) {
     if (typeof path !== "string")
         invalid("entry path must be a string");
+    if (path.length > RECEIVE_UPLOAD_MAX_PATH_CHARS) {
+        invalid(`entry path must not exceed ${RECEIVE_UPLOAD_MAX_PATH_CHARS} characters`);
+    }
     if (path.includes("\\") || path.includes("\0"))
         invalid(`invalid entry path: ${path}`);
     if (path !== "" && path.split("/").some((part) => part === "" || part === "." || part === "..")) {
         invalid(`invalid entry path: ${path}`);
     }
+    if (path.split("/").some((part) => part.length > RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS)) {
+        invalid(`entry path segment must not exceed ${RECEIVE_UPLOAD_MAX_PATH_SEGMENT_CHARS} characters`);
+    }
     return path;
 }
 function validateBody(body) {
@@ -30,13 +41,18 @@ function validateBody(body) {
         upload.name === ".." ||
         upload.name.includes("/") ||
         upload.name.includes("\\") ||
-        upload.name.includes("\0")) {
+        upload.name.includes("\0") ||
+        upload.name.length > RECEIVE_UPLOAD_MAX_NAME_CHARS) {
         invalid("invalid upload name");
     }
     if (!Array.isArray(upload.entries) || upload.entries.length === 0)
         invalid("entries must be a non-empty array");
+    if (upload.entries.length > RECEIVE_UPLOAD_MAX_ENTRIES) {
+        invalid(`entries must not exceed ${RECEIVE_UPLOAD_MAX_ENTRIES}`);
+    }
     const entries = [];
     const entryTypes = new Map();
+    let decodedBytes = 0;
     for (const value of upload.entries) {
         if (typeof value !== "object" || value === null)
             invalid("each entry must be an object");
@@ -58,6 +74,10 @@ function validateBody(body) {
         const data = Buffer.from(entry.data, "base64");
         if (data.toString("base64") !== entry.data)
             invalid(`file entry data must be valid base64: ${path}`);
+        decodedBytes += data.byteLength;
+        if (decodedBytes > RECEIVE_UPLOAD_MAX_DECODED_BYTES) {
+            invalid(`decoded upload data must not exceed ${RECEIVE_UPLOAD_MAX_DECODED_BYTES} bytes`);
+        }
         entries.push({ path, type: "file", data });
     }
     const rootType = entryTypes.get("");
@@ -74,12 +94,74 @@ function validateBody(body) {
     }
     return { name: upload.name, entries };
 }
+function fileMatches(path, expected) {
+    const stat = lstatSync(path);
+    if (!stat.isFile() || stat.size !== expected.byteLength)
+        return false;
+    const handle = openSync(path, "r");
+    const buffer = Buffer.allocUnsafe(Math.min(64 * 1024, Math.max(1, expected.byteLength)));
+    let offset = 0;
+    try {
+        while (offset < expected.byteLength) {
+            const bytesRead = readSync(handle, buffer, 0, Math.min(buffer.byteLength, expected.byteLength - offset), offset);
+            if (bytesRead === 0 || !buffer.subarray(0, bytesRead).equals(expected.subarray(offset, offset + bytesRead))) {
+                return false;
+            }
+            offset += bytesRead;
+        }
+        return true;
+    }
+    finally {
+        closeSync(handle);
+    }
+}
+function existingDestinationMatches(destination, entries) {
+    const expected = new Map(entries.map((entry) => [entry.path, entry]));
+    const root = expected.get("");
+    if (!root)
+        return false;
+    const destinationStat = lstatSync(destination);
+    if (root.type === "file") {
+        return !destinationStat.isSymbolicLink() && fileMatches(destination, root.data);
+    }
+    if (!destinationStat.isDirectory() || destinationStat.isSymbolicLink())
+        return false;
+    let visited = 1;
+    const visitDirectory = (directory) => {
+        for (const child of readdirSync(directory, { withFileTypes: true })) {
+            if (child.isSymbolicLink())
+                return false;
+            const childPath = join(directory, child.name);
+            const entryPath = relative(destination, childPath).split(sep).join("/");
+            const entry = expected.get(entryPath);
+            if (!entry)
+                return false;
+            visited++;
+            if (visited > expected.size)
+                return false;
+            if (entry.type === "directory") {
+                if (!child.isDirectory() || !visitDirectory(childPath))
+                    return false;
+            }
+            else if (!child.isFile() || !fileMatches(childPath, entry.data)) {
+                return false;
+            }
+        }
+        return true;
+    };
+    return visitDirectory(destination) && visited === expected.size;
+}
 export function receiveUpload(uploadDir, body) {
     const upload = validateBody(body);
     mkdirSync(uploadDir, { recursive: true });
     const destination = join(uploadDir, upload.name);
-    if (existsSync(destination))
-        throw new ReceiveUploadError(409, `destination already exists: ${destination}`);
+    const fileCount = upload.entries.filter((entry) => entry.type === "file").length;
+    if (existsSync(destination)) {
+        if (existingDestinationMatches(destination, upload.entries)) {
+            return { path: destination, files: fileCount };
+        }
+        throw new ReceiveUploadError(409, `destination already exists with different contents: ${destination}`);
+    }
     const temporaryDir = mkdtempSync(join(uploadDir, ".upload-"));
     const temporaryRoot = join(temporaryDir, upload.name);
     try {
@@ -96,6 +178,6 @@ export function receiveUpload(uploadDir, body) {
     finally {
         rmSync(temporaryDir, { recursive: true, force: true });
     }
-    return { path: destination, files: upload.entries.filter((entry) => entry.type === "file").length };
+    return { path: destination, files: fileCount };
 }
 //# sourceMappingURL=receive-upload.js.map