@hyperdreamer/pi-webui 1.10.7 → 1.11.0-beta.10

package/dist/server/sessions/utilityModelExtension.js

@@ -0,0 +1,199 @@
+import { compact as piCompact, generateBranchSummary as piGenerateBranchSummary, } from "@earendil-works/pi-coding-agent";
+import { runtimeThinkingLevels as piRuntimeThinkingLevels } from "./modelTierRegistry.js";
+export function createUtilityModelHandlers(deps) {
+    const generateBranchSummary = deps.generateBranchSummary ?? piGenerateBranchSummary;
+    const compact = deps.compact ?? piCompact;
+    const thinkingLevels = deps.runtimeThinkingLevels ?? piRuntimeThinkingLevels;
+    return {
+        sessionBeforeTree: async (event, ctx) => {
+            if (!event.preparation.userWantsSummary ||
+                event.preparation.entriesToSummarize.length === 0 ||
+                ctx.model === undefined) {
+                return undefined;
+            }
+            const refs = availableRefs(deps.refs);
+            if (refs === undefined)
+                return undefined;
+            let reserveTokens;
+            let retry;
+            try {
+                reserveTokens = refs.settingsManager.getBranchSummarySettings().reserveTokens;
+                retry = refs.settingsManager.getRetrySettings();
+            }
+            catch (error) {
+                logNoThrow(deps.logger, { err: error, task: "lightweight" }, "utility model runtime refs failed");
+                return undefined;
+            }
+            const candidates = await deps.resolver.configuredCandidates("lightweight");
+            for (const model of candidates) {
+                if (isAborted(event.signal))
+                    return { cancel: true };
+                const auth = await resolveCandidateAuth(deps, "lightweight", model);
+                if (isAborted(event.signal))
+                    return { cancel: true };
+                if (auth === undefined)
+                    continue;
+                try {
+                    const thinking = utilityThinking(model, thinkingLevels);
+                    const options = {
+                        model,
+                        signal: event.signal,
+                        reserveTokens,
+                        streamFn: utilityStreamFunction(refs.streamFunction, thinking),
+                        retry,
+                        ...auth,
+                        ...(event.preparation.customInstructions === undefined
+                            ? {}
+                            : { customInstructions: event.preparation.customInstructions }),
+                        ...(event.preparation.replaceInstructions === undefined
+                            ? {}
+                            : { replaceInstructions: event.preparation.replaceInstructions }),
+                    };
+                    const result = await generateBranchSummary(event.preparation.entriesToSummarize, options);
+                    if (isAborted(event.signal) || result.aborted === true) {
+                        return { cancel: true };
+                    }
+                    if (result.error !== undefined || result.summary?.trim() === "") {
+                        logCandidateFailure(deps.logger, "lightweight", model, new Error(result.error ?? "branch summary was empty"));
+                        continue;
+                    }
+                    if (result.summary === undefined) {
+                        logCandidateFailure(deps.logger, "lightweight", model, new Error("branch summary was missing"));
+                        continue;
+                    }
+                    return {
+                        summary: {
+                            summary: result.summary,
+                            details: {
+                                readFiles: result.readFiles ?? [],
+                                modifiedFiles: result.modifiedFiles ?? [],
+                            },
+                            ...(result.usage === undefined ? {} : { usage: result.usage }),
+                        },
+                    };
+                }
+                catch (error) {
+                    if (isAborted(event.signal))
+                        return { cancel: true };
+                    logCandidateFailure(deps.logger, "lightweight", model, error);
+                }
+            }
+            return undefined;
+        },
+        sessionBeforeCompact: async (event, ctx) => {
+            if (ctx.model === undefined)
+                return undefined;
+            const refs = availableRefs(deps.refs);
+            if (refs === undefined)
+                return undefined;
+            let retry;
+            try {
+                retry = refs.settingsManager.getRetrySettings();
+            }
+            catch (error) {
+                logNoThrow(deps.logger, { err: error, task: "context" }, "utility model runtime refs failed");
+                return undefined;
+            }
+            const candidates = await deps.resolver.configuredCandidates("context");
+            for (const model of candidates) {
+                if (isAborted(event.signal))
+                    return { cancel: true };
+                const auth = await resolveCandidateAuth(deps, "context", model);
+                if (isAborted(event.signal))
+                    return { cancel: true };
+                if (auth === undefined)
+                    continue;
+                try {
+                    const thinking = utilityThinking(model, thinkingLevels);
+                    const result = await compact(event.preparation, model, auth.apiKey, auth.headers, event.customInstructions, event.signal, thinking, utilityStreamFunction(refs.streamFunction, thinking), auth.env, retry);
+                    if (isAborted(event.signal))
+                        return { cancel: true };
+                    return { compaction: result };
+                }
+                catch (error) {
+                    if (isAborted(event.signal))
+                        return { cancel: true };
+                    logCandidateFailure(deps.logger, "context", model, error);
+                }
+            }
+            return undefined;
+        },
+    };
+}
+export function createUtilityModelExtension(deps) {
+    const handlers = createUtilityModelHandlers(deps);
+    return {
+        name: "pi-webui-utility-models",
+        hidden: true,
+        factory(pi) {
+            pi.on("session_before_tree", handlers.sessionBeforeTree);
+            pi.on("session_before_compact", handlers.sessionBeforeCompact);
+        },
+    };
+}
+function availableRefs(refs) {
+    if (refs.streamFunction === undefined || refs.settingsManager === undefined) {
+        return undefined;
+    }
+    return {
+        streamFunction: refs.streamFunction,
+        settingsManager: refs.settingsManager,
+    };
+}
+async function resolveCandidateAuth(deps, task, model) {
+    try {
+        const result = await deps.modelRuntime.getAuth(model);
+        if (result === undefined) {
+            logCandidateFailure(deps.logger, task, model, new Error("utility model authentication is unavailable"));
+            return undefined;
+        }
+        const headers = normalizeHeaders(result.auth.headers);
+        return {
+            ...(result.auth.apiKey === undefined ? {} : { apiKey: result.auth.apiKey }),
+            ...(headers === undefined ? {} : { headers }),
+            ...(result.env === undefined ? {} : { env: result.env }),
+        };
+    }
+    catch (error) {
+        logCandidateFailure(deps.logger, task, model, error);
+        return undefined;
+    }
+}
+function normalizeHeaders(headers) {
+    if (headers === undefined)
+        return undefined;
+    const normalized = {};
+    for (const [name, value] of Object.entries(headers)) {
+        if (value !== null)
+            normalized[name] = value;
+    }
+    return normalized;
+}
+function isAborted(signal) {
+    return signal.aborted;
+}
+function utilityThinking(model, thinkingLevels) {
+    return model.reasoning && thinkingLevels(model).includes("minimal")
+        ? "minimal"
+        : "off";
+}
+function utilityStreamFunction(streamFunction, thinking) {
+    if (thinking === "off")
+        return streamFunction;
+    return (model, context, options) => streamFunction(model, context, {
+        ...options,
+        reasoning: "minimal",
+    });
+}
+function logCandidateFailure(logger, task, model, error) {
+    logNoThrow(logger, { err: error, task, provider: model.provider, modelId: model.id }, "utility model candidate failed");
+}
+function logNoThrow(logger, details, message) {
+    try {
+        logger?.info(details, message);
+    }
+    catch {
+        // Diagnostics must not prevent Pi's active-session fallback.
+    }
+}
+//# sourceMappingURL=utilityModelExtension.js.map

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

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

package/dist/server/sessions/utilityModelResolver.js

@@ -0,0 +1,77 @@
+const taskSlots = {
+    lightweight: ["lightweight"],
+    context: ["context", "lightweight"],
+};
+export function createUtilityModelResolver(deps) {
+    return {
+        configuredCandidates: async (task) => {
+            try {
+                await deps.modelRuntime.refresh({ allowNetwork: false });
+                const config = deps.loadConfig();
+                if (config.utilityModelsError !== undefined ||
+                    config.utilityModels === undefined) {
+                    return [];
+                }
+                const available = deps.modelRuntime.getAvailableSnapshot();
+                const candidates = [];
+                const seen = new Set();
+                for (const slot of taskSlots[task]) {
+                    const reference = config.utilityModels[slot];
+                    if (reference === undefined)
+                        continue;
+                    const candidate = available.find((model) => model.provider === reference.provider && model.id === reference.id);
+                    if (candidate === undefined)
+                        continue;
+                    const key = modelKey(candidate);
+                    if (seen.has(key))
+                        continue;
+                    seen.add(key);
+                    candidates.push(candidate);
+                }
+                return candidates;
+            }
+            catch (error) {
+                logNoThrow(deps.logger, { err: error, task }, "utility model resolution failed");
+                return [];
+            }
+        },
+    };
+}
+export async function runWithUtilityModelFallback(resolver, task, activeModel, run, onFailure) {
+    const configured = await resolver.configuredCandidates(task);
+    const candidates = [];
+    const seen = new Set();
+    for (const model of [
+        ...configured,
+        ...(activeModel === undefined ? [] : [activeModel]),
+    ]) {
+        const key = modelKey(model);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        candidates.push(model);
+    }
+    for (const model of candidates) {
+        try {
+            const result = await run(model);
+            if (result !== undefined)
+                return result;
+        }
+        catch (error) {
+            onFailure?.(model, error);
+        }
+    }
+    return undefined;
+}
+function modelKey(model) {
+    return JSON.stringify([model.provider, model.id]);
+}
+function logNoThrow(logger, details, message) {
+    try {
+        logger?.info(details, message);
+    }
+    catch {
+        // Diagnostics must not defeat the active-model fallback.
+    }
+}
+//# sourceMappingURL=utilityModelResolver.js.map

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

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

package/dist/server/sessions/utilityModelSettingsRoutes.js

@@ -0,0 +1,62 @@
+import { parseUtilityModelsConfig } from "../../config.js";
+import { UTILITY_MODEL_SLOTS } from "../../shared/apiTypes.js";
+export function registerUtilityModelSettingsRoutes(app, service, prefix = "") {
+    app.get(`${prefix}/utility-models`, async (_request, reply) => {
+        try {
+            return await service.inspect();
+        }
+        catch (error) {
+            return reply.code(400).send({ error: errorMessage(error) });
+        }
+    });
+    app.put(`${prefix}/utility-models`, async (request, reply) => {
+        try {
+            return await service.update(parseUpdate(request.body));
+        }
+        catch (error) {
+            return reply.code(400).send({ error: errorMessage(error) });
+        }
+    });
+}
+function parseUpdate(value) {
+    if (!isRecord(value))
+        throw new Error("Expected object body");
+    const unknownField = Object.keys(value).find((key) => key !== "settings");
+    if (unknownField !== undefined)
+        throw new Error(`unknown field ${JSON.stringify(unknownField)}; expected exactly settings`);
+    if (!Object.prototype.hasOwnProperty.call(value, "settings"))
+        throw new Error("settings is required");
+    return parseSettingsUpdate(value["settings"]);
+}
+function parseSettingsUpdate(value) {
+    if (!isRecord(value))
+        throw new Error("settings must be an object");
+    const unknownSlot = Object.keys(value).find((key) => !isUtilityModelSlot(key));
+    if (unknownSlot !== undefined)
+        throw new Error(`unknown utility model slot ${JSON.stringify(unknownSlot)}`);
+    const update = {};
+    for (const slot of UTILITY_MODEL_SLOTS) {
+        if (!Object.prototype.hasOwnProperty.call(value, slot))
+            continue;
+        if (value[slot] === null) {
+            update[slot] = null;
+            continue;
+        }
+        const parsed = parseUtilityModelsConfig({ [slot]: value[slot] }, "request body settings");
+        const reference = parsed[slot];
+        if (reference === undefined)
+            throw new Error(`${slot} utility model reference is required`);
+        update[slot] = reference;
+    }
+    return update;
+}
+function isUtilityModelSlot(value) {
+    return UTILITY_MODEL_SLOTS.some((slot) => slot === value);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=utilityModelSettingsRoutes.js.map

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

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

package/dist/server/sessions/utilityModelSettingsService.js

@@ -0,0 +1,101 @@
+import { UTILITY_MODEL_SLOTS, } from "../../shared/apiTypes.js";
+/**
+ * Inspect and atomically update machine-global utility model settings against
+ * the daemon's latest authenticated model catalog.
+ */
+export function createUtilityModelSettingsService(deps) {
+    let updateQueue = Promise.resolve();
+    const inspect = async () => {
+        const models = await refreshedSnapshot();
+        return responseFor(deps.loadConfig(), models);
+    };
+    return {
+        inspect,
+        update: (patch) => enqueueUpdate(() => updateSettings(patch)),
+    };
+    function enqueueUpdate(operation) {
+        const queuedUpdate = updateQueue.then(operation);
+        updateQueue = queuedUpdate.then(() => undefined, () => undefined);
+        return queuedUpdate;
+    }
+    async function updateSettings(patch) {
+        const current = deps.loadConfig();
+        const next = current.utilityModelsError === undefined
+            ? { ...current.utilityModels }
+            : {};
+        if (Object.prototype.hasOwnProperty.call(patch, "lightweight")) {
+            if (patch.lightweight === null)
+                delete next.lightweight;
+            else if (patch.lightweight !== undefined)
+                next.lightweight = patch.lightweight;
+        }
+        if (Object.prototype.hasOwnProperty.call(patch, "context")) {
+            if (patch.context === null)
+                delete next.context;
+            else if (patch.context !== undefined)
+                next.context = patch.context;
+        }
+        const models = await refreshedSnapshot();
+        const slots = validationSlots(next, models);
+        const invalidSlots = UTILITY_MODEL_SLOTS.filter((slot) => !slots[slot].valid);
+        if (invalidSlots.length > 0) {
+            throw new Error(invalidSlots.map((slot) => slots[slot].reason ?? `${slot} utility model is invalid`).join("; "));
+        }
+        await deps.saveConfig({ utilityModels: next });
+        return await inspect();
+    }
+    async function refreshedSnapshot() {
+        await deps.modelRuntime.refresh({ allowNetwork: false });
+        return deps.modelRuntime.getAvailableSnapshot();
+    }
+    function responseFor(config, models) {
+        const modelOptions = models.map(modelOptionFor);
+        if (config.utilityModelsError !== undefined) {
+            return {
+                contractVersion: 1,
+                configError: config.utilityModelsError,
+                settings: {},
+                models: modelOptions,
+                slots: invalidSlots(config.utilityModelsError),
+                valid: false,
+            };
+        }
+        const settings = config.utilityModels ?? {};
+        const slots = validationSlots(settings, models);
+        return {
+            contractVersion: 1,
+            settings,
+            models: modelOptions,
+            slots,
+            valid: UTILITY_MODEL_SLOTS.every((slot) => slots[slot].valid),
+        };
+    }
+    function modelOptionFor(model) {
+        return {
+            model: { provider: model.provider, id: model.id },
+            ...(model.name === undefined ? {} : { name: model.name }),
+        };
+    }
+    function validationSlots(settings, models) {
+        return {
+            lightweight: validationFor("lightweight", settings, models),
+            context: validationFor("context", settings, models),
+        };
+    }
+    function validationFor(slot, settings, models) {
+        const configured = settings[slot];
+        if (configured === undefined)
+            return { valid: true };
+        const available = models.some((model) => model.provider === configured.provider && model.id === configured.id);
+        return available
+            ? { valid: true }
+            : { valid: false, reason: `${slot} utility model ${configured.provider}/${configured.id} is unavailable` };
+    }
+    function invalidSlots(reason) {
+        return {
+            lightweight: { valid: false, reason },
+            context: { valid: false, reason },
+        };
+    }
+}
+//# sourceMappingURL=utilityModelSettingsService.js.map

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

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

package/dist/server/skills/optionalSkillInstall.js

@@ -0,0 +1,69 @@
+/**
+ * Installs the repository's opt-in skills into the user's global skill directory.
+ *
+ * The shipped source directories carry a `deterministic-` prefix so they can sit
+ * beside the upstream skills they derive from. Installation strips that prefix,
+ * because sibling skills such as `brainstorming` route to `writing-plans` and
+ * `subagent-driven-development` by name; installing under the prefixed names
+ * would leave those references dangling.
+ *
+ * Stripping the prefix is not a directory rename. The name appears inside hashed
+ * runtime files, so the caller must rewrite those occurrences and then regenerate
+ * the runtime manifest, or `manifest-hash` reports a mismatch for a tree that is
+ * otherwise correct.
+ */
+export const OPTIONAL_SKILLS = Object.freeze([
+    Object.freeze({
+        sourceName: "deterministic-writing-plans",
+        installName: "writing-plans",
+    }),
+    Object.freeze({
+        sourceName: "deterministic-subagent-driven-development",
+        installName: "subagent-driven-development",
+    }),
+]);
+const PREFIX = "deterministic-";
+/**
+ * Rewrites prefixed skill names in a shipped text file to their installed names.
+ *
+ * Applies to every configured skill, not just the file's own, because the
+ * authoring skill references the controller's directory as a sibling path.
+ */
+export function rewriteSkillNames(content, skills = OPTIONAL_SKILLS) {
+    let result = content;
+    for (const skill of skills) {
+        result = result.split(skill.sourceName).join(skill.installName);
+    }
+    return result;
+}
+/** Strips the install prefix from a single name, leaving unprefixed names alone. */
+export function stripSkillPrefix(name) {
+    return name.startsWith(PREFIX) ? name.slice(PREFIX.length) : name;
+}
+/**
+ * Removes lock entries for skills this installer now owns.
+ *
+ * A stale entry is worse than a missing one: it names an upstream `sourceUrl`
+ * and a folder hash that no longer matches the installed tree, so an updater
+ * comparing them concludes the skill is out of date and overwrites it. With no
+ * entry the server reports no install info at all, which is the documented
+ * behavior for package-provided skills.
+ */
+export function pruneSkillLock(document, skills = OPTIONAL_SKILLS) {
+    const entries = document.skills;
+    if (entries === undefined)
+        return { document, removed: [] };
+    const removed = [];
+    const kept = {};
+    for (const [name, value] of Object.entries(entries)) {
+        if (skills.some((skill) => skill.installName === name)) {
+            removed.push(name);
+            continue;
+        }
+        kept[name] = value;
+    }
+    if (removed.length === 0)
+        return { document, removed: [] };
+    return { document: { ...document, skills: kept }, removed };
+}
+//# sourceMappingURL=optionalSkillInstall.js.map

package/dist/server/skills/optionalSkillInstall.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"optionalSkillInstall.js","sourceRoot":"","sources":["../../../src/server/skills/optionalSkillInstall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AASH,MAAM,CAAC,MAAM,eAAe,GAAiC,MAAM,CAAC,MAAM,CAAC;IACzE,MAAM,CAAC,MAAM,CAAC;QACZ,UAAU,EAAE,6BAA6B;QACzC,WAAW,EAAE,eAAe;KAC7B,CAAC;IACF,MAAM,CAAC,MAAM,CAAC;QACZ,UAAU,EAAE,2CAA2C;QACvD,WAAW,EAAE,6BAA6B;KAC3C,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAAe,EACf,SAAuC,eAAe;IAEtD,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACpE,CAAC;AAcD;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAC5B,QAA2B,EAC3B,SAAuC,eAAe;IAEtD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;IAChC,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAE5D,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC3D,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;AAC9D,CAAC"}