@ouro.bot/cli 0.1.0-alpha.665 → 0.1.0-alpha.666

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

@@ -364,6 +364,8 @@ function agentResolutionFailureMode(command) {
         case "friend.update":
         case "habit.list":
         case "habit.create":
+        case "habit.runs":
+        case "habit.inspect":
         case "thoughts":
         case "attention.list":
         case "attention.show":
@@ -6841,9 +6843,10 @@ 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") {
+    if (command.kind === "habit.list" || command.kind === "habit.create" || command.kind === "habit.runs" || command.kind === "habit.inspect") {
         const { parseHabitFile, renderHabitFile } = await Promise.resolve().then(() => __importStar(require("../habits/habit-parser")));
         const { applyHabitRuntimeState } = await Promise.resolve().then(() => __importStar(require("../habits/habit-runtime-state")));
+        const { listHabitRunReceipts, readHabitRunReceipt } = await Promise.resolve().then(() => __importStar(require("../../arc/flight-recorder")));
         /* v8 ignore start -- production default: uses real bundle root @preserve */
         const bundleRoot = deps.agentBundleRoot ?? path.join(deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(), `${command.agent}.ouro`);
         /* v8 ignore stop */
@@ -6874,6 +6877,52 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             deps.writeStdout(message);
             return message;
         }
+        if (command.kind === "habit.runs") {
+            const receipts = listHabitRunReceipts(bundleRoot, { limit: command.limit });
+            const message = receipts.length === 0
+                ? "no habit runs found"
+                : receipts.map((receipt) => [
+                    receipt.runId,
+                    `habit=${receipt.habitName}`,
+                    `trigger=${receipt.trigger}`,
+                    `outcome=${receipt.outcome}`,
+                    `endedAt=${receipt.endedAt}`,
+                    `receipt=${receipt.receiptLocator}`,
+                ].join("  ")).join("\n");
+            deps.writeStdout(message);
+            (0, runtime_1.emitNervesEvent)({
+                component: "daemon",
+                event: "daemon.habit_runs_cli_read",
+                message: "habit run receipts listed from CLI",
+                meta: { agent: command.agent, limit: command.limit, count: receipts.length },
+            });
+            return message;
+        }
+        if (command.kind === "habit.inspect") {
+            const receipt = readHabitRunReceipt(bundleRoot, command.runId);
+            if (!receipt) {
+                const message = `error: habit run '${command.runId}' not found`;
+                deps.writeStdout(message);
+                deps.setExitCode?.(1);
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "daemon",
+                    event: "daemon.habit_run_cli_read_missing",
+                    message: "habit run receipt not found from CLI",
+                    meta: { agent: command.agent, runId: command.runId },
+                });
+                return message;
+            }
+            const message = `${JSON.stringify(receipt, null, 2)}\n`;
+            deps.writeStdout(message);
+            (0, runtime_1.emitNervesEvent)({
+                component: "daemon",
+                event: "daemon.habit_run_cli_read",
+                message: "habit run receipt read from CLI",
+                meta: { agent: command.agent, runId: command.runId },
+            });
+            return message;
+        }
         // habit.create
         const filePath = path.join(habitsDir, `${command.name}.md`);
         if (fs.existsSync(filePath)) {

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

@@ -127,7 +127,7 @@ exports.COMMAND_REGISTRY = {
     poke: {
         category: "Tasks",
         description: "Poke an agent about a task or habit",
-        usage: "ouro poke <agent> --task <task-id> | --habit <name>",
+        usage: "ouro poke <agent> --task <task-id> | --habit <name> [--trigger poke|launchd|cron|overdue|manual]",
         example: "ouro poke ouroboros --task abc123",
     },
     habit: {

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

@@ -17,6 +17,7 @@ exports.parseOuroCommand = parseOuroCommand;
 const types_1 = require("../../mind/friends/types");
 const cli_help_1 = require("./cli-help");
 const cli_desk_1 = require("./cli-desk");
+const flight_recorder_1 = require("../../arc/flight-recorder");
 const vault_items_1 = require("./vault-items");
 // ── Shared helpers ──
 function extractAgentFlag(args) {
@@ -104,9 +105,11 @@ function usage() {
         "  ouro chat <agent>",
         "  ouro msg --to <agent> [--session <id>] [--task <ref>] <message>",
         "  ouro poke <agent> --task <task-id>",
-        "  ouro poke <agent> --habit <name>",
+        "  ouro poke <agent> --habit <name> [--trigger poke|launchd|cron|overdue|manual]",
         "  ouro habit list [--agent <name>]",
         "  ouro habit create [--agent <name>] <name> [--cadence <interval>]",
+        "  ouro habit runs [--agent <name>] [--limit <n>]",
+        "  ouro habit inspect [--agent <name>] <runId>",
         "  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 friend list [--agent <name>]",
@@ -175,6 +178,7 @@ function parsePokeCommand(args) {
     let taskId;
     let habitName;
     let awaitName;
+    let trigger;
     for (let i = 1; i < args.length; i += 1) {
         if (args[i] === "--task") {
             taskId = args[i + 1];
@@ -188,12 +192,21 @@ function parsePokeCommand(args) {
             awaitName = args[i + 1];
             i += 1;
         }
+        if (args[i] === "--trigger") {
+            const rawTrigger = args[i + 1];
+            if (!(0, flight_recorder_1.isHabitRunTrigger)(rawTrigger))
+                throw new Error("invalid habit trigger");
+            trigger = rawTrigger;
+            i += 1;
+        }
     }
     // Priority order: --await > --habit > --task
     if (awaitName)
         return { kind: "await.poke", agent, awaitName };
     if (habitName)
-        return { kind: "habit.poke", agent, habitName };
+        return { kind: "habit.poke", agent, habitName, trigger: trigger ?? "poke" };
+    if (trigger)
+        throw new Error(`Usage\n${usage()}`);
     if (!taskId)
         throw new Error(`Usage\n${usage()}`);
     return { kind: "task.poke", agent, taskId };
@@ -227,6 +240,27 @@ function parseHabitCommand(args) {
             throw new Error(`Usage\n${usage()}`);
         return { kind: "habit.create", name, ...(agent ? { agent } : {}), ...(cadence ? { cadence } : {}) };
     }
+    if (sub === "runs") {
+        let limit = 20;
+        const options = rest.slice(1);
+        for (let i = 0; i < options.length; i += 1) {
+            if (options[i] !== "--limit" || !options[i + 1])
+                throw new Error(`Usage\n${usage()}`);
+            const parsedLimit = Number.parseInt(options[i + 1], 10);
+            if (!Number.isInteger(parsedLimit) || String(parsedLimit) !== options[i + 1] || parsedLimit < 1 || parsedLimit > 100) {
+                throw new Error("--limit must be an integer between 1 and 100");
+            }
+            limit = parsedLimit;
+            i += 1;
+        }
+        return { kind: "habit.runs", ...(agent ? { agent } : {}), limit };
+    }
+    if (sub === "inspect") {
+        const positional = rest.slice(1);
+        if (positional.length !== 1 || !positional[0])
+            throw new Error(`Usage\n${usage()}`);
+        return { kind: "habit.inspect", ...(agent ? { agent } : {}), runId: positional[0] };
+    }
     throw new Error(`Usage\n${usage()}`);
 }
 function parseLinkCommand(args, kind = "friend.link") {

package/dist/heart/daemon/daemon-entry.js

@@ -149,9 +149,30 @@ const processManager = new process_manager_1.DaemonProcessManager({
     },
     /* v8 ignore stop */
 });
-const scheduler = new task_scheduler_1.TaskDrivenScheduler({
+const taskScheduler = new task_scheduler_1.TaskDrivenScheduler({
     agents: [...managedAgents],
 });
+const habitSchedulers = [];
+const awaitSchedulers = [];
+const scheduler = {
+    listJobs: () => [
+        ...taskScheduler.listJobs(),
+        ...habitSchedulers.flatMap((habitScheduler) => habitScheduler.listJobs()),
+    ],
+    triggerJob: (jobId) => taskScheduler.triggerJob(jobId),
+    triggerHabitJob: async (jobId) => {
+        for (const habitScheduler of habitSchedulers) {
+            const result = await habitScheduler.triggerJob(jobId, "cron");
+            if (result.ok)
+                return result;
+        }
+        return { ok: false, message: `unknown habit job: ${jobId}` };
+    },
+    start: () => taskScheduler.start(),
+    stop: () => taskScheduler.stop(),
+    reconcile: () => taskScheduler.reconcile(),
+    recordTaskRun: (agent, taskId) => taskScheduler.recordTaskRun(agent, taskId),
+};
 const router = new message_router_1.FileMessageRouter();
 const senseManager = new sense_manager_1.DaemonSenseManager({
     agents: [...managedAgents],
@@ -201,8 +222,6 @@ const healthMonitor = new health_monitor_1.HealthMonitor({
         catch { /* recovery is best-effort */ }
     },
 });
-const habitSchedulers = [];
-const awaitSchedulers = [];
 let entryRuntimeStopping = false;
 let stopCommandExitScheduled = false;
 function stopEntryRuntime() {
@@ -393,8 +412,8 @@ void daemon.start().then(async () => {
                 agent,
                 habitsDir,
                 osCronManager,
-                onHabitFire: (habitName) => {
-                    processManager.sendToAgent(agent, { type: "habit", habitName, trigger: "overdue" });
+                onHabitFire: (habitName, trigger) => {
+                    processManager.sendToAgent(agent, { type: "habit", habitName, trigger });
                 },
                 deps: {
                     readdir: (dir) => fs.readdirSync(dir),

package/dist/heart/daemon/daemon.js

@@ -67,6 +67,7 @@ const mailbox_read_1 = require("../mailbox/mailbox-read");
 const mailbox_view_1 = require("../mailbox/mailbox-view");
 const provider_visibility_1 = require("../provider-visibility");
 const socket_client_1 = require("./socket-client");
+const flight_recorder_1 = require("../../arc/flight-recorder");
 const PIDFILE_PATH = path.join(os.homedir(), ".ouro-cli", "daemon.pids");
 /**
  * Defense-in-depth: detect if we're running under vitest. The pidfile lives
@@ -1236,6 +1237,10 @@ class OuroDaemon {
                 return { ok: true, summary, data: jobs };
             }
             case "cron.trigger": {
+                const habitResult = await this.scheduler.triggerHabitJob?.(command.jobId);
+                if (habitResult?.ok) {
+                    return { ok: true, message: habitResult.message };
+                }
                 const result = await this.scheduler.triggerJob(command.jobId);
                 return { ok: result.ok, message: result.message };
             }
@@ -1302,7 +1307,11 @@ class OuroDaemon {
                 };
             }
             case "habit.poke": {
-                this.processManager.sendToAgent?.(command.agent, { type: "habit", habitName: command.habitName, trigger: "poke" });
+                const trigger = command.trigger ?? "poke";
+                if (!(0, flight_recorder_1.isHabitRunTrigger)(trigger)) {
+                    return { ok: false, error: `invalid habit trigger: ${String(trigger)}` };
+                }
+                this.processManager.sendToAgent?.(command.agent, { type: "habit", habitName: command.habitName, trigger });
                 return {
                     ok: true,
                     message: `poked habit ${command.habitName} for ${command.agent}`,

package/dist/heart/habits/habit-scheduler.js

@@ -108,7 +108,7 @@ class HabitScheduler {
                     message: "firing overdue habit (never run)",
                     meta: { habitName: habit.name, agent: this.agent },
                 });
-                this.onHabitFire(habit.name);
+                this.onHabitFire(habit.name, "overdue");
                 continue;
             }
             const lastRunMs = new Date(habit.lastRun).getTime();
@@ -120,7 +120,7 @@ class HabitScheduler {
                     message: "firing overdue habit",
                     meta: { habitName: habit.name, agent: this.agent, elapsedMs: elapsed },
                 });
-                this.onHabitFire(habit.name);
+                this.onHabitFire(habit.name, "overdue");
             }
         }
     }
@@ -174,6 +174,25 @@ class HabitScheduler {
             return null;
         }
     }
+    listJobs() {
+        return this.buildJobs(this.scanHabits())
+            .map((job) => ({ id: job.id, schedule: job.schedule, lastRun: job.lastRun }))
+            .sort((a, b) => a.id.localeCompare(b.id));
+    }
+    async triggerJob(jobId, trigger = "cron") {
+        const job = this.buildJobs(this.scanHabits()).find((candidate) => candidate.id === jobId);
+        if (!job) {
+            return { ok: false, message: `unknown habit job: ${jobId}` };
+        }
+        this.onHabitFire(job.taskId, trigger);
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.habit_job_triggered",
+            message: "habit scheduler job triggered",
+            meta: { agent: job.agent, habitName: job.taskId, jobId, trigger },
+        });
+        return { ok: true, message: `triggered habit ${jobId}` };
+    }
     watchForChanges() {
         const watchFn = this.deps.watch;
         if (!watchFn)
@@ -278,7 +297,7 @@ class HabitScheduler {
                 const output = this.execForVerify("crontab -l");
                 const lines = output.split("\n");
                 for (const line of lines) {
-                    const match = line.match(/ouro poke \S+ --habit (\S+)/);
+                    const match = line.match(/ouro poke \S+ --habit (\S+)(?:\s+--trigger\s+\S+)?/);
                     if (match) {
                         verified.add(match[1]);
                     }
@@ -293,7 +312,7 @@ class HabitScheduler {
     createTimerFallback(habitName, cadenceMs) {
         const schedule = () => {
             const timer = setTimeout(() => {
-                this.onHabitFire(habitName);
+                this.onHabitFire(habitName, "overdue");
                 schedule();
             }, cadenceMs);
             this.timerFallbacks.set(habitName, timer);
@@ -362,7 +381,7 @@ class HabitScheduler {
                 taskId: habit.name,
                 schedule: cronSchedule,
                 lastRun: habit.lastRun,
-                command: `${this.deps.ouroPath} poke ${this.agent} --habit ${habit.name}`,
+                command: `${this.deps.ouroPath} poke ${this.agent} --habit ${habit.name} --trigger launchd`,
                 taskPath: path.join(this.habitsDir, `${habit.name}.md`),
             });
         }