arkgate 4.6.5 → 4.6.6

package/bin/lib/html-report.mjs

@@ -110,7 +110,7 @@ export function baselineSignalHint(signal) {
 export function modeBadgeHint(mode) {
   switch (String(mode || '').toLowerCase()) {
     case 'enforce':
-      return 'Contract matches the tree: cores are required where populated, coverage is honest, gates can hold the line.';
+      return 'Contract matches the tree on checked import edges. Required GitHub status (or an advisory-only ack) is what adopts the merge boundary.';
     case 'adapt':
       return 'Contract is live but still aligning (optional cores with files, empty cores, or presentation-bag false green).';
     case 'suggest':
@@ -255,7 +255,7 @@ export function computeReportFitness({ coverage, violations, ok, enforcement, co
   const modeBlurb = {
     suggest: 'Starter shape — expand layers as the codebase grows.',
     adapt: 'Contract is live; raise governed coverage or match real folders.',
-    enforce: 'Contract governs the tree. Gates can honestly hold the line.',
+    enforce: 'Contract matches the tree on checked import edges. Merge is adopted only with a required GitHub status or an advisory-only ack.',
   }[mode];
   const scoreCoverage = governedPercent == null ? 50 : governedPercent;
   const scoreClean =

package/bin/lib/mcp-adoption.mjs

@@ -17,6 +17,11 @@ import { detectActiveAgentHost, skillTemplateNames } from './skill-install.mjs';
 import { detectDeployPathQuality } from './deploy-path.mjs';
 import { collectWeakestLinkGaps } from './weakest-link.mjs';
 import { codexRuntimeActivation, withCiProviderEvidence } from './enforcement-state.mjs';
+import {
+  classifyAdopted,
+  readAdoptionStance,
+  NOT_ADOPTED_NEXT_ACTION,
+} from './adoption-stance.mjs';
 
 export { detectDeployPathQuality };
 
@@ -528,6 +533,20 @@ export function collectAdoptionGaps(root, config, coverage) {
     gaps.push(g);
   }
 
+  const adoptedKind = classifyAdopted({
+    stance: readAdoptionStance(root),
+    github: weakest.github,
+  });
+  if (adoptedKind === 'not-adopted') {
+    gaps.push({
+      id: 'adoption-stance-missing',
+      severity: 'warn',
+      message:
+        'Merge boundary not adopted: require a GitHub status on arkgate-check --strict-merge, or write .ark/adoption-stance.json with stance: "advisory-only".',
+      fix: NOT_ADOPTED_NEXT_ACTION,
+    });
+  }
+
   return {
     gaps,
     hosts,

package/bin/lib/policy-delta-io.mjs

@@ -42,7 +42,7 @@ function repositoryRoot(root) {
   return result.status === 0 ? result.stdout.trim() : null;
 }
 
-function discoverLocalBaseRef(root) {
+export function discoverLocalBaseRef(root) {
   const top = repositoryRoot(root);
   if (!top) return null;
   const remoteHead = runGit(top, ['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']);

package/bin/lib/post-green-path.mjs

@@ -92,10 +92,14 @@ export function mergePostGreenTopActions(actions, postGreen) {
 
 /**
  * Whether doctor may print “Healthy — nothing to do”.
+ * Empty actions + !designWeak is not Healthy unless the merge boundary is
+ * required-merge (advisory-only ack is adopted but not this Healthy string).
  * @param {{ designWeak?: boolean } | null | undefined} designFitness
  * @param {string[]} topActions
+ * @param {string | null | undefined} adopted
  */
-export function isDoctorHealthyNothingToDo(designFitness, topActions = []) {
+export function isDoctorHealthyNothingToDo(designFitness, topActions = [], adopted = null) {
   if (designFitness?.designWeak) return false;
+  if (adopted !== 'required-merge') return false;
   return !topActions.some(Boolean);
 }

package/bin/lib/product-copy.mjs

@@ -13,17 +13,20 @@ export const LEFTOVER_DESIGN_LABEL = 'leftover design work';
  * Operating-mode title for humans (and doctor JSON `designFitness.label` prefix).
  * @param {string|null|undefined} mode suggest|adapt|enforce
  * @param {boolean} leftoverDesign
+ * @param {boolean} [stewardsUnset]
  */
-export function operatingModeTitle(mode, leftoverDesign) {
+export function operatingModeTitle(mode, leftoverDesign, stewardsUnset) {
   const light = String(mode || 'enforce').toUpperCase();
-  return leftoverDesign ? `${light} · ${LEFTOVER_DESIGN_LABEL}` : light;
+  if (leftoverDesign) return `${light} · ${LEFTOVER_DESIGN_LABEL}`;
+  if (stewardsUnset) return `${light} · stewards unset`;
+  return light;
 }
 
 /** Short HTML/doctor badge text. */
 export const LEFTOVER_DESIGN_BADGE = LEFTOVER_DESIGN_LABEL;
 
 export const POST_GREEN_HUMAN =
-  'Imports check out, but the design is still messy. Map leftover work with /ark-explore shape-focus, then apply one small refactor via /ark-autopilot. A clean import check is not done; pattern bets are never auto-applied.';
+  'Imports check out, but the design is still messy. Next: /ark-explore, then one small refactor with /ark-autopilot and your OK.';
 
 export const POST_GREEN_LEDE =
   'Import rules are clean, but leftover design work remains. That does not fail the check — it only means “done” is still wrong until you tidy shape.';

package/bin/lib/start-preview.mjs

@@ -151,7 +151,7 @@ export function renderStartPreview(preview, options = {}) {
     console.log('Apply this plan with: arkgate start --apply');
   }
   if (preview.analysis) {
-    console.log(`Your project looks like: ${preview.analysis.label} (${preview.analysis.archetype}, confidence ${preview.analysis.confidence}).`);
+    console.log(`Your project looks like: ${preview.analysis.label}.`);
   }
   console.log(applying ? 'Files create/edit/delete:' : 'Files to create/edit/delete:');
   if (preview.changes.length === 0) console.log('  (none)');
@@ -159,34 +159,24 @@ export function renderStartPreview(preview, options = {}) {
     console.log(`  ${change.action.padEnd(6)} ${change.path}`);
   }
   if (!applying) {
-    console.log('Commands in the approved setup plan:');
-    for (const command of preview.commands) console.log(`  ${command}`);
+    console.log('Setup: install package + host gates (see --json).');
+    console.log('Preview does not write. Apply installs CI.');
   }
-  console.log('Host guarantees:');
-  for (const guarantee of preview.hostGuarantees) console.log(`  ${guarantee}`);
   if (preview.runtimeActivation) {
-    console.log('Codex MCP CONFIGURED — RUNTIME NOT VERIFIED.');
-    console.log(`  Runtime activation: ${JSON.stringify(preview.runtimeActivation)}`);
-    console.log(`  Restart Codex, then call ark_identity with expectedRoot "${preview.root}".`);
-    console.log('  Do not trust MCP verdicts before the project identity matches.');
+    console.log('Host: Codex is configured but not verified yet. Restart the host, then confirm this project.');
   }
   if (preview.unresolvedDecisions.length > 0) {
     console.log('Unresolved decisions:');
     for (const decision of preview.unresolvedDecisions) console.log(`  ${decision}`);
   }
-  console.log('Details (optional):');
-  console.log(`Projected governed coverage: ${preview.projectedCoverage.percent ?? 'unknown'}% (${preview.projectedCoverage.classifiedFiles}/${preview.projectedCoverage.totalFiles} files)`);
-  const budget = preview.setupBudget;
-  const arkrulesNote =
-    budget.arkrulesFiles > 0 ? ` (+${budget.arkrulesFiles} arkrules)` : '';
-  const gateCount = budget.gateFiles ?? budget.files;
-  console.log(
-    `Compact setup budget: ${gateCount}/${budget.maxFiles} gate files${arkrulesNote}, ${budget.bytes}/${budget.maxBytes} bytes${budget.ok ? '' : ' (exceeded)'}.`
-  );
-  for (const change of preview.changes) {
-    console.log(`  ${change.action.padEnd(6)} ${change.path}  ${change.afterHash ?? '(deleted)'}`);
-  }
-  if (!applying) {
+  if (applying) {
+    const percent = preview.projectedCoverage?.percent;
+    if (percent != null) console.log(`Projected governed coverage: ${percent}%`);
+    const verified = (preview.hostGuarantees || []).find((line) =>
+      String(line).startsWith('Hard-write hook verified')
+    );
+    if (verified) console.log(verified);
+  } else {
     console.log('Review complete file contents with --json.');
   }
 }

package/bin/lib/status-command.mjs

@@ -26,6 +26,7 @@ import { readBaseline } from './violations.mjs';
 import { reportsDir, readJsonSafe } from './html-report.mjs';
 import { summarizeRulesUnderContract } from './rules-under-contract.mjs';
 import { collectVsBaseFacts, discoverTeamBaseRef } from './team-parliament-io.mjs';
+import { classifyAdopted, readAdoptionStance } from './adoption-stance.mjs';
 
 function sha256Hex(value) {
   return createHash('sha256').update(value, 'utf8').digest('hex');
@@ -387,6 +388,21 @@ export function collectStatusFacts(options = {}) {
       latest?.leftoverDesignWork === true ||
       latest?.designFitness?.designWeak === true ||
       latest?.doctor?.designFitness?.designWeak === true,
+    adopted:
+      options.adopted ??
+      classifyAdopted({
+        stance: readAdoptionStance(resolvedRoot),
+        github: {
+          requiredStatusConfigured: writePath?.enforcementState?.ciMerge?.required === true,
+          arkCheckRequired: writePath?.enforcementState?.ciMerge?.required === true,
+        },
+        ci: {
+          state:
+            writePath?.enforcementState?.ciMerge?.required === true
+              ? 'required'
+              : undefined,
+        },
+      }),
     improvementCompass,
     vsBase: (() => {
       const vsRef = typeof options.vs === 'string' ? options.vs.trim() : '';

package/bin/lib/status-manifest.mjs

@@ -242,9 +242,15 @@ export function resolveStatusNextAction(facts, binding, activation, lastCheck, r
             summary: 'ArkRules residual remains frozen — review inventory debt without claiming a score.',
         };
     }
+    if (facts.adopted === 'required-merge' || facts.adopted === 'advisory-only-acked') {
+        return {
+            id: 'stay-enforced',
+            summary: 'Contract looks enforceable for this session — keep writing through the gate and re-check after structural edits.',
+        };
+    }
     return {
-        id: 'stay-enforced',
-        summary: 'Contract looks enforceable for this session — keep writing through the gate and re-check after structural edits.',
+        id: 'require-ci-merge-status',
+        summary: 'Make arkgate-check --strict-merge a required GitHub status, or write .ark/adoption-stance.json with stance: "advisory-only".',
     };
 }
 export function buildStatusManifest(facts) {

package/bin/lib/team-parliament-io.mjs

@@ -203,11 +203,30 @@ export function teamCheckRequested(args, config) {
       args.against ||
       args.persona ||
       args.contractSession ||
+      args.updateBaseline ||
       (args.strictMerge && teamStewardsFromConfig(config).length > 0)
   );
 }
 
 export function runTeamPreflight({ root, args, config, policyDelta, teamBase }) {
+  const weakening =
+    policyDelta?.classification === 'weakening' ||
+    policyDelta?.classification === 'judgment-required';
+  if (weakening && !contractSessionFrom(args)) {
+    const message =
+      'Weakening the contract requires --contract-session (and --policy-ack bound to both hashes).';
+    const teamParliament = {
+      deny: true,
+      reasonId: 'steward-only-loosen',
+      message,
+      kinds: ['loosen'],
+    };
+    return {
+      halt: { exitCode: 1, message, teamParliament, fail: true },
+      teamParliament,
+      changedPaths: [],
+    };
+  }
   if (!teamCheckRequested(args, config)) {
     return { halt: null, teamParliament: null, changedPaths: [] };
   }
@@ -301,7 +320,24 @@ export function applyAgainstRatchet({
   };
 }
 
+/** Cheap doctor-path probe: skip git spawns on non-repos (hook-path bench tmpdirs). */
+function gitDirPresent(root) {
+  let dir = path.resolve(root);
+  for (let i = 0; i < 10; i += 1) {
+    try {
+      if (fs.existsSync(path.join(dir, '.git'))) return true;
+    } catch {
+      return false;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return false;
+}
+
 function gitAuthors(root) {
+  if (!gitDirPresent(root)) return [];
   const log = runGit(root, ['log', '--format=%aN<%aE>', '--max-count=300']);
   if (log.status !== 0) return [];
   const ids = [];
@@ -328,11 +364,35 @@ function readCodeowners(root) {
   return [];
 }
 
-/** Advisory only. Never flips a gate. Missing git is honest empty, not green. */
-export function collectStewardNudge(root, config) {
+function gitFirstAddIso(root, relPath) {
+  if (!gitDirPresent(root)) return null;
+  const log = runGit(root, ['log', '--diff-filter=A', '--follow', '--format=%cI', '--', relPath]);
+  if (log.status !== 0) return null;
+  const lines = log.stdout
+    .split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean);
+  return lines.length > 0 ? lines[lines.length - 1] : null;
+}
+
+/** Tooling clock: git first-add of ark.config.json vs injected `now`. Domain never clocks. */
+export function adoptAgeDaysFromGit(root, relPath, now) {
+  const iso = gitFirstAddIso(root, relPath);
+  if (!iso) return { days: null, source: 'unavailable' };
+  const then = Date.parse(iso);
+  const nowMs = now instanceof Date ? now.getTime() : Number(now);
+  if (!Number.isFinite(then) || !Number.isFinite(nowMs)) return { days: null, source: 'unavailable' };
+  return { days: Math.floor((nowMs - then) / 86_400_000), source: 'git-first-add' };
+}
+
+/** Advisory residual. Never flips `valid` / `goal.met`. Missing git is unknown age, not green. */
+export function collectStewardNudge(root, config, options = {}) {
+  const now = options.now instanceof Date ? options.now : options.now != null ? new Date(options.now) : new Date();
+  const age = adoptAgeDaysFromGit(root, options.configRel || 'ark.config.json', now);
   return suggestStewards({
     existingStewards: teamStewardsFromConfig(config),
     gitAuthors: gitAuthors(root),
     codeowners: readCodeowners(root),
+    adoptAgeDays: age.days,
   });
 }

package/bin/lib/team-parliament.mjs

@@ -198,8 +198,9 @@ export function parseCodeownersHandles(text) {
 }
 /**
  * Empty list + several hands → propose owners.
+ * Empty list + grace elapsed or unknown age → unfinished residual (not a new operating mode).
  * Existing list + CODEOWNERS ahead or author count grew → show the gap.
- * Never a gate input. Propose GitHub handles or emails — never git display names. Never auto-remove.
+ * Never a layer / `valid` / `goal.met` input. Propose GitHub handles or emails — never git display names.
  */
 export function suggestStewards(input) {
     const existing = [
@@ -224,7 +225,9 @@ export function suggestStewards(input) {
     ];
     const authorCount = Math.max(uniqueGit.length, fromOwners.length);
     const multiHand = uniqueGit.length >= 2 || fromOwners.length >= 1;
-    const needsStewards = multiHand && existing.length === 0;
+    const age = input.adoptAgeDays;
+    const emptyStewardsPastGrace = existing.length === 0 && (age === null || (typeof age === 'number' && age >= 30));
+    const needsStewards = existing.length === 0 && (multiHand || emptyStewardsPastGrace);
     const missingFromList = fromOwners.filter((id) => !existing.includes(id));
     const teamGrew = existing.length > 0 &&
         fromOwners.length === 0 &&
@@ -238,24 +241,29 @@ export function suggestStewards(input) {
     const named = proposed.map((id) => formatStewardMention(id)).join(', ');
     const listed = existing.map((id) => formatStewardMention(id)).join(', ');
     let ask = '';
-    if (needsStewards) {
+    if (needsStewards && multiHand) {
         ask =
             proposed.length > 0
                 ? `This repo has several people and no stewards. Add ${named} as stewards so only they can loosen the law or grow the baseline? Say yes, or name the GitHub handles or emails.`
                 : 'This repo has several people and no stewards. Who owns ark.config.json? Name GitHub handles or emails for the stewards[] list.';
     }
+    else if (needsStewards) {
+        ask =
+            'No stewards listed. Name GitHub handles or emails for `stewards[]`, or this stays Adapt-or-nudge — not a finished Enforce. `/ark-adopt` asks; it does not invent names.';
+    }
     else if (missingFromList.length > 0) {
         ask = `CODEOWNERS is ahead of stewards[]: add ${missingFromList.map((id) => formatStewardMention(id)).join(', ')}? The current list stays unless you say yes or name the GitHub handles or emails.`;
     }
     else if (teamGrew) {
         ask = `This repo started with ${existing.length} steward(s) (${listed}) and now has ${uniqueGit.length} recent git authors. Who else owns the law? Name GitHub handles or emails, or say the list is still right.`;
     }
-    const shouldAct = needsStewards || drift;
+    const shouldAct = needsStewards || drift || emptyStewardsPastGrace;
     return {
         advisory: true,
         notAScore: true,
         multiHand,
         needsStewards,
+        emptyStewardsPastGrace,
         drift,
         authorCount,
         stewardCount: existing.length,
@@ -266,6 +274,7 @@ export function suggestStewards(input) {
         nextAction: shouldAct
             ? '/ark-adopt (ask, then update stewards[] — do not invent names)'
             : '',
+        adoptAgeDays: typeof age === 'number' ? age : null,
     };
 }
 export function personaCheckBudget(persona) {
@@ -310,7 +319,8 @@ export function isTeamPersona(value) {
 /**
  * Gate for a diff vs the merge base.
  * Contract session still forbids mixing law with product source.
- * Loosen / baseline-grow require a steward when the list is non-empty.
+ * Loosen / baseline-grow require --contract-session even when stewards is empty.
+ * A non-empty list additionally requires a matching listed author.
  */
 export function evaluateTeamGate(input) {
     const kinds = [];
@@ -338,6 +348,16 @@ export function evaluateTeamGate(input) {
     const stewards = input.stewards ?? [];
     const grow = (input.baselineGrowCount ?? 0) > 0;
     const loosen = input.policyKind === 'loosen';
+    if ((loosen || grow) && !input.contractSession) {
+        return {
+            deny: true,
+            reasonId: loosen ? 'steward-only-loosen' : 'steward-only-baseline-grow',
+            message: loosen
+                ? 'Weakening the contract requires --contract-session (and --policy-ack bound to both hashes).'
+                : 'Growing the baseline requires --contract-session. Freeze in a law-only PR.',
+            kinds,
+        };
+    }
     if (stewards.length > 0 && (loosen || grow) && !isSteward(input.author, stewards)) {
         return {
             deny: true,

package/bin/lib/unavailable-analysis.mjs

@@ -45,6 +45,7 @@ export function reportUnavailableAnalysis({
       configWalkedUp: args.configWalkedUp === true,
       parseHealth,
       completeness,
+      all: args.all === true,
     });
     process.exitCode = 2;
     return;