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

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

@@ -39,6 +39,7 @@ const path = __importStar(require("path"));
 const runtime_1 = require("../../nerves/runtime");
 const habit_parser_1 = require("./habit-parser");
 const habit_runtime_state_1 = require("./habit-runtime-state");
+const habit_lifecycle_1 = require("./habit-lifecycle");
 const frontmatter_1 = require("../../util/frontmatter");
 /** Fields that belong to the task system and should be stripped from migrated habits. */
 const TASK_ONLY_FIELDS = new Set([
@@ -54,15 +55,13 @@ const TASK_ONLY_FIELDS = new Set([
 ]);
 /** Regex matching the YYYY-MM-DD-HHMM- timestamp prefix in task filenames. */
 const TIMESTAMP_PREFIX = /^\d{4}-\d{2}-\d{2}-\d{4}-/;
-/** Map old task statuses to habit statuses. */
-function mapStatus(taskStatus) {
-    if (taskStatus === "processing")
-        return "active";
-    if (taskStatus === "paused")
-        return "paused";
+/** Map known old task statuses while preserving explicit unknown values for fail-closed parsing. */
+function mapStatus(taskStatus, wasExplicit) {
+    if (!wasExplicit || taskStatus === "processing")
+        return { skip: false, status: "active" };
     if (taskStatus === "done")
-        return null; // skip done habits
-    return "active"; // default to active for unknown statuses
+        return { skip: true, status: taskStatus };
+    return { skip: false, status: taskStatus };
 }
 /** Strip timestamp prefix from filename to get the slug name. */
 function stripTimestampPrefix(filename) {
@@ -99,16 +98,6 @@ function migrateHabitsFromTaskSystem(bundleRoot) {
     for (const file of mdFiles) {
         const slugName = stripTimestampPrefix(file);
         const targetPath = path.join(newHabitsDir, slugName);
-        // Skip if already migrated
-        if (fs.existsSync(targetPath)) {
-            (0, runtime_1.emitNervesEvent)({
-                component: "daemon",
-                event: "daemon.habit_migration_skip",
-                message: "habit already exists at target, skipping",
-                meta: { file, targetPath },
-            });
-            continue;
-        }
         const sourcePath = path.join(oldHabitsDir, file);
         let content;
         try {
@@ -126,11 +115,14 @@ function migrateHabitsFromTaskSystem(bundleRoot) {
             continue;
         const rawFrontmatter = lines.slice(1, closing).join("\n");
         const body = lines.slice(closing + 1).join("\n").trim();
+        if (!(0, habit_parser_1.isHabitFrontmatterSyntaxValid)(rawFrontmatter))
+            continue;
         const frontmatter = (0, frontmatter_1.parseFrontmatter)(rawFrontmatter);
         // Check status — skip done habits
-        const rawStatus = typeof frontmatter.status === "string" ? frontmatter.status : "processing";
-        const habitStatus = mapStatus(rawStatus);
-        if (habitStatus === null) {
+        const hasExplicitStatus = Object.prototype.hasOwnProperty.call(frontmatter, "status");
+        const rawStatus = hasExplicitStatus ? frontmatter.status : undefined;
+        const mappedStatus = mapStatus(rawStatus, hasExplicitStatus);
+        if (mappedStatus.skip) {
             (0, runtime_1.emitNervesEvent)({
                 component: "daemon",
                 event: "daemon.habit_migration_skip",
@@ -150,7 +142,7 @@ function migrateHabitsFromTaskSystem(bundleRoot) {
             newFrontmatter.title = frontmatter.title;
         if (typeof frontmatter.cadence === "string")
             newFrontmatter.cadence = frontmatter.cadence;
-        newFrontmatter.status = habitStatus;
+        newFrontmatter.status = mappedStatus.status;
         newFrontmatter.created = typeof frontmatter.created === "string" ? frontmatter.created : "null";
         // Add any other non-task fields from original
         for (const [key, value] of Object.entries(frontmatter)) {
@@ -166,7 +158,20 @@ function migrateHabitsFromTaskSystem(bundleRoot) {
             newFrontmatter[key] = value;
         }
         const rendered = (0, habit_parser_1.renderHabitFile)(newFrontmatter, body);
-        fs.writeFileSync(targetPath, rendered, "utf-8");
+        const publication = (0, habit_lifecycle_1.publishNewHabitDefinition)({
+            agentRoot: bundleRoot,
+            habitId: path.basename(slugName, ".md"),
+            bytes: rendered,
+        });
+        if (publication === "exists") {
+            (0, runtime_1.emitNervesEvent)({
+                component: "daemon",
+                event: "daemon.habit_migration_skip",
+                message: "habit already exists at target, skipping",
+                meta: { file, targetPath },
+            });
+            continue;
+        }
         if (legacyLastRun) {
             (0, habit_runtime_state_1.writeHabitLastRun)(bundleRoot, path.basename(slugName, ".md"), legacyLastRun);
         }

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

@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHabitFrontmatterSyntaxValid = isHabitFrontmatterSyntaxValid;
+exports.createDegradedHabitFile = createDegradedHabitFile;
 exports.parseHabitFile = parseHabitFile;
 exports.renderHabitFile = renderHabitFile;
 const path = __importStar(require("path"));
@@ -40,7 +42,7 @@ const frontmatter_1 = require("../../util/frontmatter");
 const runtime_1 = require("../../nerves/runtime");
 const habit_policy_1 = require("../../rsvp/habit-policy");
 function isHabitStatus(value) {
-    return value === "active" || value === "paused";
+    return value === "active" || value === "paused" || value === "cancelled";
 }
 function parseToolsField(raw) {
     if (raw === undefined || raw === null)
@@ -110,18 +112,63 @@ function parseContinuity(raw) {
     const mode = record ? record.mode : null;
     return { mode: mode === "stateful" ? "stateful" : "fresh" };
 }
+function isHabitFrontmatterSyntaxValid(rawFrontmatter) {
+    const lines = rawFrontmatter.split(/\r?\n/);
+    for (let index = 0; index < lines.length; index += 1) {
+        const line = lines[index];
+        if (!line.trim())
+            continue;
+        const match = /^([A-Za-z0-9_:-]+):\s*(.*)$/.exec(line);
+        if (!match)
+            return false;
+        if (match[2].length > 0)
+            continue;
+        let cursor = index + 1;
+        while (cursor < lines.length && /^\s*-\s+/.test(lines[cursor]))
+            cursor += 1;
+        if (cursor > index + 1) {
+            index = cursor - 1;
+            continue;
+        }
+        while (cursor < lines.length && /^\s+[A-Za-z0-9_:-]+:\s*/.test(lines[cursor]))
+            cursor += 1;
+        index = cursor - 1;
+    }
+    return true;
+}
 function extractFrontmatterAndBody(content) {
     const lines = content.split(/\r?\n/);
     if (lines[0]?.trim() !== "---") {
-        return null;
+        return { kind: "legacy_body", body: content.trim() };
     }
     const closing = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
     if (closing === -1) {
-        return null;
+        return { kind: "degraded", reason: "unterminated_frontmatter", body: content.trim() };
     }
     const rawFrontmatter = lines.slice(1, closing).join("\n");
     const body = lines.slice(closing + 1).join("\n").trim();
-    return { frontmatter: (0, frontmatter_1.parseFrontmatter)(rawFrontmatter), body };
+    if (!isHabitFrontmatterSyntaxValid(rawFrontmatter)) {
+        return { kind: "degraded", reason: "malformed_frontmatter", body };
+    }
+    return { kind: "frontmatter", frontmatter: (0, frontmatter_1.parseFrontmatter)(rawFrontmatter), body };
+}
+function createDegradedHabitFile(filePath, degradedReason, body = "", degradedDetail = null) {
+    const stem = path.basename(filePath, ".md");
+    return {
+        name: stem,
+        title: stem,
+        cadence: null,
+        status: "degraded",
+        degradedReason,
+        degradedDetail,
+        lastRun: null,
+        created: null,
+        tools: undefined,
+        origin: null,
+        surface: { family: false, originator: false, extra: [] },
+        continuity: { mode: "fresh" },
+        body: body.trim(),
+    };
 }
 function parseHabitFile(content, filePath) {
     (0, runtime_1.emitNervesEvent)({
@@ -132,7 +179,7 @@ function parseHabitFile(content, filePath) {
     });
     const stem = path.basename(filePath, ".md");
     const parsed = extractFrontmatterAndBody(content);
-    if (!parsed) {
+    if (parsed.kind === "legacy_body") {
         return {
             name: stem,
             title: stem,
@@ -144,21 +191,38 @@ function parseHabitFile(content, filePath) {
             origin: null,
             surface: { family: true, originator: true, extra: [] },
             continuity: { mode: "fresh" },
-            body: content.trim(),
+            body: parsed.body,
         };
     }
+    if (parsed.kind === "degraded") {
+        return createDegradedHabitFile(filePath, parsed.reason, parsed.body);
+    }
     const { frontmatter, body } = parsed;
     const rawTitle = frontmatter.title;
     const title = typeof rawTitle === "string" && rawTitle.length > 0 ? rawTitle : stem;
     const rawCadence = frontmatter.cadence;
     const cadence = typeof rawCadence === "string" && rawCadence.length > 0 ? rawCadence : null;
     const rawStatus = frontmatter.status;
-    const status = typeof rawStatus === "string" && isHabitStatus(rawStatus) ? rawStatus : "active";
+    const status = rawStatus === undefined
+        ? "active"
+        : typeof rawStatus === "string" && isHabitStatus(rawStatus)
+            ? rawStatus
+            : null;
+    if (status === null) {
+        return createDegradedHabitFile(filePath, "invalid_status", body);
+    }
     const rawLastRun = frontmatter.lastRun ?? frontmatter.last_run;
     const lastRun = typeof rawLastRun === "string" && rawLastRun.length > 0 ? rawLastRun : null;
     const rawCreated = frontmatter.created;
     const created = typeof rawCreated === "string" && rawCreated.length > 0 ? rawCreated : null;
-    const rsvp = (0, habit_policy_1.parseRsvpHabitMetadata)(frontmatter.rsvp);
+    let rsvp;
+    try {
+        rsvp = (0, habit_policy_1.parseRsvpHabitMetadata)(frontmatter.rsvp);
+    }
+    catch (error) {
+        const degradedDetail = (0, habit_policy_1.rsvpHabitMetadataErrorDetail)(error);
+        return createDegradedHabitFile(filePath, "invalid_metadata", body, degradedDetail);
+    }
     const tools = rsvp ? [...habit_policy_1.RSVP_HABIT_ALLOWED_TOOLS] : parseToolsField(frontmatter.tools);
     const origin = parseOrigin(frontmatter.origin);
     const surface = parseSurface(frontmatter.surface);

package/dist/heart/habits/habit-runtime-state.js

@@ -37,7 +37,6 @@ exports.readHabitLastRun = readHabitLastRun;
 exports.applyHabitRuntimeState = applyHabitRuntimeState;
 exports.writeHabitLastRun = writeHabitLastRun;
 exports.recordHabitRun = recordHabitRun;
-const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const json_store_1 = require("../../arc/json-store");
 const runtime_1 = require("../../nerves/runtime");
@@ -50,21 +49,6 @@ function isNonEmptyString(value) {
 function nullableCursor(value) {
     return isNonEmptyString(value) ? value.trim() : null;
 }
-function stripLegacyLastRunFromDefinition(definitionPath) {
-    const content = fs.readFileSync(definitionPath, "utf-8");
-    const lines = content.split(/\r?\n/);
-    if (lines[0]?.trim() !== "---")
-        return;
-    const closing = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
-    if (closing === -1)
-        return;
-    const frontmatterLines = lines.slice(1, closing);
-    const filtered = frontmatterLines.filter((line) => !/^\s*lastRun\s*:/.test(line) && !/^\s*last_run\s*:/.test(line));
-    if (filtered.length === frontmatterLines.length)
-        return;
-    const nextContent = ["---", ...filtered, "---", ...lines.slice(closing + 1)].join("\n");
-    fs.writeFileSync(definitionPath, nextContent, "utf-8");
-}
 function readHabitLastRun(agentRoot, habitName) {
     const record = (0, json_store_1.readJsonFile)(habitRuntimeStateDir(agentRoot), habitName);
     return isNonEmptyString(record?.lastRun) ? record.lastRun : null;
@@ -103,12 +87,7 @@ function writeHabitLastRun(agentRoot, habitName, lastRun, updatedAt = lastRun, o
 }
 function recordHabitRun(agentRoot, habitName, lastRun, options = {}) {
     writeHabitLastRun(agentRoot, habitName, lastRun, lastRun, options);
-    if (!options.definitionPath)
-        return;
-    try {
-        stripLegacyLastRunFromDefinition(options.definitionPath);
-    }
-    catch {
-        // Missing/deleted habit files should never block runtime-state recording.
-    }
+    // Runtime cursor state is the sole authority for lastRun. Definition files
+    // are lifecycle-owned and must never be opportunistically rewritten from a
+    // run-completion path, even for legacy-field cleanup.
 }