atris 3.55.0 → 3.56.1

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,20 @@ 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. A second do stays two first-minute
+  // lines. 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,
 };