@chainingintention/pi-web-cn 1.202610.4 → 2.202610.0

package/dist/server/sessions/mcpAuthFlowService.js

@@ -0,0 +1,289 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import { randomUUID } from "node:crypto";
+import { createTranslator, UserFacingError, userFacingErrorMessage } from "../../shared/i18n.js";
+import { normalizeRequestCwd } from "../workingDirectory.js";
+const execution = new AsyncLocalStorage();
+const MAX_TEXT = 32 * 1024;
+const MAX_PROGRESS = 100;
+function normalizeOwner(owner) {
+    return { ...owner, cwd: normalizeRequestCwd(owner.cwd), ...(owner.projectPath === undefined ? {} : { projectPath: normalizeRequestCwd(owner.projectPath) }) };
+}
+function ownerKey(owner) {
+    const normalized = normalizeOwner(owner);
+    return JSON.stringify([normalized.scope, normalized.sessionId, normalized.cwd, normalized.projectPath]);
+}
+/** Operation transport only. Pi owns config, credentials, OAuth and reconnect. */
+export class McpAuthFlowService {
+    constructor(options = {}) {
+        this.options = options;
+        this.flows = new Map();
+        this.active = new Map();
+        this.sessions = new Map();
+        this.disposed = false;
+        this.t = options.translator ?? createTranslator("en", {});
+    }
+    start(options) {
+        if (this.disposed)
+            throw new UserFacingError("mcpAuth.disposed", "MCP authentication service is disposed");
+        const owner = normalizeOwner(options.owner);
+        if (this.sessions.has(ownerKey(owner)))
+            throw new UserFacingError("mcpAuth.sessionAlreadyRunning", "MCP authentication is already running for this session");
+        // Pi persisted OAuth state is shared across sessions. Do not race two scoped logins against the same credentials.
+        if (this.sessions.size > 0)
+            throw new UserFacingError("mcpAuth.machineBusy", "Another MCP authentication operation is running on this machine. Finish it before starting another.");
+        if (this.flows.size >= 100)
+            throw new UserFacingError("mcpAuth.tooManyFlows", "Too many MCP authentication flows");
+        const flow = {
+            state: { flowId: randomUUID(), target: "mcp", providerId: "mcp", providerName: this.t("mcpAuth.server", "MCP server"), status: "running", progress: [], ...(options.mode === undefined ? {} : { mcpMode: options.mode }) },
+            identity: options.identity, owner, token: Symbol(), isCurrent: () => options.isCurrent(),
+        };
+        this.flows.set(flow.state.flowId, flow);
+        this.active.set(flow.token, flow);
+        this.sessions.set(ownerKey(flow.owner), flow);
+        flow.timer = setTimeout(() => { this.requestCancel(flow); }, this.options.runningTtlMs ?? 30 * 60_000);
+        flow.timer.unref();
+        // Keep the real command promise in this scope, not its submission receipt.
+        void execution.run({ service: this, token: flow.token }, async () => {
+            try {
+                await options.run();
+                if (flow.commandError !== undefined)
+                    throw new Error(flow.commandError);
+                flow.state.status = "complete";
+            }
+            catch (error) {
+                flow.state.status = "error";
+                flow.state.error = userFacingErrorMessage(error, this.t).slice(0, MAX_TEXT);
+            }
+            finally {
+                this.active.delete(flow.token);
+                this.sessions.delete(ownerKey(flow.owner));
+                flow.pending?.settle(undefined);
+                clearTimeout(flow.timer);
+                if (!this.disposed) {
+                    flow.timer = setTimeout(() => { this.flows.delete(flow.state.flowId); }, this.options.terminalTtlMs ?? 5 * 60_000);
+                    flow.timer.unref();
+                }
+            }
+        });
+        return this.snapshot(flow);
+    }
+    /** Public /mcp waits for startup; its status UI must never escape into chat. */
+    async discover(options) {
+        if (this.disposed)
+            throw new UserFacingError("mcpAuth.disposed", "MCP authentication service is disposed");
+        const owner = normalizeOwner(options.owner);
+        const scope = execution.getStore();
+        const own = scope?.service === this ? this.active.get(scope.token) : undefined;
+        if (own && (own.identity !== options.identity || ownerKey(own.owner) !== ownerKey(owner) || !own.isCurrent()))
+            throw new UserFacingError("mcpAuth.ownerChanged", "MCP authentication owner is no longer current");
+        if (!own && this.sessions.size > 0)
+            throw new UserFacingError("mcpAuth.machineBusyShort", "Another MCP authentication operation is running on this machine");
+        const flow = own ?? {
+            state: { flowId: randomUUID(), providerId: "mcp", providerName: this.t("mcpAuth.server", "MCP server"), status: "running", progress: [] },
+            identity: options.identity, owner, token: Symbol(), isCurrent: () => options.isCurrent(),
+        };
+        if (!own) {
+            this.active.set(flow.token, flow);
+            this.sessions.set(ownerKey(flow.owner), flow);
+        }
+        try {
+            return await execution.run({ service: this, token: flow.token, discovery: true }, async () => {
+                const result = await options.run();
+                if (flow.commandError !== undefined)
+                    throw new UserFacingError("mcpAuth.discoveryFailed", "MCP server discovery failed");
+                return result;
+            });
+        }
+        finally {
+            if (!own) {
+                this.active.delete(flow.token);
+                this.sessions.delete(ownerKey(flow.owner));
+            }
+        }
+    }
+    assertSessionAvailable(owner) {
+        const active = this.sessions.get(ownerKey(owner));
+        const scope = execution.getStore();
+        if (active && (scope?.service !== this || scope.token !== active.token))
+            throw new UserFacingError("mcpAuth.sessionBusy", "MCP authentication operation is running for this session");
+    }
+    owner(flowId, scope) {
+        const flow = this.flows.get(flowId);
+        if (flow?.owner.scope !== scope)
+            throw new UserFacingError("mcpAuth.flowNotFound", "MCP authentication flow not found");
+        return structuredClone(flow.owner);
+    }
+    get(flowId, owner) { return this.snapshot(this.requireFlow(flowId, owner)); }
+    respond(flowId, requestId, value, owner) {
+        const flow = this.requireFlow(flowId, owner);
+        const pending = flow.pending;
+        if (flow.state.status !== "running" || pending?.id !== requestId)
+            throw new UserFacingError("mcpAuth.requestNotPending", "MCP authentication request is no longer pending");
+        if (typeof value !== "string" || value.length > MAX_TEXT || (pending.values?.includes(value) === false))
+            throw new UserFacingError("mcpAuth.invalidResponse", "Invalid MCP authentication response");
+        pending.settle(value);
+        return this.snapshot(flow);
+    }
+    cancel(flowId, owner) {
+        const flow = this.requireFlow(flowId, owner);
+        if (flow.state.status === "running")
+            this.requestCancel(flow);
+        return this.snapshot(flow);
+    }
+    cancelSession(owner) {
+        const flow = this.sessions.get(ownerKey(owner));
+        if (flow)
+            this.requestCancel(flow);
+    }
+    dispose() {
+        this.disposed = true;
+        for (const flow of new Set([...this.flows.values(), ...this.active.values()])) {
+            this.requestCancel(flow);
+            clearTimeout(flow.timer);
+        }
+        this.flows.clear();
+    }
+    /** Invocation-time lookup: stale socket ancestry must use the ordinary bridge. */
+    static current(identity) {
+        const scope = execution.getStore();
+        const flow = scope?.service.active.get(scope.token);
+        if (!scope || !flow || (identity !== undefined && identity !== flow.identity))
+            return undefined;
+        const isCurrent = () => {
+            if (scope.service.disposed || !flow.isCurrent()) {
+                scope.service.requestCancel(flow);
+                return false;
+            }
+            return true;
+        };
+        // An active command must retain its private sink even after its runtime is
+        // closed; falling back to the ordinary bridge can expose late OAuth data.
+        isCurrent();
+        return new McpAuthDispatcher(scope.service, flow, scope.discovery === true, isCurrent, scope.service.t);
+    }
+    requireFlow(id, owner) {
+        const flow = this.flows.get(id);
+        if (!flow || ownerKey(flow.owner) !== ownerKey(owner))
+            throw new UserFacingError("mcpAuth.flowNotFound", "MCP authentication flow not found");
+        return flow;
+    }
+    snapshot(flow) { return structuredClone(flow.state); }
+    requestCancel(flow) {
+        flow.state.cancelRequested = true;
+        flow.pending?.settle(undefined);
+    }
+    wait(flow, title, options, values, placeholder) {
+        if (flow.state.cancelRequested === true || options?.signal?.aborted === true)
+            return Promise.resolve(undefined);
+        if (flow.pending)
+            return Promise.reject(new UserFacingError("mcpAuth.promptPending", "An MCP authentication request is already pending"));
+        if (title.length > MAX_TEXT || (placeholder?.length ?? 0) > MAX_TEXT || (values && (values.length > 200 || values.some((value) => value.length > MAX_TEXT))))
+            return Promise.reject(new UserFacingError("mcpAuth.promptTooLarge", "MCP authentication prompt is too large"));
+        const id = randomUUID();
+        if (values)
+            flow.state.select = { requestId: id, message: title, options: values.map((value) => ({ value, label: value })) };
+        else
+            flow.state.prompt = { requestId: id, message: title, promptType: "text", ...(placeholder === undefined ? {} : { placeholder }) };
+        return new Promise((resolve) => {
+            let timer;
+            const settle = (value) => {
+                if (flow.pending?.id !== id)
+                    return;
+                clearTimeout(timer);
+                options?.signal?.removeEventListener("abort", abort);
+                delete flow.pending;
+                delete flow.state.prompt;
+                delete flow.state.select;
+                resolve(value);
+            };
+            // Pi aborts the losing input when its browser callback wins. This only
+            // dismisses the prompt; it is not cancellation of the auth operation.
+            const abort = () => { settle(undefined); };
+            flow.pending = { id, settle, ...(values === undefined ? {} : { values }) };
+            if (options?.timeout !== undefined && options.timeout > 0) {
+                timer = setTimeout(abort, options.timeout);
+                timer.unref();
+            }
+            options?.signal?.addEventListener("abort", abort, { once: true });
+            if (options?.signal?.aborted === true)
+                abort();
+        });
+    }
+}
+/** Narrow adapter used by the stable session proxy and builtin openUrl hook. */
+class McpAuthDispatcher {
+    constructor(service, flow, discovery, isCurrent, t) {
+        this.service = service;
+        this.flow = flow;
+        this.discovery = discovery;
+        this.isCurrent = isCurrent;
+        this.t = t;
+    }
+    selectServer(servers) {
+        const result = this.select(this.t("mcpAuth.chooseServer", "Choose an MCP server"), servers.map((server) => server.name));
+        if (this.flow.state.select)
+            this.flow.state.select.options = servers.map((server) => ({ value: server.name, label: server.name, ...(server.description === undefined ? {} : { description: server.description }) }));
+        return result;
+    }
+    setServer(name) { if (this.isCurrent())
+        this.flow.state.providerName = name; }
+    isCancelled() { return !this.isCurrent() || this.flow.state.cancelRequested === true; }
+    notify(message) {
+        if (!this.isCurrent() || this.discovery)
+            return;
+        const url = this.flow.state.auth?.url;
+        if (url !== undefined && message.includes(url))
+            return;
+        this.flow.state.progress.push(message.slice(0, MAX_TEXT));
+        this.flow.state.progress = this.flow.state.progress.slice(-MAX_PROGRESS);
+    }
+    openUrl(url) {
+        if (!this.isCurrent() || this.discovery)
+            return;
+        if (url.length > MAX_TEXT)
+            throw new UserFacingError("mcpAuth.authUrlTooLarge", "MCP authorization URL is too large");
+        let parsed;
+        try {
+            parsed = new URL(url);
+        }
+        catch {
+            throw new UserFacingError("mcpAuth.invalidAuthUrl", "Invalid MCP authorization URL");
+        }
+        if (parsed.protocol !== "https:" && parsed.protocol !== "http:")
+            throw new UserFacingError("mcpAuth.authUrlProtocol", "Unsupported MCP authorization URL");
+        this.flow.state.auth = { url };
+        this.flow.state.progress = this.flow.state.progress.filter((message) => !message.includes(url));
+    }
+    error(message) { if (this.isCurrent()) {
+        this.flow.commandError = message.slice(0, MAX_TEXT);
+        this.notify(message);
+    } }
+    input(title, placeholder, options) {
+        if (!this.isCurrent())
+            return Promise.resolve(undefined);
+        if (this.discovery) {
+            this.flow.commandError = "MCP discovery cannot request input";
+            return Promise.reject(new UserFacingError("mcpAuth.discoveryInput", "MCP discovery cannot request input"));
+        }
+        return this.service.wait(this.flow, title, options, undefined, placeholder);
+    }
+    select(title, values, options) {
+        if (!this.isCurrent())
+            return Promise.resolve(undefined);
+        if (this.discovery) {
+            this.flow.commandError = "MCP discovery cannot request input";
+            return Promise.reject(new UserFacingError("mcpAuth.discoveryInput", "MCP discovery cannot request input"));
+        }
+        return this.service.wait(this.flow, title, options, values);
+    }
+    async confirm(title, message, options) {
+        const selected = this.select(`${title}\n${message}`, ["Yes", "No"], options);
+        if (this.flow.state.select)
+            this.flow.state.select.options = [
+                { value: "Yes", label: this.t("mcpAuth.yes", "Yes") },
+                { value: "No", label: this.t("mcpAuth.no", "No") },
+            ];
+        return await selected === "Yes";
+    }
+}
+//# sourceMappingURL=mcpAuthFlowService.js.map

package/dist/server/sessions/mcpAuthFlowService.js.map

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

package/dist/server/sessions/mcpAuthRoutes.js

@@ -0,0 +1,104 @@
+import { normalizeRequestCwd } from "../workingDirectory.js";
+import { attachWorkbenchAccessHandle, decodeManagementContext, MANAGEMENT_EMBED_CONTEXT_HEADER, WORKBENCH_ACCESS_HANDLE_HEADER } from "../managementEmbed.js";
+import { UserFacingError, userFacingErrorMessage } from "../../shared/i18n.js";
+import { loadNodeTranslator } from "../../localization.js";
+export function registerMcpAuthRoutes(app, sessions, prefix = "", translator = loadNodeTranslator("server")) {
+    app.get(`${prefix}/sessions/:sessionId/mcp/auth/servers`, async (request, reply) => {
+        reply.header("cache-control", "no-store");
+        try {
+            const query = record(request.query);
+            onlyKeys(query, ["cwd", "embed", "token"]);
+            const cwd = string(query, "cwd");
+            if (!cwd)
+                throw new UserFacingError("mcpAuth.cwdEmpty", "cwd must not be empty");
+            return await sessions.mcpAuthServers({ id: identifier(request.params.sessionId), cwd: normalizeRequestCwd(cwd) }, managementContext(request.headers));
+        }
+        catch (error) {
+            return reply.code(400).send({ error: userFacingErrorMessage(error, translator) });
+        }
+    });
+    app.post(`${prefix}/sessions/:sessionId/mcp/auth`, async (request, reply) => {
+        reply.header("cache-control", "no-store");
+        try {
+            onlyKeys(record(request.query), ["embed", "token"]);
+            const body = record(request.body);
+            onlyKeys(body, ["cwd", "mode", "serverName"]);
+            const cwd = string(body, "cwd");
+            if (!cwd)
+                throw new UserFacingError("mcpAuth.cwdEmpty", "cwd must not be empty");
+            const mode = body["mode"];
+            if (mode !== "login" && mode !== "logout")
+                throw new UserFacingError("mcpAuth.invalidMode", "mode must be login or logout");
+            const serverName = body["serverName"] === undefined ? undefined : string(body, "serverName");
+            return await sessions.startMcpAuth({ id: identifier(request.params.sessionId), cwd: normalizeRequestCwd(cwd) }, mode, serverName, managementContext(request.headers));
+        }
+        catch (error) {
+            return reply.code(400).send({ error: userFacingErrorMessage(error, translator) });
+        }
+    });
+    app.get(`${prefix}/auth/mcp/:flowId`, async (request, reply) => {
+        reply.header("cache-control", "no-store");
+        try {
+            onlyKeys(record(request.query), ["embed", "token"]);
+            return await sessions.mcpAuthFlow(identifier(request.params.flowId), managementContext(request.headers));
+        }
+        catch (error) {
+            return reply.code(404).send({ error: userFacingErrorMessage(error, translator) });
+        }
+    });
+    app.post(`${prefix}/auth/mcp/:flowId/respond`, async (request, reply) => {
+        reply.header("cache-control", "no-store");
+        try {
+            onlyKeys(record(request.query), ["embed", "token"]);
+            const body = record(request.body);
+            onlyKeys(body, ["requestId", "value"]);
+            return await sessions.respondToMcpAuthFlow(identifier(request.params.flowId), string(body, "requestId"), string(body, "value"), managementContext(request.headers));
+        }
+        catch (error) {
+            return reply.code(400).send({ error: userFacingErrorMessage(error, translator) });
+        }
+    });
+    app.post(`${prefix}/auth/mcp/:flowId/cancel`, async (request, reply) => {
+        reply.header("cache-control", "no-store");
+        try {
+            onlyKeys(record(request.query), ["embed", "token"]);
+            if (request.body !== undefined)
+                onlyKeys(record(request.body), []);
+            return await sessions.cancelMcpAuthFlow(identifier(request.params.flowId), managementContext(request.headers));
+        }
+        catch (error) {
+            return reply.code(400).send({ error: userFacingErrorMessage(error, translator) });
+        }
+    });
+}
+function record(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value))
+        throw new UserFacingError("mcpAuth.requestObject", "Expected a request object");
+    return Object.fromEntries(Object.entries(value));
+}
+function string(body, key) {
+    const value = body[key];
+    if (typeof value !== "string" || value.length > 32 * 1024)
+        throw new UserFacingError("mcpAuth.invalidString", "{field} must be a string of at most 32768 characters", { field: key });
+    return value;
+}
+function onlyKeys(body, keys) {
+    if (Object.keys(body).some((key) => !keys.includes(key)))
+        throw new UserFacingError("mcpAuth.unexpectedField", "Unexpected MCP authentication field");
+}
+function identifier(value) {
+    if (!value || value.length > 512)
+        throw new UserFacingError("mcpAuth.invalidIdentifier", "Invalid MCP authentication identifier");
+    return value;
+}
+function managementContext(headers) {
+    const raw = headers[MANAGEMENT_EMBED_CONTEXT_HEADER];
+    if (raw === undefined)
+        return undefined;
+    const context = decodeManagementContext(Array.isArray(raw) ? raw[0] : raw);
+    if (context === undefined)
+        throw new UserFacingError("mcpAuth.invalidManagementContext", "Invalid management context");
+    const handle = headers[WORKBENCH_ACCESS_HANDLE_HEADER];
+    return attachWorkbenchAccessHandle(context, Array.isArray(handle) ? handle[0] : handle);
+}
+//# sourceMappingURL=mcpAuthRoutes.js.map

package/dist/server/sessions/mcpAuthRoutes.js.map

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

package/dist/server/sessions/mcpOAuthCredentialAdapter.js

@@ -0,0 +1,92 @@
+import { chmod, lstat, mkdir, realpath } from "node:fs/promises";
+import { isAbsolute, join, relative, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+import { createHash } from "node:crypto";
+import { getAgentDir, VERSION } from "../../piSdk.js";
+import { piRuntimePackageInfo } from "../../piRuntime.js";
+export function mcpOAuthStorageDirectory(projectScopeDirectory, managementScope) {
+    const root = join(projectScopeDirectory, "mcp");
+    return managementScope === undefined ? root : join(root, "identities", createHash("sha256").update(managementScope).digest("hex"));
+}
+/**
+ * Pi 1.3.0 exposes credential injection but not its constructor. These three
+ * version-pinned internal modules must come from the same selected host SDK.
+ */
+export async function createMcpOAuthCredentialOptions(options, dependencies = {}) {
+    const info = await (dependencies.packageInfo ?? piRuntimePackageInfo)();
+    if (info.version !== "1.3.0" || (dependencies.sdkVersion ?? VERSION) !== info.version) {
+        throw new Error("Scoped MCP authentication requires the selected Pi SDK version 1.3.0 with a matching package identity");
+    }
+    const importModule = dependencies.importModule ?? ((url) => import(url));
+    const modules = await Promise.all([
+        loadInternal(info.directory, "dist/extensions/mcp/oauth.js", importModule),
+        loadInternal(info.directory, "dist/core/auth-storage.js", importModule),
+        loadInternal(info.directory, "dist/extensions/mcp/config.js", importModule),
+    ]);
+    const [credentials, backend, config] = modules;
+    if (!isCredentialModule(credentials) || !isBackendModule(backend) || !isConfigModule(config)) {
+        throw new Error("The selected Pi 1.3.0 SDK does not expose the expected MCP credential adapter contracts");
+    }
+    const directory = resolve(options.directory);
+    const lockDir = join(directory, "refresh-locks");
+    await privateDirectory(directory);
+    await privateDirectory(lockDir);
+    const authPath = join(directory, "mcp-auth.json");
+    const logPath = join(directory, "mcp.log");
+    await privateFileIfPresent(authPath);
+    await privateFileIfPresent(logPath);
+    const store = new credentials.McpOAuthCredentialStore(new backend.FileAuthStorageBackend(authPath), lockDir);
+    const configAgentDir = options.configAgentDir ?? getAgentDir();
+    return {
+        credentials: store,
+        logPath,
+        loadConfig: (ctx) => config.loadMcpConfig({ agentDir: configAgentDir, cwd: ctx.cwd, projectTrusted: ctx.isProjectTrusted() }),
+    };
+}
+async function loadInternal(root, file, importModule) {
+    const canonicalRoot = await realpath(root);
+    const path = await realpath(join(root, file));
+    const child = relative(canonicalRoot, path);
+    if (isAbsolute(child) || child === ".." || child.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`)) {
+        throw new Error("The MCP credential adapter module is outside the selected Pi SDK");
+    }
+    return importModule(pathToFileURL(path).href);
+}
+async function privateDirectory(path) {
+    await mkdir(path, { recursive: true, mode: 0o700 });
+    const entry = await lstat(path);
+    if (entry.isSymbolicLink() || !entry.isDirectory())
+        throw new Error("MCP private storage must be a directory, not a symbolic link");
+    await chmod(path, 0o700);
+}
+async function privateFileIfPresent(path) {
+    let entry;
+    try {
+        entry = await lstat(path);
+    }
+    catch (error) {
+        if (error instanceof Error && "code" in error && error.code === "ENOENT")
+            return;
+        throw error;
+    }
+    if (entry.isSymbolicLink() || !entry.isFile())
+        throw new Error("MCP private storage must be a regular file");
+    await chmod(path, 0o600);
+}
+function isRecord(value) { return typeof value === "object" && value !== null; }
+function hasConstructor(value, methods) {
+    if (typeof value !== "function" || !("prototype" in value))
+        return false;
+    const prototype = value.prototype;
+    return isRecord(prototype) && methods.every((method) => typeof prototype[method] === "function");
+}
+function isCredentialModule(value) {
+    return isRecord(value) && hasConstructor(value["McpOAuthCredentialStore"], ["forServer", "tokens", "remove"]);
+}
+function isBackendModule(value) {
+    return isRecord(value) && hasConstructor(value["FileAuthStorageBackend"], ["withLock", "withLockAsync"]);
+}
+function isConfigModule(value) {
+    return isRecord(value) && typeof value["loadMcpConfig"] === "function";
+}
+//# sourceMappingURL=mcpOAuthCredentialAdapter.js.map

package/dist/server/sessions/mcpOAuthCredentialAdapter.js.map

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

package/dist/server/sessions/messageHistoryTarget.js

@@ -0,0 +1,79 @@
+import { UserFacingError } from "../../shared/i18n.js";
+/**
+ * Resolve a message shortcut against the current root-to-leaf branch. Non-user
+ * checkpoints retain the intervening history up to, but not including, the next
+ * distinct user/assistant checkpoint, or through a question but not its answer.
+ * Pi still owns the actual tree mutation.
+ * Exact-entry tree operations do not use this resolver.
+ */
+export function messageHistoryTargetId(branch, entryId) {
+    const index = branch.findIndex((entry) => isRecord(entry) && entry["id"] === entryId);
+    if (index < 0)
+        throw new UserFacingError("session.checkpointUnavailable", "This message is no longer available on the active session branch.");
+    const entry = branch[index];
+    // A question is answered from its durable tool result, without retaining any
+    // earlier answer (custom messages are otherwise part of a checkpoint's tail).
+    if (isQuestionResult(entry))
+        return entryId;
+    // Pi restores a selected user message to the editor by positioning before it.
+    if (isRecord(entry) && entry["type"] === "message" && isRecord(entry["message"])
+        && entry["message"]["role"] === "user")
+        return entryId;
+    let targetId = entryId;
+    for (let nextIndex = index + 1; nextIndex < branch.length; nextIndex += 1) {
+        const next = branch[nextIndex];
+        if (!isRecord(next) || typeof next["id"] !== "string" || isConversationCheckpoint(next))
+            break;
+        targetId = next["id"];
+        // The agent message that produced a question retains the request, not any
+        // later answer, just like selecting the question itself.
+        if (isQuestionResult(next))
+            break;
+    }
+    return targetId;
+}
+function isQuestionResult(entry) {
+    if (!isRecord(entry) || entry["type"] !== "message" || !isRecord(entry["message"]))
+        return false;
+    const message = entry["message"];
+    const details = message["details"];
+    return message["role"] === "toolResult" && message["toolName"] === "ask_user" && message["isError"] === false
+        && isRecord(details) && isRecord(details["ask"]);
+}
+/**
+ * Boundaries are intrinsic conversation checkpoints, not transient plugin
+ * availability (busy/archived/disabled buttons must not change the cutoff).
+ * Tool-only assistant entries have no core history header and stay in the
+ * preceding checkpoint along with their results and other technical entries.
+ */
+function isConversationCheckpoint(entry) {
+    if (entry["type"] !== "message" || !isRecord(entry["message"]))
+        return false;
+    const message = entry["message"];
+    if (message["role"] === "user")
+        return true;
+    if (message["role"] !== "assistant")
+        return false;
+    const content = message["content"];
+    if (typeof content === "string")
+        return content !== "";
+    if (!Array.isArray(content))
+        return content != null;
+    return content.some((part) => {
+        if (!isRecord(part))
+            return true;
+        if (part["type"] === "toolCall")
+            return false;
+        if (part["type"] === "text")
+            return typeof part["text"] === "string" && part["text"] !== "";
+        if (part["type"] === "thinking") {
+            const text = part["thinking"] ?? part["text"];
+            return typeof text === "string" && text !== "";
+        }
+        return true;
+    });
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=messageHistoryTarget.js.map

package/dist/server/sessions/messageHistoryTarget.js.map

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