@fitchmultz/pi-subagents 0.49.1 → 0.50.0

package/dist/runs/shared/child-message-validation.js

@@ -1,215 +0,0 @@
-import { isRecord as isObject } from "../../shared/unknown.js";
-export function optionalString(value, label) {
-    if (value === undefined) {
-        return;
-    }
-    if (typeof value !== "string") {
-        throw new SyntaxError(`Invalid ${label}`);
-    }
-    return value;
-}
-export function optionalNumber(value, label) {
-    if (value === undefined) {
-        return;
-    }
-    if (typeof value !== "number") {
-        throw new SyntaxError(`Invalid ${label}`);
-    }
-    return value;
-}
-export function optionalBoolean(value, label) {
-    if (value === undefined) {
-        return;
-    }
-    if (typeof value !== "boolean") {
-        throw new SyntaxError(`Invalid ${label}`);
-    }
-    return value;
-}
-export function requiredString(value, label) {
-    const text = optionalString(value, label);
-    if (text === undefined) {
-        throw new SyntaxError(`Missing ${label}`);
-    }
-    return text;
-}
-function isObservedUsage(value) {
-    if (!isObject(value)) {
-        return false;
-    }
-    for (const key of [
-        "input",
-        "output",
-        "cacheRead",
-        "cacheWrite",
-        "totalTokens",
-        "reasoning",
-        "cacheWrite1h",
-    ]) {
-        optionalNumber(value[key], `usage.${key}`);
-    }
-    if (value.cost !== undefined) {
-        if (!isObject(value.cost)) {
-            return false;
-        }
-        for (const key of ["input", "output", "cacheRead", "cacheWrite", "total"]) {
-            optionalNumber(value.cost[key], `cost.${key}`);
-        }
-    }
-    return true;
-}
-export function observedUsage(value) {
-    if (value === undefined) {
-        return;
-    }
-    if (!isObservedUsage(value)) {
-        throw new SyntaxError("Invalid native usage");
-    }
-    return value;
-}
-function observedContent(value) {
-    if (!isObject(value)) {
-        throw new SyntaxError("Invalid native message content");
-    }
-    switch (value.type) {
-        case "text":
-            return {
-                ...value,
-                type: "text",
-                text: requiredString(value.text, "content.text"),
-                textSignature: optionalString(value.textSignature, "textSignature"),
-            };
-        case "thinking":
-            return {
-                ...value,
-                type: "thinking",
-                thinking: optionalString(value.thinking, "content.thinking") ?? "",
-                thinkingSignature: optionalString(value.thinkingSignature, "thinkingSignature"),
-            };
-        case "image":
-            return {
-                ...value,
-                type: "image",
-                data: optionalString(value.data, "image.data") ?? "",
-                mimeType: requiredString(value.mimeType, "image.mimeType"),
-            };
-        case "toolCall":
-            if (!isObject(value.arguments)) {
-                throw new SyntaxError("Invalid tool call arguments");
-            }
-            return {
-                ...value,
-                type: "toolCall",
-                id: requiredString(value.id, "toolCall.id"),
-                name: requiredString(value.name, "toolCall.name"),
-                arguments: value.arguments,
-            };
-        default:
-            throw new SyntaxError("Unsupported native message content");
-    }
-}
-function contentArray(value) {
-    if (!Array.isArray(value)) {
-        throw new SyntaxError("Invalid native message content array");
-    }
-    return value.map((part) => observedContent(part));
-}
-function assistant(value) {
-    return {
-        ...value,
-        role: "assistant",
-        content: contentArray(value.content),
-        timestamp: optionalNumber(value.timestamp, "timestamp"),
-        api: optionalString(value.api, "api"),
-        provider: optionalString(value.provider, "provider"),
-        model: optionalString(value.model, "model"),
-        responseModel: optionalString(value.responseModel, "responseModel"),
-        responseId: optionalString(value.responseId, "responseId"),
-        usage: observedUsage(value.usage),
-        stopReason: optionalString(value.stopReason, "stopReason"),
-        errorMessage: optionalString(value.errorMessage, "errorMessage"),
-    };
-}
-function otherMessage(value, timestamp) {
-    switch (value.role) {
-        case "custom":
-            return {
-                ...value,
-                role: "custom",
-                timestamp,
-                customType: requiredString(value.customType, "customType"),
-                content: typeof value.content === "string" ? value.content : contentArray(value.content),
-                display: optionalBoolean(value.display, "display"),
-            };
-        case "bashExecution":
-            return {
-                ...value,
-                role: "bashExecution",
-                timestamp,
-                command: requiredString(value.command, "command"),
-                output: requiredString(value.output, "output"),
-                exitCode: optionalNumber(value.exitCode, "exitCode"),
-                cancelled: optionalBoolean(value.cancelled, "cancelled"),
-                truncated: optionalBoolean(value.truncated, "truncated"),
-                fullOutputPath: optionalString(value.fullOutputPath, "fullOutputPath"),
-                excludeFromContext: optionalBoolean(value.excludeFromContext, "excludeFromContext"),
-            };
-        case "branchSummary":
-            return {
-                ...value,
-                role: "branchSummary",
-                timestamp,
-                summary: requiredString(value.summary, "summary"),
-                fromId: value.fromId === null ? null : requiredString(value.fromId, "fromId"),
-            };
-        case "compactionSummary": {
-            const tokensBefore = optionalNumber(value.tokensBefore, "tokensBefore");
-            if (tokensBefore === undefined) {
-                throw new SyntaxError("Missing tokensBefore");
-            }
-            return {
-                ...value,
-                role: "compactionSummary",
-                timestamp,
-                summary: requiredString(value.summary, "summary"),
-                tokensBefore,
-            };
-        }
-        default:
-            throw new SyntaxError("Unsupported native message role");
-    }
-}
-export function observedMessage(value) {
-    if (!isObject(value)) {
-        throw new SyntaxError("Invalid native message");
-    }
-    if (value.role === "assistant") {
-        return assistant(value);
-    }
-    const timestamp = optionalNumber(value.timestamp, "timestamp");
-    if (value.role === "toolResult") {
-        if (value.isError !== undefined && typeof value.isError !== "boolean") {
-            throw new SyntaxError("Invalid tool result isError");
-        }
-        return {
-            ...value,
-            role: "toolResult",
-            content: contentArray(value.content),
-            timestamp,
-            toolCallId: requiredString(value.toolCallId, "toolCallId"),
-            toolName: requiredString(value.toolName, "toolName"),
-            isError: value.isError,
-            observedExitCode: optionalNumber(value.observedExitCode, "observedExitCode"),
-            usage: observedUsage(value.usage),
-        };
-    }
-    if (value.role === "user" || value.role === "system") {
-        return {
-            ...value,
-            role: value.role,
-            timestamp,
-            content: typeof value.content === "string" ? value.content : contentArray(value.content),
-        };
-    }
-    return otherMessage(value, timestamp);
-}

package/dist/runs/shared/child-native-accounting.js

@@ -1,106 +0,0 @@
-import { NativeJournal } from "../../shared/journal-reader.js";
-import { readNativeUsage, nativeUsageCollector } from "./native-usage.js";
-import { sumAttemptUsage } from "./model-fallback.js";
-import { errorMessage as errorText } from "../../shared/unknown.js";
-import { nonempty } from "./child-presence.js";
-import { optionalString } from "./child-message-validation.js";
-function verifyObservedCommits(observations, publishedIds) {
-    const missing = observations.some((item) => {
-        if (!item.message) {
-            return false;
-        }
-        const billable = item.message.role === "assistant" ||
-            (item.message.role === "toolResult" && item.message.usage !== undefined);
-        return billable && (item.nativeEntryId === undefined || !publishedIds.has(item.nativeEntryId));
-    });
-    if (missing) {
-        throw new Error("Finalized message usage has no verified native commit; its reported usage and audit remain available.");
-    }
-}
-function acceptedTotals(input) {
-    if (!nonempty(input.result.nativeSessionId) || input.acceptedEntries.size === 0) {
-        return;
-    }
-    const accepted = nativeUsageCollector(input.result.nativeSessionId, input.baseline, input.result.finalization?.map((segment) => segment.event.lastEntryId));
-    for (const entry of input.acceptedEntries.values()) {
-        accepted.append(entry);
-    }
-    return accepted.totals;
-}
-/** Publication, not message_end, authorizes complete native accounting. */
-export function accountNativeChild(input) {
-    const publishedIds = new Set();
-    let nativeSessionId = input.result.nativeSessionId;
-    let terminalEntryId = input.result.terminalEntryId;
-    let accounting = input.result.accounting ?? {
-        state: "complete",
-    };
-    let usage;
-    let segmentUsage;
-    try {
-        const native = readNativeUsage(input.file, input.baseline, input.result.finalization?.map((segment) => segment.event.lastEntryId), {
-            onEntry: (entry) => {
-                if (entry.type === "message") {
-                    publishedIds.add(entry.id);
-                    if (!input.baseline.has(entry.id)) {
-                        input.reference(entry);
-                    }
-                }
-            },
-            onBoundary: (boundary) => {
-                nativeSessionId = boundary.sessionId;
-                terminalEntryId = boundary.lastEntryId;
-            },
-        });
-        const totals = native ?? acceptedTotals(input);
-        if (totals) {
-            if (native) {
-                verifyObservedCommits(input.observations(), publishedIds);
-            }
-            accounting = { state: "complete" };
-            const total = sumAttemptUsage(totals.map((item) => ({
-                model: input.result.model ?? "default",
-                success: true,
-                usage: item,
-            })));
-            usage = { ...total, contributions: total.contributions?.slice() };
-            segmentUsage = totals;
-        }
-    }
-    catch (error) {
-        accounting = {
-            state: "incomplete",
-            error: `Cannot read finalized native usage: ${errorText(error)}`,
-        };
-    }
-    const selection = terminalSelection(input.file, input.result, terminalEntryId, accounting);
-    return { ...selection, publishedIds, nativeSessionId, usage, segmentUsage };
-}
-function terminalSelection(file, result, terminalEntryId, accounting) {
-    let selectedEntryId = terminalEntryId;
-    let selectionAccounting = accounting;
-    let terminalLeafId = result.terminalLeafId;
-    let effectiveConfiguration = result.effectiveConfiguration;
-    if (effectiveConfiguration || !nonempty(file)) {
-        return { accounting, effectiveConfiguration, terminalEntryId, terminalLeafId };
-    }
-    try {
-        const journal = new NativeJournal(file, "inspect", true);
-        const terminal = journal.records.findLast((record) => record.value.type !== "session");
-        selectedEntryId ??= optionalString(terminal?.value.id, "terminal native ID");
-        terminalLeafId ??= selectedEntryId;
-        effectiveConfiguration = journal.configuration(undefined, terminalLeafId);
-    }
-    catch (error) {
-        selectionAccounting = {
-            state: "incomplete",
-            error: accounting.error ?? `Cannot capture terminal native selection: ${errorText(error)}`,
-        };
-    }
-    return {
-        accounting: selectionAccounting,
-        effectiveConfiguration,
-        terminalEntryId: selectedEntryId,
-        terminalLeafId,
-    };
-}

package/dist/runs/shared/child-native-observation.js

@@ -1,69 +0,0 @@
-import * as fs from "node:fs";
-import { SessionEntryCursor } from "../../shared/session-entries.js";
-import { nonempty } from "./child-presence.js";
-function entryObservation(entry) {
-    const message = entry.type === "message" ? entry.message : undefined;
-    const usage = entry.type === "usage" || entry.type === "compaction" || entry.type === "branch_summary"
-        ? entry.usage
-        : undefined;
-    return {
-        id: entry.id,
-        type: entry.type,
-        parentId: entry.parentId,
-        ...("checkpoint" in entry ? { checkpoint: entry.checkpoint } : {}),
-        ...(usage !== undefined ? { usage } : {}),
-        ...(entry.type === "usage" ? { provider: entry.provider, model: entry.model } : {}),
-        ...(message ? { message: messageObservation(message) } : {}),
-    };
-}
-function messageObservation(message) {
-    return {
-        role: message.role,
-        timestamp: message.timestamp,
-        ...("usage" in message ? { usage: message.usage } : {}),
-        ...(message.role === "assistant"
-            ? { provider: message.provider, model: message.model, responseModel: message.responseModel }
-            : {}),
-        ...("toolCallId" in message ? { toolCallId: message.toolCallId } : {}),
-    };
-}
-/** turn_end follows native append; message_end alone is never a commit receipt. */
-export class ChildNativeObservation {
-    cursor = new SessionEntryCursor();
-    previousIds = new Set();
-    observedMessages = 0;
-    start(ctx) {
-        this.cursor.reset();
-        this.observedMessages = 0;
-        const { entries } = this.cursor.read(ctx.sessionManager);
-        const baseline = process.env.PI_SUBAGENT_NATIVE_BASELINE_COUNT;
-        if (nonempty(baseline) && /^\d+$/.test(baseline)) {
-            process.stdout.write(`${JSON.stringify({ type: "subagent.native_baseline", sessionId: ctx.sessionManager.getSessionId(), entryIds: entries.slice(0, Number(baseline)).map((entry) => entry.id) })}\n`);
-        }
-        const file = ctx.sessionManager.getSessionFile();
-        const persisted = nonempty(file) && fs.existsSync(file);
-        this.previousIds = persisted ? new Set(entries.map((entry) => entry.id)) : new Set();
-        if (!persisted) {
-            this.cursor.reset();
-        }
-    }
-    message(role) {
-        if (["assistant", "user", "toolResult"].includes(role)) {
-            this.observedMessages++;
-        }
-    }
-    publish(ctx, boundary, pi) {
-        if (process.env.PI_SUBAGENT_CHILD !== "1") {
-            return;
-        }
-        const entries = [];
-        for (const entry of this.cursor.read(ctx.sessionManager).entries) {
-            if (!this.previousIds.has(entry.id)) {
-                this.previousIds.add(entry.id);
-                entries.push(entryObservation(entry));
-            }
-        }
-        const sessionFile = ctx.sessionManager.getSessionFile();
-        process.stdout.write(`${JSON.stringify({ type: "subagent.native", boundary, entries, sessionId: ctx.sessionManager.getSessionId(), sessionFile, leafId: ctx.sessionManager.getLeafId(), persisted: nonempty(sessionFile) && fs.existsSync(sessionFile), messageCount: this.observedMessages, configuration: { ...(ctx.model ? { model: `${ctx.model.provider}/${ctx.model.id}` } : {}), thinking: pi.getThinkingLevel() } })}\n`);
-    }
-}

package/dist/runs/shared/child-observation-spool.js

@@ -1,169 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { tmpdir } from "node:os";
-import { StringDecoder } from "node:string_decoder";
-import { errorMessage as errorText } from "../../shared/unknown.js";
-import { nonempty } from "./child-presence.js";
-/** Owns bounded streaming spools and transfers retained evidence to the durable audit. */
-export class ChildObservationSpool {
-    directory;
-    wirePath;
-    wire = -1;
-    text = -1;
-    stderr = -1;
-    textOffset = 0;
-    auditPath;
-    constructor(auditPath) {
-        this.auditPath = auditPath;
-        const parent = nonempty(auditPath) ? path.dirname(auditPath) : tmpdir();
-        fs.mkdirSync(parent, { recursive: true });
-        this.directory = fs.mkdtempSync(path.join(parent, ".pi-subagents-wire-"));
-        this.wirePath = path.join(this.directory, "stdout");
-        try {
-            this.wire = fs.openSync(this.wirePath, "wx+");
-            this.text = fs.openSync(path.join(this.directory, "text"), "wx+");
-            this.stderr = fs.openSync(path.join(this.directory, "stderr"), "wx+");
-        }
-        catch (error) {
-            this.close();
-            fs.rmSync(this.directory, { recursive: true, force: true });
-            throw error;
-        }
-    }
-    writeWire(bytes) {
-        fs.writeFileSync(this.wire, bytes);
-    }
-    writeStderr(text) {
-        fs.writeFileSync(this.stderr, text);
-    }
-    resetText() {
-        if (this.textOffset === 0) {
-            return;
-        }
-        fs.ftruncateSync(this.text, 0);
-        this.textOffset = 0;
-    }
-    appendText(text) {
-        const bytes = Buffer.from(text);
-        for (let offset = 0; offset < bytes.length;) {
-            const count = fs.writeSync(this.text, bytes, offset, bytes.length - offset, this.textOffset + offset);
-            if (count === 0) {
-                throw new Error("Cannot write child output spool");
-            }
-            offset += count;
-        }
-        this.textOffset += bytes.length;
-    }
-    replayText(consume) {
-        if (this.textOffset > 0) {
-            this.decode(this.text, 0, this.textOffset, consume);
-        }
-    }
-    replayWire(start, end, consume) {
-        this.decode(this.wire, start, end, consume);
-    }
-    copy(fd, start, end, consume) {
-        const buffer = Buffer.allocUnsafe(Math.min(64 * 1024, end - start));
-        for (let position = start; position < end;) {
-            const count = fs.readSync(fd, buffer, 0, Math.min(buffer.length, end - position), position);
-            if (count === 0) {
-                throw new Error("Missing child audit bytes");
-            }
-            consume(buffer.subarray(0, count));
-            position += count;
-        }
-    }
-    decode(fd, start, end, consume) {
-        const decoder = new StringDecoder("utf8");
-        this.copy(fd, start, end, (bytes) => consume(decoder.write(bytes)));
-        const tail = decoder.end();
-        if (tail.length > 0) {
-            consume(tail);
-        }
-    }
-    close() {
-        for (const fd of [this.wire, this.text, this.stderr]) {
-            if (fd >= 0) {
-                fs.closeSync(fd);
-            }
-        }
-        this.wire = -1;
-        this.text = -1;
-        this.stderr = -1;
-    }
-    retain(observations, receiverFailed) {
-        const retained = receiverFailed
-            ? [
-                {
-                    start: 0,
-                    end: fs.fstatSync(this.wire).size,
-                    kind: "receiver_failure",
-                    number: undefined,
-                },
-            ]
-            : observations.filter((item) => item.nativeEntryId === undefined);
-        const auditPath = this.auditPath ?? path.join(this.directory, "observations.log");
-        const stderrLength = fs.fstatSync(this.stderr).size;
-        let retainedWire = false;
-        let result = {};
-        try {
-            if (retained.length > 0 || stderrLength > 0) {
-                result = { auditPath, auditRecords: this.appendAudit(auditPath, retained, stderrLength) };
-            }
-        }
-        catch (error) {
-            retainedWire = true;
-            result = { auditSaveError: errorText(error), auditPath: this.directory };
-        }
-        finally {
-            this.close();
-            if (!retainedWire) {
-                this.removeWire(result.auditPath);
-            }
-        }
-        return result;
-    }
-    appendAudit(auditPath, retained, stderrLength) {
-        const audit = fs.openSync(auditPath, "a", 0o600);
-        const records = [];
-        try {
-            let offset = fs.fstatSync(audit).size;
-            for (const item of retained) {
-                this.copy(this.wire, item.start, item.end, (bytes) => {
-                    fs.writeFileSync(audit, bytes);
-                });
-                records.push({
-                    kind: item.kind,
-                    messageNumber: item.number,
-                    offset,
-                    length: item.end - item.start,
-                });
-                offset += item.end - item.start;
-            }
-            if (stderrLength > 0) {
-                this.copy(this.stderr, 0, stderrLength, (bytes) => {
-                    fs.writeFileSync(audit, bytes);
-                });
-                records.push({ kind: "stderr", offset, length: stderrLength });
-            }
-            return records;
-        }
-        finally {
-            fs.closeSync(audit);
-        }
-    }
-    removeWire(auditPath) {
-        if (auditPath?.startsWith(`${this.directory}${path.sep}`) === true) {
-            for (const file of [
-                this.wirePath,
-                path.join(this.directory, "text"),
-                path.join(this.directory, "stderr"),
-            ]) {
-                fs.rmSync(file);
-            }
-        }
-        else {
-            fs.rmSync(this.directory, { recursive: true, force: true });
-        }
-    }
-}