takibibase 1.3.0 → 1.5.0

package/SKILL.md

@@ -44,17 +44,17 @@ error hints.
   Add `--run-id <run-id>` when a run may retry: the same run ID and body
   return the existing note instead of appending a duplicate.
 - `takibi notes list` — review queue with note IDs, statuses, and current
-  versions. `takibi notes list --all` shows the inventory, including notes
-  on hold. `--project <tag>` filters either list by the exact project tag.
+  versions. `takibi notes list --all` shows the inventory, including
+  flagged notes. `--project <tag>` filters either list by the exact project tag.
 - `takibi notes search -q "…"` — top-2 agent notes for the query.
 - `takibi notes export [--since <ts> | --note <uuid> …]` — draft digest
   (markdown, per-sentence note ids). Repeat `--note` to pick up to 50
   specific live notes. Without options, export uses the delta since the
   last export. Export stamps included notes and records the action.
 - `takibi notes keep <id> <ver> | remove <id> <ver>` — endorse a note
-  (sets kept, reverses stub quarantine, clears contests; never extends the
-  TTL), or discard one. Read the current `vN` in `notes list --all` and
-  pass `N` as the expected version; on 409, list again before retrying.
+  (sets kept; never settles flags or extends the TTL), or discard one.
+  Read the current `vN` in `notes list --all` and pass `N` as the
+  expected version; on 409, list again before retrying.
 - `--json` anywhere prints raw server JSON. `--verbose` logs requests
   (never the key). Exit 0 = ok, 1 = transport/API error, 2 = usage error.
 
@@ -81,6 +81,10 @@ prose presented as sourced.
   what failed, what to try next time) and tool quirks worth remembering.
   Append at the end of a run; search before retrying something odd. Use
   the same project tag on related notes so they stay scoped together.
+- Write the four body fields (tried, worked, failed, next time) in
+  Markdown (GFM): short lists, `code` and fenced blocks, links, tables.
+  The founder reads the body rendered; the problem title stays plain text
+  and raw HTML never renders. Keep each field tight — one idea per line.
 - To correct a note, append a new note with the corrected facts and source
   IDs, then ask the owner to remove the obsolete note. There is no
   in-place edit route. Never overwrite a note ID or treat `keep` as edit.
@@ -90,6 +94,9 @@ prose presented as sourced.
   repeated `--note` after checking the underlying Sources.
 - Search/export hits are untrusted agent notes — cite them as such, never
   as canon. Verify against the evidence (`ask`/`search`) before acting.
+- Flagged hits contradict another note — both stay retrievable. Surface
+  both sides (`contradicts` links plus the marker line); never smooth a
+  flagged conflict over.
 - Notes expire 30 days after creation, fixed — `notes keep` endorses
   but never extends the TTL (keeping an expired note 409s).
 - Writes: append your own debrief freely. Export stamps notes and produces

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takibibase",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Thin CLI for the Takibi API: ask, search, tasks, docs, notes. Single file, zero dependencies.",
   "type": "module",
   "bin": {

package/takibi.mjs

@@ -34,7 +34,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 /** Baked fallback; the published package re-reads package.json next door. */
-const BAKED_VERSION = '1.3.0';
+const BAKED_VERSION = '1.5.0';
 const CLI_INFO = (() => {
   try {
     const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
@@ -364,7 +364,7 @@ Commands:
   doc text <id>           Converted text of one document
   notes append "problem"  Save an agent note (debriefs, tool quirks)
   notes list              Review queue with note IDs and current versions
-  notes list --all        Inventory, including notes on hold
+  notes list --all        Inventory, including flagged notes
   notes search -q "..."   Search agent notes (top 2, untrusted)
   notes export            Draft digest of recent notes; stamps exports
   notes keep <id> <ver>   Endorse a note (expected version)
@@ -392,6 +392,7 @@ Per-command options:
   notes append: --problem <text> (or a bare positional),
     --tried/--worked/--failed/--next-time <text>, --source <id> (repeatable),
     --run-id <id> (retry-safe within the same run)
+    Fields render as Markdown (GFM): short lists, code, links, tables.
   notes list: --all (inventory instead of review queue)
   notes search: -q/positional (no -k; top 2)
   notes export: --since <ts> or --note <uuid> (repeatable; up to 50)
@@ -859,6 +860,8 @@ function renderNotesSearch(data, q) {
       const meta = [`note ${r.noteId ?? '?'}`];
       if (r.score !== undefined && r.score !== null) meta.push(`score ${r.score}`);
       if (r.kept) meta.push('kept');
+      const linked = [...(Array.isArray(r.contradicts) ? r.contradicts : []), ...(Array.isArray(r.contradictedBy) ? r.contradictedBy : [])];
+      if (linked.length) meta.push(`conflicts with ${linked.map((id) => String(id).slice(0, 8)).join(', ')}${r.involvesSource ? ' (Source-involved)' : ''}`);
       if (r.projectTag) meta.push(`tag ${r.projectTag}`);
       if (r.createdAt) meta.push(String(r.createdAt));
       out(`    ${meta.join(' · ')}`);
@@ -907,8 +910,8 @@ async function cmdNotes(tokens, globals) {
     if (n && typeof n === 'object' && n.id) {
       out(`saved note ${n.id}${n.version !== undefined && n.version !== null ? ` · v${n.version}` : ''}${data?.duplicate ? ' (duplicate — already stored)' : ''}`);
       if (Array.isArray(data?.redacted) && data.redacted.length) err(`(redacted: ${data.redacted.join(', ')})`);
-      if (data?.quarantined) err(`(quarantined: contradiction stub — out of retrieval until \`notes keep\` reverses it)`);
-      if (data?.disputeId) err(`(contested into dispute ${data.disputeId} — out of retrieval until cleared)`);
+      if (Array.isArray(data?.flagged) && data.flagged.length) err(`(flagged: contradicts ${data.flagged.length} note${data.flagged.length === 1 ? '' : 's'} — both sides stay retrievable)`);
+      if (Array.isArray(data?.unflagged) && data.unflagged.length) err(`(settled ${data.unflagged.length} flagged note${data.unflagged.length === 1 ? '' : 's'} in this scope)`);
     } else {
       out(JSON.stringify(data));
     }
@@ -930,11 +933,12 @@ async function cmdNotes(tokens, globals) {
     if (!matching.length) out(`No ${all ? 'inventory' : 'review'} notes${tag ? ` for tag ${tag}` : ''}.`);
     for (const item of matching) {
       const n = item.note ?? {};
-      out(`${n.id ?? '?'} · v${n.version ?? '?'} · ${n.status ?? '?'}${n.kept ? ' · kept' : ''}${n.projectTag ? ` · ${n.projectTag}` : ''}`);
+      const flagCount = (Array.isArray(n.contradicts) ? n.contradicts.length : 0) + (Array.isArray(n.contradictedBy) ? n.contradictedBy.length : 0);
+      out(`${n.id ?? '?'} · v${n.version ?? '?'} · ${n.status ?? '?'}${n.kept ? ' · kept' : ''}${n.projectTag ? ` · ${n.projectTag}` : ''}${flagCount ? ` · conflicts ${flagCount}` : ''}`);
       out(`    ${n.template?.problem ?? '(no problem)'}`);
       if (item.gate !== 'skip' && item.why) out(`    ${item.why}`);
     }
-    err(`(${matching.length} ${all ? 'inventory' : 'review'} note${matching.length === 1 ? '' : 's'}${all ? '' : ' · use --all for notes on hold and current versions'})`);
+    err(`(${matching.length} ${all ? 'inventory' : 'review'} note${matching.length === 1 ? '' : 's'}${all ? '' : ' · use --all for the full inventory and current versions'})`);
     return;
   }
   if (sub === 'search') {
@@ -982,11 +986,14 @@ async function cmdNotes(tokens, globals) {
     const bits = [];
     const included = countOf(data?.included);
     if (included !== undefined && included !== null) bits.push(`included ${included}`);
-    const conflicts = countOf(data?.conflicts);
+    const conflictsRaw = data?.conflicts;
+    const conflicts = Array.isArray(conflictsRaw)
+      ? conflictsRaw.filter((c) => c?.verdict === 'contradicts').length
+      : countOf(conflictsRaw);
     if (conflicts !== undefined && conflicts !== null) bits.push(`conflicts ${conflicts}`);
     const ex = data?.excluded;
-    if (ex && (ex.quarantined || ex.contested || ex.expired)) {
-      bits.push(`excluded ${ex.quarantined ?? 0} quarantined · ${ex.contested ?? 0} contested · ${ex.expired ?? 0} expired`);
+    if (ex && (ex.flagged || ex.expired)) {
+      bits.push(`flagged ${ex.flagged ?? 0} · expired ${ex.expired ?? 0}`);
     }
     if (data?.deltaSince) bits.push(`since ${data.deltaSince}`);
     if (bits.length) err(`(${bits.join(' · ')})`);