npm - @pasko70/pibo - Versions diffs - 3.4.2 → 3.4.4 - Mend

@pasko70/pibo 3.4.2 → 3.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/dist/agent-runtime/routed-session.js +4 -1
package/dist/agent-runtimes/codex-native/adapter.js +14 -1
package/dist/agent-runtimes/codex-native/models.js +4 -4
package/dist/agent-runtimes/codex-native/process.js +32 -13
package/dist/agent-runtimes/codex-native/provider-usage.js +115 -0
package/dist/agent-runtimes/pi/routed-session.js +2 -0
package/dist/apps/chat/chat-settings-routes.js +10 -0
package/dist/apps/chat-ui/assets/{dist-BDnWOTcs.js → dist-23lt_7qm.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-CCR1HsaR.js → dist-Bf2KScPo.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-B7Ju7u08.js → dist-CH3SvpYV.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-CXWLhBio.js → dist-DsgL8w-W.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-CAiO6h6z.js → dist-V06sfuZa.js} +1 -1
package/dist/apps/chat-ui/assets/index-BOceJ0jM.css +1 -0
package/dist/apps/chat-ui/assets/index-BOemYq-V.js +228 -0
package/dist/apps/chat-ui/index.html +2 -2
package/dist/apps/chat-vscode-web/assets/index-CMwTB8o8.js +43 -0
package/dist/apps/chat-vscode-web/index.html +1 -1
package/dist/core/session-router.js +1 -0
package/dist/core/user-settings.js +11 -0
package/dist/gateway/cli.js +104 -16
package/dist/session-ui/terminalRows.js +7 -7
package/dist/sessions/pibo-data-store.js +29 -10
package/dist/shared/tool-call-metrics.js +68 -7
package/dist/shared/tool-call-token-settings.js +45 -0
package/dist/web/channel.js +5 -2
package/npm-shrinkwrap.json +22 -13
package/package.json +2 -1
package/dist/apps/chat-ui/assets/index-0cCGS0o3.js +0 -228
package/dist/apps/chat-ui/assets/index-BMJGoyM8.css +0 -1
package/dist/apps/chat-vscode-web/assets/index-BD3Ogz9Z.js +0 -43

package/dist/apps/chat-vscode-web/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta name="theme-color" content="#101d22" />
 		<title>Pibo</title>
-		<script type="module" crossorigin src="/apps/chat-vscode/assets/index-BD3Ogz9Z.js"></script>
+		<script type="module" crossorigin src="/apps/chat-vscode/assets/index-CMwTB8o8.js"></script>
 		<link rel="stylesheet" crossorigin href="/apps/chat-vscode/assets/index-b18ZkEo0.css">
 	</head>
 	<body>

package/dist/core/session-router.js CHANGED Viewed

@@ -1552,6 +1552,7 @@ export class PiboSessionRouter {
                 return result;
             },
             statusResources,
+            getToolMetricTokenCalculation: () => loadPiboUserSettings().toolMetrics.tokenCalculation,
         });
         this.sessions.set(piboSession.id, session);
         return session;

package/dist/core/user-settings.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { piboHomePath } from "./pibo-home.js";
 import { sanitizePreviewServerSettings } from "./preview-server-settings.js";
 import { sanitizeTelemetryRetentionSettings } from "./telemetry-retention-settings.js";
 import { sanitizeTelemetryStaleThresholdSettings } from "./telemetry-staleness.js";
+import { DEFAULT_TOOL_METRIC_TOKEN_CALCULATION, parseToolMetricTokenCalculation, } from "../shared/tool-call-token-settings.js";
 export const DEFAULT_USER_TIMEZONE = "UTC";
 export const DEFAULT_WEB_ANNOTATIONS_TOGGLE_SHORTCUT = "Alt+Shift+A";
 export const DEFAULT_TRANSCRIPTION_PROVIDER_ID = "openai-chatgpt";
@@ -64,6 +65,15 @@ export function sanitizeSpeechSettings(value) {
         : {};
     return { providerId: sanitizeTranscriptionProviderId(raw.providerId) ?? DEFAULT_SPEECH_PROVIDER_ID };
 }
+export function sanitizeToolMetricSettings(value) {
+    const raw = value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : {};
+    return {
+        tokenCalculation: parseToolMetricTokenCalculation(raw.tokenCalculation)
+            ?? DEFAULT_TOOL_METRIC_TOKEN_CALCULATION,
+    };
+}
 export function sanitizeTimezone(value) {
     if (typeof value !== "string")
         return undefined;
@@ -87,6 +97,7 @@ function sanitizeUserSettings(value) {
         shortcuts: sanitizeShortcutSettings(raw.shortcuts),
         transcription: sanitizeTranscriptionSettings(raw.transcription),
         speech: sanitizeSpeechSettings(raw.speech),
+        toolMetrics: sanitizeToolMetricSettings(raw.toolMetrics),
         previewServers: sanitizePreviewServerSettings(raw.previewServers),
         telemetryStaleThresholds: sanitizeTelemetryStaleThresholdSettings(raw.telemetryStaleThresholds),
         telemetryRetention: sanitizeTelemetryRetentionSettings(raw.telemetryRetention),

package/dist/gateway/cli.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { spawn, execFile } from "node:child_process";
-import { existsSync, mkdirSync, openSync, readFileSync, readdirSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { appendFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { promisify } from "node:util";
@@ -205,11 +206,14 @@ function runtimeTelemetryHint(value) {
 }
 function runtimeStatus(value) {
     const obj = objectValue(value);
-    if (!obj)
+    if (!obj || !stringValue(obj.piboSessionId) || typeof obj.processing !== "boolean" || typeof obj.streaming !== "boolean"
+        || !Number.isInteger(obj.queuedMessages) || Number(obj.queuedMessages) < 0)
         return undefined;
     return {
         piboSessionId: stringValue(obj.piboSessionId),
         queuedMessages: numberValue(obj.queuedMessages),
+        activeEventId: stringValue(obj.activeEventId),
+        queuedEventIds: Array.isArray(obj.queuedEventIds) && obj.queuedEventIds.every((id) => typeof id === "string") ? obj.queuedEventIds : undefined,
         processing: booleanValue(obj.processing),
         streaming: booleanValue(obj.streaming),
         activeTelemetry: runtimeTelemetryHint(obj.activeTelemetry),
@@ -217,13 +221,14 @@ function runtimeStatus(value) {
 }
 function activeRun(value) {
     const obj = objectValue(value);
-    if (!obj)
+    if (!obj || !stringValue(obj.runId) || !stringValue(obj.status)
+        || !(stringValue(obj.controllerPiboSessionId) || stringValue(obj.piboSessionId)))
         return undefined;
     return {
         runId: stringValue(obj.runId),
         status: stringValue(obj.status),
         toolName: stringValue(obj.toolName),
-        piboSessionId: stringValue(obj.piboSessionId),
+        piboSessionId: stringValue(obj.controllerPiboSessionId) ?? stringValue(obj.piboSessionId),
     };
 }
 function parseGatewaySafetyPayload(payload, reachable) {
@@ -231,7 +236,9 @@ function parseGatewaySafetyPayload(payload, reachable) {
     const mode = obj && (obj.mode === "dev" || obj.mode === "prod" || obj.mode === "fallback") ? obj.mode : "unknown";
     const runtimeStatuses = Array.isArray(obj?.runtimeStatuses) ? obj.runtimeStatuses.map(runtimeStatus).filter((item) => Boolean(item)) : [];
     const activeRuns = Array.isArray(obj?.activeRuns) ? obj.activeRuns.map(activeRun).filter((item) => Boolean(item)) : [];
-    return { reachable, mode, health: obj?.health, runtimeStatuses, activeRuns, ambiguous: booleanValue(obj?.ambiguous) };
+    const incomplete = !Array.isArray(obj?.runtimeStatuses) || !Array.isArray(obj?.activeRuns)
+        || runtimeStatuses.length !== obj.runtimeStatuses.length || activeRuns.length !== obj.activeRuns.length;
+    return { reachable, mode, generation: stringValue(obj?.generation), health: obj?.health, runtimeStatuses, activeRuns, ambiguous: incomplete || booleanValue(obj?.ambiguous) };
 }
 export function checkActiveWork(status, target = "web") {
     const reasons = [];
@@ -249,7 +256,7 @@ export function checkActiveWork(status, target = "web") {
             reasons.push(`${id} is processing`);
         if (session.streaming === true)
             reasons.push(`${id} is streaming`);
-        if ((session.queuedMessages ?? 0) > 0)
+        if ((session.queuedMessages ?? 0) > 0 || (session.activeTelemetry?.queueDepth ?? 0) > 0)
             reasons.push(`${id} has queued messages`);
         if (session.activeTelemetry?.isStale === true) {
             const phase = session.activeTelemetry.activePhase ? ` in ${session.activeTelemetry.activePhase}` : "";
@@ -260,6 +267,58 @@ export function checkActiveWork(status, target = "web") {
         reasons.push(`${run.runId ?? "yielded run"} is ${run.status ?? "active"}`);
     return { unsafe: reasons.length > 0, reasons };
 }
+function blockingSessions(status) {
+    return status.runtimeStatuses.filter((session) => session.processing || session.streaming
+        || (session.queuedMessages ?? 0) > 0 || (session.activeTelemetry?.queueDepth ?? 0) > 0 || session.activeTelemetry?.isStale);
+}
+export function restartConfirmationToken(status) {
+    if (!status.reachable || status.error || status.ambiguous || status.mode !== "prod" || !status.generation)
+        return undefined;
+    const sessions = blockingSessions(status);
+    if (status.runtimeStatuses.some((session) => !session.piboSessionId || typeof session.processing !== "boolean"
+        || typeof session.streaming !== "boolean" || !Number.isInteger(session.queuedMessages) || session.queuedMessages < 0))
+        return undefined;
+    if (sessions.some((session) => ((session.processing || session.streaming || session.activeTelemetry?.isStale)
+        && !(session.activeEventId || session.activeTelemetry?.activeTurnId))
+        || (session.queuedMessages > 0 && (session.queuedEventIds?.length !== session.queuedMessages || session.queuedEventIds?.some((id) => !id)))
+        || (session.activeTelemetry?.queueDepth ?? 0) > (session.queuedMessages ?? 0)))
+        return undefined;
+    if (status.activeRuns.some((run) => !run.runId || !run.piboSessionId || !run.status))
+        return undefined;
+    // Exclude clock/progress counters: approval describes work identities, not polling time.
+    const snapshot = {
+        generation: status.generation,
+        target: "web", port: targetPort("web"), service: gatewayServiceName("web"), home: managedGatewayHome("web"),
+        sessions: sessions.map((session) => ({
+            id: session.piboSessionId, activeEventId: session.activeEventId,
+            processing: session.processing, streaming: session.streaming,
+            queuedEventIds: [...(session.queuedEventIds ?? [])], queuedMessages: session.queuedMessages,
+            telemetryTurnId: session.activeTelemetry?.activeTurnId,
+            stale: session.activeTelemetry?.isStale === true,
+        })).sort((a, b) => a.id.localeCompare(b.id)),
+        runs: [...status.activeRuns].sort((a, b) => a.runId.localeCompare(b.runId)),
+    };
+    return `${RESTART_CONFIRMATION_TOKEN}:${createHash("sha256").update(JSON.stringify(snapshot)).digest("hex")}`;
+}
+function printRestartApproval(status) {
+    const token = restartConfirmationToken(status);
+    if (token) {
+        console.log("Review the listed work and obtain user approval before running:");
+        console.log(`  pibo gateway web restart --force --confirm ${token}`);
+    }
+    else
+        console.log("Snapshot approval unavailable: status must identify the gateway generation and all active work. Inspect: pibo gateway web doctor");
+}
+function auditRestart(status, decision, force, reason) {
+    const home = managedGatewayHome("web");
+    mkdirSync(home, { recursive: true });
+    appendFileSync(join(home, "gateway-restart-audit.jsonl"), `${JSON.stringify({
+        at: new Date().toISOString(), decision, force, reason, snapshot: restartConfirmationToken(status),
+        generation: status.generation,
+        sessionIds: [...new Set([...blockingSessions(status).map((session) => session.piboSessionId), ...status.activeRuns.map((run) => run.piboSessionId)].filter(Boolean))],
+        runIds: status.activeRuns.map((run) => run.runId), reasons: checkActiveWork(status).reasons,
+    })}\n`, { mode: 0o600 });
+}
 async function readGatewaySafetyStatus(target) {
     const port = targetPort(target);
     const reachable = await isPortReachable("127.0.0.1", port, 1500);
@@ -281,6 +340,10 @@ function printSafetyStatus(target, status) {
     console.log(`  runtime sessions: ${status.runtimeStatuses.length}`);
     for (const session of status.runtimeStatuses) {
         console.log(`    ${session.piboSessionId ?? "unknown"}: processing=${session.processing === true} streaming=${session.streaming === true} queued=${session.queuedMessages ?? 0}`);
+        if (session.activeEventId)
+            console.log(`      active event: ${session.activeEventId}`);
+        if (session.queuedEventIds?.length)
+            console.log(`      queued events: ${session.queuedEventIds.join(", ")}`);
         if (session.activeTelemetry) {
             const parts = [
                 session.activeTelemetry.activePhase ? `phase=${session.activeTelemetry.activePhase}` : undefined,
@@ -295,7 +358,7 @@ function printSafetyStatus(target, status) {
     }
     console.log(`  active yielded runs: ${status.activeRuns.length}`);
     for (const run of status.activeRuns)
-        console.log(`    ${run.runId ?? "unknown"}: ${run.status ?? "active"}${run.toolName ? ` (${run.toolName})` : ""}`);
+        console.log(`    ${run.runId ?? "unknown"}: ${run.status ?? "active"}${run.toolName ? ` (${run.toolName})` : ""} session=${run.piboSessionId ?? "unknown"}`);
 }
 function managerRequiresShell(command) {
     return process.platform === "win32" && /\.(?:cmd|bat)$/i.test(command);
@@ -332,6 +395,7 @@ async function runManagedGatewayCommand(target, command, args, argv = process.ar
             }
             else
                 console.log("  restart safety: idle");
+            printRestartApproval(status);
         }
         if (command === "doctor")
             process.exitCode = status.reachable && !status.error && status.mode === expectedMode(target) ? 0 : 1;
@@ -380,19 +444,43 @@ async function runManagedGatewayCommand(target, command, args, argv = process.ar
         const force = args.includes("--force");
         const confirmIndex = args.indexOf("--confirm");
         const confirmation = confirmIndex >= 0 ? args[confirmIndex + 1] : undefined;
-        if (force && confirmation !== RESTART_CONFIRMATION_TOKEN) {
+        if (target === "dev" && force && confirmation !== RESTART_CONFIRMATION_TOKEN) {
             console.error(`Force restart requires: --confirm ${RESTART_CONFIRMATION_TOKEN}`);
             process.exitCode = 1;
             return true;
         }
-        if (target === "web" && !force) {
-            const active = checkActiveWork(await readGatewaySafetyStatus(target), target);
-            if (active.unsafe) {
-                console.error("Restart blocked: active agent work is running.");
-                console.error("Do not restart the gateway now.");
-                console.error("Ask the user before interrupting active sessions.");
+        if (target === "web") {
+            // Both normal and delayed/forced commands inspect again at execution time.
+            let current = await readGatewaySafetyStatus(target);
+            for (let inspection = 0; inspection < 2; inspection += 1) {
+                const active = checkActiveWork(current, target);
+                const token = restartConfirmationToken(current);
+                printSafetyStatus(target, current);
                 for (const reason of active.reasons)
                     console.error(`- ${reason}`);
+                const blocked = force ? !token || confirmation !== token : active.unsafe;
+                if (blocked) {
+                    const reason = force ? "Snapshot approval is missing, unavailable, or changed." : "Active work or unavailable gateway status.";
+                    console.error(`Restart blocked: ${reason}`);
+                    console.error("Ask the user before interrupting active sessions. Obtain fresh approval with: pibo gateway web status");
+                    printRestartApproval(current);
+                    try {
+                        auditRestart(current, "blocked", force, reason);
+                    }
+                    catch (error) {
+                        console.error(`Restart audit failed: ${error instanceof Error ? error.message : String(error)}`);
+                    }
+                    process.exitCode = 1;
+                    return true;
+                }
+                if (inspection === 0)
+                    current = await readGatewaySafetyStatus(target);
+            }
+            try {
+                auditRestart(current, "approved", force, force ? "Unchanged snapshot explicitly approved" : "Gateway idle");
+            }
+            catch (error) {
+                console.error(`Restart blocked: cannot record restart audit: ${error instanceof Error ? error.message : String(error)}`);
                 process.exitCode = 1;
                 return true;
             }
@@ -642,8 +730,8 @@ Commands:
   dev doctor       Check dev gateway health
 Options:
-  --force --confirm ${RESTART_CONFIRMATION_TOKEN}
-                 Force a production restart after explicit confirmation
+  --force --confirm <snapshot-token>
+                 Restart only the work explicitly approved from web status
 Next:
   pibo gateway web status

package/dist/session-ui/terminalRows.js CHANGED Viewed

@@ -41,14 +41,7 @@ function applyToolDisplayMode(rows, mode) {
         const slimRow = {
             ...row,
             lines: row.lines.slice(0, 1),
-            input: undefined,
-            output: undefined,
-            error: undefined,
-            markdown: undefined,
-            expandable: false,
             singleLine: true,
-            previewOmission: undefined,
-            detailItems: undefined,
         };
         if (mode !== "intent")
             return [slimRow];
@@ -60,6 +53,13 @@ function applyToolDisplayMode(rows, mode) {
                         prefix: "bullet",
                         tokens: [token(intent, row.status === "error" ? "red" : row.status === "done" ? "green" : "cyan", "semibold")],
                     }],
+                input: undefined,
+                output: undefined,
+                error: undefined,
+                markdown: undefined,
+                expandable: false,
+                previewOmission: undefined,
+                detailItems: undefined,
             }];
     });
 }

package/dist/sessions/pibo-data-store.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ChatDataIngestService } from "../data/ingest-service.js";
+import { ChatDataIngestService, outputIdempotencyKey } from "../data/ingest-service.js";
 import { PiboDataStore } from "../data/pibo-store.js";
 import { PIBO_AGENT_OBSERVATION_AUTO_CURSOR_MAX_SCOPES, createPiboSession, matchesFindInput, } from "./store.js";
 import { createLegacyPiRuntimeSessionBinding, nextRuntimeSessionBinding, RuntimeSessionBindingConflictError, } from "./runtime-binding.js";
@@ -469,9 +469,26 @@ export class PiboDataSessionStore {
         const at = input.at ?? new Date().toISOString();
         const runsBySession = groupRunsByController(input.recoveredRuns ?? []);
         return this.dataStore.transaction(() => {
+            // Durable terminal output wins over stale telemetry. Do not send a different
+            // recovery payload through the same output identity during startup.
+            const terminalErrors = new Map();
             const recoveredTurns = this.dataStore.telemetry.recoverInterruptedTurns({
                 at,
-                resolveOutcome: (turn) => recoveryOutcomeForTurn(turn, runsBySession.get(turn.piboSessionId) ?? []),
+                resolveOutcome: (turn) => {
+                    const identity = { type: "session_error", piboSessionId: turn.piboSessionId, eventId: recoveryEventId(turn), error: "" };
+                    const existing = this.dataStore.eventLog.findByIdempotencyKey(outputIdempotencyKey(identity));
+                    if (existing) {
+                        const event = {
+                            ...identity,
+                            error: typeof existing.attributes.error === "string" ? existing.attributes.error : existing.previewText ?? "Runtime error",
+                            errorDetails: existing.attributes.errorDetails,
+                        };
+                        terminalErrors.set(turn.turnId, event);
+                        const details = event.errorDetails;
+                        return { status: details?.code === "timeout" ? "timeout" : details?.errorClass === "runtime_abort" ? "aborted" : "error", summary: event.error };
+                    }
+                    return recoveryOutcomeForTurn(turn, runsBySession.get(turn.piboSessionId) ?? []);
+                },
             });
             if (recoveredTurns.length === 0)
                 return [];
@@ -482,7 +499,8 @@ export class PiboDataSessionStore {
                 if (!session)
                     continue;
                 const row = this.db.prepare("SELECT room_id FROM sessions WHERE id = ?").get(session.id);
-                const event = {
+                const existingError = terminalErrors.get(recovered.turn.turnId);
+                const event = existingError ?? {
                     type: "session_error",
                     piboSessionId: session.id,
                     eventId: recoveryEventId(recovered.turn),
@@ -512,13 +530,14 @@ export class PiboDataSessionStore {
 						updated_at = ?
 					WHERE session_id = ?
 				`).run(at, at, at, session.id);
-                ingest.ingestOutputEvent({
-                    session,
-                    roomId: row?.room_id ?? undefined,
-                    actorId: session.id,
-                    event,
-                    createdAt: at,
-                });
+                if (!existingError)
+                    ingest.ingestOutputEvent({
+                        session,
+                        roomId: row?.room_id ?? undefined,
+                        actorId: session.id,
+                        event,
+                        createdAt: at,
+                    });
                 results.push({
                     turnId: recovered.turn.turnId,
                     piboSessionId: session.id,

package/dist/shared/tool-call-metrics.js CHANGED Viewed

@@ -1,5 +1,10 @@
-/** Bounded structural walk; never tokenize, copy or scan large strings. */
-export function estimateToolPayloadTokens(payload) {
+import { createRequire } from "node:module";
+import { DEFAULT_TOOL_METRIC_TOKEN_CALCULATION, sanitizeToolMetricTokenCalculation, toolMetricTokenBasis, } from "./tool-call-token-settings.js";
+export const MAX_TIKTOKEN_PAYLOAD_CHARACTERS = 4_000_000;
+const require = createRequire(import.meta.url);
+let activeTokenizer;
+/** Bounded structural walk; character mode never tokenizes, copies, or scans large strings. */
+export function measureToolPayloadCharacters(payload) {
     let budget = 10_000;
     const seen = new WeakSet();
     function size(value, depth) {
@@ -26,7 +31,6 @@ export function estimateToolPayloadTokens(payload) {
         }
         else {
             const record = value;
-            // Binary/media payloads have no meaningful character-based token count.
             if (["image", "audio", "document", "resource", "image_url"].includes(String(record.type)))
                 return NaN;
             for (const key in record) {
@@ -44,7 +48,26 @@ export function estimateToolPayloadTokens(payload) {
     }
     try {
         const chars = size(payload, 0);
-        return Number.isFinite(chars) ? Math.ceil(chars / 4) : undefined;
+        return Number.isFinite(chars) ? chars : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export function estimateToolPayloadTokens(payload, calculation = DEFAULT_TOOL_METRIC_TOKEN_CALCULATION) {
+    try {
+        const normalized = sanitizeToolMetricTokenCalculation(calculation);
+        if (normalized.method === "characters") {
+            const chars = measureToolPayloadCharacters(payload);
+            if (chars === undefined)
+                return undefined;
+            const tokens = Math.ceil(chars / normalized.factor);
+            return Number.isSafeInteger(tokens) ? tokens : undefined;
+        }
+        const text = serializableToolPayloadText(payload);
+        if (text === undefined)
+            return undefined;
+        return tiktokenPayloadTokens(text, normalized.encoding);
     }
     catch {
         // Diagnostics must not turn an otherwise successful tool into a failure.
@@ -52,26 +75,64 @@ export function estimateToolPayloadTokens(payload) {
     }
 }
 export class ToolCallMetricsCollector {
+    getCalculation;
     active = new Map();
+    constructor(getCalculation = () => DEFAULT_TOOL_METRIC_TOKEN_CALCULATION) {
+        this.getCalculation = getCalculation;
+    }
     start(id, args, now = performance.now()) {
         if (this.active.has(id))
             return;
-        this.active.set(id, { startedAt: now, inputTokens: estimateToolPayloadTokens(args) });
+        const calculation = this.currentCalculation();
+        this.active.set(id, {
+            startedAt: now,
+            inputTokens: estimateToolPayloadTokens(args, calculation),
+            calculation,
+        });
     }
     finish(id, result, now = performance.now()) {
         const started = this.active.get(id);
         this.active.delete(id);
+        const calculation = started?.calculation ?? this.currentCalculation();
         // Harness result metadata is not model-visible tool output.
         const output = result && typeof result === "object" && "content" in result
             ? result.content : result;
         return {
-            tokenBasis: "chars/4",
+            tokenBasis: toolMetricTokenBasis(calculation),
             durationMs: started ? Math.max(0, now - started.startedAt) : undefined,
             inputTokens: started?.inputTokens,
-            outputTokens: estimateToolPayloadTokens(output),
+            outputTokens: estimateToolPayloadTokens(output, calculation),
         };
     }
     clear() {
         this.active.clear();
     }
+    currentCalculation() {
+        try {
+            return sanitizeToolMetricTokenCalculation(this.getCalculation());
+        }
+        catch {
+            return DEFAULT_TOOL_METRIC_TOKEN_CALCULATION;
+        }
+    }
+}
+function serializableToolPayloadText(payload) {
+    const measuredCharacters = measureToolPayloadCharacters(payload);
+    if (measuredCharacters === undefined || measuredCharacters > MAX_TIKTOKEN_PAYLOAD_CHARACTERS)
+        return undefined;
+    if (typeof payload === "string")
+        return payload;
+    const serialized = JSON.stringify(payload);
+    return typeof serialized === "string" && serialized.length <= MAX_TIKTOKEN_PAYLOAD_CHARACTERS
+        ? serialized
+        : undefined;
+}
+function tiktokenPayloadTokens(text, encoding) {
+    if (activeTokenizer?.encoding !== encoding) {
+        activeTokenizer?.tokenizer.free();
+        const tiktoken = require("tiktoken");
+        activeTokenizer = { encoding, tokenizer: tiktoken.get_encoding(encoding) };
+    }
+    const tokens = activeTokenizer.tokenizer.encode_ordinary(text).length;
+    return Number.isSafeInteger(tokens) ? tokens : undefined;
 }

package/dist/shared/tool-call-token-settings.js ADDED Viewed

@@ -0,0 +1,45 @@
+export const TIKTOKEN_ENCODINGS = [
+    "o200k_base",
+    "cl100k_base",
+    "p50k_base",
+    "r50k_base",
+    "p50k_edit",
+    "gpt2",
+];
+export const DEFAULT_TOOL_METRIC_TOKEN_CALCULATION = {
+    method: "characters",
+    factor: 4,
+};
+export function parseToolMetricTokenCalculation(value) {
+    if (!isRecord(value))
+        return undefined;
+    if (value.method === "characters") {
+        return typeof value.factor === "number" && Number.isFinite(value.factor) && value.factor > 0
+            ? { method: "characters", factor: value.factor }
+            : undefined;
+    }
+    if (value.method === "tiktoken" && typeof value.encoding === "string" && TIKTOKEN_ENCODINGS.includes(value.encoding)) {
+        return { method: "tiktoken", encoding: value.encoding };
+    }
+    return undefined;
+}
+export function sanitizeToolMetricTokenCalculation(value) {
+    return parseToolMetricTokenCalculation(value) ?? DEFAULT_TOOL_METRIC_TOKEN_CALCULATION;
+}
+export function toolMetricTokenBasis(calculation) {
+    return calculation.method === "characters"
+        ? `characters/${calculation.factor}`
+        : `tiktoken/${calculation.encoding}`;
+}
+export function toolMetricTokenBasisLabel(basis) {
+    if (!basis)
+        return "—";
+    if (basis === "chars/4")
+        return "chars ÷ 4";
+    if (basis.startsWith("characters/"))
+        return `chars ÷ ${basis.slice("characters/".length)}`;
+    return `tiktoken · ${basis.slice("tiktoken/".length)}`;
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/web/channel.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 import { createServer } from "node:http";
 import { PiboAuthError } from "../auth/types.js";
 import { handleSimpleAgentApiRequest } from "../api/simple-agent-api.js";
@@ -190,11 +191,12 @@ function createGatewayRuntimeStatuses(channelContext) {
         }
     });
 }
-function createGatewayStatusResponse(channelContext, options) {
+function createGatewayStatusResponse(channelContext, options, generation) {
     const mode = gatewayMode(options);
     return responseJson({
         status: "ok",
         mode,
+        generation,
         health: { status: "ok", mode },
         runtimeStatuses: createGatewayRuntimeStatuses(channelContext),
         activeRuns: collectActiveRuns(channelContext),
@@ -238,6 +240,7 @@ async function waitForServerClose(closePromise, timeoutMs) {
     });
 }
 export function createWebHostChannel(options = {}) {
+    const generation = randomUUID();
     const host = options.host ?? DEFAULT_WEB_CHANNEL_HOST;
     const port = options.port ?? DEFAULT_WEB_CHANNEL_PORT;
     const shutdownDrainTimeoutMs = options.shutdownDrainTimeoutMs ?? DEFAULT_SHUTDOWN_DRAIN_TIMEOUT_MS;
@@ -319,7 +322,7 @@ export function createWebHostChannel(options = {}) {
                 return;
             }
             if (url.pathname === "/gateway/status") {
-                await sendResponse(nodeResponse, createGatewayStatusResponse(requireContext(), options));
+                await sendResponse(nodeResponse, createGatewayStatusResponse(requireContext(), options, generation));
                 return;
             }
             if (url.pathname.startsWith("/api/auth/")) {

package/npm-shrinkwrap.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@pasko70/pibo",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pasko70/pibo",
-      "version": "3.4.2",
+      "version": "3.4.4",
       "workspaces": [
         "packages/workflows"
       ],
@@ -39,6 +39,7 @@
         "react-virtuoso": "^4.18.6",
         "remark-gfm": "^4.0.1",
         "tailwindcss": "^4.2.4",
+        "tiktoken": "^1.0.22",
         "typebox": "1.1.38",
         "xstate": "5.31.1"
       },
@@ -11502,7 +11503,7 @@
       "license": "MIT",
       "peer": true,
       "funding": {
-        "type": "GitHub Sponsors \u2764",
+        "type": "GitHub Sponsors ❤",
         "url": "https://github.com/sponsors/dmonad"
       }
     },
@@ -11781,7 +11782,7 @@
         "node": ">=16"
       },
       "funding": {
-        "type": "GitHub Sponsors \u2764",
+        "type": "GitHub Sponsors ❤",
         "url": "https://github.com/sponsors/dmonad"
       }
     },
@@ -15811,6 +15812,12 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/tiktoken": {
+      "version": "1.0.22",
+      "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.22.tgz",
+      "integrity": "sha512-PKvy1rVF1RibfF3JlXBSP0Jrcw2uq3yXdgcEXtKTYn3QJ/cBRBHDnrJ5jHky+MENZ6DIPwNUGWpkVx+7joCpNA==",
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.17",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
@@ -17073,6 +17080,16 @@
         "node": ">=20.0"
       }
     },
+    "node_modules/xstate": {
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/xstate/-/xstate-5.31.1.tgz",
+      "integrity": "sha512-3P7t7GQ61BvLu+8Cj6Zq7rcS34vecL9pvfN2ucUWmIFIUG+rAREviOs4Xy4OO3BuJHSz6RLU8eqDXxSbVotjDQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/xstate"
+      }
+    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -17132,7 +17149,7 @@
         "npm": ">=8.0.0"
       },
       "funding": {
-        "type": "GitHub Sponsors \u2764",
+        "type": "GitHub Sponsors ❤",
         "url": "https://github.com/sponsors/dmonad"
       }
     },
@@ -17204,14 +17221,6 @@
       "dependencies": {
         "xstate": "5.31.1"
       }
-    },
-    "packages/workflows/node_modules/xstate": {
-      "version": "5.31.1",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/xstate"
-      }
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pasko70/pibo",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -109,6 +109,7 @@
     "react-virtuoso": "^4.18.6",
     "remark-gfm": "^4.0.1",
     "tailwindcss": "^4.2.4",
+    "tiktoken": "^1.0.22",
     "typebox": "1.1.38",
     "xstate": "5.31.1"
   },