@ouro.bot/cli 0.1.0-alpha.13 → 0.1.0-alpha.131

package/dist/heart/tool-loop.js

@@ -0,0 +1,194 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLOBAL_CIRCUIT_BREAKER_LIMIT = exports.PING_PONG_WINDOW = exports.GENERIC_REPEAT_LIMIT = exports.POLL_NO_PROGRESS_LIMIT = exports.TOOL_LOOP_HISTORY_LIMIT = void 0;
+exports.createToolLoopState = createToolLoopState;
+exports.recordToolOutcome = recordToolOutcome;
+exports.detectToolLoop = detectToolLoop;
+const crypto = __importStar(require("crypto"));
+const runtime_1 = require("../nerves/runtime");
+exports.TOOL_LOOP_HISTORY_LIMIT = 30;
+exports.POLL_NO_PROGRESS_LIMIT = 3;
+exports.GENERIC_REPEAT_LIMIT = 4;
+exports.PING_PONG_WINDOW = 6;
+exports.GLOBAL_CIRCUIT_BREAKER_LIMIT = 24;
+function stableStringify(value) {
+    if (value === null || typeof value !== "object") {
+        return JSON.stringify(value);
+    }
+    /* v8 ignore next -- stableStringify currently receives only objects/strings from normalized loop inputs @preserve */
+    if (Array.isArray(value)) {
+        return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
+    }
+    const record = value;
+    return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(record[key])}`).join(",")}}`;
+}
+function digest(value) {
+    return crypto.createHash("sha256").update(stableStringify(value)).digest("hex");
+}
+function normalizeArgs(toolName, args) {
+    if (toolName === "query_active_work") {
+        return { toolName };
+    }
+    if (toolName === "coding_status" || toolName === "coding_tail") {
+        return {
+            toolName,
+            sessionId: args.sessionId ?? "",
+        };
+    }
+    if (toolName === "query_session") {
+        return {
+            toolName,
+            mode: args.mode ?? "",
+            friendId: args.friendId ?? "",
+            channel: args.channel ?? "",
+            key: args.key ?? "",
+            query: args.query ?? "",
+        };
+    }
+    return {
+        toolName,
+        args,
+    };
+}
+function normalizeOutcome(result, success) {
+    return {
+        success,
+        result: result.replace(/\s+/g, " ").trim(),
+    };
+}
+function isKnownPollTool(toolName, args) {
+    return toolName === "query_active_work"
+        || toolName === "coding_status"
+        || toolName === "coding_tail"
+        || (toolName === "query_session" && (args.mode ?? "").trim() === "status");
+}
+function emitDetection(detector, toolName, count, message, pairedToolName) {
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "engine",
+        event: "engine.tool_loop_detected",
+        message: "tool loop guard detected repeated non-progress work",
+        meta: {
+            detector,
+            toolName,
+            count,
+            pairedToolName: pairedToolName ?? null,
+        },
+    });
+    return {
+        stuck: true,
+        detector,
+        count,
+        message,
+        pairedToolName,
+    };
+}
+function countTrailingRepeats(history, toolName, callHash) {
+    let count = 0;
+    let outcomeHash;
+    for (let index = history.length - 1; index >= 0; index--) {
+        const record = history[index];
+        if (record.toolName !== toolName || record.callHash !== callHash) {
+            break;
+        }
+        if (!outcomeHash) {
+            outcomeHash = record.outcomeHash;
+        }
+        if (record.outcomeHash !== outcomeHash) {
+            break;
+        }
+        count += 1;
+    }
+    return { count, outcomeHash };
+}
+function detectPingPong(history, toolName, callHash) {
+    if (history.length < exports.PING_PONG_WINDOW) {
+        return { stuck: false };
+    }
+    const recent = history.slice(-exports.PING_PONG_WINDOW);
+    const first = recent[0];
+    const second = recent[1];
+    if (!first.isKnownPoll || !second.isKnownPoll) {
+        return { stuck: false };
+    }
+    if (first.toolName === second.toolName && first.callHash === second.callHash) {
+        return { stuck: false };
+    }
+    for (let index = 0; index < recent.length; index++) {
+        const expected = index % 2 === 0 ? first : second;
+        const actual = recent[index];
+        if (actual.toolName !== expected.toolName
+            || actual.callHash !== expected.callHash
+            || actual.outcomeHash !== expected.outcomeHash) {
+            return { stuck: false };
+        }
+    }
+    const matchesPair = (toolName === first.toolName && callHash === first.callHash)
+        || (toolName === second.toolName && callHash === second.callHash);
+    if (!matchesPair) {
+        return { stuck: false };
+    }
+    const pairedToolName = toolName === first.toolName ? second.toolName : first.toolName;
+    return emitDetection("ping_pong", toolName, exports.PING_PONG_WINDOW, `repeated ${first.toolName}/${second.toolName} polling is not changing. stop cycling between status checks and either act on the current state, change approach, or answer truthfully with what is known.`, pairedToolName);
+}
+function createToolLoopState() {
+    return { history: [] };
+}
+function recordToolOutcome(state, toolName, args, result, success) {
+    state.history.push({
+        toolName,
+        callHash: digest(normalizeArgs(toolName, args)),
+        outcomeHash: digest(normalizeOutcome(result, success)),
+        isKnownPoll: isKnownPollTool(toolName, args),
+    });
+    if (state.history.length > exports.TOOL_LOOP_HISTORY_LIMIT) {
+        state.history.splice(0, state.history.length - exports.TOOL_LOOP_HISTORY_LIMIT);
+    }
+}
+function detectToolLoop(state, toolName, args) {
+    if (state.history.length >= exports.GLOBAL_CIRCUIT_BREAKER_LIMIT) {
+        return emitDetection("global_circuit_breaker", toolName, state.history.length, `this turn has already made ${state.history.length} tool calls. stop thrashing, use the current evidence, and either change approach or answer truthfully with the best grounded status.`);
+    }
+    const callHash = digest(normalizeArgs(toolName, args));
+    const trailing = countTrailingRepeats(state.history, toolName, callHash);
+    if (isKnownPollTool(toolName, args) && trailing.count >= exports.POLL_NO_PROGRESS_LIMIT) {
+        return emitDetection("known_poll_no_progress", toolName, trailing.count, `repeated ${toolName} calls have returned the same state ${trailing.count} times. stop polling and either act on the current state, wait for a meaningful change, or answer truthfully with what is known.`);
+    }
+    if (trailing.count >= exports.GENERIC_REPEAT_LIMIT) {
+        return emitDetection("generic_repeat", toolName, trailing.count, `repeating ${toolName} with the same inputs is not producing new information. change approach, use the evidence already gathered, or answer truthfully with what is known.`);
+    }
+    return detectPingPong(state.history, toolName, callHash);
+}

package/dist/heart/turn-coordinator.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTurnCoordinator = createTurnCoordinator;
+exports.withSharedTurnLock = withSharedTurnLock;
+exports.tryBeginSharedTurn = tryBeginSharedTurn;
+exports.endSharedTurn = endSharedTurn;
+exports.isSharedTurnActive = isSharedTurnActive;
+exports.enqueueSharedFollowUp = enqueueSharedFollowUp;
+exports.drainSharedFollowUps = drainSharedFollowUps;
 const runtime_1 = require("../nerves/runtime");
+function scopedKey(scope, key) {
+    return `${scope}:${key}`;
+}
 function createTurnCoordinator() {
     const turnLocks = new Map();
     const activeTurns = new Set();
@@ -60,3 +69,22 @@ function createTurnCoordinator() {
         },
     };
 }
+const _sharedTurnCoordinator = createTurnCoordinator();
+function withSharedTurnLock(scope, key, fn) {
+    return _sharedTurnCoordinator.withTurnLock(scopedKey(scope, key), fn);
+}
+function tryBeginSharedTurn(scope, key) {
+    return _sharedTurnCoordinator.tryBeginTurn(scopedKey(scope, key));
+}
+function endSharedTurn(scope, key) {
+    _sharedTurnCoordinator.endTurn(scopedKey(scope, key));
+}
+function isSharedTurnActive(scope, key) {
+    return _sharedTurnCoordinator.isTurnActive(scopedKey(scope, key));
+}
+function enqueueSharedFollowUp(scope, key, followUp) {
+    _sharedTurnCoordinator.enqueueFollowUp(scopedKey(scope, key), followUp);
+}
+function drainSharedFollowUps(scope, key) {
+    return _sharedTurnCoordinator.drainFollowUps(scopedKey(scope, key));
+}

package/dist/mind/associative-recall.js

@@ -87,7 +87,19 @@ function readFacts(memoryRoot) {
     const raw = fs.readFileSync(factsPath, "utf8").trim();
     if (!raw)
         return [];
-    return raw.split("\n").map((line) => JSON.parse(line));
+    const facts = [];
+    for (const line of raw.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            facts.push(JSON.parse(trimmed));
+        }
+        catch {
+            // Skip corrupt lines (e.g. partial write from a crash).
+        }
+    }
+    return facts;
 }
 function getLatestUserText(messages) {
     for (let i = messages.length - 1; i >= 0; i--) {
@@ -190,7 +202,7 @@ async function injectAssociativeRecall(messages, options) {
             event: "mind.associative_recall_error",
             message: "associative recall failed",
             meta: {
-                reason: error instanceof Error ? error.message : String(error),
+                reason: error instanceof Error ? error.message : /* v8 ignore start -- defensive: non-Error catch branch @preserve */ String(error) /* v8 ignore stop */,
             },
         });
     }

package/dist/mind/bundle-manifest.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CANONICAL_BUNDLE_MANIFEST = void 0;
+exports.getChangelogPath = getChangelogPath;
 exports.getPackageVersion = getPackageVersion;
 exports.createBundleMeta = createBundleMeta;
 exports.backfillBundleMeta = backfillBundleMeta;
@@ -53,11 +54,22 @@ exports.CANONICAL_BUNDLE_MANIFEST = [
     { path: "psyche/ASPIRATIONS.md", kind: "file" },
     { path: "psyche/memory", kind: "dir" },
     { path: "friends", kind: "dir" },
+    { path: "state", kind: "dir" },
     { path: "tasks", kind: "dir" },
     { path: "skills", kind: "dir" },
     { path: "senses", kind: "dir" },
     { path: "senses/teams", kind: "dir" },
 ];
+function getChangelogPath() {
+    const changelogPath = path.resolve(__dirname, "../../changelog.json");
+    (0, runtime_1.emitNervesEvent)({
+        component: "mind",
+        event: "mind.changelog_path_resolved",
+        message: "resolved changelog path",
+        meta: { path: changelogPath },
+    });
+    return changelogPath;
+}
 function getPackageVersion() {
     const packageJsonPath = path.resolve(__dirname, "../../package.json");
     const raw = fs.readFileSync(packageJsonPath, "utf-8");

package/dist/mind/context.js

@@ -50,17 +50,17 @@ function buildTrimmableBlocks(messages) {
     let i = 0;
     while (i < messages.length) {
         const msg = messages[i];
-        if (msg?.role === "system") {
+        if (msg.role === "system") {
             i++;
             continue;
         }
         // Tool coherence block: assistant message with tool_calls + immediately following tool results
-        if (msg?.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
             const indices = [i];
             i++;
             while (i < messages.length) {
                 const next = messages[i];
-                if (next?.role !== "tool")
+                if (next.role !== "tool")
                     break;
                 indices.push(i);
                 i++;
@@ -78,13 +78,13 @@ function buildTrimmableBlocks(messages) {
 function getSystemMessageIndices(messages) {
     const indices = [];
     for (let i = 0; i < messages.length; i++) {
-        if (messages[i]?.role === "system")
+        if (messages[i].role === "system")
             indices.push(i);
     }
     return indices;
 }
 function buildTrimmedMessages(messages, kept) {
-    return messages.filter((m, idx) => m?.role === "system" || kept.has(idx));
+    return messages.filter((m, idx) => m.role === "system" || kept.has(idx));
 }
 function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     const targetTokens = Math.floor(maxTokens * (1 - contextMargin / 100));
@@ -132,7 +132,7 @@ function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     let remaining = actualTokenCount;
     const kept = new Set();
     for (let i = 0; i < messages.length; i++) {
-        if (messages[i]?.role !== "system")
+        if (messages[i].role !== "system")
             kept.add(i);
     }
     // Drop oldest blocks until we fall under target.
@@ -146,7 +146,7 @@ function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     let trimmed = buildTrimmedMessages(messages, kept);
     // If we're still above budget after dropping everything trimmable, preserve system only.
     if (remaining > targetTokens) {
-        trimmed = messages.filter((m) => m?.role === "system");
+        trimmed = messages.filter((m) => m.role === "system");
     }
     const estimatedAfter = (0, token_estimate_1.estimateTokensForMessages)(trimmed);
     (0, runtime_1.emitNervesEvent)({
@@ -219,7 +219,7 @@ function repairSessionMessages(messages) {
         result.push(msg);
     }
     (0, runtime_1.emitNervesEvent)({
-        level: "warn",
+        level: "info",
         event: "mind.session_invariant_repair",
         component: "mind",
         message: "repaired session invariant violations",
@@ -227,11 +227,39 @@ function repairSessionMessages(messages) {
     });
     return result;
 }
-function saveSession(filePath, messages, lastUsage) {
+function stripOrphanedToolResults(messages) {
+    const validCallIds = new Set();
+    for (const msg of messages) {
+        if (msg.role !== "assistant" || !Array.isArray(msg.tool_calls))
+            continue;
+        for (const toolCall of msg.tool_calls)
+            validCallIds.add(toolCall.id);
+    }
+    let removed = 0;
+    const repaired = messages.filter((msg) => {
+        if (msg.role !== "tool")
+            return true;
+        const keep = validCallIds.has(msg.tool_call_id);
+        if (!keep)
+            removed++;
+        return keep;
+    });
+    if (removed > 0) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "info",
+            event: "mind.session_orphan_tool_result_repair",
+            component: "mind",
+            message: "removed orphaned tool results from session history",
+            meta: { removed },
+        });
+    }
+    return repaired;
+}
+function saveSession(filePath, messages, lastUsage, state) {
     const violations = validateSessionMessages(messages);
     if (violations.length > 0) {
         (0, runtime_1.emitNervesEvent)({
-            level: "warn",
+            level: "info",
             event: "mind.session_invariant_violation",
             component: "mind",
             message: "session invariant violated on save",
@@ -239,10 +267,17 @@ function saveSession(filePath, messages, lastUsage) {
         });
         messages = repairSessionMessages(messages);
     }
+    messages = stripOrphanedToolResults(messages);
     fs.mkdirSync(path.dirname(filePath), { recursive: true });
     const envelope = { version: 1, messages };
     if (lastUsage)
         envelope.lastUsage = lastUsage;
+    if (state?.mustResolveBeforeHandoff === true || typeof state?.lastFriendActivityAt === "string") {
+        envelope.state = {
+            ...(state?.mustResolveBeforeHandoff === true ? { mustResolveBeforeHandoff: true } : {}),
+            ...(typeof state?.lastFriendActivityAt === "string" ? { lastFriendActivityAt: state.lastFriendActivityAt } : {}),
+        };
+    }
     fs.writeFileSync(filePath, JSON.stringify(envelope, null, 2));
 }
 function loadSession(filePath) {
@@ -255,7 +290,7 @@ function loadSession(filePath) {
         const violations = validateSessionMessages(messages);
         if (violations.length > 0) {
             (0, runtime_1.emitNervesEvent)({
-                level: "warn",
+                level: "info",
                 event: "mind.session_invariant_violation",
                 component: "mind",
                 message: "session invariant violated on load",
@@ -263,13 +298,24 @@ function loadSession(filePath) {
             });
             messages = repairSessionMessages(messages);
         }
-        return { messages, lastUsage: data.lastUsage };
+        messages = stripOrphanedToolResults(messages);
+        const rawState = data?.state && typeof data.state === "object" && data.state !== null
+            ? data.state
+            : undefined;
+        const state = rawState && (rawState.mustResolveBeforeHandoff === true
+            || typeof rawState.lastFriendActivityAt === "string")
+            ? {
+                ...(rawState.mustResolveBeforeHandoff === true ? { mustResolveBeforeHandoff: true } : {}),
+                ...(typeof rawState.lastFriendActivityAt === "string" ? { lastFriendActivityAt: rawState.lastFriendActivityAt } : {}),
+            }
+            : undefined;
+        return { messages, lastUsage: data.lastUsage, state };
     }
     catch {
         return null;
     }
 }
-function postTurn(messages, sessPath, usage, hooks) {
+function postTurn(messages, sessPath, usage, hooks, state) {
     if (hooks?.beforeTrim) {
         try {
             hooks.beforeTrim([...messages]);
@@ -289,7 +335,7 @@ function postTurn(messages, sessPath, usage, hooks) {
     const { maxTokens, contextMargin } = (0, config_1.getContextConfig)();
     const trimmed = trimMessages(messages, maxTokens, contextMargin, usage?.input_tokens);
     messages.splice(0, messages.length, ...trimmed);
-    saveSession(sessPath, messages, usage);
+    saveSession(sessPath, messages, usage, state);
 }
 function deleteSession(filePath) {
     try {

package/dist/mind/first-impressions.js

@@ -11,9 +11,22 @@ exports.ONBOARDING_TOKEN_THRESHOLD = 100_000;
 function isOnboarding(friend) {
     return (friend.totalTokens ?? 0) < exports.ONBOARDING_TOKEN_THRESHOLD;
 }
-function getFirstImpressions(friend) {
+function hasLiveContinuityPressure(state) {
+    if (!state)
+        return false;
+    if (typeof state.currentObligation === "string" && state.currentObligation.trim().length > 0)
+        return true;
+    if (state.mustResolveBeforeHandoff === true)
+        return true;
+    if (state.hasQueuedFollowUp === true)
+        return true;
+    return false;
+}
+function getFirstImpressions(friend, state) {
     if (!isOnboarding(friend))
         return "";
+    if (hasLiveContinuityPressure(state))
+        return "";
     (0, runtime_1.emitNervesEvent)({
         component: "mind",
         event: "mind.first_impressions",
@@ -37,7 +50,8 @@ function getFirstImpressions(friend) {
     lines.push("- what do they do outside of work that they care about?");
     lines.push("i don't ask all of these at once -- i weave them into conversation naturally, one or two at a time, and i genuinely follow up on what they share.");
     lines.push("i introduce what i can do -- i have tools, integrations, and skills that can help them. i mention these naturally as they become relevant.");
-    lines.push("if my friend hasn't asked me to do something specific, or i've already finished what they asked for, that's my cue to turn the tables -- i ask them questions about themselves, what they're into, what they need. no idle small talk; i'm on a mission to get to know them.");
+    lines.push("if we're already in motion on a task, thread, or follow-up, i do not reset with a generic opener like 'hiya' or 'what do ya need help with?'. i continue directly or ask the specific next question.");
+    lines.push("only when the conversation is genuinely fresh and idle, with no active ask or thread in flight, a light opener is okay.");
     lines.push("i save everything i learn immediately with save_friend_note -- names, roles, preferences, projects, anything. the bar is low: if i learned it, i save it.");
     return lines.join("\n");
 }

package/dist/mind/friends/channel.js

@@ -3,10 +3,13 @@
 // Pure lookup, no I/O, cannot fail. Unknown channel gets minimal defaults.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChannelCapabilities = getChannelCapabilities;
+exports.isRemoteChannel = isRemoteChannel;
+exports.getAlwaysOnSenseNames = getAlwaysOnSenseNames;
 const runtime_1 = require("../../nerves/runtime");
 const CHANNEL_CAPABILITIES = {
     cli: {
         channel: "cli",
+        senseType: "local",
         availableIntegrations: [],
         supportsMarkdown: false,
         supportsStreaming: true,
@@ -15,6 +18,7 @@ const CHANNEL_CAPABILITIES = {
     },
     teams: {
         channel: "teams",
+        senseType: "closed",
         availableIntegrations: ["ado", "graph", "github"],
         supportsMarkdown: true,
         supportsStreaming: true,
@@ -23,15 +27,26 @@ const CHANNEL_CAPABILITIES = {
     },
     bluebubbles: {
         channel: "bluebubbles",
+        senseType: "open",
         availableIntegrations: [],
         supportsMarkdown: false,
         supportsStreaming: false,
         supportsRichCards: false,
         maxMessageLength: Infinity,
     },
+    inner: {
+        channel: "inner",
+        senseType: "internal",
+        availableIntegrations: [],
+        supportsMarkdown: false,
+        supportsStreaming: true,
+        supportsRichCards: false,
+        maxMessageLength: Infinity,
+    },
 };
 const DEFAULT_CAPABILITIES = {
     channel: "cli",
+    senseType: "local",
     availableIntegrations: [],
     supportsMarkdown: false,
     supportsStreaming: false,
@@ -47,3 +62,23 @@ function getChannelCapabilities(channel) {
     });
     return CHANNEL_CAPABILITIES[channel] ?? DEFAULT_CAPABILITIES;
 }
+/** Whether the channel is remote (open or closed) vs local/internal. */
+function isRemoteChannel(capabilities) {
+    const senseType = capabilities?.senseType;
+    return senseType !== undefined && senseType !== "local" && senseType !== "internal";
+}
+/**
+ * Returns channel names whose senseType is "open" or "closed" -- i.e. channels
+ * that are always-on (daemon-managed) rather than interactive or internal.
+ */
+function getAlwaysOnSenseNames() {
+    (0, runtime_1.emitNervesEvent)({
+        component: "channels",
+        event: "channel.always_on_lookup",
+        message: "always-on sense names lookup",
+        meta: {},
+    });
+    return Object.entries(CHANNEL_CAPABILITIES)
+        .filter(([, cap]) => cap.senseType === "open" || cap.senseType === "closed")
+        .map(([channel]) => channel);
+}