atris 3.56.0 → 3.56.2

package/commands/spaceship.js

@@ -13,17 +13,42 @@
  *   atris spaceship --hours 4 --repo /path/to/repo --interval 780 --yes
  *   atris spaceship --hours 0.01 --tick-cmd /tmp/stub.sh --no-email --yes
  *
- * Without --yes, spaceship only prints the plan (no email, no overnight run).
+ * Without --yes, spaceship only talks the keep-working plan (no email, no run).
  * `--json` without --yes prints a JSON refuse and still does not start.
+ * `--yes` from an unbound scratch folder refuses: that folder is not a room.
  */
 
 const path = require('path');
 const fs = require('fs');
 const { spawn } = require('child_process');
 const { hasYesFlag, argsWantHelp, wantsJson } = require('../lib/noninteractive');
+const { isUnboundScratchFolder, refuseUnboundScratch } = require('../lib/scratch-root');
+const { resolveWorkspaceRoot } = require('../lib/mission-root');
+const { personName } = require('../lib/first-minute');
 
 const SCRIPT = path.join(__dirname, '..', 'scripts', 'spaceship.sh');
 
+function greet(person) {
+  return person ? `hey ${person}, ` : '';
+}
+
+function readFlagValue(args, name) {
+  const list = Array.isArray(args) ? args : [];
+  const idx = list.indexOf(name);
+  const raw = idx !== -1 && list[idx + 1] && !String(list[idx + 1]).startsWith('-')
+    ? String(list[idx + 1]).trim()
+    : '';
+  return raw;
+}
+
+function spokenHours(raw) {
+  const text = raw === undefined || raw === null ? '4' : String(raw).trim();
+  const n = Number(text);
+  if (!Number.isFinite(n) || n <= 0) return '4 hours';
+  if (n === 1) return `${text} hour`;
+  return `${text} hours`;
+}
+
 function printUsage() {
   const lines = [
     'Usage: atris spaceship [--hours N] [--interval SEC] [--repo PATH]',
@@ -31,25 +56,34 @@ function printUsage() {
     '                       [--idle-alert N] [--halt-alert N] [--label NAME]',
     '                       [--no-email] [--yes]',
     '',
-    'Bounded overnight runner. Survives bad ticks and emails on state changes.',
-    'Without --yes, prints the plan only (no email, no overnight run).',
-    'Defaults: --hours 4, --interval 780, tick = atris autopilot --auto --iterations=1',
+    "Keep working here for a few hours. I'll write you if something changes.",
+    'Without --yes, I only say the plan. --no-email stays quiet.',
   ];
   console.log(lines.join('\n'));
 }
 
 function planLines(args = []) {
-  const hoursIdx = args.indexOf('--hours');
-  const hours = hoursIdx !== -1 && args[hoursIdx + 1] ? args[hoursIdx + 1] : '4';
+  const list = Array.isArray(args) ? args : [];
+  const hours = spokenHours(readFlagValue(list, '--hours') || '4');
+  const next = list.includes('--no-email')
+    ? 'next: atris spaceship --yes'
+    : "I'll write you if something changes. next: atris spaceship --yes";
   return [
-    'spaceship plan (no run):',
-    `  budget: ${hours}h`,
-    '  email: on meaningful state changes (unless --no-email)',
-    '  tick: atris autopilot --auto --iterations=1',
-    'Pass --yes to start the overnight run.',
+    `${greet(personName())}I can keep working here for ${hours}.`,
+    '',
+    next,
   ];
 }
 
+function spaceshipTargetRoot(args = []) {
+  const list = Array.isArray(args) ? args : [];
+  const idx = list.indexOf('--repo');
+  const raw = idx !== -1 && list[idx + 1] && !String(list[idx + 1]).startsWith('-')
+    ? path.resolve(list[idx + 1])
+    : process.cwd();
+  return resolveWorkspaceRoot(raw);
+}
+
 function spaceship(args = []) {
   const list = Array.isArray(args) ? args : [];
   if (argsWantHelp(list) || list.includes('--help') || list.includes('-h')) {
@@ -75,6 +109,12 @@ function spaceship(args = []) {
     process.exit(2);
   }
 
+  // --yes starts the run. It is not a workspace unlock. An unbound
+  // scratch folder is not a room (same class as slack/gmail from scratch).
+  if (isUnboundScratchFolder(spaceshipTargetRoot(list))) {
+    process.exit(refuseUnboundScratch());
+  }
+
   const runArgs = list.filter((a) => a !== '--yes' && a !== '-y' && a !== '--json');
   return new Promise((resolve, reject) => {
     if (!fs.existsSync(SCRIPT)) {
@@ -99,4 +139,4 @@ function spaceship(args = []) {
   });
 }
 
-module.exports = { spaceship, SCRIPT, printUsage, planLines };
+module.exports = { spaceship, SCRIPT, printUsage, planLines, spokenHours, spaceshipTargetRoot };

package/commands/status.js

@@ -4,6 +4,15 @@ const { getLogPath, ensureLogDirectory, createLogFile } = require('../lib/journa
 const { parseTodo, getTeamActivity } = require('../lib/todo');
 const { clarify } = require('../lib/autoland');
 const { checkoutBehindMessage } = require('../lib/checkout-sync');
+const {
+  isFreshWorkspace,
+  isKeepWorkingMinute,
+  isClaimMinute,
+  buildFirstMinute,
+  speakFirstMinute,
+  speakKeepWorkingMinute,
+  speakNothingRunning,
+} = require('../lib/first-minute');
 
 // Box drawing helpers
 const W = 64; // inner width
@@ -122,18 +131,40 @@ function parseStatusTodo(todoFile) {
   }
 }
 
+function hasLiveKeepWorkingRun(root = process.cwd()) {
+  try {
+    const { pickLiveLocalMission } = require('./mission');
+    return Boolean(pickLiveLocalMission(root));
+  } catch {
+    return false;
+  }
+}
+
 function statusAtris(isQuick = false, jsonMode = false, verbose = false) {
-  const targetDir = path.join(process.cwd(), 'atris');
+  // Fresh folder: empty talks first-talk. A file already here
+  // names that file, same as bare atris. Do not mint a room.
+  if (isFreshWorkspace()) {
+    process.exit(speakNothingRunning({ asJson: jsonMode }));
+  }
 
-  if (!fs.existsSync(targetDir)) {
-    if (jsonMode) {
-      console.log(JSON.stringify({ error: 'atris/ folder not found' }));
-      process.exit(1);
+  // Just-minted file folder, nothing running: same two lines as
+  // first-minute / the next keep-working ready. After init, next is claim: same
+  // two lines as bare atris / now. Not factory let-it-run.
+  // A live mission still gets the board. --verbose keeps the
+  // factory dump because the operator asked for it. --json on
+  // the claim path keeps the factory board for scripts.
+  if (!verbose && !hasLiveKeepWorkingRun()) {
+    const minute = buildFirstMinute({ root: process.cwd() });
+    if (isKeepWorkingMinute(minute)) {
+      process.exit(speakKeepWorkingMinute({ asJson: jsonMode }));
+    }
+    if (!jsonMode && isClaimMinute(minute)) {
+      process.exit(speakFirstMinute());
     }
-    console.log('✗ atris/ folder not found. Run "atris init" first.');
-    process.exit(1);
   }
 
+  const targetDir = path.join(process.cwd(), 'atris');
+
   // Load task board state.
   const todoFile = path.join(targetDir, 'TODO.md');
   const todo = parseStatusTodo(todoFile);

package/commands/task.js

@@ -60,7 +60,18 @@ const {
   decisionMarkerFor,
   DECISION_REFUSE_REASON,
 } = require('../lib/task-decision');
-const { buildFirstMinute, deskNextCommand, personName, pickNext, speakFirstMinute, taskCommand, taskNextCommand } = require('../lib/first-minute');
+const {
+  buildFirstMinute,
+  deskNextCommand,
+  firstTalkCommand,
+  folderName,
+  personName,
+  pickNext,
+  speakFirstMinute,
+  taskCommand,
+  taskNextCommand,
+} = require('../lib/first-minute');
+const { loadContext } = require('../lib/state-detection');
 
 const DEFAULT_OWNER = process.env.ATRIS_AGENT_ID
   || process.env.USER
@@ -6172,9 +6183,9 @@ function cmdAdd(args) {
   if (isUninitializedTaskFolder(root)) {
     if (wantsJson(args)) {
       printJson({
-        ok: true,
-        action: 'init',
-        command: 'atris init --minimal',
+        ok: false,
+        action: 'none',
+        command: firstTalkCommand(folderName(root)),
         task_id: null,
         projection_path: null,
         task: null,
@@ -6493,9 +6504,19 @@ function cmdDay(args) {
 
 function cmdFirstMinute() {
   const root = process.cwd();
+  const fresh = !fs.existsSync(path.join(root, 'atris'));
+  let context = {};
+  if (!fresh) {
+    try {
+      context = loadContext(root);
+    } catch {
+      context = {};
+    }
+  }
   const screen = buildFirstMinute({
     root,
-    fresh: !fs.existsSync(path.join(root, 'atris')),
+    fresh,
+    context,
   });
   console.log(screen.text);
 }
@@ -6826,10 +6847,12 @@ function createEndgameSeedTask(taskDb, db, seed, owner) {
 }
 
 function nextActionFromCommand(command) {
-  const match = String(command || '').trim().match(/^atris (?:task|mission) (\S+)/);
+  const text = String(command || '').trim();
+  const match = text.match(/^atris (?:task|mission) (\S+)/);
   const verb = match ? match[1] : '';
-  if (!verb || verb === 'new') return 'none';
-  return verb;
+  if (verb && verb !== 'new') return verb;
+  if (/^atris do\b/.test(text)) return 'do';
+  return 'none';
 }
 
 function cmdNextTruth(args) {
@@ -6840,9 +6863,24 @@ function cmdNextTruth(args) {
   const workspaceRoot = taskDb.workspaceRoot();
   const rows = taskDb.listTasks(db, { workspaceRoot, limit: 500 });
   const existingProj = readProjectionFile(workspaceRoot);
+  const dbHasActionable = rows.some((task) => {
+    const status = task && task.status;
+    return status === 'open' || status === 'claimed' || status === 'review';
+  });
+  const projHasActionable = Boolean(
+    existingProj
+    && Array.isArray(existingProj.tasks)
+    && existingProj.tasks.some((task) => {
+      const status = task && task.status;
+      return status === 'open' || status === 'claimed' || status === 'review';
+    }),
+  );
   let projection;
   let outPath;
-  if (rows.length === 0 && existingProj && Array.isArray(existingProj.tasks) && existingProj.tasks.length > 0) {
+  if (!dbHasActionable && projHasActionable) {
+    projection = existingProj;
+    outPath = path.resolve(path.join(workspaceRoot || '.', '.atris', 'state', 'tasks.projection.json'));
+  } else if (rows.length === 0 && existingProj && Array.isArray(existingProj.tasks) && existingProj.tasks.length > 0) {
     projection = existingProj;
     outPath = path.resolve(path.join(workspaceRoot || '.', '.atris', 'state', 'tasks.projection.json'));
   } else {
@@ -6911,9 +6949,9 @@ function cmdNext(args) {
   if (isUninitializedTaskFolder(root)) {
     if (wantsJson(args)) {
       printJson({
-        ok: true,
-        action: 'init',
-        command: 'atris init --minimal',
+        ok: false,
+        action: 'none',
+        command: firstTalkCommand(folderName(root)),
         task_id: null,
         owner: String(flag(args, '--as') || personName() || DEFAULT_OWNER),
         scope: normalizeTaskQueueScope(taskQueueScopeFromArgs(args)),
@@ -6922,9 +6960,7 @@ function cmdNext(args) {
       });
       return;
     }
-    const screen = buildFirstMinute({ root, fresh: true });
-    console.log(screen.text);
-    return;
+    return speakFirstMinute({ root, fresh: true });
   }
   if (!hasFlag(args, '--create-next')) return cmdNextTruth(args);
   const owner = flag(args, '--as') || DEFAULT_OWNER;
@@ -9796,16 +9832,17 @@ function appendRelabelArchivedJournalReceipt(workspaceRoot, { actor, count, ids
 function cmdReady(args) {
   const pos = positional(args);
   const id = pos[0];
-  if (!id) {
-    console.error('atris task ready: id required');
+  const proofFlag = flag(args, '--proof');
+  const verifyFlag = flag(args, '--verify');
+  const resultFlag = textFlag(args, ['--result']);
+  if (!id || (!proofFlag && !verifyFlag && !resultFlag)) {
+    console.log('Usage: atris task ready <id> --proof "..." --result "<sentence>"');
     process.exit(2);
   }
   // Two ways to prove: --proof "<note>" (claimed, pattern-checked) or
   // --verify "<command>" which actually RUNS the command and gates ready on exit 0.
   // If --proof names npm test, node --test, or git diff --check, this process
   // must have run that command. A sentence that names one of those is a lie.
-  const proofFlag = flag(args, '--proof');
-  const verifyFlag = flag(args, '--verify');
   const proofUrl = textFlag(args, ['--proof-url']);
   const iFetched = hasFlag(args, '--i-fetched');
   if (proofUrl && !iFetched) {

package/commands/terminal.js

@@ -2,7 +2,7 @@
  * atris terminal <business> <command...> [--timeout N]
  *
  * Run a shell command directly on a business EC2 workspace via the warm runner.
- * This is the load-bearing primitive for fast bulk ops — one bash call beats
+ * This is the load-bearing primitive for fast bulk ops: one bash call beats
  * hundreds of rate-limited individual file API calls.
  *
  * SAFETY:
@@ -27,7 +27,7 @@ const path = require('path');
 const { loadCredentials, abortOnAuthFailure } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { loadBusinesses, saveBusinesses } = require('./business');
-const { requireAccountBound, refuseAccountGlobal } = require('../lib/account-bound');
+const { looksLikeBusinessSlug, requireAccountBound, refuseAccountGlobal } = require('../lib/account-bound');
 const { argsWantHelp, wantsJson } = require('../lib/noninteractive');
 
 function sleep(ms) {
@@ -151,8 +151,8 @@ async function terminalAtris() {
     try { return JSON.parse(fs.readFileSync(bizFile, 'utf8')).slug; } catch { return null; }
   })();
 
-  // If first arg is a single word with no shell metacharacters, it might be a slug
-  const firstLooksLikeSlug = args[0] && /^[a-z0-9-]+$/i.test(args[0]) && !args[0].includes(' ');
+  // Flags like --json match a hyphenated word regex. Require a real slug first.
+  const firstLooksLikeSlug = looksLikeBusinessSlug(args[0]);
 
   if (firstLooksLikeSlug && args.length > 1) {
     slug = args[0];
@@ -161,7 +161,7 @@ async function terminalAtris() {
     slug = cwdSlug;
     command = args.join(' ');
   } else if (firstLooksLikeSlug && args.length === 1) {
-    // First (and only) arg is a slug-shaped word — could be the slug with no command
+    // First and only arg is a slug-shaped word with no command.
     console.error('Missing command. Usage: atris terminal <business> <command>');
     process.exit(1);
   } else {

package/commands/workflow.js

@@ -6,13 +6,16 @@ const {
   folderName,
   freshMinuteJson,
   isCertifiedReview,
+  listUserVisibleWork,
   isFreshWorkspace,
   personName,
   pickNext,
   renderWorkspace,
   speakFirstMinute,
   taskCommand,
+  visibleWorkTitle,
 } = require('../lib/first-minute');
+const { startFirstTalk } = require('../lib/context-gatherer');
 const { isNonInteractive } = require('../lib/noninteractive');
 const { loadContext } = require('../lib/state-detection');
 const { buildToolResultBody } = require('../lib/tool-result-encode');
@@ -64,7 +67,8 @@ function reviewSoftTitle(title, maxWords = 5) {
 }
 
 function isHumanDeskNext(command) {
-  return /^atris task (?:claim|ready|accept)\b/.test(String(command || ''));
+  const text = String(command || '');
+  return /^atris do\b/.test(text) || /^atris task (?:claim|show|ready|accept)\b/.test(text);
 }
 
 function loadReviewTasks(root = process.cwd()) {
@@ -506,7 +510,7 @@ async function planAtris(userInput = null) {
   // init --minimal is optional context, not a factory bounce.
   if (!fs.existsSync(targetDir)) {
     if (args.includes('--json')) {
-      console.log(JSON.stringify(freshMinuteJson(), null, 2));
+      console.log(JSON.stringify(freshMinuteJson(folderName(cwd), listUserVisibleWork(cwd), { root: cwd }), null, 2));
       process.exit(2);
     }
     const screen = buildFirstMinute({ root: cwd, fresh: true });
@@ -877,11 +881,21 @@ async function doAtris() {
   const cwd = process.cwd();
   const targetDir = path.join(cwd, 'atris');
 
-  // Empty folder talks like bare atris. Missing executor.md after
-  // init --minimal is optional context, not a factory bounce.
+  // Empty folder talks like bare atris. Files already here start
+  // first-talk, then next is atris do. After that work is yours,
+  // next is task ready so keep-working is not a do loop. Missing
+  // executor.md after init --minimal is optional context, not a
+  // factory bounce.
   if (!fs.existsSync(targetDir)) {
+    const visible = listUserVisibleWork(cwd);
+    if (visible.length) {
+      const title = visibleWorkTitle(visible, folderName(cwd));
+      const code = startFirstTalk(cwd, title, { asJson: args.includes('--json') });
+      if (code !== 0) process.exit(code);
+      return;
+    }
     if (args.includes('--json')) {
-      console.log(JSON.stringify(freshMinuteJson(), null, 2));
+      console.log(JSON.stringify(freshMinuteJson(folderName(cwd), visible, { root: cwd }), null, 2));
       process.exit(2);
     }
     const screen = buildFirstMinute({ root: cwd, fresh: true });

package/commands/x-search.js

@@ -2,9 +2,12 @@
 
 const { apiRequestJson } = require('../utils/api');
 const { ensureBilledCommandAuth } = require('./auth');
+const applyGate = require('../lib/apply-gate');
 
 const DEFAULT_TIMEOUT_MS = 120000;
 const COST_HINT = '5 credits per search';
+const APPLY_NEXT_MESSAGE =
+  'next: write one apply (change + receipt) for this query.';
 
 function showXSearchHelp(output = console.log, commandName = 'atris x-search') {
   output('');
@@ -13,6 +16,7 @@ function showXSearchHelp(output = console.log, commandName = 'atris x-search') {
   output('');
   output(`Search X/Twitter via Atris (${COST_HINT}).`);
   output('Requires login. Same auth path as atris youtube process.');
+  output('Empty or failed search refunds the credits.');
   output('');
   output('Options:');
   output('  --limit <n>         Max results hint (search only)');
@@ -213,6 +217,58 @@ function resultErrorText(result) {
   }
 }
 
+function unwrapXSearchPayload(data) {
+  return data?.data && typeof data.data === 'object' ? data.data : data;
+}
+
+function xSearchContent(data) {
+  const payload = unwrapXSearchPayload(data);
+  return payload?.content != null ? String(payload.content).trim() : '';
+}
+
+function xSearchCitations(data) {
+  const payload = unwrapXSearchPayload(data);
+  if (Array.isArray(payload?.citations)) return payload.citations;
+  if (Array.isArray(data?.citations)) return data.citations;
+  return [];
+}
+
+function xSearchCredits(data) {
+  if (!data || typeof data !== 'object') {
+    return { used: undefined, remaining: undefined, refunded: undefined };
+  }
+  const payload = unwrapXSearchPayload(data) || {};
+  const used = data.credits_used !== undefined ? data.credits_used : payload.credits_used;
+  const remaining = data.credits_remaining !== undefined
+    ? data.credits_remaining
+    : payload.credits_remaining;
+  let refunded = data.credits_refunded !== undefined
+    ? data.credits_refunded
+    : payload.credits_refunded;
+  if (refunded === undefined && (data.refunded === true || payload.refunded === true)) {
+    refunded = true;
+  }
+  return { used, remaining, refunded };
+}
+
+function creditsWereRefunded(credits) {
+  if (!credits) return false;
+  if (credits.used === 0) return true;
+  if (credits.refunded === true) return true;
+  return typeof credits.refunded === 'number' && credits.refunded > 0;
+}
+
+function formatCreditsLines(credits) {
+  const lines = [];
+  if (credits.used !== undefined || credits.remaining !== undefined) {
+    lines.push(`Credits: ${credits.used !== undefined ? credits.used : '?'} used, ${credits.remaining !== undefined ? credits.remaining : '?'} remaining`);
+  }
+  if (creditsWereRefunded(credits)) {
+    lines.push('credits refunded');
+  }
+  return lines;
+}
+
 function xSearchFailureError(result) {
   const hint = result.status === 401
     ? ' Run "atris login --force".'
@@ -221,7 +277,13 @@ function xSearchFailureError(result) {
       : result.status === 502
         ? ' xAI is unavailable; retry in a few seconds.'
         : '';
-  return new Error(`X search failed (${result.status}): ${resultErrorText(result)}.${hint}`);
+  const credits = xSearchCredits(result.data);
+  const refundHint = result.status === 502 && creditsWereRefunded(credits)
+    ? ' credits refunded.'
+    : '';
+  const lines = [`X search failed (${result.status}): ${resultErrorText(result)}.${hint}${refundHint}`];
+  lines.push(...formatCreditsLines(credits));
+  return new Error(lines.join('\n'));
 }
 
 async function ensureToken(deps = {}) {
@@ -265,13 +327,35 @@ async function runXSearch(options, deps = {}) {
   return result.data;
 }
 
+function xSearchApplySource(options) {
+  if (options?.mode === 'person') return options.name;
+  return options?.query;
+}
+
+function xSearchApplyRel(source) {
+  return applyGate.applySidecarRel('x-search', applyGate.applySlug(source));
+}
+
+function xSearchHasResults(data) {
+  return Boolean(xSearchContent(data)) || xSearchCitations(data).length > 0;
+}
+
+function ensureXSearchApply({ cwd, source, now, output } = {}) {
+  return applyGate.ensureApply({
+    cwd,
+    source,
+    rel: source ? xSearchApplyRel(source) : null,
+    now,
+    output,
+    incompleteMessage: APPLY_NEXT_MESSAGE,
+    required: false,
+  });
+}
+
 function formatXSearchResult(data) {
   const lines = [];
-  const payload = data?.data && typeof data.data === 'object' ? data.data : data;
-  const content = payload?.content != null ? String(payload.content).trim() : '';
-  const citations = Array.isArray(payload?.citations)
-    ? payload.citations
-    : (Array.isArray(data?.citations) ? data.citations : []);
+  const content = xSearchContent(data);
+  const citations = xSearchCitations(data);
 
   if (content) {
     lines.push(content);
@@ -289,18 +373,25 @@ function formatXSearchResult(data) {
     }
   }
 
-  const used = data?.credits_used !== undefined ? data.credits_used : payload?.credits_used;
-  const remaining = data?.credits_remaining !== undefined
-    ? data.credits_remaining
-    : payload?.credits_remaining;
-  if (used !== undefined || remaining !== undefined) {
+  const creditLines = formatCreditsLines(xSearchCredits(data));
+  if (creditLines.length) {
     lines.push('');
-    lines.push(`Credits: ${used !== undefined ? used : '?'} used, ${remaining !== undefined ? remaining : '?'} remaining`);
+    lines.push(...creditLines);
   }
 
   return lines.join('\n');
 }
 
+function formatEmptyXSearchResult(data) {
+  const lines = ['no results'];
+  const creditLines = formatCreditsLines(xSearchCredits(data));
+  if (creditLines.length) {
+    lines.push('');
+    lines.push(...creditLines);
+  }
+  return lines.join('\n');
+}
+
 async function xSearchCommand(argv = process.argv.slice(3), deps = {}) {
   const output = deps.output || ((line = '') => console.log(line));
   let options;
@@ -319,7 +410,23 @@ async function xSearchCommand(argv = process.argv.slice(3), deps = {}) {
   let status = 0;
   try {
     const data = await runXSearch(options, deps);
-    output(options.json ? JSON.stringify(data, null, 2) : formatXSearchResult(data));
+    const hasResults = xSearchHasResults(data);
+    if (options.json) {
+      output(JSON.stringify(data, null, 2));
+    } else {
+      output(hasResults ? formatXSearchResult(data) : formatEmptyXSearchResult(data));
+    }
+    if (hasResults) {
+      const ensureApply = deps.ensureApply || ensureXSearchApply;
+      status = ensureApply({
+        cwd: deps.cwd || process.cwd(),
+        source: xSearchApplySource(options),
+        now: deps.applyNow,
+        output,
+      });
+    } else {
+      status = 2;
+    }
   } catch (err) {
     output(err.message);
     status = 1;
@@ -332,9 +439,12 @@ async function xSearchCommand(argv = process.argv.slice(3), deps = {}) {
 
 module.exports = {
   DEFAULT_TIMEOUT_MS,
+  APPLY_NEXT_MESSAGE,
   parseXSearchArgs,
   buildSearchPayload,
   buildPersonPayload,
   formatXSearchResult,
+  xSearchHasResults,
+  xSearchApplyRel,
   xSearchCommand,
 };