@ouro.bot/cli 0.1.0-alpha.482 → 0.1.0-alpha.484

package/dist/heart/session-events.js

@@ -112,6 +112,24 @@ function normalizeContent(content) {
         .filter((part) => part != null && typeof part === "object")
         .map((part) => ({ ...part }));
 }
+const SYNTHETIC_TIMESTAMP_PREFIX_RE = /^(?:(?:\[(?:just now|-\d+[mhd])\])\s*)+/i;
+function stripSyntheticTimestampPrefix(text) {
+    return text.replace(SYNTHETIC_TIMESTAMP_PREFIX_RE, "");
+}
+function sanitizeConversationContent(role, content) {
+    if (role !== "user" && role !== "assistant")
+        return content;
+    if (typeof content === "string")
+        return stripSyntheticTimestampPrefix(content);
+    if (!Array.isArray(content))
+        return content;
+    return content.map((part) => {
+        if (part.type === "text" && typeof part.text === "string") {
+            return { ...part, text: stripSyntheticTimestampPrefix(part.text) };
+        }
+        return part;
+    });
+}
 function normalizeToolCalls(rawToolCalls) {
     if (!Array.isArray(rawToolCalls))
         return [];
@@ -141,10 +159,11 @@ function normalizeRole(role) {
 function normalizeMessage(message) {
     const record = message;
     const role = normalizeRole(record.role);
+    const normalizedContent = sanitizeConversationContent(role, normalizeContent(record.content));
     if (role === "assistant") {
         return {
             role,
-            content: normalizeContent(record.content),
+            content: normalizedContent,
             name: typeof record.name === "string" ? record.name : null,
             toolCallId: null,
             toolCalls: normalizeToolCalls(record.tool_calls),
@@ -163,7 +182,7 @@ function normalizeMessage(message) {
     }
     return {
         role,
-        content: normalizeContent(record.content) ?? "",
+        content: normalizedContent ?? "",
         name: typeof record.name === "string" ? record.name : null,
         toolCallId: null,
         toolCalls: [],
@@ -286,7 +305,7 @@ function repairSessionMessages(messages) {
     });
     return result.map(toProviderMessage);
 }
-function stripOrphanedToolResults(messages) {
+function repairToolCallSequences(messages) {
     const normalized = messages.map(normalizeMessage);
     const validCallIds = new Set();
     for (const msg of normalized) {
@@ -313,8 +332,74 @@ function stripOrphanedToolResults(messages) {
             meta: { removed },
         });
     }
+    let injected = 0;
+    for (let i = 0; i < repaired.length; i++) {
+        const msg = repaired[i];
+        if (msg.role !== "assistant" || msg.toolCalls.length === 0)
+            continue;
+        const resultIds = new Set();
+        for (let j = i + 1; j < repaired.length; j++) {
+            const following = repaired[j];
+            if (following.role === "tool" && following.toolCallId !== null) {
+                resultIds.add(following.toolCallId);
+                continue;
+            }
+            if (following.role === "assistant" || following.role === "user")
+                break;
+        }
+        const missing = msg.toolCalls.filter((toolCall) => !resultIds.has(toolCall.id));
+        if (missing.length === 0)
+            continue;
+        const syntheticResults = missing.map((toolCall) => ({
+            role: "tool",
+            content: "error: tool call was interrupted (previous turn timed out or was aborted)",
+            name: null,
+            toolCallId: toolCall.id,
+            toolCalls: [],
+            hadToolCallsField: false,
+        }));
+        let insertAt = i + 1;
+        while (insertAt < repaired.length && repaired[insertAt].role === "tool")
+            insertAt++;
+        repaired.splice(insertAt, 0, ...syntheticResults);
+        injected += syntheticResults.length;
+    }
+    if (injected > 0) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "info",
+            event: "mind.session_orphan_tool_call_repair",
+            component: "mind",
+            message: "injected synthetic tool results for orphaned tool calls",
+            meta: { injected },
+        });
+    }
     return repaired.map(toProviderMessage);
 }
+function canonicalizeSystemMessageSequence(messages) {
+    const normalized = messages.map(normalizeMessage);
+    const firstSystemIndex = normalized.findIndex((msg) => msg.role === "system");
+    if (firstSystemIndex === -1)
+        return normalized.map(toProviderMessage);
+    const extraSystemCount = normalized.filter((msg) => msg.role === "system").length - 1;
+    if (firstSystemIndex === 0 && extraSystemCount === 0) {
+        return normalized.map(toProviderMessage);
+    }
+    const primarySystem = normalized[firstSystemIndex];
+    const nonSystemMessages = normalized.filter((msg) => msg.role !== "system");
+    const repaired = [primarySystem, ...nonSystemMessages].map(toProviderMessage);
+    (0, runtime_1.emitNervesEvent)({
+        level: "info",
+        event: "mind.session_system_prompt_repair",
+        component: "mind",
+        message: "canonicalized session system prompt sequence",
+        meta: {
+            firstSystemIndex,
+            extraSystemCount,
+            finalMessageCount: repaired.length,
+        },
+    });
+    return repaired;
+}
 function migrateToolNames(messages) {
     const safeMessages = messages.filter((message) => Boolean(message) && typeof message === "object");
     let migrated = 0;
@@ -359,7 +444,7 @@ function sanitizeProviderMessages(messages) {
             meta: { violations },
         });
     }
-    return migrateToolNames(stripOrphanedToolResults(repairSessionMessages(normalized.map(toProviderMessage))));
+    return canonicalizeSystemMessageSequence(migrateToolNames(repairToolCallSequences(repairSessionMessages(normalized.map(toProviderMessage)))));
 }
 function stampIngressTime(msg) {
     msg._ingressAt = new Date().toISOString();
@@ -587,11 +672,12 @@ function parseSessionEnvelope(raw, options = {}) {
         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: normalizeContent(event.content),
+            content,
             name: typeof event.name === "string" ? event.name : null,
             toolCallId: typeof event.toolCallId === "string" ? event.toolCallId : null,
             toolCalls: normalizeToolCalls(event.toolCalls),

package/dist/heart/turn-context.js

@@ -60,6 +60,7 @@ const config_1 = require("./config");
 const daemon_health_1 = require("./daemon/daemon-health");
 const prompt_1 = require("../mind/prompt");
 const provider_visibility_1 = require("./provider-visibility");
+const mail_import_discovery_1 = require("./mail-import-discovery");
 // ── Helpers ─────────────────────────────────────────────────────────
 const DAEMON_SOCKET_PATH = "/tmp/ouroboros-daemon.sock";
 function isLiveCodingSessionStatus(status) {
@@ -271,6 +272,14 @@ async function buildTurnContext(input) {
         otherCodingSessions = [];
         /* v8 ignore stop */
     }
+    const backgroundOperations = (0, mail_import_discovery_1.listVisibleBackgroundOperations)({
+        agentName,
+        agentRoot,
+        repoRoot: process.cwd(),
+        homeDir: process.env.HOME,
+        nowMs: Date.now(),
+        limit: 5,
+    });
     // Inner work state
     const innerWorkState = readInnerWorkState();
     // Task board
@@ -333,6 +342,7 @@ async function buildTurnContext(input) {
             obligationCount: pendingObligations.length,
             bridgeCount: activeBridges.length,
             codingSessionCount: codingSessions.length,
+            backgroundOperationCount: backgroundOperations.length,
             episodeCount: recentEpisodes.length,
             providerLaneCount: providerVisibility.lanes.length,
         },
@@ -344,6 +354,7 @@ async function buildTurnContext(input) {
         pendingObligations,
         codingSessions,
         otherCodingSessions,
+        backgroundOperations,
         innerWorkState,
         taskBoard,
         returnObligations,

package/dist/mind/context.js

@@ -242,7 +242,7 @@ function loadSession(filePath) {
         if (!envelope)
             return null;
         return {
-            messages: (0, session_events_1.annotateMessageTimestamps)(envelope, (0, session_events_1.projectProviderMessages)(envelope)),
+            messages: (0, session_events_1.sanitizeProviderMessages)((0, session_events_1.projectProviderMessages)(envelope)),
             events: envelope.events,
             lastUsage: envelope.lastUsage ?? undefined,
             state: denormalizeContinuityState(envelope.state),

package/dist/mind/prompt.js

@@ -467,7 +467,7 @@ function senseRuntimeGuidance(channel, preReadStatusLines) {
     lines.push("mail setup AX: if a human asks me to set up email, I do not hand them a terminal checklist. I guide the flow end-to-end: name the current phase, run agent-runnable commands myself with shell/tools when available, ask the human only for human-required facts or browser actions, wait for their reply, verify the result, then continue.");
     lines.push("mail setup hard rule: never tell the human to run `ouro account ensure`, `ouro connect mail`, `ouro mail import-mbox`, `ouro status`, or `ouro doctor` for setup. Say what I am about to run, run it myself, and report the result. If my current surface cannot run shell/tools, I ask for a tool-capable Ouro setup session or companion to continue; I do not offload CLI operation to the human.");
     lines.push("mail setup truth: Agent Mail uses Mailroom, not HEY OAuth/IMAP. For the full work substrate account, the agent-runnable command is `ouro account ensure --agent <agent> --owner-email <email> --source hey`; use `ouro connect mail --agent <agent> --owner-email <email> --source hey` for mail-only repair/provisioning, or `--no-delegated-source` for native-only mail. The detailed runbook is `docs/agent-mail-setup.md`.");
-    lines.push("mail setup truth: HEY archive bootstrap is human-exported MBOX only. I ask for the browser-downloaded MBOX path, then I run `ouro mail import-mbox --file <path> --owner-email <email> --source hey --agent <agent>` myself and verify the import.");
+    lines.push("mail setup truth: HEY archive bootstrap still depends on HEY's browser-only export, but I should not offload path-discovery ceremony to the human. If browser MCP/Playwright downloaded the archive, I first try `ouro mail import-mbox --discover --owner-email <email> --source hey --agent <agent>` so Ouro can find the sandboxed copy in a repo/worktree `.playwright-mcp`, the home `.playwright-mcp`, or Downloads. If discovery cannot find a unique file, then I ask the human for the local MBOX path and run `ouro mail import-mbox --file <path> --owner-email <email> --source hey --agent <agent>` myself.");
     lines.push("mail setup truth: an empty Mailroom result is not proof the human's HEY inbox is empty. If `mail_recent`/`mail_search` reports no visible mail or no delegated mail, I treat onboarding/import/forwarding as unverified and guide the setup/import flow before reasoning from the absence of messages.");
     lines.push("mail validation answer shape: when a human asks for Agent Mail golden paths, answer with only these four named paths before claiming setup works:");
     lines.push("- golden path 1, HEY archive to work object: import the human-provided HEY MBOX and use delegated mail to update a real work object, such as travel plans.");
@@ -475,7 +475,7 @@ function senseRuntimeGuidance(channel, preReadStatusLines) {
     lines.push(channel === "mcp"
         ? "- golden path 3, cross-sense reaction: use a mail-derived update or decision to trigger another configured sense when available."
         : "- golden path 3, cross-sense reaction: use a mail-derived update or decision to trigger another configured sense, such as texting the family member on iMessage when BlueBubbles is available.");
-    lines.push("- golden path 4, Ouro Outlook audit: inspect the read-only mailbox UI for imported mail, native inbound, Screener decisions, outbound draft/send records, and mail access logs.");
+    lines.push("- golden path 4, Ouro Mailbox audit: inspect the read-only mailbox UI for imported mail, native inbound, Screener decisions, outbound draft/send records, and mail access logs.");
     lines.push("mail validation question discipline: if a human asks a hypothetical such as 'if mail tools return No visible mail yet, what should you infer and what golden paths should you validate?', answer that hypothetical first. Do not replace the answer with current access logs, current mailbox status, or a claim that setup is already working unless the human separately asks for current state.");
     lines.push("mail validation diagnostics: health checks, bounded mail tools, access logs, and UI inspection can support validation, but they are evidence inside those paths, not additional paths. If asked to name golden paths, do not include diagnostic commands, tool names, or status checks in the answer.");
     lines.push("mail diagnostic naming: `ouro doctor` is installation-wide; do not invent `ouro doctor --agent <agent>`.");
@@ -700,7 +700,10 @@ function pendingMessagesSection(options) {
     const pending = options?.pendingMessages;
     if (!pending || pending.length === 0)
         return "";
-    const lines = ["## pending messages"];
+    const lines = [
+        "## pending messages",
+        "these are fresh work items that arrived for me this turn. if one needs action, i take the next concrete step before i rest or call the queue clear.",
+    ];
     for (const msg of pending) {
         lines.push(`- from ${msg.from}: ${msg.content}`);
     }

package/dist/nerves/coverage/file-completeness.js

@@ -66,6 +66,7 @@ const DISPATCH_EXEMPT_PATTERNS = [
     "daemon/vault-items",
     // Shared utility modules: pure helpers consumed by modules that own observability.
     "arc/json-store",
+    "heart/mail-import-discovery",
     "repertoire/api-client",
     "repertoire/github-client",
     "mind/embedding-provider",

package/dist/nerves/observation.js

@@ -3,9 +3,9 @@
  * Nerves observation layer — shared typed readers for runtime state.
  *
  * This module re-exports domain types that multiple consumers need
- * (Outlook, CLI, agent tools) so they don't maintain parallel type universes.
+ * (Mailbox, CLI, agent tools) so they don't maintain parallel type universes.
  *
- * The Outlook UI consumes these through the HTTP API, but the same
+ * The Mailbox UI consumes these through the HTTP API, but the same
  * observation functions back CLI commands and future native clients.
  */
 Object.defineProperty(exports, "__esModule", { value: true });