hippo-memory 1.69.0 → 1.71.0

package/dist/cli/decisions.js

@@ -1,55 +1,47 @@
 // First-class object verbs for predictions, decisions and incidents.
-import { writeEntry } from '../store/entry-writes.js';
-import { readEntry } from '../store/entry-reads.js';
-import { extractPathTags } from '../path-context.js';
-import * as predictionsModule from '../predictions/store.js';
-import * as decisionsModule from '../decisions.js';
-import * as incidentsModule from '../incidents.js';
-import { resolveTenantId } from '../tenant.js';
+import { getMemory } from '../api/memories.js';
+import { extractPathTags } from '../search/path-context.js';
+import * as predictionsModule from '../store/predictions.js';
+import * as decisionsModule from '../objects/decisions.js';
+import * as incidentsModule from '../objects/incidents.js';
 import { printError } from './output.js';
+import { nonEmptyStringFlag, parseListLimit, flagIsTrue, isStringFlag, stringFlag } from './flag-values.js';
 import { requireInit } from './shared.js';
-function parseListLimit(flags) {
-    const limitRaw = flags['limit'];
-    const limit = limitRaw !== undefined ? parseInt(String(limitRaw), 10) : 100;
-    if (!Number.isFinite(limit) || limit <= 0) {
-        printError(`Invalid --limit: "${limitRaw}". Must be a positive integer.`);
-        process.exit(1);
-    }
-    return limit;
-}
-/** parseInt-based id parse for predictions and decisions; incidents use the strict parse below. */
+import { cliApiContext } from './api-context.js';
+import { closeObject, foundOrExit, idArgOrExit, listObjects, printLifecycleTail, requireStatus } from './object-verbs.js';
+import { errorMessage } from '../util/log.js';
+import { CliExit } from './exit.js';
+const BASERATE_DECIMALS = 3;
+const DECISION = { cmd: 'decide', noun: 'Decision', idLabel: 'decision' };
+const INCIDENT = { cmd: 'incident', noun: 'Incident', idLabel: 'incident' };
+const PREDICTION_NOUN = 'Prediction';
+// Lenient on purpose (parseInt reads "1abc" as 1) until the next major version; incidents use the strict parser.
 function parseObjectId(idRaw, noun) {
     const id = parseInt(String(idRaw), 10);
     if (!Number.isFinite(id) || id <= 0) {
         printError(`Invalid ${noun} id: "${idRaw}"`);
-        process.exit(1);
+        throw new CliExit(1);
     }
     return id;
 }
-// ---------------------------------------------------------------------------
 // Prediction first-class object
-// ---------------------------------------------------------------------------
 function predictClose(hippoRoot, tenantId, args, flags) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo predict close <id> --state <closed|closed-unknown> [--actual <v>] [--note "..."]');
-        process.exit(1);
-    }
-    const id = parseObjectId(idRaw, 'prediction');
-    const stateRaw = typeof flags['state'] === 'string' ? flags['state'].trim() : '';
+    const id = idArgOrExit(args, 'Usage: hippo predict close <id> --state <closed|closed-unknown> [--actual <v>] [--note "..."]', 'prediction', parseObjectId);
+    const stateRaw = (stringFlag(flags, 'state') ?? '').trim();
+    // SAFETY: Set.has only compares by value, so a string outside the closure states is a plain miss.
     if (!predictionsModule.VALID_CLOSURE_STATES.has(stateRaw) || stateRaw === 'open') {
         printError(`Invalid --state: "${stateRaw}". Must be one of: closed | closed-unknown.`);
-        process.exit(1);
+        throw new CliExit(1);
     }
     const actualRaw = flags['actual'];
     const actualValue = actualRaw !== undefined ? Number(actualRaw) : undefined;
     if (actualRaw !== undefined && !Number.isFinite(actualValue)) {
         printError(`Invalid --actual: "${actualRaw}". Must be a number.`);
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const noteRaw = flags['note'];
-    const closureNote = typeof noteRaw === 'string' ? noteRaw : undefined;
+    const closureNote = stringFlag(flags, 'note');
     const closed = predictionsModule.closePrediction(hippoRoot, tenantId, id, {
+        // SAFETY: the check above exits unless stateRaw is in VALID_CLOSURE_STATES.
         closureState: stateRaw,
         actualValue,
         closureNote,
@@ -68,25 +60,20 @@ function loadPredictionList(hippoRoot, tenantId, status, classTag, limit) {
             ? predictionsModule.loadPredictionsByClass(hippoRoot, tenantId, classTag, { limit })
             : predictionsModule.loadAllPredictions(hippoRoot, tenantId, { limit });
     }
-    if (!predictionsModule.VALID_CLOSURE_STATES.has(status)) {
-        printError(`Invalid --status: "${status}". Must be one of: open | closed | closed-unknown | all.`);
-        process.exit(1);
-    }
+    const closureState = requireStatus(status, predictionsModule.VALID_CLOSURE_STATES);
     if (!classTag) {
         // status filter without class — scan all classes is more complex; v1 requires --class for non-default status
         printError('--status filter (non-open) requires --class to be set.');
-        process.exit(1);
+        throw new CliExit(1);
     }
     return predictionsModule.loadPredictionsByClass(hippoRoot, tenantId, classTag, {
-        closureState: status,
+        closureState,
         limit,
     });
 }
 function predictList(hippoRoot, tenantId, flags) {
-    const classTagRaw = flags['class'];
-    const classTag = typeof classTagRaw === 'string' ? classTagRaw.trim() : '';
-    const statusRaw = flags['status'];
-    const status = typeof statusRaw === 'string' ? statusRaw.trim() : 'all';
+    const classTag = stringFlag(flags, 'class')?.trim() ?? '';
+    const status = stringFlag(flags, 'status')?.trim() ?? 'all';
     const limit = parseListLimit(flags);
     const results = loadPredictionList(hippoRoot, tenantId, status, classTag, limit);
     if (results.length === 0) {
@@ -105,17 +92,8 @@ function predictList(hippoRoot, tenantId, flags) {
     }
 }
 function predictShow(hippoRoot, tenantId, args) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo predict show <id>');
-        process.exit(1);
-    }
-    const id = parseObjectId(idRaw, 'prediction');
-    const pred = predictionsModule.loadPredictionById(hippoRoot, tenantId, id);
-    if (!pred) {
-        printError(`Prediction ${id} not found.`);
-        process.exit(1);
-    }
+    const id = idArgOrExit(args, 'Usage: hippo predict show <id>', 'prediction', parseObjectId);
+    const pred = foundOrExit(predictionsModule.loadPredictionById(hippoRoot, tenantId, id), PREDICTION_NOUN, id);
     console.log(`Prediction #${pred.id}`);
     console.log(`  class: ${pred.classTag}`);
     console.log(`  claim: ${pred.claimText}`);
@@ -136,12 +114,12 @@ function predictShow(hippoRoot, tenantId, args) {
 }
 function predictBaserate(hippoRoot, tenantId, flags) {
     // Reference-class / planning-fallacy detector
-    const classTagRaw = flags['class'];
-    if (typeof classTagRaw !== 'string' || !classTagRaw.trim()) {
+    const classTag = stringFlag(flags, 'class')?.trim();
+    if (!classTag) {
         printError('Usage: hippo predict baserate --class <c>');
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const baserate = predictionsModule.computePredictionBaserate(hippoRoot, tenantId, classTagRaw.trim());
+    const baserate = predictionsModule.computePredictionBaserate(hippoRoot, tenantId, classTag);
     if (baserate.nClosed === 0) {
         console.log(`No closed predictions in class "${baserate.classTag}" yet.`);
         console.log(`  Create one with: hippo predict "<claim>" --class ${baserate.classTag} --estimate N`);
@@ -152,19 +130,18 @@ function predictBaserate(hippoRoot, tenantId, flags) {
     console.log(`  n_closed:         ${baserate.nClosed}`);
     console.log(`  n_ratio_eligible: ${baserate.nRatioEligible}`);
     if (baserate.meanEstimate !== null)
-        console.log(`  mean_estimate:    ${baserate.meanEstimate.toFixed(3)}`);
+        console.log(`  mean_estimate:    ${baserate.meanEstimate.toFixed(BASERATE_DECIMALS)}`);
     if (baserate.meanActual !== null)
-        console.log(`  mean_actual:      ${baserate.meanActual.toFixed(3)}`);
+        console.log(`  mean_actual:      ${baserate.meanActual.toFixed(BASERATE_DECIMALS)}`);
     if (baserate.meanRatio !== null)
-        console.log(`  mean_ratio:       ${baserate.meanRatio.toFixed(3)}x`);
+        console.log(`  mean_ratio:       ${baserate.meanRatio.toFixed(BASERATE_DECIMALS)}x`);
     if (baserate.p50Ratio !== null)
-        console.log(`  p50_ratio:        ${baserate.p50Ratio.toFixed(3)}x`);
+        console.log(`  p50_ratio:        ${baserate.p50Ratio.toFixed(BASERATE_DECIMALS)}x`);
     if (baserate.mae !== null)
-        console.log(`  mae:              ${baserate.mae.toFixed(3)}`);
+        console.log(`  mae:              ${baserate.mae.toFixed(BASERATE_DECIMALS)}`);
 }
-export function cmdPredict(hippoRoot, args, flags) {
+export function handlePredict({ hippoRoot, tenantId, args, flags }) {
     requireInit(hippoRoot);
-    const tenantId = resolveTenantId({});
     const subcommand = args[0] ?? '';
     if (subcommand === 'close')
         return predictClose(hippoRoot, tenantId, args, flags);
@@ -183,24 +160,21 @@ function predictCreate(hippoRoot, tenantId, claimText, flags) {
         printError('       hippo predict close <id> --state <closed|closed-unknown> [--actual <v>] [--note "..."]');
         printError('       hippo predict list [--class X] [--status open|closed|closed-unknown|all] [--limit N]');
         printError('       hippo predict show <id>');
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const classTagRaw = flags['class'];
-    if (typeof classTagRaw !== 'string' || !classTagRaw.trim()) {
+    const classTag = stringFlag(flags, 'class')?.trim();
+    if (!classTag) {
         printError('--class is required for prediction creation.');
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const classTag = classTagRaw.trim();
     const estimateRaw = flags['estimate'];
     const estimateValue = estimateRaw !== undefined ? Number(estimateRaw) : undefined;
     if (estimateRaw !== undefined && !Number.isFinite(estimateValue)) {
         printError(`Invalid --estimate: "${estimateRaw}". Must be a number.`);
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const unitRaw = flags['unit'];
-    const estimateUnit = typeof unitRaw === 'string' ? unitRaw : undefined;
-    const targetRaw = flags['target'];
-    const targetDate = typeof targetRaw === 'string' ? targetRaw : undefined;
+    const estimateUnit = stringFlag(flags, 'unit');
+    const targetDate = stringFlag(flags, 'target');
     const created = predictionsModule.savePrediction(hippoRoot, tenantId, {
         classTag,
         claimText,
@@ -212,77 +186,36 @@ function predictCreate(hippoRoot, tenantId, claimText, flags) {
     if (created.memoryId)
         console.log(`  memory: ${created.memoryId}`);
 }
+function printDecisionRow(d) {
+    const supPart = d.supersededBy !== null ? ` superseded_by=#${d.supersededBy}` : '';
+    console.log(`#${d.id} [${d.status}]${supPart} memory=${d.memoryId ?? '-'}`);
+    console.log(`    ${d.decisionText}`);
+    if (d.context)
+        console.log(`    context: ${d.context}`);
+}
 function decideList(hippoRoot, tenantId, flags) {
-    const statusRaw = flags['status'];
-    const status = typeof statusRaw === 'string' ? statusRaw.trim() : 'all';
-    const limit = parseListLimit(flags);
-    let results;
-    if (status === 'all') {
-        results = decisionsModule.loadDecisions(hippoRoot, tenantId, { limit });
-    }
-    else {
-        if (!decisionsModule.VALID_DECISION_STATES.has(status)) {
-            printError(`Invalid --status: "${status}". Must be one of: active | superseded | closed | all.`);
-            process.exit(1);
-        }
-        results = decisionsModule.loadDecisions(hippoRoot, tenantId, {
-            status: status,
-            limit,
-        });
-    }
-    if (results.length === 0) {
-        console.log('No decisions.');
-        return;
-    }
-    console.log(`Found ${results.length} decisions:\n`);
-    for (const d of results) {
-        const supPart = d.supersededBy !== null ? ` superseded_by=#${d.supersededBy}` : '';
-        console.log(`#${d.id} [${d.status}]${supPart} memory=${d.memoryId ?? '-'}`);
-        console.log(`    ${d.decisionText}`);
-        if (d.context)
-            console.log(`    context: ${d.context}`);
-    }
+    listObjects(flags, {
+        plural: 'decisions',
+        states: decisionsModule.VALID_DECISION_STATES,
+        load: (opts) => decisionsModule.loadDecisions(hippoRoot, tenantId, opts),
+        printRow: printDecisionRow,
+    });
 }
 function decideGet(hippoRoot, tenantId, args) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo decide get <id>');
-        process.exit(1);
-    }
-    const id = parseObjectId(idRaw, 'decision');
-    const decision = decisionsModule.loadDecisionById(hippoRoot, tenantId, id);
-    if (!decision) {
-        printError(`Decision ${id} not found.`);
-        process.exit(1);
-    }
+    const id = idArgOrExit(args, 'Usage: hippo decide get <id>', DECISION.idLabel, parseObjectId);
+    const decision = foundOrExit(decisionsModule.loadDecisionById(hippoRoot, tenantId, id), DECISION.noun, id);
     console.log(`Decision #${decision.id}`);
     console.log(`  status: ${decision.status}`);
     console.log(`  text: ${decision.decisionText}`);
     if (decision.context)
         console.log(`  context: ${decision.context}`);
-    if (decision.supersededBy !== null)
-        console.log(`  superseded_by: #${decision.supersededBy}`);
-    if (decision.supersededAt)
-        console.log(`  superseded_at: ${decision.supersededAt}`);
-    if (decision.closedAt)
-        console.log(`  closed_at: ${decision.closedAt}`);
-    if (decision.memoryId)
-        console.log(`  memory: ${decision.memoryId}`);
-    console.log(`  created: ${decision.createdAt}`);
+    printLifecycleTail(decision);
 }
 function decideClose(hippoRoot, tenantId, args) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo decide close <id>');
-        process.exit(1);
-    }
-    const id = parseObjectId(idRaw, 'decision');
-    const closed = decisionsModule.closeDecision(hippoRoot, tenantId, id);
-    console.log(`Decision #${closed.id} closed.`);
+    closeObject(args, DECISION, (id) => decisionsModule.closeDecision(hippoRoot, tenantId, id), parseObjectId);
 }
-export function cmdDecide(hippoRoot, args, flags) {
+export async function handleDecide({ hippoRoot, tenantId, args, flags }) {
     requireInit(hippoRoot);
-    const tenantId = resolveTenantId({});
     const subcommand = args[0] ?? '';
     if (subcommand === 'list')
         return decideList(hippoRoot, tenantId, flags);
@@ -291,37 +224,28 @@ export function cmdDecide(hippoRoot, args, flags) {
     if (subcommand === 'close')
         return decideClose(hippoRoot, tenantId, args);
     // Default subcommand: create. args[0] is the decision text.
-    decideCreate(hippoRoot, tenantId, subcommand, flags);
+    await decideCreate(hippoRoot, tenantId, subcommand, flags);
 }
-function decideCreate(hippoRoot, tenantId, decisionText, flags) {
-    if (!decisionText) {
-        printError('Usage: hippo decide "<decision>" [--context "<why>"] [--supersedes <memory-id>]');
-        printError('       hippo decide list [--status active|superseded|closed|all] [--limit N]');
-        printError('       hippo decide get <id>');
-        printError('       hippo decide close <id>');
-        process.exit(1);
-    }
-    const contextRaw = flags['context'];
-    const context = typeof contextRaw === 'string' && contextRaw ? contextRaw : undefined;
+async function decideCreate(hippoRoot, tenantId, decisionText, flags) {
+    if (!decisionText)
+        exitWithDecideUsage();
+    const context = nonEmptyStringFlag(flags, 'context');
     // A value-less `--supersedes` asks to supersede but gives no memory id: reject it rather
     // than silently creating a non-superseding decision.
-    if (flags['supersedes'] === true) {
+    if (flagIsTrue(flags, 'supersedes')) {
         printError('--supersedes requires a memory id, e.g. hippo decide "<text>" --supersedes mem_abc123.');
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const supersedesMemId = typeof flags['supersedes'] === 'string' ? flags['supersedes'] : null;
-    // Backward-compat: --supersedes takes a MEMORY id. Validate it exists and
-    // resolve it to the active decision row (if any). Commit the
-    // canonical table create+supersede FIRST (inside saveDecision's SAVEPOINT),
-    // weaken the old memory LAST (best-effort) so a memory-write failure cannot
-    // leave the memory stale without the table reflecting the supersession.
+    const supersedesMemId = stringFlag(flags, 'supersedes') ?? null;
+    // Commit the table create+supersede first (inside saveDecision's SAVEPOINT) and weaken the old memory last, best-effort,
+    // so a memory-write failure cannot leave the memory stale while the table shows the supersession.
     let supersedesDecisionId;
     let oldEntry = null;
     if (supersedesMemId) {
-        oldEntry = readEntry(hippoRoot, supersedesMemId, tenantId) ?? null;
+        oldEntry = await getMemory(cliApiContext(hippoRoot, tenantId), supersedesMemId);
         if (!oldEntry) {
             printError(`Memory ${supersedesMemId} not found.`);
-            process.exit(1);
+            throw new CliExit(1);
         }
         supersedesDecisionId =
             decisionsModule.resolveActiveDecisionIdByMemory(hippoRoot, tenantId, supersedesMemId) ?? undefined;
@@ -333,88 +257,55 @@ function decideCreate(hippoRoot, tenantId, decisionText, flags) {
         supersedesDecisionId,
         extraTags: decisionPathTags,
     });
-    // Legacy memory-weaken (best-effort, LAST): half-life halved, marked stale +
-    // 'superseded' tag. Preserves the exact pre-promotion behavior for the memory
-    // mirror; the canonical table supersession already committed above.
-    if (oldEntry) {
-        // Best-effort: saveDecision already committed. Failing here would make a retry find no active
-        // decision for the old memory and create a duplicate active successor, so warn instead.
-        try {
-            oldEntry.half_life_days = Math.max(1, Math.floor(oldEntry.half_life_days / 2));
-            oldEntry.confidence = 'stale';
-            if (!oldEntry.tags.includes('superseded'))
-                oldEntry.tags.push('superseded');
-            writeEntry(hippoRoot, oldEntry);
-        }
-        catch (e) {
-            printError(`  warning: decision recorded and superseded, but failed to weaken the prior memory ${supersedesMemId}: ${e.message}`);
-        }
-    }
+    if (oldEntry)
+        weakenSupersededMemory(hippoRoot, oldEntry, supersedesMemId);
     console.log(`Decision recorded: #${created.id}`);
     if (created.memoryId)
         console.log(`  memory: ${created.memoryId}`);
-    if (supersedesMemId) {
-        const tail = supersedesDecisionId !== undefined
-            ? ` (decision #${supersedesDecisionId} superseded)`
-            : ' (no active decision row; memory weakened only)';
-        console.log(`  supersedes memory: ${supersedesMemId}${tail}`);
-    }
+    if (supersedesMemId)
+        printSupersedes(supersedesMemId, supersedesDecisionId);
 }
-// Strict positive-integer parse for incident id args. parseInt() alone accepts
-// trailing junk ("1abc" -> 1), which would let a mutating subcommand (close/
-// resolve) silently hit the wrong row; require the whole arg to be digits.
-function parsePositiveIncidentId(idRaw) {
-    const s = String(idRaw ?? '').trim();
-    const id = parseInt(s, 10);
-    if (!/^\d+$/.test(s) || id <= 0) {
-        printError(`Invalid incident id: "${idRaw}" (expected a positive integer).`);
-        process.exit(1);
-    }
-    return id;
+function exitWithDecideUsage() {
+    printError('Usage: hippo decide "<decision>" [--context "<why>"] [--supersedes <memory-id>]');
+    printError('       hippo decide list [--status active|superseded|closed|all] [--limit N]');
+    printError('       hippo decide get <id>');
+    printError('       hippo decide close <id>');
+    throw new CliExit(1);
 }
-function incidentList(hippoRoot, tenantId, flags) {
-    const statusRaw = flags['status'];
-    const status = typeof statusRaw === 'string' ? statusRaw.trim() : 'all';
-    const limit = parseListLimit(flags);
-    let results;
-    if (status === 'all') {
-        results = incidentsModule.loadIncidents(hippoRoot, tenantId, { limit });
+function weakenSupersededMemory(hippoRoot, oldEntry, supersedesMemId) {
+    // Best-effort and last: saveDecision already committed. Failing here would make a retry find no active
+    // decision for the old memory and create a duplicate active successor, so warn instead.
+    try {
+        decisionsModule.weakenSupersededMemory(hippoRoot, oldEntry);
     }
-    else {
-        if (!incidentsModule.VALID_INCIDENT_STATES.has(status)) {
-            printError(`Invalid --status: "${status}". Must be one of: open | resolved | closed | all.`);
-            process.exit(1);
-        }
-        results = incidentsModule.loadIncidents(hippoRoot, tenantId, {
-            status: status,
-            limit,
-        });
-    }
-    if (results.length === 0) {
-        console.log('No incidents.');
-        return;
-    }
-    console.log(`Found ${results.length} incidents:\n`);
-    for (const inc of results) {
-        const linkPart = inc.linkedMemoryIds.length > 0 ? ` links=${inc.linkedMemoryIds.length}` : '';
-        console.log(`#${inc.id} [${inc.status}]${linkPart} memory=${inc.memoryId ?? '-'}`);
-        console.log(`    ${inc.incidentText}`);
-        if (inc.context)
-            console.log(`    context: ${inc.context}`);
+    catch (e) {
+        printError(`  warning: decision recorded and superseded, but failed to weaken the prior memory ${supersedesMemId}: ${errorMessage(e)}`);
     }
 }
+function printSupersedes(supersedesMemId, supersedesDecisionId) {
+    const tail = supersedesDecisionId !== undefined
+        ? ` (decision #${supersedesDecisionId} superseded)`
+        : ' (no active decision row; memory weakened only)';
+    console.log(`  supersedes memory: ${supersedesMemId}${tail}`);
+}
+function printIncidentRow(inc) {
+    const linkPart = inc.linkedMemoryIds.length > 0 ? ` links=${inc.linkedMemoryIds.length}` : '';
+    console.log(`#${inc.id} [${inc.status}]${linkPart} memory=${inc.memoryId ?? '-'}`);
+    console.log(`    ${inc.incidentText}`);
+    if (inc.context)
+        console.log(`    context: ${inc.context}`);
+}
+function incidentList(hippoRoot, tenantId, flags) {
+    listObjects(flags, {
+        plural: 'incidents',
+        states: incidentsModule.VALID_INCIDENT_STATES,
+        load: (opts) => incidentsModule.loadIncidents(hippoRoot, tenantId, opts),
+        printRow: printIncidentRow,
+    });
+}
 function incidentGet(hippoRoot, tenantId, args) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo incident get <id>');
-        process.exit(1);
-    }
-    const id = parsePositiveIncidentId(idRaw);
-    const incident = incidentsModule.loadIncidentById(hippoRoot, tenantId, id);
-    if (!incident) {
-        printError(`Incident ${id} not found.`);
-        process.exit(1);
-    }
+    const id = idArgOrExit(args, 'Usage: hippo incident get <id>', INCIDENT.idLabel);
+    const incident = foundOrExit(incidentsModule.loadIncidentById(hippoRoot, tenantId, id), INCIDENT.noun, id);
     console.log(`Incident #${incident.id}`);
     console.log(`  status: ${incident.status}`);
     console.log(`  text: ${incident.incidentText}`);
@@ -434,33 +325,20 @@ function incidentGet(hippoRoot, tenantId, args) {
     console.log(`  created: ${incident.createdAt}`);
 }
 function incidentResolve(hippoRoot, tenantId, args, flags) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo incident resolve <id> --resolution "<text>"');
-        process.exit(1);
-    }
-    const id = parsePositiveIncidentId(idRaw);
-    const resolutionRaw = flags['resolution'];
-    if (typeof resolutionRaw !== 'string' || !resolutionRaw.trim()) {
+    const id = idArgOrExit(args, 'Usage: hippo incident resolve <id> --resolution "<text>"', INCIDENT.idLabel);
+    const resolutionRaw = stringFlag(flags, 'resolution');
+    if (!resolutionRaw?.trim()) {
         printError('--resolution requires a non-empty value, e.g. hippo incident resolve <id> --resolution "root cause fixed".');
-        process.exit(1);
+        throw new CliExit(1);
     }
     const resolved = incidentsModule.resolveIncident(hippoRoot, tenantId, id, resolutionRaw);
     console.log(`Incident #${resolved.id} resolved.`);
 }
 function incidentClose(hippoRoot, tenantId, args) {
-    const idRaw = args[1];
-    if (!idRaw) {
-        printError('Usage: hippo incident close <id>');
-        process.exit(1);
-    }
-    const id = parsePositiveIncidentId(idRaw);
-    const closed = incidentsModule.closeIncident(hippoRoot, tenantId, id);
-    console.log(`Incident #${closed.id} closed.`);
+    closeObject(args, INCIDENT, (id) => incidentsModule.closeIncident(hippoRoot, tenantId, id));
 }
-export function cmdIncident(hippoRoot, args, flags) {
+export function handleIncident({ hippoRoot, tenantId, args, flags }) {
     requireInit(hippoRoot);
-    const tenantId = resolveTenantId({});
     const subcommand = args[0] ?? '';
     if (subcommand === 'list')
         return incidentList(hippoRoot, tenantId, flags);
@@ -470,9 +348,8 @@ export function cmdIncident(hippoRoot, args, flags) {
         return incidentResolve(hippoRoot, tenantId, args, flags);
     if (subcommand === 'close')
         return incidentClose(hippoRoot, tenantId, args);
-    // Default subcommand: open (create). Accept both the documented
-    // `incident open "<text>"` form and the bare `incident "<text>"` form: for the
-    // `open` keyword the text is args[1], otherwise args[0] IS the text.
+    // Default subcommand is open (create): accept both `incident open "<text>"` and bare `incident "<text>"`;
+    // for the `open` keyword the text is args[1], otherwise args[0] is the text.
     incidentCreate(hippoRoot, tenantId, subcommand === 'open' ? (args[1] ?? '') : subcommand, flags);
 }
 function incidentCreate(hippoRoot, tenantId, incidentText, flags) {
@@ -482,10 +359,9 @@ function incidentCreate(hippoRoot, tenantId, incidentText, flags) {
         printError('       hippo incident get <id>');
         printError('       hippo incident resolve <id> --resolution "<text>"');
         printError('       hippo incident close <id>');
-        process.exit(1);
+        throw new CliExit(1);
     }
-    const contextRaw = flags['context'];
-    const context = typeof contextRaw === 'string' && contextRaw ? contextRaw : undefined;
+    const context = nonEmptyStringFlag(flags, 'context');
     // --link is a repeatable flag (collected into an array by parseArgs). A
     // single --link <id> yields a string; normalize both to string[].
     const linkRaw = flags['link'];
@@ -493,12 +369,12 @@ function incidentCreate(hippoRoot, tenantId, incidentText, flags) {
     if (Array.isArray(linkRaw)) {
         linkedMemoryIds = linkRaw;
     }
-    else if (typeof linkRaw === 'string') {
+    else if (isStringFlag(linkRaw)) {
         linkedMemoryIds = [linkRaw];
     }
     else if (linkRaw === true) {
         printError('--link requires a memory id, e.g. hippo incident "<text>" --link mem_abc123.');
-        process.exit(1);
+        throw new CliExit(1);
     }
     const incidentPathTags = extractPathTags(process.cwd());
     const created = incidentsModule.saveIncident(hippoRoot, tenantId, {

package/dist/cli/eval.d.ts

@@ -1,5 +1,3 @@
-import { type CommandContext } from './shared.js';
-/** Runs `hippo eval`: --bootstrap writes a corpus, --suite runs the built-in feature eval, else it scores a corpus file. */
-export declare function cmdEval(hippoRoot: string, corpusPath: string | null, flags: Record<string, string | boolean | string[]>): Promise<void>;
+import { type CommandContext } from './flag-values.js';
 export declare function handleEval({ hippoRoot, args, flags }: CommandContext): Promise<void>;
 //# sourceMappingURL=eval.d.ts.map