@ouro.bot/cli 0.1.0-alpha.81 → 0.1.0-alpha.811

package/dist/heart/timeouts.js

@@ -0,0 +1,101 @@
+"use strict";
+/**
+ * Soft/hard timeout pattern for boot-path operations — Layer 2.
+ *
+ * Soft timeout = "log a warning, keep going". The op continues; the consumer
+ * records the warning and moves on.
+ * Hard timeout = "abort the op via AbortSignal". The underlying op is
+ * expected to honour the signal (Node child_process accepts `{ signal }`,
+ * fetch accepts `{ signal }`, etc.). When the signal aborts, the op should
+ * reject with an AbortError, and the wrapper returns
+ * `{ classification: "timeout-hard" }` rather than re-throwing.
+ *
+Two optional env overrides (currently only `GIT` is consumed):
+ *   - `OURO_BOOT_TIMEOUT_GIT_SOFT` / `OURO_BOOT_TIMEOUT_GIT_HARD` — boot
+ *     git operations (fetch / pull). Used when `envKey === "GIT"`.
+ *
+ * Env values are parsed as integer milliseconds. Non-numeric or non-positive
+ * values are ignored (the explicit `softMs` / `hardMs` defaults from the
+ * caller win in that case).
+ *
+ * Pattern guarantee: timers cleared on resolve / reject so the function
+ * holds no refs after settlement. Important because `ouro up` chains
+ * many of these and a leaking timer would block process exit.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runWithTimeouts = runWithTimeouts;
+function readEnvMs(name) {
+    const raw = process.env[name];
+    if (raw === undefined || raw === null)
+        return null;
+    const parsed = Number.parseInt(raw, 10);
+    if (!Number.isFinite(parsed) || parsed <= 0)
+        return null;
+    return parsed;
+}
+function resolveTimeouts(options) {
+    let softMs = options.softMs;
+    let hardMs = options.hardMs;
+    if (options.envKey === "GIT") {
+        const envSoft = readEnvMs("OURO_BOOT_TIMEOUT_GIT_SOFT");
+        if (envSoft !== null)
+            softMs = envSoft;
+        const envHard = readEnvMs("OURO_BOOT_TIMEOUT_GIT_HARD");
+        if (envHard !== null)
+            hardMs = envHard;
+    }
+    return { softMs, hardMs };
+}
+/**
+ * Run `fn` with soft and hard timeouts.
+ *
+ * - Returns `{ result }` on success.
+ * - Returns `{ classification: "timeout-hard", warnings }` when aborted.
+ * - Returns `{ result, warnings: [...] }` when soft tripped but op completed.
+ * - Rejects when `fn` throws a non-abort error (callers can wrap with
+ *   classifier).
+ */
+async function runWithTimeouts(fn, options) {
+    const { softMs, hardMs } = resolveTimeouts(options);
+    const controller = new AbortController();
+    const warnings = [];
+    let softTimer = setTimeout(() => {
+        softTimer = null;
+        warnings.push(`${options.label}: soft timeout exceeded (${softMs}ms) — warning, continuing until hard cut`);
+    }, softMs);
+    let hardTimer = setTimeout(() => {
+        hardTimer = null;
+        controller.abort();
+    }, hardMs);
+    const cleanup = () => {
+        if (softTimer !== null) {
+            clearTimeout(softTimer);
+            softTimer = null;
+        }
+        if (hardTimer !== null) {
+            clearTimeout(hardTimer);
+            hardTimer = null;
+        }
+    };
+    try {
+        const result = await fn(controller.signal);
+        cleanup();
+        // If the abort fired and the op resolved gracefully (e.g., the inner
+        // function caught the AbortError and returned a structured result), we
+        // still classify the outcome as timeout-hard — the op was aborted from
+        // the caller's perspective even if no exception propagated. The caller
+        // can ignore the classification and use `result` if both are present.
+        if (controller.signal.aborted) {
+            return { classification: "timeout-hard", warnings };
+        }
+        return { result, warnings };
+    }
+    catch (err) {
+        cleanup();
+        if (controller.signal.aborted) {
+            // Hard timeout fired — abort wins over whatever error the op threw.
+            return { classification: "timeout-hard", warnings };
+        }
+        throw err;
+    }
+}

package/dist/heart/tool-activity-callbacks.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createToolActivityCallbacks = createToolActivityCallbacks;
+const tool_description_1 = require("./tool-description");
+const runtime_1 = require("../nerves/runtime");
+function createToolActivityCallbacks(options) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.tool_activity_callbacks_created",
+        message: "tool activity callbacks initialized",
+        meta: {},
+    });
+    // Track the last description so we can reference it in END messages
+    let lastDescription = null;
+    // Track in-flight hidden tools so onToolEnd can SYMMETRICALLY suppress
+    // emission for the same tools that onToolStart already suppresses.
+    // Without this, a rejected hidden tool (e.g. settle blocked by the
+    // mustResolveBeforeHandoff gate or the private-runtime attention-queue gate)
+    // would emit "✗ <previous visible tool's description> — <hidden tool's args summary>"
+    // because lastDescription persists across calls and the hidden tool's summary
+    // (built via summarizeArgs) leaks args like settle's `answer`/`intent` into
+    // the visible chat. Counter map (not bool) so concurrent hidden starts don't
+    // underflow if ends arrive in any order.
+    const hiddenInFlight = new Map();
+    return {
+        onToolStart(name, args) {
+            const description = (0, tool_description_1.humanReadableToolDescription)(name, args);
+            if (description === null) {
+                // hidden tool (settle, rest, descend, observe, speak) — track so the
+                // matching onToolEnd is also suppressed symmetrically.
+                hiddenInFlight.set(name, (hiddenInFlight.get(name) ?? 0) + 1);
+                return;
+            }
+            lastDescription = description;
+            options.onDescription(description);
+        },
+        onToolEnd(name, summary, success) {
+            const hiddenCount = hiddenInFlight.get(name) ?? 0;
+            if (hiddenCount > 0) {
+                // Hidden tool's start was suppressed; suppress its end too.
+                if (hiddenCount === 1)
+                    hiddenInFlight.delete(name);
+                else
+                    hiddenInFlight.set(name, hiddenCount - 1);
+                return;
+            }
+            const desc = lastDescription ?? name;
+            // Strip trailing "..." from description for the result line
+            const cleanDesc = desc.endsWith("...") ? desc.slice(0, -3) : desc;
+            if (!success) {
+                options.onFailure(`✗ ${cleanDesc} — ${summary}`);
+                return;
+            }
+            if (options.isDebug()) {
+                options.onResult(`✓ ${cleanDesc}`);
+            }
+        },
+    };
+}

package/dist/heart/tool-approval.js

@@ -0,0 +1,375 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApprovalExecutionFailedError = exports.ApprovalExecutionIndeterminateError = void 0;
+exports.coordinateApprovalDecision = coordinateApprovalDecision;
+exports.digestApprovalSuspensionCheckpointPayload = digestApprovalSuspensionCheckpointPayload;
+exports.commitApprovalProposal = commitApprovalProposal;
+exports.recoverApprovalProposals = recoverApprovalProposals;
+exports.digestApprovalToolDefinition = digestApprovalToolDefinition;
+exports.executeApprovalDecision = executeApprovalDecision;
+exports.recoverClaimedApproval = recoverClaimedApproval;
+exports.recoverAttemptedApproval = recoverAttemptedApproval;
+const node_crypto_1 = require("node:crypto");
+const approval_store_1 = require("./approval-store");
+const runtime_1 = require("../nerves/runtime");
+const tool_arguments_1 = require("../repertoire/tool-arguments");
+class ApprovalExecutionIndeterminateError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ApprovalExecutionIndeterminateError";
+    }
+}
+exports.ApprovalExecutionIndeterminateError = ApprovalExecutionIndeterminateError;
+class ApprovalExecutionFailedError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ApprovalExecutionFailedError";
+    }
+}
+exports.ApprovalExecutionFailedError = ApprovalExecutionFailedError;
+async function coordinateApprovalDecision(options) {
+    return options.withSessionLease(async (lease) => {
+        let currentSessionRevision = options.readCurrentRevision();
+        const record = await options.decideAndExecute({
+            currentSessionRevision,
+            lease,
+            hooks: {
+                afterClaim: async () => {
+                    currentSessionRevision = options.readCurrentRevision();
+                },
+            },
+        });
+        await options.persist?.(record);
+        await options.resume(record);
+        (0, runtime_1.emitNervesEvent)({
+            component: "engine",
+            event: "engine.approval_decision_coordinated",
+            message: "approval decision coordinated under session turn lease",
+            meta: { approvalId: record.approvalId, state: record.state },
+        });
+        return { record };
+    });
+}
+function checkpointMatches(record, checkpoint) {
+    return checkpoint.approvalId === record.approvalId
+        && checkpoint.checkpointDigest === record.checkpointDigest
+        && checkpoint.baseSessionRevision === record.baseSessionRevision
+        && (record.state === "preparing" || checkpoint.suspendedSessionRevision === record.suspendedSessionRevision)
+        && checkpoint.argumentDigest === record.argumentDigest
+        && checkpoint.schemaDigest === record.schemaDigest
+        && checkpoint.toolDigest === record.toolDigest
+        && checkpoint.policyDigest === record.policyDigest
+        && checkpoint.preCallDigest === digestTranscript(checkpoint.preCallMessages)
+        && record.checkpointDigest === digestApprovalSuspensionCheckpointPayload(checkpoint)
+        && JSON.stringify(checkpoint.frozenAssistantMessage) === JSON.stringify(record.frozenAssistantMessage);
+}
+function frozenCallMatches(record, checkpoint) {
+    const message = checkpoint.frozenAssistantMessage;
+    if (message.role !== "assistant")
+        return false;
+    if (!Array.isArray(message.tool_calls) || message.tool_calls.length !== 1)
+        return false;
+    const call = message.tool_calls[0];
+    if (!call || typeof call !== "object" || Array.isArray(call))
+        return false;
+    const callRecord = call;
+    if (callRecord.type !== "function")
+        return false;
+    const fn = callRecord.function;
+    if (!fn || typeof fn !== "object" || Array.isArray(fn))
+        return false;
+    const functionRecord = fn;
+    if (callRecord.id !== record.toolCallId || functionRecord.name !== record.toolName || typeof functionRecord.arguments !== "string")
+        return false;
+    try {
+        const parsed = JSON.parse(functionRecord.arguments);
+        return JSON.stringify(parsed) === JSON.stringify(record.arguments);
+    }
+    catch {
+        return false;
+    }
+}
+function digestTranscript(messages) {
+    return (0, node_crypto_1.createHash)("sha256").update(JSON.stringify(messages), "utf8").digest("hex");
+}
+function digestApprovalSuspensionCheckpointPayload(checkpoint) {
+    return (0, node_crypto_1.createHash)("sha256").update(JSON.stringify({
+        baseSessionRevision: checkpoint.baseSessionRevision,
+        argumentDigest: checkpoint.argumentDigest,
+        schemaDigest: checkpoint.schemaDigest,
+        toolDigest: checkpoint.toolDigest,
+        policyDigest: checkpoint.policyDigest,
+        preCallDigest: checkpoint.preCallDigest,
+        preCallMessages: checkpoint.preCallMessages,
+        frozenAssistantMessage: checkpoint.frozenAssistantMessage,
+    }), "utf8").digest("hex");
+}
+function digestDecisionToken(token) {
+    return (0, node_crypto_1.createHash)("sha256").update(token, "utf8").digest("hex");
+}
+function commitApprovalProposal(options) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.approval_proposal_commit_start",
+        message: "approval proposal commit started",
+        meta: { toolName: options.proposal.toolName, toolCallId: options.proposal.toolCallId },
+    });
+    const preCallDigest = digestTranscript(options.preCallMessages);
+    const checkpointDigest = digestApprovalSuspensionCheckpointPayload({
+        baseSessionRevision: options.proposal.baseSessionRevision,
+        argumentDigest: (0, approval_store_1.canonicalApprovalArguments)(options.proposal.arguments).digest,
+        schemaDigest: options.proposal.schemaDigest,
+        toolDigest: options.proposal.toolDigest,
+        policyDigest: options.proposal.policyDigest,
+        preCallDigest,
+        preCallMessages: options.preCallMessages,
+        frozenAssistantMessage: options.proposal.frozenAssistantMessage,
+    });
+    const prepared = options.approvalStore.prepare({ ...options.proposal, checkpointDigest });
+    options.hooks?.afterJournalPrepare?.();
+    options.tokenStore.put(prepared.record.approvalId, prepared.decisionToken);
+    options.hooks?.afterTokenPersist?.();
+    const attestation = options.checkpointStore.write({
+        approvalId: prepared.record.approvalId,
+        baseSessionRevision: prepared.record.baseSessionRevision,
+        argumentDigest: prepared.record.argumentDigest,
+        schemaDigest: prepared.record.schemaDigest,
+        toolDigest: prepared.record.toolDigest,
+        policyDigest: prepared.record.policyDigest,
+        preCallDigest,
+        preCallMessages: structuredClone(options.preCallMessages),
+        frozenAssistantMessage: structuredClone(prepared.record.frozenAssistantMessage),
+    });
+    options.hooks?.afterCheckpointWrite?.();
+    if (attestation.checkpointDigest !== prepared.record.checkpointDigest) {
+        options.tokenStore.remove(prepared.record.approvalId);
+        options.checkpointStore.remove(prepared.record.approvalId);
+        options.approvalStore.recoverPreparing({
+            approvalId: prepared.record.approvalId,
+            state: "drifted",
+            reason: "checkpoint attestation digest mismatch",
+        });
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "engine",
+            event: "engine.approval_checkpoint_attestation_mismatch",
+            message: "approval checkpoint durability attestation did not match proposal",
+            meta: { approvalId: prepared.record.approvalId },
+        });
+        throw new approval_store_1.ApprovalStoreError("checkpoint_attestation_mismatch");
+    }
+    const record = options.approvalStore.activate({
+        approvalId: prepared.record.approvalId,
+        checkpointDigest: attestation.checkpointDigest,
+        suspendedSessionRevision: attestation.suspendedSessionRevision,
+    });
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.approval_proposal_commit_end",
+        message: "approval proposal checkpoint activated",
+        meta: { approvalId: record.approvalId },
+    });
+    return { record, decisionToken: prepared.decisionToken };
+}
+function recoverApprovalProposals(options) {
+    const recovered = [];
+    const preparing = options.approvalStore.listPreparing();
+    const preparingIds = new Set(preparing.map((record) => record.approvalId));
+    for (const checkpoint of options.checkpointStore.list()) {
+        if (preparingIds.has(checkpoint.approvalId) || options.approvalStore.read(checkpoint.approvalId))
+            continue;
+        options.checkpointStore.remove(checkpoint.approvalId);
+        recovered.push({ approvalId: checkpoint.approvalId, state: "orphan_checkpoint_removed" });
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "engine",
+            event: "engine.approval_orphan_checkpoint_removed",
+            message: "removed approval checkpoint with no journal authority",
+            meta: { approvalId: checkpoint.approvalId },
+        });
+    }
+    for (const record of preparing) {
+        const checkpoint = options.checkpointStore.read(record.approvalId);
+        const token = options.tokenStore.get(record.approvalId);
+        const hasToken = token !== null;
+        const tokenMatches = token !== null && digestDecisionToken(token) === record.decisionTokenDigest;
+        if (checkpoint && tokenMatches && checkpointMatches(record, checkpoint)) {
+            const activated = options.approvalStore.activate({
+                approvalId: record.approvalId,
+                checkpointDigest: checkpoint.checkpointDigest,
+                suspendedSessionRevision: checkpoint.suspendedSessionRevision,
+            });
+            recovered.push({ approvalId: record.approvalId, state: activated.state });
+            continue;
+        }
+        options.tokenStore.remove(record.approvalId);
+        if (checkpoint)
+            options.checkpointStore.remove(record.approvalId);
+        const checkpointMismatch = checkpoint !== null && !checkpointMatches(record, checkpoint);
+        const tokenMismatch = hasToken && !tokenMatches;
+        const mismatch = checkpointMismatch || tokenMismatch;
+        const terminal = options.approvalStore.recoverPreparing({
+            approvalId: record.approvalId,
+            state: mismatch ? "drifted" : "abandoned_before_attempt",
+            reason: tokenMismatch ? "decision token evidence mismatch" : mismatch ? "checkpoint evidence mismatch" : "incomplete proposal commit",
+        });
+        recovered.push({ approvalId: record.approvalId, state: terminal.state });
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.approval_proposal_recovery",
+        message: "approval proposal recovery scan completed",
+        meta: { recoveredCount: recovered.length },
+    });
+    return recovered;
+}
+function terminalizeClaimed(store, claimed, state, reason) {
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "engine",
+        event: "engine.approval_pre_attempt_terminalized",
+        message: "approval stopped during live revalidation",
+        meta: { approvalId: claimed.approvalId, state, reason },
+    });
+    return store.terminalizeBeforeAttempt({
+        approvalId: claimed.approvalId,
+        ownerId: claimed.ownerId,
+        epoch: claimed.epoch,
+        state,
+        reason,
+    });
+}
+function digestApprovalToolDefinition(definition, schemaDigest, policyId) {
+    const binding = definition.mcpBinding;
+    return (0, tool_arguments_1.digestJson)({
+        name: definition.tool.function.name, schemaDigest, policyId, advertisedTool: JSON.parse(JSON.stringify(definition.tool)),
+        ...(binding ? { mcp: {
+                agentName: binding.agentName, agentRoot: binding.agentRoot,
+                server: binding.server, rawName: binding.rawName, surfacedName: binding.surfacedName,
+                source: binding.source, pluginId: binding.pluginId ?? null,
+                configDigest: binding.configDigest,
+            } } : {}),
+    });
+}
+async function resolveApprovalTool(options, decided) {
+    const definition = await options.resolveTool(decided.toolName);
+    if (!definition || definition.tool.function.name !== decided.toolName) {
+        return { ok: false, reason: "tool identity drift" };
+    }
+    const schema = definition.tool.function.parameters;
+    if (!schema || typeof schema !== "object") {
+        return { ok: false, reason: "advertised schema missing" };
+    }
+    const validated = (0, tool_arguments_1.validateAdvertisedToolArguments)(JSON.stringify(decided.arguments), schema);
+    if (!validated.ok || validated.value.argumentDigest !== decided.argumentDigest
+        || validated.value.schemaDigest !== decided.schemaDigest) {
+        return { ok: false, reason: "tool arguments or schema drift" };
+    }
+    const policy = await options.resolveApprovalPolicy?.(decided.toolName, validated.value.arguments)
+        ?? definition.approvalPolicy?.(validated.value.arguments)
+        ?? { kind: "not_required" };
+    if (policy.kind !== "required") {
+        return { ok: false, reason: "approval policy no longer requires approval" };
+    }
+    const toolDigest = digestApprovalToolDefinition(definition, validated.value.schemaDigest, policy.policyId);
+    const policyDigest = (0, tool_arguments_1.digestJson)({ policyId: policy.policyId, actionClass: policy.actionClass, classification: "required" });
+    if (policy.policyId !== decided.policyId || toolDigest !== decided.toolDigest || policyDigest !== decided.policyDigest) {
+        return { ok: false, reason: "approval policy or tool digest drift" };
+    }
+    return { ok: true, definition, arguments: validated.value.arguments };
+}
+async function executeApprovalDecision(options) {
+    const decided = options.approvalStore.decide({ ...options.decision, ownerId: options.ownerId });
+    if (decided.state !== "claimed")
+        return decided;
+    await options.hooks?.afterClaim?.();
+    if (options.currentSessionRevision !== decided.suspendedSessionRevision) {
+        return terminalizeClaimed(options.approvalStore, decided, "session_head_changed", "suspended session revision changed");
+    }
+    const checkpoint = options.checkpointStore.read(decided.approvalId);
+    if (!checkpoint || !checkpointMatches(decided, checkpoint) || !frozenCallMatches(decided, checkpoint)) {
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", "checkpoint evidence drift");
+    }
+    const current = await resolveApprovalTool(options, decided);
+    if (!current.ok)
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", current.reason);
+    const context = {
+        record: structuredClone(decided),
+        checkpoint: structuredClone(checkpoint),
+        definition: current.definition,
+        arguments: structuredClone(current.arguments),
+    };
+    const guard = await options.liveGuard(context);
+    if (!guard.ok)
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", guard.reason);
+    const risk = await options.liveRisk(context);
+    if (!risk.ok)
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", risk.reason);
+    const fresh = await resolveApprovalTool(options, decided);
+    if (!fresh.ok)
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", fresh.reason);
+    const preflight = options.preflight
+        ? await options.preflight({ ...context, definition: fresh.definition, arguments: structuredClone(fresh.arguments) })
+        : { ok: false, reason: "canonical tool preflight is unavailable" };
+    if (!preflight.ok)
+        return terminalizeClaimed(options.approvalStore, decided, "drifted", preflight.reason);
+    const attempted = options.approvalStore.markAttempted({
+        approvalId: decided.approvalId,
+        ownerId: decided.ownerId,
+        epoch: decided.epoch,
+    });
+    await options.hooks?.afterAttempt?.();
+    let result;
+    try {
+        result = await options.execute(attempted.toolName, structuredClone(attempted.arguments));
+    }
+    catch (error) {
+        if (!(error instanceof ApprovalExecutionFailedError))
+            throw error;
+        result = { kind: "handler_failed", text: `error: ${error.message}`, error };
+    }
+    if (!result || typeof result.text !== "string"
+        || !["rejected_before_handler", "handler_succeeded", "handler_failed", "handler_indeterminate"].includes(result.kind)) {
+        throw new ApprovalExecutionIndeterminateError("executor returned an invalid typed outcome; action was not retried");
+    }
+    const state = result.kind === "handler_succeeded" ? "succeeded"
+        : result.kind === "handler_indeterminate" ? "attempted_indeterminate" : "failed";
+    const emptyText = {
+        rejected_before_handler: "tool preflight rejected execution",
+        handler_succeeded: "action completed without output",
+        handler_failed: "action failed without details",
+        handler_indeterminate: "execution outcome is indeterminate; action was not retried",
+    };
+    const text = result.text.trim() ? result.text : emptyText[result.kind];
+    await options.hooks?.afterHandler?.();
+    return options.approvalStore.complete({
+        approvalId: attempted.approvalId,
+        ownerId: attempted.ownerId,
+        epoch: attempted.epoch,
+        state,
+        result: result.kind === "rejected_before_handler" ? `no action was taken: ${text}` : text,
+    });
+}
+function recoverClaimedApproval(options) {
+    const record = options.approvalStore.read(options.approvalId);
+    if (!record || record.state !== "claimed" || !record.ownerId)
+        throw new approval_store_1.ApprovalStoreError("claimed_recovery_not_eligible");
+    return options.approvalStore.abandonBeforeAttempt({
+        approvalId: record.approvalId,
+        ownerId: record.ownerId,
+        epoch: record.epoch,
+        reason: options.reason,
+    });
+}
+function recoverAttemptedApproval(options) {
+    const record = options.approvalStore.read(options.approvalId);
+    if (!record || record.state !== "attempted" || !record.ownerId)
+        throw new approval_store_1.ApprovalStoreError("attempted_recovery_not_eligible");
+    return options.approvalStore.complete({
+        approvalId: record.approvalId,
+        ownerId: record.ownerId,
+        epoch: record.epoch,
+        state: "attempted_indeterminate",
+        result: "execution outcome is indeterminate after restart; action was not retried",
+    });
+}