@ouro.bot/cli 0.1.0-alpha.815 → 0.1.0-alpha.817

package/dist/heart/daemon/sense-manager.js

@@ -161,6 +161,9 @@ function runtimeConfigUnavailableDetail(agent, runtimeConfig) {
         return `missing vault ${itemName} (${agent})`;
     return `vault ${itemName} unavailable (${compactRuntimeConfigError(agent, runtimeConfig.error)})`;
 }
+function needsMachineRuntimeConfig(agent, sense) {
+    return sense === "bluebubbles" || sense === "voice" || sense === "a2a" || (agent === "sanctuary" && sense === "telegram");
+}
 function senseFactsFromRuntimeConfig(agent, senses, runtimeConfig, machineRuntimeConfig = (0, runtime_credentials_1.readMachineRuntimeCredentialConfig)(agent), workbenchHasStaleBundleEntry = false) {
     const base = {
         cli: { configured: true, detail: "local interactive terminal" },
@@ -183,7 +186,14 @@ function senseFactsFromRuntimeConfig(agent, senses, runtimeConfig, machineRuntim
     const integrations = payload.integrations;
     const voice = machinePayload.voice;
     const a2a = machinePayload.a2a;
-    if (senses.telegram.enabled) {
+    if (senses.telegram.enabled && agent === "sanctuary") {
+        const ready = runtimeConfig.ok && machineRuntimeConfig.ok
+            && !Object.hasOwn(payload, "telegramBotToken") && !Object.hasOwn(machinePayload, "telegramBotToken");
+        base.telegram = ready
+            ? { configured: true, detail: "root authority transport; gateway validated at process startup" }
+            : { configured: false, detail: "root authority migration requires available tokenless credential inventories" };
+    }
+    else if (senses.telegram.enabled) {
         const missing = ["telegramBotToken", "telegramAuthorizedUserId", "telegramAuthorizedChatId"]
             .filter((field) => !textField(payload, field));
         base.telegram = missing.length === 0
@@ -355,7 +365,9 @@ function senseRepairHint(agent, sense) {
         return `Agent-runnable: run 'ouro connect a2a --agent ${agent}', then restart with 'ouro up'.`;
     }
     if (sense === "telegram") {
-        return `Agent-runnable: store Telegram bot/user/chat coordinates with 'ouro connect telegram --agent ${agent}', then restart with 'ouro up'.`;
+        return agent === "sanctuary"
+            ? "Agent-runnable: complete or recover the root authority migration; do not restore a resident Telegram token."
+            : `Agent-runnable: store Telegram bot/user/chat coordinates with 'ouro connect telegram --agent ${agent}', then restart with 'ouro up'.`;
     }
     /* v8 ignore next -- Workbench is deliberately not daemon-managed, so getSenseInventory never asks the daemon manager for a repair hint @preserve */
     if (sense === "workbench") {
@@ -655,10 +667,10 @@ class DaemonSenseManager {
         this.configRefreshRetryTimers.delete(name);
         this.configRefreshRetryAttempts.delete(name);
     }
-    shouldRetryConfigRefresh(sense, runtimeConfig, machineRuntimeConfig) {
+    shouldRetryConfigRefresh(agent, sense, runtimeConfig, machineRuntimeConfig) {
         if (!runtimeConfig.ok && runtimeConfig.reason === "unavailable")
             return true;
-        if ((sense === "bluebubbles" || sense === "voice" || sense === "a2a") &&
+        if (needsMachineRuntimeConfig(agent, sense) &&
             !machineRuntimeConfig.ok &&
             machineRuntimeConfig.reason === "unavailable")
             return true;
@@ -668,7 +680,7 @@ class DaemonSenseManager {
         let retryAfterMs = null;
         try {
             const refreshed = await (0, runtime_credentials_1.refreshRuntimeCredentialConfig)(parsed.agent, { preserveCachedOnFailure: true });
-            const machineRefreshed = parsed.sense === "bluebubbles" || parsed.sense === "voice" || parsed.sense === "a2a"
+            const machineRefreshed = needsMachineRuntimeConfig(parsed.agent, parsed.sense)
                 ? await (0, runtime_credentials_1.refreshMachineRuntimeCredentialConfig)(parsed.agent, currentMachineId(), { preserveCachedOnFailure: true })
                 : (0, runtime_credentials_1.readMachineRuntimeCredentialConfig)(parsed.agent);
             const context = this.contexts.get(parsed.agent);
@@ -677,7 +689,7 @@ class DaemonSenseManager {
                 return;
             context.facts = senseFactsFromRuntimeConfig(parsed.agent, context.senses, refreshed, machineRefreshed, context.workbenchHasStaleBundleEntry);
             if (!context.facts[parsed.sense].configured) {
-                if (this.shouldRetryConfigRefresh(parsed.sense, refreshed, machineRefreshed)) {
+                if (this.shouldRetryConfigRefresh(parsed.agent, parsed.sense, refreshed, machineRefreshed)) {
                     retryAfterMs = this.nextConfigRetryDelayMs(name);
                 }
                 else {
@@ -723,13 +735,11 @@ class DaemonSenseManager {
             /* v8 ignore next -- periodic refresh work only exists when a managed background sense is enabled @preserve */
             if (enabledManagedSenses.length === 0)
                 return;
-            /* v8 ignore start -- periodic freshness refresh uses the same runtime readers covered by startup integration tests @preserve */
             const runtimeConfig = await (0, runtime_credentials_1.refreshRuntimeCredentialConfig)(agent, { preserveCachedOnFailure: true });
-            const needsMachineConfig = enabledManagedSenses.some((sense) => sense === "bluebubbles" || sense === "voice" || sense === "a2a");
+            const needsMachineConfig = enabledManagedSenses.some((sense) => needsMachineRuntimeConfig(agent, sense));
             const machineRuntimeConfig = needsMachineConfig
                 ? await (0, runtime_credentials_1.refreshMachineRuntimeCredentialConfig)(agent, currentMachineId(), { preserveCachedOnFailure: true })
                 : (0, runtime_credentials_1.readMachineRuntimeCredentialConfig)(agent);
-            /* v8 ignore stop */
             context.facts = senseFactsFromRuntimeConfig(agent, context.senses, runtimeConfig, machineRuntimeConfig, context.workbenchHasStaleBundleEntry);
         });
         await Promise.all(refreshes);
@@ -835,7 +845,7 @@ class DaemonSenseManager {
             return null;
         const managedName = `${parsed.agent}:${parsed.sense}`;
         const runtimeConfig = await (0, runtime_credentials_1.refreshRuntimeCredentialConfig)(parsed.agent, { preserveCachedOnFailure: true });
-        const needsMachineConfig = parsed.sense === "bluebubbles" || parsed.sense === "voice" || parsed.sense === "a2a";
+        const needsMachineConfig = needsMachineRuntimeConfig(parsed.agent, parsed.sense);
         const machineRuntimeConfig = needsMachineConfig
             ? await (0, runtime_credentials_1.refreshMachineRuntimeCredentialConfig)(parsed.agent, currentMachineId(), { preserveCachedOnFailure: true })
             : (0, runtime_credentials_1.readMachineRuntimeCredentialConfig)(parsed.agent);

package/dist/heart/external-events/router.js

@@ -290,10 +290,7 @@ function withRecordLock(recordPath, operation) {
         }
     };
     acquire();
-    try {
-        return operation();
-    }
-    finally {
+    const release = () => {
         try {
             /* v8 ignore else -- concurrency fence: a replaced owner must not release its successor's lock @preserve */
             if (fs.readFileSync(ownerPath, "utf8") === owner) {
@@ -304,6 +301,17 @@ function withRecordLock(recordPath, operation) {
         catch {
             // A stale owner must never remove a successor's lock.
         }
+    };
+    try {
+        const result = operation();
+        if (result instanceof Promise)
+            return result.finally(release);
+        release();
+        return result;
+    }
+    catch (error) {
+        release();
+        throw error;
     }
 }
 function isRecord(value) {
@@ -1174,18 +1182,26 @@ function claimExternalEvent(recordPath, input) {
         }, now);
     });
 }
-function renewExternalEventClaim(recordPath, input) {
+function renewClaimLocked(recordPath, input, requireCurrent) {
+    const record = readExternalEventRecord(recordPath);
+    if (record.executionState !== "running" || record.claimOwner !== input.owner)
+        throw new Error("External event claim owner mismatch");
+    if (record.generation !== input.expectedGeneration)
+        throw new Error("External event generation mismatch");
+    const leaseMs = input.leaseMs ?? 30_000;
+    if (!Number.isSafeInteger(leaseMs) || leaseMs <= 0)
+        throw new Error("External event claim renewal is invalid");
+    const now = input.now?.() ?? new Date().toISOString();
+    if (requireCurrent && !(Date.parse(record.claimExpiresAt ?? "") > Date.parse(now)))
+        throw new Error("External event claim expired");
+    return commitMutation(recordPath, { ...record, claimExpiresAt: new Date(Date.parse(now) + leaseMs).toISOString() }, now);
+}
+function renewExternalEventClaim(recordPath, input, operation) {
     return withRecordLock(recordPath, () => {
-        const record = readExternalEventRecord(recordPath);
-        if (record.executionState !== "running" || record.claimOwner !== input.owner)
-            throw new Error("External event claim owner mismatch");
-        if (record.generation !== input.expectedGeneration)
-            throw new Error("External event generation mismatch");
-        const leaseMs = input.leaseMs ?? 30_000;
-        if (!Number.isSafeInteger(leaseMs) || leaseMs <= 0)
-            throw new Error("External event claim renewal is invalid");
-        const now = input.now?.() ?? new Date().toISOString();
-        return commitMutation(recordPath, { ...record, claimExpiresAt: new Date(Date.parse(now) + leaseMs).toISOString() }, now);
+        if (!operation)
+            return renewClaimLocked(recordPath, input, false);
+        const signal = AbortSignal.timeout(25_000);
+        return operation(renewClaimLocked(recordPath, input, true), signal);
     });
 }
 function assertClaim(record, input) {