atris 3.82.14 → 3.82.15

package/commands/business.js

@@ -52,38 +52,38 @@ const {
   findAtrisDir,
 } = require('../lib/business-core');
 
-async function findExistingBusinessBySlug(slug, token) {
+async function findExistingBusinessBySlug(slug, token, { api = apiRequestJson, loadLocal = loadBusinesses } = {}) {
   if (!slug) return null;
 
-  // Local cache first, no network round-trip needed.
-  const local = loadBusinesses();
-  if (local[slug]) {
-    return { id: local[slug].business_id, name: local[slug].name, slug, source: 'local' };
-  }
-  for (const v of Object.values(local)) {
-    if (businessMatchesSlug(v, slug)) {
-      return { id: v.business_id, name: v.name, slug, source: 'local' };
-    }
-  }
+  const local = loadLocal();
+  const localMatch = local[slug]
+    ? { id: local[slug].business_id, name: local[slug].name, slug, source: 'local' }
+    : (() => {
+      const v = Object.values(local).find((b) => businessMatchesSlug(b, slug));
+      return v ? { id: v.business_id, name: v.name, slug, source: 'local' } : null;
+    })();
 
-  if (!token) return null;
+  if (!token) return localMatch;
 
-  // Cloud lookup, covers businesses the user is a member of but hasn't added.
-  const direct = await apiRequestJson(`/business/by-slug/${encodeURIComponent(slug)}`, {
-    method: 'GET',
-    token,
-  });
+  // The cloud is the truth. The Mac's list can hold a business that was
+  // deleted, and trusting it refused to recreate one that no longer existed.
+  const direct = await api(`/business/by-slug/${encodeURIComponent(slug)}`, { method: 'GET', token });
   if (direct.ok && direct.data && direct.data.id) {
     return { id: direct.data.id, name: direct.data.name, slug: direct.data.slug || slug, source: 'cloud' };
   }
 
-  const list = await apiRequestJson('/business/', { method: 'GET', token });
+  const list = await api('/business/', { method: 'GET', token });
   if (list.ok && Array.isArray(list.data)) {
     const match = list.data.find(b => businessMatchesSlug(b, slug));
     if (match) return { id: match.id, name: match.name, slug: match.slug, source: 'cloud' };
+    if (localMatch) {
+      console.warn(`  Note: this Mac still lists "${slug}", but the cloud has no such business. Run: atris business doctor --fix`);
+    }
+    return null;
   }
 
-  return null;
+  // Cloud unreachable: fall back to the Mac's list rather than risk a duplicate.
+  return localMatch;
 }
 
 async function addBusiness(slug) {
@@ -1665,6 +1665,7 @@ async function businessCommand(subcommand, ...args) {
 }
 
 module.exports = {
+  findExistingBusinessBySlug,
   businessCommand,
   businessWorkspaceBase,
   loadBusinesses,

package/commands/memory-live.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// atris memory show, search, read, ls, remember, write, rm, usage, log, lesson
+// atris memory show, search, ask, read, ls, remember, write, rm, usage, log, lesson
 // and agents: the person's Atris memory from any terminal, so any agent can
 // read it, search it and save to it. One request per command. The login and
 // network modules load only when a command needs the server.
@@ -13,6 +13,7 @@ const { NOT_LOGGED_IN, oneLine, tokenFrom } = require('../lib/developer-api');
 const MAX_WRITE_BYTES = 1000000;
 const STDIN_WAIT_MS = 5000;
 const REMEMBER_MAX_CHARS = 1000;
+const ASK_MAX_CHARS = 500;
 const REMEMBER_FILES = ['journal', 'now', 'learning'];
 const LEARNING_SECTIONS = ['want', 'understand', 'shaky'];
 
@@ -138,6 +139,20 @@ const COMMANDS = {
     },
   },
 
+  ask: {
+    check(ctx) {
+      const question = ctx.words.join(' ').replace(/\s+/g, ' ').trim();
+      if (!question) throw new UsageError('ask a question, like atris memory ask "where does Sam work?"');
+      if (question.length > ASK_MAX_CHARS) throw new UsageError('keep the question under 500 characters');
+      return { question, folder: ctx.flags['--in'] || '' };
+    },
+    async run(ctx, { question, folder }) {
+      // The server reads for up to 75 seconds; asking twice would count twice.
+      const data = await ctx.call(`/memory/ask?q=${enc(question)}${folder ? `&folder=${enc(folder)}` : ''}`, { timeoutMs: 90000, retries: 0 });
+      return { data, lines: live.askLines(data) };
+    },
+  },
+
   read: {
     check(ctx) {
       const rel = onePath(ctx, 'file to read');

package/commands/push.js

@@ -9,6 +9,17 @@ const { normalizeWikiOnlyPrefix } = require('../lib/wiki');
 const { emitSyncEvent, startTimer } = require('../lib/sync-telemetry');
 const { assertSafeWorkspaceRoot } = require('../lib/workspace-safety');
 
+// The server's own words for a refused request. It used to be dropped, so a
+// refusal for any reason read as "you can only push to your team/ folder".
+function refusalText(result) {
+  if (!result) return '';
+  const raw = result.errorMessage || result.error || (result.data && result.data.detail) || '';
+  if (!raw) return '';
+  if (typeof raw === 'string') return raw === 'Request failed' ? '' : raw;
+  if (typeof raw === 'object' && typeof raw.message === 'string') return raw.message;
+  try { return JSON.stringify(raw); } catch { return String(raw); }
+}
+
 function resolvePushSourceDir({ slug, argv = process.argv, cwd = process.cwd() }) {
   const fromIdx = argv.indexOf('--from');
   if (fromIdx !== -1 && argv[fromIdx + 1]) {
@@ -858,13 +869,15 @@ async function pushAtris() {
               pushed = landedPaths.size;
               break;
             } else {
-              console.error(`\n  Push failed: ${retry.errorMessage || retry.error || retry.status}`);
+              console.error(`\n  Push failed: ${refusalText(retry) || retry.status}`);
+              if (refusalText(result)) console.error(`  The first refusal said: ${refusalText(result)}`);
               await emit('access_denied', { error_detail: `403 retry failed: ${retry.status}` });
               process.exit(1);
             }
           } else {
-            console.error('\n  Access denied: you can only push to your team/ folder.');
-            await emit('access_denied');
+            const reason = refusalText(result);
+            console.error(`\n  Access denied: ${reason || 'the server refused this push and gave no reason.'}`);
+            await emit('access_denied', reason ? { error_detail: reason } : undefined);
             process.exit(1);
           }
         } else if (result.status === 409) {
@@ -1052,6 +1065,7 @@ async function pushAtris() {
 }
 
 module.exports = {
+  refusalText,
   pushAtris,
   buildPushChangePlan,
   buildPushUploadBatches,

package/lib/memory-live.js

@@ -9,7 +9,7 @@ const fs = require('fs');
 const path = require('path');
 
 const LIVE_COMMANDS = new Set([
-  'show', 'search', 'read', 'ls', 'remember', 'write', 'rm', 'usage', 'log', 'lesson', 'agents', 'setup',
+  'show', 'search', 'ask', 'read', 'ls', 'remember', 'write', 'rm', 'usage', 'log', 'lesson', 'agents', 'setup',
 ]);
 
 function isLiveCommand(word) {
@@ -19,10 +19,11 @@ function isLiveCommand(word) {
 // One line per command, shown together by `atris memory` and one at a time by
 // `atris memory <command> --help`.
 const COLUMN = 38;
-const row = (form, ...what) => [`  ${form}`.padEnd(COLUMN) + what[0], ...what.slice(1).map((more) => ' '.repeat(COLUMN) + more)].join('\n');
+const row = (form, ...what) => [`  ${form} `.padEnd(COLUMN) + what[0], ...what.slice(1).map((more) => ' '.repeat(COLUMN) + more)].join('\n');
 const USAGE_LINES = {
   show: row('show', 'who they are and what matters now; read it before helping'),
   search: row('search "rent|lease" [--in folder]', 'lines with any of the words, split by |'),
+  ask: row('ask "a question" [--in folder]', 'answered from their memory, with the lines it rests on'),
   read: row('read <path> [--from N] [--lines N]', 'numbered lines of one file; --raw prints it as stored'),
   ls: row('ls [folder]', 'what is in a folder; MAP.md says what is where'),
   remember: row('remember "one short line"', 'a lasting fact or preference about the person, when they',
@@ -43,6 +44,7 @@ const LIVE_HELP = [
   'read',
   USAGE_LINES.show,
   USAGE_LINES.search,
+  USAGE_LINES.ask,
   USAGE_LINES.read,
   USAGE_LINES.ls,
   '',
@@ -62,6 +64,7 @@ const LIVE_HELP = [
 // Flags that take a value, per command. --json, --raw and --help take none.
 const VALUE_FLAGS = {
   search: ['--in'],
+  ask: ['--in'],
   read: ['--from', '--lines'],
   ls: [],
   show: [],
@@ -205,6 +208,26 @@ function searchLines(query, data) {
   return lines;
 }
 
+// The answer first, then each line it rests on, then how sure it is. With no
+// answer (the model was busy) the search hits it started from are shown.
+function askLines(data) {
+  const sources = (data && data.sources) || [];
+  const cite = sources.map((s) => `  ${s.path}:${s.n}: ${s.text}`);
+  if (data && data.answer && data.found) {
+    return [String(data.answer), ...(cite.length ? ['', 'From:', ...cite] : [])];
+  }
+  if (data && data.answer) {
+    const lines = [String(data.answer)];
+    if (cite.length) lines.push('', 'Closest lines:', ...cite);
+    lines.push('', 'Not found for certain. Search it yourself: atris memory search "word|other word"');
+    return lines;
+  }
+  const hits = (data && data.search && data.search.hits) || [];
+  const lines = [String((data && data.note) || 'No answer right now.')];
+  if (hits.length) lines.push('', 'Lines that may hold it:', ...hits.slice(0, 8).map((h) => `  ${h.path}:${h.n}: ${h.text}`));
+  return lines;
+}
+
 function readLines(data) {
   const page = (data && data.lines) || [];
   const total = Number(data && data.total) || 0;
@@ -244,7 +267,7 @@ function rulesBlock(agent) {
     '',
     'This person keeps one memory in Atris that every app and agent shares. Use it.',
     '- Start each task with `atris memory show`: who they are and what matters now.',
-    '- Before you ask them anything they may have said before, search: `atris memory search "word|other word"`.',
+    '- Before you ask them anything they may have said before, search: `atris memory search "word|other word"`, or ask in plain words: `atris memory ask "..."`.',
     '- Open what you find with `atris memory read <path>`. `atris memory ls` shows the folder.',
     '- When they say remember, note, save or don\'t forget, save one short line: `atris memory remember "..."`.',
     '- Save only lasting facts about them, never logs or your own work. Never rewrite their about.md.',
@@ -338,6 +361,7 @@ module.exports = {
   END,
   LIVE_HELP,
   USAGE_LINES,
+  askLines,
   isLiveCommand,
   lsLines,
   mcpLines,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.82.14",
+  "version": "3.82.15",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof. project memory your coding agents share across sessions.",
   "mcpName": "io.github.atrislabs/atris",
   "main": "bin/atris.js",