@kal-elsam/kairo-runtime 0.14.0 → 0.16.0

package/CHANGELOG.md

@@ -5,6 +5,116 @@ Historical entries below may reference the legacy `@kal-elsam/harness` package n
 
 ## Unreleased
 
+## 0.16.0 — 2026-08-13 (Kairo Runtime)
+
+Minor release. Public `kairo control-plane` command and
+`kairo.control-plane/v1` Gentle companion report. Publish tag:
+`kairo-runtime-v0.16.0`. Extension VSIX stays out of this unit.
+
+### Added
+
+- `kairo control-plane [--json] [--client cursor]`: atomic panel report
+  (work + Gentle workflow + team + attention) as `kairo.control-plane/v1`.
+- Negotiate `gentle-ai.review-integration/v2` (protocol 2.0 and 2.1) before
+  any workflow fetch. Provider states: `connected`, `upgrade_required`,
+  `unavailable`, `incompatible`.
+- Official `review status` from Gentle's announced bootstrap argv; pass
+  `next_transition` through unaltered. Receipt/gate only when Gentle publishes
+  them.
+- `sdd-status --json` projection copies `changeName` / `nextRecommended` only.
+
+### Docs
+
+- Gentle companion boundary: Kairo observes `gentle-ai.review-integration/v2`
+  and projects official `next_transition` / `sdd-status --json`. Freeze
+  `kairo review`, Cockpit receipts, orchestrator, and intelligence routing so
+  they do not feed the panel Workflow. Propose upstream `gentle-ai observe --json`
+  in Kairo docs only (`docs/gentle-companion.md`).
+
+## 0.15.0 — 2026-08-12 (Kairo Runtime)
+
+Minor release. Declared Fleet board + model configure, and the Cursor
+observable companion (work snapshots, MCP publish, `kairo next`, managed
+rule, honest panel). Publish tag: `kairo-runtime-v0.15.0`. Extension
+marketplace delivery stays out of this unit.
+
+### Added
+
+- Contract `kairo.work-snapshot/v1` and MCP tool `kairo_publish_work_snapshot`
+  to enroll the current Cursor conversation with Goal / Progress / Now /
+  Constraints / Next.
+- `kairo next` / `kairo.next/v1`: selected work snapshot plus integration
+  state (`active` / `enrolled` / `showRepair`) for the IDE panel.
+- `kairo mcp install [--yes]`: consent-gated registration of Kairo MCP in
+  `~/.cursor/mcp.json` (plan first; atomic write + backup) and managed
+  Cursor rule `~/.cursor/rules/kairo-work-snapshot.mdc` (`alwaysApply`).
+- Panel **0.7.0**: honest companion surface — Repair only when integration
+  is broken; otherwise active/enrolled without false prompts.
+- MCP workspace binding: prefer Cursor env (`VSCODE_CWD` /
+  `WORKSPACE_FOLDER_PATHS`) over process cwd; canonicalize macOS `/tmp` vs
+  `/private/tmp` before hashing `projectKey`.
+- Panel **0.6.5**: One **Configure all** for multi-agent (Claude + OpenCode +
+  Cursor agents). **Codex aparte** (`--codex-model`). `kairo fleet models`
+  shows available vs enabled per tool. Cursor desk: open agents/skills/rules.
+  Profile at `~/.harness/fleet-models.json` (seeded from disk; preserves
+  tuned OpenCode). `--from gentle` remaps OpenCode tiers when you want that.
+- Panel **0.6.4**: Fleet Details puts configure buttons first (Edit per
+  minion on Claude/OpenCode; Cursor offers Claude/OpenCode configure +
+  optional Pixel Agents). `fleet configure` defaults to Claude only (no
+  surprise OpenCode overwrite).
+- `kairo fleet configure`: Gentle-style model assignments across OpenCode +
+  Claude (+ Codex when `codex_default` set). Plan / `--yes` + backups. Panel
+  **Models** button. Cursor Auto remains IDE-managed.
+- Panel **0.6.2**: Fleet floor (compact platform desks). Working floor only
+  shows live agents — no idle OpenCode wall. CLI `kairo fleet` compact by
+  default (`--verbose` for full minion list).
+- Panel **0.6.3**: Configure models toolbar + desk actions for sync/set.
+- `kairo fleet [--json]`: declared orchestrator→minion fleet topology from
+  OpenCode config (Gentle + SDD models); Cursor Auto marked opaque.
+  MCP tool `kairo_fleet`; `kairo connections --json` includes `fleets`.
+- Panel **0.5.0**: Fleet tree under connections (platform · orchestrator ·
+  model, indented minions). Details note: declared config, not live tokens.
+- `kairo connections [--json]`: Gentle / Hermes / Engram / Graphify / Agent
+  connection chips for the IDE panel (companion probes + MCP registration).
+- VS Code / Cursor panel **0.3.0**: connection chips, Connect Agent button,
+  Entries + Details webview. Docs: `docs/mcp.md`.
+- Panel **0.3.1**: soften "not installed / unconfigured" entries to `note`;
+  fix false Engram conflict when Claude uses `~/.claude/mcp/engram.json`
+  without `mcpServers.engram` in settings.json.
+- Panel **0.3.2**: **Setup** button + per-connection actions (Configure /
+  How to install / Update graph). Optional tools labeled; Kairo never
+  auto-installs Gentle/Hermes/Graphify.
+- Panel **0.3.3**: every Entry shows resolve buttons in Details (Fix SDD,
+  Repair, Update graph, Why optional?). Hermes chip offers **Start Hermes
+  gateway**. Conflicts sort first so buttons are visible immediately.
+- Panel **0.3.4**: Hermes tip documents `API_SERVER_ENABLED=true` — gateway
+  alone without API Server does not expose :8642.
+- Check **resolutions[]** contract + panel **0.4.0**: status checks can declare
+  clickable fix buttons. For `sdd-core:skills` conflicts:
+  - `kairo components diff sdd-core` (read-only)
+  - `kairo components adopt sdd-core` (keep disk; record adopted hashes)
+  - `kairo components configure sdd-core --overwrite-conflicts` (backup + replace)
+  Destructive overwrite asks for a modal confirm in the IDE panel.
+- Panel **0.4.1**: adopt/overwrite buttons apply with `--yes` (click = consent).
+  Previous `--dry-run` left CONFLICT unchanged after clicking Conservar el mío.
+- Panel **0.4.2**: status/connections/terminal use the open workspace folder as
+  `cwd`, so graphify-out/ is detected (was falsely "not found" from IDE cwd).
+
+### Fixed
+
+- Cockpit Home opened with focus on the tab bar, so the two Home buttons never
+  showed a selection mark and the arrow keys moved between tabs instead. Home
+  now starts on the buttons.
+
+### Changed
+
+- Home buttons render as `› [1] Label` with `← Press Enter` on the focused
+  option; press `1` / `2` to run a button without arrow navigation.
+- Home footer names each key (`1·2 Select · Enter Run · ? Help · Esc Exit`)
+  instead of listing bare keys.
+- Home shows at most two plain-language needs; the rest collapse into the
+  `More info (n)` disclosure, which absorbs the duplicated "n more" line.
+
 ## 0.14.0 — 2026-08-07 (Kairo Runtime)
 
 Minor release. Simpler Cockpit, one-command CLI self-update, pnpm for

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kal-elsam/kairo-runtime",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Kairo Runtime — local agent operating system for Codex, Cursor, Claude, Pi, Engram, and Graphify.",
   "type": "module",
   "homepage": "https://github.com/Kal-elSam/harness#readme",

package/src/cli.js

@@ -6,6 +6,10 @@ import {
   runComponentsRollback,
   runComponentsVerify
 } from "./global/component-integration-cli.js";
+import {
+  runComponentsAdopt,
+  runComponentsDiff
+} from "./global/components-resolve-cli.js";
 import {
   printGlobalComponents,
   printGlobalDetect,
@@ -128,17 +132,109 @@ export async function runCli(argv) {
       await runGraphifyCli(optionsWithPolicy, packageManifest);
       return;
     case "mcp": {
-      // Lazy-load: MCP SDK is heavy and optional for day-to-day CLI (help/status/sync).
-      const { runKairoMcp } = await import("./global/mcp/kairo-mcp.js");
-      // stdout reserved for MCP protocol — no banners/logs here
-      await runKairoMcp({
+      const { runMcpCli } = await import("./global/mcp-install.js");
+      await runMcpCli({
+        mcpAction: optionsWithPolicy.mcpAction ?? "serve",
+        mcpClient: optionsWithPolicy.mcpClient ?? "cursor",
+        yes: optionsWithPolicy.yes === true,
+        json: optionsWithPolicy.json === true,
         cwd: optionsWithPolicy.cwd,
+        cwdExplicit: optionsWithPolicy.cwdExplicit,
         packageRoot,
         packageName: packageManifest.name,
         version: packageManifest.version
       });
       return;
     }
+    case "connections": {
+      const { buildConnectionsReport } = await import("./global/connections.js");
+      const { printJson } = await import("./global/json-output.js");
+      const { commandHeader } = await import("./global/brand/index.js");
+      const report = await buildConnectionsReport({
+        workspaceRoot: optionsWithPolicy.cwd,
+        packageRoot,
+        packageName: packageManifest.name,
+        cliVersion: packageManifest.version,
+        client: optionsWithPolicy.mcpClient ?? "cursor"
+      });
+      if (optionsWithPolicy.json) {
+        printJson(report);
+      } else {
+        console.log(commandHeader("Connections"));
+        for (const c of report.connections) {
+          console.log(`${c.label} · ${c.state}`);
+          console.log(`  ${c.access}`);
+          if (c.detail) console.log(`  ${c.detail}`);
+        }
+      }
+      return;
+    }
+    case "next": {
+      const { runNextCli } = await import("./global/next/next-cli.js");
+      await runNextCli({
+        cwd: optionsWithPolicy.cwd,
+        json: optionsWithPolicy.json === true,
+        mcpClient: optionsWithPolicy.mcpClient ?? "cursor"
+      });
+      return;
+    }
+    case "control-plane": {
+      const { runControlPlaneCli } = await import("./global/control-plane/cli.js");
+      await runControlPlaneCli({
+        cwd: optionsWithPolicy.cwd,
+        json: optionsWithPolicy.json === true,
+        mcpClient: optionsWithPolicy.mcpClient ?? "cursor"
+      });
+      return;
+    }
+    case "fleet": {
+      const fleetAction = optionsWithPolicy.fleetAction ?? "show";
+      if (fleetAction === "set") {
+        const { runFleetSet } = await import("./global/fleet-set.js");
+        await runFleetSet({
+          platform: optionsWithPolicy.fleetPlatform,
+          agent: optionsWithPolicy.fleetAgent ?? optionsWithPolicy.agent,
+          model: optionsWithPolicy.model,
+          yes: optionsWithPolicy.yes === true,
+          dryRun: optionsWithPolicy.dryRun === true,
+          json: optionsWithPolicy.json === true
+        });
+        return;
+      }
+      if (fleetAction === "configure") {
+        const { runFleetConfigure } = await import("./global/fleet-configure.js");
+        await runFleetConfigure({
+          yes: optionsWithPolicy.yes === true,
+          json: optionsWithPolicy.json === true,
+          platforms: optionsWithPolicy.fleetPlatforms ?? null,
+          from: optionsWithPolicy.fleetFrom ?? "profile",
+          assignmentsRaw: optionsWithPolicy.fleetAssignments ?? null,
+          codexModel: optionsWithPolicy.fleetCodexModel ?? null
+        });
+        return;
+      }
+      if (fleetAction === "models") {
+        const { runFleetModels } = await import("./global/fleet-configure.js");
+        await runFleetModels({
+          json: optionsWithPolicy.json === true,
+          profile: optionsWithPolicy.fleetProfile === true
+        });
+        return;
+      }
+      const { buildFleetReport, formatFleetText } = await import("./global/observability/fleet-probe.js");
+      const { printJson } = await import("./global/json-output.js");
+      const report = await buildFleetReport({
+        includeVariants: optionsWithPolicy.includeVariants === true
+      });
+      if (optionsWithPolicy.json) {
+        printJson(report);
+      } else {
+        console.log(formatFleetText(report, {
+          verbose: optionsWithPolicy.verbose === true || optionsWithPolicy.includeVariants === true
+        }));
+      }
+      return;
+    }
     case "intelligence":
       await runIntelligenceCli(optionsWithPolicy, packageManifest);
       return;
@@ -285,6 +381,12 @@ async function dispatchComponentsCommand(options, invoke) {
     case "verify":
       await runComponentsVerify({ ...options, packageRoot });
       return;
+    case "adopt":
+      await runComponentsAdopt({ ...options, packageRoot });
+      return;
+    case "diff":
+      await runComponentsDiff({ ...options, packageRoot });
+      return;
     case "rollback":
       await runComponentsRollback(options);
       return;
@@ -363,6 +465,7 @@ export function parseArgs(argv) {
   const command = normalizeCommand(rawCommand);
   const options = {
     cwd: process.cwd(),
+    cwdExplicit: false,
     scope: null,
     mode: "standard",
     modeExplicit: false,
@@ -382,6 +485,7 @@ export function parseArgs(argv) {
     dryRun: false,
     yes: false,
     confirm: false,
+    overwriteConflicts: false,
     preflight: true,
     preflightExplicit: false,
     yesExplicit: false,
@@ -419,6 +523,18 @@ export function parseArgs(argv) {
     confirmDismiss: false,
     graphifyAction: null, graphifyArgs: [], graphifyBudget: null, graphPath: null,
     updatesAction: "check",
+    mcpAction: "serve",
+    mcpClient: "cursor",
+    fleetAction: "show",
+    fleetPlatform: null,
+    fleetAgent: null,
+    fleetPlatforms: null,
+    fleetFrom: "profile",
+    fleetAssignments: null,
+    fleetCodexModel: null,
+    fleetProfile: false,
+    includeVariants: false,
+    verbose: false,
     base: null,
     commit: null,
     staged: false,
@@ -473,6 +589,8 @@ export function parseArgs(argv) {
 
   if (command === "graphify") parseGraphifyAction(args, options);
   if (command === "updates") parseUpdatesAction(args, options);
+  if (command === "mcp") parseMcpAction(args, options);
+  if (command === "fleet") parseFleetAction(args, options);
 
   if (command === "help") {
     while (args[0] === "all" || args[0] === "--all") {
@@ -484,7 +602,10 @@ export function parseArgs(argv) {
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
 
-    if (arg === "--cwd") options.cwd = resolve(args[++index]);
+    if (arg === "--cwd") {
+      options.cwd = resolve(args[++index]);
+      options.cwdExplicit = true;
+    }
     else if (arg === "--scope") options.scope = parseScope(args[++index]);
     else if (arg.startsWith("--scope=")) options.scope = parseScope(arg.slice("--scope=".length));
     else if (arg === "--mode") {
@@ -518,8 +639,26 @@ export function parseArgs(argv) {
       options.componentsExplicit = true;
     } else if (arg === "--force") options.force = true;
     else if (arg === "--dry-run") options.dryRun = true;
+    else if (arg === "--overwrite-conflicts") options.overwriteConflicts = true;
     else if (arg === "--json") options.json = true;
-    else if (arg === "--yes" || arg === "-y") {
+    else if (arg === "--include-variants") options.includeVariants = true;
+    else if (arg === "--platforms") options.fleetPlatforms = args[++index];
+    else if (arg.startsWith("--platforms=")) options.fleetPlatforms = arg.slice("--platforms=".length);
+    else if (arg === "--from") options.fleetFrom = args[++index];
+    else if (arg.startsWith("--from=")) options.fleetFrom = arg.slice("--from=".length);
+    else if (arg === "--assignments") options.fleetAssignments = args[++index];
+    else if (arg.startsWith("--assignments=")) options.fleetAssignments = arg.slice("--assignments=".length);
+    else if (arg === "--codex-model") options.fleetCodexModel = args[++index];
+    else if (arg.startsWith("--codex-model=")) options.fleetCodexModel = arg.slice("--codex-model=".length);
+    else if (arg === "--profile") options.fleetProfile = true;
+    else if (arg === "--verbose") options.verbose = true;
+    else if (arg === "--platform") options.fleetPlatform = args[++index];
+    else if (arg.startsWith("--platform=")) options.fleetPlatform = arg.slice("--platform=".length);
+    else if (arg === "--client") {
+      options.mcpClient = args[++index];
+    } else if (arg.startsWith("--client=")) {
+      options.mcpClient = arg.slice("--client=".length);
+    } else if (arg === "--yes" || arg === "-y") {
       options.yes = true;
       options.yesExplicit = true;
     } else if (arg === "--confirm") {
@@ -651,7 +790,8 @@ function parseComponentsAction(args, options) {
 
   if (action === "validate") return;
 
-  if (action === "configure" || action === "verify" || action === "rollback") {
+  if (action === "configure" || action === "verify" || action === "rollback"
+    || action === "adopt" || action === "diff") {
     const componentId = args[0];
     if (!componentId || componentId.startsWith("-")) {
       throw new Error(
@@ -662,7 +802,7 @@ function parseComponentsAction(args, options) {
     return;
   }
 
-  throw new Error(`Unknown components action "${action}". Use validate, init, pack, import, configure, verify, or rollback.`);
+  throw new Error(`Unknown components action "${action}". Use validate, init, pack, import, configure, verify, adopt, diff, or rollback.`);
 }
 
 function parsePolicyAction(args, options) {
@@ -842,6 +982,36 @@ function parseUpdatesAction(args, options) {
   options.updatesAction = "check";
 }
 
+function parseMcpAction(args, options) {
+  const action = args[0];
+  if (!action || action.startsWith("-")) {
+    options.mcpAction = "serve";
+    return;
+  }
+  if (!new Set(["serve", "install"]).has(action)) {
+    throw new Error(
+      `Unknown mcp action "${action}". Use: ${formatCliCommand("mcp")} or ${formatCliCommand("mcp install [--yes]")}`
+    );
+  }
+  args.shift();
+  options.mcpAction = action;
+}
+
+function parseFleetAction(args, options) {
+  const action = args[0];
+  if (!action || action.startsWith("-")) {
+    options.fleetAction = "show";
+    return;
+  }
+  if (!new Set(["show", "set", "activity", "configure", "models"]).has(action)) {
+    throw new Error(
+      `Unknown fleet action "${action}". Use: ${formatCliCommand("fleet")}, ${formatCliCommand("fleet models")}, ${formatCliCommand("fleet configure")}, or ${formatCliCommand("fleet set --platform opencode --agent <id> --model <id>")}`
+    );
+  }
+  args.shift();
+  options.fleetAction = action === "activity" ? "show" : action;
+}
+
 function parsePathList(value) {
   if (!value) return [];
   return [...new Set(
@@ -889,6 +1059,10 @@ function normalizeCommand(command) {
   if (command === "alerts") return "alerts";
   if (command === "graphify") return "graphify";
   if (command === "mcp") return "mcp";
+  if (command === "connections") return "connections";
+  if (command === "next") return "next";
+  if (command === "control-plane") return "control-plane";
+  if (command === "fleet") return "fleet";
   if (command === "intelligence" || command === "intel") return "intelligence";
   if (command === "setup") return "setup";
   if (command === "status") return "status";

package/src/global/check-resolutions.js

@@ -0,0 +1,31 @@
+/**
+ * Stable resolution contract for doctor/status checks.
+ * Panels render these as buttons; commands stay consent-gated in the CLI.
+ */
+export function resolution(id, label, command, {
+  kind = "run",
+  safety = "consent",
+  detail = ""
+} = {}) {
+  return {
+    id: String(id),
+    label: String(label),
+    command: command == null ? null : String(command),
+    kind: String(kind),
+    safety: String(safety),
+    detail: detail == null ? "" : String(detail)
+  };
+}
+
+export const RESOLUTION_SAFETY = Object.freeze({
+  READ_ONLY: "read-only",
+  CONSENT: "consent",
+  DESTRUCTIVE: "destructive"
+});
+
+export const RESOLUTION_KIND = Object.freeze({
+  RUN: "run",
+  CONFIGURE: "configure",
+  GUIDE: "guide",
+  REFRESH: "refresh"
+});

package/src/global/cli-help.js

@@ -109,10 +109,20 @@ Bootstrap: see README.md and docs/install.md (curl install.sh or npx ${PACKAGE_N
   ${cli} components
   ${cli} components validate|init|pack|import ...
   ${cli} components configure engram-memory [--agents <list>] [--dry-run|--yes] [--json]
-  ${cli} components configure sdd-core [--agents <list>] [--persona off|teaching] [--dry-run|--yes] [--json]
+  ${cli} components configure sdd-core [--agents <list>] [--persona off|teaching] [--overwrite-conflicts] [--dry-run|--yes] [--json]
   ${cli} components verify sdd-core [--agents <list>] [--json]
+  ${cli} components adopt sdd-core [--agents <list>] [--dry-run|--yes] [--json]
+  ${cli} components diff sdd-core [--agents <list>] [--json]
   ${cli} components rollback engram-memory|sdd-core --receipt <id> [--dry-run|--yes] [--json]
+  ${cli} connections [--json] [--client cursor]
+  ${cli} next [--json] [--client cursor]
+  ${cli} control-plane [--json] [--client cursor]
+  ${cli} fleet [--json] [--verbose] [--include-variants]
+  ${cli} fleet models [--profile] [--json]
+  ${cli} fleet configure [--platforms claude,opencode,cursor|codex] [--from profile|gentle] [--codex-model <id>] [--assignments a=b,...] [--yes] [--json]
+  ${cli} fleet set --platform opencode|claude|codex --agent <id> --model <id> [--yes] [--json]
   ${cli} mcp
+  ${cli} mcp install [--yes] [--json] [--client cursor]
   ${cli} install --scope=workspace [--mode minimal|standard|enterprise] (opt-in/legacy)
   ${cli} init [--mode minimal|standard|enterprise] (workspace alias)
 
@@ -157,12 +167,21 @@ Commands:
   policy     View or edit local operation preferences under ~/.harness/policy.json.
   report     Read-only diagnostics bundle: status, policy, adapters, diff, history.
   components List, validate, scaffold, pack, import, or configure integrations (Engram, SDD).
+  connections Companion chips + MCP registration (IDE panel).
+  next        Selected work snapshot + integration state (panel contract).
+  control-plane Atomic panel report (work + Gentle workflow + team + attention).
+  fleet      Declared fleet floor + working activity; configure/set models across CLIs.
+             fleet models [--profile]   available vs enabled per tool
+             fleet configure            one plan for Claude+OpenCode+Cursor (profile)
+             fleet configure --codex-model <id>   Codex only (single-default)
+             fleet set --platform opencode|claude|codex --agent <id> --model <id> [--yes]
+  mcp        Serve or install MCP for agents (mcp install writes entry + snapshot rule).
   uninstall  Remove managed sections and global state. Backups are preserved.
   init       Alias for install --scope=workspace (legacy).
 
 JSON output (--json on supported commands):
   status, sync, doctor, adapters, explain, diff, history, history last,
-  policy (show/set/reset), report, monitor
+  policy (show/set/reset), report, monitor, connections, fleet
   Human text remains the default. See docs/cli-reference.md for examples and field notes.
 
 Version:

package/src/global/component-ecosystem-checks.js

@@ -9,6 +9,7 @@ import { requireIntegrationProvider } from "./integrations/provider-registry.js"
 import { buildEngramIntegrationChecks, buildSddIntegrationChecks } from "./component-integration-cli.js";
 import { KAIRO_ENGRAM_AGENT_IDS } from "./integrations/engram-evidence.js";
 import { SDD_MANAGED_AGENT_IDS } from "./integrations/sdd-destinations.js";
+import { adoptedHashesFromState } from "./integrations/sdd-state.js";
 import { harnessHomePaths } from "./paths.js";
 import { readGlobalState } from "./state.js";
 
@@ -78,6 +79,7 @@ async function buildSddChecks({ homeDir }) {
       requestedAgentIds: installedAgents.length ? installedAgents : [],
       detectedAgentIds: installedAgents,
       trackedFiles,
+      adoptedFiles: adoptedHashesFromState(state?.sdd),
       personaAgentIds: state?.sdd?.personaAgentIds ?? [],
       packageRoot: PACKAGE_ROOT
     });

package/src/global/component-integration-cli.js

@@ -9,11 +9,13 @@ import { formatCliCommand } from "./brand/cli.js";
 import { requireIntegrationProvider } from "./integrations/provider-registry.js";
 import { ensureIntegrationProvidersRegistered } from "./integrations/index.js";
 import { ENGRAM_INTEGRATION_STATUS } from "./integrations/engram-evidence.js";
-import { SDD_HEALTH } from "./integrations/sdd-evidence.js";
+import { SDD_HEALTH, SDD_FILE_OUTCOMES } from "./integrations/sdd-evidence.js";
 import {
-  hasSuccessfulSddRollbackMutations, recordSddMaterialization, reconcileSddStateAfterRollback
+  hasSuccessfulSddRollbackMutations, recordSddMaterialization, reconcileSddStateAfterRollback,
+  adoptedHashesFromState, clearSddAdoptionsForPaths
 } from "./integrations/sdd-state.js";
 import { loadSddReceipt } from "./integrations/sdd-receipts.js";
+import { buildSddSkillResolutions } from "./integrations/sdd-resolutions.js";
 
 const DEFAULT_PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
 
@@ -169,14 +171,24 @@ async function buildProviderContext(options, { homeDir, componentId }) {
     packageRoot: options.packageRoot ?? DEFAULT_PACKAGE_ROOT,
     persona: options.persona ?? state?.sdd?.persona ?? "off",
     personaAgentIds: state?.sdd?.personaAgentIds ?? [],
-    trackedFiles
+    trackedFiles,
+    adoptedFiles: adoptedHashesFromState(state?.sdd),
+    overwriteConflicts: Boolean(options.overwriteConflicts)
   };
 }
 
 async function persistSddReceiptState(homeDir, receipt) {
   const paths = harnessHomePaths(homeDir);
   const state = (await readGlobalState(paths.statePath)) ?? {};
-  await writeGlobalState(paths.statePath, recordSddMaterialization(state, { receipt }));
+  let next = recordSddMaterialization(state, { receipt });
+  const appliedPaths = (receipt.files ?? [])
+    .filter((file) => file.outcome === SDD_FILE_OUTCOMES.APPLIED)
+    .map((file) => file.destinationPath)
+    .filter(Boolean);
+  if (appliedPaths.length) {
+    next = clearSddAdoptionsForPaths(next, appliedPaths);
+  }
+  await writeGlobalState(paths.statePath, next);
 }
 
 async function reconcileSddRollbackState(homeDir, result) {
@@ -230,13 +242,19 @@ export function buildEngramIntegrationChecks(inspection) {
 export function buildSddIntegrationChecks(verification) {
   const summary = verification.summary ?? {};
   const persona = verification.persona ?? {};
+  const skillsHealthy = verification.status === SDD_HEALTH.CONFIGURED
+    || verification.status === SDD_HEALTH.ADOPTED;
+  const skillsCheck = {
+    name: "sdd-core:skills",
+    status: skillsHealthy ? "ok" : "warning",
+    category: "integration",
+    componentId: "sdd-core",
+    detail: `SDD skills ${verification.status}: configured=${summary.configured ?? 0}, adopted=${summary.adopted ?? 0}, missing=${summary.missing ?? 0}, drifted=${summary.drifted ?? 0}, conflict=${summary.conflict ?? 0} (disk presence ≠ runtime active).`
+  };
+  const resolutions = buildSddSkillResolutions(verification);
+  if (resolutions.length) skillsCheck.resolutions = resolutions;
   return [
-    {
-      name: "sdd-core:skills",
-      status: verification.status === SDD_HEALTH.CONFIGURED ? "ok" : "warning",
-      category: "integration", componentId: "sdd-core",
-      detail: `SDD skills ${verification.status}: configured=${summary.configured ?? 0}, missing=${summary.missing ?? 0}, drifted=${summary.drifted ?? 0}, conflict=${summary.conflict ?? 0} (disk presence ≠ runtime active).`
-    },
+    skillsCheck,
     {
       name: "sdd-core:persona",
       status: persona.status === "configured" || persona.status === "off" ? "ok" : "warning",
@@ -283,6 +301,7 @@ function printSddConfigureHuman(result) {
   if (result.dryRun) return void console.log("Dry-run only — no skills materialized.");
   if (result.cancelled) return void console.log("Cancelled.");
   if (result.blocked) return void console.log(`Blocked: ${result.reason ?? "conflicts present"}`);
+  if (result.overwriteConflicts) console.log("Mode: overwrite-conflicts (backups before replace).");
   if (result.receipt) {
     console.log(`Receipt: ${result.receipt.id}${result.receipt.partial ? " (partial)" : ""}`);
     if (result.sessionRefreshRequired) {