atris 3.58.5 → 3.58.6

package/commands/learn.js

@@ -12,6 +12,17 @@ const {
   getStats,
   exportMarkdown,
 } = require('../lib/learnings');
+const applyGate = require('../lib/apply-gate');
+const {
+  fileTeachExperiment,
+  extractTeachNumbers,
+  extractTeachMechanisms,
+  isThinTeachLesson,
+  printLearnerCheckGate,
+  proveSavedLearnerBaseline,
+} = require('./youtube');
+
+const KEEP_RULE = 'keep only if measure.py moves 0→1. scores 1 only when the fixture contains the check tokens.';
 
 function showRecent(limit = 20) {
   const learnings = loadLearnings()
@@ -149,7 +160,52 @@ function showPrune() {
   console.log('');
 }
 
-function interactiveAdd() {
+function commitAddedLearning({ type, key, insight, confidence, source, files } = {}, deps = {}) {
+  const print = typeof deps.output === 'function' ? deps.output : (line = '') => console.log(line);
+  const cwd = deps.cwd || process.cwd();
+  const entry = addLearning({ type, key, insight, confidence, source, files });
+  print('');
+  print(`  ✓ Saved: [${entry.confidence}/10] ${entry.type}/${entry.key}`);
+  print(`    "${entry.insight}"`);
+  print('');
+  const baseline = mintRichLearn({
+    cwd,
+    key: entry.key,
+    insight: entry.insight,
+    now: deps.now,
+    output: print,
+  });
+  return { entry, baseline };
+}
+
+function reviewLearningType(insight) {
+  return /^(don't|never|avoid|watch out|careful)/i.test(String(insight || '')) ? 'pitfall' : 'pattern';
+}
+
+function reviewLearningKey(insight) {
+  return String(insight || '').toLowerCase().replace(/[^a-z0-9\s]/g, '').split(/\s+/).slice(0, 4).join('-');
+}
+
+function commitReviewLearning(insight, deps = {}) {
+  const print = typeof deps.output === 'function' ? deps.output : (line = '') => console.log(line);
+  const cwd = deps.cwd || process.cwd();
+  const text = String(insight || '').trim();
+  if (!text) return { entry: null, baseline: 0 };
+  const type = reviewLearningType(text);
+  const key = reviewLearningKey(text);
+  const entry = addLearning({ type, key, insight: text, confidence: 7, source: 'review', files: [] });
+  print(`✓ Saved to learnings: [7/10] ${entry.type}/${entry.key}`);
+  const baseline = mintRichLearn({
+    cwd,
+    key: entry.key,
+    insight: entry.insight,
+    now: deps.now,
+    output: print,
+  });
+  return { entry, baseline };
+}
+
+function interactiveAdd(deps = {}) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -214,11 +270,11 @@ function interactiveAdd() {
         return;
       }
 
-      const entry = addLearning({ type, key, insight, confidence, source, files });
-      console.log('');
-      console.log(`  ✓ Saved: [${entry.confidence}/10] ${entry.type}/${entry.key}`);
-      console.log(`    "${entry.insight}"`);
-      console.log('');
+      commitAddedLearning({ type, key, insight, confidence, source, files }, {
+        cwd: deps.cwd || process.cwd(),
+        now: deps.now,
+        output: deps.output,
+      });
       rl.close();
     } catch (err) {
       console.log(`  ✗ Error: ${err.message}`);
@@ -239,24 +295,104 @@ function printLearnLogSchema(stream = console.error) {
   for (const line of learnLogSchemaLines()) stream(`  ${line}`);
 }
 
+function learnExperimentSlug(key) {
+  return `learn-${applyGate.applySlug(key)}`;
+}
+
+function learnExperimentRel(key) {
+  return `atris/experiments/${learnExperimentSlug(key)}`;
+}
+
+function learnApplyRel(key) {
+  return applyGate.applySidecarRel('learn', applyGate.applySlug(key));
+}
+
+function learnLessonFromText(text) {
+  const body = String(text || '');
+  return {
+    numbers: extractTeachNumbers(body),
+    mechanisms: extractTeachMechanisms(body),
+  };
+}
+
+function saveRichLearn({ cwd, key, insight } = {}) {
+  const lesson = learnLessonFromText(insight);
+  if (isThinTeachLesson(lesson)) {
+    return { thin: true, packRel: null, lesson };
+  }
+  if (cwd) fs.mkdirSync(path.join(cwd, 'atris', 'wiki'), { recursive: true });
+  const packRel = fileTeachExperiment({
+    cwd,
+    lesson,
+    slug: key ? learnExperimentSlug(key) : null,
+    applyRel: key ? learnApplyRel(key) : null,
+  });
+  return { thin: false, packRel, lesson };
+}
+
+function ensureLearnApply({ cwd, key, packRel, now, output } = {}) {
+  const pack = packRel || (key ? learnExperimentRel(key) : null);
+  const slug = pack ? path.basename(pack) : null;
+  return applyGate.ensureApply({
+    cwd,
+    source: key ? `learn:${key}` : 'learn',
+    rel: key ? learnApplyRel(key) : null,
+    now,
+    output,
+    incompleteMessage: slug
+      ? `next: atris experiments keep ${slug}`
+      : applyGate.ephemeralApplyMessage('learning'),
+    required: false,
+    change: pack ? `apply ${pack}` : undefined,
+    receipt: pack ? KEEP_RULE : undefined,
+    journalLine: pack ? `- [claimable] apply: ${pack}. ${KEEP_RULE}` : undefined,
+  });
+}
+
+function mintRichLearn({ cwd, key, insight, now, output } = {}) {
+  const print = typeof output === 'function' ? output : (line = '') => console.log(line);
+  const saved = saveRichLearn({ cwd, key, insight });
+  if (saved.thin) {
+    printLearnerCheckGate(print, saved.lesson, { includeCheck: true });
+    return 0;
+  }
+  ensureLearnApply({
+    cwd,
+    key,
+    packRel: saved.packRel,
+    now,
+    output: print,
+  });
+  return proveSavedLearnerBaseline({
+    cwd,
+    applyRel: key ? learnApplyRel(key) : null,
+    lesson: saved.lesson,
+    output: print,
+  });
+}
+
 /**
  * Non-interactive log: `atris learn log '{"type":"pattern","key":"...","insight":"...","confidence":8,"source":"observed"}'`
  * For agents and scripts, no prompts, no quality gate.
  * Aliases: title→key, detail→insight.
  */
-function logDirect(jsonStr) {
+function logDirect(jsonStr, deps = {}) {
+  const error = typeof deps.error === 'function' ? deps.error : (line = '') => console.error(line);
+  const print = typeof deps.output === 'function' ? deps.output : (line = '') => console.log(line);
+  const exit = typeof deps.exit === 'function' ? deps.exit : (code) => process.exit(code);
+  const cwd = deps.cwd || process.cwd();
   if (!jsonStr) {
-    console.error('  ✗ Usage: atris learn log \'<json>\'');
-    printLearnLogSchema();
-    process.exit(1);
+    error('  ✗ Usage: atris learn log \'<json>\'');
+    printLearnLogSchema(error);
+    return exit(1);
   }
   let data;
   try {
     data = JSON.parse(jsonStr);
   } catch (err) {
-    console.error(`  ✗ Invalid JSON: ${err.message}`);
-    printLearnLogSchema();
-    process.exit(1);
+    error(`  ✗ Invalid JSON: ${err.message}`);
+    printLearnLogSchema(error);
+    return exit(1);
   }
   try {
     const entry = addLearning({
@@ -267,11 +403,20 @@ function logDirect(jsonStr) {
       source: data.source || 'observed',
       files: data.files || [],
     });
-    console.log(`  ✓ [${entry.confidence}/10] ${entry.type}/${entry.key}`);
+    print(`  ✓ [${entry.confidence}/10] ${entry.type}/${entry.key}`);
+    const baseline = mintRichLearn({
+      cwd,
+      key: entry.key,
+      insight: entry.insight,
+      now: deps.now,
+      output: print,
+    });
+    if (baseline !== 0) return exit(baseline);
+    return 0;
   } catch (err) {
-    console.error(`  ✗ ${err.message}`);
-    printLearnLogSchema();
-    process.exit(1);
+    error(`  ✗ ${err.message}`);
+    printLearnLogSchema(error);
+    return exit(1);
   }
 }
 
@@ -279,12 +424,14 @@ function logDirect(jsonStr) {
  * Harvest learnings from journal Notes sections.
  * Scans recent journals for lines that look like insights.
  */
-function harvestFromJournals() {
-  const atrisDir = path.join(process.cwd(), 'atris');
+function harvestFromJournals(deps = {}) {
+  const print = typeof deps.output === 'function' ? deps.output : (line = '') => console.log(line);
+  const cwd = deps.cwd || process.cwd();
+  const atrisDir = path.join(cwd, 'atris');
   const logsDir = path.join(atrisDir, 'logs');
 
   if (!fs.existsSync(logsDir)) {
-    console.log('  No journals found.');
+    print('  No journals found.');
     return;
   }
 
@@ -318,10 +465,10 @@ function harvestFromJournals() {
   }
 
   if (candidates.length === 0) {
-    console.log('');
-    console.log('  No harvestable notes found in recent journals.');
-    console.log('  Add notes during "atris review" or write to ## Notes in your journal.');
-    console.log('');
+    print('');
+    print('  No harvestable notes found in recent journals.');
+    print('  Add notes during "atris review" or write to ## Notes in your journal.');
+    print('');
     return;
   }
 
@@ -331,31 +478,38 @@ function harvestFromJournals() {
   const fresh = candidates.filter(c => !existingInsights.has(c.insight.toLowerCase()));
 
   if (fresh.length === 0) {
-    console.log('');
-    console.log(`  Scanned ${candidates.length} journal notes, all already captured.`);
-    console.log('');
+    print('');
+    print(`  Scanned ${candidates.length} journal notes, all already captured.`);
+    print('');
     return;
   }
 
-  console.log('');
-  console.log(`  Found ${fresh.length} new ${fresh.length === 1 ? 'note' : 'notes'} to harvest:`);
-  console.log('');
+  print('');
+  print(`  Found ${fresh.length} new ${fresh.length === 1 ? 'note' : 'notes'} to harvest:`);
+  print('');
   for (let i = 0; i < fresh.length; i++) {
     const c = fresh[i];
     const isPitfall = /^(don't|never|avoid|watch out|careful)/i.test(c.insight);
     const type = isPitfall ? 'pitfall' : 'pattern';
     const key = c.insight.toLowerCase().replace(/[^a-z0-9\s]/g, '').split(/\s+/).slice(0, 4).join('-');
-    console.log(`  ${i + 1}. [${type}] ${c.insight}`);
-    console.log(`     from: ${c.source}`);
+    print(`  ${i + 1}. [${type}] ${c.insight}`);
+    print(`     from: ${c.source}`);
 
     try {
-      addLearning({ type, key, insight: c.insight, confidence: 6, source: 'review', files: [] });
-      console.log(`     ✓ saved [6/10]`);
+      const entry = addLearning({ type, key, insight: c.insight, confidence: 6, source: 'review', files: [] });
+      print(`     ✓ saved [6/10]`);
+      mintRichLearn({
+        cwd,
+        key: entry.key,
+        insight: entry.insight,
+        now: deps.now,
+        output: print,
+      });
     } catch (err) {
-      console.log(`     ✗ ${err.message}`);
+      print(`     ✗ ${err.message}`);
     }
   }
-  console.log('');
+  print('');
 }
 
 /**
@@ -375,10 +529,10 @@ function showLearnHelp() {
   console.log('');
   console.log('  Commands:');
   console.log('    (none)     Show recent learnings');
-  console.log('    add        Add a learning interactively');
-  console.log('    log <json> Add programmatically (for agents)');
+  console.log('    add        Add a learning interactively. A rich insight mints one apply plus a failing measure.py. A thin insight prints check: fill this.');
+  console.log('    log <json> Add programmatically (for agents). A rich insight (number or named mechanism) mints one apply plus a failing measure.py. A thin insight prints check: fill this.');
   console.log('    search <q> Search learnings by keyword');
-  console.log('    harvest    Extract learnings from journal Notes');
+  console.log('    harvest    Extract learnings from journal Notes. A rich insight mints one apply plus a failing measure.py. A thin insight prints check: fill this.');
   console.log('    prune      Check for stale/contradictory entries');
   console.log('    stats      Show learning statistics');
   console.log('    export     Export as markdown');
@@ -437,5 +591,17 @@ function learnAtris(subcommand, ...args) {
 }
 
 learnAtris.getLearningCount = getLearningCount;
+learnAtris.learnExperimentSlug = learnExperimentSlug;
+learnAtris.learnExperimentRel = learnExperimentRel;
+learnAtris.learnApplyRel = learnApplyRel;
+learnAtris.learnLessonFromText = learnLessonFromText;
+learnAtris.saveRichLearn = saveRichLearn;
+learnAtris.ensureLearnApply = ensureLearnApply;
+learnAtris.mintRichLearn = mintRichLearn;
+learnAtris.commitAddedLearning = commitAddedLearning;
+learnAtris.commitReviewLearning = commitReviewLearning;
+learnAtris.reviewLearningKey = reviewLearningKey;
+learnAtris.harvestFromJournals = harvestFromJournals;
+learnAtris.logDirect = logDirect;
 
 module.exports = learnAtris;

package/commands/workflow.js

@@ -19,6 +19,7 @@ const { startFirstTalk } = require('../lib/context-gatherer');
 const { isNonInteractive } = require('../lib/noninteractive');
 const { loadContext } = require('../lib/state-detection');
 const { buildToolResultBody } = require('../lib/tool-result-encode');
+const { commitReviewLearning } = require('./learn');
 
 function wrapWorkflowText(text, width = 76) {
   const normalized = String(text || '').replace(/\s+/g, ' ').trim();
@@ -1786,15 +1787,10 @@ async function reviewAtris() {
           console.log(`✓ Logged to journal: ${learning}`);
         }
 
-        // Also log to structured learnings (if learnings module exists)
         try {
-          const { addLearning } = require('../lib/learnings');
-          const insight = answer.trim();
-          // Auto-classify: starts with "don't" or "never" or "avoid" → pitfall, else pattern
-          const type = /^(don't|never|avoid|watch out|careful)/i.test(insight) ? 'pitfall' : 'pattern';
-          const key = insight.toLowerCase().replace(/[^a-z0-9\s]/g, '').split(/\s+/).slice(0, 4).join('-');
-          addLearning({ type, key, insight, confidence: 7, source: 'review', files: [] });
-          console.log(`✓ Saved to learnings: [7/10] ${type}/${key}`);
+          commitReviewLearning(answer.trim(), {
+            cwd: process.cwd(),
+          });
         } catch {
           // learnings module not available, so skip silently
         }

package/commands/x-search.js

@@ -32,7 +32,7 @@ function showXSearchHelp(output = console.log, commandName = 'atris x-search') {
   output('Prints to stdout. Rich ephemeral prints one apply next-step, then hands off to atris youtube search (no files).');
   output('--save files a brief only when the result is rich.');
   output('unsave deletes the filed brief, apply stub, and matching experiment pack (no paid calls).');
-  output('Empty or failed search refunds the credits.');
+  output('Empty or failed search prints credits refunded only when the server marks a refund.');
   output('');
   output('Options:');
   output('  --limit <n>         Max results hint (search only)');
@@ -327,13 +327,6 @@ function xSearchCredits(data) {
   return { used, remaining, refunded };
 }
 
-function creditsWereRefunded(credits) {
-  if (!credits) return false;
-  if (credits.used === 0) return true;
-  if (credits.refunded === true) return true;
-  return typeof credits.refunded === 'number' && credits.refunded > 0;
-}
-
 function creditsRefundedExplicitly(credits) {
   if (!credits) return false;
   if (credits.refunded === true) return true;
@@ -345,7 +338,7 @@ function formatCreditsLines(credits) {
   if (credits.used !== undefined || credits.remaining !== undefined) {
     lines.push(`Credits: ${credits.used !== undefined ? credits.used : '?'} used, ${credits.remaining !== undefined ? credits.remaining : '?'} remaining`);
   }
-  if (creditsWereRefunded(credits)) {
+  if (creditsRefundedExplicitly(credits)) {
     lines.push('credits refunded');
   }
   return lines;
@@ -360,7 +353,7 @@ function xSearchFailureError(result) {
         ? ' xAI is unavailable; retry in a few seconds.'
         : '';
   const credits = xSearchCredits(result.data);
-  const refundHint = result.status === 502 && creditsWereRefunded(credits)
+  const refundHint = result.status === 502 && creditsRefundedExplicitly(credits)
     ? ' credits refunded.'
     : '';
   const lines = [`X search failed (${result.status}): ${resultErrorText(result)}.${hint}${refundHint}`];
@@ -398,6 +391,12 @@ async function runXSearch(options, deps = {}) {
       forceMint: true,
     });
     if (remint?.ok && remint.token) {
+      if (!options.json) {
+        const print = typeof deps.output === 'function' ? deps.output : () => {};
+        for (const line of formatCreditsLines(xSearchCredits(result.data))) {
+          print(line);
+        }
+      }
       auth = remint;
       result = await call(auth.token);
     }