atris 3.57.2 → 3.57.4

package/commands/youtube.js

@@ -30,7 +30,7 @@ function showYoutubeHelp(output = console.log, commandName = 'atris youtube') {
   output(`Usage: ${commandName} search "<query>" [--limit N] [--json]`);
   output(`       ${commandName} search --paid "<query>" [--limit N] [--json]`);
   output(`       ${commandName} notes <youtube-url> [youtube-url-or-playlist...] [engine] [--save]`);
-  output(`       ${commandName} teach <youtube-url> [--section N] [--save]`);
+  output(`       ${commandName} teach <youtube-url> [--section N] [--save] [--recap TEXT] [--skip]`);
   output(`       ${commandName} unsave <url-or-id>`);
   output(`       ${commandName} process <youtube-url> [options]`);
   output(`       ${commandName} digest [--days N]`);
@@ -44,6 +44,7 @@ function showYoutubeHelp(output = console.log, commandName = 'atris youtube') {
   output('search --paid = 5 credits, watch permalinks + titles from Atris');
   output('notes = free local notes to stdout; ephemeral unless --save');
   output('teach = one chapter from local captions; ephemeral unless --save');
+  output('rich ephemeral notes/teach print one apply next-step (no files)');
   output('process = 5 credits cloud knowledge (needs a filled Apply)');
   output('digest = one decision page from this week\'s video briefs');
   output('watch = subscribed channels turn into briefs without a human');
@@ -53,9 +54,11 @@ function showYoutubeHelp(output = console.log, commandName = 'atris youtube') {
   output('Options:');
   output('  --limit <n>         Max search results (default: 5)');
   output('  --paid              Bill 5 credits for watch permalinks (search only)');
-  output('  --save              File brief, journal, apply stub; teach also mints a keep/revert experiment');
+  output('  --save              File brief, journal, apply; rich notes/teach mint a keep/revert experiment');
   output('  --section <n>       Chapter to teach, 1-based (teach only, default: 1)');
-  output('  --unsave            Delete filed brief and apply stub (no paid calls)');
+  output('  --recap <text>      Unlock the next teach section with the unpaid check');
+  output('  --skip              Unlock the next teach section without answering');
+  output('  --unsave            Delete filed brief, apply stub, and matching notes/teach experiment packs (no paid calls)');
   output('  --query, -q <text>  Focus question for the analysis');
   output('  --agent <id>        Agent id to store knowledge against');
   output('  --store             Save as agent knowledge (requires --agent)');
@@ -645,16 +648,68 @@ function applySidecarRel(id) {
   return applyGate.applySidecarRel('youtube', id);
 }
 
-function ensureNotesApply({ cwd, url, now, output } = {}) {
+function notesExperimentSlug(id) {
+  return `notes-${experimentIdToken(id)}`;
+}
+
+function notesExperimentRel(id) {
+  return `atris/experiments/${notesExperimentSlug(id)}`;
+}
+
+function notesLessonFromText(text) {
+  const body = String(text || '');
+  return {
+    numbers: extractTeachNumbers(body),
+    mechanisms: extractTeachMechanisms(body),
+  };
+}
+
+function readNotesText({ url, workDir } = {}) {
+  const id = videoIdFromUrl(url);
+  if (!id || !workDir) return '';
+  const notesPath = path.join(workDir, `yt_${id}.md`);
+  try {
+    if (!fs.existsSync(notesPath)) return '';
+    return fs.readFileSync(notesPath, 'utf8');
+  } catch {
+    return '';
+  }
+}
+
+function saveRichNotes(url, deps = {}) {
+  const workDir = deps.workDir || path.join(process.env.TMPDIR || '/tmp', 'ytnotes');
+  const lesson = notesLessonFromText(readNotesText({ url, workDir }));
+  if (isThinTeachLesson(lesson)) {
+    return { thin: true, brief: null, packRel: null };
+  }
+  const brief = fileNotesBrief(url, deps);
   const id = videoIdFromUrl(url);
+  const packRel = fileTeachExperiment({
+    cwd: deps.cwd || process.cwd(),
+    url,
+    lesson,
+    slug: id ? notesExperimentSlug(id) : null,
+    applyRel: id ? applySidecarRel(id) : null,
+  });
+  return { thin: false, brief, packRel };
+}
+
+function ensureNotesApply({ cwd, url, packRel, now, output } = {}) {
+  const id = videoIdFromUrl(url);
+  const pack = packRel || (id ? notesExperimentRel(id) : null);
   return applyGate.ensureApply({
     cwd,
     source: url,
     rel: id ? applySidecarRel(id) : null,
     now,
     output,
-    incompleteMessage: APPLY_NEXT_MESSAGE,
+    incompleteMessage: pack
+      ? `next: apply ${pack}. keep only if measure.py moves 0→1`
+      : APPLY_NEXT_MESSAGE,
     required: false,
+    change: pack ? `apply ${pack}` : undefined,
+    receipt: pack ? TEACH_KEEP_RULE : undefined,
+    journalLine: pack ? `- [claimable] apply: ${pack}. ${TEACH_KEEP_RULE}` : undefined,
   });
 }
 
@@ -662,6 +717,50 @@ function youtubeBriefRel(id) {
   return `atris/wiki/briefs/youtube-${id}.md`;
 }
 
+function removeUnsaveRel(cwd, rel, removed) {
+  const abs = path.join(cwd, rel);
+  try {
+    if (!fs.existsSync(abs)) return;
+    const st = fs.lstatSync(abs);
+    if (st.isDirectory()) fs.rmSync(abs, { recursive: true, force: true });
+    else fs.unlinkSync(abs);
+    removed.push(rel);
+  } catch {
+    // already gone or unreadable: do not error
+  }
+}
+
+function listTeachSectionNumbers(cwd, id) {
+  const root = path.join(cwd, 'atris', 'experiments');
+  const sections = [];
+  try {
+    if (!fs.existsSync(root)) return sections;
+    for (const name of fs.readdirSync(root)) {
+      const match = String(name).match(/^teach-.+-s(\d+)$/);
+      if (!match) continue;
+      const section = Number(match[1]);
+      if (name === teachExperimentSlug(id, section)) sections.push(section);
+    }
+  } catch {
+    // missing experiments dir is fine
+  }
+  return sections.sort((a, b) => a - b);
+}
+
+function listTeachSidecarRels(cwd, id) {
+  const briefsDir = path.join(cwd, 'atris', 'wiki', 'briefs');
+  const prefix = `youtube-${id}-s`;
+  try {
+    if (!fs.existsSync(briefsDir)) return [];
+    return fs.readdirSync(briefsDir)
+      .filter((name) => name.startsWith(prefix) && name.endsWith('.md'))
+      .sort((a, b) => a.localeCompare(b, 'en'))
+      .map((name) => `atris/wiki/briefs/${name}`);
+  } catch {
+    return [];
+  }
+}
+
 function unsaveYoutubeNotes(target, deps = {}) {
   const output = deps.output || ((line = '') => console.log(line));
   const cwd = deps.cwd || process.cwd();
@@ -672,18 +771,26 @@ function unsaveYoutubeNotes(target, deps = {}) {
   }
   const briefRel = youtubeBriefRel(id);
   const applyRel = applySidecarRel(id);
-  const removed = [];
-  for (const rel of [briefRel, applyRel]) {
-    const abs = path.join(cwd, rel);
-    try {
-      if (fs.existsSync(abs)) {
-        fs.unlinkSync(abs);
-        removed.push(rel);
-      }
-    } catch {
-      // already gone or unreadable: do not error
-    }
+  const sections = listTeachSectionNumbers(cwd, id);
+  const rels = [];
+  const seen = new Set();
+  const add = (rel) => {
+    if (!rel || seen.has(rel)) return;
+    seen.add(rel);
+    rels.push(rel);
+  };
+  add(briefRel);
+  add(applyRel);
+  for (const section of sections) {
+    add(teachBriefRel(id, section));
+    add(applySidecarRel(`${id}-s${section}`));
   }
+  for (const rel of listTeachSidecarRels(cwd, id)) add(rel);
+  add(notesExperimentRel(id));
+  for (const section of sections) add(teachExperimentRel(id, section));
+
+  const removed = [];
+  for (const rel of rels) removeUnsaveRel(cwd, rel, removed);
   if (!removed.length) {
     output(`already gone: ${briefRel} and ${applyRel}`);
     return 0;
@@ -1339,9 +1446,30 @@ function runOneNotesItem(item, engine, deps = {}) {
   } catch {
     status = 1;
   }
-  const brief = status === 0 && deps.save ? fileNotesBrief(item.url, deps) : null;
+  let brief = null;
+  let ok = status === 0;
+  if (ok && deps.save) {
+    const saved = saveRichNotes(item.url, deps);
+    if (saved.thin) {
+      output(TEACH_THIN_REFUSE);
+      ok = false;
+    } else {
+      brief = saved.brief;
+      const ensureApply = deps.ensureApply || ensureNotesApply;
+      try {
+        ensureApply({
+          cwd: deps.cwd || process.cwd(),
+          url: item.url,
+          packRel: saved.packRel,
+          now: deps.now,
+          output,
+        });
+      } catch {
+        // apply filing must never break the batch
+      }
+    }
+  }
   const seconds = Math.max(0, Math.round((readNowMs(deps) - started) / 1000));
-  const ok = status === 0;
   output(`${label}  ${seconds}s  ${ok ? (brief || 'ok') : 'FAILED'}`);
   return { url: item.url, id: item.id, seconds, ok, brief };
 }
@@ -1380,12 +1508,23 @@ function runSingleYoutubeNotes(url, engine, deps = {}) {
   }
   const status = readRunnerStatus(result);
   if (status !== 0) return status;
-  if (!deps.save) return 0;
-  fileNotesBrief(url, deps);
+  const output = deps.output || ((line = '') => console.error(line));
+  if (!deps.save) {
+    const workDir = deps.workDir || path.join(process.env.TMPDIR || '/tmp', 'ytnotes');
+    const lesson = notesLessonFromText(readNotesText({ url, workDir }));
+    if (!isThinTeachLesson(lesson)) applyGate.hintEphemeralApply(output, 'notes');
+    return 0;
+  }
+  const saved = saveRichNotes(url, deps);
+  if (saved.thin) {
+    output(TEACH_THIN_REFUSE);
+    return 2;
+  }
   const ensureApply = deps.ensureApply || ensureNotesApply;
   return ensureApply({
     cwd: deps.cwd || process.cwd(),
     url,
+    packRel: saved.packRel,
     now: deps.now,
     output: deps.output,
   });
@@ -1936,9 +2075,11 @@ async function runYoutubeSearch(args = [], deps = {}) {
   return 0;
 }
 
-const YTTEACH_USAGE = 'usage: atris youtube teach <youtube-url> [--section N] [--save]';
+const YTTEACH_USAGE = 'usage: atris youtube teach <youtube-url> [--section N] [--save] [--recap TEXT] [--skip]';
 const TEACH_PAID_REFUSE = 'teach is free local captions. drop --paid.';
 const TEACH_THIN_REFUSE = 'thin: no number or named mechanism. no brief.';
+const TEACH_OWED_FILE = 'youtube-teach-owed.json';
+const TEACH_RECAP_MISSING = '--recap needs the unpaid check';
 const TEACH_APPLY_NEXT_MESSAGE = APPLY_NEXT_MESSAGE;
 const TEACH_KEEP_RULE = 'keep only if measure.py moves 0→1. scores 1 only when the fixture contains the check tokens.';
 const MECHANISM_STOP = new Set([
@@ -1965,6 +2106,9 @@ function parseTeachArgs(argv = []) {
   const options = {
     help: false,
     save: false,
+    json: false,
+    skip: false,
+    recap: null,
     url: null,
     section: 1,
   };
@@ -1980,8 +2124,23 @@ function parseTeachArgs(argv = []) {
       options.help = true;
     } else if (arg === '--save') {
       options.save = true;
+    } else if (arg === '--json') {
+      options.json = true;
+    } else if (arg === '--skip') {
+      options.skip = true;
     } else if (arg === '--paid') {
       throw new Error(TEACH_PAID_REFUSE);
+    } else if (arg === '--recap') {
+      const raw = args[i + 1];
+      if (raw == null || String(raw).startsWith('--')) {
+        throw new Error(TEACH_RECAP_MISSING);
+      }
+      options.recap = String(raw);
+      i += 1;
+    } else if (arg.startsWith('--recap=')) {
+      const value = arg.slice('--recap='.length);
+      if (!value) throw new Error(TEACH_RECAP_MISSING);
+      options.recap = value;
     } else if (arg === '--section') {
       const raw = args[i + 1];
       const value = Number.parseInt(raw, 10);
@@ -1998,6 +2157,18 @@ function parseTeachArgs(argv = []) {
       options.section = value;
     } else if (arg.startsWith('-')) {
       throw new Error(`Unknown option: ${arg}`);
+    } else if (arg === 'recap' && options.recap == null && !options.url) {
+      const parts = [];
+      i += 1;
+      while (i < args.length && !String(args[i]).startsWith('--')) {
+        parts.push(String(args[i]));
+        i += 1;
+      }
+      i -= 1;
+      options.recap = parts.join(' ').trim();
+      if (!options.recap) throw new Error(TEACH_RECAP_MISSING);
+    } else if (arg === 'skip' && !options.url) {
+      options.skip = true;
     } else if (!options.url && looksLikeYoutubeUrl(arg)) {
       options.url = arg;
     } else {
@@ -2006,7 +2177,9 @@ function parseTeachArgs(argv = []) {
   }
 
   if (options.help) return options;
-  if (!options.url) throw new Error('Missing YouTube URL. Run "atris youtube teach --help".');
+  if (!options.url && options.recap == null && !options.skip) {
+    throw new Error('Missing YouTube URL. Run "atris youtube teach --help".');
+  }
   return options;
 }
 
@@ -2185,14 +2358,17 @@ function teachBriefRel(id, section) {
   return `atris/wiki/briefs/youtube-${id}-s${section}.md`;
 }
 
-function teachExperimentSlug(id, section) {
-  const safe = String(id || 'video')
+function experimentIdToken(id) {
+  return String(id || 'video')
     .toLowerCase()
     .replace(/_/g, '-')
     .replace(/[^a-z0-9-]+/g, '')
     .replace(/-+/g, '-')
     .replace(/^-+|-+$/g, '') || 'video';
-  return `teach-${safe}-s${Number(section) || 1}`;
+}
+
+function teachExperimentSlug(id, section) {
+  return `teach-${experimentIdToken(id)}-s${Number(section) || 1}`;
 }
 
 function teachExperimentRel(id, section) {
@@ -2207,22 +2383,118 @@ function teachCheckNeedles(lesson = {}) {
   return [];
 }
 
+function teachRecapTokens(lesson = {}) {
+  const tokens = [];
+  const seen = new Set();
+  for (const value of [...(lesson.mechanisms || []), ...(lesson.numbers || [])]) {
+    const token = String(value || '').trim().toLowerCase();
+    if (!token || seen.has(token)) continue;
+    seen.add(token);
+    tokens.push(token);
+  }
+  return tokens;
+}
+
+function recapHitsTokens(text, tokens) {
+  const hay = String(text || '').toLowerCase();
+  return (tokens || []).some((token) => {
+    const needle = String(token || '').trim().toLowerCase();
+    return needle.length > 0 && hay.includes(needle);
+  });
+}
+
+function teachOwedPath(deps = {}) {
+  if (deps.teachOwedPath) return deps.teachOwedPath;
+  const cwd = deps.cwd || process.cwd();
+  return path.join(cwd, '.atris', TEACH_OWED_FILE);
+}
+
+function readTeachOwedStore(deps = {}) {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(teachOwedPath(deps), 'utf8'));
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return {};
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+
+function writeTeachOwedStore(deps, store) {
+  try {
+    const filePath = teachOwedPath(deps);
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, `${JSON.stringify(store || {})}\n`);
+  } catch {
+    // owed recap is ephemeral; a failed write must not break teach
+  }
+}
+
+function rememberTeachOwed(deps, { url, section, lesson } = {}) {
+  const id = videoIdFromUrl(url);
+  if (!id) return;
+  const store = readTeachOwedStore(deps);
+  store[id] = {
+    section: Number(section) || 1,
+    check: teachCheckLine(lesson),
+    tokens: teachRecapTokens(lesson),
+  };
+  writeTeachOwedStore(deps, store);
+}
+
+function previousTeachUnlocked(owed, section) {
+  if (!owed) return true;
+  return Number(owed.section) >= Number(section);
+}
+
+function applyTeachRecap(parsed, deps, output) {
+  const store = readTeachOwedStore(deps);
+  let id = parsed.url ? videoIdFromUrl(parsed.url) : null;
+  let entry = id ? store[id] : null;
+  if (!entry && !id) {
+    const ids = Object.keys(store);
+    if (parsed.recap) {
+      id = ids.find((key) => recapHitsTokens(parsed.recap, store[key] && store[key].tokens));
+    }
+    if (!id && ids.length === 1) id = ids[0];
+    entry = id ? store[id] : null;
+  }
+  if (!entry) {
+    if (parsed.skip) return 0;
+    if (!parsed.json) output('recap the previous section first');
+    return 2;
+  }
+  if (parsed.skip) {
+    delete store[id];
+    writeTeachOwedStore(deps, store);
+    return 0;
+  }
+  if (!recapHitsTokens(parsed.recap, entry.tokens)) {
+    if (!parsed.json) output(entry.check);
+    return 2;
+  }
+  delete store[id];
+  writeTeachOwedStore(deps, store);
+  return 0;
+}
+
 function teachCheckLine(lesson = {}) {
   return oneTeachCheck(lesson.mechanisms || [], lesson.numbers || [], '');
 }
 
-function fileTeachExperiment({ cwd, url, section, lesson } = {}) {
+function fileTeachExperiment({ cwd, url, section, lesson, slug, applyRel } = {}) {
   try {
-    const id = videoIdFromUrl(url);
-    if (!id || !cwd) return null;
-    const slug = teachExperimentSlug(id, section);
-    const rel = `atris/experiments/${slug}`;
+    const id = url ? videoIdFromUrl(url) : null;
+    if (!cwd) return null;
+    const packSlug = slug || (id ? teachExperimentSlug(id, section) : null);
+    if (!packSlug) return null;
+    const rel = `atris/experiments/${packSlug}`;
     const dir = path.join(cwd, rel);
     fs.mkdirSync(dir, { recursive: true });
 
     const check = teachCheckLine(lesson);
     const needles = teachCheckNeedles(lesson);
-    const applyRel = applySidecarRel(`${id}-s${section}`);
+    const sidecarRel = applyRel || (id ? applySidecarRel(`${id}-s${section}`) : null);
+    if (!sidecarRel) return null;
     const program = [
       '# Program',
       '',
@@ -2243,7 +2515,7 @@ function fileTeachExperiment({ cwd, url, section, lesson } = {}) {
       'EXPERIMENT_DIR = Path(__file__).resolve().parent',
       `CHECK = ${JSON.stringify(check)}`,
       `NEEDLES = ${JSON.stringify(needles)}`,
-      `DEFAULT_TARGET = ${JSON.stringify(applyRel)}`,
+      `DEFAULT_TARGET = ${JSON.stringify(sidecarRel)}`,
       '',
       '',
       'def repo_root() -> Path:',
@@ -2559,6 +2831,26 @@ async function runYoutubeTeach(args = [], deps = {}) {
     return 0;
   }
 
+  const owedDeps = { ...deps, cwd: deps.cwd || process.cwd() };
+  if (parsed.recap != null || parsed.skip) {
+    const recapCode = applyTeachRecap(parsed, owedDeps, output);
+    if (recapCode !== 0) return recapCode;
+    if (!parsed.url || parsed.section <= 1) return 0;
+  }
+
+  if (!parsed.url) {
+    output('Missing YouTube URL. Run "atris youtube teach --help".');
+    return 2;
+  }
+
+  if (parsed.section > 1) {
+    const owed = readTeachOwedStore(owedDeps)[videoIdFromUrl(parsed.url) || ''];
+    if (!previousTeachUnlocked(owed, parsed.section)) {
+      if (!parsed.json && owed && owed.check) output(owed.check);
+      return 2;
+    }
+  }
+
   const source = await (deps.extractTeachSource || extractTeachSource)(parsed.url, deps);
   if (!source || !Array.isArray(source.cues) || !source.cues.length) {
     output('no english captions for this url. teach stays local and will not call process.');
@@ -2582,8 +2874,12 @@ async function runYoutubeTeach(args = [], deps = {}) {
     title: source.title,
   });
   output(lesson.text);
+  rememberTeachOwed(owedDeps, { url: parsed.url, section: parsed.section, lesson });
 
-  if (!parsed.save) return 0;
+  if (!parsed.save) {
+    if (!isThinTeachLesson(lesson)) applyGate.hintEphemeralApply(output, 'teach');
+    return 0;
+  }
   if (isThinTeachLesson(lesson)) {
     output(TEACH_THIN_REFUSE);
     return 2;
@@ -2706,5 +3002,7 @@ module.exports = {
   isThinTeachLesson,
   TEACH_THIN_REFUSE,
   teachExperimentSlug,
+  notesExperimentSlug,
+  fileTeachExperiment,
   youtubeCommand,
 };

package/lib/apply-gate.js

@@ -95,8 +95,21 @@ function ensureApply({
   return required ? 2 : 0;
 }
 
+function ephemeralApplyMessage(kind) {
+  const label = String(kind || '').trim() || 'result';
+  return `next: write one apply (change + receipt) for this ${label}`;
+}
+
+function hintEphemeralApply(output, kind) {
+  const print = typeof output === 'function' ? output : (line = '') => console.error(line);
+  print(ephemeralApplyMessage(kind));
+  return 0;
+}
+
 module.exports = {
   applySlug,
   applySidecarRel,
   ensureApply,
+  ephemeralApplyMessage,
+  hintEphemeralApply,
 };

package/lib/engine-ask.js

@@ -222,7 +222,6 @@ function buildReadOnlyEngineInvocation(engineName, prompt, modelName = '') {
         '--model', model || profile.model || DEFAULT_CLAUDE_RUNNER_MODEL,
         '--tools', 'Read,Glob,Grep,WebSearch,WebFetch',
         '--permission-mode', 'plan',
-        '--safe-mode',
         '--no-session-persistence',
       ],
     };
@@ -293,6 +292,25 @@ function cancelledAskResult(job, extra = {}) {
   };
 }
 
+function osAccountName() {
+  try {
+    return String(os.userInfo().username || '').trim();
+  } catch {
+    return '';
+  }
+}
+
+// Claude Code looks up macOS Keychain with process.env.USER, not whoami.
+// Host apps sometimes pass a display name, so pin USER and LOGNAME to the OS account.
+function buildAskSpawnEnv(sourceEnv = process.env) {
+  const env = { ...sourceEnv };
+  const username = osAccountName();
+  if (!username) return env;
+  env.USER = username;
+  env.LOGNAME = username;
+  return env;
+}
+
 function runAskProcess(invocation, {
   cwd = process.cwd(),
   timeoutMs = DEFAULT_ASK_TIMEOUT_MS,
@@ -387,7 +405,7 @@ function runAskProcess(invocation, {
     try {
       child = spawnProcess(invocation.bin, invocation.args, {
         cwd,
-        env: process.env,
+        env: buildAskSpawnEnv(),
         detached: process.platform !== 'win32',
         stdio: ['ignore', 'pipe', 'pipe'],
       });
@@ -671,6 +689,7 @@ module.exports = {
   MAX_ASK_PROMPT_BYTES,
   parseEngineAskArgs,
   buildReadOnlyEngineInvocation,
+  buildAskSpawnEnv,
   runAskProcess,
   runEngineAskJobs,
   runEngineAskCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.57.2",
+  "version": "3.57.4",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "main": "bin/atris.js",
   "bin": {