@pasko70/pibo 1.10.0 → 1.11.0

package/dist/debug/trace-status.js

@@ -0,0 +1,25 @@
+export function resolveDebugTraceSessionStatus(sessionStatus, eventTypes) {
+    for (let index = eventTypes.length - 1; index >= 0; index -= 1) {
+        switch (eventTypes[index]) {
+            case "session_error":
+                return { status: "error", source: "event-log" };
+            case "message_started":
+                return { status: "running", source: "event-log" };
+            case "message_finished":
+                return { status: "idle", source: "event-log" };
+        }
+    }
+    return {
+        status: sessionStatus === "running" || sessionStatus === "error" ? sessionStatus : "idle",
+        source: "session-store",
+    };
+}
+export function summarizeDebugTraceStatus(sessionStatus, nodeStatuses) {
+    const errorNodeCount = nodeStatuses.filter((status) => status === "error").length;
+    if (sessionStatus === "error")
+        return { status: "error", errorNodeCount };
+    if (sessionStatus === "running" || nodeStatuses.some((status) => status === "running")) {
+        return { status: "running", errorNodeCount };
+    }
+    return { status: "done", errorNodeCount };
+}

package/dist/debug/trace.js

@@ -1,8 +1,9 @@
 import { buildTraceView } from "../apps/chat/trace.js";
 import { normalizeSessionErrorDetails } from "../core/session-errors.js";
-import { compareTraceOrder } from "../shared/trace-order.js";
+import { compareTraceNodes } from "../shared/trace-nodes.js";
 import { openReadOnlyDebugDatabase, withStorePath } from "./sql.js";
 import { formatNextCommands } from "./next-commands.js";
+import { resolveDebugTraceSessionStatus, summarizeDebugTraceStatus } from "./trace-status.js";
 export async function inspectDebugTrace(piboSessionId, stores, options = {}) {
     if (!stores.sessions.exists)
         throw new Error(`Debug store "sessions" not found at ${stores.sessions.path}`);
@@ -16,27 +17,32 @@ export async function inspectDebugTrace(piboSessionId, stores, options = {}) {
             throw new Error(`Pibo session "${piboSessionId}" not found`);
         const session = sessionFromRow(sessionRow);
         const sessions = sessionsDb.prepare("SELECT * FROM sessions").all().map(sessionFromRow);
+        const adapterIssues = [];
         const events = tableExists(chatDb, "event_log")
             ? chatDb
                 .prepare("SELECT stream_id, session_id, session_sequence, event_id, type, created_at, preview_text, attributes_json FROM event_log WHERE session_id = ? ORDER BY stream_id ASC")
-                .all(piboSessionId).map(eventFromRow).filter((event) => event !== undefined)
+                .all(piboSessionId).map((row) => eventFromRow(row, adapterIssues)).filter((event) => event !== undefined)
             : [];
+        const sessionStatus = resolveDebugTraceSessionStatus(sessionRow.status, events.map((event) => event.type));
         const view = await buildTraceView({
             session,
             sessions,
             events,
-            status: sessionRow.status === "running" || sessionRow.status === "error" ? sessionRow.status : "idle",
+            status: sessionStatus.status,
         });
         const rows = flattenTraceNodes(view.nodes);
+        const statusSummary = summarizeDebugTraceStatus(sessionStatus.status, rows.map((node) => node.status));
         const filtered = options.runningOnly ? rows.filter((node) => node.status === "running") : rows;
         return {
             piboSessionId: view.piboSessionId,
             piSessionId: view.piSessionId,
             title: view.title,
-            status: traceStatus(view),
+            status: statusSummary.status,
+            statusSource: sessionStatus.source,
+            errorNodeCount: statusSummary.errorNodeCount,
             nodes: filtered,
             rawNodeCount: rows.length,
-            ...(options.check ? { checks: checkTraceView(view) } : {}),
+            ...(options.check ? { checks: checkTraceView(view, adapterIssues) } : {}),
             nextCommands: buildTraceNextCommands(view.piboSessionId, filtered),
         };
     }
@@ -68,6 +74,8 @@ export function formatDebugTrace(result, options = {}) {
         `piSessionId: ${result.piSessionId}`,
         `title: ${result.title}`,
         `status: ${result.status}`,
+        `statusSource: ${result.statusSource}`,
+        `nodeErrors: ${result.errorNodeCount}`,
         "",
     ];
     if (result.nodes.length === 0) {
@@ -160,18 +168,11 @@ function flattenTraceNodes(nodes, depth = 0) {
         ...flattenTraceNodes(node.children, depth + 1),
     ]);
 }
-function traceStatus(view) {
-    const rows = flattenTraceNodes(view.nodes);
-    if (rows.some((node) => node.status === "error"))
-        return "error";
-    if (rows.some((node) => node.status === "running"))
-        return "running";
-    return "done";
-}
-function checkTraceView(view) {
-    const issues = [];
+export function checkTraceView(view, adapterIssues = []) {
+    const issues = [...adapterIssues];
     const all = flattenPiboTraceNodes(view.nodes);
     const ids = new Set();
+    const stableKeyOwners = new Map();
     for (const node of all) {
         if (ids.has(node.id)) {
             issues.push({
@@ -206,6 +207,20 @@ function checkTraceView(view) {
                 message: "Trace node has no conceptual stable key.",
             });
         }
+        else {
+            const existingOwner = stableKeyOwners.get(node.stableKey);
+            if (existingOwner && existingOwner !== node.id) {
+                issues.push({
+                    severity: "warning",
+                    code: "duplicate_stable_key",
+                    nodeId: node.id,
+                    message: `Stable key "${node.stableKey}" is already used by node "${existingOwner}".`,
+                });
+            }
+            else {
+                stableKeyOwners.set(node.stableKey, node.id);
+            }
+        }
     }
     for (const node of all) {
         if (node.parentId && !ids.has(node.parentId)) {
@@ -235,7 +250,7 @@ function checkSiblingOrder(nodes, issues) {
         checkSiblingOrder(node.children, issues);
 }
 function compareOrder(left, right) {
-    return compareTraceOrder(left.orderKey, right.orderKey) || left.id.localeCompare(right.id);
+    return compareTraceNodes(left, right);
 }
 function flattenPiboTraceNodes(nodes) {
     return nodes.flatMap((node) => [node, ...flattenPiboTraceNodes(node.children)]);
@@ -288,10 +303,18 @@ function sessionFromRow(row) {
         updatedAt: row.updated_at,
     };
 }
-function eventFromRow(row) {
+function eventFromRow(row, issues) {
     const payload = outputPayloadFromV2Row(row);
     if (!payload)
         return undefined;
+    if ((row.type === "assistant_delta" || row.type === "thinking_delta") && !nonEmptyEventText(payload)) {
+        issues.push({
+            severity: "warning",
+            code: "missing_delta_text",
+            nodeId: row.event_id ?? String(row.stream_id),
+            message: `Persisted ${row.type} event has no readable text payload.`,
+        });
+    }
     return {
         id: String(row.stream_id),
         piboSessionId: row.session_id ?? undefined,
@@ -315,12 +338,16 @@ function outputPayloadFromV2Row(row) {
     const base = { piboSessionId, eventId: row.event_id ?? undefined };
     if (row.type === "assistant_message")
         return compactObject({ ...base, type: "assistant_message", text: row.preview_text ?? "" });
+    if (row.type === "assistant_delta")
+        return compactObject({ ...base, type: "assistant_delta", text: inlineTextPayload(inlinePayload) ?? row.preview_text ?? "" });
     if (row.type === "message_started")
         return compactObject({ ...base, type: "message_started", text: row.preview_text ?? "" });
     if (row.type === "message_finished")
         return compactObject({ ...base, type: "message_finished" });
     if (row.type === "thinking_started")
         return compactObject({ ...base, type: "thinking_started" });
+    if (row.type === "thinking_delta")
+        return compactObject({ ...base, type: "thinking_delta", text: inlineTextPayload(inlinePayload) ?? row.preview_text ?? "" });
     if (row.type === "thinking_finished")
         return compactObject({ ...base, type: "thinking_finished", text: row.preview_text ?? "" });
     if (row.type === "tool_call")
@@ -337,6 +364,13 @@ function outputPayloadFromV2Row(row) {
     }
     return compactObject({ ...base, type: row.type });
 }
+function inlineTextPayload(value) {
+    return typeof value === "string" ? value : undefined;
+}
+function nonEmptyEventText(event) {
+    const text = event.text;
+    return typeof text === "string" && text.length > 0;
+}
 function stringAttribute(attributes, key) {
     const value = attributes[key];
     return typeof value === "string" ? value : undefined;

package/dist/index.js

@@ -19,6 +19,7 @@ export { LOCAL_TUI_CHANNEL_NAME, LocalRoutedTuiClient, createLocalRoutedTuiClien
 export { createWebHostChannel, DEFAULT_WEB_CHANNEL_HOST, DEFAULT_WEB_CHANNEL_PORT, WEB_CHANNEL_NAME } from "./web/channel.js";
 export { sendGatewayEvent, sendGatewayMessageAndWaitForReply } from "./gateway/request.js";
 export { createSubagentToolDefinitions, createSubagentToolName, } from "./subagents/tool.js";
+export { PiboSteeringUnavailableError } from "./core/events.js";
 export { InMemoryPiboSessionStore, createPiSessionId, createPiboSessionId, createPiboSession, } from "./sessions/store.js";
 export { runPiboCli } from "./cli.js";
 export { DEFAULT_PIBO_CONFIG_PATH, PIBO_CONFIG_KEYS, deletePiboConfigValue, getDefaultPiboConfigPath, getDisplayPiboConfigValue, getPiboConfigValue, isPiboConfigKeySecret, loadPiboConfig, redactPiboConfig, savePiboConfig, setPiboConfigValue, } from "./config/config.js";

package/dist/loops/accounting.js

@@ -0,0 +1,19 @@
+export function goalActiveTimeSeconds(job) {
+    return Math.max(0, Math.floor(job.state.activeTimeSeconds ?? job.state.timeUsedSeconds ?? 0));
+}
+export function goalElapsedWallClockSeconds(job, now = new Date()) {
+    if (job.mode !== 'goal' || !job.state.goalStartedAt)
+        return 0;
+    const startedAt = Date.parse(job.state.goalStartedAt);
+    const endedAt = job.state.goalEndedAt ? Date.parse(job.state.goalEndedAt) : now.getTime();
+    if (!Number.isFinite(startedAt) || !Number.isFinite(endedAt))
+        return 0;
+    return Math.max(0, Math.floor((endedAt - startedAt) / 1000));
+}
+export function goalRemainingTokens(job) {
+    return job.tokenBudget === undefined ? undefined : Math.max(0, job.tokenBudget - (job.state.tokensUsed ?? 0));
+}
+export function goalCanStartNextTurn(job) {
+    const remaining = goalRemainingTokens(job);
+    return remaining === undefined || remaining > (job.tokenReserve ?? 0);
+}

package/dist/loops/cli.js

@@ -1,5 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { Command } from 'commander';
+import { goalActiveTimeSeconds, goalElapsedWallClockSeconds } from './accounting.js';
 import { createDefaultPiboLoopStore } from './store.js';
 import { createBuiltInLoopStopConditions } from './stopping.js';
 import { DEFAULT_PIBO_PROFILE_NAME } from '../plugins/builtin.js';
@@ -38,6 +39,9 @@ function maxIterations(value) { if (value === undefined)
 function tokenBudget(value) { if (value === undefined)
     return undefined; const parsed = Number(value); if (!Number.isInteger(parsed) || parsed < 1)
     throw new Error('--token-budget must be a positive integer'); return parsed; }
+function tokenReserve(value) { if (value === undefined)
+    return undefined; const parsed = Number(value); if (!Number.isInteger(parsed) || parsed < 0)
+    throw new Error('--token-reserve must be a non-negative integer'); return parsed; }
 function loopMode(value) { if (value === undefined)
     return undefined; if (value !== 'goal' && value !== 'ralph')
     throw new Error('--mode must be goal or ralph'); return value; }
@@ -110,8 +114,16 @@ export function formatLoopResourceSummary(resources) {
         parts.push('next=pibo compute reap --dry-run --include-dev');
     return parts.length ? parts.join(';') : '-';
 }
-function formatLoopJobLine(job) { const goal = job.mode === 'goal' ? job.state.goalStatus ?? (job.enabled ? 'active' : 'paused') : '-'; const tokens = job.mode === 'goal' ? `${job.state.tokensUsed ?? 0}/${job.tokenBudget ?? 'unbounded'}` : '-'; return `${job.id}\t${job.mode}\t${job.enabled ? 'running' : 'stopped'}\t${job.state.runningAt ? 'active' : '-'}\tgoal=${goal}\ttokens=${tokens}\tresources=${formatLoopResourceSummary(job.resources)}\t${job.name}`; }
-function formatLoopRunLine(run) { return `${run.id}\t${run.jobId}\t${run.status}\t${run.piboSessionId ?? '-'}\t${run.completedAt ?? '-'}\tresources=${formatLoopResourceSummary(run.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 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` : '-';
+    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 = {}) {
     const program = new Command();
     program.name(defaults.commandName ?? 'pibo loop').description('Manage continuous Pibo loops').helpOption('-h, --help');
@@ -127,13 +139,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>', 'Stop a Goal loop after reported model usage reaches n tokens').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; 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')
         .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), stopPolicy: base.stopPolicy ?? undefined }; applyRuntimeCreateOptions(input, options); const store = createDefaultPiboLoopStore({ path: program.opts().store }); const job = store.createJob(input); if (options.json)
+        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 Goal token budget').option('--clear-token-budget', 'Clear Goal token budget').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 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)
         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)
@@ -143,7 +155,11 @@ export async function runLoopCli(argv = process.argv, defaults = {}) {
         throw new Error('Choose either --token-budget or --clear-token-budget, not both'); if (options.clearTokenBudget)
         patch.tokenBudget = null;
     else if (options.tokenBudget !== undefined)
-        patch.tokenBudget = tokenBudget(options.tokenBudget); applyRuntimePatchOptions(patch, options); const target = maybeTargetFromOptions(options); if (target)
+        patch.tokenBudget = tokenBudget(options.tokenBudget); if (options.tokenReserve !== undefined && options.clearTokenReserve)
+        throw new Error('Choose either --token-reserve or --clear-token-reserve, not both'); if (options.clearTokenReserve)
+        patch.tokenReserve = null;
+    else if (options.tokenReserve !== undefined)
+        patch.tokenReserve = tokenReserve(options.tokenReserve); applyRuntimePatchOptions(patch, options); const target = maybeTargetFromOptions(options); if (target)
         patch.target = target; if (Object.keys(patch).length === 0)
         throw new Error('No Loop job update fields provided'); const job = store.updateJob(id, patch); if (!job)
         throw new Error('Loop job not found'); if (options.json)

package/dist/loops/prompts.js

@@ -21,6 +21,7 @@ function buildGoalTurnPrompt(job, continuation, goalToolsAvailable) {
     const tokensUsed = job.state.tokensUsed ?? 0;
     const tokenBudget = job.tokenBudget;
     const remainingTokens = tokenBudget === undefined ? 'unbounded' : String(Math.max(0, tokenBudget - tokensUsed));
+    const tokenReserve = job.tokenReserve ?? 0;
     return [
         continuation ? 'Continue working toward the active Pibo loop goal.' : 'Start working toward the active Pibo loop goal.',
         '',
@@ -36,8 +37,10 @@ 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}`,
-        `- Token budget: ${tokenBudget ?? 'none'}`,
+        `- Soft token budget: ${tokenBudget ?? 'none'}`,
+        `- Pre-turn token reserve: ${tokenReserve}`,
         `- Reported tokens remaining before this turn: ${remainingTokens}`,
         '',
         'Work from evidence:',

package/dist/loops/service.js

@@ -5,7 +5,7 @@ import { getDefaultPiboWorkspace } from '../core/workspace.js';
 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 { browserPoolPaths, releaseBrowserPoolLease } from '../tools/browser-pool.js';
+import { acquireBrowserPoolLease, browserPoolPaths, releaseBrowserPoolLease, restartRecordedBrowserPoolChrome } from '../tools/browser-pool.js';
 import { createDefaultPiboLoopStore } from './store.js';
 import { createBuiltInLoopStopConditions, evaluateLoopStopPolicy } from './stopping.js';
 import { buildLoopTurnPrompt } from './prompts.js';
@@ -48,6 +48,8 @@ export class PiboLoopService {
     activeRuns = 0;
     stopped = true;
     cancelledRuns = new Set();
+    browserLeaseHeartbeatTimers = new Map();
+    browserLeaseHeartbeatWork = new Map();
     unsubscribeProductEvents;
     unsubscribeOutputEvents;
     constructor(options) {
@@ -62,7 +64,8 @@ export class PiboLoopService {
     start() { if (!this.stopped)
         return; this.stopped = false; this.store.recoverInterruptedRuns(); this.unsubscribeProductEvents = this.options.context.subscribeProductEvents?.((event) => this.handleProductEvent(event)); this.unsubscribeOutputEvents = this.options.context.subscribe((event) => this.handleOutputEvent(event)); this.arm(250); }
     stop() { this.stopped = true; if (this.timer)
-        clearTimeout(this.timer); this.timer = undefined; this.unsubscribeProductEvents?.(); this.unsubscribeProductEvents = undefined; this.unsubscribeOutputEvents?.(); this.unsubscribeOutputEvents = undefined; this.dataStore.close(); this.store.close(); }
+        clearTimeout(this.timer); this.timer = undefined; for (const timer of this.browserLeaseHeartbeatTimers.values())
+        clearInterval(timer); this.browserLeaseHeartbeatTimers.clear(); this.unsubscribeProductEvents?.(); this.unsubscribeProductEvents = undefined; this.unsubscribeOutputEvents?.(); this.unsubscribeOutputEvents = undefined; this.dataStore.close(); this.store.close(); }
     status() { return { enabled: !this.stopped, ...this.store.status() }; }
     async startJob(id) { const job = this.store.updateJob(id, { enabled: true }); if (!job)
         return undefined; const reserved = await this.reserveAfterBeforeRunEvaluation(job); if (!reserved)
@@ -109,7 +112,70 @@ export class PiboLoopService {
             return undefined;
         }
         this.store.applyStopEvaluation({ jobId: fresh.id, evaluation, conditionStates, disable: false });
-        return this.store.reserveRun(fresh.id);
+        if (fresh.mode === 'goal' && !await this.renewGoalBrowserLeases(fresh))
+            return undefined;
+        const reserved = this.store.reserveRun(fresh.id);
+        if (reserved)
+            this.startGoalBrowserLeaseHeartbeat(reserved.job, reserved.run);
+        return reserved;
+    }
+    startGoalBrowserLeaseHeartbeat(job, run) {
+        if (job.mode !== 'goal' || (job.resources?.browserLeaseIds?.length ?? 0) === 0)
+            return;
+        const renew = () => {
+            if (this.browserLeaseHeartbeatWork.has(run.id))
+                return;
+            const work = this.renewGoalBrowserLeases(this.store.getJob(job.id) ?? job, run).finally(() => { this.browserLeaseHeartbeatWork.delete(run.id); });
+            this.browserLeaseHeartbeatWork.set(run.id, work);
+        };
+        const timer = setInterval(renew, Math.max(10, this.options.resourceCleanup?.browserLeaseRenewIntervalMs ?? 5 * 60_000));
+        this.browserLeaseHeartbeatTimers.set(run.id, timer);
+    }
+    async stopGoalBrowserLeaseHeartbeat(runId) {
+        const timer = this.browserLeaseHeartbeatTimers.get(runId);
+        if (timer)
+            clearInterval(timer);
+        this.browserLeaseHeartbeatTimers.delete(runId);
+        await this.browserLeaseHeartbeatWork.get(runId);
+    }
+    async renewGoalBrowserLeases(job, run) {
+        const resources = mergeRunResources(job.resources, run?.resources);
+        const leaseIds = resources?.browserLeaseIds ?? [];
+        if (!resources || leaseIds.length === 0)
+            return true;
+        const workerId = resources.workerId || process.env.PIBO_BROWSER_POOL_WORKER_ID || process.env.PIBO_COMPUTE_WORKER_ID || process.env.HOSTNAME || 'local';
+        const poolId = this.options.resourceCleanup?.browserPoolId || process.env.PIBO_BROWSER_POOL_ID || 'default';
+        const rootDir = this.options.resourceCleanup?.browserPoolRootDir || process.env.PIBO_BROWSER_POOL_ROOT || join(process.env.BROWSER_USE_HOME || join(homedir(), '.browser-use'), 'pibo-browser-pool');
+        const identity = { workerId, poolId };
+        const paths = browserPoolPaths(rootDir, identity);
+        const acquire = this.options.resourceCleanup?.acquireBrowserPoolLease ?? acquireBrowserPoolLease;
+        let retainedUntil;
+        for (const leaseId of leaseIds) {
+            try {
+                const result = await acquire(paths, identity, {
+                    leaseId,
+                    holder: run ? `loop:${job.id}:run:${run.id}` : `loop:${job.id}`,
+                    idleTimeoutMs: this.options.resourceCleanup?.browserLeaseIdleTimeoutMs,
+                    startBrowser: restartRecordedBrowserPoolChrome,
+                    lockOptions: { holder: run ? `loop:${job.id}:run:${run.id}` : `loop:${job.id}` },
+                });
+                if (!result.acquired)
+                    throw new Error(result.staleReason);
+                retainedUntil = result.state.idleExpiresAt ?? retainedUntil;
+            }
+            catch (error) {
+                const reason = `Browser lease ${leaseId} could not be renewed or reacquired: ${errorMessage(error)}. Authenticated browser access requires operator attention.`;
+                this.markRunResourcesDirty(job, reason);
+                this.store.updateGoalStatus(job.id, 'blocked');
+                return false;
+            }
+        }
+        const updatedAt = new Date().toISOString();
+        const next = clearDirtyReason({ ...resources, workerId, cleanupState: 'active', retainedUntil, updatedAt });
+        this.store.updateJobResources(job.id, next);
+        if (run)
+            this.store.updateRunResources({ jobId: job.id, runId: run.id, resources: next });
+        return true;
     }
     async abortCancelRequestedJobs() { for (const job of this.store.listJobs({ includeDisabled: true })) {
         if (job.state.cancelRequestedAt)
@@ -134,17 +200,25 @@ export class PiboLoopService {
     }
     async executeReserved(job, run) {
         this.activeRuns += 1;
+        const activeStartedAt = Date.now();
+        let activeTimeRecorded = false;
+        const recordActiveTime = () => {
+            if (activeTimeRecorded)
+                return;
+            activeTimeRecorded = true;
+            this.recordGoalRunTime(job, run, activeStartedAt);
+        };
         try {
             const result = await this.executeJob(job, run);
+            recordActiveTime();
             const cancelled = this.cancelledRuns.delete(run.id);
-            if (job.mode === 'goal')
-                this.store.recordGoalProgress(job.id, { timeUsedSeconds: result.timeUsedSeconds });
             const outcome = { status: cancelled ? 'cancelled' : 'ok', piboSessionId: result.piboSessionId, finalAnswer: result.finalAnswer };
             const { evaluation, conditionStates } = await this.evaluateStopPolicy(this.store.getJob(job.id) ?? job, 'after-run', run, outcome);
             this.store.completeRun({ jobId: job.id, runId: run.id, status: outcome.status, piboSessionId: result.piboSessionId, reason: cancelled ? 'cancelled' : evaluation.reason, stopAfterRun: evaluation.finalAction !== 'continue', stopEvaluation: evaluation, conditionStates });
             await this.cleanupRunResources(job, run);
         }
         catch (error) {
+            recordActiveTime();
             const cancelled = this.cancelledRuns.delete(run.id);
             const message = errorMessage(error);
             const fatalProfileError = !cancelled && isUnknownProfileErrorMessage(message);
@@ -160,6 +234,11 @@ export class PiboLoopService {
             this.activeRuns -= 1;
         }
     }
+    recordGoalRunTime(job, run, startedAt) {
+        if (job.mode !== 'goal')
+            return;
+        this.store.recordGoalRunTime(job.id, run.id, Math.max(0, Math.ceil((Date.now() - startedAt) / 1000)));
+    }
     markRunResourcesDirty(job, dirtyReason) {
         const latestJob = this.store.getJob(job.id) ?? job;
         const runId = latestJob.state.lastRunId ?? job.state.lastRunId;
@@ -178,12 +257,20 @@ export class PiboLoopService {
         }
     }
     async cleanupRunResources(job, run) {
+        await this.stopGoalBrowserLeaseHeartbeat(run.id);
         const latestJob = this.store.getJob(job.id) ?? job;
         const latestRun = this.store.listRuns({ jobId: job.id, limit: 100 }).find((candidate) => candidate.id === run.id) ?? run;
         const resources = mergeRunResources(latestJob.resources, latestRun.resources);
         const leaseIds = resources?.browserLeaseIds ?? [];
         if (!resources || leaseIds.length === 0)
             return;
+        const goalStatus = latestJob.mode === 'goal' ? latestJob.state.goalStatus ?? (latestJob.enabled ? 'active' : 'paused') : undefined;
+        if (latestJob.mode === 'goal' && latestJob.enabled && goalStatus === 'active') {
+            const retained = clearDirtyReason({ ...resources, cleanupState: 'retained', updatedAt: new Date().toISOString() });
+            this.store.updateRunResources({ jobId: job.id, runId: run.id, resources: retained });
+            this.store.updateJobResources(job.id, retained);
+            return;
+        }
         const workerId = resources.workerId || process.env.PIBO_BROWSER_POOL_WORKER_ID || process.env.PIBO_COMPUTE_WORKER_ID || process.env.HOSTNAME || 'local';
         const poolId = this.options.resourceCleanup?.browserPoolId || process.env.PIBO_BROWSER_POOL_ID || 'default';
         const rootDir = this.options.resourceCleanup?.browserPoolRootDir || process.env.PIBO_BROWSER_POOL_ROOT || join(process.env.BROWSER_USE_HOME || join(homedir(), '.browser-use'), 'pibo-browser-pool');
@@ -228,7 +315,10 @@ export class PiboLoopService {
         const status = job.state.goalStatus ?? (job.enabled ? 'active' : 'paused');
         if (!job.state.runningAt && status !== 'active')
             return;
-        this.store.recordGoalProgress(job.id, { tokens: event.totalTokens });
+        if (job.state.runningAt && job.state.lastRunId)
+            this.store.recordGoalTurnUsage(job.id, job.state.lastRunId, event.totalTokens);
+        else
+            this.store.recordGoalProgress(job.id, { tokens: event.totalTokens });
     }
     handleProductEvent(event) {
         if (event.type !== 'pibo.loop.fact' && event.type !== 'loop.fact' && event.type !== 'pibo.ralph.fact' && event.type !== 'ralph.fact')
@@ -304,7 +394,6 @@ export class PiboLoopService {
     } const room = this.roomService.ensureDefaultRoom({ name: 'Shared Chat' }); return { roomId: room.id, workspace: room.workspace ?? getDefaultPiboWorkspace() }; }
     async emitMessageAndWait(piboSessionId, text) {
         const eventId = `loop_msg_${randomUUID()}`;
-        const startedAt = Date.now();
         return await new Promise((resolve, reject) => {
             let settled = false;
             let deltaAnswer = '';
@@ -323,7 +412,7 @@ export class PiboLoopService {
                 if (error)
                     reject(error);
                 else
-                    resolve({ finalAnswer: finalAnswer || deltaAnswer, timeUsedSeconds: Math.max(0, Math.ceil((Date.now() - startedAt) / 1000)) });
+                    resolve({ finalAnswer: finalAnswer || deltaAnswer });
             };
             if (this.runTimeoutMs !== undefined) {
                 timeout = setTimeout(() => {