@ouro.bot/cli 0.1.0-alpha.723 → 0.1.0-alpha.725

package/dist/heart/daemon/cli-exec.js

@@ -1444,8 +1444,41 @@ async function checkManualCloneBundles(deps) {
 }
 // ── toDaemonCommand ──
 function toDaemonCommand(command) {
+    if (command.kind === "habit.probe") {
+        return {
+            kind: "habit.probe",
+            agent: command.agent,
+            habitName: command.habitName,
+            noSend: true,
+        };
+    }
     return command;
 }
+function habitProbeJsonResponse(response) {
+    const data = response.data && typeof response.data === "object" && !Array.isArray(response.data)
+        ? response.data
+        : null;
+    const status = typeof data?.status === "string" ? data.status : "degraded";
+    if (response.ok
+        && data?.noSend === true
+        && typeof data.transportInvocationCount === "number"
+        && data.transportInvocationCount === 0) {
+        return JSON.stringify({
+            noSend: true,
+            status,
+            transportInvocationCount: 0,
+        }, null, 2);
+    }
+    return JSON.stringify({
+        ok: false,
+        noSend: true,
+        status,
+        transportInvocationCount: null,
+        error: response.error
+            ?? (!response.ok ? response.message : undefined)
+            ?? "habit probe did not produce verified zero-transport evidence",
+    }, null, 2);
+}
 // ── Hatch input resolution ──
 async function resolveHatchInput(command, deps) {
     const prompt = deps.promptInput;
@@ -3707,6 +3740,57 @@ function hostedMissingMailKeys(body, keys) {
         rotateSourceGrant: missingSourceGrant,
     };
 }
+/**
+ * Key ids the public registry declares for this agent, or `[]` when the
+ * registry cannot be consulted.
+ *
+ * `requiredHostedKeyIds` derives the asserted set from the ensure response
+ * alone, so anything the response omits is never asserted — and the server
+ * omits `sourceGrant` unless a source alias is in play. That is how the
+ * 2026-07-24 gap passed: the registry declared a source-grant key, the vault
+ * never received its private half, and setup reported success. The registry is
+ * the authority on what mail is currently being encrypted to, so it is
+ * consulted too.
+ *
+ * Never throws. An unreachable registry degrades to the response-only
+ * assertion, because refusing a setup that previously succeeded — on a machine
+ * whose Azure credentials happen to be unavailable — would be a worse failure
+ * than the one this guards against.
+ *
+ * The agent match is case-insensitive: the harness sends `agentId: agent`
+ * verbatim in the ensure payload while registry records can carry the
+ * lowercased form.
+ */
+async function hostedRegistryDeclaredKeyIds(input) {
+    try {
+        const publicRegistry = isPlainRecord(input.body.publicRegistry) ? input.body.publicRegistry : {};
+        const managedIdentityClientId = stringField(input.existingMailroom ?? {}, "azureManagedIdentityClientId");
+        const registry = await input.readRegistry({
+            mailboxAddress: "",
+            privateKeys: {},
+            registryAzureAccountUrl: stringField(publicRegistry, "azureAccountUrl"),
+            registryContainer: stringField(publicRegistry, "container"),
+            registryBlob: stringField(publicRegistry, "blob"),
+            ...(managedIdentityClientId ? { azureManagedIdentityClientId: managedIdentityClientId } : {}),
+        });
+        const wanted = input.agent.toLowerCase();
+        const isThisAgent = (agentId) => agentId.toLowerCase() === wanted;
+        return [
+            ...registry.mailboxes.filter((mailbox) => isThisAgent(mailbox.agentId)).map((mailbox) => mailbox.keyId),
+            ...registry.sourceGrants.filter((grant) => isThisAgent(grant.agentId) && grant.enabled).map((grant) => grant.keyId),
+        ].filter((keyId) => keyId.trim().length > 0);
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "cli",
+            event: "cli.hosted_mail_registry_assertion_skipped",
+            message: "hosted mail key assertion could not consult the public registry",
+            meta: { agent: input.agent, error: error instanceof Error ? error.message : String(error) },
+        });
+        return [];
+    }
+}
 function assertHostedPrivateKeys(input) {
     for (const keyId of input.requiredKeyIds) {
         if (input.keys[keyId])
@@ -3811,10 +3895,18 @@ async function ensureAgentMailroom(agent, input, deps, progressLabel) {
                 generatedPrivateKeys = responsePrivateKeys(body.generatedPrivateKeys);
                 Object.assign(privateKeys, generatedPrivateKeys);
             }
+            const registryKeyIds = await hostedRegistryDeclaredKeyIds({
+                agent,
+                body,
+                existingMailroom,
+                readRegistry: deps.readMailroomRegistry ?? reader_1.readMailroomRegistry,
+            });
             assertHostedPrivateKeys({
                 agent,
                 keys: privateKeys,
-                requiredKeyIds: requiredHostedKeyIds(body),
+                // Union, not replacement: the response still names keys it just minted,
+                // which a registry read taken before the write would not yet show.
+                requiredKeyIds: [...new Set([...requiredHostedKeyIds(body), ...registryKeyIds])],
             });
             const publicRegistry = requiredResponseRecord(body.publicRegistry, "publicRegistry");
             const blobStore = requiredResponseRecord(body.blobStore, "blobStore");
@@ -7159,8 +7251,9 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         return result.summary;
     }
     // ── habit subcommands (local, no daemon socket needed) ──
-    if (command.kind === "habit.list" || command.kind === "habit.create" || command.kind === "habit.runs" || command.kind === "habit.inspect" || command.kind === "habit.summary") {
-        const { parseHabitFile, renderHabitFile } = await Promise.resolve().then(() => __importStar(require("../habits/habit-parser")));
+    if (command.kind === "habit.list" || command.kind === "habit.create" || command.kind === "habit.runs" || command.kind === "habit.inspect" || command.kind === "habit.summary" || command.kind === "habit.cancel") {
+        const { createDegradedHabitFile, parseHabitFile, renderHabitFile } = await Promise.resolve().then(() => __importStar(require("../habits/habit-parser")));
+        const { publishNewHabitDefinition } = await Promise.resolve().then(() => __importStar(require("../habits/habit-lifecycle")));
         const { applyHabitRuntimeState } = await Promise.resolve().then(() => __importStar(require("../habits/habit-runtime-state")));
         const { listHabitRunReceipts, readHabitRunReceipt } = await Promise.resolve().then(() => __importStar(require("../../arc/flight-recorder")));
         const { readHabitSessionSummary } = await Promise.resolve().then(() => __importStar(require("../habits/habit-session-summary")));
@@ -7168,10 +7261,21 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         const bundleRoot = deps.agentBundleRoot ?? path.join(deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(), `${command.agent}.ouro`);
         /* v8 ignore stop */
         const habitsDir = path.join(bundleRoot, "habits");
+        if (command.kind === "habit.cancel") {
+            const { cancelHabit } = await Promise.resolve().then(() => __importStar(require("../habits/habit-cancel")));
+            const receipt = await cancelHabit({
+                agentRoot: bundleRoot,
+                habitId: command.habitName,
+                evidenceLocator: command.evidenceLocator,
+                authority: { kind: "offline_bridge" },
+            }, deps.habitCancelDeps);
+            deps.writeStdout(receipt.acknowledgement);
+            return receipt.acknowledgement;
+        }
         if (command.kind === "habit.list") {
             let files;
             try {
-                files = fs.readdirSync(habitsDir).filter((f) => f.endsWith(".md") && f !== "README.md");
+                files = fs.readdirSync(habitsDir).filter((f) => f.endsWith(".md") && f !== "README.md").sort();
             }
             catch {
                 const message = "no habits found";
@@ -7185,10 +7289,18 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             }
             const lines = [];
             for (const file of files) {
-                const fileContent = fs.readFileSync(path.join(habitsDir, file), "utf-8");
-                const habit = applyHabitRuntimeState(bundleRoot, parseHabitFile(fileContent, path.join(habitsDir, file)));
+                const filePath = path.join(habitsDir, file);
+                let habit;
+                try {
+                    const fileContent = fs.readFileSync(filePath, "utf-8");
+                    habit = applyHabitRuntimeState(bundleRoot, parseHabitFile(fileContent, filePath));
+                }
+                catch (error) {
+                    habit = createDegradedHabitFile(filePath, "read_error", "", error instanceof Error ? error.message : String(error));
+                }
                 const lastRunStr = habit.lastRun ?? "never";
-                lines.push(`${habit.name}  cadence=${habit.cadence ?? "none"}  status=${habit.status}  lastRun=${lastRunStr}`);
+                const degradedReason = habit.status === "degraded" ? `  degradedReason=${habit.degradedReason}` : "";
+                lines.push(`${habit.name}  cadence=${habit.cadence ?? "none"}  status=${habit.status}${degradedReason}  lastRun=${lastRunStr}`);
             }
             const message = lines.join("\n");
             deps.writeStdout(message);
@@ -7272,12 +7384,6 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         }
         // habit.create
         const filePath = path.join(habitsDir, `${command.name}.md`);
-        if (fs.existsSync(filePath)) {
-            const message = `error: habit '${command.name}' already exists`;
-            deps.writeStdout(message);
-            return message;
-        }
-        fs.mkdirSync(habitsDir, { recursive: true });
         const now = new Date().toISOString();
         const habitContent = renderHabitFile({
             title: command.name,
@@ -7285,7 +7391,16 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             status: "active",
             created: now,
         }, `Habit: ${command.name}`);
-        fs.writeFileSync(filePath, habitContent, "utf-8");
+        const publication = publishNewHabitDefinition({
+            agentRoot: bundleRoot,
+            habitId: command.name,
+            bytes: habitContent,
+        });
+        if (publication === "exists") {
+            const message = `error: habit '${command.name}' already exists`;
+            deps.writeStdout(message);
+            return message;
+        }
         const message = `created: ${filePath}`;
         deps.writeStdout(message);
         return message;
@@ -8258,7 +8373,9 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
         ? command.json
             ? formatDaemonStatusJsonOutput(response)
             : (0, cli_render_1.formatDaemonStatusOutput)(response, fallbackMessage)
-        : fallbackMessage;
+        : command.kind === "habit.probe" && command.json
+            ? habitProbeJsonResponse(response)
+            : fallbackMessage;
     deps.writeStdout(message);
     return message;
 }

package/dist/heart/daemon/cli-help.js

@@ -10,6 +10,7 @@ exports.levenshteinDistance = levenshteinDistance;
 exports.suggestCommand = suggestCommand;
 exports.getGroupedHelp = getGroupedHelp;
 exports.getCommandHelp = getCommandHelp;
+const core_1 = require("../../nerves/review/core");
 // ── Registry ──
 exports.COMMAND_REGISTRY = {
     up: {
@@ -142,7 +143,7 @@ exports.COMMAND_REGISTRY = {
         description: "Manage agent habits",
         usage: "ouro habit <subcommand> [--agent <name>]",
         example: "ouro habit list",
-        subcommands: ["list", "create", "runs", "inspect", "summary", "poke"],
+        subcommands: ["list", "create", "runs", "inspect", "summary", "poke", "cancel", "probe"],
     },
     rsvp: {
         category: "Habits",
@@ -186,7 +187,7 @@ exports.COMMAND_REGISTRY = {
     },
     "nerves-review": {
         category: "Internal",
-        description: "Read-only review of recent nerves events from an agent log stream",
+        description: `Read-only review of recent nerves events from one agent log stream (default: ${core_1.DEFAULT_NERVES_PROCESS})`,
         usage: "ouro nerves-review [--agent <name>] [--process <name>] [--component <substr>] [--event <substr>] [--level <level>] [--since <duration>] [--limit <n>] [--json]",
         example: "ouro nerves-review --agent slugger --component daemon --event habit --since 30m --json",
     },
@@ -368,6 +369,16 @@ exports.COMMAND_REGISTRY = {
     },
 };
 const SUBCOMMAND_HELP = {
+    "habit probe": {
+        description: "Probe one habit through its real dispatch path with an irrevocable no-send boundary; it cannot send and reports zero transport invocations",
+        usage: "ouro habit probe --agent <name> --habit <name> --no-send [--json]",
+        example: "ouro habit probe --agent slugger --habit report-name --no-send --json",
+    },
+    "habit cancel": {
+        description: "Cancel a habit offline from a previously verified evidence bridge",
+        usage: "ouro habit cancel --agent <name> --habit <name> --evidence <bridge-id>",
+        example: "ouro habit cancel --agent slugger --habit report-name --evidence pre-v1-bluebubbles-event-id",
+    },
     "private decisions": {
         description: "Read recent private-runtime allow/deny decisions from the policy ledger",
         usage: "ouro private decisions [--agent <name>] [--limit <n>] [--json]",

package/dist/heart/daemon/cli-parse.js

@@ -18,6 +18,7 @@ const friends_1 = require("@ouro.bot/friends");
 const cli_help_1 = require("./cli-help");
 const cli_desk_1 = require("./cli-desk");
 const flight_recorder_1 = require("../../arc/flight-recorder");
+const core_1 = require("../../nerves/review/core");
 const vault_items_1 = require("./vault-items");
 // ── Shared helpers ──
 function extractAgentFlag(args) {
@@ -112,6 +113,8 @@ function usage() {
         "  ouro habit runs [--agent <name>] [--limit <n>]",
         "  ouro habit inspect [--agent <name>] <runId>",
         "  ouro habit summary [--agent <name>] (--run-id <id>|--habit <name>|--operation-id <id>) [--which latest|previous|latest-success|latest-failure] [--json]",
+        "  ouro habit cancel --agent <name> --habit <name> --evidence <bridge-id>",
+        "  ouro habit probe --agent <name> --habit <name> --no-send [--json]",
         "  ouro link <agent> --friend <id> --provider <provider> --external-id <external-id>",
         "  ouro bluebubbles replay [--agent <name>] --message-guid <guid> [--event-type new-message|updated-message] [--json]",
         "  ouro bluebubbles context-smoke [--agent <name>] --message-guid <guid> [--persist] [--json]",
@@ -314,6 +317,84 @@ function parsePokeCommand(args) {
 function parseHabitCommand(args) {
     const { agent, rest } = extractAgentFlag(args);
     const sub = rest[0];
+    if (sub === "probe") {
+        if (args.includes("--allow-send")) {
+            throw new Error("habit probe cannot allow send");
+        }
+        if (args.filter((value) => value === "--agent").length !== 1
+            || !agent
+            || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(agent))
+            throw new Error("habit probe requires --agent <name>");
+        let habitName;
+        let json = false;
+        let sawNoSend = false;
+        const options = rest.slice(1);
+        for (let index = 0; index < options.length; index += 1) {
+            const option = options[index];
+            if (option === "--json") {
+                if (json)
+                    throw new Error("habit probe received duplicate --json");
+                json = true;
+                continue;
+            }
+            if (option === "--no-send") {
+                if (sawNoSend)
+                    throw new Error("habit probe received duplicate --no-send");
+                sawNoSend = true;
+                continue;
+            }
+            if (option === "--habit" && options[index + 1]) {
+                if (habitName !== undefined)
+                    throw new Error("habit probe received duplicate --habit");
+                habitName = options[index + 1];
+                index += 1;
+                continue;
+            }
+            throw new Error("Usage: ouro habit probe --agent <name> --habit <name> --no-send [--json]");
+        }
+        if (!habitName)
+            throw new Error("habit probe requires --habit <name>");
+        if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(habitName)) {
+            throw new Error("habit probe requires a valid --habit name");
+        }
+        return { kind: "habit.probe", agent, habitName, noSend: true, json };
+    }
+    if (sub === "cancel") {
+        if (args.filter((value) => value === "--agent").length !== 1
+            || !agent
+            || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(agent)) {
+            throw new Error(`Usage\n${usage()}`);
+        }
+        let habitName;
+        let evidenceLocator;
+        const options = rest.slice(1);
+        for (let index = 0; index < options.length; index += 1) {
+            const option = options[index];
+            const value = options[index + 1];
+            if ((option !== "--habit" && option !== "--evidence") || value === undefined) {
+                throw new Error(`Usage\n${usage()}`);
+            }
+            if (option === "--habit") {
+                if (habitName !== undefined)
+                    throw new Error(`Usage\n${usage()}`);
+                habitName = value;
+            }
+            else {
+                if (evidenceLocator !== undefined)
+                    throw new Error(`Usage\n${usage()}`);
+                evidenceLocator = value;
+            }
+            index += 1;
+        }
+        if (!habitName || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(habitName)) {
+            throw new Error("habit cancellation requires a valid --habit name");
+        }
+        if (!evidenceLocator
+            || evidenceLocator.startsWith("capture:")
+            || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(evidenceLocator))
+            throw new Error("habit cancellation requires an offline evidence bridge ID");
+        return { kind: "habit.cancel", agent, habitName, evidenceLocator };
+    }
     if (sub === "list") {
         return { kind: "habit.list", ...(agent ? { agent } : {}) };
     }
@@ -2225,7 +2306,7 @@ function parseRsvpSmokeCommand(args) {
 }
 function parseNervesReviewCommand(args) {
     const { agent, rest } = extractAgentFlag(args);
-    let processName = "daemon";
+    let processName = core_1.DEFAULT_NERVES_PROCESS;
     let component;
     let event;
     let level;