atris 3.15.57 → 3.16.0

package/lib/task-proof.js

@@ -0,0 +1,43 @@
+'use strict';
+
+const GENERIC_COMPLETION_PROOF_RE = /^(?:done|done now|complete|completed|finished|fixed|handled|ship|shipped|ok|okay|yes|yep|looks good|looks good to me|all set|should be good|works now|approved|approve|lgtm|failed)$/i;
+
+const COMMAND_PROOF_RE = /\b(?:npm\s+run|npm\s+test|node\s+--test|node\s+scripts\/|pnpm\b|yarn\b|npx\b|pytest\b|python\s+-m|tsc\b|vite\s+build|git\s+diff\s+--check|curl\b|atris\s+task|\.\/ax\b|ax\s+--|test\s+-s)\b/i;
+const FILE_PROOF_RE = /(?:^|[\s'"`])(?:\.{0,2}\/|~\/|\/Users\/|src\/|scripts\/|atris\/|backend\/|public\/|resources\/|package[.]json|main[.]js|preload[.]js|AGENTXP_PROOF[.]md)[^\s'"`,;)]*/i;
+const PATH_ONLY_PROOF_RE = /(?:^|[\s'"`])(?:\.{0,2}\/|~\/|\/Users\/|\/private\/|\/var\/|atris\/runs\/|\.atris\/state\/)[^\s'"`,;)]+(?:[.](?:json|jsonl|md|log|txt|png|jpg|jpeg|pdf))?/i;
+const RECEIPT_OR_ARTIFACT_RE = /\b(?:receipt|artifact|screenshot|log|trace|path=|file=|bytes=|model=|opened=|https?:\/\/)\b/i;
+const RESULT_PAIR_RE = /\b(?:typecheck|build|smoke|test|pytest|verifier|validation|validated|verified|render|diff|sync|lineage|projection)\b.{0,80}\b(?:pass|passed|failed|green|ok|exit\s*0|reviewed)\b|\b(?:pass|passed|failed|green|ok|exit\s*0|reviewed)\b.{0,80}\b(?:typecheck|build|smoke|test|pytest|verifier|validation|validated|verified|render|diff|sync|lineage|projection)\b/i;
+const HUMAN_PROOF_RE = /\b(?:team human approved|human approved|human approval|approved by|accepted by|reviewed by|customer replied|customer approved|customer accepted|replied)\b/i;
+const FILE_ACTION_RE = /\b(?:changed|updated|edited|created|deleted|saved|wrote|patched|reviewed|verified|validated|opened|read)\b/i;
+
+function compactWhitespace(text) {
+  return String(text || '').replace(/\s+/g, ' ').trim();
+}
+
+function taskProofState(proof) {
+  const text = compactWhitespace(proof);
+  if (!text) return { ok: false, reason: 'proof required' };
+  if (GENERIC_COMPLETION_PROOF_RE.test(text)) {
+    return { ok: false, reason: 'proof must name what was verified, changed, approved, or produced' };
+  }
+  if (COMMAND_PROOF_RE.test(text)) return { ok: true, reason: 'proof names a command' };
+  if (HUMAN_PROOF_RE.test(text)) return { ok: true, reason: 'proof names human/customer approval' };
+  if (RESULT_PAIR_RE.test(text)) return { ok: true, reason: 'proof names a verifier result' };
+  if (PATH_ONLY_PROOF_RE.test(text)) return { ok: true, reason: 'proof names a receipt or artifact path' };
+  if (RECEIPT_OR_ARTIFACT_RE.test(text) && (FILE_PROOF_RE.test(text) || RESULT_PAIR_RE.test(text))) {
+    return { ok: true, reason: 'proof names a receipt or artifact' };
+  }
+  if (FILE_PROOF_RE.test(text) && FILE_ACTION_RE.test(text) && RESULT_PAIR_RE.test(text)) {
+    return { ok: true, reason: 'proof names changed files and validation' };
+  }
+  return { ok: false, reason: 'proof needs concrete evidence: command, verifier result, receipt/artifact path, changed file plus validation, or explicit human/customer approval' };
+}
+
+function taskProofLooksMeaningful(proof) {
+  return taskProofState(proof).ok;
+}
+
+module.exports = {
+  taskProofLooksMeaningful,
+  taskProofState,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.15.57",
+  "version": "3.16.0",
   "main": "bin/atris.js",
   "bin": {
     "atris": "bin/atris.js",

package/utils/auth.js

@@ -324,7 +324,15 @@ function saveCredentials(token, refreshToken, email, userId, provider) {
 }
 
 function loadCredentials() {
-  // Priority: ATRIS_PROFILE env var → per-terminal session file → global credentials.json
+  // Priority: ATRIS_TOKEN env var → ATRIS_PROFILE env var → per-terminal session file → global credentials.json
+
+  // 0. Raw token injection. Headless boxes (cloud business computers) have no
+  //    browser for `atris login`; the runner injects a scoped token as env
+  //    instead, so no credentials file ever lands on disk.
+  const envToken = process.env.ATRIS_TOKEN;
+  if (envToken && envToken.trim()) {
+    return { token: envToken.trim(), provider: null, source: 'env' };
+  }
 
   // 1. Explicit env var override
   const profileOverride = process.env.ATRIS_PROFILE;
@@ -481,9 +489,10 @@ async function ensureValidCredentials(apiRequestJson, options = {}) {
     const updatedUserId = user?.id || credentials.user_id;
 
     if (
-      updatedEmail !== credentials.email ||
-      updatedProvider !== credentials.provider ||
-      updatedUserId !== credentials.user_id
+      credentials.source !== 'env' &&
+      (updatedEmail !== credentials.email ||
+        updatedProvider !== credentials.provider ||
+        updatedUserId !== credentials.user_id)
     ) {
       saveCredentials(
         credentials.token,

package/commands/research.js

@@ -1,52 +0,0 @@
-const { initResearchWorkspace } = require('./business');
-
-async function researchQuickstart() {
-  console.log(`
-  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-  Start a Research Lab in 3 Commands
-  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  1. Create:
-     atris research init "Frontier Lab"
-
-  2. Open the local workspace:
-     cd ~/arena/atris-business/frontier-lab
-
-  3. Push local state to cloud:
-     atris align --fix
-
-  The research template starts with:
-     hypotheses + experiment lanes
-     eval-first reward policy
-     literature + findings workflow
-  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-`);
-}
-
-async function researchCommand(subcommand, ...args) {
-  switch (subcommand) {
-    case 'init':
-    case 'workspace':
-    case 'create':
-      await initResearchWorkspace(args[0], ...args.slice(1));
-      break;
-    case 'quickstart':
-    case 'start':
-    case 'guide':
-      await researchQuickstart();
-      break;
-    default:
-      console.log('Usage: atris research <command> [args]');
-      console.log('');
-      console.log('  quickstart           ← Start here! 3-command guide');
-      console.log('');
-      console.log('  init <name>          Create a research lab workspace (cloud + local)');
-      console.log('  workspace <name>     Alias for init');
-      console.log('  create <name>        Alias for init');
-  }
-}
-
-module.exports = {
-  researchCommand,
-  researchQuickstart,
-};

package/lib/section-merge.js

@@ -1,196 +0,0 @@
-/**
- * Section-level three-way merge for structured markdown files.
- *
- * Parses markdown into sections (split on ## headers + YAML frontmatter).
- * Merges non-conflicting section changes. Flags same-section conflicts.
- *
- * This is what makes us better than git for context files.
- * Git merges by line. We merge by section.
- */
-
-/**
- * Parse a markdown document into sections.
- * Returns: { __frontmatter__: string, __header__: string, sections: [{name, content}] }
- */
-function parseSections(content) {
-  if (!content) return { frontmatter: '', header: '', sections: [] };
-
-  const lines = content.split('\n');
-  let frontmatter = '';
-  let header = '';
-  const sections = [];
-  let current = null;
-  let inFrontmatter = false;
-  let frontmatterDone = false;
-  let headerLines = [];
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-
-    // YAML frontmatter
-    if (i === 0 && line.trim() === '---') {
-      inFrontmatter = true;
-      headerLines.push(line);
-      continue;
-    }
-    if (inFrontmatter) {
-      headerLines.push(line);
-      if (line.trim() === '---') {
-        inFrontmatter = false;
-        frontmatterDone = true;
-        frontmatter = headerLines.join('\n');
-        headerLines = [];
-      }
-      continue;
-    }
-
-    // Section headers
-    if (line.startsWith('## ')) {
-      // Save previous section or header
-      if (current) {
-        sections.push(current);
-      } else if (headerLines.length > 0) {
-        header = headerLines.join('\n');
-      }
-      current = { name: line.substring(3).trim(), content: line };
-      continue;
-    }
-
-    // Content belongs to current section or header
-    if (current) {
-      current.content += '\n' + line;
-    } else {
-      headerLines.push(line);
-    }
-  }
-
-  // Save last section or header
-  if (current) {
-    sections.push(current);
-  } else if (headerLines.length > 0 && !header) {
-    header = headerLines.join('\n');
-  }
-
-  return { frontmatter, header, sections };
-}
-
-/**
- * Reconstruct a markdown document from parsed sections.
- */
-function reconstructDocument(parsed) {
-  const parts = [];
-  if (parsed.frontmatter) parts.push(parsed.frontmatter);
-  if (parsed.header) parts.push(parsed.header);
-  for (const section of parsed.sections) {
-    parts.push(section.content);
-  }
-  return parts.join('\n');
-}
-
-/**
- * Three-way section merge.
- *
- * @param {string} base - Common ancestor content
- * @param {string} local - Your version
- * @param {string} remote - Their version
- * @returns {{ merged: string|null, conflicts: [{section, local, remote}] }}
- *
- * If merged is non-null, the merge succeeded (conflicts array is empty).
- * If merged is null, there are conflicts that need manual resolution.
- */
-function sectionMerge(base, local, remote) {
-  const baseParsed = parseSections(base);
-  const localParsed = parseSections(local);
-  const remoteParsed = parseSections(remote);
-
-  const conflicts = [];
-
-  // Merge frontmatter (field-by-field if both changed, otherwise take the changed one)
-  let mergedFrontmatter = baseParsed.frontmatter;
-  if (localParsed.frontmatter !== baseParsed.frontmatter && remoteParsed.frontmatter === baseParsed.frontmatter) {
-    mergedFrontmatter = localParsed.frontmatter;
-  } else if (remoteParsed.frontmatter !== baseParsed.frontmatter && localParsed.frontmatter === baseParsed.frontmatter) {
-    mergedFrontmatter = remoteParsed.frontmatter;
-  } else if (localParsed.frontmatter !== remoteParsed.frontmatter && localParsed.frontmatter !== baseParsed.frontmatter) {
-    conflicts.push({ section: 'frontmatter', local: localParsed.frontmatter, remote: remoteParsed.frontmatter });
-  }
-
-  // Merge header
-  let mergedHeader = baseParsed.header;
-  if (localParsed.header !== baseParsed.header && remoteParsed.header === baseParsed.header) {
-    mergedHeader = localParsed.header;
-  } else if (remoteParsed.header !== baseParsed.header && localParsed.header === baseParsed.header) {
-    mergedHeader = remoteParsed.header;
-  } else if (localParsed.header !== remoteParsed.header && localParsed.header !== baseParsed.header) {
-    conflicts.push({ section: 'header', local: localParsed.header, remote: remoteParsed.header });
-  }
-
-  // Build section maps
-  const baseMap = {};
-  for (const s of baseParsed.sections) baseMap[s.name] = s.content;
-  const localMap = {};
-  for (const s of localParsed.sections) localMap[s.name] = s.content;
-  const remoteMap = {};
-  for (const s of remoteParsed.sections) remoteMap[s.name] = s.content;
-
-  // Get all section names preserving order (base order, then new sections)
-  const allNames = [];
-  const seen = new Set();
-  for (const s of baseParsed.sections) { allNames.push(s.name); seen.add(s.name); }
-  for (const s of localParsed.sections) { if (!seen.has(s.name)) { allNames.push(s.name); seen.add(s.name); } }
-  for (const s of remoteParsed.sections) { if (!seen.has(s.name)) { allNames.push(s.name); seen.add(s.name); } }
-
-  // Merge each section
-  const mergedSections = [];
-  for (const name of allNames) {
-    const b = baseMap[name] || null;
-    const l = localMap[name] || null;
-    const r = remoteMap[name] || null;
-
-    if (l === r) {
-      // Both same — take either (or null = both deleted)
-      if (l !== null) mergedSections.push({ name, content: l });
-      continue;
-    }
-
-    if (b === null) {
-      // New section — exists in one or both
-      if (l && !r) { mergedSections.push({ name, content: l }); continue; }
-      if (r && !l) { mergedSections.push({ name, content: r }); continue; }
-      // Both added same-named section with different content
-      conflicts.push({ section: name, local: l, remote: r });
-      mergedSections.push({ name, content: l }); // default to local
-      continue;
-    }
-
-    const localChanged = l !== b;
-    const remoteChanged = r !== b;
-
-    if (!localChanged && remoteChanged) {
-      if (r !== null) mergedSections.push({ name, content: r });
-      // else: remote deleted it, local didn't change → accept deletion
-    } else if (localChanged && !remoteChanged) {
-      if (l !== null) mergedSections.push({ name, content: l });
-      // else: local deleted it, remote didn't change → accept deletion
-    } else {
-      // Both changed the same section → conflict
-      conflicts.push({ section: name, local: l, remote: r });
-      if (l !== null) mergedSections.push({ name, content: l }); // default to local
-    }
-  }
-
-  if (conflicts.length > 0) {
-    return { merged: null, conflicts };
-  }
-
-  // Reconstruct
-  const merged = reconstructDocument({
-    frontmatter: mergedFrontmatter,
-    header: mergedHeader,
-    sections: mergedSections,
-  });
-
-  return { merged, conflicts: [] };
-}
-
-module.exports = { parseSections, reconstructDocument, sectionMerge };