atris 3.37.1 → 3.40.0

package/commands/wiki.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { hasFlag } = require('../lib/arg-parser');
 const { loadCredentials } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { loadBusinesses, saveBusinesses } = require('./business');
@@ -14,8 +15,11 @@ const {
   buildIngestPrompt,
   buildQueryPrompt,
   buildLintPrompt,
+  buildConsolidatePrompt,
   writeWikiStatus,
   appendWikiLog,
+  findWikiMetabolismFindings,
+  recordWikiConsolidation,
   validateAgentReadableWikiPages,
 } = require('../lib/wiki');
 
@@ -171,7 +175,7 @@ function hasHelpFlag(args) {
 }
 
 function printWikiHelp(scope = null) {
-  const normalized = scope === 'ingest' || scope === 'query' || scope === 'lint' || scope === 'search' || scope === 'log' || scope === 'loop' || scope === 'verify'
+  const normalized = scope === 'ingest' || scope === 'query' || scope === 'lint' || scope === 'consolidate' || scope === 'search' || scope === 'log' || scope === 'loop' || scope === 'verify'
     ? scope
     : null;
 
@@ -191,12 +195,17 @@ function printWikiHelp(scope = null) {
     console.log('Usage: atris wiki lint [--private|--cloud] [business]');
     console.log('');
     console.log('Build a local or cloud wiki lint prompt.');
+  } else if (normalized === 'consolidate') {
+    console.log('Usage: atris wiki consolidate [--private]');
+    console.log('');
+    console.log('Build a local wiki pruning prompt and reset the growth marker.');
   } else {
-    console.log('Usage: atris wiki <ingest|query|lint|search|log|loop|verify|entities|related> [business] [args]');
+    console.log('Usage: atris wiki <ingest|query|lint|consolidate|search|log|loop|verify|entities|related> [business] [args]');
     console.log('');
     console.log('  ingest <path>                 Local-first ingest into atris/wiki/');
     console.log('  query  "question"             Local-first query against atris/wiki/');
     console.log('  lint                          Local-first lint for atris/wiki/');
+    console.log('  consolidate                   Build a local pruning prompt and reset wiki growth');
     console.log('  search [business] <term>      Search local atris/wiki/index.md');
     console.log('  log    [business] [N]         Show recent atris/wiki/log.md entries');
     console.log('  loop                          Run local wiki upkeep analysis and refresh STATUS/log');
@@ -215,10 +224,6 @@ function printWikiHelp(scope = null) {
   console.log('');
 }
 
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
 function optionValue(args, name, fallback = null) {
   const index = args.indexOf(name);
   if (index === -1 || index + 1 >= args.length) return fallback;
@@ -366,7 +371,11 @@ async function wikiLint(mode, slug) {
       console.error(`No local wiki found at ${getWikiRoot(wikiMode)}. Run: atris wiki ingest${wikiMode === 'private' ? ' --private' : ''} <path>`);
       process.exit(1);
     }
-    printLocalPrompt(mode === 'private' ? 'Private wiki lint' : 'Local wiki lint', buildLintPrompt(wikiMode), getWikiRoot(wikiMode), [`Wiki dir: ${wikiDir}`]);
+    const metabolismFindings = findWikiMetabolismFindings(process.cwd(), wikiMode);
+    printLocalPrompt(mode === 'private' ? 'Private wiki lint' : 'Local wiki lint', buildLintPrompt(wikiMode), getWikiRoot(wikiMode), [
+      `Wiki dir: ${wikiDir}`,
+      ...metabolismFindings.map((finding) => `${finding.code}: ${finding.message}`),
+    ]);
     return;
   }
 
@@ -376,6 +385,28 @@ async function wikiLint(mode, slug) {
   await runChat(business, buildLintPrompt(), creds.token);
 }
 
+function wikiConsolidate(mode, slug) {
+  if (mode === 'cloud') {
+    console.error('Wiki consolidation is local-only. Pull the wiki before consolidating it.');
+    process.exit(1);
+  }
+
+  const wikiMode = mode === 'private' ? 'private' : 'public';
+  const wikiDir = findLocalWikiDir(process.cwd(), slug, wikiMode);
+  if (!wikiDir) {
+    console.error(`No local wiki found at ${getWikiRoot(wikiMode)}.`);
+    process.exit(1);
+  }
+
+  printLocalPrompt(
+    mode === 'private' ? 'private wiki consolidate' : 'local wiki consolidate',
+    buildConsolidatePrompt(wikiMode),
+    getWikiRoot(wikiMode),
+    [`wiki dir: ${wikiDir}`]
+  );
+  recordWikiConsolidation(process.cwd(), wikiMode);
+}
+
 function wikiSearch(mode, slug, query) {
   if (!query) {
     console.error('Usage: atris wiki search [business] <term>');
@@ -513,6 +544,10 @@ async function wikiCommand(subcommand, ...args) {
       await wikiLint(mode, slug);
       break;
     }
+    case 'consolidate': {
+      wikiConsolidate(mode, null);
+      break;
+    }
     case 'search': {
       if (mode === 'private') {
         wikiSearch(mode, null, cleanArgs.join(' '));
@@ -572,12 +607,4 @@ async function wikiCommand(subcommand, ...args) {
 
 module.exports = {
   wikiCommand,
-  wikiIngest,
-  wikiQuery,
-  wikiLint,
-  wikiSearch,
-  wikiLog,
-  wikiVerify,
-  wikiEntities,
-  wikiRelated,
 };

package/commands/wish.js

@@ -487,7 +487,6 @@ module.exports = {
   printRewards,
   readWishEvents,
   readWishes,
-  runCloudWish,
   runAgainWish,
   sayWish,
   sharesMeaningfulWords,

package/commands/workflow.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { getLogPath } = require('../lib/journal');
-const { encodeToolResult } = require('../lib/tool-result-encode');
+const { buildToolResultBody } = require('../lib/tool-result-encode');
 
 function wrapWorkflowText(text, width = 76) {
   const normalized = String(text || '').replace(/\s+/g, ' ').trim();
@@ -140,7 +140,7 @@ function postToolResult(callId, result, base = 'http://127.0.0.1:8000') {
   const url = new URL('/api/atris2/turn/tool-result', base);
   const transport = url.protocol === 'https:' ? require('https') : require('http');
   return new Promise((resolve, reject) => {
-    const postData = JSON.stringify({ call_id: callId, result_base64: encodeToolResult(result) });
+    const postData = JSON.stringify(buildToolResultBody(callId, result));
     const req = transport.request({
       hostname: url.hostname,
       port: url.port || (url.protocol === 'https:' ? 443 : 80),

package/commands/worktree.js

@@ -3,7 +3,9 @@
 const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
+const { hasFlag, readFlag } = require('../lib/arg-parser');
 const { stampLatestOpenBriefForWorktree } = require('../lib/brief-ledger');
+const { isConductorArtifact } = require('../lib/conductor-artifacts');
 
 const REGEN_ADAPTER_FILES = ['AGENTS.md', 'CLAUDE.md', 'GEMINI.md'];
 const COMMAND_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
@@ -261,11 +263,16 @@ function baseBranchName(ref) {
   return String(ref || '').replace(/^refs\/heads\//, '').replace(/^origin\//, '');
 }
 
-function statusCounts(root, { ignoredUnstagedFiles = new Set(), ignoredUntrackedFiles = new Set() } = {}) {
+function statusCounts(root, {
+  ignoredUnstagedFiles = new Set(),
+  ignoredUntrackedFiles = new Set(),
+  ignoreUntracked = null,
+} = {}) {
   if (!fs.existsSync(root)) return null;
   // -uall expands untracked directories to individual files so ignoredUntrackedFiles
-  // can match exact paths (plain porcelain collapses them to "?? dir/").
-  const statusArgs = ignoredUntrackedFiles.size ? ['status', '--porcelain', '-uall'] : ['status', '--porcelain'];
+  // and ignoreUntracked can match exact paths (plain porcelain collapses them to "?? dir/").
+  const expandUntracked = ignoredUntrackedFiles.size || typeof ignoreUntracked === 'function';
+  const statusArgs = expandUntracked ? ['status', '--porcelain', '-uall'] : ['status', '--porcelain'];
   const result = runGit(statusArgs, { cwd: root, check: false });
   if (result.status !== 0) return null;
   let staged = 0;
@@ -276,6 +283,7 @@ function statusCounts(root, { ignoredUnstagedFiles = new Set(), ignoredUntracked
     if (ignoredUnstagedFiles.has(file) && line[0] === ' ' && line[1] !== ' ') continue;
     if (line.startsWith('??')) {
       if (ignoredUntrackedFiles.has(file)) continue;
+      if (typeof ignoreUntracked === 'function' && ignoreUntracked(file)) continue;
       untracked += 1;
       continue;
     }
@@ -285,6 +293,16 @@ function statusCounts(root, { ignoredUnstagedFiles = new Set(), ignoredUntracked
   return { staged, unstaged, untracked };
 }
 
+// Remove conductor plumbing from the index after a broad `git add -A`, so the commit
+// records engine output only. Paths that were never staged are simply not listed.
+function unstageConductorArtifacts(root) {
+  const staged = runGit(['diff', '--cached', '--name-only'], { cwd: root, check: false });
+  if (staged.status !== 0) return [];
+  const drop = String(staged.stdout || '').split(/\r?\n/).filter(Boolean).filter(isConductorArtifact);
+  if (drop.length) runGit(['reset', '-q', 'HEAD', '--', ...drop], { cwd: root, check: false });
+  return drop;
+}
+
 function changedFiles(root, args) {
   const result = runGit([...args, '--', ...REGEN_ADAPTER_FILES], { cwd: root, check: false });
   if (result.status !== 0) return new Set();
@@ -304,20 +322,6 @@ function restoreRegeneratedAdapterChurn(root, message, { dryRun = false } = {})
   return skipped;
 }
 
-function readFlag(args, name, fallback = '') {
-  const prefix = `${name}=`;
-  for (let i = 0; i < args.length; i += 1) {
-    const arg = String(args[i]);
-    if (arg === name && args[i + 1] && !String(args[i + 1]).startsWith('--')) return String(args[i + 1]);
-    if (arg.startsWith(prefix)) return arg.slice(prefix.length);
-  }
-  return fallback;
-}
-
-function hasFlag(args, name) {
-  return args.includes(name);
-}
-
 function swarloClaim(root, { channel, taskKey, content }) {
   const script = path.join(root, 'scripts', 'swarlo.py');
   if (!fs.existsSync(script)) return 'skip: scripts/swarlo.py not found';
@@ -472,6 +476,14 @@ function createOrFindPr(root, branch, targetRef, title, dryRun) {
     `Target: ${targetBranch}`,
   ].join('\n');
   if (dryRun) return `dry-run: gh pr create --base ${targetBranch} --head ${branch}`;
+  // An engine that produced nothing leaves a branch level with its base. Asking
+  // GitHub for a PR there fails with "No commits between ...", and that throw used
+  // to escape the flight and abort the whole run. Say it plainly instead.
+  const ahead = runGit(['rev-list', '--count', `${targetRef}..HEAD`], { cwd: root, check: false });
+  if (ahead.status === 0 && String(ahead.stdout || '').trim() === '0') {
+    console.log('pr: skipped (no commits ahead of base)');
+    return '';
+  }
   const created = spawnSync(
     'gh',
     ['pr', 'create', '--base', targetBranch, '--head', branch, '--title', title, '--body', body],
@@ -498,6 +510,36 @@ function shipHelp() {
   console.log('  recommended flight verify: npm run test:fast && node --test <focused files>');
 }
 
+function deniedLaneForShip(root, branch, message) {
+  try {
+    const { DENIED_TAGS } = require('../lib/fleet');
+    const refs = new Set();
+    for (const source of [String(branch || ''), String(message || '')]) {
+      for (const m of source.toUpperCase().matchAll(/([A-Z]{2,6}-\d+)/g)) refs.add(m[1]);
+      for (const m of source.toLowerCase().matchAll(/([a-z]{2,6})-(\d+)/g)) refs.add(`${m[1].toUpperCase()}-${m[2]}`);
+    }
+    if (!refs.size) return null;
+    const projectionPath = path.join(findPrimaryRoot(root), '.atris', 'state', 'tasks.projection.json');
+    if (!fs.existsSync(projectionPath)) return null;
+    const projection = JSON.parse(fs.readFileSync(projectionPath, 'utf8'));
+    for (const task of projection.tasks || []) {
+      const ids = [task.display_id, task.legacy_ref].filter(Boolean).map(v => String(v).toUpperCase());
+      if (!ids.some(id => refs.has(id))) continue;
+      const tags = [task.tag, ...(task.metadata?.todo_tags || [])].filter(Boolean).map(t => String(t).toLowerCase());
+      const hit = tags.find(t => DENIED_TAGS.includes(t));
+      if (hit) return { taskId: ids[0], tag: hit };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+function findPrimaryRoot(root) {
+  const worktrees = listWorktrees(root);
+  return worktrees[0]?.path || root;
+}
+
 function shipWorktree(args) {
   if (hasFlag(args, '--help') || hasFlag(args, '-h') || args[0] === 'help') {
     shipHelp();
@@ -531,6 +573,17 @@ function shipWorktree(args) {
     console.error('blocked: ship from an isolated worktree, not the primary checkout');
     return 2;
   }
+  // Denied lanes are checked at dispatch, but a flight that was staffed
+  // before a task entered a denied lane (or killed mid-flight) could still
+  // ship: a payments command self-landed twice this way on 2026-07-26. The
+  // ship gate is the last door, so it re-checks.
+  if (!hasFlag(args, '--allow-denied-lane')) {
+    const denied = deniedLaneForShip(root, branch, message);
+    if (denied) {
+      console.error(`blocked: this branch carries ${denied.taskId} which sits in the protected ${denied.tag} lane; a human lands it (or pass --allow-denied-lane on written order)`);
+      return 2;
+    }
+  }
 
   let oneLapProof = null;
   try {
@@ -552,7 +605,10 @@ function shipWorktree(args) {
   refreshRemoteRef(root, targetRef);
   const skippedAdapters = restoreRegeneratedAdapterChurn(root, message, { dryRun });
   const ignoredUnstagedFiles = dryRun ? new Set(skippedAdapters) : new Set();
-  const counts = statusCounts(root, { ignoredUnstagedFiles }) || { staged: 0, unstaged: 0, untracked: 0 };
+  // Conductor plumbing must not make the checkout look dirty, or a flight where the
+  // engine wrote nothing commits the fleet's own prompt file and calls it work.
+  const counts = statusCounts(root, { ignoredUnstagedFiles, ignoreUntracked: isConductorArtifact })
+    || { staged: 0, unstaged: 0, untracked: 0 };
   const dirty = counts.staged || counts.unstaged || counts.untracked;
   if (dirty && !message) {
     console.error('blocked: --message is required when there are local changes to commit');
@@ -563,6 +619,9 @@ function shipWorktree(args) {
     console.log(`commit: ${message}`);
     if (!dryRun) {
       runGit(['add', '-A'], { cwd: root });
+      // `add -A` sweeps in the fleet's own prompt file and friends. Drop them from the
+      // index so a work commit carries work, not harness plumbing. Safe when absent.
+      unstageConductorArtifacts(root);
       if (!proofTreeMatches('index')) return 3;
       runGit(['commit', '-m', message], { cwd: root });
       if (!proofTreeMatches('head')) return 3;
@@ -578,7 +637,12 @@ function shipWorktree(args) {
     if (!dryRun) runCommand(verify, { cwd: root });
     const afterVerifyRows = dryRun ? [] : statusSnapshot(root);
     const verifyDelta = newStatusRows(beforeVerify, afterVerifyRows);
-    const afterVerify = dryRun ? { staged: 0, unstaged: 0, untracked: 0 } : statusCounts(root) || { staged: 0, unstaged: 0, untracked: 0 };
+    // This check exists to catch a verifier that writes files. Conductor plumbing was
+    // already present before the verifier ran, so counting it here blocks a clean ship.
+    const afterVerify = dryRun
+      ? { staged: 0, unstaged: 0, untracked: 0 }
+      : statusCounts(root, { ignoreUntracked: isConductorArtifact })
+        || { staged: 0, unstaged: 0, untracked: 0 };
     if (!dryRun && (afterVerify.staged || afterVerify.unstaged || afterVerify.untracked)) {
       console.error(
         `blocked: verifier left checkout dirty staged=${afterVerify.staged} ` +
@@ -687,8 +751,10 @@ function guard(args) {
     console.error('run: atris worktree start --member <member>|--agent <name> --task "<short task>" --claim');
     return 2;
   }
-  // The CLI's own worktree metadata (written by `worktree start`) must not count as dirt.
-  const counts = statusCounts(root, { ignoredUntrackedFiles: new Set(['.atris/agent-worktree.json']) });
+  // Conductor plumbing (worktree metadata, the fleet prompt written for this very
+  // engine, runtime scratch, the brief ledger) must not count as dirt — otherwise the
+  // harness blocks the engine with the harness's own files.
+  const counts = statusCounts(root, { ignoreUntracked: isConductorArtifact });
   if (counts && (counts.staged || counts.unstaged || counts.untracked) && !hasFlag(args, '--allow-dirty')) {
     console.error(`blocked: checkout is dirty staged=${counts.staged} unstaged=${counts.unstaged} untracked=${counts.untracked}`);
     return 3;
@@ -880,20 +946,14 @@ function worktreeCommand(args = []) {
 
 module.exports = {
   branchName,
-  statusSnapshot,
-  newStatusRows,
   createAgentWorktree,
+  deniedLaneForShip,
   createOrFindPr,
   cleanupWorktrees,
-  defaultShipTarget,
   defaultStartBase,
-  defaultWorktreePath,
   listWorktrees,
   parseWorktrees,
-  REGEN_ADAPTER_FILES,
   normalizeTargetRef,
-  restoreRegeneratedAdapterChurn,
-  prMergeRef,
   slugify,
   statusCounts,
   swarloClaim,

package/commands/xp.js

@@ -5,6 +5,7 @@ const os = require('os');
 const path = require('path');
 const crypto = require('crypto');
 const { spawnSync } = require('child_process');
+const { hasFlag: hasExactFlag } = require('../lib/arg-parser');
 
 const DEFAULT_GRAPH_DAYS = 365;
 const MAX_SYNC_GRAPH_DAYS = 370;
@@ -277,7 +278,8 @@ function currentForm(payload) {
   };
 }
 
-function readFlag(args, name, fallback = null) {
+// Preserve the existing rule that any inline value wins over a split value.
+function readInlineFirstFlag(args, name, fallback = null) {
   const inline = args.find(arg => arg.startsWith(`${name}=`));
   if (inline) {
     return inline.slice(name.length + 1);
@@ -291,7 +293,7 @@ function readFlag(args, name, fallback = null) {
 
 function readFirstFlag(args, names, fallback = null) {
   for (const name of names) {
-    const value = readFlag(args, name, null);
+    const value = readInlineFirstFlag(args, name, null);
     if (value !== null && value !== undefined && value !== '') return value;
   }
   return fallback;
@@ -313,8 +315,9 @@ function readFlagValues(args, names) {
   return values.filter(Boolean);
 }
 
-function hasFlag(args, name) {
-  return args.includes(name) || args.some(arg => arg.startsWith(`${name}=`));
+// This command treats --name=value as flag presence as well as a standalone flag.
+function hasFlagOrValue(args, name) {
+  return hasExactFlag(args, name) || args.some(arg => arg.startsWith(`${name}=`));
 }
 
 function levelFromXp(careerXp) {
@@ -1040,7 +1043,7 @@ function buildCareerXpProjection(receipts, workspace, integrity = {}) {
 }
 
 function collectLocalXpProjectionState(args = [], { write = true } = {}) {
-  const workspace = path.resolve(readFlag(args, '--workspace', defaultXpWorkspace()));
+  const workspace = path.resolve(readInlineFirstFlag(args, '--workspace', defaultXpWorkspace()));
   const episodePath = path.join(workspace, TASK_EPISODES_FILE);
   const receiptsPath = path.join(workspace, CAREER_XP_RECEIPTS_FILE);
   const projectionPath = path.join(workspace, CAREER_XP_PROJECTION_FILE);
@@ -1170,7 +1173,7 @@ function defaultAllSearchRoots(args = []) {
   if (explicitRoots.length) return uniquePaths(explicitRoots);
 
   const roots = [];
-  const workspace = readFlag(args, '--workspace', null);
+  const workspace = readInlineFirstFlag(args, '--workspace', null);
   if (workspace) roots.push(workspace);
   roots.push(process.cwd());
   roots.push(path.join(os.homedir(), 'arena'));
@@ -1575,7 +1578,7 @@ function codexHasThreadsTable(dbPath) {
 }
 
 function readCodexGoalsForSession(args, workspace, sinceMs, untilMs) {
-  const explicitDb = readFlag(args, '--codex-state', readFlag(args, '--state', process.env.CODEX_STATE_DB || ''));
+  const explicitDb = readInlineFirstFlag(args, '--codex-state', readInlineFirstFlag(args, '--state', process.env.CODEX_STATE_DB || ''));
   const dbPath = explicitDb
     ? path.resolve(expandHome(explicitDb))
     : path.resolve(fs.existsSync(CODEX_GOALS_FILE) ? CODEX_GOALS_FILE : CODEX_STATE_FILE);
@@ -1592,7 +1595,7 @@ function readCodexGoalsForSession(args, workspace, sinceMs, untilMs) {
     }
   }
 
-  const threadId = readFlag(args, '--thread', process.env.CODEX_THREAD_ID || '');
+  const threadId = readInlineFirstFlag(args, '--thread', process.env.CODEX_THREAD_ID || '');
   const clauses = [];
   if (threadId) clauses.push(`tg.thread_id = ${sqlString(threadId)}`);
   const workspaceCandidates = workspacePathCandidates(workspace);
@@ -1632,9 +1635,9 @@ LIMIT 25
 }
 
 function buildCareerXpSessionCapsule(args = []) {
-  const workspace = path.resolve(readFlag(args, '--workspace', defaultXpWorkspace()));
-  const sinceInput = readFlag(args, '--since', 'today');
-  const untilInput = readFlag(args, '--until', null);
+  const workspace = path.resolve(readInlineFirstFlag(args, '--workspace', defaultXpWorkspace()));
+  const sinceInput = readInlineFirstFlag(args, '--since', 'today');
+  const untilInput = readInlineFirstFlag(args, '--until', null);
   const since = parseSessionBoundary(sinceInput, startOfToday());
   const until = parseSessionBoundary(untilInput, new Date());
   const sinceMs = since.getTime();
@@ -1643,7 +1646,7 @@ function buildCareerXpSessionCapsule(args = []) {
     throw new Error('--since must be before --until');
   }
 
-  const writeEnabled = !hasFlag(args, '--no-write') && !hasFlag(args, '--dry-run');
+  const writeEnabled = !hasFlagOrValue(args, '--no-write') && !hasFlagOrValue(args, '--dry-run');
   const projectionState = collectLocalXpProjectionState(['--workspace', workspace], { write: writeEnabled });
   const projection = projectionState.projection;
   const receiptsPath = path.join(workspace, CAREER_XP_RECEIPTS_FILE);
@@ -1675,7 +1678,7 @@ function buildCareerXpSessionCapsule(args = []) {
   });
   const windowXp = acceptedReceipts.reduce((sum, receipt) => sum + asNumber(receipt.xp), 0);
   const afterTotalXp = asNumber(projection.total_xp);
-  const missionFlag = readFlag(args, '--mission', null);
+  const missionFlag = readInlineFirstFlag(args, '--mission', null);
   const episodeGoals = readJsonl(path.join(workspace, TASK_EPISODES_FILE), { allowPartialTail: true })
     .filter(episode => inWindow(episode?.created_at, sinceMs, untilMs))
     .map(episode => episode.goal);
@@ -1890,8 +1893,8 @@ function syncScopeFields(attribution = {}) {
 }
 
 function publicAgentXpOverride(args = []) {
-  if (hasFlag(args, '--public')) return true;
-  if (hasFlag(args, '--private') || hasFlag(args, '--internal')) return false;
+  if (hasFlagOrValue(args, '--public')) return true;
+  if (hasFlagOrValue(args, '--private') || hasFlagOrValue(args, '--internal')) return false;
   return null;
 }
 
@@ -1946,9 +1949,9 @@ function syncPlayer(args, projection) {
 }
 
 function buildAgentXpSyncPacket(args = []) {
-  const localMode = hasFlag(args, '--local') || hasFlag(args, '--workspace') || hasFlag(args, '--operator');
+  const localMode = hasFlagOrValue(args, '--local') || hasFlagOrValue(args, '--workspace') || hasFlagOrValue(args, '--operator');
   const projectionArgs = args.filter(arg => !['--dry-run', '--no-post', '--packet', '--public', '--private', '--internal'].includes(arg));
-  const projection = hasFlag(args, '--all') || !localMode
+  const projection = hasFlagOrValue(args, '--all') || !localMode
     ? collectAllLocalXpProjection(projectionArgs)
     : collectLocalXpProjection(projectionArgs);
   const player = syncPlayer(args, projection);
@@ -2086,10 +2089,10 @@ function buildAgentXpSyncPacket(args = []) {
 
 async function syncAgentXp(args = []) {
   const preview = buildAgentXpSyncPacket(args);
-  const dryRun = hasFlag(args, '--dry-run') || hasFlag(args, '--no-post') || hasFlag(args, '--packet');
+  const dryRun = hasFlagOrValue(args, '--dry-run') || hasFlagOrValue(args, '--no-post') || hasFlagOrValue(args, '--packet');
   if (dryRun) return preview;
 
-  const token = readFlag(args, '--token', process.env.ATRIS_AGENTXP_SYNC_TOKEN || process.env.AGENTXP_SYNC_TOKEN || '');
+  const token = readInlineFirstFlag(args, '--token', process.env.ATRIS_AGENTXP_SYNC_TOKEN || process.env.AGENTXP_SYNC_TOKEN || '');
   const envToken = process.env.ATRIS_TOKEN && process.env.ATRIS_TOKEN.trim() ? process.env.ATRIS_TOKEN.trim() : '';
   const options = {
     method: 'POST',
@@ -2298,11 +2301,11 @@ async function xpCommand(...args) {
     const commandArgs = args.slice(1);
     let payload;
     try {
-      const explicitLocal = hasFlag(commandArgs, '--local')
-        || hasFlag(commandArgs, '--workspace')
-        || hasFlag(commandArgs, '--operator');
+      const explicitLocal = hasFlagOrValue(commandArgs, '--local')
+        || hasFlagOrValue(commandArgs, '--workspace')
+        || hasFlagOrValue(commandArgs, '--operator');
       const accountStatus = (subcommand === 'status' || subcommand === 'card') && !explicitLocal;
-      payload = hasFlag(commandArgs, '--all') || accountStatus
+      payload = hasFlagOrValue(commandArgs, '--all') || accountStatus
         ? collectAllLocalXpProjection(commandArgs)
         : collectLocalXpProjection(commandArgs);
     } catch (error) {
@@ -2324,7 +2327,7 @@ async function xpCommand(...args) {
   }
 
   const jsonMode = args.includes('--json');
-  const localMode = hasFlag(args, '--local') || hasFlag(args, '--workspace') || hasFlag(args, '--operator');
+  const localMode = hasFlagOrValue(args, '--local') || hasFlagOrValue(args, '--workspace') || hasFlagOrValue(args, '--operator');
   if (localMode) {
     let payload;
     try {
@@ -2353,6 +2356,7 @@ async function xpCommand(...args) {
   });
   if (!result.ok) {
     console.error(`Failed to load XP graph: ${result.error || result.status}`);
+    console.error('Run: atris xp --local  to render your AgentXP from proof receipts in this workspace.');
     process.exit(1);
   }
 
@@ -2366,14 +2370,8 @@ async function xpCommand(...args) {
 
 module.exports = {
   xpCommand,
-  buildContributionRows,
   buildCareerXpProjection,
-  buildAllCareerXpProjection,
-  buildCareerXpSessionCapsule,
-  collectAllLocalXpProjection,
   collectLocalXpProjection,
-  buildAgentXpSyncPacket,
   syncAgentXp,
-  receiptFromTaskEpisode,
   render,
 };

package/commands/youtube.js

@@ -452,13 +452,11 @@ async function youtubeCommand(argv = process.argv.slice(3), deps = {}) {
 module.exports = {
   DEFAULT_QUERY,
   DEFAULT_TIMEOUT_MS,
-  showYoutubeHelp,
   parseYoutubeArgs,
   buildYoutubePayload,
   extractLocalTranscript,
   processYoutube,
   shouldRetryWithLocalTranscript,
   formatYoutubeResult,
-  formatTimestampFromMs,
   youtubeCommand,
 };