@ouro.bot/cli 0.1.0-alpha.807 → 0.1.0-alpha.809

package/dist/heart/mailbox/readers/sessions.js

@@ -121,7 +121,6 @@ function resolveAllSessionPaths(sessionsDir) {
     return results;
 }
 /* v8 ignore stop */
-/* v8 ignore start — defensive parsing */
 function readSessionInventory(agentName, options = {}) {
     const bundlesRoot = options.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
     const now = options.now?.() ?? new Date();
@@ -134,7 +133,7 @@ function readSessionInventory(agentName, options = {}) {
         if (friendId === "self" && channel === "inner")
             continue;
         const envelope = (0, shared_1.readSessionEnvelope)(sessionPath);
-        const events = envelope?.events ?? [];
+        const events = (0, session_events_1.selectEffectiveSessionEvents)(envelope?.events ?? []);
         const chronology = (0, session_events_1.deriveSessionChronology)(events);
         const lastUsage = parseSessionUsage(envelope?.lastUsage);
         const continuity = parseSessionContinuity(envelope?.state);
@@ -213,7 +212,7 @@ function readSessionTranscript(agentName, friendId, channel, key, options = {})
     const envelope = (0, shared_1.readSessionEnvelope)(sessionPath);
     if (!envelope)
         return null;
-    const rawMessages = envelope.events;
+    const rawMessages = (0, session_events_1.selectEffectiveSessionEvents)(envelope.events);
     const friendsDir = path.join(agentRoot, "friends");
     const friendName = (0, shared_1.resolveFriendName)(friendsDir, friendId);
     const messages = rawMessages;

package/dist/heart/session-activity.js

@@ -81,7 +81,9 @@ function parseFriendActivity(sessionPath, activeThresholdMs, nowMs) {
     }
     const envelope = (0, session_events_1.loadSessionEnvelopeFile)(sessionPath);
     const chronology = envelope ? (0, session_events_1.deriveSessionChronology)(envelope.events) : null;
-    const explicit = envelope?.state.lastFriendActivityAt;
+    const explicit = envelope && envelope.events.length > 0 && (0, session_events_1.selectEffectiveSessionEvents)(envelope.events).length !== envelope.events.length
+        ? chronology?.lastInboundAt
+        : envelope?.state.lastFriendActivityAt;
     if (typeof explicit === "string") {
         const parsedMs = Date.parse(explicit);
         if (Number.isFinite(parsedMs)) {

package/dist/heart/session-events.js

@@ -61,12 +61,15 @@ exports.extractEventText = extractEventText;
 exports.deriveSessionChronology = deriveSessionChronology;
 exports.describeCurrentSessionTiming = describeCurrentSessionTiming;
 exports.migrateLegacySessionEnvelope = migrateLegacySessionEnvelope;
+exports.isExactRawSessionRedactionMarker = isExactRawSessionRedactionMarker;
+exports.selectEffectiveSessionEvents = selectEffectiveSessionEvents;
 exports.parseSessionEnvelope = parseSessionEnvelope;
 exports.loadSessionEnvelopeFile = loadSessionEnvelopeFile;
 exports.buildCanonicalSessionEnvelope = buildCanonicalSessionEnvelope;
 exports.appendSyntheticAssistantEvent = appendSyntheticAssistantEvent;
 const fs = __importStar(require("fs"));
 const node_crypto_1 = require("node:crypto");
+const node_util_1 = require("node:util");
 const runtime_1 = require("../nerves/runtime");
 const structured_output_1 = require("./structured-output");
 const APPROVAL_TERMINAL_TEXT = {
@@ -942,12 +945,15 @@ function projectedSessionEventIds(envelope) {
         ? envelope.projection.eventIds
         : envelope.events.map((event) => event.id);
 }
-function projectProviderMessages(envelope) {
+function providerProjectionEvents(envelope) {
     const eventIds = projectedSessionEventIds(envelope);
-    const byId = new Map(envelope.events.map((event) => [event.id, event]));
+    const byId = new Map(selectEffectiveSessionEvents(envelope.events).map((event) => [event.id, event]));
     return eventIds
         .map((id) => byId.get(id))
-        .filter((event) => Boolean(event))
+        .filter((event) => Boolean(event));
+}
+function projectProviderMessages(envelope) {
+    return providerProjectionEvents(envelope)
         .map((event) => toProviderMessage({
         role: event.role,
         content: event.content,
@@ -962,11 +968,7 @@ function projectProviderMessages(envelope) {
  * System and tool messages are untouched.
  */
 function annotateMessageTimestamps(envelope, messages, nowMs = Date.now()) {
-    const eventIds = projectedSessionEventIds(envelope);
-    const byId = new Map(envelope.events.map((event) => [event.id, event]));
-    const events = eventIds
-        .map((id) => byId.get(id))
-        .filter((event) => Boolean(event));
+    const events = providerProjectionEvents(envelope);
     return messages.map((msg, i) => {
         const event = events[i];
         if (!event)
@@ -1012,6 +1014,7 @@ function extractEventText(event) {
     return contentText(event.content);
 }
 function deriveSessionChronology(events) {
+    events = selectEffectiveSessionEvents(events);
     let lastInboundAt = null;
     let lastOutboundAt = null;
     let lastActivityAt = null;
@@ -1081,6 +1084,139 @@ function migrateLegacySessionEnvelope(raw, options) {
         state: normalizeContinuityState(legacy.state),
     };
 }
+function normalizeSessionEvent(event, index, recordedAt) {
+    const role = normalizeRole(event.role);
+    const time = event.time;
+    const relations = event.relations;
+    const provenance = event.provenance;
+    const content = sanitizeConversationContent(role, normalizeContent(event.content));
+    return {
+        id: typeof event.id === "string" ? event.id : makeEventId(index + 1),
+        sequence: typeof event.sequence === "number" ? event.sequence : index + 1,
+        role,
+        content,
+        name: typeof event.name === "string" ? event.name : null,
+        toolCallId: typeof event.toolCallId === "string" ? event.toolCallId : null,
+        toolCalls: normalizeToolCalls(event.toolCalls),
+        attachments: Array.isArray(event.attachments) ? event.attachments.filter((item) => typeof item === "string") : [],
+        time: {
+            authoredAt: typeof time?.authoredAt === "string" ? time.authoredAt : null,
+            authoredAtSource: typeof time?.authoredAtSource === "string" ? time.authoredAtSource : "unknown",
+            observedAt: typeof time?.observedAt === "string" ? time.observedAt : null,
+            observedAtSource: typeof time?.observedAtSource === "string" ? time.observedAtSource : "unknown",
+            recordedAt: typeof time?.recordedAt === "string" ? time.recordedAt : recordedAt,
+            recordedAtSource: typeof time?.recordedAtSource === "string" ? time.recordedAtSource : "save",
+        },
+        relations: {
+            replyToEventId: typeof relations?.replyToEventId === "string" ? relations.replyToEventId : null,
+            threadRootEventId: typeof relations?.threadRootEventId === "string" ? relations.threadRootEventId : null,
+            references: Array.isArray(relations?.references) ? relations.references.filter((item) => typeof item === "string") : [],
+            toolCallId: typeof relations?.toolCallId === "string" ? relations.toolCallId : null,
+            supersedesEventId: typeof relations?.supersedesEventId === "string" ? relations.supersedesEventId : null,
+            redactsEventId: typeof relations?.redactsEventId === "string" ? relations.redactsEventId : null,
+        },
+        provenance: {
+            captureKind: typeof provenance?.captureKind === "string" ? provenance.captureKind : "live",
+            legacyVersion: typeof provenance?.legacyVersion === "number" ? provenance.legacyVersion : null,
+            sourceMessageIndex: typeof provenance?.sourceMessageIndex === "number" ? provenance.sourceMessageIndex : null,
+        },
+    };
+}
+function exactKeys(value, keys) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        && Reflect.ownKeys(value).length === keys.length
+        && keys.every((key) => Object.prototype.hasOwnProperty.call(value, key));
+}
+function nonblank(value) {
+    return typeof value === "string" && value.trim().length > 0;
+}
+function exactIsoTime(value) {
+    return typeof value === "string" && Number.isFinite(Date.parse(value)) && new Date(value).toISOString() === value;
+}
+function exactRawEvent(value, index) {
+    if (!exactKeys(value, ["id", "sequence", "role", "content", "name", "toolCallId", "toolCalls", "attachments", "time", "relations", "provenance"]))
+        return false;
+    if (!nonblank(value.id) || !Number.isSafeInteger(value.sequence) || Number(value.sequence) <= 0
+        || typeof value.role !== "string" || !["system", "user", "assistant", "tool"].includes(value.role)
+        || !(value.name === null || typeof value.name === "string") || !(value.toolCallId === null || typeof value.toolCallId === "string")
+        || !(value.content === null || typeof value.content === "string" || Array.isArray(value.content))
+        || !Array.isArray(value.attachments) || !value.attachments.every((item) => typeof item === "string")
+        || !Array.isArray(value.toolCalls))
+        return false;
+    for (const call of value.toolCalls) {
+        if (!exactKeys(call, ["id", "type", "function"]) || !nonblank(call.id) || call.type !== "function"
+            || !exactKeys(call.function, ["name", "arguments"]) || !nonblank(call.function.name) || typeof call.function.arguments !== "string")
+            return false;
+    }
+    const time = value.time;
+    if (!exactKeys(time, ["authoredAt", "authoredAtSource", "observedAt", "observedAtSource", "recordedAt", "recordedAtSource"])
+        || !(time.authoredAt === null || exactIsoTime(time.authoredAt))
+        || !(time.observedAt === null || exactIsoTime(time.observedAt)) || !exactIsoTime(time.recordedAt))
+        return false;
+    for (const key of ["authoredAtSource", "observedAtSource", "recordedAtSource"]) {
+        if (typeof time[key] !== "string" || !["unknown", "local", "ingest", "migration", "save"].includes(time[key]))
+            return false;
+    }
+    const relations = value.relations;
+    if (!exactKeys(relations, ["replyToEventId", "threadRootEventId", "references", "toolCallId", "supersedesEventId", "redactsEventId"])
+        || !Array.isArray(relations.references) || !relations.references.every((item) => typeof item === "string"))
+        return false;
+    for (const key of ["replyToEventId", "threadRootEventId", "toolCallId", "supersedesEventId", "redactsEventId"]) {
+        if (relations[key] !== null && typeof relations[key] !== "string")
+            return false;
+    }
+    const provenance = value.provenance;
+    if (!exactKeys(provenance, ["captureKind", "legacyVersion", "sourceMessageIndex"])
+        || typeof provenance.captureKind !== "string" || !["live", "synthetic", "migration"].includes(provenance.captureKind)
+        || !(provenance.legacyVersion === null || Number.isSafeInteger(provenance.legacyVersion) && Number(provenance.legacyVersion) > 0)
+        || !(provenance.sourceMessageIndex === null || Number.isSafeInteger(provenance.sourceMessageIndex) && Number(provenance.sourceMessageIndex) >= 0))
+        return false;
+    return (0, node_util_1.isDeepStrictEqual)(value, normalizeSessionEvent(value, index, time.recordedAt));
+}
+function isExactRawSessionRedactionMarker(candidate, rawEvents) {
+    if (!candidate || typeof candidate !== "object" || candidate.role !== "system"
+        || !exactRawEvent(candidate, 0) || candidate.content !== null || candidate.name !== null || candidate.toolCallId !== null
+        || candidate.toolCalls.length !== 0 || candidate.attachments.length !== 0
+        || candidate.time.authoredAt !== null || candidate.time.observedAt !== null
+        || candidate.time.authoredAtSource !== "migration" || candidate.time.observedAtSource !== "migration" || candidate.time.recordedAtSource !== "migration"
+        || candidate.provenance.captureKind !== "migration" || candidate.provenance.legacyVersion !== 2 || candidate.provenance.sourceMessageIndex !== null
+        || candidate.relations.replyToEventId !== null || candidate.relations.threadRootEventId !== null || candidate.relations.references.length !== 0
+        || candidate.relations.toolCallId !== null || candidate.relations.supersedesEventId !== null || !nonblank(candidate.relations.redactsEventId)
+        || !Array.isArray(rawEvents))
+        return false;
+    const ids = new Set();
+    let previousSequence = 0;
+    for (const raw of rawEvents) {
+        if (!raw || typeof raw !== "object")
+            return false;
+        const event = raw;
+        if (!nonblank(event.id) || ids.has(event.id) || !Number.isSafeInteger(event.sequence) || Number(event.sequence) <= previousSequence)
+            return false;
+        ids.add(event.id);
+        previousSequence = Number(event.sequence);
+    }
+    const candidateIndex = rawEvents.findIndex((raw) => raw.id === candidate.id);
+    if (candidateIndex < 0 || !(0, node_util_1.isDeepStrictEqual)(rawEvents[candidateIndex], candidate))
+        return false;
+    const targetIndex = rawEvents.findIndex((raw) => raw.id === candidate.relations.redactsEventId);
+    if (targetIndex < 0 || targetIndex >= candidateIndex)
+        return false;
+    const target = rawEvents[targetIndex];
+    if (!exactRawEvent(target, targetIndex) || target.role !== "user" || target.relations.redactsEventId !== null)
+        return false;
+    const attempts = rawEvents.map((raw) => raw.relations?.redactsEventId);
+    return attempts.filter((id) => id === target.id).length === 1 && !attempts.includes(candidate.id);
+}
+function selectEffectiveSessionEvents(events) {
+    const hidden = new Set();
+    for (const event of events) {
+        if (isExactRawSessionRedactionMarker(event, events)) {
+            hidden.add(event.id);
+            hidden.add(event.relations.redactsEventId);
+        }
+    }
+    return events.filter((event) => !hidden.has(event.id));
+}
 function parseSessionEnvelope(raw, options = {}) {
     const recordedAt = options.recordedAt ?? new Date().toISOString();
     const fileMtimeAt = options.fileMtimeAt ?? null;
@@ -1093,46 +1229,24 @@ function parseSessionEnvelope(raw, options = {}) {
     if (record.version !== 2 || !Array.isArray(record.events) || !record.projection || typeof record.projection !== "object") {
         return null;
     }
+    const validMarkers = new Set(record.events.filter((event) => isExactRawSessionRedactionMarker(event, record.events)));
+    let invalidMarkers = 0;
     const rawEvents = record.events
         .filter((event) => event != null && typeof event === "object")
         .map((event, index) => {
-        const role = normalizeRole(event.role);
-        const time = event.time;
-        const relations = event.relations;
-        const provenance = event.provenance;
-        const content = sanitizeConversationContent(role, normalizeContent(event.content));
-        return {
-            id: typeof event.id === "string" ? event.id : makeEventId(index + 1),
-            sequence: typeof event.sequence === "number" ? event.sequence : index + 1,
-            role,
-            content,
-            name: typeof event.name === "string" ? event.name : null,
-            toolCallId: typeof event.toolCallId === "string" ? event.toolCallId : null,
-            toolCalls: normalizeToolCalls(event.toolCalls),
-            attachments: Array.isArray(event.attachments) ? event.attachments.filter((item) => typeof item === "string") : [],
-            time: {
-                authoredAt: typeof time?.authoredAt === "string" ? time.authoredAt : null,
-                authoredAtSource: typeof time?.authoredAtSource === "string" ? time.authoredAtSource : "unknown",
-                observedAt: typeof time?.observedAt === "string" ? time.observedAt : null,
-                observedAtSource: typeof time?.observedAtSource === "string" ? time.observedAtSource : "unknown",
-                recordedAt: typeof time?.recordedAt === "string" ? time.recordedAt : recordedAt,
-                recordedAtSource: typeof time?.recordedAtSource === "string" ? time.recordedAtSource : "save",
-            },
-            relations: {
-                replyToEventId: typeof relations?.replyToEventId === "string" ? relations.replyToEventId : null,
-                threadRootEventId: typeof relations?.threadRootEventId === "string" ? relations.threadRootEventId : null,
-                references: Array.isArray(relations?.references) ? relations.references.filter((item) => typeof item === "string") : [],
-                toolCallId: typeof relations?.toolCallId === "string" ? relations.toolCallId : null,
-                supersedesEventId: typeof relations?.supersedesEventId === "string" ? relations.supersedesEventId : null,
-                redactsEventId: typeof relations?.redactsEventId === "string" ? relations.redactsEventId : null,
-            },
-            provenance: {
-                captureKind: typeof provenance?.captureKind === "string" ? provenance.captureKind : "live",
-                legacyVersion: typeof provenance?.legacyVersion === "number" ? provenance.legacyVersion : null,
-                sourceMessageIndex: typeof provenance?.sourceMessageIndex === "number" ? provenance.sourceMessageIndex : null,
-            },
-        };
+        const normalized = normalizeSessionEvent(event, index, recordedAt);
+        const attempted = event.relations?.redactsEventId;
+        if (attempted !== undefined && attempted !== null && !validMarkers.has(event)) {
+            normalized.relations.redactsEventId = null;
+            invalidMarkers++;
+        }
+        return normalized;
     });
+    if (invalidMarkers > 0)
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn", component: "heart", event: "session.redaction_marker_invalid",
+            message: "invalid raw redaction authority ignored", meta: { count: invalidMarkers },
+        });
     // Self-heal duplicate event ids that may have been written by concurrent
     // writers in older harness versions. Last-occurrence-wins by id (later
     // entries in the persisted file are the more recent state for that id).
@@ -1151,9 +1265,7 @@ function parseSessionEnvelope(raw, options = {}) {
             inputTokens: typeof projection.inputTokens === "number" ? projection.inputTokens : null,
             projectedAt: typeof projection.projectedAt === "string" ? projection.projectedAt : null,
         },
-        structuredOutputs: record.structuredOutputs === undefined
-            ? (0, structured_output_1.extractStructuredOutputsFromEvents)(events, { emitTelemetry: false })
-            : (0, structured_output_1.normalizeStructuredOutputs)(record.structuredOutputs),
+        structuredOutputs: (0, structured_output_1.extractStructuredOutputsFromEvents)(selectEffectiveSessionEvents(events), { emitTelemetry: false }),
         lastUsage: normalizeUsage(record.lastUsage),
         state: normalizeContinuityState(record.state),
         approvalSuspensions: normalizeApprovalSuspensions(record.approvalSuspensions),
@@ -1228,9 +1340,7 @@ function buildCanonicalSessionEnvelope(options) {
     const previousMessages = options.previousMessages;
     const currentMessages = options.currentMessages;
     const trimmedMessages = options.trimmedMessages;
-    const previousProjectionIds = existing?.projection.eventIds.length
-        ? [...existing.projection.eventIds]
-        : existing?.events.map((event) => event.id) ?? [];
+    const previousProjectionIds = existing ? providerProjectionEvents(existing).map((event) => event.id) : [];
     // Compare only non-system messages to find the common prefix.
     // System messages change every turn (live world-state in system prompt)
     // and must not defeat prefix matching of the actual conversation.
@@ -1278,21 +1388,23 @@ function buildCanonicalSessionEnvelope(options) {
     // Prune events: only keep events whose IDs are in the projection.
     // Events not in projection are returned as evicted for archiving.
     const projectionIdSet = new Set(projectionEventIds);
-    const prunedEvents = events.filter((event) => projectionIdSet.has(event.id));
-    const evictedEvents = events.filter((event) => !projectionIdSet.has(event.id));
+    const effectiveIds = new Set(selectEffectiveSessionEvents(events).map((event) => event.id));
+    const keep = (event) => projectionIdSet.has(event.id) || !effectiveIds.has(event.id);
+    const prunedEvents = events.filter(keep);
+    const evictedEvents = events.filter((event) => !keep(event));
     return {
         envelope: {
             version: 2,
             events: prunedEvents,
             projection: {
-                eventIds: projectionEventIds,
+                eventIds: projectionEventIds.filter((id) => effectiveIds.has(id)),
                 trimmed: projectionEventIds.length < currentEventIds.length,
                 maxTokens: options.projectionBasis.maxTokens,
                 contextMargin: options.projectionBasis.contextMargin,
                 inputTokens: options.projectionBasis.inputTokens,
                 projectedAt: options.recordedAt,
             },
-            structuredOutputs: (0, structured_output_1.extractStructuredOutputsFromEvents)(prunedEvents),
+            structuredOutputs: (0, structured_output_1.extractStructuredOutputsFromEvents)(selectEffectiveSessionEvents(prunedEvents)),
             lastUsage: normalizeUsage(options.lastUsage),
             state: normalizeContinuityState(options.state),
             approvalSuspensions: structuredClone(options.existing?.approvalSuspensions ?? []),
@@ -1309,7 +1421,7 @@ function appendSyntheticAssistantEvent(envelope, content, recordedAt) {
     return {
         ...envelope,
         events: [...envelope.events, event],
-        structuredOutputs: (0, structured_output_1.extractStructuredOutputsFromEvents)([...envelope.events, event]),
+        structuredOutputs: (0, structured_output_1.extractStructuredOutputsFromEvents)(selectEffectiveSessionEvents([...envelope.events, event])),
         projection: {
             ...envelope.projection,
             eventIds: [...envelope.projection.eventIds, event.id],

package/dist/heart/session-redaction-repair-cli-main.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const runtime_1 = require("../nerves/runtime");
+const session_redaction_repair_1 = require("./session-redaction-repair");
+// Deliberately a direct packaged entrypoint, never public CLI/model routing.
+async function main() {
+    const args = process.argv.slice(2);
+    (0, runtime_1.emitNervesEvent)({ component: "heart", event: "heart.session_redaction_repair_cli", message: "private fixed repair entrypoint invoked", meta: { argumentCount: args.length } });
+    try {
+        let result;
+        if (args.length === 7 && args[0] === "inspect" && args[1] === "--agent" && args[3] === "--session" && args[5] === "--artifacts-dir") {
+            result = await (0, session_redaction_repair_1.inspectA003SessionRepair)({ agent: args[2], sessionPath: args[4], artifactsDir: args[6] });
+        }
+        else if (args.length === 4 && args[0] === "apply" && args[1] === "--manifest-sha256") {
+            result = await (0, session_redaction_repair_1.applyA003SessionRepair)({ manifestSha256: args[2], manifestPath: args[3] });
+        }
+        else if (args.length === 5 && args[0] === "rollback" && args[1] === "--manifest-sha256") {
+            result = await (0, session_redaction_repair_1.rollbackA003SessionRepair)({ manifestSha256: args[2], manifestPath: args[3], preimagePath: args[4] });
+        }
+        else {
+            throw new Error("expected fixed inspect, apply, or rollback arguments");
+        }
+        process.stdout.write(`${JSON.stringify(result)}\n`);
+        process.exitCode = result.status === "indeterminate" || result.status === "not_applied" ? 1 : 0;
+    }
+    catch (error) {
+        process.stdout.write(`${JSON.stringify({ status: "refused", error: (error instanceof Error ? error.message : String(error)).slice(0, 512) })}\n`);
+        process.exitCode = 2;
+    }
+}
+void main();