atris 3.74.26 → 3.74.27

package/commands/task.js

@@ -575,6 +575,20 @@ function landingFlags(args) {
   };
 }
 
+// The pull request and commit a flight merged on its own, so the job record
+// names what landed. Only a merge commit makes it count.
+function readyMergeFlags(args) {
+  const commit = textFlag(args, ['--merge-commit']);
+  if (!commit) return null;
+  return {
+    merge_commit: commit,
+    number: textFlag(args, ['--pr-number']),
+    url: textFlag(args, ['--pr-url']),
+    merged_at: textFlag(args, ['--merged-at']),
+    self_landed: hasFlag(args, '--self-landed'),
+  };
+}
+
 function normalizedLandingSentence(value) {
   return String(value || '').replace(/\s+/g, ' ').trim();
 }
@@ -9650,6 +9664,7 @@ function cmdReady(args) {
   const lesson = flag(args, '--lesson') || '';
   const nextTaskInput = normalizeReviewNextTaskInput(typeof flag(args, '--next') === 'string' ? flag(args, '--next') : '');
   const landing = landingFlags(args);
+  const merge = readyMergeFlags(args);
   guardExplicitActor('atris task ready', flag(args, '--as'));
   const actor = String(flag(args, '--as') || DEFAULT_OWNER);
   const resultFields = {
@@ -9697,6 +9712,7 @@ function cmdReady(args) {
     nextTask: nextTaskInput.nextTask,
     resultTrace: resultTrace && resultTrace.trace,
     landing,
+    merge,
     result: resultSentence,
   });
   if (!result.ready) {

package/commands/worktree.js

@@ -1125,7 +1125,7 @@ function shipWorktree(args) {
         }
         // A merge queue accepts the request before merging. Deleting its head
         // here closes the PR and cancels that request, so confirm the outcome.
-        const confirmation = spawnSync('gh', ['pr', 'view', mergeRef, '--json', 'state,mergedAt'], { cwd: root, encoding: 'utf8' });
+        const confirmation = spawnSync('gh', ['pr', 'view', mergeRef, '--json', 'state,mergedAt,number,url,mergeCommit'], { cwd: root, encoding: 'utf8' });
         if (confirmation.status !== 0) {
           throw new Error('could not confirm the merge; the source branch was kept');
         }
@@ -1141,6 +1141,10 @@ function shipWorktree(args) {
           throw new Error('the change was not merged; the source branch was kept');
         }
         console.log('merge: merged');
+        // One machine-readable line, so a caller can save which pull request
+        // and commit landed. The rating only counts a landing it can point at.
+        const record = shipMergeRecord(state);
+        if (record) console.log(`merge: record ${JSON.stringify(record)}`);
         const deleted = runGit(['push', 'origin', '--delete', branch], { cwd: root, check: false });
         if (deleted.status === 0) {
           console.log(`merge: remote branch deleted ${branch}`);
@@ -1165,6 +1169,17 @@ function shipWorktree(args) {
   return 0;
 }
 
+// The landed pull request from `gh pr view --json`, or null without a merge commit.
+function shipMergeRecord(state) {
+  const commit = state && state.mergeCommit && typeof state.mergeCommit === 'object' ? state.mergeCommit.oid : null;
+  if (typeof commit !== 'string' || !/^[0-9a-f]{7,64}$/i.test(commit)) return null;
+  const record = { merge_commit: commit };
+  if (Number.isInteger(state.number) && state.number > 0) record.number = state.number;
+  if (typeof state.url === 'string' && state.url) record.url = state.url;
+  if (typeof state.mergedAt === 'string' && state.mergedAt) record.merged_at = state.mergedAt;
+  return record;
+}
+
 function guard(args) {
   const root = repoRoot();
   const worktrees = listWorktrees(root);

package/lib/fleet.js

@@ -1483,6 +1483,28 @@ function shipFailureDetail(shipped, { head = 400, tail = 500 } = {}) {
   return `${cause}${headTail(combined.trim(), head, tail)}`;
 }
 
+// The `merge: record {...}` line worktree ship prints after a confirmed merge.
+function shipMergeRecord(stdout) {
+  const line = String(stdout || '').match(/^merge: record (\{.*\})\s*$/m);
+  if (!line) return null;
+  try {
+    const record = JSON.parse(line[1]);
+    return record && typeof record === 'object' && typeof record.merge_commit === 'string' ? record : null;
+  } catch {
+    return null;
+  }
+}
+
+// task ready flags that name the pull request a flight merged by itself.
+function landedMergeFlags(merge) {
+  if (!merge || !merge.merge_commit) return [];
+  const flags = ['--merge-commit', merge.merge_commit, '--self-landed'];
+  if (merge.number) flags.push('--pr-number', String(merge.number));
+  if (merge.url) flags.push('--pr-url', merge.url);
+  if (merge.merged_at) flags.push('--merged-at', merge.merged_at);
+  return flags;
+}
+
 function fleetShipArgs(entry, check, targetRef = resolveDispatchLandTarget(entry.worktreePath || process.cwd())) {
   return [
     'worktree', 'ship',
@@ -1629,6 +1651,8 @@ module.exports = {
   runInReapedProcessGroup,
   shipWithRetry,
   shipFailureDetail,
+  shipMergeRecord,
+  landedMergeFlags,
   get FLEET_CAPABLE() { return FLEET_CAPABLE; },
   get DISPATCH_CAPABLE() { return DISPATCH_CAPABLE; },
   get runFleetFlight() { return runFleetFlight; },
@@ -3272,7 +3296,7 @@ async function runFleetFlight({
     if (shipped.status !== 0 || !/done: worktree shipped/.test(shipped.stdout)) {
       return { ok: false, stage: 'ship', detail: shipFailureDetail(shipped) };
     }
-    return { ok: true, stage: 'shipped' };
+    return { ok: true, stage: 'shipped', merge: shipMergeRecord(shipped.stdout) };
   });
 
   for (const { entry, result } of results) {
@@ -3309,6 +3333,7 @@ async function runFleetFlight({
         'task', 'ready', String(entry.task.display_id),
         '--proof', `Built by ${activeEngine} engine in fleet flight.${restaffProof} Landed via worktree ship gate (rebase-before-ship, verify re-run). Receipt saved at ${path.relative(root, receiptPath)}. Report tail: ${headTail(String(result.report || '').replace(/\n/g, ' '))}`,
         '--result', 'Operators can now review fleet-shipped work faster because the worktree was verified before landing.',
+        ...landedMergeFlags(landed.merge),
         '--as', `fleet-${activeEngine}`,
       ], { flight, landedRow, worktree: entry.worktreePath, save: () => atomicWriteFlightReceipt(flight, receiptPath) });
       if (!reviewRecorded) {
@@ -3795,6 +3820,7 @@ async function runDispatchFlight({
     return {
       ok: true,
       stage: 'shipped',
+      merge: shipMergeRecord(shipped.stdout),
       check,
       verifyOutput: `${verified.stdout}${verified.stderr}`,
       verifier_result: verifierResult,
@@ -4195,6 +4221,7 @@ async function runDispatchFlight({
         '--result', 'Operators can now review engine-built work faster because dispatch reran the verifier before landing.',
         '--checked', `${landed.check} passed before landing`,
         '--tested', 'The requested behavior passed its declared verifier.',
+        ...landedMergeFlags(landed.merge),
         '--as', readyActor,
       ], { flight, landedRow, worktree: entry.worktreePath, save: () => writeDispatchReceipt(flight, receiptPath, { ids, reviewOnly: proofOnly, enforceRemoteBoundary }) });
       if (!reviewRecorded) {

package/lib/gm-season.js

@@ -301,7 +301,7 @@ function parseJson(text) {
 }
 
 function landedBy(row, payload) {
-  if (payload && payload.auto_accepted === true) return 'autoland';
+  if (payload && (payload.auto_accepted === true || payload.self_landed === true)) return 'autoland';
   return /auto/i.test(String(row.actor || '')) ? 'autoland' : 'you';
 }
 

package/lib/task-db.js

@@ -1044,7 +1044,23 @@ function recordReviewPassActor(metadata, claimedBy, rawActor) {
   return { builder: builder || null, independent };
 }
 
-function readyTask(db, { id, actor, proof, lesson, nextTask, landing = {}, resultTrace, result: resultSentence, reason, workRoot }) {
+// A merge the caller confirmed. The commit id is required; the other fields
+// are kept only when they look right.
+function cleanMergeRecord(merge) {
+  if (!merge || typeof merge !== 'object') return null;
+  const commit = String(merge.merge_commit || '').trim();
+  if (!/^[0-9a-f]{7,64}$/i.test(commit)) return null;
+  const record = { merge_commit: commit.toLowerCase() };
+  const number = Number(merge.number);
+  if (Number.isInteger(number) && number > 0) record.number = number;
+  const url = String(merge.url || '').trim();
+  if (/^https?:\/\//i.test(url)) record.url = url;
+  const mergedAt = String(merge.merged_at || '').trim();
+  if (mergedAt && Number.isFinite(Date.parse(mergedAt))) record.merged_at = mergedAt;
+  return record;
+}
+
+function readyTask(db, { id, actor, proof, lesson, nextTask, landing = {}, merge = null, resultTrace, result: resultSentence, reason, workRoot }) {
   if (!id) throw new Error('id required');
   const text = String(proof || '').trim();
   if (!text) throw new Error('proof required');
@@ -1073,6 +1089,8 @@ function readyTask(db, { id, actor, proof, lesson, nextTask, landing = {}, resul
     const cleaned = cleanLandingText(landingInput[key]);
     if (cleaned) metadata[`landing_${key}`] = cleaned;
   }
+  const mergeRecord = cleanMergeRecord(merge);
+  if (mergeRecord) metadata.merge_commit = mergeRecord.merge_commit;
   // Only the builder's own ready names the work's commit. A reviewer or the
   // autoland verifier re-runs the check from its own checkout; stamping that
   // checkout's HEAD would name a commit the builder never made. No actor, or
@@ -1121,6 +1139,12 @@ function readyTask(db, { id, actor, proof, lesson, nextTask, landing = {}, resul
     tested: metadata.landing_tested || null,
     decision: metadata.landing_decision || null,
   };
+  if (mergeRecord) {
+    payload.landing.merge_commit = mergeRecord.merge_commit;
+    payload.pull_request = { state: 'merged', ...mergeRecord };
+    // Landed by the flight with no person in the loop.
+    if (merge.self_landed === true) payload.self_landed = true;
+  }
   const event = appendTaskEvent(db, {
     taskId: id,
     workspaceRoot: updated.workspace_root,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.74.26",
+  "version": "3.74.27",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "mcpName": "io.github.atrislabs/atris",
   "main": "bin/atris.js",