maxsimcli 3.12.0 → 4.0.0

package/dist/core/state.d.ts

@@ -3,7 +3,7 @@
  *
  * Ported from maxsim/bin/lib/state.cjs
  */
-import type { StateMetricOptions, StateDecisionOptions, StateBlockerOptions, StateSessionOptions } from './types.js';
+import type { StateMetricOptions, StateDecisionOptions, StateBlockerOptions, StateSessionOptions, CmdResult } from './types.js';
 export declare function stateExtractField(content: string, fieldName: string): string | null;
 export declare function stateReplaceField(content: string, fieldName: string, newValue: string): string | null;
 /**
@@ -11,16 +11,16 @@ export declare function stateReplaceField(content: string, fieldName: string, ne
  * Returns updated content or null if section not found.
  */
 export declare function appendToStateSection(content: string, sectionPattern: RegExp, entry: string, placeholderPatterns?: RegExp[]): string | null;
-export declare function cmdStateLoad(cwd: string, raw: boolean): void;
-export declare function cmdStateGet(cwd: string, section: string | null, raw: boolean): void;
-export declare function cmdStatePatch(cwd: string, patches: Record<string, string>, raw: boolean): void;
-export declare function cmdStateUpdate(cwd: string, field: string | undefined, value: string | undefined): void;
-export declare function cmdStateAdvancePlan(cwd: string, raw: boolean): void;
-export declare function cmdStateRecordMetric(cwd: string, options: StateMetricOptions, raw: boolean): void;
-export declare function cmdStateUpdateProgress(cwd: string, raw: boolean): void;
-export declare function cmdStateAddDecision(cwd: string, options: StateDecisionOptions, raw: boolean): void;
-export declare function cmdStateAddBlocker(cwd: string, text: string | StateBlockerOptions, raw: boolean): void;
-export declare function cmdStateResolveBlocker(cwd: string, text: string | null, raw: boolean): void;
-export declare function cmdStateRecordSession(cwd: string, options: StateSessionOptions, raw: boolean): void;
-export declare function cmdStateSnapshot(cwd: string, raw: boolean): void;
+export declare function cmdStateLoad(cwd: string, raw: boolean): Promise<CmdResult>;
+export declare function cmdStateGet(cwd: string, section: string | null, raw: boolean): CmdResult;
+export declare function cmdStatePatch(cwd: string, patches: Record<string, string>, raw: boolean): CmdResult;
+export declare function cmdStateUpdate(cwd: string, field: string | undefined, value: string | undefined): CmdResult;
+export declare function cmdStateAdvancePlan(cwd: string, raw: boolean): CmdResult;
+export declare function cmdStateRecordMetric(cwd: string, options: StateMetricOptions, raw: boolean): CmdResult;
+export declare function cmdStateUpdateProgress(cwd: string, raw: boolean): CmdResult;
+export declare function cmdStateAddDecision(cwd: string, options: StateDecisionOptions, raw: boolean): CmdResult;
+export declare function cmdStateAddBlocker(cwd: string, text: string | StateBlockerOptions, raw: boolean): CmdResult;
+export declare function cmdStateResolveBlocker(cwd: string, text: string | null, raw: boolean): CmdResult;
+export declare function cmdStateRecordSession(cwd: string, options: StateSessionOptions, raw: boolean): CmdResult;
+export declare function cmdStateSnapshot(cwd: string, raw: boolean): CmdResult;
 //# sourceMappingURL=state.d.ts.map

package/dist/core/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/core/state.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EAGV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAIpB,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAInF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOrG;AAYD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAC7B,MAAM,GAAG,IAAI,CAYf;AAID,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA0C5D;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CAiCnF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA2B9F;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAqBtG;AAID,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA2BnE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA+BjG;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CAkCtE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA+BlG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA4BtG;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA6B3F;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA8BnG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CA6FhE"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/core/state.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EAGV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EAGnB,SAAS,EACV,MAAM,YAAY,CAAC;AAgBpB,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUnF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUrG;AAYD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAC7B,MAAM,GAAG,IAAI,CAYf;AAID,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAwChF;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA4BxF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CAyBnG;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAmB3G;AAID,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA0BxE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA+BtG;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CAiC3E;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA8BvG;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA2B3G;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA8BhG;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CA8BxG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,SAAS,CAyFrE"}

package/dist/core/state.js

@@ -27,19 +27,41 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 const core_js_1 = require("./core.js");
+const types_js_1 = require("./types.js");
 // ─── Internal helpers ────────────────────────────────────────────────────────
+/**
+ * Parse a markdown table row into cells, handling escaped pipes (`\|`) within cell content.
+ * Strips leading/trailing pipe characters and trims each cell.
+ */
+function parseTableRow(row) {
+    // Replace escaped pipes with a placeholder, split, then restore
+    const placeholder = '\x00PIPE\x00';
+    const safe = row.replace(/\\\|/g, placeholder);
+    return safe.split('|').map(c => c.replaceAll(placeholder, '|').trim()).filter(Boolean);
+}
 function stateExtractField(content, fieldName) {
-    const pattern = new RegExp(`\\*\\*${fieldName}:\\*\\*\\s*(.+)`, 'i');
-    const match = content.match(pattern);
-    return match ? match[1].trim() : null;
+    const escaped = (0, escape_string_regexp_1.default)(fieldName);
+    // Match **fieldName:** with optional extra whitespace around the name and colon
+    const boldPattern = new RegExp(`\\*\\*\\s*${escaped}\\s*:\\s*\\*\\*\\s*(.+)`, 'i');
+    const boldMatch = content.match(boldPattern);
+    if (boldMatch)
+        return boldMatch[1].trim();
+    // Fallback: match plain "fieldName: value" (no bold markers)
+    const plainPattern = new RegExp(`^\\s*${escaped}\\s*:\\s*(.+)`, 'im');
+    const plainMatch = content.match(plainPattern);
+    return plainMatch ? plainMatch[1].trim() : null;
 }
 function stateReplaceField(content, fieldName, newValue) {
     const escaped = (0, escape_string_regexp_1.default)(fieldName);
-    const pattern = new RegExp(`(\\*\\*${escaped}:\\*\\*\\s*)(.*)`, 'i');
-    if (pattern.test(content)) {
-        return content.replace(pattern, (_match, prefix) => `${prefix}${newValue}`);
-    }
-    return null;
+    // Match **fieldName:** with optional extra whitespace
+    const boldPattern = new RegExp(`(\\*\\*\\s*${escaped}\\s*:\\s*\\*\\*\\s*)(.*)`, 'i');
+    let replaced = content.replace(boldPattern, (_match, prefix) => `${prefix}${newValue}`);
+    if (replaced !== content)
+        return replaced;
+    // Fallback: plain "fieldName: value"
+    const plainPattern = new RegExp(`(^[ \\t]*${escaped}\\s*:\\s*)(.*)`, 'im');
+    replaced = content.replace(plainPattern, (_match, prefix) => `${prefix}${newValue}`);
+    return replaced !== content ? replaced : null;
 }
 function readTextArgOrFile(cwd, value, filePath, label) {
     if (!filePath)
@@ -69,18 +91,14 @@ function appendToStateSection(content, sectionPattern, entry, placeholderPattern
     return content.replace(sectionPattern, (_m, header) => `${header}${sectionBody}`);
 }
 // ─── State commands ──────────────────────────────────────────────────────────
-function cmdStateLoad(cwd, raw) {
+async function cmdStateLoad(cwd, raw) {
     const config = (0, core_js_1.loadConfig)(cwd);
-    let stateRaw = '';
-    try {
-        stateRaw = node_fs_1.default.readFileSync((0, core_js_1.statePath)(cwd), 'utf-8');
-    }
-    catch (e) {
-        /* optional op, ignore */
-        (0, core_js_1.debugLog)(e);
-    }
-    const configExists = node_fs_1.default.existsSync((0, core_js_1.configPath)(cwd));
-    const roadmapExists = node_fs_1.default.existsSync((0, core_js_1.roadmapPath)(cwd));
+    const [stateContent, configExists, roadmapExists] = await Promise.all([
+        (0, core_js_1.safeReadFileAsync)((0, core_js_1.statePath)(cwd)),
+        node_fs_1.default.promises.access((0, core_js_1.configPath)(cwd)).then(() => true, () => false),
+        node_fs_1.default.promises.access((0, core_js_1.roadmapPath)(cwd)).then(() => true, () => false),
+    ]);
+    const stateRaw = stateContent ?? '';
     const stateExists = stateRaw.length > 0;
     const result = {
         config,
@@ -105,38 +123,34 @@ function cmdStateLoad(cwd, raw) {
             `roadmap_exists=${roadmapExists}`,
             `state_exists=${stateExists}`,
         ];
-        (0, core_js_1.output)(result, true, lines.join('\n'));
+        return (0, types_js_1.cmdOk)(result, lines.join('\n'));
     }
-    (0, core_js_1.output)(result);
+    return (0, types_js_1.cmdOk)(result);
 }
 function cmdStateGet(cwd, section, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     try {
         const content = node_fs_1.default.readFileSync(statePath, 'utf-8');
         if (!section) {
-            (0, core_js_1.output)({ content }, raw, content);
-            return;
+            return (0, types_js_1.cmdOk)({ content }, raw ? content : undefined);
         }
-        const fieldEscaped = (0, escape_string_regexp_1.default)(section);
-        // Check for **field:** value
-        const fieldPattern = new RegExp(`\\*\\*${fieldEscaped}:\\*\\*\\s*(.*)`, 'i');
-        const fieldMatch = content.match(fieldPattern);
-        if (fieldMatch) {
-            (0, core_js_1.output)({ [section]: fieldMatch[1].trim() }, raw, fieldMatch[1].trim());
-            return;
+        // Check for **field:** value (reuse stateExtractField for format tolerance)
+        const fieldValue = stateExtractField(content, section);
+        if (fieldValue !== null) {
+            return (0, types_js_1.cmdOk)({ [section]: fieldValue }, raw ? fieldValue : undefined);
         }
-        // Check for ## Section
-        const sectionPattern = new RegExp(`##\\s*${fieldEscaped}\\s*\n([\\s\\S]*?)(?=\\n##|$)`, 'i');
+        // Check for ## or ### Section, tolerating extra blank lines after header
+        const fieldEscaped = (0, escape_string_regexp_1.default)(section);
+        const sectionPattern = new RegExp(`#{2,3}\\s*${fieldEscaped}\\s*\\n\\s*\\n?([\\s\\S]*?)(?=\\n#{2,3}\\s|$)`, 'i');
         const sectionMatch = content.match(sectionPattern);
         if (sectionMatch) {
-            (0, core_js_1.output)({ [section]: sectionMatch[1].trim() }, raw, sectionMatch[1].trim());
-            return;
+            return (0, types_js_1.cmdOk)({ [section]: sectionMatch[1].trim() }, raw ? sectionMatch[1].trim() : undefined);
         }
-        (0, core_js_1.output)({ error: `Section or field "${section}" not found` }, raw, '');
+        return (0, types_js_1.cmdOk)({ error: `Section or field "${section}" not found` }, raw ? '' : undefined);
     }
     catch (e) {
         (0, core_js_1.rethrowCliSignals)(e);
-        (0, core_js_1.error)('STATE.md not found');
+        return (0, types_js_1.cmdErr)('STATE.md not found');
     }
 }
 function cmdStatePatch(cwd, patches, raw) {
@@ -145,10 +159,9 @@ function cmdStatePatch(cwd, patches, raw) {
         let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
         const results = { updated: [], failed: [] };
         for (const [field, value] of Object.entries(patches)) {
-            const fieldEscaped = (0, escape_string_regexp_1.default)(field);
-            const pattern = new RegExp(`(\\*\\*${fieldEscaped}:\\*\\*\\s*)(.*)`, 'i');
-            if (pattern.test(content)) {
-                content = content.replace(pattern, (_match, prefix) => `${prefix}${value}`);
+            const result = stateReplaceField(content, field, value);
+            if (result) {
+                content = result;
                 results.updated.push(field);
             }
             else {
@@ -158,56 +171,52 @@ function cmdStatePatch(cwd, patches, raw) {
         if (results.updated.length > 0) {
             node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
         }
-        (0, core_js_1.output)(results, raw, results.updated.length > 0 ? 'true' : 'false');
+        return (0, types_js_1.cmdOk)(results, raw ? (results.updated.length > 0 ? 'true' : 'false') : undefined);
     }
     catch (e) {
         (0, core_js_1.rethrowCliSignals)(e);
-        (0, core_js_1.error)('STATE.md not found');
+        return (0, types_js_1.cmdErr)('STATE.md not found');
     }
 }
 function cmdStateUpdate(cwd, field, value) {
     if (!field || value === undefined) {
-        (0, core_js_1.error)('field and value required for state update');
+        return (0, types_js_1.cmdErr)('field and value required for state update');
     }
     const statePath = (0, core_js_1.statePath)(cwd);
     try {
-        let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
-        const fieldEscaped = (0, escape_string_regexp_1.default)(field);
-        const pattern = new RegExp(`(\\*\\*${fieldEscaped}:\\*\\*\\s*)(.*)`, 'i');
-        if (pattern.test(content)) {
-            content = content.replace(pattern, (_match, prefix) => `${prefix}${value}`);
-            node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-            (0, core_js_1.output)({ updated: true });
+        const content = node_fs_1.default.readFileSync(statePath, 'utf-8');
+        const result = stateReplaceField(content, field, value);
+        if (result) {
+            node_fs_1.default.writeFileSync(statePath, result, 'utf-8');
+            return (0, types_js_1.cmdOk)({ updated: true });
         }
         else {
-            (0, core_js_1.output)({ updated: false, reason: `Field "${field}" not found in STATE.md` });
+            return (0, types_js_1.cmdOk)({ updated: false, reason: `Field "${field}" not found in STATE.md` });
         }
     }
     catch (e) {
         (0, core_js_1.rethrowCliSignals)(e);
-        (0, core_js_1.output)({ updated: false, reason: 'STATE.md not found' });
+        return (0, types_js_1.cmdOk)({ updated: false, reason: 'STATE.md not found' });
     }
 }
 // ─── State Progression Engine ────────────────────────────────────────────────
 function cmdStateAdvancePlan(cwd, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const currentPlan = parseInt(stateExtractField(content, 'Current Plan') ?? '', 10);
     const totalPlans = parseInt(stateExtractField(content, 'Total Plans in Phase') ?? '', 10);
     const today = (0, core_js_1.todayISO)();
     if (isNaN(currentPlan) || isNaN(totalPlans)) {
-        (0, core_js_1.output)({ error: 'Cannot parse Current Plan or Total Plans in Phase from STATE.md' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'Cannot parse Current Plan or Total Plans in Phase from STATE.md' });
     }
     if (currentPlan >= totalPlans) {
         content = stateReplaceField(content, 'Status', 'Phase complete — ready for verification') || content;
         content = stateReplaceField(content, 'Last Activity', today) || content;
         node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ advanced: false, reason: 'last_plan', current_plan: currentPlan, total_plans: totalPlans, status: 'ready_for_verification' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ advanced: false, reason: 'last_plan', current_plan: currentPlan, total_plans: totalPlans, status: 'ready_for_verification' }, raw ? 'false' : undefined);
     }
     else {
         const newPlan = currentPlan + 1;
@@ -215,22 +224,21 @@ function cmdStateAdvancePlan(cwd, raw) {
         content = stateReplaceField(content, 'Status', 'Ready to execute') || content;
         content = stateReplaceField(content, 'Last Activity', today) || content;
         node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ advanced: true, previous_plan: currentPlan, current_plan: newPlan, total_plans: totalPlans }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ advanced: true, previous_plan: currentPlan, current_plan: newPlan, total_plans: totalPlans }, raw ? 'true' : undefined);
     }
 }
 function cmdStateRecordMetric(cwd, options, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const { phase, plan, duration, tasks, files } = options;
     if (!phase || !plan || !duration) {
-        (0, core_js_1.output)({ error: 'phase, plan, and duration required' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'phase, plan, and duration required' });
     }
-    const metricsPattern = /(##\s*Performance Metrics[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n)([\s\S]*?)(?=\n##|\n$|$)/i;
+    // Flexible: tolerate varying heading levels (##/###), flexible separator lines (|---|, | --- |, |:---|)
+    const metricsPattern = /(#{2,3}\s*Performance Metrics[\s\S]*?\n\|[^\n]+\n\|[\s:|\-]+\n)([\s\S]*?)(?=\n#{2,3}\s|\n$|$)/i;
     const metricsMatch = content.match(metricsPattern);
     if (metricsMatch) {
         let tableBody = metricsMatch[2].trimEnd();
@@ -243,17 +251,16 @@ function cmdStateRecordMetric(cwd, options, raw) {
         }
         content = content.replace(metricsPattern, (_match, header) => `${header}${tableBody}\n`);
         node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ recorded: true, phase, plan, duration }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ recorded: true, phase, plan, duration }, raw ? 'true' : undefined);
     }
     else {
-        (0, core_js_1.output)({ recorded: false, reason: 'Performance Metrics section not found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ recorded: false, reason: 'Performance Metrics section not found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateUpdateProgress(cwd, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const phasesDir = (0, core_js_1.phasesPath)(cwd);
@@ -273,21 +280,19 @@ function cmdStateUpdateProgress(cwd, raw) {
     const filled = Math.round(percent / 100 * barWidth);
     const bar = '\u2588'.repeat(filled) + '\u2591'.repeat(barWidth - filled);
     const progressStr = `[${bar}] ${percent}%`;
-    const progressPattern = /(\*\*Progress:\*\*\s*).*/i;
-    if (progressPattern.test(content)) {
-        content = content.replace(progressPattern, (_match, prefix) => `${prefix}${progressStr}`);
-        node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ updated: true, percent, completed: totalSummaries, total: totalPlans, bar: progressStr }, raw, progressStr);
+    const result = stateReplaceField(content, 'Progress', progressStr);
+    if (result) {
+        node_fs_1.default.writeFileSync(statePath, result, 'utf-8');
+        return (0, types_js_1.cmdOk)({ updated: true, percent, completed: totalSummaries, total: totalPlans, bar: progressStr }, raw ? progressStr : undefined);
     }
     else {
-        (0, core_js_1.output)({ updated: false, reason: 'Progress field not found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ updated: false, reason: 'Progress field not found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateAddDecision(cwd, options, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     const { phase, summary, summary_file, rationale, rationale_file } = options;
     let summaryText;
@@ -298,12 +303,10 @@ function cmdStateAddDecision(cwd, options, raw) {
     }
     catch (thrown) {
         const e = thrown;
-        (0, core_js_1.output)({ added: false, reason: e.message }, raw, 'false');
-        return;
+        return (0, types_js_1.cmdOk)({ added: false, reason: e.message }, raw ? 'false' : undefined);
     }
     if (!summaryText) {
-        (0, core_js_1.output)({ error: 'summary required' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'summary required' });
     }
     const content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const entry = `- [Phase ${phase || '?'}]: ${summaryText}${rationaleText ? ` — ${rationaleText}` : ''}`;
@@ -311,17 +314,16 @@ function cmdStateAddDecision(cwd, options, raw) {
     const updated = appendToStateSection(content, sectionPattern, entry, [/None yet\.?\s*\n?/gi, /No decisions yet\.?\s*\n?/gi]);
     if (updated) {
         node_fs_1.default.writeFileSync(statePath, updated, 'utf-8');
-        (0, core_js_1.output)({ added: true, decision: entry }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ added: true, decision: entry }, raw ? 'true' : undefined);
     }
     else {
-        (0, core_js_1.output)({ added: false, reason: 'Decisions section not found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ added: false, reason: 'Decisions section not found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateAddBlocker(cwd, text, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     const blockerOptions = typeof text === 'object' && text !== null ? text : { text: text };
     let blockerText;
@@ -330,12 +332,10 @@ function cmdStateAddBlocker(cwd, text, raw) {
     }
     catch (thrown) {
         const e = thrown;
-        (0, core_js_1.output)({ added: false, reason: e.message }, raw, 'false');
-        return;
+        return (0, types_js_1.cmdOk)({ added: false, reason: e.message }, raw ? 'false' : undefined);
     }
     if (!blockerText) {
-        (0, core_js_1.output)({ error: 'text required' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'text required' });
     }
     const content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const entry = `- ${blockerText}`;
@@ -343,50 +343,48 @@ function cmdStateAddBlocker(cwd, text, raw) {
     const updated = appendToStateSection(content, sectionPattern, entry, [/None\.?\s*\n?/gi, /None yet\.?\s*\n?/gi]);
     if (updated) {
         node_fs_1.default.writeFileSync(statePath, updated, 'utf-8');
-        (0, core_js_1.output)({ added: true, blocker: blockerText }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ added: true, blocker: blockerText }, raw ? 'true' : undefined);
     }
     else {
-        (0, core_js_1.output)({ added: false, reason: 'Blockers section not found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ added: false, reason: 'Blockers section not found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateResolveBlocker(cwd, text, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     if (!text) {
-        (0, core_js_1.output)({ error: 'text required' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'text required' });
     }
     let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
-    const sectionPattern = /(###?\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n)([\s\S]*?)(?=\n###?|\n##[^#]|$)/i;
+    const sectionPattern = /(#{2,3}\s*(?:Blockers|Blockers\/Concerns|Concerns)\s*\n\s*\n?)([\s\S]*?)(?=\n#{2,3}\s|$)/i;
     const match = content.match(sectionPattern);
     if (match) {
         const sectionBody = match[2];
         const lines = sectionBody.split('\n');
         const filtered = lines.filter(line => {
-            if (!line.startsWith('- '))
+            // Match - or * bullets, optionally indented
+            if (!/^\s*[-*]\s+/.test(line))
                 return true;
             return !line.toLowerCase().includes(text.toLowerCase());
         });
         let newBody = filtered.join('\n');
-        if (!newBody.trim() || !newBody.includes('- ')) {
+        if (!newBody.trim() || !/^\s*[-*]\s+/m.test(newBody)) {
             newBody = 'None\n';
         }
         content = content.replace(sectionPattern, (_match, header) => `${header}${newBody}`);
         node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ resolved: true, blocker: text }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ resolved: true, blocker: text }, raw ? 'true' : undefined);
     }
     else {
-        (0, core_js_1.output)({ resolved: false, reason: 'Blockers section not found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ resolved: false, reason: 'Blockers section not found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateRecordSession(cwd, options, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     let content = node_fs_1.default.readFileSync(statePath, 'utf-8');
     const now = new Date().toISOString();
@@ -420,24 +418,19 @@ function cmdStateRecordSession(cwd, options, raw) {
     }
     if (updated.length > 0) {
         node_fs_1.default.writeFileSync(statePath, content, 'utf-8');
-        (0, core_js_1.output)({ recorded: true, updated }, raw, 'true');
+        return (0, types_js_1.cmdOk)({ recorded: true, updated }, raw ? 'true' : undefined);
     }
     else {
-        (0, core_js_1.output)({ recorded: false, reason: 'No session fields found in STATE.md' }, raw, 'false');
+        return (0, types_js_1.cmdOk)({ recorded: false, reason: 'No session fields found in STATE.md' }, raw ? 'false' : undefined);
     }
 }
 function cmdStateSnapshot(cwd, raw) {
     const statePath = (0, core_js_1.statePath)(cwd);
     if (!node_fs_1.default.existsSync(statePath)) {
-        (0, core_js_1.output)({ error: 'STATE.md not found' }, raw);
-        return;
+        return (0, types_js_1.cmdOk)({ error: 'STATE.md not found' });
     }
     const content = node_fs_1.default.readFileSync(statePath, 'utf-8');
-    const extractField = (fieldName) => {
-        const pattern = new RegExp(`\\*\\*${fieldName}:\\*\\*\\s*(.+)`, 'i');
-        const match = content.match(pattern);
-        return match ? match[1].trim() : null;
-    };
+    const extractField = (fieldName) => stateExtractField(content, fieldName);
     const currentPhase = extractField('Current Phase');
     const currentPhaseName = extractField('Current Phase Name');
     const totalPhasesRaw = extractField('Total Phases');
@@ -452,12 +445,16 @@ function cmdStateSnapshot(cwd, raw) {
     const totalPlansInPhase = totalPlansRaw ? parseInt(totalPlansRaw, 10) : null;
     const progressPercent = progressRaw ? parseInt(progressRaw.replace('%', ''), 10) : null;
     const decisions = [];
-    const decisionsMatch = content.match(/##\s*Decisions Made[\s\S]*?\n\|[^\n]+\n\|[-|\s]+\n([\s\S]*?)(?=\n##|\n$|$)/i);
+    // Tolerate ##/### heading levels and flexible separator lines (|---|, | --- |, |:---|)
+    const decisionsMatch = content.match(/#{2,3}\s*Decisions Made[\s\S]*?\n\|[^\n]+\n\|[\s:|\-]+\n([\s\S]*?)(?=\n#{2,3}\s|\n$|$)/i);
     if (decisionsMatch) {
         const tableBody = decisionsMatch[1];
-        const rows = tableBody.trim().split('\n').filter(r => r.includes('|'));
+        const rows = tableBody.trim().split('\n').filter(r => r.includes('|') && !r.match(/^\s*$/));
         for (const row of rows) {
-            const cells = row.split('|').map(c => c.trim()).filter(Boolean);
+            // Skip separator lines that snuck through
+            if (/^\s*\|[\s:\-|]+\|\s*$/.test(row))
+                continue;
+            const cells = parseTableRow(row);
             if (cells.length >= 3) {
                 decisions.push({
                     phase: cells[0],
@@ -468,12 +465,14 @@ function cmdStateSnapshot(cwd, raw) {
         }
     }
     const blockers = [];
-    const blockersMatch = content.match(/##\s*Blockers\s*\n([\s\S]*?)(?=\n##|$)/i);
+    // Tolerate ##/### heading levels
+    const blockersMatch = content.match(/#{2,3}\s*Blockers\s*\n([\s\S]*?)(?=\n#{2,3}\s|$)/i);
     if (blockersMatch) {
         const blockersSection = blockersMatch[1];
-        const items = blockersSection.match(/^-\s+(.+)$/gm) || [];
+        // Match - or * bullets, optionally indented
+        const items = blockersSection.match(/^\s*[-*]\s+(.+)$/gm) || [];
         for (const item of items) {
-            blockers.push(item.replace(/^-\s+/, '').trim());
+            blockers.push(item.replace(/^\s*[-*]\s+/, '').trim());
         }
     }
     const session = {
@@ -481,18 +480,12 @@ function cmdStateSnapshot(cwd, raw) {
         stopped_at: null,
         resume_file: null,
     };
-    const sessionMatch = content.match(/##\s*Session\s*\n([\s\S]*?)(?=\n##|$)/i);
+    const sessionMatch = content.match(/#{2,3}\s*Session\s*\n\s*\n?([\s\S]*?)(?=\n#{2,3}\s|$)/i);
     if (sessionMatch) {
         const sessionSection = sessionMatch[1];
-        const lastDateMatch = sessionSection.match(/\*\*Last Date:\*\*\s*(.+)/i);
-        const stoppedAtMatch = sessionSection.match(/\*\*Stopped At:\*\*\s*(.+)/i);
-        const resumeFileMatch = sessionSection.match(/\*\*Resume File:\*\*\s*(.+)/i);
-        if (lastDateMatch)
-            session.last_date = lastDateMatch[1].trim();
-        if (stoppedAtMatch)
-            session.stopped_at = stoppedAtMatch[1].trim();
-        if (resumeFileMatch)
-            session.resume_file = resumeFileMatch[1].trim();
+        session.last_date = stateExtractField(sessionSection, 'Last Date');
+        session.stopped_at = stateExtractField(sessionSection, 'Stopped At') || stateExtractField(sessionSection, 'Stopped at');
+        session.resume_file = stateExtractField(sessionSection, 'Resume File') || stateExtractField(sessionSection, 'Resume file');
     }
     const snapshot = {
         current_phase: currentPhase,
@@ -509,6 +502,6 @@ function cmdStateSnapshot(cwd, raw) {
         paused_at: pausedAt,
         session,
     };
-    (0, core_js_1.output)(snapshot, raw);
+    return (0, types_js_1.cmdOk)(snapshot);
 }
 //# sourceMappingURL=state.js.map