atris 3.80.1 → 3.82.2

package/commands/task.js

@@ -10,6 +10,7 @@ const { execSync } = require('node:child_process');
 const path = require('path');
 const os = require('os');
 const { hasFlag } = require('../lib/arg-parser');
+const { buildNextWorkContext, reconcileTaskRows } = require('../lib/next-work-context');
 const { argsWantHelp } = require('../lib/noninteractive');
 const {
   compactErrorPayload,
@@ -47,6 +48,7 @@ const {
 } = require('../lib/task-explanation');
 const { extractReceiptEvidence, RECEIPT_PATH_PATTERN } = require('../lib/receipt-evidence');
 const escapeRegExp = require('../lib/escape-regexp');
+const { writeFileAtomic } = require('../lib/json-file');
 const reviewIntegrity = require('../lib/review-integrity');
 const { gateForHuman, isRetiredFillerReason, landingWhyClause, numberWord, plainLandingReason } = require('../lib/voice-gate');
 const {
@@ -73,6 +75,7 @@ const {
 } = require('../lib/task-decision');
 const {
   buildFirstMinute,
+  loadLocalTaskState,
   deskNextCommand,
   firstTalkCommand,
   folderName,
@@ -184,14 +187,15 @@ function writeDefaultProjection(taskDb, db, options = {}) {
   }));
   const outPath = path.resolve(root || process.cwd(), '.atris', 'state', 'tasks.projection.json');
   const output = JSON.stringify(projection, null, 2) + '\n';
-  fs.mkdirSync(path.dirname(outPath), { recursive: true });
   let shouldWrite = true;
   try {
     shouldWrite = fs.readFileSync(outPath, 'utf8') !== output;
   } catch {
     shouldWrite = true;
   }
-  if (shouldWrite) fs.writeFileSync(outPath, output, 'utf8');
+  // Temp file and rename: a reader never sees half a projection. This is the one writer of the
+  // projection's shape; lib/mission-core.js writes through it too.
+  if (shouldWrite) writeFileAtomic(outPath, output);
   return { projection, outPath };
 }
 
@@ -4787,16 +4791,13 @@ function cmdReviews(args) {
 }
 
 function stampAcceptGroupMetadata(taskDb, db, taskId, { actor, group, verified, sampleVerifiedIds }) {
-  const row = taskDb.getTask(db, taskId);
-  if (!row) return;
-  const metadata = row.metadata && typeof row.metadata === 'object' ? { ...row.metadata } : {};
-  metadata.accept_group = group;
-  metadata.accept_group_by = actor;
-  metadata.accept_group_at = new Date().toISOString();
-  metadata.accepted_by_sampling = !verified;
-  if (!verified) metadata.sample_verified_ids = sampleVerifiedIds;
-  db.prepare('UPDATE tasks SET metadata = ?, updated_at = ? WHERE id = ?')
-    .run(JSON.stringify(metadata), Date.now(), taskId);
+  taskDb.updateTaskMetadata(db, taskId, (metadata) => {
+    metadata.accept_group = group;
+    metadata.accept_group_by = actor;
+    metadata.accept_group_at = new Date().toISOString();
+    metadata.accepted_by_sampling = !verified;
+    if (!verified) metadata.sample_verified_ids = sampleVerifiedIds;
+  });
 }
 
 // Accept a whole certified cluster honestly: the human spot-checks K rows (real career XP), the rest
@@ -4902,16 +4903,7 @@ function cmdAcceptGroup(args) {
       accepted.push({ id: task.id, ok: false, reason: MISSION_XP_END_TO_END_REASON, detail: missionXpIssue });
       continue;
     }
-    const done = taskDb.doneTask(db, {
-      id: task.id,
-      status: 'done',
-      actor,
-      allowReview: true,
-      action: 'accepted',
-      proof,
-    });
-    if (!done.updated) { accepted.push({ id: task.id, ok: false, reason: 'not_review' }); continue; }
-    const reviewed = taskDb.reviewTask(db, {
+    const done = taskDb.acceptTask(db, {
       id: task.id,
       actor,
       reward: 1,
@@ -4920,6 +4912,8 @@ function cmdAcceptGroup(args) {
       proof,
       careerXpEligible: isVerified, // honest: career XP ONLY for rows the human actually verified
     });
+    if (!done.updated) { accepted.push({ id: task.id, ok: false, reason: 'not_review' }); continue; }
+    const reviewed = done.reviewed;
     refreshCareerXpAfterReview(reviewed);
     stampAcceptGroupMetadata(taskDb, db, task.id, { actor, group: groupLabel, verified: isVerified, sampleVerifiedIds: [...verifiedIds] });
     accepted.push({ id: task.id, ok: true, verified: isVerified, career_xp: isVerified });
@@ -5888,27 +5882,11 @@ function cmdNextTruth(args) {
   const taskDb = getTaskDb();
   const db = taskDb.open();
   const workspaceRoot = taskDb.workspaceRoot();
-  const rows = taskDb.listTasks(db, { workspaceRoot, limit: 500 });
-  const existingProj = readProjectionFile(workspaceRoot);
-  const dbHasActionable = rows.some((task) => {
-    const status = task && task.status;
-    return status === 'open' || status === 'claimed' || status === 'review';
-  });
-  const projHasActionable = Boolean(
-    existingProj
-    && Array.isArray(existingProj.tasks)
-    && existingProj.tasks.some((task) => {
-      const status = task && task.status;
-      return status === 'open' || status === 'claimed' || status === 'review';
-    }),
-  );
+  const snapshot = loadLocalTaskState(workspaceRoot);
   let projection;
   let outPath;
-  if (!dbHasActionable && projHasActionable) {
-    projection = existingProj;
-    outPath = path.resolve(path.join(workspaceRoot || '.', '.atris', 'state', 'tasks.projection.json'));
-  } else if (rows.length === 0 && existingProj && Array.isArray(existingProj.tasks) && existingProj.tasks.length > 0) {
-    projection = existingProj;
+  if (snapshot.source !== 'database') {
+    projection = { tasks: snapshot.tasks };
     outPath = path.resolve(path.join(workspaceRoot || '.', '.atris', 'state', 'tasks.projection.json'));
   } else {
     const written = writeDefaultProjection(taskDb, db);
@@ -5936,6 +5914,7 @@ function cmdNextTruth(args) {
       scope: normalizeTaskQueueScope(scope),
       projection_path: outPath,
       task: task ? compactTaskFromProjection(projection, task.id) : null,
+      context: buildNextWorkContext({ root: workspaceRoot, tasks: reconcileTaskRows(snapshot.tasks, projection.tasks || []), selected: task, owner: String(owner), taskSource: snapshot.source, generatedAt: snapshot.generated_at }),
     });
     return;
   }
@@ -9390,19 +9369,8 @@ async function cmdAccept(args) {
     console.error('atris task accept: reward must be a positive number');
     process.exit(2);
   }
-  const done = taskDb.doneTask(db, {
-    id: taskId,
-    status: 'done',
-    actor,
-    allowReview: true,
-    action: 'accepted',
-    proof,
-  });
-  if (!done.updated) {
-    console.error(`accept failed: ${taskId} not open|claimed|review`);
-    process.exit(1);
-  }
-  const reviewed = taskDb.reviewTask(db, {
+  // One transaction: done and accepted land together or not at all (lib/task-db.js acceptTask).
+  const done = taskDb.acceptTask(db, {
     id: taskId,
     actor,
     reward: parsedReward.value,
@@ -9412,6 +9380,11 @@ async function cmdAccept(args) {
     careerXpEligible: true,
     clearedFields,
   });
+  if (!done.updated) {
+    console.error(`accept failed: ${taskId} not open|claimed|review`);
+    process.exit(1);
+  }
+  const reviewed = done.reviewed;
   const xpProjection = refreshCareerXpAfterReview(reviewed);
   const { projection, outPath } = writeDefaultProjection(taskDb, db);
   const workspaceRoot = projection.workspace_root || process.cwd();
@@ -9485,17 +9458,13 @@ function stampAutoAcceptMetadata(taskDb, db, task, actor, policy) {
   } catch (err) {
     landing = { status: 'unverified', reason: 'landing_proof_failed', detail: String((err && err.message) || err).slice(0, 200) };
   }
-  const metadata = row.metadata && typeof row.metadata === 'object' ? { ...row.metadata } : {};
-  metadata.auto_accepted_at = new Date().toISOString();
-  metadata.auto_accepted_by = actor;
-  metadata.auto_accept_policy = policy;
-  metadata.landing = { ...landing, checked_at: metadata.auto_accepted_at };
-  db.prepare(`
-    UPDATE tasks
-       SET metadata = ?,
-           updated_at = ?
-     WHERE id = ?
-  `).run(JSON.stringify(metadata), Date.now(), taskId);
+  // The landing proof runs git, so it is worked out first; only the write holds the lock.
+  taskDb.updateTaskMetadata(db, taskId, (metadata) => {
+    metadata.auto_accepted_at = new Date().toISOString();
+    metadata.auto_accepted_by = actor;
+    metadata.auto_accept_policy = policy;
+    metadata.landing = { ...landing, checked_at: metadata.auto_accepted_at };
+  });
   return landing;
 }
 
@@ -9512,19 +9481,8 @@ function acceptReviewTask(taskDb, db, taskId, { actor, proof, reward, lesson = '
   if (missionXpIssue) {
     return { ok: false, reason: MISSION_XP_END_TO_END_REASON, detail: missionXpIssue };
   }
-  const done = taskDb.doneTask(db, {
-    id: taskId,
-    status: 'done',
-    actor,
-    allowReview: true,
-    action: 'accepted',
-    proof,
-    autoAccepted,
-  });
-  if (!done.updated) {
-    return { ok: false, reason: 'not_open_claimed_or_review' };
-  }
-  const reviewed = taskDb.reviewTask(db, {
+  // One transaction: done and accepted land together or not at all (lib/task-db.js acceptTask).
+  const accepted = taskDb.acceptTask(db, {
     id: taskId,
     actor,
     reward,
@@ -9534,6 +9492,10 @@ function acceptReviewTask(taskDb, db, taskId, { actor, proof, reward, lesson = '
     careerXpEligible: true,
     autoAccepted,
   });
+  if (!accepted.updated) {
+    return { ok: false, reason: 'not_open_claimed_or_review' };
+  }
+  const reviewed = accepted.reviewed;
   const acceptedRow = taskDb.getTask(db, taskId);
   refreshExistingTodoMarkdown(taskDb, db, acceptedRow && acceptedRow.workspace_root);
   return { ok: true, reviewed };
@@ -9580,19 +9542,12 @@ function verifyIsOnlyFileChecks(verify) {
 }
 
 function stampCertifyVerifyMetadata(taskDb, db, taskId, actor, verify) {
-  const row = taskDb.getTask(db, taskId);
-  if (!row) return;
-  const metadata = row.metadata && typeof row.metadata === 'object' ? { ...row.metadata } : {};
-  metadata.verify = metadata.verify || verify;
-  metadata.certified_verified_at = new Date().toISOString();
-  metadata.certified_verified_by = actor;
-  metadata.machine_verified = true;
-  db.prepare(`
-    UPDATE tasks
-       SET metadata = ?,
-           updated_at = ?
-     WHERE id = ?
-  `).run(JSON.stringify(metadata), Date.now(), taskId);
+  taskDb.updateTaskMetadata(db, taskId, (metadata) => {
+    metadata.verify = metadata.verify || verify;
+    metadata.certified_verified_at = new Date().toISOString();
+    metadata.certified_verified_by = actor;
+    metadata.machine_verified = true;
+  });
 }
 
 function currentHeadSha(workspaceRoot) {
@@ -9613,27 +9568,23 @@ function currentHeadSha(workspaceRoot) {
 // certify-verified and the autoland landing re-check, persist the outcome
 // here for the read path to consult.
 function stampVerifyCacheMetadata(taskDb, db, taskId, { verify, result, actor, workspaceRoot }) {
-  const row = taskDb.getTask(db, taskId);
-  if (!row) return;
-  const metadata = row.metadata && typeof row.metadata === 'object' ? { ...row.metadata } : {};
-  metadata.verify_cache = {
+  if (!taskDb.getTask(db, taskId)) return;
+  const verifyCache = {
     command: verify,
     ok: result && result.ok === true,
     reason: (result && result.reason) || null,
     ran_at: new Date().toISOString(),
     ran_by: actor,
     // The commit the check ran on: the job's own code when it has some,
-    // else the folder the job lives in.
+    // else the folder the job lives in. Read before the write lock is taken.
     code_sha: (result && result.code_sha) || currentHeadSha(workspaceRoot),
     code_source: (result && result.code_source) || 'checkout',
   };
   // A check is not a touch. Bumping updated_at here put every failed job at
   // the front of the next pass, so the same six failing jobs won every hour.
-  db.prepare(`
-    UPDATE tasks
-       SET metadata = ?
-     WHERE id = ?
-  `).run(JSON.stringify(metadata), taskId);
+  taskDb.updateTaskMetadata(db, taskId, (metadata) => {
+    metadata.verify_cache = verifyCache;
+  }, { touch: false });
 }
 
 // When a review job was last given a second check; never checked reads 0.
@@ -9656,23 +9607,16 @@ function failedOnSameCode(task, verify, codeSha) {
 // metadata.verify is what lets sweep --auto-accept (and certify-verified)
 // re-run it later against the current checkout instead of re-parsing prose.
 function stampReadyVerifyMetadata(taskDb, db, taskId, verify) {
-  const row = taskDb.getTask(db, taskId);
-  if (!row) return;
-  const metadata = row.metadata && typeof row.metadata === 'object' ? { ...row.metadata } : {};
-  metadata.verify = verify;
-  // A real verify stamped at ready means the creation-time degraded flag is
-  // stale: clear it so `task show` stops warning about a missing check. A
-  // diff-only verify keeps the flag; it still cannot fail on real breakage.
-  if (verify.toLowerCase() !== 'git diff --check') {
-    delete metadata.verification_status;
-    delete metadata.verification_degraded_reason;
-  }
-  db.prepare(`
-    UPDATE tasks
-       SET metadata = ?,
-           updated_at = ?
-     WHERE id = ?
-  `).run(JSON.stringify(metadata), Date.now(), taskId);
+  taskDb.updateTaskMetadata(db, taskId, (metadata) => {
+    metadata.verify = verify;
+    // A real verify stamped at ready means the creation-time degraded flag is
+    // stale: clear it so `task show` stops warning about a missing check. A
+    // diff-only verify keeps the flag; it still cannot fail on real breakage.
+    if (verify.toLowerCase() !== 'git diff --check') {
+      delete metadata.verification_status;
+      delete metadata.verification_degraded_reason;
+    }
+  });
 }
 
 function landingVerifyFailureNote(verify, result) {
@@ -11095,13 +11039,29 @@ function renderedTaskRefSet(taskDb, rows, refRows) {
   return refs;
 }
 
-function markdownRowsForRender(taskDb, existingTodoPath, rows, refRows) {
+// A bullet the renderer wrote starts with its job's ref in bold brackets: `- **[WSX-1]** title`.
+const RENDERED_TODO_BULLET_REF = /^\s*- (?:\[[ x]\]\s+)?\*\*\[([^\]]+)\]\*\*/;
+
+// Rows in TODO.md that the database does not know. In a hand-written TODO they are rendered
+// from the markdown, as before. In a rendered TODO (it has the "Regenerated" marker) a bullet
+// the renderer wrote whose job is gone stays gone, but a bullet a person or a command added by
+// hand (no bracketed ref, like `atris business` writing `- **Onboard:** ...`) is imported into
+// the database when `db` is given, so the next render keeps it instead of dropping it. Imported
+// rows are pushed onto `rows` and `refRows`, so the caller renders them with the rest.
+function markdownRowsForRender(taskDb, existingTodoPath, rows, refRows, { db = null, workspaceRoot: wsOption = null } = {}) {
   if (!existingTodoPath || !fs.existsSync(existingTodoPath)) return [];
   const { parseTodoFile } = require('../lib/todo-fallback');
   const existingTodo = fs.readFileSync(existingTodoPath, 'utf8');
   const generatedTodo = existingTodo.includes('Regenerated from durable Atris task state');
   const parsed = parseTodoFile(existingTodoPath);
-  const ws = taskDb.workspaceRoot();
+  const ws = wsOption || taskDb.workspaceRoot();
+  const renderedBulletRefs = new Set();
+  if (generatedTodo) {
+    for (const line of existingTodo.split('\n')) {
+      const match = line.match(RENDERED_TODO_BULLET_REF);
+      if (match) renderedBulletRefs.add(normalizeRenderedTaskRef(match[1]));
+    }
+  }
   const existingRefs = renderedTaskRefSet(taskDb, rows, refRows);
   const existingSourceKeys = new Set(
     (Array.isArray(refRows) ? refRows : [])
@@ -11130,9 +11090,38 @@ function markdownRowsForRender(taskDb, existingTodoPath, rows, refRows) {
       if (
         (renderedRef && existingRefs.has(renderedRef)) ||
         (sk && existingSourceKeys.has(sk)) ||
-        existingTitles.has(normalizedTitle) ||
-        generatedTodo
+        existingTitles.has(normalizedTitle)
       ) continue;
+      if (generatedTodo) {
+        // Written by the renderer and no longer in the database: leave it out.
+        // Only open and in-progress bullets are imported: a hand-written line under Review or
+        // Completed has no history to stand on.
+        if (!db || (renderedRef && renderedBulletRefs.has(renderedRef)) || (status !== 'open' && status !== 'claimed')) continue;
+        const claimer = status === 'claimed' ? (task.claimed || null) : null;
+        const added = taskDb.addTask(db, {
+          title: task.title,
+          tag: task.tag || null,
+          workspaceRoot: ws,
+          sourceKey: sk,
+          status: status === 'claimed' && !claimer ? 'open' : status,
+          claimedBy: claimer,
+          metadata: {
+            source: 'todo_markdown_import',
+            todo_id: task.id || null,
+            todo_tags: task.tags || [],
+            ...(task.verify ? { verify: task.verify } : {}),
+          },
+        });
+        const imported = added && added.id ? taskDb.getTask(db, added.id) : null;
+        if (imported) {
+          if (Array.isArray(rows)) rows.push(imported);
+          if (Array.isArray(refRows) && refRows !== rows) refRows.push(imported);
+          existingRefs.add(normalizeRenderedTaskRef(imported.id));
+        }
+        if (sk) existingSourceKeys.add(sk);
+        existingTitles.add(normalizedTitle);
+        continue;
+      }
       out.push({
         id: `markdown:${status}:${task.id || index}:${sk ? sk.slice(0, 10) : index}`,
         title: task.title,
@@ -11204,12 +11193,12 @@ function refreshExistingTodoMarkdown(taskDb, db, workspaceRoot) {
   const preservedSections = [];
   const endgameSection = extractTodoSectionMarkdown(existingTodo, 'Endgame');
   if (endgameSection) preservedSections.push(endgameSection);
-  const markdownRows = markdownRowsForRender(taskDb, outPath, rows, refRows);
+  const markdownRows = markdownRowsForRender(taskDb, outPath, rows, refRows, { db, workspaceRoot: ws });
   const markdown = taskDb.renderTodoMarkdown([...rows, ...markdownRows], {
     refRows,
     preservedSections,
   });
-  fs.writeFileSync(outPath, markdown, 'utf8');
+  writeFileAtomic(outPath, markdown);
   return outPath;
 }
 
@@ -11225,13 +11214,43 @@ function autoRenderTodoFromDb(cwd = process.cwd()) {
     if (fs.existsSync(outPath)) return refreshExistingTodoMarkdown(taskDb, db, cwd);
     const rows = taskDb.listTasks(db, { workspaceRoot: cwd, limit: 500 });
     const refRows = taskDb.listTasks(db, { workspaceRoot: cwd });
-    fs.writeFileSync(outPath, taskDb.renderTodoMarkdown(rows, { refRows }), 'utf8');
+    writeFileAtomic(outPath, taskDb.renderTodoMarkdown(rows, { refRows }));
     return outPath;
   } catch {
     return null;
   }
 }
 
+// The task behind a TODO bullet, finished the way `atris task done` finishes one: doneTask, then the
+// projection and the rendered TODO. A rendered TODO.md is a view of the database, so marking its bullet
+// means nothing until the job itself is done. `matches(title)` says whether a job's title is the one the
+// caller named; only an open or claimed job in this workspace counts, an exact title wins over a partial
+// one, and two partial matches are a refusal, not a guess. Returns { completed, id, reason }.
+function completeTodoTaskByTitle(cwd, title, { matches, actor, proof } = {}) {
+  const taskDb = getTaskDb();
+  const db = taskDb.open();
+  const ws = taskDb.workspaceRoot(cwd);
+  const wanted = taskDb.normalizeTitle(title);
+  const candidates = taskDb.listTasks(db, { workspaceRoot: ws, limit: null })
+    .filter((row) => row.status === 'open' || row.status === 'claimed');
+  const exact = candidates.filter((row) => wanted && taskDb.normalizeTitle(row.title) === wanted);
+  const partial = typeof matches === 'function' ? candidates.filter((row) => matches(row.title)) : [];
+  const picked = exact.length === 1 ? exact : (exact.length ? [] : partial);
+  if (picked.length !== 1) return { completed: false, id: null, reason: picked.length ? 'ambiguous' : 'no_match' };
+  const id = picked[0].id;
+  const done = taskDb.doneTask(db, {
+    id,
+    status: 'done',
+    actor: actor || process.env.ATRIS_AGENT_ID || DEFAULT_OWNER,
+    action: 'done',
+    proof,
+  });
+  if (!done.updated) return { completed: false, id, reason: 'not_open_or_claimed' };
+  try { writeDefaultProjection(taskDb, db, { root: cwd }); } catch { /* the view is rebuilt on the next write */ }
+  autoRenderTodoFromDb(cwd);
+  return { completed: true, id, reason: null };
+}
+
 function cmdRender(args) {
   const out = flag(args, '--out') || path.join('atris', 'TODO.md');
   const all = hasFlag(args, '--all');
@@ -11255,12 +11274,12 @@ function cmdRender(args) {
   const preservedSections = [];
   const endgameSection = extractTodoSectionMarkdown(existingTodo, 'Endgame');
   if (endgameSection) preservedSections.push(endgameSection);
-  const markdownRows = markdownRowsForRender(taskDb, outPath, rows, refRows);
+  const markdownRows = markdownRowsForRender(taskDb, outPath, rows, refRows, workspaceRoot ? { db, workspaceRoot } : {});
   const rowsToRender = [...rows, ...markdownRows];
   const statusCounts = taskRenderStatusCounts(rowsToRender);
   const markdown = taskDb.renderTodoMarkdown(rowsToRender, { doneLimit, failedLimit, refRows, preservedSections });
   fs.mkdirSync(path.dirname(outPath), { recursive: true });
-  fs.writeFileSync(outPath, markdown, 'utf8');
+  writeFileAtomic(outPath, markdown);
   if (wantsJson(args)) {
     printJson({
       ok: true,
@@ -11839,16 +11858,7 @@ function postTaskApiAccept({ res, taskDb, db, taskId, body }) {
   if (hasExplicitNext && !nextTask.trim()) clearedFields.push('next_task');
   const parsedReward = parseAcceptReward(body.reward);
   if (!parsedReward.ok) return sendJson(res, 400, { ok: false, reason: 'invalid_reward', detail: 'reward must be a positive number' });
-  const done = taskDb.doneTask(db, {
-    id: taskId,
-    status: 'done',
-    actor: String(body.actor || DEFAULT_OWNER),
-    allowReview: true,
-    action: 'accepted',
-    proof,
-  });
-  if (!done.updated) return sendJson(res, 409, { ok: false, reason: 'not_open_claimed_or_review' });
-  const reviewed = taskDb.reviewTask(db, {
+  const done = taskDb.acceptTask(db, {
     id: taskId,
     actor: String(body.actor || DEFAULT_OWNER),
     reward: parsedReward.value,
@@ -11858,6 +11868,8 @@ function postTaskApiAccept({ res, taskDb, db, taskId, body }) {
     careerXpEligible: true,
     clearedFields,
   });
+  if (!done.updated) return sendJson(res, 409, { ok: false, reason: 'not_open_claimed_or_review' });
+  const reviewed = done.reviewed;
   const nextCreated = body.createNext ? createNextTaskIfRequested(taskDb, db, ['--create-next'], currentTask, reviewed.episode.next_task_suggestion) : null;
   const xpProjection = refreshCareerXpAfterReview(reviewed);
   const { projection, outPath } = writeDefaultProjection(taskDb, db);
@@ -12260,6 +12272,7 @@ module.exports = {
   delegateTask,
   AGENT_ENV_MARKERS,
   autoRenderTodoFromDb,
+  completeTodoTaskByTitle,
   cmdCertifyVerified,
   refreshKeptTaskList,
   keptCount,

package/commands/unknowns.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { mapNotesPath } = require('../lib/map-refs');
+const { mapNotesPath, mapNotesExcerpt } = require('../lib/map-refs');
 const { spawnSync } = require('child_process');
 const taskDb = require('../lib/task-db');
 const {
@@ -166,10 +166,14 @@ function formatTaskEvents(rows) {
   }).join('\n');
 }
 
-function gatherTerritoryContext(root, db) {
+function gatherTerritoryContext(root, db, problem = '') {
   const map = readFileBestEffort(path.join(root, 'atris', 'MAP.md'), { lines: 100 });
   const notesPath = mapNotesPath(root);
-  const notes = notesPath ? readFileBestEffort(path.join(root, notesPath), { lines: 100 }) : '';
+  // Follow the notes index to the area notes that match the problem; with no
+  // match, fall back to the top of the notes file.
+  const matched = notesPath ? mapNotesExcerpt(root, problem, READ_LIMIT) : '';
+  const notes = matched || (notesPath ? readFileBestEffort(path.join(root, notesPath), { lines: 100 }) : '');
+  const notesTitle = matched ? 'map notes lines that match the problem' : `${notesPath} first 100 lines`;
   const lessonsMd = readFileBestEffort(path.join(root, 'atris', 'lessons.md'), { maxChars: READ_LIMIT });
   const lessonsJson = readFileBestEffort(path.join(root, 'atris', 'lessons.json'), { maxChars: READ_LIMIT });
   const journals = readRecentJournals(root);
@@ -179,7 +183,7 @@ function gatherTerritoryContext(root, db) {
   return [
     section('workspace_root', root),
     section('atris/MAP.md first 100 lines', map),
-    ...(notesPath ? [section(`${notesPath} first 100 lines`, notes)] : []),
+    ...(notesPath ? [section(notesTitle, notes)] : []),
     section('atris/lessons.md', lessonsMd),
     section('atris/lessons.json', lessonsJson),
     section('last 3 daily journals', journals),
@@ -617,7 +621,7 @@ async function unknownsCommand(args = []) {
     return 1;
   }
 
-  const territoryContext = gatherTerritoryContext(root, db);
+  const territoryContext = gatherTerritoryContext(root, db, problem);
   const analysis = analyzeWithModel(root, problem, territoryContext);
   const unknowns = normalizeUnknowns(analysis);
   const questions = normalizeQuestions(analysis, problem);

package/commands/visualize.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { mapNotesPath } = require('../lib/map-refs');
+const { mapNotesExcerpt } = require('../lib/map-refs');
 const { spawnSync } = require('child_process');
 const { getLogPath } = require('../lib/journal');
 const { ensureValidCredentials } = require('../utils/auth');
@@ -195,17 +195,6 @@ function findRelevantContextFiles(cwd, prompt) {
     .slice(0, 4);
 }
 
-// The deep map is large: keep only the lines that share a word with the prompt.
-function mapNotesExcerpt(cwd, prompt, maxChars) {
-  const notesPath = mapNotesPath(cwd);
-  if (!notesPath) return '';
-  const words = promptWords(prompt);
-  if (!words.size) return '';
-  const lines = fs.readFileSync(path.join(cwd, notesPath), 'utf8').split(/\r?\n/)
-    .filter(line => [...words].some(word => line.toLowerCase().includes(word)));
-  return lines.join('\n').slice(0, maxChars);
-}
-
 function collectWorkspaceContext(prompt, cwd = process.cwd()) {
   const business = readBusinessMeta(cwd);
   const chunks = [];

package/commands/workflow.js

@@ -19,6 +19,7 @@ const {
 const { startFirstTalk } = require('../lib/context-gatherer');
 const { isNonInteractive } = require('../lib/noninteractive');
 const { loadContext } = require('../lib/state-detection');
+const { resolveClaudeRunnerModel } = require('../lib/runner-command');
 const { buildToolResultBody } = require('../lib/tool-result-encode');
 const { commitReviewLearning } = require('./learn');
 
@@ -502,7 +503,7 @@ function mapPromptSection(targetDir, cwd = process.cwd()) {
   if (!notes) return `## MAP.md\nRead this file for file:line references: ${mapRef}\n\n`;
   const notesRef = path.relative(cwd, path.join(path.dirname(targetDir), notes));
   return `## MAP.md\nRead this file to find where work lives: ${mapRef}\n\n`
-    + `## MAP-NOTES.md\nRead this file for exact file:line references: ${notesRef}\n\n`;
+    + `## MAP-NOTES.md\nRead this file for exact file:line references, or the area note it points to: ${notesRef}\n\n`;
 }
 
 async function planAtris(userInput = null) {
@@ -1741,7 +1742,7 @@ async function reviewAtris() {
   // Handoff prompt: suggest writing handoff if completions exist today
   if (fs.existsSync(logFile)) {
     const journalContent = fs.readFileSync(logFile, 'utf8');
-    const hasCompletions = /## Completed ✅[\s\S]*?- \*\*C\d+:/.test(journalContent);
+    const hasCompletions = /## Completed(?: ✅)?[^\S\n]*\n[\s\S]*?- \*\*C\d+:/.test(journalContent);
     const hasHandoff = /## Handoff[\s\S]*?\*\*Context:\*\*/.test(journalContent);
 
     if (hasCompletions && !hasHandoff) {
@@ -1834,7 +1835,7 @@ async function executeAgentSDKFast(userInput) {
     const postData = JSON.stringify({
       message: userInput,
       workspace_path: process.cwd(),
-      model: 'claude-sonnet-4-6'
+      model: resolveClaudeRunnerModel()
     });
 
     const options = {