atris 3.53.0 → 3.55.0

package/commands/search.js

@@ -3,13 +3,16 @@
 const fs = require('fs');
 const path = require('path');
 
-const LAYERS = [
+const MEMORY_LAYERS = [
   { key: 'features', dir: path.join('atris', 'features') },
   { key: 'team', dir: path.join('atris', 'team') },
   { key: 'wiki', dir: path.join('atris', 'wiki') },
   { key: 'logs', dir: path.join('atris', 'logs') },
 ];
 
+const SOURCE_DIRS = ['bin', 'commands', 'lib', 'utils', 'scripts'];
+const SOURCE_EXTS = new Set(['.js', '.mjs', '.cjs', '.ts', '.sh', '.md']);
+
 const STOPWORDS = new Set([
   'a', 'an', 'and', 'are', 'as', 'at', 'for', 'from', 'in', 'is', 'it',
   'of', 'on', 'or', 'the', 'to', 'where', 'who',
@@ -38,9 +41,10 @@ const SYNONYM_MAP = {
 };
 
 function showSearchHelp() {
-  console.log('Usage: atris search <keyword> [--raw]');
+  console.log('Usage: atris search <keyword> [--raw] [--memory-only]');
   console.log('Example: atris search auth');
-  console.log('  --raw  Print the full file:line dump instead of the compact answer');
+  console.log('  --raw          Print the full file:line dump instead of the compact answer');
+  console.log('  --memory-only  Search atris/features, team, wiki, logs only (skip source + MAP)');
 }
 
 function normalizeText(value) {
@@ -112,6 +116,37 @@ function listMarkdownFiles(rootDir) {
   return files;
 }
 
+function listSourceFiles(root, dirs = SOURCE_DIRS) {
+  const files = [];
+
+  function walk(dir) {
+    let entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    entries
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .forEach((entry) => {
+        if (entry.name === 'node_modules' || entry.name === '.git') return;
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+          walk(fullPath);
+          return;
+        }
+        if (!entry.isFile()) return;
+        if (SOURCE_EXTS.has(path.extname(entry.name).toLowerCase())) files.push(fullPath);
+      });
+  }
+
+  for (const rel of dirs) {
+    const abs = path.join(root, rel);
+    if (fs.existsSync(abs)) walk(abs);
+  }
+  return files;
+}
+
 function recencyMs(relativePath, stat) {
   const match = relativePath.match(/(\d{4})-(\d{2})-(\d{2})/);
   if (match) {
@@ -121,17 +156,26 @@ function recencyMs(relativePath, stat) {
   return Number(stat && stat.mtimeMs) || 0;
 }
 
-function scanLayer(root, layer, terms) {
-  const dir = path.join(root, layer.dir);
+function emptyLayerResult(key, dir) {
+  return {
+    key,
+    dir,
+    exists: false,
+    fileHits: [],
+    lineHits: [],
+  };
+}
+
+function scanFiles(root, key, dirLabel, files, terms) {
   const result = {
-    key: layer.key,
-    dir: layer.dir.split(path.sep).join('/'),
-    exists: fs.existsSync(dir),
+    key,
+    dir: dirLabel,
+    exists: files.length > 0,
     fileHits: [],
     lineHits: [],
   };
 
-  for (const filePath of listMarkdownFiles(dir)) {
+  for (const filePath of files) {
     let stat;
     let content;
     try {
@@ -149,7 +193,7 @@ function scanLayer(root, layer, terms) {
     content.split(/\r?\n/).forEach((line, index) => {
       if (!hasTerm(line, terms)) return;
       const hit = {
-        layer: layer.key,
+        layer: key,
         file: relativePath,
         line: index + 1,
         content: line.trim(),
@@ -162,7 +206,7 @@ function scanLayer(root, layer, terms) {
 
     if (pathMatched || fileLineHits.length > 0) {
       result.fileHits.push({
-        layer: layer.key,
+        layer: key,
         file: relativePath,
         pathMatched,
         lineHits: fileLineHits,
@@ -174,6 +218,26 @@ function scanLayer(root, layer, terms) {
   return result;
 }
 
+function scanLayer(root, layer, terms) {
+  const dir = path.join(root, layer.dir);
+  if (!fs.existsSync(dir)) {
+    return emptyLayerResult(layer.key, layer.dir.split(path.sep).join('/'));
+  }
+  return scanFiles(root, layer.key, layer.dir.split(path.sep).join('/'), listMarkdownFiles(dir), terms);
+}
+
+function scanMap(root, terms) {
+  const mapPath = path.join(root, 'atris', 'MAP.md');
+  if (!fs.existsSync(mapPath)) return emptyLayerResult('map', 'atris/MAP.md');
+  return scanFiles(root, 'map', 'atris/MAP.md', [mapPath], terms);
+}
+
+function scanSource(root, terms) {
+  const files = listSourceFiles(root);
+  if (!files.length) return emptyLayerResult('source', 'bin,commands,lib,utils,scripts');
+  return scanFiles(root, 'source', 'bin,commands,lib,utils,scripts', files, terms);
+}
+
 function compareByRecency(a, b) {
   return (b.recencyMs || 0) - (a.recencyMs || 0)
     || a.file.localeCompare(b.file)
@@ -188,13 +252,21 @@ function sortedLineHits(layerResult) {
   return [...(layerResult.lineHits || [])].sort(compareByRecency);
 }
 
-function collectSearchResults(root, query) {
+function layerKeys(results) {
+  return Object.keys(results.layers || {});
+}
+
+function collectSearchResults(root, query, options = {}) {
   const terms = queryTerms(query);
   const layers = {};
-  for (const layer of LAYERS) {
+  for (const layer of MEMORY_LAYERS) {
     layers[layer.key] = scanLayer(root, layer, terms);
   }
-  return { query, terms, layers };
+  if (!options.memoryOnly) {
+    layers.map = scanMap(root, terms);
+    layers.source = scanSource(root, terms);
+  }
+  return { query, terms, layers, memoryOnly: Boolean(options.memoryOnly) };
 }
 
 function featurePath(file) {
@@ -216,12 +288,12 @@ function ownerPath(root, file) {
 }
 
 function selectedFeature(results) {
-  const hit = sortedFileHits(results.layers.features)[0];
+  const hit = sortedFileHits(results.layers.features || emptyLayerResult('features', 'atris/features'))[0];
   return hit ? featurePath(hit.file) : 'none';
 }
 
 function selectedOwner(root, results) {
-  for (const hit of sortedFileHits(results.layers.team)) {
+  for (const hit of sortedFileHits(results.layers.team || emptyLayerResult('team', 'atris/team'))) {
     const member = ownerPath(root, hit.file);
     if (member) return member;
   }
@@ -229,10 +301,24 @@ function selectedOwner(root, results) {
 }
 
 function selectedWiki(results) {
-  const hit = sortedFileHits(results.layers.wiki)[0];
+  const hit = sortedFileHits(results.layers.wiki || emptyLayerResult('wiki', 'atris/wiki'))[0];
   return hit ? hit.file : 'gap - not indexed yet';
 }
 
+function selectedMap(results) {
+  if (!results.layers.map) return null;
+  const hit = sortedLineHits(results.layers.map)[0] || sortedFileHits(results.layers.map)[0];
+  if (!hit) return 'none';
+  return hit.line ? `${hit.file}:${hit.line}` : hit.file;
+}
+
+function selectedSource(results) {
+  if (!results.layers.source) return null;
+  const hit = sortedLineHits(results.layers.source)[0] || sortedFileHits(results.layers.source)[0];
+  if (!hit) return 'none';
+  return hit.line ? `${hit.file}:${hit.line}` : hit.file;
+}
+
 function hitCount(layerResult) {
   return (layerResult.fileHits || []).reduce((total, fileHit) => {
     if (fileHit.lineHits.length > 0) return total + fileHit.lineHits.length;
@@ -241,7 +327,7 @@ function hitCount(layerResult) {
 }
 
 function totalHitCount(results) {
-  return LAYERS.reduce((total, layer) => total + hitCount(results.layers[layer.key]), 0);
+  return layerKeys(results).reduce((total, key) => total + hitCount(results.layers[key]), 0);
 }
 
 function truncateLine(value, max = 140) {
@@ -256,8 +342,10 @@ function renderCompactSearch(root, results) {
     `Owner: ${selectedOwner(root, results)}`,
     `Wiki: ${selectedWiki(results)}`,
   ];
+  if (results.layers.map) lines.push(`Map: ${selectedMap(results)}`);
+  if (results.layers.source) lines.push(`Source: ${selectedSource(results)}`);
 
-  const journalHits = sortedLineHits(results.layers.logs);
+  const journalHits = sortedLineHits(results.layers.logs || emptyLayerResult('logs', 'atris/logs'));
   if (totalHitCount(results) === 0) {
     lines.push('No matches found.');
   }
@@ -281,13 +369,13 @@ function renderCompactSearch(root, results) {
 
 function rawHits(results) {
   const hits = [];
-  for (const layer of LAYERS) {
-    for (const fileHit of sortedFileHits(results.layers[layer.key])) {
+  for (const key of layerKeys(results)) {
+    for (const fileHit of sortedFileHits(results.layers[key])) {
       if (fileHit.lineHits.length > 0) {
         hits.push(...fileHit.lineHits.sort((a, b) => (a.line || 0) - (b.line || 0)));
       } else if (fileHit.pathMatched) {
         hits.push({
-          layer: layer.key,
+          layer: key,
           file: fileHit.file,
           line: 1,
           content: `(path match) ${fileHit.file}`,
@@ -301,9 +389,12 @@ function rawHits(results) {
 }
 
 function renderRawSearch(results) {
+  const scope = results.memoryOnly
+    ? 'atris/features, atris/team, atris/wiki, atris/logs'
+    : 'source, atris/MAP.md, atris/features, atris/team, atris/wiki, atris/logs';
   const hits = rawHits(results);
   const lines = [
-    `Searching for "${results.query}" in atris/features, atris/team, atris/wiki, atris/logs...`,
+    `Searching for "${results.query}" in ${scope}...`,
     '',
   ];
 
@@ -326,12 +417,16 @@ function parseSearchArgs(args) {
   const argv = Array.isArray(args) ? args : [];
   const helpIndex = argv.findIndex(arg => arg === '--help' || arg === '-h');
   const raw = argv.includes('--raw');
-  const query = argv.filter(arg => arg !== '--raw' && arg !== '--help' && arg !== '-h').join(' ').trim();
-  return { helpIndex, raw, query, argCount: argv.length };
+  const memoryOnly = argv.includes('--memory-only');
+  const query = argv
+    .filter(arg => arg !== '--raw' && arg !== '--help' && arg !== '-h' && arg !== '--memory-only')
+    .join(' ')
+    .trim();
+  return { helpIndex, raw, memoryOnly, query, argCount: argv.length };
 }
 
 function searchCommand(args = [], options = {}) {
-  const { helpIndex, raw, query, argCount } = parseSearchArgs(args);
+  const { helpIndex, raw, memoryOnly, query, argCount } = parseSearchArgs(args);
 
   if (helpIndex >= 0) {
     showSearchHelp();
@@ -344,9 +439,8 @@ function searchCommand(args = [], options = {}) {
   }
 
   const root = options.root || process.cwd();
-  const results = collectSearchResults(root, query);
+  const results = collectSearchResults(root, query, { memoryOnly });
   if (totalHitCount(results) === 0 && !fs.existsSync(path.join(root, 'atris'))) {
-    // Outside a workspace the empty scan rows are noise; lead with the way in.
     console.log('No atris folder here. Run atris init to set one up.');
     return 0;
   }
@@ -357,4 +451,5 @@ function searchCommand(args = [], options = {}) {
 module.exports = {
   searchCommand,
   showSearchHelp,
+  collectSearchResults,
 };

package/commands/sign.js

@@ -74,11 +74,11 @@ function signCommand(sub) {
     console.log(installed
       ? `\n  ✓ atris co-author is on: ${rel(hookPath)}\n    every commit gets: ${TRAILER}\n`
       : `\n  atris co-author is off — run 'atris sign' to turn it on\n`);
-    return installed ? 0 : 1;
+    return 0;
   }
   if (sub && sub !== 'on' && sub !== 'install') {
     console.log(`\n  atris sign — co-author trailer on every commit\n\n  atris sign          install the prepare-commit-msg hook\n  atris sign off      remove it\n  atris sign status   check whether it's installed\n\n  While installed, any commit in a repo with an atris/ folder gets:\n    ${TRAILER}\n`);
-    return 0;
+    return 2;
   }
   const { hookPath, already } = installSignHook();
   console.log(already

package/commands/signup.js

@@ -13,6 +13,7 @@
 const crypto = require('crypto');
 const { apiRequestJson, getApiBaseUrl } = require('../utils/api');
 const { saveCredentials } = require('../utils/auth');
+const { argsWantHelp, isHelpToken } = require('../lib/noninteractive');
 
 // Mirror the server rule exactly (^[a-z0-9]{3,30}$) so we fail fast and friendly
 // before spending a network round trip / a rate-limit slot.
@@ -40,16 +41,24 @@ function solvePow(handle) {
 }
 
 function parseHandle(args = []) {
-  const positional = args.find((a) => a && !a.startsWith('-'));
+  const positional = args.find((a) => a && !a.startsWith('-') && !isHelpToken(a));
   return (positional || '').trim().toLowerCase();
 }
 
+function printSignupUsage() {
+  console.error('Usage: atris signup <handle>');
+  console.error('  handle: 3–30 characters, lowercase letters and digits only.');
+}
+
 async function signupCommand(args = []) {
+  if (argsWantHelp(args)) {
+    printSignupUsage();
+    return 2;
+  }
   const handle = parseHandle(args);
 
   if (!handle) {
-    console.error('Usage: atris signup <handle>');
-    console.error('  handle: 3–30 characters, lowercase letters and digits only.');
+    printSignupUsage();
     return 1;
   }
   if (!HANDLE_RE.test(handle)) {

package/commands/site-deploy.js

@@ -51,13 +51,14 @@ function printHelp() {
   console.log(`
   atris site deploy: publish a web folder at a free atris.ai subdomain
 
-    atris site deploy <dir> --name <slug> [--spa] [--dry-run]
-    atris site deploy <dir> --fullstack --name <slug> [--dry-run]
-    atris site deploy dist --name my-site --api-base https://api.atris.ai
+    atris site deploy <dir> --name <slug> [--spa] [--dry-run] --yes
+    atris site deploy <dir> --fullstack --name <slug> [--dry-run] --yes
+    atris site deploy dist --name my-site --api-base https://api.atris.ai --yes
 
   names use lowercase letters, digits, and hyphens. files are capped at 2 mb
   each and 200 total. --spa enables single-page app routing. --fullstack
-  deploys a node server with a package.json start script.
+  deploys a node server with a package.json start script. --yes is required
+  to publish.
 `);
 }
 
@@ -70,6 +71,7 @@ function parseArgs(argv) {
     fullstack: false,
     dryRun: false,
     help: false,
+    yes: false,
   };
 
   for (let i = 0; i < argv.length; i += 1) {
@@ -82,6 +84,8 @@ function parseArgs(argv) {
       options.fullstack = true;
     } else if (arg === '--dry-run') {
       options.dryRun = true;
+    } else if (arg === '--yes' || arg === '-y') {
+      options.yes = true;
     } else if (arg === '--name' || arg === '--api-base') {
       const value = argv[i + 1];
       if (!value || value.startsWith('-')) throw new Error(`${arg} needs a value`);
@@ -829,6 +833,10 @@ async function run(argv, deps = {}) {
       printFullstackPlan(options.name, packagePlan, log);
       return 0;
     }
+    if (!options.yes) {
+      errorLog('  Pass --yes to publish.');
+      return 2;
+    }
     return runFullstack(root, { ...options, apiBase }, packagePlan, deps);
   }
 
@@ -850,6 +858,11 @@ async function run(argv, deps = {}) {
     return 0;
   }
 
+  if (!options.yes) {
+    errorLog('  Pass --yes to publish.');
+    return 2;
+  }
+
   const readCredentials = deps.loadCredentials || loadCredentials;
   const credentials = readCredentials();
   if (!credentials || !credentials.token) {

package/commands/site.js

@@ -20,8 +20,8 @@ async function run(argv) {
 
     atris site <dir|doc.md> [--out dist] [--theme atris|terminal|paper] [--title T]
     atris site atris/wiki --title "Atris Wiki" --serve
-    atris site deploy <dir> --name <slug> [--spa] [--dry-run]
-    atris site deploy <dir> --fullstack --name <slug> [--dry-run]
+    atris site deploy <dir> --name <slug> [--spa] [--dry-run] --yes
+    atris site deploy <dir> --fullstack --name <slug> [--dry-run] --yes
 
   Each .md becomes a page; an index links them all. Same anti-slop design system,
   semantic data-atris-block sections, ready for the web app. --serve previews it.