@jmfederico/pi-web 1.202608.2 → 1.202609.1

package/dist/server/terminals/requiredTerminalService.js

@@ -0,0 +1,103 @@
+import { REQUIRED_TERMINAL_PLUGIN_ID } from "../../shared/requiredTerminalPlugin.js";
+/** Core's typed view of the bundled Terminal service capability. */
+export const REQUIRED_TERMINAL_SERVICE_CAPABILITY = Object.freeze({
+    pluginId: REQUIRED_TERMINAL_PLUGIN_ID,
+    id: "service",
+    version: 1,
+    parse: snapshotRequiredTerminalService,
+});
+export class RequiredTerminalUnavailableError extends Error {
+    constructor() {
+        super(...arguments);
+        this.name = "RequiredTerminalUnavailableError";
+    }
+}
+export function snapshotRequiredTerminalService(value) {
+    if (!isRecord(value))
+        throw new Error("Required Terminal server entry did not provide its composition service");
+    const closeForCwd = value["closeForCwd"];
+    const runCommand = value["runCommand"];
+    const bindActivitySink = value["bindActivitySink"];
+    if (typeof closeForCwd !== "function" || typeof runCommand !== "function" || typeof bindActivitySink !== "function") {
+        throw new Error("Required Terminal server entry did not provide its composition service");
+    }
+    return Object.freeze({
+        closeForCwd: (cwd) => { Reflect.apply(closeForCwd, value, [cwd]); },
+        runCommand: (options) => requireCommandRun(Reflect.apply(runCommand, value, [options])),
+        bindActivitySink: (sink) => {
+            Reflect.apply(bindActivitySink, value, [Object.freeze({
+                    updateTerminal: (terminal) => { sink.updateTerminal(terminal); },
+                    removeTerminal: (terminalId, cwd) => { sink.removeTerminal(terminalId, cwd); },
+                })]);
+        },
+    });
+}
+export function unavailableRequiredTerminalService() {
+    const unavailable = () => {
+        throw new RequiredTerminalUnavailableError("Required Terminal plugin is unavailable in recovery safe start; workspace removal cannot continue");
+    };
+    return Object.freeze({
+        closeForCwd: unavailable,
+        runCommand: unavailable,
+        bindActivitySink: () => undefined,
+    });
+}
+function requireCommandRun(value) {
+    if (!isRecord(value))
+        throw invalidCommandRun();
+    const status = value["status"];
+    const exitCode = optionalFiniteNumber(value["exitCode"]);
+    const startedAt = optionalString(value["startedAt"]);
+    const completedAt = optionalString(value["completedAt"]);
+    if (typeof value["id"] !== "string"
+        || typeof value["origin"] !== "string"
+        || typeof value["projectId"] !== "string"
+        || typeof value["workspaceId"] !== "string"
+        || typeof value["terminalId"] !== "string"
+        || typeof value["title"] !== "string"
+        || typeof value["command"] !== "string"
+        || (status !== "queued" && status !== "running" && status !== "succeeded" && status !== "failed")
+        || exitCode === invalidOptionalField
+        || typeof value["createdAt"] !== "string"
+        || startedAt === invalidOptionalField
+        || completedAt === invalidOptionalField
+        || !isStringRecord(value["metadata"])) {
+        throw invalidCommandRun();
+    }
+    return {
+        id: value["id"],
+        origin: value["origin"],
+        projectId: value["projectId"],
+        workspaceId: value["workspaceId"],
+        terminalId: value["terminalId"],
+        title: value["title"],
+        command: value["command"],
+        status,
+        ...(exitCode === undefined ? {} : { exitCode }),
+        createdAt: value["createdAt"],
+        ...(startedAt === undefined ? {} : { startedAt }),
+        ...(completedAt === undefined ? {} : { completedAt }),
+        metadata: { ...value["metadata"] },
+    };
+}
+const invalidOptionalField = Symbol("invalid optional Terminal field");
+function optionalFiniteNumber(value) {
+    if (value === undefined)
+        return undefined;
+    return typeof value === "number" && Number.isFinite(value) ? value : invalidOptionalField;
+}
+function optionalString(value) {
+    if (value === undefined)
+        return undefined;
+    return typeof value === "string" ? value : invalidOptionalField;
+}
+function isStringRecord(value) {
+    return isRecord(value) && Object.values(value).every((child) => typeof child === "string");
+}
+function invalidCommandRun() {
+    return new Error("Required Terminal server entry returned an invalid command run");
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null;
+}
+//# sourceMappingURL=requiredTerminalService.js.map

package/dist/server/terminals/requiredTerminalService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requiredTerminalService.js","sourceRoot":"","sources":["../../../src/server/terminals/requiredTerminalService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAuCrF,oEAAoE;AACpE,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,MAAM,CAAC;IAChE,QAAQ,EAAE,2BAA2B;IACrC,EAAE,EAAE,SAAS;IACb,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,+BAA+B;CACvC,CAAwD,CAAC;AAE1D,MAAM,OAAO,gCAAiC,SAAQ,KAAK;IAA3D;;QACW,SAAI,GAAG,kCAAkC,CAAC;IACrD,CAAC;CAAA;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAc;IAC5D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAChH,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,gBAAgB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACnD,IAAI,OAAO,WAAW,KAAK,UAAU,IAAI,OAAO,UAAU,KAAK,UAAU,IAAI,OAAO,gBAAgB,KAAK,UAAU,EAAE,CAAC;QACpH,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC5F,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,CAAC,GAAW,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,UAAU,EAAE,CAAC,OAAkC,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAClH,gBAAgB,EAAE,CAAC,IAAkC,EAAE,EAAE;YACvD,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;oBACpD,cAAc,EAAE,CAAC,QAAkC,EAAE,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC1F,cAAc,EAAE,CAAC,UAAkB,EAAE,GAAY,EAAE,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;iBAChG,CAAC,CAAC,CAAC,CAAC;QACP,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kCAAkC;IAChD,MAAM,WAAW,GAAG,GAAU,EAAE;QAC9B,MAAM,IAAI,gCAAgC,CACxC,mGAAmG,CACpG,CAAC;IACJ,CAAC,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,WAAW;QACxB,UAAU,EAAE,WAAW;QACvB,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;KAClC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,MAAM,iBAAiB,EAAE,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IACzD,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ;WAC9B,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ;WACnC,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ;WACtC,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,QAAQ;WACxC,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,QAAQ;WACvC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,QAAQ;WAClC,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ;WACpC,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,QAAQ,CAAC;WAC9F,QAAQ,KAAK,oBAAoB;WACjC,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,QAAQ;WACtC,SAAS,KAAK,oBAAoB;WAClC,WAAW,KAAK,oBAAoB;WACpC,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACxC,MAAM,iBAAiB,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC;QACf,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC;QACvB,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC;QAC7B,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;QACjC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC;QAC/B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;QACzB,MAAM;QACN,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;QAC/C,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC;QAC7B,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;QACjD,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QACrD,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,oBAAoB,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;AAEvE,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC;AAC5F,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC;AAClE,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}

package/dist/server/webSocketBridge.js

@@ -1,4 +1,59 @@
 import { WebSocket } from "ws";
+import { boundedPluginBackendChannelCloseReason, PLUGIN_BACKEND_CHANNEL_DATA_FRAME_MAX_BYTES, PLUGIN_BACKEND_CHANNEL_DRAIN_TIMEOUT_MS, PLUGIN_BACKEND_CHANNEL_OPEN_FRAME_MAX_BYTES, PLUGIN_BACKEND_CHANNEL_QUEUE_MAX_BYTES, PLUGIN_BACKEND_CHANNEL_QUEUE_MAX_FRAMES, PLUGIN_BACKEND_CHANNEL_SERVER_TO_BROWSER_QUEUE_MAX_BYTES, PLUGIN_BACKEND_CHANNEL_TEARDOWN_TIMEOUT_MS, utf8ByteLength, } from "../shared/pluginBackendProtocol.js";
+const pluginChannelLimitedServers = new WeakSet();
+const pendingPluginBackendChannelUpgrades = new WeakSet();
+export class PluginBackendChannelTransportFrameError extends Error {
+    constructor(closeCode, message, options) {
+        super(message, options);
+        this.closeCode = closeCode;
+        this.name = "PluginBackendChannelTransportFrameError";
+    }
+}
+/** Decode one opaque text frame while enforcing only physical-hop bounds. */
+export function decodeBoundedPluginBackendChannelTextFrame(data, isBinary, maxBytes, label) {
+    if (isBinary) {
+        throw new PluginBackendChannelTransportFrameError(1003, "Plugin backend channels accept text frames only");
+    }
+    if (typeof data === "string") {
+        if (utf8ByteLength(data) > maxBytes) {
+            throw new PluginBackendChannelTransportFrameError(1009, `${label} exceeds the ${String(maxBytes)} byte transport limit`);
+        }
+        return data;
+    }
+    const bytes = data instanceof ArrayBuffer
+        ? new Uint8Array(data)
+        : Array.isArray(data)
+            ? Buffer.concat(data)
+            : data;
+    if (bytes.byteLength > maxBytes) {
+        throw new PluginBackendChannelTransportFrameError(1009, `${label} exceeds the ${String(maxBytes)} byte transport limit`);
+    }
+    try {
+        return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+    }
+    catch (error) {
+        throw new PluginBackendChannelTransportFrameError(1007, `${label} must be valid UTF-8 text`, { cause: error });
+    }
+}
+/** Mark a Fastify-matched paired-channel request before ws allocates its receiver. */
+export function markPluginBackendChannelUpgradeRequest(request) {
+    pendingPluginBackendChannelUpgrades.add(request);
+}
+/** Select the plugin-channel ingress cap before ws allocates its receiver. */
+export function installPluginBackendChannelWebSocketPayloadLimit(server) {
+    if (pluginChannelLimitedServers.has(server))
+        return;
+    pluginChannelLimitedServers.add(server);
+    const defaultMaxPayload = server.options.maxPayload;
+    server.on("headers", (_headers, request) => {
+        // The ws `headers` event runs synchronously immediately before setSocket()
+        // reads this option. Reset every unrelated upgrade so session protocols keep
+        // the server's configured allowance.
+        server.options.maxPayload = pendingPluginBackendChannelUpgrades.delete(request)
+            ? PLUGIN_BACKEND_CHANNEL_OPEN_FRAME_MAX_BYTES
+            : defaultMaxPayload;
+    });
+}
 export function bridgeSockets(client, upstream) {
     const sendToClient = createBufferedSender(client);
     const sendToUpstream = createBufferedSender(upstream);
@@ -29,4 +84,288 @@ export function createBufferedSender(socket) {
             queue.push(data);
     };
 }
+/** One-at-a-time sender whose connecting and socket-write queue is explicitly bounded. */
+export function createBoundedTextWebSocketSender(socket, options = {}) {
+    const maxFrames = options.maxFrames ?? PLUGIN_BACKEND_CHANNEL_QUEUE_MAX_FRAMES;
+    const maxBytes = options.maxBytes ?? PLUGIN_BACKEND_CHANNEL_QUEUE_MAX_BYTES;
+    const queue = [];
+    const drainWaiters = new Set();
+    let queuedBytes = 0;
+    let sending = false;
+    let failure;
+    const settleDrainWaiters = () => {
+        if (failure === undefined && (sending || queue.length !== 0))
+            return;
+        for (const waiter of drainWaiters) {
+            clearTimeout(waiter.timer);
+            if (failure === undefined)
+                waiter.resolve();
+            else
+                waiter.reject(failure);
+        }
+        drainWaiters.clear();
+    };
+    const fail = (error) => {
+        if (failure !== undefined)
+            return;
+        failure = error;
+        options.onOverflow?.(error);
+        settleDrainWaiters();
+    };
+    const flush = () => {
+        if (sending || failure !== undefined || socket.readyState !== WebSocket.OPEN)
+            return;
+        const frame = queue[0];
+        if (frame === undefined) {
+            settleDrainWaiters();
+            return;
+        }
+        sending = true;
+        try {
+            socket.send(frame.text, { binary: false }, (error) => {
+                sending = false;
+                if (queue[0] === frame) {
+                    queue.shift();
+                    queuedBytes -= frame.bytes;
+                }
+                if (error) {
+                    fail(new Error(`Plugin backend channel socket send failed: ${error.message}`, { cause: error }));
+                    return;
+                }
+                flush();
+            });
+        }
+        catch (error) {
+            sending = false;
+            if (queue[0] === frame) {
+                queue.shift();
+                queuedBytes -= frame.bytes;
+            }
+            fail(error instanceof Error ? error : new Error(String(error)));
+        }
+    };
+    if (socket.readyState === WebSocket.CONNECTING)
+        socket.once("open", flush);
+    const send = (text) => {
+        if (failure !== undefined || (socket.readyState !== WebSocket.OPEN && socket.readyState !== WebSocket.CONNECTING)) {
+            throw new Error("Plugin backend channel socket is not open");
+        }
+        const bytes = utf8ByteLength(text);
+        if (queue.length >= maxFrames || queuedBytes + bytes > maxBytes) {
+            const error = new Error("Plugin backend channel socket queue limit was exceeded");
+            fail(error);
+            throw error;
+        }
+        queue.push({ text, bytes });
+        queuedBytes += bytes;
+        flush();
+    };
+    const drain = (timeoutMs = PLUGIN_BACKEND_CHANNEL_DRAIN_TIMEOUT_MS) => {
+        if (failure !== undefined)
+            return Promise.reject(failure);
+        if (!sending && queue.length === 0)
+            return Promise.resolve();
+        return new Promise((resolve, reject) => {
+            const waiter = {
+                resolve,
+                reject,
+                timer: setTimeout(() => {
+                    drainWaiters.delete(waiter);
+                    reject(new Error(`Plugin backend channel socket drain timed out after ${String(timeoutMs)}ms`));
+                }, timeoutMs),
+            };
+            waiter.timer.unref();
+            drainWaiters.add(waiter);
+        });
+    };
+    return Object.assign(send, { drain });
+}
+/**
+ * Boundedly bridge opaque generic-channel text without reading plugin or host
+ * envelope semantics. The returned lifetime resolves only after both physical
+ * sockets have closed and accepted clean-close frames have drained.
+ */
+export function bridgePluginBackendChannelSockets(client, upstream, options = {}) {
+    setPluginBackendChannelSocketPayloadLimit(client, PLUGIN_BACKEND_CHANNEL_OPEN_FRAME_MAX_BYTES);
+    let closing = false;
+    let closeNotified = false;
+    let receivedClientFrame = false;
+    let resolveCompletion = () => undefined;
+    const completion = new Promise((resolve) => { resolveCompletion = resolve; });
+    const isClosing = () => closing;
+    const detachBridgeListeners = () => {
+        client.off("message", onClientMessage);
+        upstream.off("message", onUpstreamMessage);
+        client.off("close", onClientClose);
+        upstream.off("close", onUpstreamClose);
+        client.off("error", onClientError);
+        upstream.off("error", onUpstreamError);
+    };
+    const notifyClosed = () => {
+        if (closeNotified)
+            return;
+        closeNotified = true;
+        detachBridgeListeners();
+        resolveCompletion();
+    };
+    const fail = (code, reason) => {
+        if (closing)
+            return;
+        closing = true;
+        void Promise.allSettled([
+            closePluginBackendChannelWebSocket(client, code, reason),
+            closePluginBackendChannelWebSocket(upstream, code, reason),
+        ]).finally(notifyClosed);
+    };
+    const sendToClient = createBoundedTextWebSocketSender(client, {
+        maxBytes: PLUGIN_BACKEND_CHANNEL_SERVER_TO_BROWSER_QUEUE_MAX_BYTES,
+        onOverflow: (error) => { fail(1013, error.message); },
+    });
+    const sendToUpstream = createBoundedTextWebSocketSender(upstream, {
+        onOverflow: (error) => { fail(1013, error.message); },
+    });
+    const forwardClientFrame = (data, isBinary) => {
+        const firstFrame = !receivedClientFrame;
+        const text = decodeBoundedPluginBackendChannelTextFrame(data, isBinary, firstFrame ? PLUGIN_BACKEND_CHANNEL_OPEN_FRAME_MAX_BYTES : PLUGIN_BACKEND_CHANNEL_DATA_FRAME_MAX_BYTES, firstFrame ? "Plugin backend channel first client frame" : "Plugin backend channel client frame");
+        if (firstFrame) {
+            receivedClientFrame = true;
+            setPluginBackendChannelSocketPayloadLimit(client, PLUGIN_BACKEND_CHANNEL_DATA_FRAME_MAX_BYTES);
+        }
+        sendToUpstream(text);
+    };
+    function onClientMessage(data, isBinary) {
+        try {
+            forwardClientFrame(data, isBinary);
+        }
+        catch (error) {
+            fail(transportFrameCloseCode(error), bridgeErrorMessage(error));
+        }
+    }
+    function onUpstreamMessage(data, isBinary) {
+        try {
+            const text = decodeBoundedPluginBackendChannelTextFrame(data, isBinary, PLUGIN_BACKEND_CHANNEL_DATA_FRAME_MAX_BYTES, "Plugin backend channel upstream frame");
+            sendToClient(text);
+        }
+        catch (error) {
+            fail(transportFrameCloseCode(error), bridgeErrorMessage(error));
+        }
+    }
+    function onClientClose(code, reason) {
+        if (closing)
+            return;
+        closing = true;
+        void propagatePluginChannelClose(upstream, sendToUpstream, code, decodeCloseReason(reason)).finally(notifyClosed);
+    }
+    function onUpstreamClose(code, reason) {
+        if (closing)
+            return;
+        closing = true;
+        void propagatePluginChannelClose(client, sendToClient, code, decodeCloseReason(reason)).finally(notifyClosed);
+    }
+    function onClientError(error) {
+        fail(1011, `Plugin backend channel client transport failed: ${bridgeErrorMessage(error)}`);
+    }
+    function onUpstreamError(error) {
+        fail(1011, `Plugin backend channel upstream transport failed: ${bridgeErrorMessage(error)}`);
+    }
+    client.on("message", onClientMessage);
+    upstream.on("message", onUpstreamMessage);
+    client.once("close", onClientClose);
+    upstream.once("close", onUpstreamClose);
+    client.once("error", onClientError);
+    upstream.once("error", onUpstreamError);
+    for (const text of options.initialClientFrames ?? []) {
+        if (isClosing())
+            break;
+        try {
+            forwardClientFrame(text, false);
+        }
+        catch (error) {
+            fail(transportFrameCloseCode(error), bridgeErrorMessage(error));
+        }
+    }
+    return completion;
+}
+async function propagatePluginChannelClose(target, sender, code, reason) {
+    const closeCode = transferableCloseCode(code);
+    if (closeCode === 1000) {
+        try {
+            await sender.drain();
+        }
+        catch (error) {
+            await closePluginBackendChannelWebSocket(target, 1011, `Plugin backend channel clean-close drain failed: ${bridgeErrorMessage(error)}`);
+            return;
+        }
+    }
+    await closePluginBackendChannelWebSocket(target, closeCode, reason);
+}
+/**
+ * `@fastify/websocket` owns one ws server for unrelated routes, so its public
+ * maxPayload option cannot express this route's smaller protocol bound. Update
+ * the ws receiver before route listeners run, then tighten it after the larger
+ * first open frame. Keep this compatibility seam isolated and fail loudly if a
+ * future ws version changes the receiver shape.
+ */
+export function setPluginBackendChannelSocketPayloadLimit(socket, maxPayload) {
+    const receiver = Reflect.get(socket, "_receiver");
+    if (typeof receiver !== "object" || receiver === null || typeof Reflect.get(receiver, "_maxPayload") !== "number") {
+        throw new Error("Plugin backend channel transport cannot apply its payload limit");
+    }
+    if (!Reflect.set(receiver, "_maxPayload", maxPayload)) {
+        throw new Error("Plugin backend channel transport cannot apply its payload limit");
+    }
+}
+function transportFrameCloseCode(error) {
+    return error instanceof PluginBackendChannelTransportFrameError ? error.closeCode : 1011;
+}
+function decodeCloseReason(reason) {
+    try {
+        return new TextDecoder("utf-8", { fatal: true }).decode(reason);
+    }
+    catch {
+        return "Invalid close reason";
+    }
+}
+function transferableCloseCode(code) {
+    return code === 1000 || (code >= 1001 && code <= 1014 && code !== 1004 && code !== 1005 && code !== 1006)
+        ? code
+        : 1011;
+}
+/** Resolve only after the physical socket closes, terminating a non-cooperating peer at the hard deadline. */
+export function closePluginBackendChannelWebSocket(socket, code, reason, options = {}) {
+    if (socket.readyState === WebSocket.CLOSED)
+        return Promise.resolve();
+    return new Promise((resolve) => {
+        let settled = false;
+        const consumeExpectedError = () => undefined;
+        const finish = () => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            socket.off("close", finish);
+            socket.off("error", consumeExpectedError);
+            resolve();
+        };
+        const timer = setTimeout(() => {
+            if (socket.readyState !== WebSocket.CLOSED)
+                socket.terminate();
+        }, options.teardownTimeoutMs ?? PLUGIN_BACKEND_CHANNEL_TEARDOWN_TIMEOUT_MS);
+        timer.unref();
+        socket.once("close", finish);
+        socket.once("error", consumeExpectedError);
+        if (options.terminateImmediately === true || socket.readyState === WebSocket.CONNECTING) {
+            socket.terminate();
+        }
+        else if (socket.readyState === WebSocket.OPEN) {
+            socket.close(code, boundedPluginBackendChannelCloseReason(reason));
+        }
+        if (socket.readyState === WebSocket.CLOSED)
+            finish();
+    });
+}
+function bridgeErrorMessage(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return boundedPluginBackendChannelCloseReason(message);
+}
 //# sourceMappingURL=webSocketBridge.js.map

package/dist/server/webSocketBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketBridge.js","sourceRoot":"","sources":["../../src/server/webSocketBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,IAAI,CAAC;AAE1C,MAAM,UAAU,aAAa,CAAC,MAAiB,EAAE,QAAmB;IAClE,MAAM,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAiB;IACpD,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,OAAO,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC3B,IAAI,IAAI,KAAK,SAAS;gBAAE,OAAO;YAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACzB,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"webSocketBridge.js","sourceRoot":"","sources":["../../src/server/webSocketBridge.ts"],"names":[],"mappings":"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"}

package/dist/server/workspaces/projectPiWebConfig.js

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { effectiveUploadsConfig, parsePathAccessConfig, parseUploadsConfig } from "../../config.js";
+import { effectiveAttachmentsConfig, effectiveUploadsConfig, parseAttachmentsConfig, parsePathAccessConfig, parseUploadsConfig } from "../../config.js";
 export const PROJECT_PI_WEB_CONFIG_PATH = ".pi-web/config.json";
 export async function loadProjectPiWebConfig(projectPath) {
     const path = join(projectPath, PROJECT_PI_WEB_CONFIG_PATH);
@@ -24,6 +24,10 @@ export async function loadEffectiveProjectUploadsConfig(projectPath, globalConfi
     const projectConfig = await loadProjectPiWebConfig(projectPath);
     return effectiveUploadsConfig({ uploads: { ...(globalConfig.uploads ?? {}), ...(projectConfig.config.uploads ?? {}) } });
 }
+export async function loadEffectiveProjectAttachmentsConfig(projectPath, globalConfig) {
+    const projectConfig = await loadProjectPiWebConfig(projectPath);
+    return effectiveAttachmentsConfig({ attachments: { ...(globalConfig.attachments ?? {}), ...(projectConfig.config.attachments ?? {}) } });
+}
 export function mergePathAccessConfigs(...configs) {
     const allowedPaths = dedupe(configs.flatMap((config) => config?.allowedPaths ?? []));
     return allowedPaths.length === 0 ? undefined : { allowedPaths };
@@ -34,6 +38,7 @@ function parseProjectPiWebConfig(value, path) {
         ...(version !== undefined ? { version: parseProjectConfigVersion(version, path) } : {}),
         ...(value["pathAccess"] !== undefined ? { pathAccess: parsePathAccessConfig(value["pathAccess"], path) } : {}),
         ...(value["uploads"] !== undefined ? { uploads: parseUploadsConfig(value["uploads"], path) } : {}),
+        ...(value["attachments"] !== undefined ? { attachments: parseAttachmentsConfig(value["attachments"], path) } : {}),
     };
 }
 function parseProjectConfigVersion(value, path) {

package/dist/server/workspaces/projectPiWebConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectPiWebConfig.js","sourceRoot":"","sources":["../../../src/server/workspaces/projectPiWebConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projectPiWebConfig.js","sourceRoot":"","sources":["../../../src/server/workspaces/projectPiWebConfig.ts"],"names":[],"mappings":"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"}

package/dist/server/workspaces/sessionDaemonWorkspaceCatalog.js

@@ -169,7 +169,6 @@ function parseProvider(value, workspaceLabel) {
     return Object.freeze({
         pluginId: requirePluginId(value, "pluginId", label),
         capabilities: Object.freeze({
-            request: requireBoolean(capabilities, "request", `${label} capabilities`),
             remove: requireBoolean(capabilities, "remove", `${label} capabilities`),
         }),
         ...(metadata === undefined ? {} : { metadata }),
@@ -191,12 +190,17 @@ function parseProviderRuntimeSnapshot(value) {
     if (value["protocolVersion"] !== WORKSPACE_PROVIDER_RUNTIME_PROTOCOL_VERSION) {
         throw protocolError("provider runtime protocol is unsupported; restart or upgrade the session daemon");
     }
+    const terminalMode = parseTerminalMode(value["terminalMode"]);
     const safeStart = parseSafeStart(value["safeStart"]);
+    if ((safeStart === "none") !== (terminalMode === "recovery-disabled")) {
+        throw protocolError("provider runtime terminalMode does not match safeStart");
+    }
     const records = parseArray(value["records"], "provider runtime records", parseRuntimeRecord);
     const health = parseArray(value["health"], "provider runtime health", parseHealthInspection);
     const diagnostics = parseArray(value["diagnostics"], "provider runtime diagnostics", parseCatalogDiagnostic);
     return Object.freeze({
         protocolVersion: WORKSPACE_PROVIDER_RUNTIME_PROTOCOL_VERSION,
+        terminalMode,
         ...(safeStart === undefined ? {} : { safeStart }),
         records: Object.freeze(records),
         health: Object.freeze(health),
@@ -220,6 +224,8 @@ function parseRuntimeRecord(value, index) {
     const name = optionalString(value, "name", label);
     const message = optionalString(value, "message", label);
     const browserRevision = optionalString(value, "browserRevision", label);
+    const pairedRequestVersion = parsePairedCapabilityVersion(value["pairedRequestVersion"], label, "request");
+    const pairedChannelVersion = parsePairedCapabilityVersion(value["pairedChannelVersion"], label, "channel");
     return Object.freeze({
         pluginId: requirePluginId(value, "pluginId", label),
         source: requireString(value, "source", label),
@@ -228,12 +234,21 @@ function parseRuntimeRecord(value, index) {
         ...(browserRevision === undefined ? {} : { browserRevision }),
         settingsRevision: requireString(value, "settingsRevision", label),
         machineSpecific: requireBoolean(value, "machineSpecific", label),
+        ...(pairedRequestVersion === undefined ? {} : { pairedRequestVersion }),
+        ...(pairedChannelVersion === undefined ? {} : { pairedChannelVersion }),
         state,
         ...(name === undefined ? {} : { name }),
         ...(phase === undefined ? {} : { phase }),
         ...(message === undefined ? {} : { message }),
     });
 }
+function parsePairedCapabilityVersion(value, label, capability) {
+    if (value === undefined)
+        return undefined;
+    if (value !== 1)
+        throw protocolError(`${label} paired ${capability} version is invalid`);
+    return value;
+}
 function parseCatalogDiagnostic(value, index) {
     const label = `provider runtime diagnostic ${String(index + 1)}`;
     if (!isRecord(value))
@@ -280,6 +295,11 @@ function parseHealth(value, inspectionLabel) {
         ...(details === undefined ? {} : { details }),
     });
 }
+function parseTerminalMode(value) {
+    if (value === "required" || value === "recovery-disabled")
+        return value;
+    throw protocolError("provider runtime terminalMode is invalid");
+}
 function parseSafeStart(value) {
     if (value === undefined)
         return undefined;
@@ -349,10 +369,10 @@ function isRuntimeState(value) {
     return value === "active" || value === "failed" || value === "incompatible" || value === "disabled";
 }
 function isLifecyclePhase(value) {
-    return value === "import" || value === "activate" || value === "validate" || value === "start" || value === "health" || value === "stop";
+    return value === "import" || value === "activate" || value === "validate" || value === "start" || value === "health" || value === "dispose";
 }
 function isCatalogDiagnosticCode(value) {
-    return value === "invalid-package" || value === "duplicate-id";
+    return value === "invalid-package" || value === "reserved-id" || value === "duplicate-id" || value === "required-plugin-config";
 }
 function encodedId(value, label) {
     if (value === "")