atris 3.74.6 → 3.74.8

package/lib/idea-tick.js

@@ -186,6 +186,19 @@ function defaultRunLap(text, options) {
   return require('../commands/one-lap').runOneLap(text, options);
 }
 
+// Sealed builds get no keychain, so a Claude build with no saved login fails
+// at its first word. Saying so before the build keeps the idea's attempts.
+function defaultLoginGap(repo) {
+  try {
+    const executor = require('../commands/one-lap').readyExecutor(repo);
+    if (!executor || executor.id !== 'claude') return '';
+    if (process.env.CLAUDE_CODE_OAUTH_TOKEN || require('./engine-login').savedToken()) return '';
+    return 'no Claude login for sealed builds';
+  } catch {
+    return '';
+  }
+}
+
 // Where a stopped lap stopped: its check failed, its check passed but the
 // review did not, or it never got that far.
 function lapStage(lap) {
@@ -248,6 +261,7 @@ async function runIdeaTick({
   lockOptions = {},
   loopRepo = null,
   clock = () => Date.now(),
+  loginGap = runLap === defaultRunLap ? defaultLoginGap : () => '',
 } = {}) {
   const repo = path.resolve(root);
   const lock = acquireTickLock(repo, lockOptions);
@@ -282,6 +296,12 @@ async function runIdeaTick({
       return stop(idea, { stage: 'checks', cause: 'no fast check found', reason: `this repo has no fast check I can find; give one: atris idea retry ${idea.n} --verify "<cmd>"` });
     }
 
+    const gap = loginGap(repo);
+    if (gap) {
+      log(`idea ${idea.n} waits: ${gap}. run: atris idea login`);
+      return { status: 'needs_login', idea_id: idea.id, reason: gap };
+    }
+
     started = iso();
     current = updateIdea(repo, idea.id, { status: 'building', attempts: Number(idea.attempts || 0) + 1, started_at: started }) || idea;
     log(`building idea ${idea.n}: ${oneLine(idea.text, 80)}`);

package/lib/values.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+const PACKAGE_ROOT = path.join(__dirname, '..');
+
+// The bold-lead bullets under `## values` in atris.md, each as its name and
+// its first sentence, so the boot can show them in every new chat instead of
+// leaving them deep in a long file. A workspace made before the values
+// shipped has no such section; the package copy stands in for it.
+function extractValues(content) {
+  const lines = String(content || '').split(/\r?\n/);
+  const start = lines.findIndex((line) => /^## values\s*$/i.test(line));
+  if (start === -1) return [];
+  const values = [];
+  for (let index = start + 1; index < lines.length && !/^##\s+/.test(lines[index]); index += 1) {
+    const match = lines[index].match(/^- \*\*([^*]+?)\.\*\*\s+([^.]+)\./);
+    if (match) values.push({ name: match[1].toLowerCase(), gist: match[2][0].toLowerCase() + match[2].slice(1) });
+  }
+  return values;
+}
+
+function readValues(root) {
+  for (const file of [path.join(root, 'atris.md'), path.join(root, 'atris', 'atris.md')]) {
+    if (!fs.existsSync(file)) continue;
+    const found = extractValues(fs.readFileSync(file, 'utf8'));
+    if (found.length) return found;
+  }
+  return [];
+}
+
+function valuesForRoot(root = process.cwd()) {
+  const own = readValues(root);
+  return own.length ? own : readValues(PACKAGE_ROOT);
+}
+
+module.exports = { extractValues, valuesForRoot };

package/lib/zen-apply.js

@@ -16,6 +16,7 @@ const {
   checkZen,
   defaultBranch,
   dirtyEntries,
+  folderLinksOnly,
   dirtyFiles,
   FRESH_MINUTES,
   gitOut,
@@ -26,6 +27,7 @@ const {
   mtime,
   idleWithOnlyNotes,
   lastTouched,
+  nextSaveIn,
   sideCopyLines,
   scheduledCopies,
   untrackedFiles,
@@ -151,6 +153,19 @@ function putAwaySideCopies(root, cutoff, staleCutoff, tag, teamState) {
       busy.push(wt.path);
       continue;
     }
+    // A copy whose only changes are links to ignored folders is clean: the
+    // links go, then the copy, and they come back if git will not remove it.
+    const links = status.stdout.trim() ? folderLinksOnly(wt.path, root) : [];
+    if (links.length) {
+      const targets = links.map((rel) => [path.join(wt.path, rel), fs.readlinkSync(path.join(wt.path, rel))]);
+      for (const [at] of targets) fs.unlinkSync(at);
+      if (runGit(['worktree', 'remove', wt.path], root).status === 0) removed += 1;
+      else {
+        for (const [at, to] of targets) fs.symlinkSync(to, at);
+        busy.push(wt.path);
+      }
+      continue;
+    }
     if (status.stdout.trim()) {
       // Unsaved work nobody has touched in days goes to a branch, then away.
       // So does an idle copy holding only team notes: nothing in it is work.
@@ -529,7 +544,7 @@ function applyZen({ cwd = process.cwd(), fetch = true, freshMinutes, abandonedDa
     done.push(`saved ${plural(copies.kept.length, 'side copy', 'side copies')} untouched for ${plural(staleDays, 'day', 'days')} to zen-backup/ and put ${copies.kept.length === 1 ? 'it' : 'them'} away`);
     saved.push(...copies.kept.map((b) => `refs/heads/${b}`));
   }
-  if (copies.busy.length) left.push(...sideCopyLines(copies.busy, staleDays));
+  if (copies.busy.length) left.push(...sideCopyLines(copies.busy, staleDays, nextSaveIn(copies.busy, staleDays, now.getTime())));
   if (copies.scheduled) left.push(`${plural(copies.scheduled, 'side copy is', 'side copies are')} used by a scheduled job, so ${copies.scheduled === 1 ? 'it stays' : 'they stay'}`);
   if (copies.locked) left.push(`${plural(copies.locked, 'side copy is', 'side copies are')} locked by ${copies.locked === 1 ? 'its owner, so it stays' : 'their owners, so they stay'}`);
   if (copies.inUse) left.push(`${plural(copies.inUse, 'side copy was', 'side copies were')} used in ${window}`);

package/lib/zen.js

@@ -231,6 +231,27 @@ function lastTouched(checkout) {
   return newest;
 }
 
+// Links a side copy holds where the repo ignores a folder, like node_modules
+// pointing at another checkout's packages. A link holds no work, but git only
+// matches `node_modules/` against a real folder, so it reads as unsaved. The
+// rule is asked of the main checkout, where that path is not a link. Empty
+// when anything else in the copy changed.
+function folderLinksOnly(checkout, root) {
+  const entries = dirtyEntries(checkout);
+  const links = [];
+  for (const entry of entries) {
+    if (entry.xy !== '??') return [];
+    const rel = entry.path.replace(/\/+$/, '');
+    let link = false;
+    try {
+      link = fs.lstatSync(path.join(checkout, rel)).isSymbolicLink();
+    } catch {}
+    if (!link || runGit(['check-ignore', '-q', `${rel}/`], root).status !== 0) return [];
+    links.push(rel);
+  }
+  return links;
+}
+
 // A side copy whose only changes are team notes, untouched and not switched
 // or committed in the fresh window, holds nothing anyone is working on. Live
 // data files never count as notes, so a copy holding one is left alone.
@@ -278,14 +299,37 @@ function lastEntryTime(log) {
   }
 }
 
-// True when a checkout switched or made a commit after the cutoff.
-function headMovedSince(checkout, cutoff) {
+// When a checkout last switched or made a commit.
+function headTime(checkout) {
   const gitDir = gitOut(['rev-parse', '--git-dir'], checkout);
-  if (!gitDir) return false;
+  if (!gitDir) return 0;
   const dir = path.resolve(checkout, gitDir);
   const logged = lastEntryTime(path.join(dir, 'logs', 'HEAD'));
-  if (logged !== null) return logged > cutoff;
-  return Math.max(mtime(path.join(dir, 'logs', 'HEAD')), mtime(path.join(dir, 'HEAD'))) > cutoff;
+  if (logged !== null) return logged;
+  return Math.max(mtime(path.join(dir, 'logs', 'HEAD')), mtime(path.join(dir, 'HEAD')));
+}
+
+// True when a checkout switched or made a commit after the cutoff.
+function headMovedSince(checkout, cutoff) {
+  return headTime(checkout) > cutoff;
+}
+
+// How long until the first of these side copies has sat untouched long
+// enough for zen to save it, or null when none is waiting on the clock.
+function nextSaveIn(paths, days, now = Date.now()) {
+  let soonest = null;
+  for (const p of paths) {
+    const wait = Math.max(headTime(p), lastTouched(p)) + days * 86400000 - now;
+    if (wait > 0 && (soonest === null || wait < soonest)) soonest = wait;
+  }
+  return soonest;
+}
+
+function waitText(ms) {
+  const hours = Math.ceil(ms / 3600000);
+  if (hours < 24) return `${hours} ${hours === 1 ? 'hour' : 'hours'}`;
+  const days = Math.round(hours / 24);
+  return `${days} ${days === 1 ? 'day' : 'days'}`;
 }
 
 // True when a branch was made or moved after the cutoff. A running job makes
@@ -381,7 +425,7 @@ function checkZen({ cwd = process.cwd(), fetch = true, freshMinutes = freshMinut
     }
     const status = runGit(['status', '--porcelain'], wt.path);
     if (status.status !== 0) busy.push(wt);
-    else if (status.stdout.trim()) (idleWithOnlyNotes(wt.path, teamState, cutoff) ? notesOnly : busy).push(wt);
+    else if (status.stdout.trim() && !folderLinksOnly(wt.path, root).length) (idleWithOnlyNotes(wt.path, teamState, cutoff) ? notesOnly : busy).push(wt);
     else if (headMovedSince(wt.path, cutoff)) inUse.push(wt);
     else idle.push(wt);
   }
@@ -439,27 +483,57 @@ function checkZen({ cwd = process.cwd(), fetch = true, freshMinutes = freshMinut
   };
 }
 
-// Where the side copies are, so a line about them can be acted on: home
-// shortened to ~, at most three named.
-// Side copies left with unsaved work: one place per line so a long path
-// still fits a narrow pane, then when zen will take them over.
-function sideCopyLines(paths, days) {
+// A place a person can paste: home as ~, and the system temp folder (git
+// may report it through /private) as $TMPDIR when that variable is set, so a
+// test leftover there fits a narrow pane.
+function shortPlace(p) {
   const home = os.homedir();
+  const tmp = (process.env.TMPDIR || '').replace(/\/+$/, '');
+  if (tmp) {
+    let real = tmp;
+    try {
+      real = fs.realpathSync(tmp);
+    } catch {}
+    for (const dir of new Set([tmp, real])) {
+      if (p === dir || p.startsWith(dir + path.sep)) return `$TMPDIR${p.slice(dir.length)}`;
+    }
+  }
+  return p === home || p.startsWith(home + path.sep) ? `~${p.slice(home.length)}` : p;
+}
+
+// Side copies left with unsaved work: at most three named, one place per
+// line so a long path still fits a narrow pane, then when zen will take
+// them over and, when known, how long until the first one goes.
+function sideCopyLines(paths, days, waitMs = null) {
   const n = paths.length;
   const lines = [`${n} side ${n === 1 ? 'copy has' : 'copies have'} unsaved work, left for ${n === 1 ? 'its owner' : 'their owners'}`];
-  for (const p of paths.slice(0, 3)) {
-    lines.push(`  ${p === home || p.startsWith(home + path.sep) ? `~${p.slice(home.length)}` : p}`);
+  // Copies that share a folder (one workflow's runs, say) read as one line.
+  const folders = new Map();
+  for (const p of paths) {
+    const dir = path.dirname(p);
+    if (!folders.has(dir)) folders.set(dir, []);
+    folders.get(dir).push(p);
+  }
+  const rows = [];
+  for (const [dir, group] of folders) {
+    if (group.length >= 3) rows.push({ text: `${group.length} in ${shortPlace(dir)}/`, count: group.length });
+    else for (const p of group) rows.push({ text: shortPlace(p), count: 1 });
   }
-  if (n > 3) lines.push(`  and ${n - 3} more`);
+  for (const row of rows.slice(0, 3)) lines.push(`  ${row.text}`);
+  const rest = rows.slice(3).reduce((sum, row) => sum + row.count, 0);
+  if (rest) lines.push(`  and ${rest} more`);
   lines.push(`zen saves ${n === 1 ? 'it' : 'each one'} to zen-backup/ once nobody has touched it for ${days} ${days === 1 ? 'day' : 'days'}`);
+  if (waitMs > 0) lines.push(`${n === 1 ? 'that is' : 'the first one is'} due in ${waitText(waitMs)}`);
   return lines;
 }
 
 module.exports = {
   ABANDONED_DAYS,
   branchMovedSince,
+  folderLinksOnly,
   idleWithOnlyNotes,
   lastTouched,
+  nextSaveIn,
   untrackedFiles,
   abandonedDaysFromEnv,
   sideCopyLines,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.74.6",
+  "version": "3.74.8",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "mcpName": "io.github.atrislabs/atris",
   "main": "bin/atris.js",