npm - @pasko70/pibo - Versions diffs - 2.4.0 → 2.4.2 - Mend

@pasko70/pibo 2.4.0 → 2.4.2

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 (39) hide show

package/dist/agent-runtime/routed-session.js +151 -7
package/dist/agent-runtimes/codex-native/turn.js +3 -1
package/dist/agent-runtimes/omp/turn.js +36 -7
package/dist/agent-runtimes/pi/routed-session.js +62 -16
package/dist/apps/chat/web-app.js +6 -8
package/dist/apps/chat-ui/assets/{dist-CUcAofmV.js → dist-3YG57JXi.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-Byygd1lH.js → dist-BeqHbnGN.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-DusFwy0L.js → dist-CrDtveZB.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-C9BrS7sL.js → dist-Cw9po47P.js} +1 -1
package/dist/apps/chat-ui/assets/{dist-D4RU6xu3.js → dist-DTRjeLwO.js} +1 -1
package/dist/apps/chat-ui/assets/{index-Bifi_kjN.js → index-AjnP3ci-.js} +89 -89
package/dist/apps/chat-ui/index.html +1 -1
package/dist/apps/chat-vscode-web/assets/{index-WsLm1mo3.js → index-DvTSSvzN.js} +5 -5
package/dist/apps/chat-vscode-web/index.html +1 -1
package/dist/apps/vscode-artifacts/latest.vsix +0 -0
package/dist/apps/vscode-artifacts/{pibo-vscode-ext-2.4.0.vsix → pibo-vscode-ext-2.4.2.vsix} +0 -0
package/dist/core/session-router.js +153 -63
package/dist/gateway/web.js +8 -1
package/dist/loops/accounting.js +27 -0
package/dist/loops/cli.js +6 -5
package/dist/loops/prompts.js +13 -5
package/dist/loops/service.js +8 -2
package/dist/loops/store.js +27 -11
package/dist/loops/tools.js +10 -5
package/dist/mcp/config-command.js +3 -2
package/dist/mcp/config.js +10 -4
package/dist/mcp/errors.js +1 -1
package/dist/mcp/index.js +19 -33
package/dist/reliability/store.js +11 -6
package/dist/runs/lifecycle.js +12 -0
package/dist/runs/registry.js +23 -4
package/dist/runs/tools.js +12 -3
package/dist/session-ui/sessionActivity.js +6 -2
package/dist/signals/status.js +9 -4
package/dist/tools/guides.js +1 -1
package/dist/web/channel.js +10 -4
package/npm-shrinkwrap.json +2 -2
package/package.json +1 -1
package/skills/builtin/loop/SKILL.md +1 -1

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-WsLm1mo3.js"></script>
+		<script type="module" crossorigin src="/apps/chat-vscode/assets/index-DvTSSvzN.js"></script>
 		<link rel="stylesheet" crossorigin href="/apps/chat-vscode/assets/index-CF1-9PKU.css">
 	</head>
 	<body>

package/dist/apps/vscode-artifacts/latest.vsix CHANGED Viewed

Binary file

package/dist/apps/vscode-artifacts/{pibo-vscode-ext-2.4.0.vsix → pibo-vscode-ext-2.4.2.vsix} RENAMED Viewed

Binary file

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

@@ -5,7 +5,7 @@ import { RuntimeRoutedSession as RoutedSession, } from "../agent-runtime/routed-
 import { runtimeSessionErrorDetails } from "./session-errors.js";
 import { normalizePiboAgentObservationCursor, normalizePiboAgentObservationLimit, normalizePiboAgentObservationOrder, parsePiboAgentObservationTimestamp, piboAgentObservationDetails, piboAgentObservationKind, piboAgentObservationRole, piboAgentObservationSourceFromEvent, piboAgentObservationText, } from "../subagents/observations.js";
 import { PiboRunRegistry } from "../runs/registry.js";
-import { PiboRunExecutionTimeoutError } from "../runs/lifecycle.js";
+import { PiboRunCancellationError, PiboRunCancelledError, PiboRunExecutionTimeoutError } from "../runs/lifecycle.js";
 import { PiboRunResourceLimitError } from "../runs/resource-isolation.js";
 import { createPiboSignalRegistry } from "../signals/registry.js";
 import { createDefaultPiboReliabilityStore } from "../reliability/store.js";
@@ -150,7 +150,29 @@ function formatRunReminderMessage(notification) {
     ].join("\n");
 }
 function isRunReminderServiceMessage(event) {
-    return event.source === "service" && event.capabilityScope === "run-reminder";
+    return event.source === "service" && event.text.startsWith("<pibo_run_notification>");
+}
+function yieldedRunOrigin(event) {
+    if (!event?.id || event.provenance?.kind !== "loop-run")
+        return undefined;
+    return {
+        eventId: event.provenance.rootEventId ?? event.id,
+        provenance: {
+            kind: event.provenance.kind,
+            jobId: event.provenance.jobId,
+            runId: event.provenance.runId,
+        },
+    };
+}
+function runReminderProvenance(notification) {
+    const origin = notification.origin;
+    if (!origin || origin.provenance.kind !== "loop-run")
+        return undefined;
+    return {
+        ...origin.provenance,
+        cause: "run-reminder",
+        rootEventId: origin.eventId,
+    };
 }
 function isTerminalRunStatus(status) {
     return status === "completed" || status === "failed" || status === "timed_out" || status === "cancelled";
@@ -235,7 +257,7 @@ export class PiboSessionRouter {
     portableHistoryProvider;
     runtimeResourceSessions = new Map();
     runtimeAuthFingerprints = new Map();
-    activeSubagentChildren = new Map();
+    activeSubagentRequests = new Map();
     agentObservations = [];
     agentObservationEvictedThroughByParent = new Map();
     nextAgentObservationSequence = 1;
@@ -388,11 +410,24 @@ export class PiboSessionRouter {
                 teardownCompleted = true;
                 return output;
             }
-            const childAbort = event.action === "abort"
-                ? this.abortActiveSubagentSessions(event.piboSessionId)
-                : undefined;
-            const output = await session.executeAction(event);
-            await childAbort;
+            let output;
+            if (event.action === "abort") {
+                const [sessionAbort, childAbort] = await Promise.allSettled([
+                    session.executeAction(event),
+                    this.abortActiveSubagentSessions(event.piboSessionId),
+                ]);
+                if (sessionAbort.status === "rejected" && childAbort.status === "rejected") {
+                    throw new AggregateError([sessionAbort.reason, childAbort.reason], "Failed to abort the session and its active subagent requests.");
+                }
+                if (sessionAbort.status === "rejected")
+                    throw sessionAbort.reason;
+                if (childAbort.status === "rejected")
+                    throw childAbort.reason;
+                output = sessionAbort.value;
+            }
+            else {
+                output = await session.executeAction(event);
+            }
             if (event.action === "kill" || event.action === "kill_all") {
                 await this.disposeSessionSubtree(event.piboSessionId, `${event.action} action`, { cancelRuns: event.action === "kill_all" });
                 teardownCompleted = true;
@@ -837,20 +872,10 @@ export class PiboSessionRouter {
         const eventWithId = { ...event, id: event.id ?? randomUUID() };
         return await new Promise((resolve, reject) => {
             let settled = false;
-            let messageDispatched = false;
+            let dispatchPromise;
             let lastAssistantMessage;
             let timeout;
-            const abortChild = () => {
-                if (!messageDispatched)
-                    return;
-                void this.emit({
-                    type: "execution",
-                    piboSessionId: eventWithId.piboSessionId,
-                    action: "abort",
-                    id: randomUUID(),
-                }).catch(() => { });
-            };
-            const finish = (result) => {
+            const claimSettlement = () => {
                 if (settled)
                     return false;
                 settled = true;
@@ -858,16 +883,33 @@ export class PiboSessionRouter {
                     clearTimeout(timeout);
                 signal?.removeEventListener("abort", onAbort);
                 unsubscribe();
+                return true;
+            };
+            const finish = (result) => {
+                if (!claimSettlement())
+                    return;
                 if (result instanceof Error)
                     reject(result);
                 else
                     resolve(result);
-                return true;
             };
-            const onAbort = () => {
-                if (!finish(subagentAbortError()))
+            const rejectAfterMessageCancellation = (error) => {
+                if (!claimSettlement())
                     return;
-                abortChild();
+                void (async () => {
+                    try {
+                        await dispatchPromise;
+                        await this.cancelSessionMessage(eventWithId.piboSessionId, eventWithId.id);
+                    }
+                    catch (cancellationError) {
+                        reject(new PiboRunCancellationError(`Failed to cancel subagent request "${eventWithId.id}" in Pibo session "${eventWithId.piboSessionId}".`, { cause: cancellationError }));
+                        return;
+                    }
+                    reject(error);
+                })();
+            };
+            const onAbort = () => {
+                rejectAfterMessageCancellation(subagentAbortError());
             };
             const unsubscribe = this.subscribe((output) => {
                 if (output.piboSessionId !== eventWithId.piboSessionId ||
@@ -886,20 +928,25 @@ export class PiboSessionRouter {
                 }
             });
             if (signal?.aborted) {
-                onAbort();
+                finish(subagentAbortError());
                 return;
             }
             signal?.addEventListener("abort", onAbort, { once: true });
             timeout = setTimeout(() => {
-                const timeoutError = new Error(`Timed out waiting for assistant reply from Pibo session "${eventWithId.piboSessionId}"`);
-                if (!finish(timeoutError))
-                    return;
-                abortChild();
+                rejectAfterMessageCancellation(new PiboRunExecutionTimeoutError(`Timed out waiting for assistant reply from Pibo session "${eventWithId.piboSessionId}"`, "lifetime"));
             }, timeoutMs);
-            messageDispatched = true;
-            this.emit(eventWithId).catch(finish);
+            dispatchPromise = this.emit(eventWithId);
+            dispatchPromise.catch((error) => {
+                finish(error instanceof Error ? error : new Error(String(error)));
+            });
         });
     }
+    async cancelSessionMessage(piboSessionId, eventId) {
+        const session = this.sessions.get(piboSessionId);
+        if (!session || !await session.cancelMessage(eventId)) {
+            throw new Error(`Pibo session "${piboSessionId}" no longer owns message "${eventId}".`);
+        }
+    }
     async disposeAll() {
         if (this.disposePromise)
             return this.disposePromise;
@@ -946,7 +993,7 @@ export class PiboSessionRouter {
             await this.portableToolService.dispose();
             await this.runtimeResourceService.dispose();
             this.runtimeResourceSessions.clear();
-            this.activeSubagentChildren.clear();
+            this.activeSubagentRequests.clear();
             this.agentObservations.length = 0;
             this.agentObservationEvictedThroughByParent.clear();
             await this.telemetryWriter?.dispose();
@@ -1562,44 +1609,40 @@ export class PiboSessionRouter {
         this.signalRegistry.project({ type: "session_created", session: created });
         return created;
     }
-    trackActiveSubagent(parentPiboSessionId, childPiboSessionId) {
-        let children = this.activeSubagentChildren.get(parentPiboSessionId);
-        if (!children) {
-            children = new Map();
-            this.activeSubagentChildren.set(parentPiboSessionId, children);
+    trackActiveSubagent(parentPiboSessionId, request) {
+        let requests = this.activeSubagentRequests.get(parentPiboSessionId);
+        if (!requests) {
+            requests = new Set();
+            this.activeSubagentRequests.set(parentPiboSessionId, requests);
         }
-        children.set(childPiboSessionId, (children.get(childPiboSessionId) ?? 0) + 1);
+        requests.add(request);
         let active = true;
         return () => {
             if (!active)
                 return;
             active = false;
-            const current = this.activeSubagentChildren.get(parentPiboSessionId);
+            const current = this.activeSubagentRequests.get(parentPiboSessionId);
             if (!current)
                 return;
-            const remaining = (current.get(childPiboSessionId) ?? 1) - 1;
-            if (remaining > 0)
-                current.set(childPiboSessionId, remaining);
-            else
-                current.delete(childPiboSessionId);
+            current.delete(request);
             if (current.size === 0)
-                this.activeSubagentChildren.delete(parentPiboSessionId);
+                this.activeSubagentRequests.delete(parentPiboSessionId);
         };
     }
     async abortActiveSubagentSessions(parentPiboSessionId) {
-        const childIds = [...(this.activeSubagentChildren.get(parentPiboSessionId)?.keys() ?? [])];
-        if (childIds.length === 0)
-            return;
-        await Promise.allSettled(childIds.map(async (childPiboSessionId) => await this.emit({
-            type: "execution",
-            piboSessionId: childPiboSessionId,
-            action: "abort",
-            id: randomUUID(),
-        })));
+        const requests = [...(this.activeSubagentRequests.get(parentPiboSessionId) ?? [])];
+        for (const request of requests)
+            request.abortController.abort();
+        const settlements = await Promise.all(requests.map(async (request) => await request.settled));
+        const failures = settlements.flatMap((settlement) => settlement.status === "rejected" ? [settlement.reason] : []);
+        if (failures.length > 0)
+            throw new AggregateError(failures, "Failed to cancel active subagent requests.");
     }
     createAgentsController(parentPiboSessionId) {
         return {
             sendMessage: async ({ subagent, message, threadKey, toolCallId, signal }) => {
+                if (signal?.aborted)
+                    throw subagentAbortError();
                 this.assertSubagentDepth(parentPiboSessionId, subagent);
                 const child = this.resolveSubagentSession(parentPiboSessionId, subagent, threadKey);
                 const resolvedThreadKey = typeof child.metadata?.threadKey === "string" ? child.metadata.threadKey : "";
@@ -1619,9 +1662,21 @@ export class PiboSessionRouter {
                     childPiboSessionId: child.id,
                     threadKey: resolvedThreadKey,
                 });
-                const untrack = this.trackActiveSubagent(parentPiboSessionId, child.id);
+                const parentAbortController = new AbortController();
+                const requestSignal = signal
+                    ? AbortSignal.any([signal, parentAbortController.signal])
+                    : parentAbortController.signal;
+                let resolveSettled;
+                const settled = new Promise((resolve) => {
+                    resolveSettled = resolve;
+                });
+                const untrack = this.trackActiveSubagent(parentPiboSessionId, {
+                    abortController: parentAbortController,
+                    settled,
+                });
+                let settlement = { status: "fulfilled" };
                 try {
-                    const reply = await this.emitMessageAndWaitForReply(event, subagent.timeoutMs ?? DEFAULT_SUBAGENT_REPLY_TIMEOUT_MS, signal);
+                    const reply = await this.emitMessageAndWaitForReply(event, subagent.timeoutMs ?? DEFAULT_SUBAGENT_REPLY_TIMEOUT_MS, requestSignal);
                     return {
                         agentId: child.id,
                         name: subagent.name,
@@ -1631,8 +1686,17 @@ export class PiboSessionRouter {
                         reply,
                     };
                 }
+                catch (error) {
+                    const confirmedParentCancellation = parentAbortController.signal.aborted
+                        && error instanceof Error
+                        && error.name === "AbortError";
+                    if (!confirmedParentCancellation)
+                        settlement = { status: "rejected", reason: error };
+                    throw error;
+                }
                 finally {
                     untrack();
+                    resolveSettled?.(settlement);
                 }
             },
             listAgents: () => this.listManagedAgents(parentPiboSessionId),
@@ -1767,8 +1831,9 @@ export class PiboSessionRouter {
             const cancel = this.runCancellationHandlers.get(run.runId);
             if (!cancel)
                 return;
-            this.runCancellationHandlers.delete(run.runId);
             await cancel();
+            if (this.runCancellationHandlers.get(run.runId) === cancel)
+                this.runCancellationHandlers.delete(run.runId);
         }));
         const failures = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
         if (failures.length > 0)
@@ -1796,14 +1861,32 @@ export class PiboSessionRouter {
                         timeoutMs,
                         serviceWarning,
                         resources,
+                        origin: yieldedRunOrigin(this.sessions.get(parentPiboSessionId)?.getActiveMessage?.()),
                     });
                 }
                 catch (error) {
                     admission.release();
                     throw error;
                 }
-                if (cancel)
-                    this.runCancellationHandlers.set(run.runId, cancel);
+                const cancellation = { state: "none" };
+                if (cancel) {
+                    this.runCancellationHandlers.set(run.runId, async () => {
+                        cancellation.state = "pending";
+                        let resolveDecision;
+                        cancellation.decision = new Promise((resolve) => { resolveDecision = resolve; });
+                        try {
+                            await cancel();
+                            cancellation.state = "confirmed";
+                        }
+                        catch (error) {
+                            cancellation.state = "failed";
+                            throw error;
+                        }
+                        finally {
+                            resolveDecision?.();
+                        }
+                    });
+                }
                 void (async () => {
                     try {
                         const result = await execute();
@@ -1814,6 +1897,12 @@ export class PiboSessionRouter {
                             this.handleTerminalRunReminder(parentPiboSessionId, completed.runId, reminderGeneration);
                     }
                     catch (error) {
+                        if (error instanceof PiboRunCancelledError) {
+                            if (cancellation.state === "pending")
+                                await cancellation.decision;
+                            if (cancellation.state === "confirmed")
+                                return;
+                        }
                         const message = error instanceof Error ? error.message : String(error);
                         if (resources)
                             this.runRegistry.updateResources(run.runId, resources);
@@ -1842,14 +1931,15 @@ export class PiboSessionRouter {
                 return run;
             },
             cancelRun: async (runId) => {
-                const cancelled = this.runRegistry.cancel(parentPiboSessionId, runId);
+                const current = this.runRegistry.status(parentPiboSessionId, runId);
                 try {
-                    await this.invokeRunCancellationHandlers([cancelled]);
+                    if (!isTerminalRunStatus(current.status))
+                        await this.invokeRunCancellationHandlers([current]);
+                    return this.runRegistry.cancel(parentPiboSessionId, runId);
                 }
                 finally {
                     this.refreshQueuedRunReminders(parentPiboSessionId);
                 }
-                return cancelled;
             },
             ackRun: (runId) => {
                 const run = this.runRegistry.ack(parentPiboSessionId, runId);
@@ -2067,8 +2157,8 @@ export class PiboSessionRouter {
                 piboSessionId,
                 text: formatRunReminderMessage(notification),
                 source: "service",
-                capabilityScope: "run-reminder",
                 id: randomUUID(),
+                provenance: runReminderProvenance(notification),
             });
         }
         catch (error) {

package/dist/gateway/web.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { CHAT_WEB_APP_NAME } from "../apps/chat/web-app.js";
 import { createDefaultPiboPlugins } from "../plugins/builtin.js";
 import { createPiboBetterAuthPlugin } from "../plugins/better-auth.js";
 import { createPiboChatCustomAgentProfilesPlugin } from "../plugins/chat-custom-agents.js";
@@ -144,7 +145,13 @@ export function createWebPiboPluginRegistry(options = {}) {
         plugins: [
             ...createDefaultPiboPlugins(),
             useDevAuth ? createPiboDevAuthPlugin() : createPiboBetterAuthPlugin(resolvedOptions.auth),
-            createPiboWebHostPlugin({ announce: false, canonicalBaseURL: useDevAuth ? undefined : authBaseURL(resolvedOptions), gatewayMode: webGatewayMode(resolvedOptions, useDevAuth), ...resolvedOptions.web }),
+            createPiboWebHostPlugin({
+                announce: false,
+                canonicalBaseURL: useDevAuth ? undefined : authBaseURL(resolvedOptions),
+                gatewayMode: webGatewayMode(resolvedOptions, useDevAuth),
+                ...resolvedOptions.web,
+                landingAppName: CHAT_WEB_APP_NAME,
+            }),
             createPiboCronPlugin({ cronStorePath: resolvedOptions.chat?.cronStorePath, dataStorePath: resolvedOptions.chat?.dataStorePath, dataPayloadRootDir: resolvedOptions.chat?.dataPayloadRootDir }),
             createPiboChatUserSkillsPlugin({
                 globalRoot: resolvedOptions.chat?.userSkillGlobalRoot,

package/dist/loops/accounting.js CHANGED Viewed

@@ -1,3 +1,30 @@
+export const LOOP_TOKEN_ACCOUNTING_VERSION = 1;
+function normalizedTokenCount(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
+}
+export function normalizeLoopTokenAccounting(value, fallback = 'total') {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+        const candidate = value;
+        if (candidate.version === LOOP_TOKEN_ACCOUNTING_VERSION && (candidate.basis === 'total' || candidate.basis === 'uncached')) {
+            return { version: LOOP_TOKEN_ACCOUNTING_VERSION, basis: candidate.basis };
+        }
+    }
+    return { version: LOOP_TOKEN_ACCOUNTING_VERSION, basis: fallback };
+}
+export function newGoalTokenAccounting() {
+    return { version: LOOP_TOKEN_ACCOUNTING_VERSION, basis: 'uncached' };
+}
+export function goalTokenAccounting(job) {
+    return normalizeLoopTokenAccounting(job.state.tokenAccounting);
+}
+export function goalBudgetTokens(usage, basis) {
+    const totalTokens = normalizedTokenCount(usage.totalTokens);
+    if (basis === 'total')
+        return totalTokens;
+    const cacheReadTokens = normalizedTokenCount(usage.cacheReadTokens);
+    const cacheWriteTokens = normalizedTokenCount(usage.cacheWriteTokens);
+    return Math.max(0, totalTokens - cacheReadTokens - cacheWriteTokens);
+}
 export function goalActiveTimeSeconds(job) {
     return Math.max(0, Math.floor(job.state.activeTimeSeconds ?? job.state.timeUsedSeconds ?? 0));
 }

package/dist/loops/cli.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { Command } from 'commander';
-import { goalActiveTimeSeconds, goalElapsedWallClockSeconds } from './accounting.js';
+import { goalActiveTimeSeconds, goalElapsedWallClockSeconds, goalTokenAccounting } from './accounting.js';
 import { createDefaultPiboLoopStore } from './store.js';
 import { createBuiltInLoopStopConditions } from './stopping.js';
 import { DEFAULT_PIBO_PROFILE_NAME } from '../plugins/builtin.js';
@@ -116,12 +116,13 @@ export function formatLoopResourceSummary(resources) {
 }
 function formatLoopJobLine(job) {
     const goal = job.mode === 'goal' ? job.state.goalStatus ?? (job.enabled ? 'active' : 'paused') : '-';
-    const budget = job.mode === 'goal' ? job.tokenBudget === undefined ? 'unbounded' : `soft:${job.state.tokensUsed ?? 0}/${job.tokenBudget};reserve=${job.tokenReserve ?? 0}` : '-';
+    const tokenBasis = job.mode === 'goal' ? goalTokenAccounting(job).basis : undefined;
+    const budget = job.mode === 'goal' ? job.tokenBudget === undefined ? `unbounded:${tokenBasis}` : `soft:${tokenBasis}:${job.state.tokensUsed ?? 0}/${job.tokenBudget};reserve=${job.tokenReserve ?? 0}` : '-';
     const time = job.mode === 'goal' ? `activeAgent=${goalActiveTimeSeconds(job)}s;elapsedWall=${goalElapsedWallClockSeconds(job)}s;paused=included` : '-';
     return `${job.id}\t${job.mode}\t${job.enabled ? 'running' : 'stopped'}\t${job.state.runningAt ? 'active' : '-'}\tgoal=${goal}\tbudget=${budget}\ttime=${time}\tresources=${formatLoopResourceSummary(job.resources)}\t${job.name}`;
 }
 function formatLoopRunLine(run) {
-    const accounting = run.accounting ? `tokens=${run.accounting.tokensUsed ?? 0};remainingBefore=${run.accounting.remainingTokensBefore ?? 'unbounded'};overshoot=${run.accounting.overshootTokens ?? 0};activeAgent=${run.accounting.activeTimeSeconds ?? 0}s` : '-';
+    const accounting = run.accounting ? `basis=${run.accounting.tokenAccounting?.basis ?? 'total'};tokens=${run.accounting.tokensUsed ?? 0};remainingBefore=${run.accounting.remainingTokensBefore ?? 'unbounded'};overshoot=${run.accounting.overshootTokens ?? 0};activeAgent=${run.accounting.activeTimeSeconds ?? 0}s` : '-';
     return `${run.id}\t${run.jobId}\t${run.status}\t${run.piboSessionId ?? '-'}\t${run.completedAt ?? '-'}\taccounting=${accounting}\tresources=${formatLoopResourceSummary(run.resources)}`;
 }
 export async function runLoopCli(argv = process.argv, defaults = {}) {
@@ -139,13 +140,13 @@ export async function runLoopCli(argv = process.argv, defaults = {}) {
     else
         for (const job of jobs)
             console.log(formatLoopJobLine(job)); store.close(); });
-    program.command('add').description(defaults.mode === 'ralph' ? 'Create a Ralph job' : 'Create a Loop job').option('--template <id>', 'Built-in job template id').option('--mode <mode>', 'Loop mode: goal or ralph').option('--prompt <text>', 'Task prompt').option('--name <name>', 'Job name').option('--description <text>', 'Job description').option('--profile <profile>', 'Agent profile', DEFAULT_PIBO_PROFILE_NAME).option('--room <room-id>', 'Target room id').option('--default-chat', 'Target the shared default chat').option('--max-iterations <n>', 'Stop after n completed run attempts').option('--token-budget <n>', 'Set a soft Goal token budget; the final turn can overshoot').option('--token-reserve <n>', 'Require more than n tokens to remain before starting another Goal turn').option('--model <provider/model>', 'Runtime model override, for example openai/gpt-5').option('--thinking <level>', 'Runtime thinking level override: off, minimal, low, medium, high, xhigh, max').option('--fast', 'Enable runtime fast mode').option('--no-fast', 'Disable runtime fast mode')
+    program.command('add').description(defaults.mode === 'ralph' ? 'Create a Ralph job' : 'Create a Loop job').option('--template <id>', 'Built-in job template id').option('--mode <mode>', 'Loop mode: goal or ralph').option('--prompt <text>', 'Task prompt').option('--name <name>', 'Job name').option('--description <text>', 'Job description').option('--profile <profile>', 'Agent profile', DEFAULT_PIBO_PROFILE_NAME).option('--room <room-id>', 'Target room id').option('--default-chat', 'Target the shared default chat').option('--max-iterations <n>', 'Stop after n completed run attempts').option('--token-budget <n>', 'Set a soft Goal token budget; new Goals use uncached accounting and the final turn can overshoot').option('--token-reserve <n>', 'Require more than n tokens under the Goal accounting basis before starting another turn').option('--model <provider/model>', 'Runtime model override, for example openai/gpt-5').option('--thinking <level>', 'Runtime thinking level override: off, minimal, low, medium, high, xhigh, max').option('--fast', 'Enable runtime fast mode').option('--no-fast', 'Disable runtime fast mode')
         .option('--start', 'Start immediately').option('--json', 'Print JSON').action((options) => { const base = templatePatch(options.template); const prompt = options.prompt ?? base.prompt; if (typeof prompt !== 'string' || !prompt.trim())
         throw new Error('Choose --template <id> or provide --prompt <text>'); const input = { mode: loopMode(options.mode) ?? base.mode ?? defaults.mode ?? 'goal', name: options.name ?? base.name, description: options.description ?? base.description, enabled: options.start === true, target: targetFromOptions(options), profile: options.profile, prompt, maxIterations: options.maxIterations !== undefined ? maxIterations(options.maxIterations) : typeof base.maxIterations === 'number' ? base.maxIterations : undefined, tokenBudget: tokenBudget(options.tokenBudget), tokenReserve: tokenReserve(options.tokenReserve), stopPolicy: base.stopPolicy ?? undefined }; applyRuntimeCreateOptions(input, options); const store = createDefaultPiboLoopStore({ path: program.opts().store }); const job = store.createJob(input); if (options.json)
         printJson(job);
     else
         console.log(`${job.id}\t${job.enabled ? 'running' : 'stopped'}\t${job.name}`); store.close(); });
-    program.command('edit').argument('<id>', defaults.mode === 'ralph' ? 'Ralph job id' : 'Loop job id').description(defaults.mode === 'ralph' ? 'Update a Ralph job' : 'Update a Loop job').option('--template <id>', 'Apply a built-in job template before explicit overrides').option('--mode <mode>', 'Set loop mode: goal or ralph').option('--prompt <text>', 'Task prompt').option('--name <name>', 'Job name').option('--description <text>', 'Job description').option('--profile <profile>', 'Agent profile').option('--room <room-id>', 'Target room id').option('--default-chat', 'Target the shared default chat').option('--max-iterations <n>', 'Stop after n completed run attempts').option('--token-budget <n>', 'Set soft Goal token budget').option('--clear-token-budget', 'Clear Goal token budget').option('--token-reserve <n>', 'Set pre-turn minimum remaining tokens').option('--clear-token-reserve', 'Clear Goal token reserve').option('--model <provider/model>', 'Set runtime model override, for example openai/gpt-5').option('--clear-model', 'Clear runtime model override').option('--thinking <level>', 'Set runtime thinking level override: off, minimal, low, medium, high, xhigh, max').option('--clear-thinking', 'Clear runtime thinking level override').option('--fast', 'Enable runtime fast mode').option('--no-fast', 'Disable runtime fast mode').option('--clear-fast', 'Clear runtime fast mode override').option('--json', 'Print JSON').action((id, options) => { const store = createDefaultPiboLoopStore({ path: program.opts().store }); const patch = { ...templatePatch(options.template) }; if (options.mode !== undefined)
+    program.command('edit').argument('<id>', defaults.mode === 'ralph' ? 'Ralph job id' : 'Loop job id').description(defaults.mode === 'ralph' ? 'Update a Ralph job' : 'Update a Loop job').option('--template <id>', 'Apply a built-in job template before explicit overrides').option('--mode <mode>', 'Set loop mode: goal or ralph').option('--prompt <text>', 'Task prompt').option('--name <name>', 'Job name').option('--description <text>', 'Job description').option('--profile <profile>', 'Agent profile').option('--room <room-id>', 'Target room id').option('--default-chat', 'Target the shared default chat').option('--max-iterations <n>', 'Stop after n completed run attempts').option('--token-budget <n>', "Set the soft Goal token budget under the job's persisted accounting basis").option('--clear-token-budget', 'Clear Goal token budget').option('--token-reserve <n>', "Set the pre-turn minimum remaining tokens under the job's persisted accounting basis").option('--clear-token-reserve', 'Clear Goal token reserve').option('--model <provider/model>', 'Set runtime model override, for example openai/gpt-5').option('--clear-model', 'Clear runtime model override').option('--thinking <level>', 'Set runtime thinking level override: off, minimal, low, medium, high, xhigh, max').option('--clear-thinking', 'Clear runtime thinking level override').option('--fast', 'Enable runtime fast mode').option('--no-fast', 'Disable runtime fast mode').option('--clear-fast', 'Clear runtime fast mode override').option('--json', 'Print JSON').action((id, options) => { const store = createDefaultPiboLoopStore({ path: program.opts().store }); const patch = { ...templatePatch(options.template) }; if (options.mode !== undefined)
         patch.mode = loopMode(options.mode); if (options.name !== undefined)
         patch.name = options.name; if (options.description !== undefined)
         patch.description = options.description; if (options.profile !== undefined)

package/dist/loops/prompts.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { goalTokenAccounting } from './accounting.js';
 const completionMarkerInstruction = 'When and only when the full objective is proven complete, end with the XML completion marker on its own line. Compose it from the opening tag <promise>, the word COMPLETE, and the closing tag </promise>. Do not quote, negate, explain, or mention the literal marker before completion.';
 export function buildLoopTurnPrompt(job, continuation, goalToolsAvailable = true) {
     if (job.mode === 'ralph')
@@ -22,6 +23,11 @@ function buildGoalTurnPrompt(job, continuation, goalToolsAvailable) {
     const tokenBudget = job.tokenBudget;
     const remainingTokens = tokenBudget === undefined ? 'unbounded' : String(Math.max(0, tokenBudget - tokensUsed));
     const tokenReserve = job.tokenReserve ?? 0;
+    const tokenAccounting = goalTokenAccounting(job);
+    const tokenBasis = tokenAccounting.basis === 'uncached' ? 'uncached' : 'total';
+    const accountingPolicy = tokenAccounting.basis === 'uncached'
+        ? '- Cache-read and cache-write tokens do not consume the budget.'
+        : '- Legacy compatibility: cache-read and cache-write tokens remain included because prior persisted counters cannot be reconstructed safely.';
     return [
         continuation ? 'Continue working toward the active Pibo loop goal.' : 'Start working toward the active Pibo loop goal.',
         '',
@@ -37,11 +43,13 @@ function buildGoalTurnPrompt(job, continuation, goalToolsAvailable) {
         '- Temporary rough edges are acceptable while work moves toward the requested end state. Completion still requires the requested end state to be true and verified.',
         '',
         'Budget:',
-        '- Budget enforcement: soft; model usage is reported after a response and the current turn can overshoot the limit.',
-        `- Reported tokens used before this turn: ${tokensUsed}`,
-        `- Soft token budget: ${tokenBudget ?? 'none'}`,
-        `- Pre-turn token reserve: ${tokenReserve}`,
-        `- Reported tokens remaining before this turn: ${remainingTokens}`,
+        `- Accounting basis: ${tokenBasis} tokens (version ${tokenAccounting.version}).`,
+        `- Budget enforcement: soft; ${tokenBasis} model usage is reported after a response and the current turn can overshoot the limit.`,
+        accountingPolicy,
+        `- Reported ${tokenBasis} tokens used before this turn: ${tokensUsed}`,
+        `- Soft ${tokenBasis} token budget: ${tokenBudget ?? 'none'}`,
+        `- Pre-turn ${tokenBasis} token reserve: ${tokenReserve}`,
+        `- Reported ${tokenBasis} tokens remaining before this turn: ${remainingTokens}`,
         '',
         'Work from evidence:',
         'Use the current workspace, repository, runtime, and external state as authoritative. Previous conversation context can help locate relevant work, but inspect current state before relying on it. Improve, replace, or remove existing work as needed to satisfy the actual objective.',

package/dist/loops/service.js CHANGED Viewed

@@ -6,6 +6,7 @@ import { PiboDataStore } from '../data/pibo-store.js';
 import { ChatRoomService } from '../apps/chat/data/room-service.js';
 import { isPiboRoomArchived } from '../apps/chat/types/rooms.js';
 import { acquireBrowserPoolLease, browserPoolPaths, releaseBrowserPoolLease, restartRecordedBrowserPoolChrome } from '../tools/browser-pool.js';
+import { goalBudgetTokens, goalTokenAccounting } from './accounting.js';
 import { createDefaultPiboLoopStore } from './store.js';
 import { createBuiltInLoopStopConditions, evaluateLoopStopPolicy } from './stopping.js';
 import { buildLoopTurnPrompt } from './prompts.js';
@@ -530,13 +531,18 @@ export class PiboLoopService {
             this.store.updateRunMessageState(eventId, 'invalidated');
         if (event.type !== 'assistant_usage')
             return;
-        const run = this.store.getRunByMessageEventId(eventId);
+        const provenance = event.provenance?.kind === 'loop-run' ? event.provenance : undefined;
+        const run = this.store.getRunByMessageEventId(eventId) ?? (provenance ? this.store.getRun(provenance.runId) : undefined);
         if (!run || run.piboSessionId !== event.piboSessionId)
             return;
+        if (provenance && (run.jobId !== provenance.jobId
+            || (provenance.cause === 'run-reminder' && run.messageEventId !== provenance.rootEventId)))
+            return;
         const job = this.store.getJob(run.jobId);
         if (!job || job.mode !== 'goal')
             return;
-        this.store.recordGoalTurnUsage(job.id, run.id, event.totalTokens);
+        const basis = run.accounting?.tokenAccounting?.basis ?? goalTokenAccounting(job).basis;
+        this.store.recordGoalTurnUsage(job.id, run.id, goalBudgetTokens(event, basis));
     }
     handleProductEvent(event) {
         if (event.type !== 'pibo.loop.fact' && event.type !== 'loop.fact' && event.type !== 'pibo.ralph.fact' && event.type !== 'ralph.fact')