arkgate 4.6.5 → 4.6.7

package/bin/lib/mcp-hook-payload.mjs

@@ -0,0 +1,328 @@
+/**
+ * Host PreToolUse payload mapping (Claude/Grok/Cursor/Antigravity/Codex).
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+
+/**
+ * Map Google Antigravity write tools (PascalCase args) onto Claude Write/Edit/MultiEdit.
+ * @returns {{ toolName: string, toolInput: object }|null}
+ */
+export function mapAntigravityToolCall(toolCall) {
+  if (!toolCall || typeof toolCall !== 'object') return null;
+  const name = toolCall.name ?? '';
+  const args = toolCall.args && typeof toolCall.args === 'object' ? toolCall.args : {};
+  const filePath = args.TargetFile ?? args.targetFile ?? args.file_path ?? args.path;
+  if (name === 'write_to_file') {
+    return {
+      toolName: 'Write',
+      toolInput: {
+        file_path: filePath,
+        content: args.CodeContent ?? args.codeContent ?? args.content ?? '',
+      },
+      operation: 'write_to_file',
+    };
+  }
+  if (name === 'replace_file_content') {
+    return {
+      toolName: 'Edit',
+      toolInput: {
+        file_path: filePath,
+        old_string: args.TargetContent ?? args.targetContent ?? args.old_string ?? '',
+        new_string: args.ReplacementContent ?? args.replacementContent ?? args.new_string ?? '',
+        replace_all: Boolean(args.AllowMultiple ?? args.allowMultiple),
+      },
+      operation: 'replace_file_content',
+    };
+  }
+  if (name === 'multi_replace_file_content') {
+    const chunks = Array.isArray(args.ReplacementChunks)
+      ? args.ReplacementChunks
+      : Array.isArray(args.replacementChunks)
+        ? args.replacementChunks
+        : [];
+    return {
+      toolName: 'MultiEdit',
+      toolInput: {
+        file_path: filePath,
+        edits: chunks.map((chunk) => ({
+          old_string: chunk?.TargetContent ?? chunk?.targetContent ?? chunk?.old_string ?? '',
+          new_string:
+            chunk?.ReplacementContent ?? chunk?.replacementContent ?? chunk?.new_string ?? '',
+          replace_all: Boolean(chunk?.AllowMultiple ?? chunk?.allowMultiple),
+        })),
+      },
+      operation: 'multi_replace_file_content',
+    };
+  }
+  return {
+    toolName: name,
+    toolInput: { ...args, file_path: filePath },
+    operation: name,
+  };
+}
+
+/**
+ * Normalize agent PreToolUse payloads.
+ * Claude Code: { tool_name, tool_input: { file_path, content | old_string/new_string } }
+ * Grok Build:  { toolName, toolInput:  { file_path, content | old_string/new_string } }
+ *              (aliases Write/Edit/MultiEdit → write/search_replace; matcher keeps both)
+ * Antigravity: { toolCall: { name, args: { TargetFile, CodeContent, … } } }
+ * Cursor:      { tool_name, tool_input, hook_event_name?, workspace_roots? }
+ *              Write uses `contents`; StrReplace maps to Edit (path/old_string/new_string).
+ * Codex:       { tool_name: "apply_patch", tool_input: { command: "*** Begin Patch..." } }
+ */
+export function normalizeHookPayload(payload, grokHookEvent = Boolean(process.env.GROK_HOOK_EVENT)) {
+  const antigravityStyle =
+    payload != null && typeof payload === 'object' && 'toolCall' in payload;
+  if (antigravityStyle) {
+    const mapped = mapAntigravityToolCall(payload.toolCall);
+    const filePath =
+      mapped?.toolInput?.file_path ??
+      mapped?.toolInput?.filePath ??
+      mapped?.toolInput?.path ??
+      mapped?.toolInput?.target_file;
+    return {
+      toolName: mapped?.toolName ?? '',
+      toolInput: { ...(mapped?.toolInput ?? {}), file_path: filePath },
+      grokStyle: true, // decision JSON on stdout (deny)
+      antigravityStyle: true,
+      cursorStyle: false,
+      operation: mapped?.operation ?? mapped?.toolName ?? null,
+    };
+  }
+
+  const rawName = payload?.tool_name ?? payload?.toolName ?? '';
+  const toolInputRaw = payload?.tool_input ?? payload?.toolInput ?? {};
+  const toolInput =
+    toolInputRaw && typeof toolInputRaw === 'object' ? { ...toolInputRaw } : {};
+  // Cursor Write uses `contents`; Claude/Grok use `content`.
+  if (toolInput.content == null && typeof toolInput.contents === 'string') {
+    toolInput.content = toolInput.contents;
+  }
+  const nameMap = {
+    Write: 'Write',
+    write: 'Write',
+    Edit: 'Edit',
+    search_replace: 'Edit',
+    StrReplace: 'Edit',
+    MultiEdit: 'MultiEdit',
+    ApplyPatch: 'ApplyPatch',
+    apply_patch: 'ApplyPatch',
+    write_to_file: 'Write',
+    replace_file_content: 'Edit',
+    multi_replace_file_content: 'MultiEdit',
+  };
+  const toolName = nameMap[rawName] ?? rawName;
+  const filePath =
+    toolInput.file_path ?? toolInput.filePath ?? toolInput.path ?? toolInput.target_file;
+  const cursorStyle =
+    Boolean(process.env.CURSOR_PROJECT_DIR) ||
+    Boolean(process.env.CURSOR_VERSION) ||
+    (payload != null &&
+      typeof payload === 'object' &&
+      (payload.hook_event_name === 'preToolUse' ||
+        Array.isArray(payload.workspace_roots) ||
+        rawName === 'StrReplace' ||
+        (rawName === 'Write' && typeof toolInputRaw?.contents === 'string')));
+  return {
+    toolName,
+    toolInput: { ...toolInput, file_path: filePath },
+    // Grok-style camelCase (or GROK_HOOK_EVENT) → also emit deny JSON on stdout.
+    grokStyle:
+      grokHookEvent ||
+      (payload != null && typeof payload === 'object' && 'toolName' in payload),
+    antigravityStyle: false,
+    cursorStyle,
+    operation: rawName === 'StrReplace' ? 'StrReplace' : null,
+  };
+}
+
+export function applyCodexUpdatePatch(current, lines) {
+  let source = current.split('\n');
+  let cursor = 0;
+  const hunks = [];
+  let hunk = null;
+  for (const line of lines) {
+    if (line.startsWith('@@')) {
+      if (hunk) hunks.push(hunk);
+      hunk = { anchor: line.slice(2).trim(), entries: [] };
+    } else if (/^[ +\-]/.test(line)) {
+      if (!hunk) return null;
+      hunk.entries.push(line);
+    }
+  }
+  if (hunk) hunks.push(hunk);
+  for (const { anchor, entries } of hunks) {
+    if (anchor) {
+      const anchorAt = source.findIndex((line, index) => index >= cursor && line === anchor);
+      if (anchorAt < 0) return null;
+      cursor = anchorAt + 1;
+    }
+    const oldLines = entries.filter((line) => !line.startsWith('+')).map((line) => line.slice(1));
+    const newLines = entries.filter((line) => !line.startsWith('-')).map((line) => line.slice(1));
+    let found = -1;
+    for (let at = cursor; at <= source.length - oldLines.length; at += 1) {
+      if (oldLines.every((line, index) => source[at + index] === line)) {
+        found = at;
+        break;
+      }
+    }
+    if (found < 0) return null;
+    source.splice(found, oldLines.length, ...newLines);
+    cursor = found + newLines.length;
+  }
+  return source.join('\n');
+}
+
+export function codexPatchWrites(patch, root) {
+  if (typeof patch !== 'string') {
+    return { writes: [], complete: false };
+  }
+  const lines = patch.split('\n');
+  const begin = lines.indexOf('*** Begin Patch');
+  const end = lines.indexOf('*** End Patch', begin + 1);
+  if (begin < 0 || end <= begin) return { writes: [], complete: false };
+  const writes = [];
+  const seenPaths = new Set();
+  let complete = [
+    ...lines.slice(0, begin),
+    ...lines.slice(end + 1),
+  ].every((line) => line.trim() === '');
+  let sawFileDirective = false;
+  for (let index = begin + 1; index < end; index += 1) {
+    const match = lines[index].match(/^\*\*\* (Add|Update|Delete) File: (.+)$/);
+    if (!match) {
+      if (lines[index].trim() !== '') complete = false;
+      continue;
+    }
+    sawFileDirective = true;
+    const [, action, relativePath] = match;
+    const body = [];
+    for (index += 1; index < end && !lines[index].startsWith('*** '); index += 1) {
+      body.push(lines[index]);
+    }
+    index -= 1;
+    const filePath = path.resolve(root, relativePath);
+    const rel = path.relative(root, filePath);
+    if (
+      seenPaths.has(filePath) ||
+      rel.startsWith(`..${path.sep}`) ||
+      rel === '..' ||
+      path.isAbsolute(rel)
+    ) {
+      complete = false;
+      continue;
+    }
+    seenPaths.add(filePath);
+    const canonicalRelativePath = rel.split(path.sep).join('/');
+    if (action === 'Delete') {
+      if (body.some((line) => line.trim() !== '') || !fs.existsSync(filePath)) {
+        complete = false;
+        continue;
+      }
+      writes.push({ path: canonicalRelativePath, filePath, delete: true });
+      continue;
+    }
+    let content;
+    if (action === 'Add') {
+      if (
+        body.length === 0 ||
+        fs.existsSync(filePath) ||
+        body.some((line) => !line.startsWith('+'))
+      ) {
+        complete = false;
+        continue;
+      }
+      content = body.filter((line) => line.startsWith('+')).map((line) => line.slice(1)).join('\n');
+      if (body.some((line) => line.startsWith('+'))) content += '\n';
+    } else {
+      if (
+        !body.some((line) => line.startsWith('@@')) ||
+        body.some((line) => !line.startsWith('@@') && !/^[ +\-]/.test(line))
+      ) {
+        complete = false;
+        continue;
+      }
+      let current;
+      try {
+        current = fs.readFileSync(filePath, 'utf8');
+      } catch {
+        complete = false;
+        continue;
+      }
+      content = applyCodexUpdatePatch(current, body);
+      if (content === null) complete = false;
+    }
+    if (typeof content === 'string') {
+      writes.push({ path: canonicalRelativePath, filePath, content });
+    }
+  }
+  return { writes, complete: complete && sawFileDirective };
+}
+
+/**
+ * Compute the file content a Write/Edit/MultiEdit is about to produce. Edits are applied
+ * to the CURRENT on-disk file so the gate judges the real post-edit state, not the edit
+ * snippet out of context. Replacement uses a function argument so `$&`-style sequences in
+ * generated code are inserted literally, never interpreted as replacement patterns.
+ */
+export function proposedSource(toolName, toolInput) {
+  if (toolName === 'Write') return toolInput.content ?? toolInput.contents;
+
+  let text = '';
+  try {
+    text = fs.readFileSync(toolInput.file_path, 'utf8');
+  } catch {
+    // New file created via Edit: fall through with an empty base.
+  }
+  const edits = toolName === 'MultiEdit' ? toolInput.edits ?? [] : [toolInput];
+  for (const edit of edits) {
+    const from = edit.old_string ?? '';
+    const to = edit.new_string ?? '';
+    if (from === '') {
+      text = to;
+    } else if (edit.replace_all) {
+      text = text.split(from).join(to);
+    } else {
+      text = text.replace(from, () => to);
+    }
+  }
+  return text;
+}
+
+/** Antigravity PreToolUse requires stdout `decision` on every response (allow included). */
+export function emitAntigravityAllow(output, antigravityStyle) {
+  if (!antigravityStyle) return;
+  output.stdout(`${JSON.stringify({ decision: 'allow' })}\n`);
+}
+
+/** Cursor preToolUse accepts explicit allow; exit 0 alone also works. */
+export function emitCursorAllow(output, cursorStyle) {
+  if (!cursorStyle) return;
+  output.stdout(`${JSON.stringify({ permission: 'allow' })}\n`);
+}
+
+export function emitHostAllow(output, { antigravityStyle, cursorStyle }) {
+  emitAntigravityAllow(output, antigravityStyle);
+  emitCursorAllow(output, cursorStyle);
+}
+
+/**
+ * Socket-style write-gate deny: two lines first. Pass/fail, no score.
+ * Rule id stays on a following line, not the first sentence.
+ */
+export function formatWriteGateDeny({ file, reason, ruleId, nextAction, extraLines = [] }) {
+  const target = file || 'this write';
+  const why = String(reason || 'this change breaks the architecture layers').replace(/\s+/g, ' ').trim();
+  const next =
+    nextAction && /place|move|import|port/i.test(nextAction)
+      ? nextAction
+      : 'Move the import or run /ark-place. Do not weaken ark.config.json.';
+  const lines = [`blocked ${target} — ${why}`, `Next: ${next}`];
+  if (ruleId) lines.push(`[${ruleId}]`);
+  for (const extra of extraLines) {
+    if (extra) lines.push(extra);
+  }
+  return lines.join('\n');
+}

package/bin/lib/package-manager.mjs

@@ -0,0 +1,174 @@
+/**
+ * Package-manager detection and emitted install/run command shapes.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+
+/** The three package managers Ark emits commands for. */
+const LOCKFILES = { pnpm: 'pnpm-lock.yaml', yarn: 'yarn.lock', npm: 'package-lock.json' };
+
+function readPackageJson(root) {
+  const file = path.join(root, 'package.json');
+  if (!fs.existsSync(file)) return null;
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * The Corepack `packageManager` field (and the newer `devEngines.packageManager`) is the
+ * project's OWN authoritative statement of its package manager. When present it wins over any
+ * lockfile guess. Returns 'pnpm' | 'yarn' | 'npm' | undefined.
+ */
+function declaredPackageManager(root) {
+  let pkg;
+  try {
+    pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+  } catch {
+    return undefined;
+  }
+  const raw =
+    (typeof pkg.packageManager === 'string' ? pkg.packageManager.split('@')[0] : undefined) ??
+    (typeof pkg.devEngines?.packageManager?.name === 'string'
+      ? pkg.devEngines.packageManager.name
+      : undefined);
+  const name = raw?.trim().toLowerCase();
+  return name === 'pnpm' || name === 'yarn' || name === 'npm' ? name : undefined;
+}
+
+/** Lockfiles present in the project root, in { pnpm, yarn, npm } key order. */
+export function presentLockfiles(root) {
+  return Object.entries(LOCKFILES)
+    .filter(([, file]) => fs.existsSync(path.join(root, file)))
+    .map(([pm]) => pm);
+}
+
+/**
+ * Detect the project's package manager: 'pnpm' | 'yarn' | 'npm'.
+ *
+ * Priority: (1) the `packageManager` / `devEngines` field (the project's own declaration);
+ * (2) a single lockfile; (3) on CONFLICT (more than one lockfile and no declaration) prefer
+ * npm whenever a package-lock.json is present. Rationale: `npx` runs fine inside a pnpm/yarn
+ * repo, but `pnpm exec` / `yarn` in an npm repo BREAKS (frozen-lockfile / no-TTY / a spurious
+ * pnpm-lock). So a stray pnpm-lock.yaml left in an npm project must NOT hijack it into pnpm —
+ * package-lock.json wins the tie, and the field is the escape hatch for a genuine pnpm repo
+ * that still carries a package-lock.json. Falls back to npm when nothing is detectable.
+ */
+export function detectPackageManager(root) {
+  const declared = declaredPackageManager(root);
+  if (declared) return declared;
+  const locks = presentLockfiles(root);
+  if (locks.length <= 1) return locks[0] ?? 'npm';
+  if (locks.includes('npm')) return 'npm';
+  return locks[0]; // pnpm over yarn when only those two collide
+}
+
+// pnpm 10+ `pnpm exec` runs a deps-status pre-check that fails with ERR_PNPM_IGNORED_BUILDS
+// when the repo has un-approved native build scripts (sharp, esbuild, tailwind oxide, …) —
+// the common state of real pnpm apps. Skip that gate so Ark's emitted commands still run.
+const PNPM_EXEC = 'pnpm --config.verify-deps-before-run=false exec';
+const RUNNER_BY_PM = { pnpm: PNPM_EXEC, yarn: 'yarn', npm: 'npx' };
+
+/**
+ * The command prefix that runs an INSTALLED package binary, matched to the project's
+ * package manager. `npx` is used for npm and as the safe fallback.
+ *
+ * This is the single source of truth that makes every command Ark EMITS — the AGENTS.md
+ * contract, .mcp.json, the Claude/Codex hooks, the check:architecture script, the
+ * SessionStart summary and every console hint — respect a pnpm-only or yarn repo instead
+ * of hardcoding `npx`. (A "pnpm only, never npx" repo treats an emitted `npx` as a policy
+ * violation.) `packageManager()` in ark-check.mjs builds the CI-workflow variant on the
+ * same detection.
+ */
+export function execRunner(root) {
+  return RUNNER_BY_PM[detectPackageManager(root)];
+}
+
+/** Full runnable command string for an installed Ark binary, package-manager aware. */
+export function arkCommand(root, bin, argsStr = '') {
+  return `${execRunner(root)} ${bin}${argsStr ? ` ${argsStr}` : ''}`;
+}
+
+/**
+ * Split { command, args } form for JSON/TOML configs (.mcp.json, config.toml) that spawn
+ * the binary directly. `pnpm exec ark-mcp` becomes command "pnpm" + args ["exec","ark-mcp",…]
+ * so the runner is a real argv[0], not a space-joined string a shell would mis-split.
+ */
+export function execCommandParts(root, bin, binArgs = []) {
+  const runner = execRunner(root);
+  if (runner === PNPM_EXEC || runner.startsWith('pnpm ')) {
+    return {
+      command: 'pnpm',
+      args: ['--config.verify-deps-before-run=false', 'exec', bin, ...binArgs],
+    };
+  }
+  if (runner === 'yarn') return { command: 'yarn', args: [bin, ...binArgs] };
+  return { command: 'npx', args: [bin, ...binArgs] };
+}
+
+/**
+ * True when this directory is a pnpm workspace root (needs `pnpm add -w` for root deps).
+ * Nested packages under the workspace are not roots.
+ */
+export function isPnpmWorkspaceRoot(root) {
+  return fs.existsSync(path.join(root, 'pnpm-workspace.yaml'));
+}
+
+/**
+ * True when package.json declares npm/yarn workspaces (yarn classic needs `-W` at root).
+ */
+export function isNpmYarnWorkspaceRoot(root) {
+  const pkg = readPackageJson(root);
+  if (!pkg) return false;
+  const ws = pkg.workspaces;
+  return Array.isArray(ws) || (ws && typeof ws === 'object' && Array.isArray(ws.packages));
+}
+
+/**
+ * Normalize a version/range/spec into an installable package argument for arkgate.
+ * Accepts `latest`, `^3.8.2`, `arkgate@latest`, or a full package name.
+ */
+export function normalizeArkgateInstallSpec(versionSpec) {
+  const raw = typeof versionSpec === 'string' && versionSpec.trim() ? versionSpec.trim() : 'latest';
+  if (raw.startsWith('arkgate@') || raw === 'arkgate') return raw === 'arkgate' ? 'arkgate@latest' : raw;
+  if (raw.includes('/') || raw.startsWith('file:') || raw.startsWith('link:')) return raw;
+  return `arkgate@${raw}`;
+}
+
+/**
+ * Package-manager argv to add a dev dependency (e.g. arkgate@latest).
+ * pnpm workspace roots get `-w`; yarn classic workspaces get `-W`.
+ *
+ * @param {string} root
+ * @param {string} [versionSpec]  package name or name@version (default arkgate@latest)
+ * @returns {[string, string[]]}
+ */
+export function packageInstallArgv(root, versionSpec = 'latest') {
+  const pkgSpec = normalizeArkgateInstallSpec(versionSpec);
+  const pm = detectPackageManager(root);
+  if (pm === 'pnpm') {
+    const args = ['add', '-D', pkgSpec];
+    if (isPnpmWorkspaceRoot(root)) args.push('-w');
+    return ['pnpm', args];
+  }
+  if (pm === 'yarn') {
+    const args = ['add', '-D', pkgSpec];
+    if (isNpmYarnWorkspaceRoot(root)) args.push('-W');
+    return ['yarn', args];
+  }
+  return ['npm', ['install', '-D', pkgSpec]];
+}
+
+/** Package-manager aware "install a dev dependency" hint (e.g. for a missing typescript). */
+export function installDevHint(root, pkg) {
+  const pm = detectPackageManager(root);
+  if (pm === 'pnpm') {
+    return isPnpmWorkspaceRoot(root) ? `pnpm add -D ${pkg} -w` : `pnpm add -D ${pkg}`;
+  }
+  if (pm === 'yarn') {
+    return isNpmYarnWorkspaceRoot(root) ? `yarn add -D ${pkg} -W` : `yarn add -D ${pkg}`;
+  }
+  return `npm install -D ${pkg}`;
+}

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

@@ -17,10 +17,14 @@ function readJsonFile(filePath, label) {
   }
 }
 
+/** Kill hung git instead of stalling CI. */
+export const SPAWN_TIMEOUT_MS = 8000;
+
 function runGit(cwd, args) {
   return spawnSync('git', ['-C', cwd, ...args], {
     encoding: 'utf8',
     stdio: ['ignore', 'pipe', 'pipe'],
+    timeout: SPAWN_TIMEOUT_MS,
   });
 }
 
@@ -42,7 +46,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) {