@pasko70/pibo 1.10.0 → 1.10.1

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(() => {

package/dist/loops/store.js

@@ -75,13 +75,37 @@ function resourceMetadataJson(resources) {
     const normalized = normalizeLoopResourceMetadata(resources);
     return normalized ? JSON.stringify(normalized) : null;
 }
+function parseRunAccounting(json) {
+    if (!json)
+        return undefined;
+    try {
+        const value = JSON.parse(json);
+        return value && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function runAccountingJson(accounting) { return accounting ? JSON.stringify(accounting) : null; }
+function normalizeJobState(state, mode, enabled, createdAt) {
+    if (mode !== 'goal')
+        return state;
+    const activeTimeSeconds = Math.max(0, Math.floor(state.activeTimeSeconds ?? state.timeUsedSeconds ?? 0));
+    const goalStartedAt = state.goalStartedAt ?? (enabled || (state.completedIterations ?? 0) > 0 || (state.tokensUsed ?? 0) > 0 || (state.goalStatus !== undefined && state.goalStatus !== 'paused') ? createdAt : undefined);
+    const normalized = { ...state, activeTimeSeconds, ...(goalStartedAt ? { goalStartedAt } : {}) };
+    delete normalized.timeUsedSeconds;
+    return normalized;
+}
 function jobFromRow(row) {
     const resources = parseResourceMetadata(row.resource_json);
-    return { id: row.id, mode: normalizeLoopMode(row.loop_mode, 'ralph'), name: row.name, description: row.description ?? undefined, enabled: row.enabled === 1, target: parseLoopTarget(row.target_json), profile: row.profile, prompt: row.prompt, maxIterations: row.max_iterations ?? undefined, tokenBudget: row.token_budget ?? undefined, stopPolicy: parseStopPolicy(row.stop_policy_json), ...parseRuntimeOptions(row.runtime_options_json), ...(resources ? { resources } : {}), state: parseJson(row.state_json), createdAt: row.created_at, updatedAt: row.updated_at };
+    const mode = normalizeLoopMode(row.loop_mode, 'ralph');
+    const enabled = row.enabled === 1;
+    return { id: row.id, mode, name: row.name, description: row.description ?? undefined, enabled, target: parseLoopTarget(row.target_json), profile: row.profile, prompt: row.prompt, maxIterations: row.max_iterations ?? undefined, tokenBudget: row.token_budget ?? undefined, tokenReserve: row.token_reserve ?? undefined, stopPolicy: parseStopPolicy(row.stop_policy_json), ...parseRuntimeOptions(row.runtime_options_json), ...(resources ? { resources } : {}), state: normalizeJobState(parseJson(row.state_json), mode, enabled, row.created_at), createdAt: row.created_at, updatedAt: row.updated_at };
 }
 function runFromRow(row) {
     const resources = parseResourceMetadata(row.resource_json);
-    return { id: row.id, jobId: row.job_id, piboSessionId: row.pibo_session_id ?? undefined, status: row.status, reason: row.reason ?? undefined, error: row.error ?? undefined, startedAt: row.started_at ?? undefined, completedAt: row.completed_at ?? undefined, ...(resources ? { resources } : {}), createdAt: row.created_at, updatedAt: row.updated_at };
+    const accounting = parseRunAccounting(row.accounting_json);
+    return { id: row.id, jobId: row.job_id, piboSessionId: row.pibo_session_id ?? undefined, status: row.status, reason: row.reason ?? undefined, error: row.error ?? undefined, startedAt: row.started_at ?? undefined, completedAt: row.completed_at ?? undefined, ...(accounting ? { accounting } : {}), ...(resources ? { resources } : {}), createdAt: row.created_at, updatedAt: row.updated_at };
 }
 function mergeResourceMetadata(jobResources, runResources) {
     if (!jobResources && !runResources)
@@ -106,6 +130,13 @@ function normalizeTokenBudget(value) {
         throw new Error('tokenBudget must be a positive integer');
     return value;
 }
+function normalizeTokenReserve(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isInteger(value) || value < 0)
+        throw new Error('tokenReserve must be a non-negative integer');
+    return value;
+}
 function goalStatus(job) {
     if (job.mode !== 'goal')
         return undefined;
@@ -213,10 +244,15 @@ function validateJobInput(input) {
         throw new Error('prompt is required');
     if (input.target.kind === 'room' && !input.target.roomId.trim())
         throw new Error('target.roomId is required');
-    if (input.mode === 'ralph' && input.tokenBudget !== undefined)
-        throw new Error('tokenBudget is only available for goal mode');
+    if (input.mode === 'ralph' && (input.tokenBudget !== undefined || input.tokenReserve !== undefined))
+        throw new Error('tokenBudget and tokenReserve are only available for goal mode');
     normalizeMaxIterations(input.maxIterations);
     normalizeTokenBudget(input.tokenBudget);
+    normalizeTokenReserve(input.tokenReserve);
+    if (input.tokenReserve !== undefined && input.tokenBudget === undefined)
+        throw new Error('tokenReserve requires tokenBudget');
+    if (input.tokenReserve !== undefined && input.tokenBudget !== undefined && input.tokenReserve >= input.tokenBudget)
+        throw new Error('tokenReserve must be smaller than tokenBudget');
     normalizeRuntimeOptions(input);
     normalizeLoopStopPolicy(input.stopPolicy);
     normalizeLoopResourceMetadata(input.resources);
@@ -246,10 +282,10 @@ export class PiboLoopStore {
         const enabled = input.enabled === true;
         const state = {
             completedIterations: 0,
-            ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokensUsed: 0, timeUsedSeconds: 0 } : {}),
+            ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokensUsed: 0, activeTimeSeconds: 0, ...(enabled ? { goalStartedAt: timestamp } : {}) } : {}),
             ...(input.initialPiboSessionId?.trim() ? { lastPiboSessionId: input.initialPiboSessionId.trim() } : {}),
         };
-        const job = { id: mode === 'ralph' ? `ralph_${randomUUID()}` : `loop_${randomUUID()}`, mode, name: (input.name ?? defaultName(input.prompt)).trim(), description: input.description?.trim() || undefined, enabled, target, profile: input.profile, prompt: input.prompt, maxIterations: normalizeMaxIterations(input.maxIterations), tokenBudget: normalizeTokenBudget(input.tokenBudget), stopPolicy: normalizeLoopStopPolicy(input.stopPolicy), ...runtimeOptions, ...(resources ? { resources } : {}), state, createdAt: timestamp, updatedAt: timestamp };
+        const job = { id: mode === 'ralph' ? `ralph_${randomUUID()}` : `loop_${randomUUID()}`, mode, name: (input.name ?? defaultName(input.prompt)).trim(), description: input.description?.trim() || undefined, enabled, target, profile: input.profile, prompt: input.prompt, maxIterations: normalizeMaxIterations(input.maxIterations), tokenBudget: normalizeTokenBudget(input.tokenBudget), tokenReserve: normalizeTokenReserve(input.tokenReserve), stopPolicy: normalizeLoopStopPolicy(input.stopPolicy), ...runtimeOptions, ...(resources ? { resources } : {}), state, createdAt: timestamp, updatedAt: timestamp };
         this.insertJob(job);
         return this.getJob(job.id);
     }
@@ -264,6 +300,10 @@ export class PiboLoopStore {
             return undefined;
         const timestamp = nowIso(now);
         const state = { ...job.state, goalStatus: status, runningAt: job.state.runningAt };
+        if (job.state.runningAt)
+            delete state.goalEndedAt;
+        else
+            state.goalEndedAt = timestamp;
         this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = 0, state_json = ?, updated_at = ? WHERE id = ?').run(JSON.stringify(state), timestamp, id);
         return this.getJob(id);
     }
@@ -272,20 +312,65 @@ export class PiboLoopStore {
         if (!job || job.mode !== 'goal')
             return job;
         const tokens = Math.max(0, Math.floor(input.tokens ?? 0));
-        const timeUsedSeconds = Math.max(0, Math.floor(input.timeUsedSeconds ?? 0));
+        const activeTimeSeconds = Math.max(0, Math.floor(input.activeTimeSeconds ?? 0));
         const nextTokens = (job.state.tokensUsed ?? 0) + tokens;
         const currentStatus = goalStatus(job) ?? 'active';
         const budgetLimited = currentStatus === 'active' && job.tokenBudget !== undefined && nextTokens >= job.tokenBudget;
         const state = {
             ...job.state,
             tokensUsed: nextTokens,
-            timeUsedSeconds: (job.state.timeUsedSeconds ?? 0) + timeUsedSeconds,
+            activeTimeSeconds: (job.state.activeTimeSeconds ?? 0) + activeTimeSeconds,
             goalStatus: budgetLimited ? 'budget_limited' : currentStatus,
         };
         const timestamp = nowIso(now);
+        if (budgetLimited && !job.state.runningAt)
+            state.goalEndedAt = timestamp;
         this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = ?, state_json = ?, updated_at = ? WHERE id = ?').run(budgetLimited ? 0 : job.enabled ? 1 : 0, JSON.stringify(state), timestamp, id);
         return this.getJob(id);
     }
+    recordGoalTurnUsage(id, runId, tokens, now = new Date()) {
+        this.db.exec('BEGIN IMMEDIATE');
+        try {
+            const job = this.recordGoalProgress(id, { tokens }, now);
+            if (job?.mode === 'goal') {
+                const row = this.db.prepare('SELECT * FROM pibo_ralph_runs WHERE id = ? AND job_id = ?').get(runId, id);
+                if (row) {
+                    const accounting = parseRunAccounting(row.accounting_json) ?? {};
+                    const turnTokens = (accounting.tokensUsed ?? 0) + Math.max(0, Math.floor(tokens));
+                    const budget = accounting.tokenBudget;
+                    const before = accounting.tokensUsedBefore ?? 0;
+                    const nextAccounting = { ...accounting, tokensUsed: turnTokens, ...(budget !== undefined ? { overshootTokens: Math.max(0, before + turnTokens - budget) } : {}) };
+                    this.db.prepare('UPDATE pibo_ralph_runs SET accounting_json = ?, updated_at = ? WHERE id = ?').run(runAccountingJson(nextAccounting), nowIso(now), runId);
+                }
+            }
+            this.db.exec('COMMIT');
+            return job;
+        }
+        catch (error) {
+            this.db.exec('ROLLBACK');
+            throw error;
+        }
+    }
+    recordGoalRunTime(id, runId, activeTimeSeconds, now = new Date()) {
+        const seconds = Math.max(0, Math.floor(activeTimeSeconds));
+        this.db.exec('BEGIN IMMEDIATE');
+        try {
+            const job = this.recordGoalProgress(id, { activeTimeSeconds: seconds }, now);
+            if (job?.mode === 'goal') {
+                const row = this.db.prepare('SELECT * FROM pibo_ralph_runs WHERE id = ? AND job_id = ?').get(runId, id);
+                if (row) {
+                    const accounting = { ...(parseRunAccounting(row.accounting_json) ?? {}), activeTimeSeconds: seconds };
+                    this.db.prepare('UPDATE pibo_ralph_runs SET accounting_json = ?, updated_at = ? WHERE id = ?').run(runAccountingJson(accounting), nowIso(now), runId);
+                }
+            }
+            this.db.exec('COMMIT');
+            return job;
+        }
+        catch (error) {
+            this.db.exec('ROLLBACK');
+            throw error;
+        }
+    }
     listJobs(input = {}) {
         const clauses = [];
         const values = [];
@@ -309,16 +394,19 @@ export class PiboLoopStore {
         const enabled = patch.enabled ?? existing.enabled;
         let state = mode === existing.mode
             ? { ...existing.state }
-            : { completedIterations: existing.state.completedIterations ?? 0, ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokensUsed: 0, timeUsedSeconds: 0 } : {}) };
+            : { completedIterations: existing.state.completedIterations ?? 0, ...(mode === 'goal' ? { goalStatus: enabled ? 'active' : 'paused', tokensUsed: 0, activeTimeSeconds: 0, ...(enabled ? { goalStartedAt: nowIso(now) } : {}) } : {}) };
         if (mode === 'goal' && patch.enabled !== undefined) {
             const currentGoalStatus = goalStatus({ mode, enabled: existing.enabled, state: existing.state }) ?? 'paused';
             if (patch.enabled) {
                 if (currentGoalStatus === 'complete')
                     throw new Error('Completed goals cannot be restarted; create a new goal');
                 const nextBudget = hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget;
-                if (currentGoalStatus === 'budget_limited' && nextBudget !== undefined && (existing.state.tokensUsed ?? 0) >= nextBudget)
-                    throw new Error('Increase or clear the token budget before resuming this goal');
+                const nextReserve = hasOwn(patch, 'tokenReserve') ? normalizeTokenReserve(patch.tokenReserve ?? undefined) : existing.tokenReserve;
+                if (currentGoalStatus === 'budget_limited' && nextBudget !== undefined && (existing.state.tokensUsed ?? 0) + (nextReserve ?? 0) >= nextBudget)
+                    throw new Error('Increase or clear the token budget, or lower the token reserve, before resuming this goal');
                 state.goalStatus = 'active';
+                state.goalStartedAt ??= nowIso(now);
+                delete state.goalEndedAt;
                 state.stopRequestedAt = undefined;
                 state.cancelRequestedAt = undefined;
             }
@@ -326,7 +414,7 @@ export class PiboLoopStore {
                 state.goalStatus = currentGoalStatus === 'active' ? 'paused' : currentGoalStatus;
             }
         }
-        const next = { ...existing, mode, state, name: patch.name !== undefined ? patch.name.trim() : existing.name, description: patch.description !== undefined ? patch.description?.trim() || undefined : existing.description, enabled, target, profile: patch.profile ?? existing.profile, prompt: patch.prompt ?? existing.prompt, maxIterations: hasOwn(patch, 'maxIterations') ? normalizeMaxIterations(patch.maxIterations ?? undefined) : existing.maxIterations, tokenBudget: mode === 'ralph' ? undefined : hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget, stopPolicy, modelOverride: runtimeOptions.modelOverride, thinkingLevel: runtimeOptions.thinkingLevel, fastMode: runtimeOptions.fastMode, updatedAt: nowIso(now) };
+        const next = { ...existing, mode, state, name: patch.name !== undefined ? patch.name.trim() : existing.name, description: patch.description !== undefined ? patch.description?.trim() || undefined : existing.description, enabled, target, profile: patch.profile ?? existing.profile, prompt: patch.prompt ?? existing.prompt, maxIterations: hasOwn(patch, 'maxIterations') ? normalizeMaxIterations(patch.maxIterations ?? undefined) : existing.maxIterations, tokenBudget: mode === 'ralph' ? undefined : hasOwn(patch, 'tokenBudget') ? normalizeTokenBudget(patch.tokenBudget ?? undefined) : existing.tokenBudget, tokenReserve: mode === 'ralph' || (hasOwn(patch, 'tokenBudget') && patch.tokenBudget === null && !hasOwn(patch, 'tokenReserve')) ? undefined : hasOwn(patch, 'tokenReserve') ? normalizeTokenReserve(patch.tokenReserve ?? undefined) : existing.tokenReserve, stopPolicy, modelOverride: runtimeOptions.modelOverride, thinkingLevel: runtimeOptions.thinkingLevel, fastMode: runtimeOptions.fastMode, updatedAt: nowIso(now) };
         validateJobInput(next);
         this.writeJob(next);
         return this.getJob(id);
@@ -418,7 +506,7 @@ export class PiboLoopStore {
         const reachedMaxIterations = job.maxIterations !== undefined && completedIterations >= job.maxIterations;
         const terminalGoalStatus = job.mode === 'goal' && ['complete', 'blocked', 'budget_limited'].includes(goalStatus(job) ?? '');
         const shouldDisable = terminalGoalStatus || reachedMaxIterations || input.stopAfterRun === true || input.stopEvaluation?.finalAction === 'stop-after-run' || input.stopEvaluation?.finalAction === 'cancel-current-run';
-        const state = { ...job.state, runningAt: undefined, completedIterations, lastRunAt: timestamp, lastRunId: input.runId, lastStatus: input.status === 'error' ? 'error' : input.status === 'cancelled' ? 'cancelled' : 'ok', lastError: input.error, lastPiboSessionId: input.piboSessionId ?? job.state.lastPiboSessionId, consecutiveErrors: input.status === 'error' ? (job.state.consecutiveErrors ?? 0) + 1 : 0, conditionStates: input.conditionStates ?? job.state.conditionStates, lastStopEvaluation: input.stopEvaluation ?? job.state.lastStopEvaluation };
+        const state = { ...job.state, runningAt: undefined, completedIterations, lastRunAt: timestamp, lastRunId: input.runId, lastStatus: input.status === 'error' ? 'error' : input.status === 'cancelled' ? 'cancelled' : 'ok', lastError: input.error, lastPiboSessionId: input.piboSessionId ?? job.state.lastPiboSessionId, consecutiveErrors: input.status === 'error' ? (job.state.consecutiveErrors ?? 0) + 1 : 0, conditionStates: input.conditionStates ?? job.state.conditionStates, lastStopEvaluation: input.stopEvaluation ?? job.state.lastStopEvaluation, ...(terminalGoalStatus ? { goalEndedAt: job.state.goalEndedAt ?? timestamp } : {}) };
         this.db.prepare('UPDATE pibo_ralph_runs SET status = ?, pibo_session_id = COALESCE(?, pibo_session_id), reason = ?, error = ?, completed_at = ?, updated_at = ? WHERE id = ?').run(input.status, input.piboSessionId ?? null, input.reason ?? input.stopEvaluation?.reason ?? null, input.error ?? null, timestamp, timestamp, input.runId);
         this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = ?, state_json = ?, updated_at = ? WHERE id = ?').run(shouldDisable ? 0 : job.enabled ? 1 : 0, JSON.stringify(state), timestamp, job.id);
     }
@@ -486,6 +574,15 @@ export class PiboLoopStore {
                 this.db.exec('COMMIT');
                 return undefined;
             }
+            if (job.mode === 'goal' && job.tokenBudget !== undefined) {
+                const remaining = Math.max(0, job.tokenBudget - (job.state.tokensUsed ?? 0));
+                if (remaining <= (job.tokenReserve ?? 0)) {
+                    const state = { ...job.state, goalStatus: 'budget_limited', goalEndedAt: timestamp };
+                    this.db.prepare('UPDATE pibo_ralph_jobs SET enabled = 0, state_json = ?, updated_at = ? WHERE id = ?').run(JSON.stringify(state), timestamp, job.id);
+                    this.db.exec('COMMIT');
+                    return undefined;
+                }
+            }
             const run = this.createRunLocked(job, timestamp);
             const state = { ...job.state, runningAt: timestamp, lastRunAt: timestamp, lastRunId: run.id };
             this.updateJobStateLocked(job.id, state, timestamp);
@@ -502,13 +599,15 @@ export class PiboLoopStore {
         this.ensureJobColumn('loop_mode', "TEXT NOT NULL DEFAULT 'ralph'");
         this.ensureJobColumn('max_iterations', 'INTEGER');
         this.ensureJobColumn('token_budget', 'INTEGER');
+        this.ensureJobColumn('token_reserve', 'INTEGER');
         this.ensureJobColumn('runtime_options_json', 'TEXT');
         this.ensureJobColumn('stop_policy_json', 'TEXT');
         this.ensureJobColumn('resource_json', 'TEXT');
         this.ensureRunColumn('resource_json', 'TEXT');
+        this.ensureRunColumn('accounting_json', 'TEXT');
     }
     createFreshSchema() {
-        this.db.exec(`CREATE TABLE IF NOT EXISTS pibo_ralph_jobs (id TEXT PRIMARY KEY, loop_mode TEXT NOT NULL DEFAULT 'goal', name TEXT NOT NULL, description TEXT, enabled INTEGER NOT NULL, target_json TEXT NOT NULL, profile TEXT NOT NULL, prompt TEXT NOT NULL, max_iterations INTEGER, token_budget INTEGER, runtime_options_json TEXT, stop_policy_json TEXT, resource_json TEXT, state_json TEXT NOT NULL, created_at TEXT NOT NULL, updated_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_jobs_enabled ON pibo_ralph_jobs(enabled, updated_at DESC); CREATE TABLE IF NOT EXISTS pibo_ralph_runs (id TEXT PRIMARY KEY, job_id TEXT NOT NULL, pibo_session_id TEXT, status TEXT NOT NULL, reason TEXT, error TEXT, resource_json TEXT, started_at TEXT, completed_at TEXT, created_at TEXT NOT NULL, updated_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_runs_job_created ON pibo_ralph_runs(job_id, created_at DESC); CREATE TABLE IF NOT EXISTS pibo_ralph_run_facts (id TEXT PRIMARY KEY, job_id TEXT NOT NULL, run_id TEXT, pibo_session_id TEXT, type TEXT NOT NULL, source TEXT NOT NULL, payload_json TEXT NOT NULL, created_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_facts_job_created ON pibo_ralph_run_facts(job_id, created_at DESC); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_facts_run_type ON pibo_ralph_run_facts(run_id, type, created_at DESC);`);
+        this.db.exec(`CREATE TABLE IF NOT EXISTS pibo_ralph_jobs (id TEXT PRIMARY KEY, loop_mode TEXT NOT NULL DEFAULT 'goal', name TEXT NOT NULL, description TEXT, enabled INTEGER NOT NULL, target_json TEXT NOT NULL, profile TEXT NOT NULL, prompt TEXT NOT NULL, max_iterations INTEGER, token_budget INTEGER, token_reserve INTEGER, runtime_options_json TEXT, stop_policy_json TEXT, resource_json TEXT, state_json TEXT NOT NULL, created_at TEXT NOT NULL, updated_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_jobs_enabled ON pibo_ralph_jobs(enabled, updated_at DESC); CREATE TABLE IF NOT EXISTS pibo_ralph_runs (id TEXT PRIMARY KEY, job_id TEXT NOT NULL, pibo_session_id TEXT, status TEXT NOT NULL, reason TEXT, error TEXT, accounting_json TEXT, resource_json TEXT, started_at TEXT, completed_at TEXT, created_at TEXT NOT NULL, updated_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_runs_job_created ON pibo_ralph_runs(job_id, created_at DESC); CREATE TABLE IF NOT EXISTS pibo_ralph_run_facts (id TEXT PRIMARY KEY, job_id TEXT NOT NULL, run_id TEXT, pibo_session_id TEXT, type TEXT NOT NULL, source TEXT NOT NULL, payload_json TEXT NOT NULL, created_at TEXT NOT NULL); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_facts_job_created ON pibo_ralph_run_facts(job_id, created_at DESC); CREATE INDEX IF NOT EXISTS idx_pibo_ralph_facts_run_type ON pibo_ralph_run_facts(run_id, type, created_at DESC);`);
     }
     ensureJobColumn(name, definition) {
         const columns = this.tableColumns('pibo_ralph_jobs');
@@ -523,9 +622,21 @@ export class PiboLoopStore {
     tableColumns(tableName) {
         return new Set(this.db.prepare(`PRAGMA table_info(${tableName})`).all().map((column) => column.name));
     }
-    insertJob(job) { this.db.prepare('INSERT INTO pibo_ralph_jobs (id, loop_mode, name, description, enabled, target_json, profile, prompt, max_iterations, token_budget, runtime_options_json, stop_policy_json, resource_json, state_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').run(job.id, job.mode, job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, job.maxIterations ?? null, job.tokenBudget ?? null, runtimeOptionsJson(job), stopPolicyJson(job.stopPolicy), resourceMetadataJson(job.resources), JSON.stringify(job.state), job.createdAt, job.updatedAt); }
-    writeJob(job) { this.db.prepare('UPDATE pibo_ralph_jobs SET loop_mode = ?, name = ?, description = ?, enabled = ?, target_json = ?, profile = ?, prompt = ?, max_iterations = ?, token_budget = ?, runtime_options_json = ?, stop_policy_json = ?, resource_json = ?, state_json = ?, updated_at = ? WHERE id = ?').run(job.mode, job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, job.maxIterations ?? null, job.tokenBudget ?? null, runtimeOptionsJson(job), stopPolicyJson(job.stopPolicy), resourceMetadataJson(job.resources), JSON.stringify(job.state), job.updatedAt, job.id); }
+    insertJob(job) { this.db.prepare('INSERT INTO pibo_ralph_jobs (id, loop_mode, name, description, enabled, target_json, profile, prompt, max_iterations, token_budget, token_reserve, runtime_options_json, stop_policy_json, resource_json, state_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').run(job.id, job.mode, job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, job.maxIterations ?? null, job.tokenBudget ?? null, job.tokenReserve ?? null, runtimeOptionsJson(job), stopPolicyJson(job.stopPolicy), resourceMetadataJson(job.resources), JSON.stringify(job.state), job.createdAt, job.updatedAt); }
+    writeJob(job) { this.db.prepare('UPDATE pibo_ralph_jobs SET loop_mode = ?, name = ?, description = ?, enabled = ?, target_json = ?, profile = ?, prompt = ?, max_iterations = ?, token_budget = ?, token_reserve = ?, runtime_options_json = ?, stop_policy_json = ?, resource_json = ?, state_json = ?, updated_at = ? WHERE id = ?').run(job.mode, job.name, job.description ?? null, job.enabled ? 1 : 0, targetJson(job.target), job.profile, job.prompt, job.maxIterations ?? null, job.tokenBudget ?? null, job.tokenReserve ?? null, runtimeOptionsJson(job), stopPolicyJson(job.stopPolicy), resourceMetadataJson(job.resources), JSON.stringify(job.state), job.updatedAt, job.id); }
     updateJobStateLocked(id, state, updatedAt) { this.db.prepare('UPDATE pibo_ralph_jobs SET state_json = ?, updated_at = ? WHERE id = ?').run(JSON.stringify(state), updatedAt, id); }
-    createRunLocked(job, timestamp) { const run = { id: job.mode === 'ralph' ? `rrun_${randomUUID()}` : `lrun_${randomUUID()}`, jobId: job.id, status: 'running', startedAt: timestamp, ...(job.resources ? { resources: job.resources } : {}), createdAt: timestamp, updatedAt: timestamp }; this.db.prepare('INSERT INTO pibo_ralph_runs (id, job_id, pibo_session_id, status, reason, error, resource_json, started_at, completed_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').run(run.id, run.jobId, null, run.status, null, null, resourceMetadataJson(run.resources), run.startedAt ?? null, null, run.createdAt, run.updatedAt); return run; }
+    createRunLocked(job, timestamp) {
+        const tokensUsedBefore = job.state.tokensUsed ?? 0;
+        const accounting = job.mode === 'goal' ? {
+            ...(job.tokenBudget !== undefined ? { tokenBudget: job.tokenBudget, remainingTokensBefore: Math.max(0, job.tokenBudget - tokensUsedBefore) } : {}),
+            ...(job.tokenReserve !== undefined ? { tokenReserve: job.tokenReserve } : {}),
+            tokensUsedBefore,
+            tokensUsed: 0,
+            overshootTokens: 0,
+        } : undefined;
+        const run = { id: job.mode === 'ralph' ? `rrun_${randomUUID()}` : `lrun_${randomUUID()}`, jobId: job.id, status: 'running', startedAt: timestamp, ...(accounting ? { accounting } : {}), ...(job.resources ? { resources: job.resources } : {}), createdAt: timestamp, updatedAt: timestamp };
+        this.db.prepare('INSERT INTO pibo_ralph_runs (id, job_id, pibo_session_id, status, reason, error, accounting_json, resource_json, started_at, completed_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)').run(run.id, run.jobId, null, run.status, null, null, runAccountingJson(run.accounting), resourceMetadataJson(run.resources), run.startedAt ?? null, null, run.createdAt, run.updatedAt);
+        return run;
+    }
 }
 export function createDefaultPiboLoopStore(options = {}) { return new PiboLoopStore(options); }

package/dist/loops/tools.js

@@ -1,5 +1,6 @@
 import { StringEnum, Type } from '@earendil-works/pi-ai';
 import { defineTool } from '@earendil-works/pi-coding-agent';
+import { goalActiveTimeSeconds, goalCanStartNextTurn, goalElapsedWallClockSeconds, goalRemainingTokens } from './accounting.js';
 import { createDefaultPiboLoopStore } from './store.js';
 export const PIBO_GOAL_TOOL_NAMES = ['get_goal', 'create_goal', 'update_goal'];
 let configuredStorePath;
@@ -33,17 +34,30 @@ function positiveInteger(value, field) {
         throw new Error(`${field} must be a positive integer`);
     return value;
 }
+function nonNegativeInteger(value, field) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isInteger(value) || value < 0)
+        throw new Error(`${field} must be a non-negative integer`);
+    return value;
+}
 function goalPayload(job) {
-    const tokensUsed = job.state.tokensUsed ?? 0;
     const tokenBudget = job.tokenBudget;
     return {
         goalId: job.id,
         objective: job.prompt,
         status: effectiveGoalStatus(job),
+        budgetType: tokenBudget === undefined ? 'unbounded' : 'soft',
         tokenBudget: tokenBudget ?? null,
-        tokensUsed,
-        remainingTokens: tokenBudget === undefined ? null : Math.max(0, tokenBudget - tokensUsed),
-        timeUsedSeconds: job.state.timeUsedSeconds ?? 0,
+        tokenReserve: job.tokenReserve ?? 0,
+        tokensUsed: job.state.tokensUsed ?? 0,
+        remainingTokens: goalRemainingTokens(job) ?? null,
+        canStartNextTurn: goalCanStartNextTurn(job),
+        activeAgentTimeSeconds: goalActiveTimeSeconds(job),
+        elapsedWallClockSeconds: goalElapsedWallClockSeconds(job),
+        goalStartedAt: job.state.goalStartedAt ?? null,
+        goalEndedAt: job.state.goalEndedAt ?? null,
+        wallClockIncludesPausedTime: true,
     };
 }
 function effectiveGoalStatus(job) {
@@ -64,7 +78,7 @@ function createGetGoalTool(context, options) {
     return defineTool({
         name: 'get_goal',
         label: 'Get Goal',
-        description: 'Get the current goal for this Pibo Session, including status, token budget, consumed tokens, remaining tokens, and elapsed active time.',
+        description: 'Get the current goal for this Pibo Session, including soft-budget risk, per-turn reserve, active agent time, and wall-clock elapsed time.',
         promptSnippet: 'Use get_goal when you need the authoritative persisted status or accounting for the current Pibo Session goal.',
         parameters: Type.Object({}),
         async execute() {
@@ -89,7 +103,8 @@ function createCreateGoalTool(context, options) {
         promptSnippet: 'Call create_goal only when the user or system explicitly requests a persistent goal. Do not infer a goal from an ordinary task.',
         parameters: Type.Object({
             objective: Type.String({ description: 'Concrete objective to pursue across automatic continuations.' }),
-            token_budget: Type.Optional(Type.Number({ description: 'Optional positive token budget. Omit unless explicitly requested.' })),
+            token_budget: Type.Optional(Type.Number({ description: 'Optional soft token budget. Usage arrives after each model response, so the final turn can overshoot.' })),
+            token_reserve: Type.Optional(Type.Number({ description: 'Optional non-negative minimum remaining tokens required before Pibo starts another turn.' })),
         }),
         async execute(_toolCallId, params) {
             try {
@@ -98,6 +113,7 @@ function createCreateGoalTool(context, options) {
                 if (!objective)
                     throw new Error('objective is required');
                 const tokenBudget = positiveInteger(params.token_budget, 'token_budget');
+                const tokenReserve = nonNegativeInteger(params.token_reserve, 'token_reserve');
                 return await withStore(options, (store) => {
                     const existing = store.getLatestGoalForSession(session.piboSessionId);
                     if (existing && effectiveGoalStatus(existing) !== 'complete') {
@@ -110,6 +126,7 @@ function createCreateGoalTool(context, options) {
                         profile: session.profileName,
                         prompt: objective,
                         tokenBudget,
+                        tokenReserve,
                         initialPiboSessionId: session.piboSessionId,
                     });
                     return toolResult({ ok: true, goal: goalPayload(job) });
@@ -147,7 +164,7 @@ function createUpdateGoalTool(context, options) {
                         ok: true,
                         goal: goalPayload(job),
                         ...(status === 'complete' && job.tokenBudget !== undefined
-                            ? { completionBudgetReport: `${job.state.tokensUsed ?? 0}/${job.tokenBudget} reported tokens consumed before the current model turn finishes` }
+                            ? { completionBudgetReport: `${job.state.tokensUsed ?? 0}/${job.tokenBudget} reported tokens consumed against a soft budget before the current model turn finishes` }
                             : {}),
                     });
                 });