@skaile/workspaces 5.19.0 → 6.1.0

package/dist/cli/index.js

@@ -1,101 +1,102 @@
 #!/usr/bin/env node
-import { makeValidateCommand, scanIdentities, isRecord } from '../chunk-ZQSOJH6I.js';
-import { storeNotInstallableReason } from '../chunk-PUK7TQT4.js';
-import { makeProvidersCommand, loadRegistryView, addProviderEntry, ProviderRegistryWriteError, removeProviderEntry } from '../chunk-WG6V4ISA.js';
-import { makeInstallCommand, makeCheckCommand, makeCleanCommand, pinComposedAgents, reportRewritten, reportReplaced, reportRelocked, reportMoved, reportStoreNotChecked, globalProblems, editedConventionFiles, supportsInstallManifest, REF_HINT, reportInstalledSoftDeps } from '../chunk-FPHNJE4M.js';
+import { makeValidateCommand, scanIdentities } from '../chunk-IHFGPHCT.js';
+import { storeNotInstallableReason, mcpNotRunnableHere } from '../chunk-EX3GLAL6.js';
+import { makeProvidersCommand, loadRegistryView, addProviderEntry, ProviderRegistryWriteError, removeProviderEntry } from '../chunk-NB7SYQYP.js';
+import { makeInstallCommand, makeCheckCommand, makeCleanCommand, pinComposedAgents, reportRewritten, reportReplaced, reportRelocked, reportMoved, reportStoreNotChecked, globalProblems, editedConventionFiles, supportsInstallManifest, runYamlInstall, REF_HINT, reportInstalledSoftDeps } from '../chunk-CEKW3KXP.js';
+import { unknownHarnessMessage, reportProjectConfig, driverAliasOption, foldDriverFlag, friendlyHarnessError, harnessErrorNotes, isRecord } from '../chunk-7HX6FNKL.js';
 import { createSpinner } from '../chunk-NESV47MF.js';
-import { getStoreConfig, storeFetch, isStoreAuthenticated, getStoreToken } from '../chunk-25ZVWL2R.js';
-import { makeSourceCommand, syncProjectSources, divergedSourceClones } from '../chunk-RO6VOM6Z.js';
-import { deviceLogin, loadStoreAuthConfig, logout, hasStoredAuth, exitOnLibrarySymlinks, resolveLibraryPublisherDetailed, getStoreIdentity, warnLibraryNameFallback, indexLibrary, warnIgnoredDomainFiles, removedDomainOption, rejectRemovedDomainOption, requireValidPublisherOrExit, exitOnManifestPublisherProblems, findAssetManifestFile, checkAssetFile, registerLibraryAsset, DOMAIN_REMOVED_HINT, reportLibrarySymlinks, checkAsset, manifestPublisherProblems, exitOnManifestRootProblems, manifestRequiresProblems, composeRefContext, registeredAssetKeys, assetEntryRef, duplicateAssetMessage, unresolvedManifestDependencies, findEntryManifestFile, unheldRequiresOfFile, warnLegacyBundleFiles, checkComposeKinds } from '../chunk-WOIRYY5L.js';
-import { openCatalogSource, LocalCatalogDisabledError, openLibraryManager, openLibrary } from '../chunk-X4ZZTHU3.js';
-import { AI_RESOURCES } from '../chunk-2PBSAH3Z.js';
-import { loadDeclaredPlugins } from '../chunk-ZX4KRWRB.js';
-import { status, enable, disable, install, uninstall } from '../chunk-HU5HVKY7.js';
-import { logErr, S, logOk, logInfo, logWarn, TARGET_DEFAULT_HINT, parseHarnessFilter, requireProjectConfig, deferredWarnings, warnPlaceholderBodies, warnFilesOnlyDelegates, reportLegacyOmpCopies, logNoProject, warnLegacyClaudeCopies, kindColorPad, kindColor, colorRef, formatSoftDepSection, bareSoftDepName, formatSoftDepHint, formatRelativeTime, formatSoftDepRemovePreview, formatSoftDepAddPreview, fitWidth, KIND_COL_WIDTH } from '../chunk-QG6GHTRM.js';
-import { getKindRegistry, getKnownKinds } from '../chunk-F6AA42GW.js';
+import { loadDeclaredPlugins } from '../chunk-QSYQOTWN.js';
+import { getStoreConfig, storeFetch, isStoreAuthenticated, getStoreToken } from '../chunk-3GMOPFWH.js';
+import { makeSourceCommand, syncProjectSources, divergedSourceClones } from '../chunk-AZ2H6R5I.js';
+import { libraryAssetRefusals, deviceLogin, loadStoreAuthConfig, logout, hasStoredAuth, exitOnLibrarySymlinks, resolveLibraryPublisherDetailed, getStoreIdentity, warnLibraryNameFallback, indexLibrary, warnIgnoredDomainFiles, removedDomainOption, rejectRemovedDomainOption, requireValidPublisherOrExit, exitOnManifestPublisherProblems, findAssetManifestFile, checkAssetFile, registerLibraryAsset, DOMAIN_REMOVED_HINT, reportLibrarySymlinks, checkAsset, manifestPublisherProblems, exitOnManifestPathProblems, manifestRequiresProblems, composeRefContext, registeredAssetKeys, assetEntryRef, duplicateAssetMessage, manifestParseFailureLine, manifestParseErrorText, unresolvedManifestDependencies, findEntryManifestFile, unheldRequiresOfFile, warnLegacyBundleFiles, checkComposeKinds } from '../chunk-AITJ7ELM.js';
+import { openCatalogSource, LocalCatalogDisabledError, openLibraryManager, openLibrary } from '../chunk-RDTLPOPD.js';
+import { AI_RESOURCES } from '../chunk-AATHJRKL.js';
+import { status, enable, disable, install, uninstall } from '../chunk-ASWTQQ7E.js';
+import { logErr, S, logOk, logInfo, logWarn, TARGET_DEFAULT_HINT, parseHarnessFilter, requireProjectConfig, deferredWarnings, warnPlaceholderBodies, warnFilesOnlyDelegates, reportLegacyOmpCopies, logNoProject, warnLegacyClaudeCopies, kindColorPad, kindColor, colorRef, formatSoftDepSection, bareSoftDepName, formatSoftDepHint, formatRelativeTime, formatSoftDepRemovePreview, formatSoftDepAddPreview, fitWidth, KIND_COL_WIDTH } from '../chunk-QEULL4Q3.js';
+import { getKindRegistry, getKnownKinds } from '../chunk-COYF6IG2.js';
 import { LocalSecretsProvider } from '../chunk-ILFGVSTJ.js';
-import { resolveInstanceAgentDir, instanceSessionOverrides, runAgentChat, isCompositionError, resolveSessionId, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, hashAgentFiles, createCompositionContentSource, compileComposition, manifestModelForDriver, instanceForSession, resolveAgentInstance, describeComposition, MarkdownStreamer, createFinalTextFallback } from '../chunk-7NT4F6SR.js';
-import '../chunk-A6SMCEEE.js';
-import '../chunk-WST6UITC.js';
-import '../chunk-2LSDMJI2.js';
-import '../chunk-R4I3VBSS.js';
-import '../chunk-R6O6YWU7.js';
-import '../chunk-PYJS5K7V.js';
-import '../chunk-6Z5KTFJT.js';
-import '../chunk-4ZTPYIBE.js';
-import '../chunk-X5YPJV4N.js';
-import '../chunk-XJVBUDDJ.js';
+import { resolveInstanceAgentDir, instanceSessionOverrides, runAgentChat, isCompositionError, resolveSessionId, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, hashAgentFiles, createCompositionContentSource, compileComposition, manifestModelForHarness, instanceForSession, resolveAgentInstance, describeComposition, MarkdownStreamer, createFinalTextFallback } from '../chunk-2LAPHLDH.js';
+import '../chunk-QAKUD6QN.js';
+import '../chunk-6YR4ALVX.js';
+import '../chunk-ZAELRYKS.js';
+import '../chunk-X3YGUKCG.js';
+import '../chunk-WYZXSJBK.js';
+import '../chunk-HMISULVD.js';
+import '../chunk-Z3VKUWAX.js';
+import '../chunk-KW37WNXY.js';
+import '../chunk-3MWQKQUB.js';
+import '../chunk-KUQAJVYT.js';
 import '../chunk-O7SG5PC2.js';
 import '../chunk-7QBNJTTQ.js';
 import '../chunk-O2SYFJWP.js';
-import '../chunk-Y5MBW5EU.js';
+import '../chunk-EJPMNDTP.js';
 import '../chunk-32NA4TVC.js';
 import '../chunk-W3UDISS2.js';
-import '../chunk-PHRNUTSG.js';
-import { runFlow, resumeFlow } from '../chunk-J24CY3PF.js';
+import '../chunk-ZFUZ5AKM.js';
+import { runFlow, resumeFlow } from '../chunk-J72MO2WA.js';
 import '../chunk-4R6DROGN.js';
-import { parseSkillRequirements, validateRequirements } from '../chunk-FKU57Q5Q.js';
-import '../chunk-H6UVIKQ2.js';
-import '../chunk-HT35SQZD.js';
-import '../chunk-YIF2IJUA.js';
-import '../chunk-I7TWVK6N.js';
-import { checkModelProvider, checkDriverModel } from '../chunk-7SCS64BG.js';
-import '../chunk-COJIL7G4.js';
-import '../chunk-VJ7NU7GD.js';
-import '../chunk-VSZWNUZC.js';
+import { parseSkillRequirements, validateRequirements } from '../chunk-IRYKRKVQ.js';
+import '../chunk-VYVTEMAW.js';
+import '../chunk-DGTI65OC.js';
+import '../chunk-6GWSDPBP.js';
+import '../chunk-BBBCJSSU.js';
+import { checkHarnessModel, checkModelProvider } from '../chunk-5Y2KGB4H.js';
+import '../chunk-7LP7RCZI.js';
+import '../chunk-SVTMNSPI.js';
+import '../chunk-XGULGQA3.js';
 import '../chunk-LOO5CB5M.js';
-import '../chunk-AJ7EGIFR.js';
-import '../chunk-MKRWN7XP.js';
-import '../chunk-2GXSSZAM.js';
-import '../chunk-RPZVHXQ3.js';
-import '../chunk-YROR332M.js';
-import '../chunk-XWOPZW26.js';
-import { listDrivers, getProviderPreset, AI_PROVIDER_PRESETS } from '../chunk-CQJH4G2K.js';
-import '../chunk-6E6PKKAD.js';
+import '../chunk-BIRW3HOG.js';
+import '../chunk-5J4NPGFM.js';
+import '../chunk-GNZBFSRB.js';
+import '../chunk-XFIEVEU7.js';
+import '../chunk-7DN6JKP2.js';
+import '../chunk-FKQNBCDW.js';
+import { listHarnesses, getProviderPreset, AI_PROVIDER_PRESETS } from '../chunk-ILLTBKDJ.js';
+import '../chunk-G5SUWZEU.js';
 import '../chunk-IFGTRL2I.js';
-import { loadFlow, flowLookupRoots, findFlowFileInRoots, loadAllFlowEntries } from '../chunk-IF6IA3PZ.js';
-import '../chunk-M3WPBTGJ.js';
+import { loadFlow, flowLookupRoots, findFlowFileInRoots, loadAllFlowEntries } from '../chunk-4MUDQCBP.js';
+import '../chunk-WD3L5QSU.js';
 import { nodeLabel, nodeSkillAsset, nodeIsInert, nodeIsOptional, nodeRunKind } from '../chunk-7RGTAEG6.js';
-import '../chunk-Y56YIT6J.js';
-import { LibraryEntryError, AssetManager, parseRefTolerant, MissingManifestError, parseCanonicalLockKey, normalizeRepoUrl, FACTORY_SOURCE_URL } from '../chunk-MRHVPQNO.js';
-import { CatalogHttpError, libraryDirMissing, missingLibraryDirMessage, cloneOrInitGitRepo, trackOriginBranch, stampManifestPublisher, isGitRepo, ensureGitRepo, conflictingAssetRoot, scanUnlistedAssets, setManifestPublisher, LIBRARY_OWNERSHIPS, assertManifestEditable, installLibraryAsset, getStoreManifestsDir, assertValidLibraryName, unparsableAssetFiles, syncManifestWithDisk, renamedLibraryName, storeManifestFile, getDefaultValue, isSecretPlaceholder } from '../chunk-XM6T2AZ2.js';
-import { flowFileNameError, SEMVER_RE } from '../chunk-I37INEWE.js';
-import '../chunk-7XSAW5OC.js';
+import '../chunk-JCPD4QRM.js';
+import { setLibraryAssetCheck, LibraryEntryError, AssetManager, parseRefTolerant, MissingManifestError, parseCanonicalLockKey, normalizeRepoUrl, FACTORY_SOURCE_URL } from '../chunk-HWNK3F3X.js';
+import { CatalogHttpError, libraryDirMissing, missingLibraryDirMessage, cloneOrInitGitRepo, trackOriginBranch, stampManifestPublisher, isGitRepo, ensureGitRepo, conflictingAssetRoot, scanUnlistedAssets, setManifestPublisher, LIBRARY_OWNERSHIPS, assertManifestEditable, installLibraryAsset, getStoreManifestsDir, assertValidLibraryName, unparsableAssetFiles, syncManifestWithDisk, renamedLibraryName, storeManifestFile, getDefaultValue, isSecretPlaceholder } from '../chunk-S2XHGWQC.js';
+import { flowFileNameError, SEMVER_RE } from '../chunk-UI745XC3.js';
+import '../chunk-YLLVSR2U.js';
 import '../chunk-BFMYYNDT.js';
 import '../chunk-3TXEJN4W.js';
 import '../chunk-ISHJITXJ.js';
 import '../chunk-LNFKL23K.js';
-import '../chunk-X3RMRJNR.js';
+import '../chunk-JRN5QF4C.js';
 import '../chunk-NUELZWCF.js';
-import { installTargetOf, SCAFFOLD_KINDS } from '../chunk-JTOWA6RS.js';
+import { installTargetOf, SCAFFOLD_KINDS } from '../chunk-NUA33BYO.js';
 import '../chunk-NOA6EJXE.js';
 import '../chunk-KTBKW2FI.js';
 import '../chunk-UQ6LFBPZ.js';
-import '../chunk-C7WBGSBV.js';
-import { effectiveComposes, validatePreset, validateAgent, composeSlotDiagnostics, agentDeprecationDiagnostics, SLOT_ID_PATTERN } from '../chunk-335ENCCS.js';
-import { loadSettings, globalSettingsPath, resolveSettings, projectSettingsPath, saveSettings, WorkspaceYamlEditor, resolveLibraryDir, checkAgentSkillConformance, resolveSettingsWithSources, readLock, globalInstallDir, GLOBAL_INSTALL_DIR_NAME, workspaceProviderRegistryPath, userProviderRegistryPath, loadProviderRegistryFile, aiResourceRoots } from '../chunk-N46LQR46.js';
+import '../chunk-ABFPSVIS.js';
+import { effectiveComposes, validatePreset, validateAgent, composeSlotDiagnostics, agentDeprecationDiagnostics, SLOT_ID_PATTERN } from '../chunk-E572OHGY.js';
+import { loadSettings, globalSettingsPath, resolveSettings, projectSettingsPath, saveSettings, WorkspaceYamlEditor, resolveLibraryDir, checkAgentSkillConformance, resolveSettingsWithSources, resolveConfiguredHarnessName, readLock, globalInstallDir, GLOBAL_INSTALL_DIR_NAME, workspaceProviderRegistryPath, userProviderRegistryPath, loadProviderRegistryFile, aiResourceRoots } from '../chunk-VMVDAZLA.js';
 import '../chunk-4GY63JU6.js';
-import { factoryAssetRoots } from '../chunk-TIIXG3PN.js';
-import { deployedDir } from '../chunk-5TBFN46Z.js';
-import { DEFAULT_DRIVER_ID, DRIVER_DEFAULTS } from '../chunk-5BEFNLOR.js';
+import { factoryAssetRoots } from '../chunk-ZDLUQLI6.js';
+import { deployedDir } from '../chunk-5KRMNUL4.js';
+import { DEFAULT_HARNESS_ID, HARNESS_DEFAULTS } from '../chunk-Z7ZEZZB6.js';
 import { findKindDirs } from '../chunk-MWXYN6NY.js';
-import { SourceEntryError, LegacyKeyError, resolveSkWorkspaceConfig, sourceCacheKey, getGlobalCacheDir, resolveAgentDir, AgentRefResolutionError, resolveAgentDefinitionDir, effectiveAgentInstances, matchPin, coerceVersion, loadSkWorkspaceConfig, isWorkspaceConfigFilename } from '../chunk-V257LUBM.js';
+import { SourceEntryError, LegacyKeyError, resolveSkWorkspaceConfig, sourceCacheKey, getGlobalCacheDir, resolveAgentDir, AgentRefResolutionError, resolveAgentDefinitionDir, effectiveAgentInstances, matchPin, coerceVersion, loadSkWorkspaceConfig, findWorkspaceRoot, isWorkspaceConfigFilename, SKAILE_YAML_DEFAULT, AGENT_PROFILE_FIELDS } from '../chunk-ZHGKAZJ7.js';
 import { globalCacheRoot, globalSkaileDir, userConfigPath } from '../chunk-L5VSIPQD.js';
-import { DRIVER_TARGETS, SUPPORTED_DRIVER_TARGETS, driverTargetForDriver } from '../chunk-IG5LZ3WU.js';
-import { SKAILE_MANIFEST_FILENAME, loadSkPublishManifest, decodeSkaileManifest, LIBRARY_GITIGNORE, librarySymlinkMessage, isNonAssetPath, isNonAssetDir, encodeSkaileManifest } from '../chunk-UQ33Y4DM.js';
+import { HARNESS_TARGETS, SUPPORTED_HARNESSES, harnessNameForHarnessId } from '../chunk-VTETQCR6.js';
+import { SKAILE_MANIFEST_FILENAME, loadSkPublishManifest, decodeSkaileManifest, LIBRARY_GITIGNORE, librarySymlinkMessage, isNonAssetPath, isNonAssetDir, encodeSkaileManifest } from '../chunk-ZBHZLWV3.js';
 import { pluginTitle } from '../chunk-RVRB27AN.js';
-import { dedupeRequirements, parseFrontmatter, scanDirectory, parseRequires } from '../chunk-GOCWM7FN.js';
-import { parseAssetRef, isValidPublisher, PUBLISHER_HINT, isValidAssetName, ASSET_NAME_HINT, depToStr, assetRefToStr, slugifyAssetName, parseAssetRefLoose } from '../chunk-WDXZA7QW.js';
-import { portableSpawn, portableSpawnSync } from '../chunk-ICSCSM5D.js';
+import { dedupeRequirements, parseFrontmatter, scanDirectory, parseRequires } from '../chunk-RHN5MRQO.js';
+import { parseAssetRef, isValidPublisher, PUBLISHER_HINT, isValidAssetName, ASSET_NAME_HINT, depToStr, assetRefToStr, slugifyAssetName, parseAssetRefLoose } from '../chunk-LSSYC5IC.js';
+import { portableSpawn, portableSpawnSync } from '../chunk-ADPM6AYF.js';
 import { openSqlite } from '../chunk-DKXNKFKP.js';
-import { parseModelRef, resolveEntryBaseUrl } from '../chunk-MJHSLODD.js';
+import { parseModelRef, resolveEntryBaseUrl } from '../chunk-LSI2IVFT.js';
 import '../chunk-C3CAXQMA.js';
 import { registerLogStore, LogStore, StdoutSink } from '../chunk-BOFL7GIF.js';
 import '../chunk-NSBPE2FW.js';
 import * as fs8 from 'fs';
 import fs8__default, { readFileSync, existsSync, mkdirSync, writeFileSync, lstatSync, rmSync, readdirSync, statSync } from 'fs';
-import * as path18 from 'path';
-import path18__default, { resolve, join } from 'path';
+import * as path19 from 'path';
+import path19__default, { resolve, join } from 'path';
 import { fileURLToPath } from 'url';
 import { Help, Command, Option } from 'commander';
 import { rcompare } from 'semver';
@@ -224,7 +225,7 @@ async function runSearch(kind, query, opts) {
   const showLocal = !opts.store;
   const showStore = !opts.local;
   const { resolveConfig } = await import('../library/index.js');
-  const airGapped = resolveConfig({ projectDir: path18__default.resolve(opts.projectDir) }).catalog.cache_ttl === 0;
+  const airGapped = resolveConfig({ projectDir: path19__default.resolve(opts.projectDir) }).catalog.cache_ttl === 0;
   if (showLocal) {
     await searchLocal(query, kind, opts, showStore, airGapped);
   }
@@ -232,13 +233,19 @@ async function runSearch(kind, query, opts) {
     await searchStore(query, kind, opts, airGapped);
   }
 }
-async function searchIndex(query, kind) {
-  const { openLibrary: openLibrary2 } = await import('../open-library-PVTIUQUF.js');
+async function searchIndex(query, kind, projectDir) {
+  const { openLibrary: openLibrary2 } = await import('../open-library-NKKUJLWA.js');
   const library = await openLibrary2();
   try {
     const { libraryDirMissing: libraryDirMissing2 } = await import('../library/index.js');
     const sources = await library.listSources();
     const gone = new Set(sources.filter(libraryDirMissing2).map((l) => l.id));
+    for (const id of new AssetManager({
+      registry: getKindRegistry(),
+      projectDir
+    }).undeclaredSourceClones(sources)) {
+      gone.add(id);
+    }
     const defs = (await library.listAssetDefs(kind ? { kind } : {})).filter((d) => !d.libraryId || !gone.has(d.libraryId));
     const libraryNames = new Map(sources.map((l) => [l.id, l.name]));
     let entries = defs.map(
@@ -270,7 +277,7 @@ async function searchIndex(query, kind) {
   }
 }
 async function searchFactory(projectDir, query, kind) {
-  const prefixes = factoryAssetRoots().map((r) => r.endsWith(path18__default.sep) ? r : r + path18__default.sep);
+  const prefixes = factoryAssetRoots().map((r) => r.endsWith(path19__default.sep) ? r : r + path19__default.sep);
   const isFactoryPath = (p6) => prefixes.some((fp) => p6 === fp.slice(0, -1) || p6.startsWith(fp));
   try {
     const entries = await new AssetManager({ registry: getKindRegistry(), projectDir }).search(
@@ -383,18 +390,35 @@ async function expandCompetingOrigins(entries, projectDir) {
   }
   return out;
 }
+async function withAddVersions(entries, projectDir) {
+  if (!entries.some((e) => e.library && e.publisher)) return entries;
+  let versions;
+  try {
+    versions = await new AssetManager({
+      registry: getKindRegistry(),
+      projectDir
+    }).sourceAssetVersions();
+  } catch {
+    return entries;
+  }
+  if (versions.size === 0) return entries;
+  return entries.map((e) => {
+    const v = e.library ? versions.get(`${e.library}\0${entryDedupKey(e)}`) : void 0;
+    return v && v !== e.version ? { ...e, version: v } : e;
+  });
+}
 async function searchLocal(query, kind, opts, showStore, airGapped) {
-  const projectDir = path18__default.resolve(opts.projectDir);
-  const { restoreSourceReaders } = await import('../source-DGPCT5IC.js');
+  const projectDir = path19__default.resolve(opts.projectDir);
+  const { restoreSourceReaders } = await import('../source-ASEHI2XS.js');
   for (const name of await restoreSourceReaders(projectDir)) {
     logInfo(`Re-registered source "${name}" (its library entry was removed elsewhere).`);
   }
   const factory = await searchFactory(projectDir, query, kind);
-  let entries = unionEntries(await searchIndex(query, kind), factory);
+  let entries = unionEntries(await searchIndex(query, kind, projectDir), factory);
   if (entries.length === 0 && !query && !kind && !airGapped) {
-    const { autoSyncForSearch } = await import('../source-DGPCT5IC.js');
+    const { autoSyncForSearch } = await import('../source-ASEHI2XS.js');
     if (await autoSyncForSearch(projectDir)) {
-      entries = unionEntries(await searchIndex(query, kind), factory);
+      entries = unionEntries(await searchIndex(query, kind, projectDir), factory);
     }
   }
   if (entries.length === 0) {
@@ -410,7 +434,10 @@ async function searchLocal(query, kind, opts, showStore, airGapped) {
   ${S.heading("Local:")}`);
   }
   printLocalEntries(
-    await expandCompetingOrigins(await expandLibraryCopies(entries, projectDir), projectDir)
+    await withAddVersions(
+      await expandCompetingOrigins(await expandLibraryCopies(entries, projectDir), projectDir),
+      projectDir
+    )
   );
 }
 var MIN_LOCAL_DESCRIPTION_WIDTH = 10;
@@ -506,9 +533,9 @@ async function searchStore(query, kind, opts, airGapped) {
     logInfo("air-gapped (cache_ttl: 0) \u2014 local sources only");
     return;
   }
-  const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-PVTIUQUF.js');
+  const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-NKKUJLWA.js');
   try {
-    const remote = await openCatalogSource2({ projectDir: path18__default.resolve(opts.projectDir) });
+    const remote = await openCatalogSource2({ projectDir: path19__default.resolve(opts.projectDir) });
     const assets = await remote.listAssets(kind ? { kind } : {});
     const sel = selectStoreRows(filterCatalogAssets(assets, query), query, Boolean(opts.all));
     if (sel.shown.length > 0) {
@@ -523,7 +550,7 @@ async function searchStore(query, kind, opts, airGapped) {
     const local = e instanceof LocalCatalogDisabledError2;
     if (opts.store) {
       logErr(
-        local ? "remote catalog disabled (catalog.url: local) \u2014 set catalog.url: https://skaile.store to search the store" : `Store search failed: ${await describeStoreFailure(e, path18__default.resolve(opts.projectDir))}`
+        local ? "remote catalog disabled (catalog.url: local) \u2014 set catalog.url: https://skaile.store to search the store" : `Store search failed: ${await describeStoreFailure(e, path19__default.resolve(opts.projectDir))}`
       );
       process.exit(1);
     } else {
@@ -615,7 +642,7 @@ function makeAddCommand() {
   return new Command("add").description("Add to skaile.yaml + deploy").argument("<ref>", "Asset reference (kind:@<publisher>/name#<version>)").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Record in ~/.skaile/skaile.yaml + deploy to every global harness").option(
     "--harness <ids>",
     "Comma-separated global harnesses to deploy into (default: all resolved); implies --global"
-  ).option("--target <agent>", `Driver target (${TARGET_DEFAULT_HINT})`).option(
+  ).option("--target <agent>", `Harness target (${TARGET_DEFAULT_HINT})`).option(
     "--link",
     "symlink local-path assets instead of copying (dev loop; machine-local, not for committing)"
   ).option(
@@ -624,7 +651,10 @@ function makeAddCommand() {
   ).option("--no-soft-deps", "skip the soft-dep prompt entirely (don't add, don't report)").option(
     "--force",
     "overwrite a deployed folder that no lock entry owns (a hand-made skill of the same name)"
-  ).option("--verbose", "print the full `exists in N libraries` warning for every asset").action(async (ref, opts) => {
+  ).option("--verbose", "print the full `exists in N libraries` warning for every asset").option(
+    "--dry-run",
+    "show the library, version, dependencies and folders the add would use; change nothing"
+  ).action(async (ref, opts) => {
     if (opts.withSoftDeps && opts.softDeps === false) {
       logErr("--with-soft-deps and --no-soft-deps are mutually exclusive.");
       process.exit(1);
@@ -635,10 +665,10 @@ function makeAddCommand() {
     const collisionKeys = [];
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir),
+      projectDir: path19__default.resolve(opts.projectDir),
       global: opts.global || harnesses !== void 0,
       harnesses,
-      driverTarget: opts.target,
+      harness: opts.target,
       verboseCollisions: opts.verbose === true,
       onLibraryCollision: (msg, keys) => {
         collisionKeys.push(...keys ?? [msg.split(" exists in ")[0]]);
@@ -653,6 +683,7 @@ function makeAddCommand() {
       const placeholderDescriptions = [];
       let presets = [];
       const skippedSecrets = /* @__PURE__ */ new Set();
+      let plan = [];
       const added = await am2.add(ref, {
         link: opts.link,
         force: opts.force,
@@ -671,9 +702,18 @@ function makeAddCommand() {
           warnings.push(
             `${secretPath} looks like a secret: it is not deployed or hashed with the asset. Keep secrets out of an asset root`
           );
+        },
+        dryRun: opts.dryRun === true,
+        onPlan: (items) => {
+          plan = items;
         }
       });
-      spinner.stop("Done");
+      spinner.stop(opts.dryRun ? "Planned" : "Done");
+      if (opts.dryRun) {
+        warnings.flush();
+        printAddPlan(plan);
+        return;
+      }
       warnings.flush();
       if (!am2.global) await pinComposedAgents(am2.projectDir);
       await promptSoftDepAdds(am2, ref, {
@@ -706,7 +746,7 @@ function makeAddCommand() {
           );
         } else if (!installTargetOf(getKindRegistry(), kind))
           logInfo(
-            `Recorded in skaile.yaml (store bytes are fetched + verified into .skaile/cache/store). ${kind} assets are not deployed into the driver target \u2014 they are composed when skaile runs the agent.`
+            `Recorded in skaile.yaml (store bytes are fetched + verified into .skaile/cache/store). ${kind} assets are not deployed into the harness target \u2014 they are composed when skaile runs the agent.`
           );
         else logInfo("Nothing to deploy (already up to date).");
       } else {
@@ -715,7 +755,7 @@ function makeAddCommand() {
           logOk(library ? `${a} (library ${library})` : a);
         }
         warnPlaceholderBodies(placeholderBodies, placeholderDescriptions);
-        if (!am2.global) warnFilesOnlyDelegates(am2.projectDir, am2.driverTarget);
+        if (!am2.global) warnFilesOnlyDelegates(am2.projectDir, am2.harness);
         if (am2.global) {
           for (const a of added) {
             const { kind, name } = parseAssetRef(a);
@@ -754,6 +794,18 @@ function makeAddCommand() {
     }
   });
 }
+function printAddPlan(plan) {
+  const line = (item, label) => {
+    logInfo(
+      `${label} ${colorRef(item.ref)}${item.version ? `#${item.version}` : ""} (${item.origin})`
+    );
+    for (const folder of item.folders) console.log(`    folder: ${S.dim(folder)}`);
+    if (item.files.length > 0) console.log(`    files:  ${S.dim(item.files.join(", "))}`);
+  };
+  for (const item of plan.filter((i) => i.requested)) line(item, "Would add");
+  for (const item of plan.filter((i) => !i.requested)) line(item, "Would also add");
+  logInfo("Dry run: nothing was changed.");
+}
 function readableError(err) {
   if (err instanceof Error && err.code === "unknown_asset_kind") {
     return `Error: ${err.message.replace(/^unknown_asset_kind: /, "")}`;
@@ -764,7 +816,7 @@ function makeRemoveCommand() {
   return new Command("remove").description("Remove from skaile.yaml + undeploy").argument("<ref>", "Asset reference (kind:@publisher/name, or kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).option("--global", "Remove from ~/.skaile/skaile.yaml + undeploy from every global harness").option(
     "--harness <ids>",
     "Comma-separated global harnesses to undeploy from (default: all resolved); implies --global"
-  ).option("--target <agent>", `Driver target (${TARGET_DEFAULT_HINT})`).option(
+  ).option("--target <agent>", `Harness target (${TARGET_DEFAULT_HINT})`).option(
     "--force",
     "Remove even when another installed asset requires it, or when the folder is not one the lock holds"
   ).option("--no-soft-deps", "skip the orphaned-soft-dep prompt (don't remove, don't report)").action(async (ref, opts) => {
@@ -773,10 +825,10 @@ function makeRemoveCommand() {
       requireProjectConfig(opts.projectDir, { allowMissing: true });
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir),
+      projectDir: path19__default.resolve(opts.projectDir),
       global: opts.global || harnesses !== void 0,
       harnesses,
-      driverTarget: opts.target
+      harness: opts.target
     });
     let result;
     try {
@@ -813,6 +865,9 @@ function makeRemoveCommand() {
     for (const dep of result.pruned) {
       logOk(`Removed ${dep} (no longer required by anything declared in skaile.yaml)`);
     }
+    for (const setting of result.droppedSettings ?? []) {
+      logOk(`Removed ${setting} from skaile.yaml (it only set values for ${ref})`);
+    }
     await promptSoftDepRemovals(am2, ref, {
       isTTY: !!process.stdin.isTTY,
       noSoftDeps: opts.softDeps === false,
@@ -834,8 +889,8 @@ function makeListCommand() {
     "-g, --global",
     "Read the global SSOT (~/.skaile/skaile.yaml); report state per harness"
   ).option("--harness <ids>", "Comma-separated global harnesses to report (implies --global)").option("--json", "Output as JSON").addOption(
-    new Option("--target <agent>", `Driver target (${TARGET_DEFAULT_HINT})`).choices(
-      SUPPORTED_DRIVER_TARGETS
+    new Option("--target <agent>", `Harness target (${TARGET_DEFAULT_HINT})`).choices(
+      SUPPORTED_HARNESSES
     )
   ).action(async (kind, opts) => {
     const harnesses = parseHarnessFilter(opts.harness);
@@ -845,8 +900,8 @@ function makeListCommand() {
     }
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir),
-      driverTarget: opts.target
+      projectDir: path19__default.resolve(opts.projectDir),
+      harness: opts.target
     });
     let declared;
     try {
@@ -895,7 +950,7 @@ function makeListCommand() {
 function runGlobalList(kind, opts, harnesses) {
   const am2 = new AssetManager({
     registry: getKindRegistry(),
-    projectDir: path18__default.resolve(opts.projectDir),
+    projectDir: path19__default.resolve(opts.projectDir),
     global: true,
     harnesses
   });
@@ -974,7 +1029,7 @@ function infoVersionLine(locked, latest) {
 }
 function lockedVersionOf(projectDir, kind, name, publisher) {
   try {
-    const lock = readLock(path18__default.join(projectDir, "skaile.lock.yaml"));
+    const lock = readLock(path19__default.join(projectDir, "skaile.lock.yaml"));
     for (const key of Object.keys(lock?.assets ?? {})) {
       const id = parseCanonicalLockKey(key);
       if (id.kind !== kind || id.name !== name || !id.version) continue;
@@ -1014,7 +1069,7 @@ async function resolveInfoEntry(am2, ref, opts) {
     return { entry: match ?? deployed };
   }
   const lookup = opts.storeLookup ?? (async (filter) => {
-    const { resolveCatalogSource } = await import('../open-library-PVTIUQUF.js');
+    const { resolveCatalogSource } = await import('../open-library-NKKUJLWA.js');
     const { source, close } = await resolveCatalogSource({ projectDir: opts.projectDir });
     try {
       return await source.listAssets(filter);
@@ -1030,7 +1085,7 @@ async function resolveInfoEntry(am2, ref, opts) {
     );
     return { entry: hit ? catalogAssetToEntry(hit) : null };
   } catch (err) {
-    const { LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-PVTIUQUF.js');
+    const { LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-NKKUJLWA.js');
     const storeNote = err instanceof Error ? err.message : String(err);
     const disabled = err instanceof LocalCatalogDisabledError2 || /catalog\.url/i.test(storeNote);
     return { entry: null, storeNote, ...disabled ? { storeDisabled: true } : {} };
@@ -1046,7 +1101,7 @@ function infoNotFoundHint(ref, lookup) {
 }
 function makeInfoCommand() {
   return new Command("info").description("Show asset metadata, deps, deploy status").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     requireProjectConfig(projectDir, { allowMissing: true });
     const am2 = new AssetManager({ registry: getKindRegistry(), projectDir });
     let lookup;
@@ -1079,6 +1134,12 @@ function makeInfoCommand() {
     if (entry.publisher) console.log(`  repository:  ${S.dim(entry.publisher)}`);
     const infoSource = showLocked && entry.source.endsWith(`#${entry.version}`) ? `${entry.source.slice(0, -`#${entry.version}`.length)}#${infoLocked}` : entry.source;
     console.log(`  source:      ${S.dim(infoSource)}`);
+    const infoLibrary = await am2.lockedLibraryOf(
+      entry.kind,
+      entry.name,
+      parseRefTolerant(ref)?.publisher ?? entry.publisher
+    );
+    if (infoLibrary) console.log(`  library:     ${S.dim(infoLibrary)}`);
     if (entry.kind === "mcp-server") {
       const skipped = (await am2.mcpNotices()).find(
         (n) => n.kind === "skipped" && (n.id === entry.name || n.id.endsWith(`/${entry.name}`))
@@ -1117,7 +1178,7 @@ function makeCreateCommand() {
     new Option("-k, --kind <kind>", "Asset kind").default("skill").choices([...SCAFFOLD_KINDS])
   ).option("-d, --dir <dir>", "Target directory (default: cwd)").action((name, opts) => {
     const am2 = new AssetManager({ registry: getKindRegistry(), projectDir: process.cwd() });
-    const destDir = opts.dir ? path18__default.resolve(opts.dir) : process.cwd();
+    const destDir = opts.dir ? path19__default.resolve(opts.dir) : process.cwd();
     const result = am2.create(name, opts.kind, destDir);
     if (result.ok) logOk(`Created ${kindColor(opts.kind)}: ${pc5.dim(result.path)}`);
     else {
@@ -1132,7 +1193,7 @@ function makeDoctorCommand() {
       const problems = globalProblems(
         new AssetManager({
           registry: getKindRegistry(),
-          projectDir: path18__default.resolve(opts.projectDir),
+          projectDir: path19__default.resolve(opts.projectDir),
           global: true,
           harnesses: parseHarnessFilter(opts.harness)
         })
@@ -1146,19 +1207,24 @@ function makeDoctorCommand() {
       return;
     }
     requireProjectConfig(opts.projectDir);
+    const configErrors = await reportProjectConfig(path19__default.resolve(opts.projectDir), {
+      harness: true,
+      instances: true
+    });
+    if (configErrors > 0) process.exitCode = 1;
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     const { gaps } = await am2.projectState();
-    const edited = await editedConventionFiles(path18__default.resolve(opts.projectDir));
+    const edited = await editedConventionFiles(path19__default.resolve(opts.projectDir));
     const notices = [
       ...(await am2.mcpNotices()).map((n) => n.text),
       // A library that went back past the lock is no drift either (p1257).
       ...await am2.libraryOlderNotices()
     ];
     if (gaps.length === 0 && edited.length === 0) {
-      logOk("No missing dependencies.");
+      if (configErrors === 0) logOk("No missing dependencies.");
       for (const n of notices) logWarn(n);
       return;
     }
@@ -1189,20 +1255,20 @@ function claudeSkillRoots() {
   const roots = [];
   const override = process.env.SKAILE_CLAUDE_SKILLS_DIR;
   if (override) roots.push(override);
-  roots.push(path18.join(os.homedir(), ".claude", "skills"));
+  roots.push(path19.join(os.homedir(), ".claude", "skills"));
   return roots;
 }
 function resolveImportSource(nameOrPath) {
-  const asPath = path18.resolve(nameOrPath);
+  const asPath = path19.resolve(nameOrPath);
   if (fs8.existsSync(asPath)) {
-    const dir = fs8.statSync(asPath).isDirectory() ? asPath : path18.dirname(asPath);
-    const skillFile = path18.join(dir, "SKILL.md");
+    const dir = fs8.statSync(asPath).isDirectory() ? asPath : path19.dirname(asPath);
+    const skillFile = path19.join(dir, "SKILL.md");
     if (fs8.existsSync(skillFile)) return { dir, skillFile, via: "path" };
   }
-  if (!nameOrPath.includes(path18.sep) && !nameOrPath.startsWith(".")) {
+  if (!nameOrPath.includes(path19.sep) && !nameOrPath.startsWith(".")) {
     for (const root of claudeSkillRoots()) {
-      const dir = path18.join(root, nameOrPath);
-      const skillFile = path18.join(dir, "SKILL.md");
+      const dir = path19.join(root, nameOrPath);
+      const skillFile = path19.join(dir, "SKILL.md");
       if (fs8.existsSync(skillFile)) return { dir, skillFile, via: "claude-skills" };
     }
   }
@@ -1260,8 +1326,8 @@ ${body}
 // cli/src/commands/asset-cmd.ts
 function copyFilter(root) {
   return (src) => {
-    const rel = path18.relative(root, src).split(path18.sep).join("/");
-    return rel === "" || !(isNonAssetPath(rel) || isNonAssetDir(path18.basename(src)));
+    const rel = path19.relative(root, src).split(path19.sep).join("/");
+    return rel === "" || !(isNonAssetPath(rel) || isNonAssetDir(path19.basename(src)));
   };
 }
 async function resolveDefByRef(library, ref, opts) {
@@ -1344,16 +1410,16 @@ function makeAssetCommand() {
         }
         const rawSkill = fs8.readFileSync(src.skillFile, "utf8");
         const norm = opts.normalize ? normalizeSkillContent(rawSkill, {
-          fallbackName: path18.basename(src.dir),
+          fallbackName: path19.basename(src.dir),
           version: opts.version,
           stage: opts.stage
-        }) : { content: rawSkill, name: path18.basename(src.dir), changed: false, notes: [] };
+        }) : { content: rawSkill, name: path19.basename(src.dir), changed: false, notes: [] };
         if (!opts.normalize && !isValidAssetName(norm.name)) {
           logWarn(
             `Name "${norm.name}" is not canonical (kebab-case); \`skaile validate\` will reject this manifest entry. Drop --no-normalize to slugify it.`
           );
         }
-        const destDir = path18.join(target.path, norm.name);
+        const destDir = path19.join(target.path, norm.name);
         if (fs8.existsSync(destDir)) {
           logErr(`Destination already exists: ${destDir}`);
           process.exit(1);
@@ -1385,7 +1451,7 @@ function makeAssetCommand() {
           logWarn(`${norm.name}/SKILL.md [${f.tag}] \u2014 ${f.text}`);
         }
         fs8.cpSync(src.dir, destDir, { recursive: true, filter: copyFilter(src.dir) });
-        fs8.writeFileSync(path18.join(destDir, "SKILL.md"), norm.content, "utf8");
+        fs8.writeFileSync(path19.join(destDir, "SKILL.md"), norm.content, "utf8");
         for (const note of norm.notes) logInfo(`  \u2022 ${note}`);
         const fm = parseFrontmatter(norm.content).data;
         for (const f of checkAgentSkillConformance(fm, { dirName: norm.name })) {
@@ -1451,10 +1517,10 @@ function makeAssetCommand() {
           );
           process.exit(1);
         }
-        const basename3 = path18.basename(srcPath);
+        const basename3 = path19.basename(srcPath);
         const destDir = target.path;
         fs8.mkdirSync(destDir, { recursive: true });
-        const destPath = path18.join(destDir, basename3);
+        const destPath = path19.join(destDir, basename3);
         if (fs8.existsSync(destPath)) {
           logErr(`Destination already exists: ${destPath}`);
           process.exit(1);
@@ -1486,7 +1552,7 @@ function makeAssetCommand() {
         }
         logOk(`Migrated ${basename3} \u2192 ${target.name} (${opts.mode})`);
         const publisher = loadSkPublishManifest(target.path)?.publisher ?? "<publisher>";
-        const migratedKind = fs8.existsSync(path18.join(destPath, "SKILL.md")) ? "skill" : "<kind>";
+        const migratedKind = fs8.existsSync(path19.join(destPath, "SKILL.md")) ? "skill" : "<kind>";
         logInfo(
           `Not addable yet: run ${S.cmd(`skaile library index ${target.name}`)}, then ${S.cmd(`skaile add ${migratedKind}:@${publisher.replace(/^@/, "")}/${basename3}`)}`
         );
@@ -1612,14 +1678,14 @@ function makeAuthCommand() {
 }
 function collectCacheTargets(scope) {
   const out = [];
-  out.push(path18__default.join(scope.projectDir, ".skaile", "cache"));
-  out.push(path18__default.join(scope.projectDir, ".skaile", "store-cache"));
-  out.push(path18__default.join(scope.projectDir, ".skaile", "repos"));
+  out.push(path19__default.join(scope.projectDir, ".skaile", "cache"));
+  out.push(path19__default.join(scope.projectDir, ".skaile", "store-cache"));
+  out.push(path19__default.join(scope.projectDir, ".skaile", "repos"));
   if (scope.global) {
     out.push(globalCacheRoot());
     const home = globalSkaileDir();
-    out.push(path18__default.join(home, "repos"));
-    out.push(path18__default.join(home, "catalog-cache"));
+    out.push(path19__default.join(home, "repos"));
+    out.push(path19__default.join(home, "catalog-cache"));
   }
   return out;
 }
@@ -1633,7 +1699,7 @@ function dirSize(target) {
 function dirSizeOfDir(dir) {
   let total = 0;
   for (const ent of readdirSync(dir, { withFileTypes: true })) {
-    const child = path18__default.join(dir, ent.name);
+    const child = path19__default.join(dir, ent.name);
     if (ent.isSymbolicLink()) continue;
     if (ent.isDirectory()) total += dirSizeOfDir(child);
     else if (ent.isFile()) total += statSync(child).size;
@@ -1659,7 +1725,7 @@ function makeCacheCommand() {
   const cmd = new Command("cache").description("Inspect and reclaim the re-derivable cache");
   cmd.command("clean").description("Remove the project cache (.skaile/cache); --global also clears ~/.skaile/cache").option("--global", "Also clear the global cache (sources + catalog) and legacy dirs").option("--dry-run", "Show what would be removed without doing it").option("-y, --yes", "Skip confirmation prompt").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
     const targets = collectCacheTargets({
-      projectDir: path18__default.resolve(opts.projectDir),
+      projectDir: path19__default.resolve(opts.projectDir),
       global: opts.global
     }).filter((t) => existsSync(t));
     if (targets.length === 0) {
@@ -1689,12 +1755,12 @@ function makeCacheCommand() {
     for (const r of removed) logOk(`Removed ${r}`);
   });
   cmd.command("dir").description("Print the resolved cache roots").option("--global", "Include the global cache root").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
-    console.log(path18__default.join(path18__default.resolve(opts.projectDir), ".skaile", "cache"));
+    console.log(path19__default.join(path19__default.resolve(opts.projectDir), ".skaile", "cache"));
     if (opts.global) console.log(globalCacheRoot());
   });
   cmd.command("size").description("Show cache disk usage per directory").option("--global", "Include the global cache").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
     const targets = collectCacheTargets({
-      projectDir: path18__default.resolve(opts.projectDir),
+      projectDir: path19__default.resolve(opts.projectDir),
       global: opts.global
     });
     console.log();
@@ -1710,7 +1776,7 @@ function makeCatalogCommand() {
   const catalog = new Command("catalog").description("Catalog source health and configuration");
   catalog.command("test").description("Probe the configured catalog source and report status").option("--project-dir <path>", "Project directory (for project-level config overlay)").option("--url <url>", "Override the catalog URL for this probe").option("--force", "Probe the network even in air-gapped mode (cache_ttl: 0)").action(async (opts) => {
     const { resolveConfig, isLocalCatalogUrl, trpcGetUrl } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     const baseUrl = opts.url ?? cfg.catalog.url;
     if (isLocalCatalogUrl(baseUrl)) {
@@ -1732,7 +1798,7 @@ function makeCatalogCommand() {
   });
   catalog.command("info").description("Print the resolved catalog configuration (url, framing, cacheTtlMs)").option("--project-dir <path>", "Project directory (for project-level config overlay)").action(async (opts) => {
     const { resolveConfig } = await import('../library/index.js');
-    const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : void 0;
+    const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : void 0;
     const cfg = resolveConfig({ projectDir });
     console.log(`url: ${cfg.catalog.url}`);
     console.log(`framing: ${cfg.catalog.framing}`);
@@ -1741,7 +1807,7 @@ function makeCatalogCommand() {
   return catalog;
 }
 async function runLocalCatalogTest(projectDir) {
-  const { resolveCatalogSource } = await import('../open-library-PVTIUQUF.js');
+  const { resolveCatalogSource } = await import('../open-library-NKKUJLWA.js');
   let resolved;
   try {
     resolved = await resolveCatalogSource({ projectDir });
@@ -1917,13 +1983,13 @@ async function scanLibraryFlowEntries() {
     const { LocalIndex, resolveIndexPath, scanAuthoringLibraries } = await import('../library/index.js');
     const indexPath = resolveIndexPath();
     if (!existsSync(indexPath)) return entries;
-    const { getKindRegistry: getKindRegistry2 } = await import('../open-registry-SOIS3TA2.js');
+    const { getKindRegistry: getKindRegistry2 } = await import('../open-registry-BYAXSHUI.js');
     const index = new LocalIndex({ indexPath });
     try {
       for (const { library, assets } of await scanAuthoringLibraries(index, getKindRegistry2())) {
         for (const asset of assets) {
           if (asset.kind !== "flow") continue;
-          if (flowFileNameError(asset.manifest, path18__default.basename(asset.manifestPath))) continue;
+          if (flowFileNameError(asset.manifest, path19__default.basename(asset.manifestPath))) continue;
           try {
             const flow = loadFlow(asset.manifestPath);
             if (flow.id) {
@@ -1991,9 +2057,9 @@ function findSkills() {
 }
 function walkSkills(dir, out) {
   for (const entry of fs8__default.readdirSync(dir, { withFileTypes: true })) {
-    const full = path18__default.join(dir, entry.name);
+    const full = path19__default.join(dir, entry.name);
     if (entry.isDirectory()) {
-      const skillMd = path18__default.join(full, "SKILL.md");
+      const skillMd = path19__default.join(full, "SKILL.md");
       if (fs8__default.existsSync(skillMd)) {
         out.push({ name: entry.name, path: full, skillPath: skillMd });
       } else {
@@ -2015,7 +2081,7 @@ function resolveFlowIds() {
   }
 }
 function resolveSessionIds(projectDir) {
-  const sessionsDir = path18__default.join(projectDir, ".skaile", "sessions");
+  const sessionsDir = path19__default.join(projectDir, ".skaile", "sessions");
   if (!fs8__default.existsSync(sessionsDir)) return [];
   try {
     return fs8__default.readdirSync(sessionsDir).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length));
@@ -2023,7 +2089,7 @@ function resolveSessionIds(projectDir) {
     return [];
   }
 }
-var CONFIG_KEYS = ["provider", "model", "driver", "framework", "projectDir", "apiKey"];
+var CONFIG_KEYS = ["provider", "model", "harness", "framework", "projectDir", "apiKey"];
 
 // cli/src/commands/complete.ts
 function makeCompleteCommand(program2) {
@@ -2070,39 +2136,12 @@ function resolveDynamic(words, cword) {
   if (cmd === "config" && ["get", "set"].includes(sub) && isLast(3)) return CONFIG_KEYS;
   return null;
 }
-
-// cli/src/driver-error.ts
-function unknownDriverMessage(driver) {
-  const known = listDrivers().map((d) => d.id);
-  if (known.includes(driver)) return void 0;
-  return `Unknown agent driver: "${driver}". Available: ${known.join(", ")}`;
-}
-function friendlyDriverError(err) {
-  const e = err;
-  if (!e) return null;
-  const isSpawnEnoent = e.code === "ENOENT" && (e.syscall?.startsWith("spawn") === true || /^spawn .*ENOENT/.test(e.message ?? ""));
-  const isConfig = e.category === "config" || e.detail?.category === "config";
-  if (!isSpawnEnoent && !isConfig) return null;
-  const hint = e.hint ?? e.detail?.hint;
-  const base = hint ?? "The configured agent binary is not installed or not on your PATH.";
-  return `${base}
-Try a different harness with \`--driver claude-sdk\`.`;
-}
-function driverErrorNotes(err) {
-  const e = err;
-  const notes = [];
-  const category = e?.category ?? e?.detail?.category;
-  const hint = e?.hint ?? e?.detail?.hint;
-  if (hint && category !== "config") notes.push(hint);
-  else if (category === "auth") notes.push("Check your API key or login.");
-  if (e?.logSessionId) {
-    notes.push(`Full records: .skaile/logs.db (skaile session logs ${e.logSessionId}).`);
-  }
-  return notes;
+var PERSONAL_KEYS = /* @__PURE__ */ new Set(["harness", "model"]);
+function resolveDriverKeyAlias(key) {
+  if (key !== "driver") return key;
+  console.error("`driver` is deprecated; use `harness`");
+  return "harness";
 }
-
-// cli/src/commands/config.ts
-var PERSONAL_KEYS = /* @__PURE__ */ new Set(["driver", "model"]);
 var CATALOG_KEYS = /* @__PURE__ */ new Set(["catalog.url", "catalog.cache_ttl", "catalog.framing"]);
 async function setCatalogKey(key, raw) {
   const { CatalogConfigSchema, saveConfig } = await import('../library/index.js');
@@ -2160,7 +2199,7 @@ function collectWorkspaceDefaults(projectDir) {
   const wsDefaults = {};
   const ws = resolveSkWorkspaceConfig(projectDir);
   const p6 = ws.agent_config?.default ?? {};
-  if (p6.driver) wsDefaults.driver = p6.driver;
+  if (p6.harness) wsDefaults.harness = p6.harness;
   if (p6.model) wsDefaults.model = p6.model;
   if (p6.skills_dir) wsDefaults.skills_dir = p6.skills_dir;
   if (p6.agents_dir) wsDefaults.agents_dir = p6.agents_dir;
@@ -2174,7 +2213,7 @@ function printEffectiveSection(config, sources) {
   console.log();
   console.log(S.heading("  Effective Config"));
   console.log(`  ${S.rule(40)}`);
-  for (const key of ["driver", "model"]) {
+  for (const key of ["harness", "model"]) {
     const value = config[key];
     if (value !== void 0) {
       const origin = sources[key];
@@ -2201,7 +2240,7 @@ function printModelSelectionSection(config, projectDir) {
   console.log(`  ${S.rule(40)}`);
   const selector = config.model;
   if (!selector) {
-    console.log(`  ${S.dim("no model: selector \u2014 the driver applies its own default")}`);
+    console.log(`  ${S.dim("no model: selector \u2014 the harness applies its own default")}`);
   } else {
     const resolved = parseModelRef(selector, registry, config.roles);
     if (!resolved) {
@@ -2233,8 +2272,8 @@ function printModelSelectionSection(config, projectDir) {
   }
 }
 function printResolvedPathsSection(config) {
-  const fw = config.driver ?? DEFAULT_DRIVER_ID;
-  const paths = DRIVER_DEFAULTS[fw] ?? DRIVER_DEFAULTS[DEFAULT_DRIVER_ID];
+  const fw = config.harness ?? DEFAULT_HARNESS_ID;
+  const paths = HARNESS_DEFAULTS[fw] ?? HARNESS_DEFAULTS[DEFAULT_HARNESS_ID];
   if (!paths) return;
   console.log();
   console.log(`  ${S.heading("Resolved Paths")}  ${S.dim(`(${fw})`)}`);
@@ -2244,7 +2283,7 @@ function printResolvedPathsSection(config) {
   console.log(`  ${S.label("prompts:".padEnd(16))} ${config.promptsDir ?? paths.promptsDir}`);
 }
 async function showConfig(opts) {
-  const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : process.cwd();
+  const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : process.cwd();
   let config;
   let sources;
   let wsDefaults;
@@ -2309,8 +2348,9 @@ function unsetApiKeySugar(provider, projectDir) {
 function makeConfigCommand() {
   const cmd = new Command("config").description("Manage personal config (.skaile/settings.json)");
   cmd.command("show").description("Show effective config with sources").option("--project-dir <path>", "Project directory").action((opts) => showConfig(opts));
-  cmd.command("get <key>").description("Get an effective config value").option("--project-dir <path>", "Project directory").option("--global", "Read ~/.skaile/settings.json only, not the project's value").action(async (key, opts) => {
-    const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : process.cwd();
+  cmd.command("get <key>").description("Get an effective config value").option("--project-dir <path>", "Project directory").option("--global", "Read ~/.skaile/settings.json only, not the project's value").action(async (rawKey, opts) => {
+    const key = resolveDriverKeyAlias(rawKey);
+    const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : process.cwd();
     if (CATALOG_KEYS.has(key)) {
       const { resolveConfig } = await import('../library/index.js');
       const field = key.slice("catalog.".length);
@@ -2322,75 +2362,92 @@ function makeConfigCommand() {
     console.log(value ?? S.dim("(not set)"));
   });
   cmd.command("set <key> <value>").description(
-    "Set a personal config value (driver, model, apiKey.<provider>) or a catalog setting (catalog.url, catalog.cache_ttl, catalog.framing). `config unset <key>` removes every one of them again"
-  ).option("--project-dir <path>", "Project directory").option("--global", "Write to ~/.skaile/settings.json instead of project-local").action(async (key, value, opts) => {
-    const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : process.cwd();
-    if (CATALOG_KEYS.has(key)) {
-      await setCatalogKey(key, value);
-      return;
-    }
-    if (key === "provider" || key === "cloud" || key === "cloudConfig") {
-      logErr(
-        `'${key}' is no longer a setting \u2014 an endpoint is an AI provider registry entry and a session selects one with a model reference.
+    "Set a personal config value (harness, model, apiKey.<provider>) or a catalog setting (catalog.url, catalog.cache_ttl, catalog.framing). `config unset <key>` removes every one of them again"
+  ).option("--project-dir <path>", "Project directory").option("--global", "Write to ~/.skaile/settings.json instead of project-local").action(
+    async (rawKey, value, opts) => {
+      const key = resolveDriverKeyAlias(rawKey);
+      const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : process.cwd();
+      if (CATALOG_KEYS.has(key)) {
+        await setCatalogKey(key, value);
+        return;
+      }
+      if (key === "provider" || key === "cloud" || key === "cloudConfig") {
+        logErr(
+          `'${key}' is no longer a setting \u2014 an endpoint is an AI provider registry entry and a session selects one with a model reference.
   Define it:  skaile providers add <id> --preset <preset>
   Select it:  skaile config set model <providerId>/<modelId>`
-      );
-      process.exit(1);
-    }
-    const isApiKey = key.startsWith(API_KEY_PREFIX);
-    if (!PERSONAL_KEYS.has(key) && !isApiKey) {
-      logErr(
-        `'${key}' is not a personal setting.
+        );
+        process.exit(1);
+      }
+      const isApiKey = key.startsWith(API_KEY_PREFIX);
+      if (!PERSONAL_KEYS.has(key) && !isApiKey) {
+        logErr(
+          `'${key}' is not a personal setting.
   Personal keys: ${[...PERSONAL_KEYS].join(", ")}, ${API_KEY_PREFIX}<provider>
-  Project config (driver, model, paths, resources) belongs in skaile.yaml`
-      );
-      process.exit(1);
-    }
-    if (isApiKey) {
-      setApiKeySugar(key.slice(API_KEY_PREFIX.length), value, projectDir);
-      return;
-    }
-    if (key === "driver") {
-      await loadDeclaredPlugins(projectDir);
-      const unknown = unknownDriverMessage(value);
-      if (unknown) {
-        logErr(unknown);
+  Project config (harness, model, paths, resources) belongs in skaile.yaml`
+        );
         process.exit(1);
       }
-    }
-    const projectDriver = key === "driver" ? resolveSkWorkspaceConfig(projectDir).agent_config?.default?.driver : void 0;
-    const filePath = opts.global ? globalSettingsPath() : projectSettingsPath(projectDir);
-    const existing = await loadSettings(filePath);
-    await saveSettings({ ...existing, [key]: value }, filePath);
-    logOk(`Set ${pc5.bold(key)} = ${value}`);
-    console.log(S.dim(`  \u2192 ${filePath}`));
-    if (projectDriver && projectDriver !== value) {
-      logWarn(
-        `skaile.yaml sets driver ${projectDriver}; a personal driver does not override the project harness.
-  Remove this one again: skaile config unset driver${opts.global ? " --global" : ""}`
-      );
-    }
-    if (key === "model") {
-      const view = loadRegistryView({ projectDir });
-      const resolved = parseModelRef(value, view.merged);
-      if (!resolved) {
+      if (isApiKey) {
+        setApiKeySugar(key.slice(API_KEY_PREFIX.length), value, projectDir);
+        return;
+      }
+      if (key === "harness") {
+        await loadDeclaredPlugins(projectDir);
+        const unknown = unknownHarnessMessage(value);
+        if (unknown) {
+          logErr(unknown);
+          process.exit(1);
+        }
+      }
+      if (key === "model") {
+        await loadDeclaredPlugins(projectDir);
+        const harness = (await resolveSettings(projectDir)).harness ?? DEFAULT_HARNESS_ID;
+        const refusal = checkHarnessModel(harness, {
+          registry: loadRegistryView({ projectDir }).merged,
+          model: value,
+          roles: resolveSkWorkspaceConfig(projectDir).roles
+        });
+        if (refusal) {
+          logErr(`${refusal} (the project's harness is ${harness})`);
+          process.exit(1);
+        }
+      }
+      const projectHarness = key === "harness" ? resolveSkWorkspaceConfig(projectDir).agent_config?.default?.harness : void 0;
+      const filePath = opts.global ? globalSettingsPath() : projectSettingsPath(projectDir);
+      const existing = await loadSettings(filePath);
+      await saveSettings({ ...existing, [key]: value }, filePath);
+      logOk(`Set ${pc5.bold(key)} = ${value}`);
+      console.log(S.dim(`  \u2192 ${filePath}`));
+      if (projectHarness && projectHarness !== value) {
         logWarn(
-          "no AI provider is configured yet \u2014 add one with `skaile providers add <id> --preset <preset>`"
-        );
-      } else {
-        console.log(
-          S.dim(
-            `  \u2192 resolves to ${resolved.providerId}${resolved.providerModelId ? `/${resolved.providerModelId}` : ""}`
-          )
+          `skaile.yaml sets harness ${projectHarness}; a personal harness does not override the project harness.
+  Remove this one again: skaile config unset harness${opts.global ? " --global" : ""}`
         );
-        for (const warning of resolved.warnings) logWarn(warning);
+      }
+      if (key === "model") {
+        const view = loadRegistryView({ projectDir });
+        const resolved = parseModelRef(value, view.merged);
+        if (!resolved) {
+          logWarn(
+            "no AI provider is configured yet \u2014 add one with `skaile providers add <id> --preset <preset>`"
+          );
+        } else {
+          console.log(
+            S.dim(
+              `  \u2192 resolves to ${resolved.providerId}${resolved.providerModelId ? `/${resolved.providerModelId}` : ""}`
+            )
+          );
+          for (const warning of resolved.warnings) logWarn(warning);
+        }
       }
     }
-  });
+  );
   cmd.command("unset <key>").description(
-    "Remove a value that `config set` wrote: driver, model, apiKey.<provider> (removes the provider entry) or catalog.url, catalog.cache_ttl, catalog.framing (the default applies again)"
-  ).option("--project-dir <path>", "Project directory").option("--global", "Remove from ~/.skaile/settings.json instead of project-local").action(async (key, opts) => {
-    const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : process.cwd();
+    "Remove a value that `config set` wrote: harness, model, apiKey.<provider> (removes the provider entry) or catalog.url, catalog.cache_ttl, catalog.framing (the default applies again)"
+  ).option("--project-dir <path>", "Project directory").option("--global", "Remove from ~/.skaile/settings.json instead of project-local").action(async (rawKey, opts) => {
+    const key = resolveDriverKeyAlias(rawKey);
+    const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : process.cwd();
     if (CATALOG_KEYS.has(key)) {
       await unsetCatalogKey(key);
       return;
@@ -2713,8 +2770,8 @@ function makeConnectorCommand() {
     async (driver, opts) => {
       const { installNpmPackages } = await import('../connectors/index.js');
       const { scanDirectory: scanDirectory2, factoryAssetRoots: factoryAssetRoots2, WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-      const projectDir = path18__default.resolve(opts.projectDir);
-      const yamlPath = path18__default.join(projectDir, "skaile.yaml");
+      const projectDir = path19__default.resolve(opts.projectDir);
+      const yamlPath = path19__default.join(projectDir, "skaile.yaml");
       if (!existsSync(yamlPath)) {
         logErr("No skaile.yaml found in current directory. Run 'skaile init' first.");
         process.exit(1);
@@ -2774,8 +2831,8 @@ ${installResult.output}`);
   );
   cmd.command("remove <id>").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Remove a connector from skaile.yaml by its instance ID").action(async (id, opts) => {
     const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-    const projectDir = path18__default.resolve(opts.projectDir);
-    const yamlPath = path18__default.join(projectDir, "skaile.yaml");
+    const projectDir = path19__default.resolve(opts.projectDir);
+    const yamlPath = path19__default.join(projectDir, "skaile.yaml");
     if (!existsSync(yamlPath)) {
       logErr("No skaile.yaml found in current directory.");
       process.exit(1);
@@ -2792,7 +2849,7 @@ ${installResult.output}`);
   cmd.command("status [id]").option("--project-dir <path>", "Workspace directory", process.cwd()).description("Connect and report health status for one or all connectors").action(async (id, opts) => {
     const res = await import('../connectors/index.js');
     res.registerBuiltinConnectors();
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const declarations = res.loadConnectorDeclarations(projectDir);
     if (declarations.length === 0) {
       console.log("No connectors configured in skaile.yaml.");
@@ -2816,7 +2873,7 @@ ${installResult.output}`);
     await manager.disconnectAll();
   });
   cmd.command("list").description("List all configured connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       console.log(JSON.stringify(manager.listConnectors(), null, 2));
@@ -2825,7 +2882,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("sync [id]").description("Re-sync a filesystem-face connector or all of them (git pull, S3 refresh, etc.)").option("--all", "Sync all connectors").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (opts.all) {
@@ -2849,7 +2906,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("ops <id>").description("List available operations for a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -2864,7 +2921,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("read <id> <resource-path>").description("Read content from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const content = await manager.read(id, resourcePath);
@@ -2874,7 +2931,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("write <id> <resource-path> <content>").description("Write content to a connector at a path").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, content, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       await manager.write(id, resourcePath, { data: content });
@@ -2884,7 +2941,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("entries <id> [resource-path]").description("List entries in a connector (files, keys, rows, etc)").option("--project-dir <path>", "Workspace directory", process.cwd()).option("--recursive", "Include nested entries").option("--limit <n>", "Maximum entries to return", parsePositiveIntOption).action(async (id, resourcePath, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const entries = await manager.list(id, resourcePath, {
@@ -2897,7 +2954,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("search <id> <query>").description("Search within a connector for matching content").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, query, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const results = await manager.search(id, query);
@@ -2907,7 +2964,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("delete <id> <resource-path>").description("Delete an entry from a connector").option("--project-dir <path>", "Workspace directory", process.cwd()).action(async (id, resourcePath, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       const ok = await manager.delete(id, resourcePath);
@@ -2917,7 +2974,7 @@ ${installResult.output}`);
     }
   });
   cmd.command("run <id> <op> [args...]").description("Run a custom adapter operation (e.g. git log, sqlite query)").option("--project-dir <path>", "Workspace directory", process.cwd()).allowUnknownOption().action(async (id, op, args, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const manager = await connectConnectors(projectDir);
     try {
       if (!manager.has(id)) {
@@ -2998,7 +3055,7 @@ function makeDebugCommand() {
   cmd.command("mcp").description("List MCP servers and their registered tools").action(async (_, parent) => {
     await runDebugQuery("mcp", parent.parent.opts());
   });
-  cmd.command("config").description("Dump driver config (API keys redacted)").action(async (_, parent) => {
+  cmd.command("config").description("Dump harness config (API keys redacted)").action(async (_, parent) => {
     await runDebugQuery("config", parent.parent.opts());
   });
   cmd.command("state [store]").description("Read a shared state store snapshot (or list all stores)").action(async (store, _, parent) => {
@@ -3026,7 +3083,7 @@ function envRecord() {
 async function buildDeployContext(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
-  const workspaceId = config.name ?? path18__default.basename(projectDir);
+  const workspaceId = config.name ?? path19__default.basename(projectDir);
   let log;
   try {
     const { createLogger } = await import('../core/logging.js');
@@ -3058,13 +3115,13 @@ async function ensureTargetsRegistered(projectDir) {
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   if (config.plugins && config.plugins.length > 0) {
-    const { ensurePluginsLoaded } = await import('../plugin-store-G2GWAHSD.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-ABE35NRX.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     for (const f of result.failed) logWarn(f.error);
   }
 }
 async function runUp(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   await ensureTargetsRegistered(projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const { resolveDeployTarget, pluginRegistry } = await import('../plugin-registry/index.js');
@@ -3132,7 +3189,7 @@ async function restoreFromHandle(projectDir) {
   return { target, handle, ctx };
 }
 async function runDown(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   await restored.handle.stop();
@@ -3141,7 +3198,7 @@ async function runDown(opts) {
   logOk(`Stopped ${S.cmd(restored.target.id)} and cleared the handle.`);
 }
 async function runStatus(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   const health = await restored.handle.health();
@@ -3155,7 +3212,7 @@ async function runStatus(opts) {
   console.log();
 }
 async function runLogs(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const restored = await restoreFromHandle(projectDir);
   if (!restored) return;
   if (!restored.handle.logs) {
@@ -3178,12 +3235,15 @@ function makeDeployCommand() {
   return cmd;
 }
 var DIFF_SHOWS = { content: true, modified: true, incomplete: true };
+function uniqueMessages(gaps) {
+  return [...new Set(gaps.map((g) => g.message))];
+}
 function makeDiffCommand() {
   return new Command("diff").description("Show changes between deployed and source versions").argument("<ref>", "Asset reference (kind:name)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     requireProjectConfig(opts.projectDir);
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     try {
       parseAssetRef(ref);
@@ -3204,7 +3264,7 @@ function makeDiffCommand() {
     const requirementGaps = await am2.requirementGapsOf(ref);
     const blocking = gaps.filter((g) => !DIFF_SHOWS[g.type]);
     if (blocking.length > 0) {
-      for (const g of [...blocking, ...requirementGaps]) logErr(g.message);
+      for (const line of uniqueMessages([...blocking, ...requirementGaps])) logErr(line);
       process.exitCode = 1;
       return;
     }
@@ -3235,7 +3295,7 @@ function makeDiffCommand() {
         console.log(result.diff);
         break;
     }
-    for (const g of [...problems, ...requirementGaps]) logErr(g.message);
+    for (const line of uniqueMessages([...problems, ...requirementGaps])) logErr(line);
     if (result.status === "not-found" || problems.length > 0 || requirementGaps.length > 0)
       process.exitCode = 1;
   });
@@ -3243,7 +3303,7 @@ function makeDiffCommand() {
 function makeFlowCommand() {
   const cmd = new Command("flow").description("Manage flows");
   cmd.command("list").description("List the flows of this project").option("--project-dir <path>", "Project directory", process.cwd()).option("--all", "Also list the flows of registered libraries and cached sources").action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const flows = discoverProjectFlows(projectDir);
     const others = opts.all ? await discoverOtherFlows(projectDir) : [];
     if (flows.length === 0 && others.length === 0) {
@@ -3279,7 +3339,7 @@ function makeFlowCommand() {
     }
   });
   cmd.command("show <id>").description("Show flow details and node graph").option("--project-dir <path>", "Project directory", process.cwd()).option("--all", "Also look in registered libraries and cached sources").action(async (id, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const flow = discoverProjectFlows(projectDir).find((f) => f.id === id) ?? (opts.all ? (await discoverOtherFlows(projectDir)).find((o) => o.flow.id === id)?.flow : void 0);
     if (!flow) {
       logErr(`Flow not found: ${id}`);
@@ -3313,12 +3373,68 @@ function makeFlowCommand() {
   cmd.action(() => cmd.help());
   return cmd;
 }
+var HARNESS_ID_OF_TARGET = {
+  "claude-code": "claude-sdk",
+  omp: "omp",
+  codex: "codex"
+};
+function parseHarnessTarget(name) {
+  if (name === "claude-sdk") return "claude-code";
+  return SUPPORTED_HARNESSES.includes(name) ? name : void 0;
+}
+function makeHarnessCommand() {
+  const cmd = new Command("harness").description("Choose the coding-agent harness of a project");
+  cmd.command("set <name>").description(
+    `Switch the project to a harness (${SUPPORTED_HARNESSES.join(" | ")}): rewrite skaile.yaml and install for it`
+  ).option("--project-dir <path>", "Project directory", process.cwd()).action(async (name, opts) => {
+    await runHarnessSet(name, path19__default.resolve(opts.projectDir));
+  });
+  cmd.action(() => cmd.help());
+  return cmd;
+}
+async function runHarnessSet(name, projectDir) {
+  const target = parseHarnessTarget(name);
+  if (!target) {
+    logErr(`Unknown harness "${name}". Supported: ${SUPPORTED_HARNESSES.join(", ")}`);
+    process.exit(1);
+  }
+  requireProjectConfig(projectDir);
+  const file = path19__default.join(projectDir, "skaile.yaml");
+  const before = resolveConfiguredHarnessName(projectDir);
+  let editor;
+  try {
+    editor = WorkspaceYamlEditor.load(file);
+  } catch (err) {
+    logErr(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
+  const profile = editor.getAgentConfig("default");
+  editor.setAgentConfig("default", {
+    agent: target,
+    harness: HARNESS_ID_OF_TARGET[target]
+  });
+  editor.save();
+  if (before === target) {
+    logInfo(`Project is already on ${S.cmd(target)}; installing for it.`);
+  } else {
+    logOk(
+      `Set ${S.cmd("agent-config.default")} to ${S.cmd(`agent: ${target}`)}, ${S.cmd(`harness: ${HARNESS_ID_OF_TARGET[target]}`)} in skaile.yaml`
+    );
+  }
+  if (profile?.model) {
+    logInfo(
+      `model ${profile.model} is kept. Check it fits ${target}: skaile run "hi there" --dry-run`
+    );
+  }
+  logInfo(`Installing for ${target} (${HARNESS_TARGETS[target].local.skill})`);
+  await runYamlInstall({ projectDir });
+}
 function makeHistoryCommand() {
   const cmd = new Command("history").description("Show recent add/remove/update actions");
   cmd.argument("[limit]", "Number of entries to show", "20").option("--project-dir <path>", "Project directory", process.cwd()).action((limitStr, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     const limit = parseInt(limitStr, 10) || 20;
     const entries = am2.history(limit);
@@ -3341,7 +3457,7 @@ function makeHistoryCommand() {
   cmd.command("clear").description("Clear action history").option("--project-dir <path>", "Project directory", process.cwd()).action((opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     am2.clearHistory();
     logOk("History cleared.");
@@ -3372,7 +3488,7 @@ async function readConfig(p6) {
   }
 }
 async function writeConfig(p6, value) {
-  await fs5.mkdir(path18__default.dirname(p6), { recursive: true });
+  await fs5.mkdir(path19__default.dirname(p6), { recursive: true });
   const cleaned = {};
   for (const [k, v] of Object.entries(value)) {
     if (v === void 0) continue;
@@ -3381,7 +3497,7 @@ async function writeConfig(p6, value) {
   await fs5.writeFile(p6, stringify$1(cleaned));
 }
 function configPath(projectDir) {
-  return path18__default.join(projectDir, ".codex", "config.toml");
+  return path19__default.join(projectDir, ".codex", "config.toml");
 }
 async function install2(projectDir) {
   const p6 = configPath(projectDir);
@@ -3392,7 +3508,7 @@ async function install2(projectDir) {
   const matches = previous && JSON.stringify(previous) === JSON.stringify(next);
   let warning;
   if (previous && !matches) {
-    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path18__default.relative(projectDir, p6)}`;
+    warning = `overwrote existing ${SKAILE_MCP_NAME} entry in ${path19__default.relative(projectDir, p6)}`;
   }
   if (matches) return { changed: false, method: "toml" };
   servers[SKAILE_MCP_NAME] = next;
@@ -3400,7 +3516,7 @@ async function install2(projectDir) {
   return { changed: true, method: "toml", warning };
 }
 function userConfigPath2() {
-  return path18__default.join(process.env.CODEX_HOME || path18__default.join(homedir(), ".codex"), "config.toml");
+  return path19__default.join(process.env.CODEX_HOME || path19__default.join(homedir(), ".codex"), "config.toml");
 }
 async function readUserConfig() {
   const p6 = userConfigPath2();
@@ -3442,7 +3558,7 @@ async function trustProject(projectDir) {
   } catch {
     return "refused";
   }
-  await fs5.mkdir(path18__default.dirname(p6), { recursive: true });
+  await fs5.mkdir(path19__default.dirname(p6), { recursive: true });
   await fs5.writeFile(p6, next);
   await writeTrustMark(projectDir, [
     .../* @__PURE__ */ new Set([
@@ -3454,7 +3570,7 @@ async function trustProject(projectDir) {
 }
 var TRUST_MARK = "codexTrustAdded";
 function stateFilePath(projectDir) {
-  return path18__default.join(projectDir, ".skaile", "plugin-state.json");
+  return path19__default.join(projectDir, ".skaile", "plugin-state.json");
 }
 async function readState(projectDir) {
   try {
@@ -3478,7 +3594,7 @@ async function writeTrustMark(projectDir, roots) {
   const state2 = await readState(projectDir);
   if (roots.length > 0) state2[TRUST_MARK] = roots;
   else delete state2[TRUST_MARK];
-  await fs5.mkdir(path18__default.dirname(stateFilePath(projectDir)), { recursive: true });
+  await fs5.mkdir(path19__default.dirname(stateFilePath(projectDir)), { recursive: true });
   await fs5.writeFile(stateFilePath(projectDir), JSON.stringify(state2, null, 2));
 }
 async function untrustProject(projectDir) {
@@ -3576,12 +3692,12 @@ async function status2(projectDir) {
     installed: "yes",
     enabled: trusted ? "n/a" : "untrusted",
     method: "mcp",
-    location: path18__default.relative(projectDir, p6)
+    location: path19__default.relative(projectDir, p6)
   };
 }
 async function install3(projectDir) {
-  const extDir = path18__default.join(projectDir, ".omp", "extensions");
-  const extPath = path18__default.join(extDir, "skaile.ts");
+  const extDir = path19__default.join(projectDir, ".omp", "extensions");
+  const extPath = path19__default.join(extDir, "skaile.ts");
   await fs5.mkdir(extDir, { recursive: true });
   const { WorkspacePlugin } = await import('../workspace-plugin/index.js');
   const plugin = new WorkspacePlugin({ projectDir });
@@ -3596,7 +3712,7 @@ async function install3(projectDir) {
   return { changed: true, method: "generated" };
 }
 async function uninstall3(projectDir) {
-  const extPath = path18__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path19__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   try {
     await fs5.unlink(extPath);
     return { changed: true };
@@ -3605,14 +3721,14 @@ async function uninstall3(projectDir) {
   }
 }
 async function status3(projectDir) {
-  const extPath = path18__default.join(projectDir, ".omp", "extensions", "skaile.ts");
+  const extPath = path19__default.join(projectDir, ".omp", "extensions", "skaile.ts");
   if (existsSync(extPath)) {
     return {
       harness: "omp",
       installed: "yes",
       enabled: "n/a",
       method: "extension",
-      location: path18__default.relative(projectDir, extPath)
+      location: path19__default.relative(projectDir, extPath)
     };
   }
   return {
@@ -3627,12 +3743,15 @@ async function status3(projectDir) {
 // cli/src/commands/integration.ts
 var ALL_HARNESSES = ["claude-code", "omp", "codex"];
 var TOGGLE_SUPPORTED = ["claude-code"];
-function resolveDriver(driver) {
-  if (driver === "all") return [...ALL_HARNESSES];
-  if (driver === "claude-code" || driver === "omp" || driver === "codex") return [driver];
-  logErr(`Unknown driver "${driver}". Supported: ${ALL_HARNESSES.join(", ")}, all`);
+function resolveHarness(harness) {
+  if (harness === "all") return [...ALL_HARNESSES];
+  if (harness === "claude-code" || harness === "omp" || harness === "codex") return [harness];
+  logErr(`Unknown harness "${harness}". Supported: ${ALL_HARNESSES.join(", ")}, all`);
   return null;
 }
+function withHarness(raw, fallback) {
+  return foldDriverFlag(raw, fallback);
+}
 async function runHarnessStep(label, body) {
   try {
     await body();
@@ -3664,15 +3783,27 @@ async function installOmp(projectDir) {
     logInfo(`omp: already installed (${r.method})`);
   }
   await unignoreOmpExtension(projectDir);
-  if (isGitIgnored(projectDir, OMP_EXTENSION)) {
+  const rule = ompExtensionIgnoreRule(projectDir, OMP_EXTENSION);
+  if (rule) {
     logWarn(
-      `git ignores ${OMP_EXTENSION} (a global ignore file or .git/info/exclude); omp does not load an ignored extension. Remove that rule.`
+      `git ignores ${OMP_EXTENSION} (${rule}); omp does not load an ignored extension. Remove that rule.`
     );
   }
   console.log(`  ${S.dim("\u2192")} OMP auto-discovers extensions on next startup.`);
 }
-function isGitIgnored(projectDir, file) {
-  return spawnSync("git", ["check-ignore", "-q", file], { cwd: projectDir, stdio: "ignore" }).status === 0;
+function ompExtensionIgnoreRule(projectDir, file) {
+  const verbose = (p6) => {
+    const r = spawnSync("git", ["check-ignore", "-v", p6], { cwd: projectDir, encoding: "utf-8" });
+    return r.status === 0 ? r.stdout.trim() || void 0 : void 0;
+  };
+  const hit = verbose(file);
+  if (!hit) return void 0;
+  const dirs = [];
+  for (let d = path19__default.posix.dirname(file); d !== "."; d = path19__default.posix.dirname(d)) dirs.push(d);
+  if (dirs.some((d) => verbose(d) !== void 0)) return void 0;
+  const [rule] = hit.split("	");
+  const m = /^(.*?):(\d+):(.*)$/.exec(rule ?? "");
+  return m ? `${m[1]}:${m[2]}: ${m[3]}` : rule;
 }
 async function installCodex(projectDir) {
   const r = await install2(projectDir);
@@ -3697,8 +3828,8 @@ ${await trustEntry(projectDir)}`
   console.log(`  ${S.dim("\u2192")} Restart Codex CLI to pick up the change.`);
 }
 async function runInstall(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const projectDir = path19__default.resolve(opts.projectDir);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3760,8 +3891,8 @@ async function uninstallCodex(projectDir) {
   }
 }
 async function runUninstall(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const projectDir = path19__default.resolve(opts.projectDir);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3783,12 +3914,12 @@ async function runUninstall(opts) {
   return exitCode;
 }
 async function removeEmptyPluginState(projectDir) {
-  const stateFile = path18__default.join(projectDir, ".skaile", "plugin-state.json");
+  const stateFile = path19__default.join(projectDir, ".skaile", "plugin-state.json");
   try {
     const parsed = JSON.parse(await fs5.readFile(stateFile, "utf-8"));
     if (typeof parsed !== "object" || parsed === null || Object.keys(parsed).length > 0) return;
     await fs5.unlink(stateFile);
-    await fs5.rmdir(path18__default.dirname(stateFile)).catch(() => void 0);
+    await fs5.rmdir(path19__default.dirname(stateFile)).catch(() => void 0);
   } catch {
   }
 }
@@ -3799,7 +3930,7 @@ var PER_MACHINE_FILES = {
 };
 var OMP_EXTENSION = ".omp/extensions/skaile.ts";
 async function unignoreOmpExtension(projectDir) {
-  const gitignore = path18__default.join(projectDir, ".gitignore");
+  const gitignore = path19__default.join(projectDir, ".gitignore");
   let text;
   try {
     text = await fs5.readFile(gitignore, "utf-8");
@@ -3816,12 +3947,12 @@ async function unignoreOmpExtension(projectDir) {
 }
 var CLAUDE_FULL_FILES = [".claude/settings.json", ".claude/plugins/skaile/"];
 async function ignorePerMachineFiles(projectDir, targets, full) {
-  const gitignore = path18__default.join(projectDir, ".gitignore");
+  const gitignore = path19__default.join(projectDir, ".gitignore");
   let existing = null;
   try {
     existing = await fs5.readFile(gitignore, "utf-8");
   } catch {
-    if (!existsSync(path18__default.join(projectDir, ".git"))) return;
+    if (!existsSync(path19__default.join(projectDir, ".git"))) return;
   }
   const have = new Set((existing ?? "").split("\n").map((l) => l.trim()));
   const wanted = [
@@ -3865,9 +3996,9 @@ async function toggleTarget(t, projectDir, action3) {
   });
 }
 async function runToggle(opts, action3) {
-  const projectDir = path18__default.resolve(opts.projectDir);
-  const requestedAll = opts.driver === "all";
-  const targets = resolveDriver(opts.driver);
+  const projectDir = path19__default.resolve(opts.projectDir);
+  const requestedAll = opts.harness === "all";
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   const usageError = checkToggleSupported(targets, requestedAll, action3);
   if (usageError !== null) return usageError;
@@ -3878,8 +4009,8 @@ async function runToggle(opts, action3) {
   return exitCode;
 }
 async function runStatus2(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const projectDir = path19__default.resolve(opts.projectDir);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   const rows = [];
   let exitCode = 0;
@@ -3950,7 +4081,7 @@ async function runHook(event) {
     await plugin.shutdown();
     return;
   }
-  const store = new PluginStore(path18__default.join(projectDir, ".skaile", "plugin-state.json"));
+  const store = new PluginStore(path19__default.join(projectDir, ".skaile", "plugin-state.json"));
   await store.load();
   const status4 = store.get("connector:status");
   if (status4 && typeof status4 === "object" && Object.keys(status4).length > 0) {
@@ -4008,28 +4139,28 @@ function makeIntegrationCommand() {
   const cmd = new Command("integration").description(
     "Manage skaile agent integration / workspace-plugin adapter (Claude Code / OMP / Codex)"
   );
-  cmd.command("install").description("Install skaile workspace plugin").option("--driver <name>", "Target: claude-code | omp | codex | all", "all").option("--project-dir <path>", "Project directory", process.cwd()).option(
+  cmd.command("install").description("Install skaile workspace plugin").option("--harness <name>", "Target: claude-code | omp | codex | all (default: all)").addOption(driverAliasOption()).option("--project-dir <path>", "Project directory", process.cwd()).option(
     "--full",
     "Claude Code: generate the full .claude/plugins/skaile/ directory (MCP + hooks) instead of the default MCP-only install"
-  ).action(async (opts) => {
-    process.exitCode = await runInstall(opts);
+  ).action(async (raw) => {
+    process.exitCode = await runInstall(withHarness(raw, "all"));
   });
-  cmd.command("uninstall").description("Uninstall skaile workspace plugin").option("--driver <name>", "Target: claude-code | omp | codex | all", "all").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    process.exitCode = await runUninstall(opts);
+  cmd.command("uninstall").description("Uninstall skaile workspace plugin").option("--harness <name>", "Target: claude-code | omp | codex | all (default: all)").addOption(driverAliasOption()).option("--project-dir <path>", "Project directory", process.cwd()).action(async (raw) => {
+    process.exitCode = await runUninstall(withHarness(raw, "all"));
   });
-  cmd.command("enable").description("Enable an installed plugin (claude-code only)").option("--driver <name>", "Target: claude-code | all", "claude-code").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    process.exitCode = await runToggle(opts, "enable");
+  cmd.command("enable").description("Enable an installed plugin (claude-code only)").option("--harness <name>", "Target: claude-code | all (default: claude-code)").addOption(driverAliasOption()).option("--project-dir <path>", "Project directory", process.cwd()).action(async (raw) => {
+    process.exitCode = await runToggle(withHarness(raw, "claude-code"), "enable");
   });
-  cmd.command("disable").description("Disable an installed plugin (claude-code only)").option("--driver <name>", "Target: claude-code | all", "claude-code").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    process.exitCode = await runToggle(opts, "disable");
+  cmd.command("disable").description("Disable an installed plugin (claude-code only)").option("--harness <name>", "Target: claude-code | all (default: claude-code)").addOption(driverAliasOption()).option("--project-dir <path>", "Project directory", process.cwd()).action(async (raw) => {
+    process.exitCode = await runToggle(withHarness(raw, "claude-code"), "disable");
   });
-  cmd.command("status").description("Show install / enable status across harnesses").option("--driver <name>", "Target: claude-code | omp | codex | all", "all").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    process.exitCode = await runStatus2(opts);
+  cmd.command("status").description("Show install / enable status across harnesses").option("--harness <name>", "Target: claude-code | omp | codex | all (default: all)").addOption(driverAliasOption()).option("--project-dir <path>", "Project directory", process.cwd()).action(async (raw) => {
+    process.exitCode = await runStatus2(withHarness(raw, "all"));
   });
   cmd.command("omp-exec <kind> <name>").description(
     "Run one tool or slash command of the omp extension (used by .omp/extensions/skaile.ts)"
   ).option("--project-dir <path>", "Project directory", process.cwd()).action(async (kind, name, opts) => {
-    process.exitCode = await runOmpExec(kind, name, path18__default.resolve(opts.projectDir));
+    process.exitCode = await runOmpExec(kind, name, path19__default.resolve(opts.projectDir));
   });
   cmd.command("hook <event>").description(
     "Run a Claude Code lifecycle hook (session-start | session-end | user-prompt-submit)"
@@ -4072,7 +4203,7 @@ function unfinishedGitState(dir) {
   for (const [entry, state2] of Object.entries(UNFINISHED_GIT_ENTRIES)) {
     const p6 = spawnSync("git", ["rev-parse", "--git-path", entry], { cwd: dir, encoding: "utf-8" });
     if (p6.status !== 0) return "the git directory could not be read";
-    if (fs8.existsSync(path18.resolve(dir, p6.stdout.trim()))) return state2;
+    if (fs8.existsSync(path19.resolve(dir, p6.stdout.trim()))) return state2;
   }
   return null;
 }
@@ -4080,7 +4211,7 @@ async function reindexLibrary(lib, library, name) {
   assertManifestEditableOrExit(lib.path);
   exitOnManifestPublisherProblems(lib.path, name);
   exitOnLibrarySymlinks(lib.path, `skaile library index ${name}`);
-  exitOnManifestRootProblems(lib.path, `skaile library index ${name}`);
+  exitOnManifestPathProblems(lib.path, `skaile library index ${name}`);
   const badRequires = manifestRequiresProblems(lib.path);
   const resolved = resolveLibraryPublisherDetailed(lib, {}, getStoreIdentity());
   warnLibraryNameFallback(name, resolved);
@@ -4097,7 +4228,7 @@ async function reindexLibrary(lib, library, name) {
     {
       check: (e) => checkAssetFile(e.source, e.kind, registry, lib.path, composeRefs),
       // A flow the engine would never load under its id (p871): keep it out of the manifest and the index.
-      refuse: (e) => e.kind === "flow" && flowFileNameError({ id: e.name }, path18.basename(e.source)) !== void 0
+      refuse: (e) => e.kind === "flow" && flowFileNameError({ id: e.name }, path19.basename(e.source)) !== void 0
     }
   );
   const manifest = loadSkPublishManifest(lib.path);
@@ -4118,7 +4249,7 @@ async function reindexLibrary(lib, library, name) {
   }
   const invalidVersion = skipped.filter((x) => x.reason === "invalid-version");
   for (const s of invalidVersion) {
-    const found = checkAssetFile(path18.join(lib.path, s.file), s.kind, registry).find(
+    const found = checkAssetFile(path19.join(lib.path, s.file), s.kind, registry).find(
       (f) => f.text.startsWith("version ")
     );
     const detail = found?.text ?? s.detail;
@@ -4129,28 +4260,36 @@ async function reindexLibrary(lib, library, name) {
   }
   const duplicates = skipped.filter((x) => x.reason === "duplicate");
   for (const s of duplicates) {
-    logErr(duplicateAssetMessage(s.kind, s.name, path18.dirname(s.file), s.detail, name));
+    logErr(duplicateAssetMessage(s.kind, s.name, path19.dirname(s.file), s.detail, name));
   }
   for (const s of failed) {
     for (const f of s.findings) logErr(`${s.file} [${f.tag}] \u2014 ${f.text}`);
   }
-  const duplicateFiles = new Set(duplicates.map((s) => path18.resolve(lib.path, s.file)));
+  const duplicateFiles = new Set(duplicates.map((s) => path19.resolve(lib.path, s.file)));
   const skippedKeys = new Set(
     [
       ...skipped.filter((s) => s.reason !== "duplicate"),
       ...failed.filter((s) => !s.inManifest)
     ].map((s) => `${s.kind}:${s.name}`)
   );
+  const refusedFiles = new Set(
+    [
+      ...skipped.filter((s) => s.reason !== "duplicate"),
+      ...failed.filter((s) => !s.inManifest)
+    ].map((s) => path19.resolve(lib.path, s.file))
+  );
   const res = await indexLibrary(lib, library, {
-    exclude: (a) => skippedKeys.has(`${a.kind}:${a.name}`) || duplicateFiles.has(path18.resolve(a.manifestPath))
+    exclude: (a) => skippedKeys.has(`${a.kind}:${a.name}`) || duplicateFiles.has(path19.resolve(a.manifestPath)) || refusedFiles.has(path19.resolve(a.manifestPath))
   });
   const unparsable = res.unparsable;
   for (const e of res.errors) (unparsable.includes(e) ? logErr : logWarn)(e);
   const syncUnparsable = skipped.filter(
-    (s) => s.reason === "unparsable" && !unparsable.some((e) => e.includes(s.file))
+    (s) => s.reason === "unparsable" && !unparsable.some((e) => e.startsWith(`${s.file} `))
   );
   for (const s of syncUnparsable) {
-    logErr(`${s.kind}:${s.name} skipped: manifest file ${s.file} could not be parsed.`);
+    logErr(
+      manifestParseFailureLine(lib.path, s.file) ?? `${s.file} [${s.kind}] \u2014 ${manifestParseErrorText("the manifest file could not be read")}`
+    );
   }
   for (const p6 of badRequires) logErr(`${p6.asset}: ${p6.message}`);
   for (const w of await unresolvedManifestDependencies(lib.path)) logWarn(w);
@@ -4160,7 +4299,7 @@ async function reindexLibrary(lib, library, name) {
     const file = findEntryManifestFile(lib.path, a);
     if (!file) continue;
     for (const f of unheldRequiresOfFile(file, a.kind, composeRefs)) {
-      logWarn(`${path18.relative(lib.path, file)} [${f.tag}] \u2014 ${f.text}`);
+      logWarn(`${path19.relative(lib.path, file)} [${f.tag}] \u2014 ${f.text}`);
     }
   }
   const skippedUnparsable = unparsable.length + syncUnparsable.length;
@@ -4220,23 +4359,60 @@ function assertManifestEditableOrExit(libraryPath) {
 }
 var DEPLOYED_COPY_DIRS = [
   ...new Set(
-    Object.values(DRIVER_TARGETS).flatMap(
+    Object.values(HARNESS_TARGETS).flatMap(
       (t) => Object.values(t.local).filter((d) => typeof d === "string")
     )
   )
 ];
+var DEPLOY_ROOT_FOLDERS = new Set(
+  DEPLOYED_COPY_DIRS.map((d) => d.split("/")[0])
+);
+function deployFolderBelowProject(dir) {
+  const real = canonicalDir(dir);
+  const home = (() => {
+    try {
+      return fs8.realpathSync(os.homedir());
+    } catch {
+      return void 0;
+    }
+  })();
+  for (let cur = real; path19.dirname(cur) !== cur; cur = path19.dirname(cur)) {
+    const project = path19.dirname(cur);
+    const folder = path19.basename(cur);
+    if (!DEPLOY_ROOT_FOLDERS.has(folder) || project === home) continue;
+    const isProject = fs8.existsSync(path19.join(project, "skaile.yaml")) || DEPLOYED_COPY_DIRS.some((d) => {
+      const full = path19.join(project, d);
+      try {
+        return fs8.statSync(full).isDirectory() && fs8.readdirSync(full).length > 0;
+      } catch {
+        return false;
+      }
+    });
+    if (isProject) return { folder, project };
+  }
+  return void 0;
+}
+function refuseDeployFolder(dir, force = false) {
+  const deployFolder = force ? void 0 : deployFolderBelowProject(dir);
+  if (!deployFolder) return;
+  logErr(
+    `${dir} is inside the deploy folder ${deployFolder.folder}/ of the project ${deployFolder.project}: a library holds asset sources, not the copies \`skaile add\` deployed. Pick another --path for the library, or pass --force when the sources live in that folder.`
+  );
+  process.exit(1);
+}
 async function refuseUnusableLibraryDir(dir, force = false) {
   const deployed = DEPLOYED_COPY_DIRS.filter((d) => {
-    const full = path18.join(dir, d);
+    const full = path19.join(dir, d);
     return fs8.existsSync(full) && fs8.statSync(full).isDirectory() && fs8.readdirSync(full).length > 0;
   });
   if (deployed.length > 0 && !force) {
-    const where = fs8.existsSync(path18.join(dir, "skaile.yaml")) ? "skaile.yaml with deployed copies" : "deployed copies";
+    const where = fs8.existsSync(path19.join(dir, "skaile.yaml")) ? "skaile.yaml with deployed copies" : "deployed copies";
     logErr(
       `${dir} is a project folder (${where} in ${deployed.map((d) => `${d}/`).join(", ")}): a library holds asset sources, not the copies \`skaile add\` deployed. Pick another --path for the library, or pass --force when the sources live in those folders.`
     );
     process.exit(1);
   }
+  refuseDeployFolder(dir, force);
   assertManifestEditableOrExit(dir);
   const unparsable = await unparsableAssetFiles(dir, getKindRegistry());
   if (unparsable.length > 0) {
@@ -4248,26 +4424,26 @@ async function refuseUnusableLibraryDir(dir, force = false) {
 }
 async function assertLibraryPathFree(manager, dir, exceptId) {
   const clash = (await manager.listLibraries()).find(
-    (l) => l.id !== exceptId && path18.resolve(l.path) === dir
+    (l) => l.id !== exceptId && path19.resolve(l.path) === dir
   );
   if (clash) throw new Error(`${dir} is already registered as library "${clash.name}".`);
 }
 function canonicalDir(dir) {
-  const abs = path18.resolve(dir);
+  const abs = path19.resolve(dir);
   const missing = [];
   let existing = abs;
   while (!fs8.existsSync(existing)) {
-    const parent = path18.dirname(existing);
+    const parent = path19.dirname(existing);
     if (parent === existing) return abs;
-    missing.unshift(path18.basename(existing));
+    missing.unshift(path19.basename(existing));
     existing = parent;
   }
-  return path18.join(fs8.realpathSync(existing), ...missing);
+  return path19.join(fs8.realpathSync(existing), ...missing);
 }
 function refuseGlobalInstallFolder(name, dir) {
   const reserved = globalInstallDir();
-  const rel = path18.relative(canonicalDir(reserved).toLowerCase(), canonicalDir(dir).toLowerCase());
-  const inside = rel === "" || !rel.startsWith("..") && !path18.isAbsolute(rel);
+  const rel = path19.relative(canonicalDir(reserved).toLowerCase(), canonicalDir(dir).toLowerCase());
+  const inside = rel === "" || !rel.startsWith("..") && !path19.isAbsolute(rel);
   if (name?.toLowerCase() === GLOBAL_INSTALL_DIR_NAME || inside) {
     logErr(
       `"${GLOBAL_INSTALL_DIR_NAME}" is reserved: ${reserved} holds assets from \`skaile install\`, not a library you author.`
@@ -4277,8 +4453,8 @@ function refuseGlobalInstallFolder(name, dir) {
 }
 async function refuseNestedLibraryPath(manager, dir, exceptId) {
   const within = (parent, child) => {
-    const rel = path18.relative(parent, child);
-    return rel === "" || !rel.startsWith("..") && !path18.isAbsolute(rel);
+    const rel = path19.relative(parent, child);
+    return rel === "" || !rel.startsWith("..") && !path19.isAbsolute(rel);
   };
   const target = canonicalDir(dir).toLowerCase();
   const librariesDir = resolveLibraryDir();
@@ -4315,7 +4491,7 @@ function assertCreateDirInsideLibrary(libRoot, destDir, given) {
     }
   };
   let probe = destDir;
-  while (!exists(probe)) probe = path18.dirname(probe);
+  while (!exists(probe)) probe = path19.dirname(probe);
   let realProbe;
   try {
     realProbe = fs8.realpathSync(probe);
@@ -4328,19 +4504,19 @@ function assertCreateDirInsideLibrary(libRoot, destDir, given) {
     process.exit(1);
   }
   const realRoot = canonicalDir(libRoot);
-  const realDest = path18.join(realProbe, path18.relative(probe, destDir));
-  const rel = path18.relative(realRoot, realDest);
-  if (rel === ".." || rel.startsWith(`..${path18.sep}`) || path18.isAbsolute(rel)) {
+  const realDest = path19.join(realProbe, path19.relative(probe, destDir));
+  const rel = path19.relative(realRoot, realDest);
+  if (rel === ".." || rel.startsWith(`..${path19.sep}`) || path19.isAbsolute(rel)) {
     logErr(
       `--dir "${given}" must stay inside the library (${realRoot}): it resolves to ${realDest}.`
     );
     process.exit(1);
   }
-  const relParts = path18.relative(path18.resolve(libRoot), path18.resolve(destDir)).split(path18.sep);
-  let walked = path18.resolve(libRoot);
+  const relParts = path19.relative(path19.resolve(libRoot), path19.resolve(destDir)).split(path19.sep);
+  let walked = path19.resolve(libRoot);
   for (const [i, part] of relParts.entries()) {
     if (part === "" || part === ".") continue;
-    walked = path18.join(walked, part);
+    walked = path19.join(walked, part);
     if (!exists(walked)) break;
     if (fs8.lstatSync(walked).isSymbolicLink()) {
       logErr(
@@ -4354,7 +4530,7 @@ function assertCreateDirInsideLibrary(libRoot, destDir, given) {
   }
 }
 function adoptWritesManifest(libPath) {
-  if (!fs8.existsSync(path18.join(libPath, SKAILE_MANIFEST_FILENAME))) return true;
+  if (!fs8.existsSync(path19.join(libPath, SKAILE_MANIFEST_FILENAME))) return true;
   const manifest = loadSkPublishManifest(libPath);
   if (!manifest || manifest.source || (manifest.assets ?? []).length > 0) return false;
   return manifestPublisherProblems(libPath).length === 0;
@@ -4408,13 +4584,13 @@ function requireValidLibraryName(name) {
 var LOCAL_OWNERSHIP_REASON = "ownership only governs sync with a git remote, and a local library is always owned by you.";
 function pruneEmptyLibraryParents(libPath) {
   const root = canonicalDir(resolveLibraryDir());
-  let dir = path18.dirname(path18.resolve(libPath));
+  let dir = path19.dirname(path19.resolve(libPath));
   for (; ; ) {
-    const rel = path18.relative(root, canonicalDir(dir));
-    if (rel === "" || rel.startsWith("..") || path18.isAbsolute(rel)) return;
+    const rel = path19.relative(root, canonicalDir(dir));
+    if (rel === "" || rel.startsWith("..") || path19.isAbsolute(rel)) return;
     if (!fs8.existsSync(dir) || fs8.readdirSync(dir).length > 0) return;
     fs8.rmdirSync(dir);
-    dir = path18.dirname(dir);
+    dir = path19.dirname(dir);
   }
 }
 function remoteBranches(url) {
@@ -4427,7 +4603,7 @@ function remoteBranches(url) {
   return r.stdout.split("\n").map((line) => line.split("	")[1]?.replace(/^refs\/heads\//, "")).filter((b) => !!b);
 }
 async function warnIfNotGithubRemote(name, url) {
-  const { isGithubRemote, notGithubRemoteMessage } = await import('../library-publish-RUQTKTJU.js');
+  const { isGithubRemote, notGithubRemoteMessage } = await import('../library-publish-I3UWXAHI.js');
   if (!isGithubRemote(url)) logWarn(notGithubRemoteMessage(name, url));
 }
 function scaffoldLibraryFiles(dir, name) {
@@ -4459,7 +4635,7 @@ by the same ref.
   ];
   const written = [];
   for (const [file, content] of files) {
-    const target = path18.join(dir, file);
+    const target = path19.join(dir, file);
     if (fs8.existsSync(target)) continue;
     fs8.writeFileSync(target, content, "utf8");
     written.push(file);
@@ -4494,7 +4670,7 @@ function makeLibraryCommand() {
       for (const l of ls) {
         const def = l.isDefault ? pc5.green("\u25B8 ") : "  ";
         console.log(
-          `${def}${S.cmd(l.name.padEnd(nameW))}  ${pc5.dim(l.backend.padEnd(backendW))}  ${pc5.dim(l.ownership.padEnd(ownerW))}  ${pc5.dim(l.path)}`
+          `${def}${S.cmd(l.name.padEnd(nameW))}  ${pc5.dim(l.backend.padEnd(backendW))}  ${pc5.dim(l.ownership.padEnd(ownerW))}  ${pc5.dim(l.path)}${libraryDirMissing(l) ? `  ${pc5.red("(directory missing)")}` : ""}`
         );
       }
       console.log(`
@@ -4516,6 +4692,11 @@ function makeLibraryCommand() {
     const { manager, close } = await openLibraryManager();
     try {
       const l = await manager.requireLibrary(name);
+      if (libraryDirMissing(l)) {
+        logErr(missingLibraryDirMessage(l));
+        process.exitCode = 1;
+        return;
+      }
       console.log();
       console.log(S.heading(`  ${l.name}`));
       console.log(`  ${S.rule(50)}`);
@@ -4527,10 +4708,6 @@ function makeLibraryCommand() {
       console.log(`  ${S.label("manifestGen")}   ${l.manifestGenerated}`);
       console.log(`  ${S.label("backendConfig")} ${JSON.stringify(l.backendConfig)}`);
       console.log();
-      if (libraryDirMissing(l)) {
-        logErr(missingLibraryDirMessage(l));
-        process.exitCode = 1;
-      }
     } finally {
       close();
     }
@@ -4552,7 +4729,7 @@ function makeLibraryCommand() {
         opts.path ??= gone.path;
       }
       const ownership = flagged[0] ?? gone?.ownership ?? "owner";
-      const libPath = opts.path ? path18.resolve(opts.path) : path18.join(resolveLibraryDir(), name);
+      const libPath = opts.path ? path19.resolve(opts.path) : path19.join(resolveLibraryDir(), name);
       refuseGlobalInstallFolder(name, libPath);
       if (fs8.existsSync(libPath) && !fs8.statSync(libPath).isDirectory()) {
         logErr(`${libPath} exists and is not a directory.`);
@@ -4578,6 +4755,8 @@ function makeLibraryCommand() {
         if (fs8.existsSync(libPath)) {
           exitOnLibrarySymlinks(libPath, `skaile library init ${name} --path ${libPath}`);
           await refuseUnusableLibraryDir(libPath, opts.force);
+        } else {
+          refuseDeployFolder(libPath, opts.force);
         }
         const hasDefault = (await manager.listLibraries()).some((l) => l.isDefault);
         let backend = "local";
@@ -4744,10 +4923,10 @@ function makeLibraryCommand() {
         exitOnManifestPublisherProblems(target.path, target.name);
         const effectiveKind = opts.kind ?? kind;
         const am2 = new AssetManager({ registry: getKindRegistry(), projectDir: process.cwd() });
-        const libRoot = path18.resolve(target.path);
-        const destDir = opts.dir ? path18.resolve(libRoot, opts.dir) : libRoot;
-        const relDest = path18.relative(libRoot, destDir);
-        if (relDest === ".." || relDest.startsWith(`..${path18.sep}`) || path18.isAbsolute(relDest)) {
+        const libRoot = path19.resolve(target.path);
+        const destDir = opts.dir ? path19.resolve(libRoot, opts.dir) : libRoot;
+        const relDest = path19.relative(libRoot, destDir);
+        if (relDest === ".." || relDest.startsWith(`..${path19.sep}`) || path19.isAbsolute(relDest)) {
           logErr(`--dir "${opts.dir}" must stay inside the library (${libRoot}).`);
           process.exit(1);
         }
@@ -4756,21 +4935,21 @@ function makeLibraryCommand() {
           libRoot,
           effectiveKind,
           name,
-          path18.relative(libRoot, path18.join(destDir, name))
+          path19.relative(libRoot, path19.join(destDir, name))
         );
         if (taken) {
           logErr(
-            `${effectiveKind}:${name} already exists at "${taken}" \u2014 creating it again under "${path18.relative(libRoot, destDir) || "."}" would re-point the manifest entry. Pick another name.`
+            `${effectiveKind}:${name} already exists at "${taken}" \u2014 creating it again under "${path19.relative(libRoot, destDir) || "."}" would re-point the manifest entry. Pick another name.`
           );
           process.exit(1);
         }
-        const wanted = path18.relative(libRoot, path18.join(destDir, name));
+        const wanted = path19.relative(libRoot, path19.join(destDir, name));
         const onDisk = (await scanUnlistedAssets(libRoot, target.name, getKindRegistry())).find(
           (u) => u.entry.kind === effectiveKind && u.entry.name === name && u.root !== wanted
         );
         if (onDisk) {
           logErr(
-            `${effectiveKind}:${name} already exists at "${onDisk.root}" (not in the manifest yet) \u2014 creating it again under "${path18.relative(libRoot, destDir) || "."}" would be a duplicate. Run \`skaile library index ${target.name}\` first or pick another name.`
+            `${effectiveKind}:${name} already exists at "${onDisk.root}" (not in the manifest yet) \u2014 creating it again under "${path19.relative(libRoot, destDir) || "."}" would be a duplicate. Run \`skaile library index ${target.name}\` first or pick another name.`
           );
           process.exit(1);
         }
@@ -4820,6 +4999,12 @@ function makeLibraryCommand() {
   cmd.command("default <name>").description("Set <name> as the default library").action(async (name) => {
     const { manager, close } = await openLibraryManager();
     try {
+      const lib = await manager.requireLibrary(name);
+      if (libraryDirMissing(lib)) {
+        logErr(missingLibraryDirMessage(lib));
+        process.exitCode = 1;
+        return;
+      }
       const updated = await manager.setDefault(name);
       logOk(`Default \u2192 ${updated.name}`);
     } finally {
@@ -4836,7 +5021,7 @@ function makeLibraryCommand() {
       logErr(`A library named "${newName}" is already registered.`);
       process.exit(1);
     }
-    const newPath = path18.join(path18.dirname(lib.path), newName);
+    const newPath = path19.join(path19.dirname(lib.path), newName);
     refuseGlobalInstallFolder(newName, newPath);
     if (fs8.existsSync(newPath)) {
       logErr(`Target directory already exists: ${newPath}`);
@@ -4929,7 +5114,7 @@ function makeLibraryCommand() {
         }
         patch.isDefault = false;
       } else if (field === "path") {
-        const dir = path18.resolve(value);
+        const dir = path19.resolve(value);
         if (!fs8.existsSync(dir) || !fs8.statSync(dir).isDirectory()) {
           logErr(`Directory does not exist: ${dir}. \`library set path=\` does not move files.`);
           process.exit(1);
@@ -5149,16 +5334,16 @@ function makeLibraryCommand() {
     "With --create-repo: create the repo private (the store only accepts public repos)"
   ).option("--ref <gitref>", "Git ref to ingest (default: the library branch or main)").option("--dry-run", "Print the plan; push nothing and call no store endpoint").action(
     async (lib, opts) => {
-      const { runLibraryPublish } = await import('../library-publish-RUQTKTJU.js');
+      const { runLibraryPublish } = await import('../library-publish-I3UWXAHI.js');
       await withStoreErrorHandling(() => runLibraryPublish(lib, opts));
     }
   );
   cmd.command("register <lib>").description("Register the library's manifest without pushing (bytes already on github)").option("--asset <ref>", "Publish only the single asset matching this ref/name").option("--ref <gitref>", "Git ref to ingest (default: the library branch or main)").option("--dry-run", "Print the plan; call no store endpoint").action(async (lib, opts) => {
-    const { runLibraryRegister } = await import('../library-publish-RUQTKTJU.js');
+    const { runLibraryRegister } = await import('../library-publish-I3UWXAHI.js');
     await withStoreErrorHandling(() => runLibraryRegister(lib, opts));
   });
   cmd.command("yank <lib>").description("Retract the library's published assets from the store").option("--asset <ref>", "Yank only the single asset matching this ref/name").action(async (lib, opts) => {
-    const { runLibraryYank } = await import('../library-publish-RUQTKTJU.js');
+    const { runLibraryYank } = await import('../library-publish-I3UWXAHI.js');
     await withStoreErrorHandling(() => runLibraryYank(lib, opts));
   });
   return cmd;
@@ -5209,9 +5394,9 @@ async function printOverallStatus(projectDir, asJson) {
     } catch {
       secretsStrategy = "unavailable";
     }
-    const resolvedProjectDir = path18.resolve(projectDir);
-    const hasWorkspaceConfig = existsSync(path18.join(resolvedProjectDir, "skaile.yaml"));
-    const hasLockFile = existsSync(path18.join(resolvedProjectDir, "skaile.lock.yaml"));
+    const resolvedProjectDir = path19.resolve(projectDir);
+    const hasWorkspaceConfig = existsSync(path19.join(resolvedProjectDir, "skaile.yaml"));
+    const hasLockFile = existsSync(path19.join(resolvedProjectDir, "skaile.lock.yaml"));
     let assignments = [];
     if (hasWorkspaceConfig) {
       try {
@@ -5308,7 +5493,7 @@ function colorLine(line) {
   if (/error|Error|ERROR|failed|Failed/.test(line)) return pc5.red(line);
   if (/connector|MCP|tool/.test(line)) return pc5.yellow(line);
   if (/rebuilt|registered|ready/.test(line)) return pc5.green(line);
-  if (/\[driver\]/.test(line)) return pc5.cyan(line);
+  if (/\[harness\]/.test(line)) return pc5.cyan(line);
   if (/\[serve\]/.test(line)) return pc5.dim(line);
   return line;
 }
@@ -5818,7 +6003,7 @@ function scheduleSoftDepPreview() {
 }
 async function loadAssets() {
   softDepPreviewCache.clear();
-  const { gatherAssetFeeds } = await import('../asset-feeds-QGLI3AXI.js');
+  const { gatherAssetFeeds } = await import('../asset-feeds-HJFV7UPW.js');
   const { entries, notes } = await gatherAssetFeeds(am, am.projectDir);
   if (notes.length > 0) {
     state.message = notes.map((n) => `[${n.feed}] ${n.message}`).join(" \u2022 ");
@@ -5826,7 +6011,7 @@ async function loadAssets() {
   const installed = new Set(am.listDeployed().map((e) => `${e.kind}:${e.name}`));
   let lock = null;
   try {
-    lock = readLock(path18__default.join(am.projectDir, "skaile.lock.yaml"));
+    lock = readLock(path19__default.join(am.projectDir, "skaile.lock.yaml"));
   } catch {
   }
   const rows = buildAssetRows(
@@ -5848,7 +6033,7 @@ function rebuildSourceTree() {
   rebuildVisibleSources();
 }
 function sourceOrgRepo(s) {
-  const parts = s.path.split(path18__default.sep).filter(Boolean);
+  const parts = s.path.split(path19__default.sep).filter(Boolean);
   if (parts.length < 2) return null;
   return { org: parts[parts.length - 2], repo: parts[parts.length - 1] };
 }
@@ -6022,13 +6207,13 @@ function reconcileCollapsedSets(rows) {
 async function loadSourcesAndLibraries() {
   try {
     const [{ openLibraryManager: openLibraryManager2 }, { getGlobalCacheDir: getGlobalCacheDir2, globalSkaileDir: globalSkaileDir2 }] = await Promise.all([
-      import('../open-library-PVTIUQUF.js'),
+      import('../open-library-NKKUJLWA.js'),
       import('../core/index.js')
     ]);
     const { manager, library, close } = await openLibraryManager2();
     try {
       const newRoot = getGlobalCacheDir2();
-      const legacyRoot = path18__default.join(globalSkaileDir2(), "sources");
+      const legacyRoot = path19__default.join(globalSkaileDir2(), "sources");
       const isSourceRow = (l) => l.path.startsWith(newRoot) || l.path.startsWith(legacyRoot);
       const libs = await manager.listLibraries();
       const defs = await library.listAssetDefs();
@@ -6988,13 +7173,13 @@ async function run(projectDir) {
 }
 function makeManageCommand() {
   return new Command("manage").description("Interactive TUI for managing assets, sources, and libraries").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    await run(path18__default.resolve(opts.projectDir));
+    await run(path19__default.resolve(opts.projectDir));
   });
 }
 function makeMcpServerCommand() {
   return new Command("mcp-server").description("Start skaile workspace MCP server (stdio transport)").option("--project-dir <path>", "Project directory (default: cwd)", process.cwd()).action(async (opts) => {
-    const path41 = await import('path');
-    const projectDir = path41.default.resolve(opts.projectDir);
+    const path43 = await import('path');
+    const projectDir = path43.default.resolve(opts.projectDir);
     const { LogStore: LogStore2, StdoutSink: StdoutSink2, registerLogStore: registerLogStore2 } = await import('../core/logging.js');
     registerLogStore2(
       new LogStore2({
@@ -7036,10 +7221,10 @@ function walkFiles(root, match) {
       return;
     }
     for (const entry of entries) {
-      const full = path18__default.join(dir, entry.name);
+      const full = path19__default.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIPPED_DIRS.has(entry.name)) continue;
-        if (entry.name === "cache" && path18__default.basename(dir) === ".skaile") continue;
+        if (entry.name === "cache" && path19__default.basename(dir) === ".skaile") continue;
         visit(full);
       } else if (entry.isFile() && match(entry.name)) {
         out.push(full);
@@ -7057,14 +7242,14 @@ function applyChanges2(changes) {
     switch (change.type) {
       case "write":
       case "create":
-        mkdirSync(path18__default.dirname(change.path), { recursive: true });
+        mkdirSync(path19__default.dirname(change.path), { recursive: true });
         writeFileSync(change.path, change.after, "utf-8");
         break;
       case "delete":
         rmSync(change.path, { force: true });
         break;
       case "move":
-        mkdirSync(path18__default.dirname(change.to), { recursive: true });
+        mkdirSync(path19__default.dirname(change.to), { recursive: true });
         writeFileSync(change.to, change.after, "utf-8");
         rmSync(change.from, { force: true });
         break;
@@ -7157,7 +7342,7 @@ function unifiedDiff(before, after, oldLabel, newLabel, context = 3) {
   return `${out.join("\n")}
 `;
 }
-var posix = (p6) => p6.split(path18__default.sep).join("/");
+var posix = (p6) => p6.split(path19__default.sep).join("/");
 function colorizeDiff(diff) {
   return diff.split("\n").map((line) => {
     if (line.startsWith("+++") || line.startsWith("---")) return S.bold(line);
@@ -7168,7 +7353,7 @@ function colorizeDiff(diff) {
   }).join("\n");
 }
 function renderChange(change, base) {
-  const rel = (p6) => posix(path18__default.relative(base, p6) || path18__default.basename(p6));
+  const rel = (p6) => posix(path19__default.relative(base, p6) || path19__default.basename(p6));
   switch (change.type) {
     case "write":
       return unifiedDiff(
@@ -7195,7 +7380,7 @@ ${diff}`;
   }
 }
 function changeLabel(change, base) {
-  const rel = (p6) => posix(path18__default.relative(base, p6) || path18__default.basename(p6));
+  const rel = (p6) => posix(path19__default.relative(base, p6) || path19__default.basename(p6));
   switch (change.type) {
     case "write":
       return `modify ${rel(change.path)}`;
@@ -7207,6 +7392,35 @@ function changeLabel(change, base) {
       return `move ${rel(change.from)} \u2192 ${rel(change.to)}`;
   }
 }
+function resolveMode(opts, writeFlag = "--write") {
+  if (opts.write && opts.dryRun) {
+    logErr(`${writeFlag} and --dry-run are mutually exclusive.`);
+    process.exit(1);
+  }
+  return opts.write === true;
+}
+function printChanges(changes, base) {
+  for (const change of changes) {
+    console.log();
+    console.log(colorizeDiff(renderChange(change, base)).trimEnd());
+  }
+}
+function finish(changes, write, base, writeFlag = "--write") {
+  console.log();
+  if (changes.length === 0) {
+    logOk("Nothing to migrate.");
+    return;
+  }
+  if (!write) {
+    logInfo(
+      `Dry run: ${changes.length} file change(s) planned, nothing written. Re-run with ${writeFlag} to apply.`
+    );
+    return;
+  }
+  applyChanges2(changes);
+  logOk(`Applied ${changes.length} file change(s):`);
+  for (const change of changes) console.log(`  ${S.dim(changeLabel(change, base))}`);
+}
 
 // cli/src/commands/migrate-agents.ts
 var TARGET_SPEC_VERSION = "0.2";
@@ -7237,7 +7451,7 @@ function itemFromRef(raw, defaultKind, ctx) {
     return { kind: prefixed[1], ref: value };
   }
   if (PATH_LIKE.test(value)) return { kind: defaultKind, ref: value };
-  if (defaultKind === "skill" && !value.includes("/") && existsSync(path18__default.join(ctx.agentDir, "skills", value, "SKILL.md"))) {
+  if (defaultKind === "skill" && !value.includes("/") && existsSync(path19__default.join(ctx.agentDir, "skills", value, "SKILL.md"))) {
     return { kind: "skill", ref: `./skills/${value}` };
   }
   return { kind: defaultKind, ref: `${defaultKind}:${value}` };
@@ -7373,7 +7587,7 @@ function migrateAgentYaml(source, options) {
         manual.push("metadata.soul: not a string; left unchanged");
         continue;
       }
-      if (path18__default.posix.basename(soul.replace(/\\/g, "/")).toLowerCase() === "soul.md") {
+      if (path19__default.posix.basename(soul.replace(/\\/g, "/")).toLowerCase() === "soul.md") {
         notes.push("metadata.soul \u2192 dropped (SOUL.md is a convention file)");
       } else {
         derived.push({ kind: "persona", ref: soul });
@@ -7607,7 +7821,7 @@ function migrateSubagents(skaileYamlPath, source) {
   if (!isMap(agentNode)) return void 0;
   const subNode = agentNode.get("subagents", true);
   if (!isMap(subNode)) return void 0;
-  const dir = path18__default.dirname(skaileYamlPath);
+  const dir = path19__default.dirname(skaileYamlPath);
   const notes = [];
   const manual = [];
   const changes = [];
@@ -7625,10 +7839,10 @@ function migrateSubagents(skaileYamlPath, source) {
       continue;
     }
     const id = instanceId(name);
-    const assetDir = path18__default.join(dir, ".skaile", "agents", id);
+    const assetDir = path19__default.join(dir, ".skaile", "agents", id);
     if (takenIds.has(id) || existsSync(assetDir)) {
       manual.push(
-        `agent.subagents.${name}: ${takenIds.has(id) ? `agents.${id} already exists` : `${path18__default.relative(dir, assetDir)} already exists`}; left in place`
+        `agent.subagents.${name}: ${takenIds.has(id) ? `agents.${id} already exists` : `${path19__default.relative(dir, assetDir)} already exists`}; left in place`
       );
       continue;
     }
@@ -7652,13 +7866,13 @@ function migrateSubagents(skaileYamlPath, source) {
       manifest.tools = { ...allowed ? { allowed } : {}, ...denied ? { denied } : {} };
     }
     const text = stringify(manifest, { lineWidth: 0 });
-    const manifestPath = path18__default.join(assetDir, "agent.yaml");
+    const manifestPath = path19__default.join(assetDir, "agent.yaml");
     changes.push({ type: "create", path: manifestPath, after: text });
     assetManifests.push({ file: manifestPath, text });
     if (typeof spec.prompt === "string" && spec.prompt.trim() !== "") {
       changes.push({
         type: "create",
-        path: path18__default.join(assetDir, "SOUL.md"),
+        path: path19__default.join(assetDir, "SOUL.md"),
         after: `${spec.prompt.replace(/\s+$/, "")}
 `
       });
@@ -7717,7 +7931,7 @@ function validateMigratedAgent(text, registry) {
 function collectAgentFiles(paths) {
   const files = /* @__PURE__ */ new Set();
   for (const input of paths) {
-    const abs = path18__default.resolve(input);
+    const abs = path19__default.resolve(input);
     if (!existsSync(abs)) continue;
     if (statSync(abs).isDirectory()) {
       for (const f of walkFiles(abs, (b) => b === "agent.yaml" || b === "skaile.yaml"))
@@ -7734,7 +7948,7 @@ function planAgentMigration(options) {
   const reports = [];
   for (const file of collectAgentFiles(options.paths)) {
     const source = readText(file);
-    const base = path18__default.basename(file);
+    const base = path19__default.basename(file);
     if (base === "skaile.yaml") {
       const result = migrateSubagents(file, source);
       if (!result) continue;
@@ -7742,7 +7956,7 @@ function planAgentMigration(options) {
       for (const asset of result.assetManifests) {
         const v = validateMigratedAgent(asset.text, options.registry);
         validation2.errors.push(
-          ...v.errors.map((e) => `${path18__default.basename(path18__default.dirname(asset.file))}: ${e}`)
+          ...v.errors.map((e) => `${path19__default.basename(path19__default.dirname(asset.file))}: ${e}`)
         );
         validation2.warnings.push(...v.warnings);
       }
@@ -7770,7 +7984,7 @@ function planAgentMigration(options) {
         });
         continue;
       }
-      migration = migrateAgentYaml(source, { agentDir: path18__default.dirname(file), knownKinds });
+      migration = migrateAgentYaml(source, { agentDir: path19__default.dirname(file), knownKinds });
     } catch (error) {
       reports.push({
         file,
@@ -7800,7 +8014,7 @@ function planAgentMigration(options) {
 var DEFAULT_PUBLISHER = "skaile-ai";
 var PRESET_DEFAULT_VERSION = "1.0.0";
 var FRONTMATTER = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
-var posix2 = (p6) => p6.split(path18__default.sep).join("/");
+var posix2 = (p6) => p6.split(path19__default.sep).join("/");
 var MOVED_KINDS = { persona: "PERSONA.md", ruleset: "RULESET.md" };
 var KIND_MANIFEST_FILES = /* @__PURE__ */ new Set(["PERSONA.md", "RULESET.md", "SKILL.md"]);
 function readFrontmatterType(text) {
@@ -7822,7 +8036,14 @@ ${kept.join("\n")}
 ${rest}`;
   return { type: parsed.type, withoutType };
 }
-function planMarkdownMoves(root, knownKinds, manual, unknownTypes) {
+function finalIdentity(kind, name) {
+  try {
+    return `${kind}:${slugifyAssetName(name)}`;
+  } catch {
+    return `${kind}:${name}`;
+  }
+}
+function planMarkdownMoves(root, knownKinds, manual, unknownTypes, identities, conflicts) {
   const moves = [];
   const changes = [];
   const targets = /* @__PURE__ */ new Set();
@@ -7831,17 +8052,26 @@ function planMarkdownMoves(root, knownKinds, manual, unknownTypes) {
     if (!text.startsWith("---")) continue;
     const found = readFrontmatterType(text);
     if (!found) continue;
-    const base = path18__default.basename(file);
-    const inAgentParts = file.split(path18__default.sep).includes("_agent-parts");
+    const base = path19__default.basename(file);
+    const inAgentParts = file.split(path19__default.sep).includes("_agent-parts");
     const targetName = MOVED_KINDS[found.type];
     if (targetName !== void 0 && !KIND_MANIFEST_FILES.has(base)) {
-      const to = path18__default.join(path18__default.dirname(file), base.replace(/\.md$/i, ""), targetName);
+      const to = path19__default.join(path19__default.dirname(file), base.replace(/\.md$/i, ""), targetName);
       if (existsSync(to) || targets.has(to)) {
         manual.push(
-          `${posix2(path18__default.relative(root, file))}: ${posix2(path18__default.relative(root, to))} already exists; not moved`
+          `${posix2(path19__default.relative(root, file))}: ${posix2(path19__default.relative(root, to))} already exists; not moved`
+        );
+        continue;
+      }
+      const identity = finalIdentity(found.type, base.replace(/\.md$/i, ""));
+      const earlier = identities.get(identity);
+      if (earlier !== void 0) {
+        conflicts.push(
+          `${earlier} and ${posix2(path19__default.relative(root, file))} both become ${identity}: rename one bundle first. Nothing was changed.`
         );
         continue;
       }
+      identities.set(identity, posix2(path19__default.relative(root, file)));
       targets.add(to);
       moves.push({ from: file, to, kind: found.type });
       changes.push({ type: "move", from: file, to, before: text, after: found.withoutType });
@@ -7859,13 +8089,13 @@ function planAgentRefRewrites(root, moves, knownKinds, notes) {
   const changes = [];
   for (const file of walkFiles(root, (b) => b === "agent.yaml")) {
     const source = readText(file);
-    const agentDir = path18__default.dirname(file);
+    const agentDir = path19__default.dirname(file);
     let hits = 0;
     const refRewrite = (_kind, ref) => {
-      const moved = byOldPath.get(path18__default.resolve(agentDir, ref));
+      const moved = byOldPath.get(path19__default.resolve(agentDir, ref));
       if (moved === void 0) return ref;
       hits++;
-      const rel = posix2(path18__default.relative(agentDir, moved));
+      const rel = posix2(path19__default.relative(agentDir, moved));
       return rel.startsWith(".") ? rel : `./${rel}`;
     };
     let output;
@@ -7882,7 +8112,7 @@ function planAgentRefRewrites(root, moves, knownKinds, notes) {
     if (hits === 0 || output === source) continue;
     changes.push({ type: "write", path: file, before: source, after: output });
     notes.push(
-      `${posix2(path18__default.relative(root, file))}: persona/ruleset refs \u2192 composes items at the new paths`
+      `${posix2(path19__default.relative(root, file))}: persona/ruleset refs \u2192 composes items at the new paths`
     );
   }
   return changes;
@@ -7906,14 +8136,14 @@ function presetText(name, description, refs, version) {
 }
 function skillDirs(dir) {
   try {
-    return readdirSync(path18__default.join(dir, "skills"), { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync(path18__default.join(dir, "skills", e.name, "SKILL.md"))).map((e) => e.name).sort();
+    return readdirSync(path19__default.join(dir, "skills"), { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync(path19__default.join(dir, "skills", e.name, "SKILL.md"))).map((e) => e.name).sort();
   } catch {
     return [];
   }
 }
 function repoPublisher(root) {
   for (const name of ["skaile.manifest.yaml", "skaile.yaml"]) {
-    const file = path18__default.join(root, name);
+    const file = path19__default.join(root, name);
     if (!existsSync(file)) continue;
     try {
       const parsed = parse(readText(file));
@@ -7925,15 +8155,15 @@ function repoPublisher(root) {
   }
   return DEFAULT_PUBLISHER;
 }
-function planBundles(root, skaileYamls, publisher, notes, manual, conflicts) {
+function planBundles(root, skaileYamls, publisher, notes, manual, conflicts, identities) {
   const changes = [];
   const presets = [];
   const handled = /* @__PURE__ */ new Set();
   const claimed = /* @__PURE__ */ new Map();
-  const rel = (p6) => posix2(path18__default.relative(root, p6));
+  const rel = (p6) => posix2(path19__default.relative(root, p6));
   const convert = (name, bundleFile, dir) => {
-    const target = path18__default.join(dir === root ? path18__default.join(dir, name) : dir, `${name}.preset.yaml`);
-    const origin = bundleFile ? rel(bundleFile) : `${rel(path18__default.join(dir, "skills")) || "skills"}/`;
+    const target = path19__default.join(dir === root ? path19__default.join(dir, name) : dir, `${name}.preset.yaml`);
+    const origin = bundleFile ? rel(bundleFile) : `${rel(path19__default.join(dir, "skills")) || "skills"}/`;
     const earlier = claimed.get(target);
     if (earlier !== void 0) {
       conflicts.push(
@@ -7941,6 +8171,14 @@ function planBundles(root, skaileYamls, publisher, notes, manual, conflicts) {
       );
       return;
     }
+    const identity = finalIdentity("preset", name);
+    const sameName = identities.get(identity);
+    if (sameName !== void 0) {
+      conflicts.push(
+        `${sameName} and ${origin} both become ${identity}: rename one bundle first. Nothing was changed.`
+      );
+      return;
+    }
     if (existsSync(target)) {
       manual.push(`${rel(target)} already exists; bundle ${name} not converted`);
       return;
@@ -7972,11 +8210,12 @@ function planBundles(root, skaileYamls, publisher, notes, manual, conflicts) {
     }
     if (refs.length === 0) {
       manual.push(
-        `bundle ${name}: no dependencies found${bundleFile ? ` in ${rel(bundleFile)}` : ` and no skills under ${rel(path18__default.join(dir, "skills"))}`}; no preset generated`
+        `bundle ${name}: no dependencies found${bundleFile ? ` in ${rel(bundleFile)}` : ` and no skills under ${rel(path19__default.join(dir, "skills"))}`}; no preset generated`
       );
       return;
     }
     claimed.set(target, origin);
+    identities.set(identity, origin);
     const after = presetText(name, description, refs, version);
     if (before !== void 0 && bundleFile) {
       changes.push({ type: "move", from: bundleFile, to: target, before, after });
@@ -7997,18 +8236,18 @@ function planBundles(root, skaileYamls, publisher, notes, manual, conflicts) {
     const assets = Array.isArray(raw.assets) ? raw.assets : [];
     for (const entry of assets) {
       if (!isRecord(entry) || entry.kind !== "bundle" || typeof entry.name !== "string") continue;
-      const baseDir = path18__default.dirname(file);
-      const entryRoot = typeof entry.root === "string" ? path18__default.join(baseDir, entry.root) : baseDir;
+      const baseDir = path19__default.dirname(file);
+      const entryRoot = typeof entry.root === "string" ? path19__default.join(baseDir, entry.root) : baseDir;
       const files = Array.isArray(entry.files) ? entry.files : [];
       const bundleName = files.find(
         (f) => typeof f === "string" && f.endsWith(".bundle.yaml")
       );
-      convert(entry.name, bundleName ? path18__default.join(entryRoot, bundleName) : void 0, entryRoot);
+      convert(entry.name, bundleName ? path19__default.join(entryRoot, bundleName) : void 0, entryRoot);
     }
   }
   for (const bundleFile of walkFiles(root, (b) => b.endsWith(".bundle.yaml"))) {
     if (handled.has(bundleFile)) continue;
-    const base = path18__default.basename(bundleFile);
+    const base = path19__default.basename(bundleFile);
     let name = base.replace(/\.bundle\.yaml$/, "");
     try {
       const parsed = parse(readText(bundleFile));
@@ -8017,7 +8256,7 @@ function planBundles(root, skaileYamls, publisher, notes, manual, conflicts) {
     } catch {
     }
     if (presets.some((p6) => p6.bundleFile === bundleFile)) continue;
-    convert(name, bundleFile, path18__default.dirname(bundleFile));
+    convert(name, bundleFile, path19__default.dirname(bundleFile));
   }
   return changes;
 }
@@ -8027,8 +8266,8 @@ function planSkaileYaml(root, file, source, notes, manual) {
   if (doc.errors.length > 0 || !isMap(doc.contents)) return [];
   const map = doc.contents;
   const raw = doc.toJS();
-  const dir = path18__default.dirname(file);
-  const rel = (p6) => posix2(path18__default.relative(root, p6));
+  const dir = path19__default.dirname(file);
+  const rel = (p6) => posix2(path19__default.relative(root, p6));
   const changes = [];
   let changed = false;
   const deps = map.get("dependencies", true);
@@ -8045,7 +8284,7 @@ function planSkaileYaml(root, file, source, notes, manual) {
   const hasPublication = PUBLICATION_KEYS.some((k) => raw[k] !== void 0);
   let remove = false;
   if (hasPublication) {
-    const manifestPath = path18__default.join(dir, "skaile.manifest.yaml");
+    const manifestPath = path19__default.join(dir, "skaile.manifest.yaml");
     if (existsSync(manifestPath)) {
       manual.push(
         `${rel(file)}: publisher/version/assets left in place \u2014 ${rel(manifestPath)} already exists; merge by hand`
@@ -8102,16 +8341,24 @@ function planSkaileYaml(root, file, source, notes, manual) {
   return changes;
 }
 function planAssetMigration(options) {
-  const root = path18__default.resolve(options.root);
+  const root = path19__default.resolve(options.root);
   const knownKinds = new Set(options.registry.getAllKinds());
   const notes = [];
   const manual = [];
   const conflicts = [];
   const unknownTypes = [];
-  const { moves, changes: moveChanges } = planMarkdownMoves(root, knownKinds, manual, unknownTypes);
+  const identities = /* @__PURE__ */ new Map();
+  const { moves, changes: moveChanges } = planMarkdownMoves(
+    root,
+    knownKinds,
+    manual,
+    unknownTypes,
+    identities,
+    conflicts
+  );
   for (const move of moves) {
     notes.push(
-      `${posix2(path18__default.relative(root, move.from))} \u2192 ${posix2(path18__default.relative(root, move.to))} (${move.kind})`
+      `${posix2(path19__default.relative(root, move.from))} \u2192 ${posix2(path19__default.relative(root, move.to))} (${move.kind})`
     );
   }
   const agentChanges = planAgentRefRewrites(root, moves, knownKinds, notes);
@@ -8123,11 +8370,19 @@ function planAssetMigration(options) {
       const raw = parse(source);
       if (isRecord(raw)) skaileYamls.push({ file, source, raw });
     } catch {
-      manual.push(`${posix2(path18__default.relative(root, file))}: invalid YAML; skipped`);
+      manual.push(`${posix2(path19__default.relative(root, file))}: invalid YAML; skipped`);
     }
   }
   const publisher = repoPublisher(root);
-  const bundleChanges = planBundles(root, skaileYamls, publisher, notes, manual, conflicts);
+  const bundleChanges = planBundles(
+    root,
+    skaileYamls,
+    publisher,
+    notes,
+    manual,
+    conflicts,
+    identities
+  );
   const skaileChanges = skaileYamls.flatMap(
     ({ file, source }) => planSkaileYaml(root, file, source, notes, manual)
   );
@@ -8139,6 +8394,142 @@ function planAssetMigration(options) {
     unknownTypes
   };
 }
+var SKAILE_YAML_SUFFIX = ".skaile.yaml";
+var OLD_KEY = "driver";
+var NEW_KEY = "harness";
+var AGENT_CONFIG_KEYS = ["agent-config", "agent_config", "agentConfig"];
+function renameInMap(map, where, notes) {
+  const oldIdx = map.items.findIndex((p6) => isScalar(p6.key) && p6.key.value === OLD_KEY);
+  if (oldIdx < 0) return false;
+  const hasNew = map.items.some((p6) => isScalar(p6.key) && p6.key.value === NEW_KEY);
+  if (hasNew) {
+    map.items.splice(oldIdx, 1);
+    notes.push(
+      `${where}: both \`harness\` and \`driver\` set; kept \`harness\`, dropped \`driver\``
+    );
+  } else {
+    (map.items[oldIdx]?.key).value = NEW_KEY;
+    notes.push(`${where}: \`driver\` \u2192 \`harness\``);
+  }
+  return true;
+}
+function migrateHarnessYaml(text, label = SKAILE_YAML_DEFAULT) {
+  const doc = parseDocument(text);
+  if (doc.errors.length > 0) {
+    throw new Error(`invalid YAML: ${doc.errors[0]?.message ?? "parse error"}`);
+  }
+  const root = doc.contents;
+  if (!isMap(root)) return { output: text, notes: [] };
+  const notes = [];
+  let changed = false;
+  for (const key of AGENT_CONFIG_KEYS) {
+    const block = root.get(key, true);
+    if (!isMap(block)) continue;
+    const flat = AGENT_PROFILE_FIELDS.some((f) => {
+      const v = block.get(f, true);
+      return isScalar(v) && typeof v.value === "string";
+    });
+    if (flat) {
+      changed = renameInMap(block, `${label}: ${key}`, notes) || changed;
+      continue;
+    }
+    for (const pair of block.items) {
+      if (!isMap(pair.value) || !isScalar(pair.key)) continue;
+      changed = renameInMap(pair.value, `${label}: ${key}.${String(pair.key.value)}`, notes) || changed;
+    }
+  }
+  return { output: changed ? String(doc) : text, notes };
+}
+function migrateHarnessSettings(text, label = "settings.json") {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return { output: text, notes: [] };
+  }
+  if (!isRecord(parsed) || !(OLD_KEY in parsed)) return { output: text, notes: [] };
+  const notes = [];
+  const out = {};
+  for (const [k, v] of Object.entries(parsed)) {
+    if (k !== OLD_KEY) {
+      out[k] = v;
+    } else if (NEW_KEY in parsed) {
+      notes.push(
+        `${label}: both \`harness\` and \`driver\` set; kept \`harness\`, dropped \`driver\``
+      );
+    } else {
+      out[NEW_KEY] = v;
+      notes.push(`${label}: \`driver\` \u2192 \`harness\``);
+    }
+  }
+  const trailing = text.endsWith("\n") ? "\n" : "";
+  return { output: `${JSON.stringify(out, null, 2)}${trailing}`, notes };
+}
+function workspaceYamlFiles(projectDir) {
+  const files = [];
+  if (existsSync(path19__default.join(projectDir, SKAILE_YAML_DEFAULT))) {
+    files.push(path19__default.join(projectDir, SKAILE_YAML_DEFAULT));
+  }
+  try {
+    for (const entry of readdirSync(projectDir).sort()) {
+      if (entry.endsWith(SKAILE_YAML_SUFFIX)) files.push(path19__default.join(projectDir, entry));
+    }
+  } catch {
+  }
+  return files;
+}
+function planHarnessMigration(opts) {
+  const changes = [];
+  const notes = [];
+  const seen = /* @__PURE__ */ new Set();
+  const plan = (file, rewrite) => {
+    if (seen.has(file) || !existsSync(file)) return;
+    seen.add(file);
+    const before = readText(file);
+    const label = path19__default.basename(file);
+    let result;
+    try {
+      result = rewrite(before, label);
+    } catch (error) {
+      notes.push(`${file}: skipped \u2014 ${error.message}`);
+      return;
+    }
+    if (result.output === before) return;
+    notes.push(...result.notes);
+    changes.push({ type: "write", path: file, before, after: result.output });
+  };
+  for (const file of workspaceYamlFiles(opts.projectDir)) plan(file, migrateHarnessYaml);
+  plan(projectSettingsPath(opts.projectDir), migrateHarnessSettings);
+  plan(globalSettingsPath(), migrateHarnessSettings);
+  return { changes, notes };
+}
+function runMigrateHarness(opts) {
+  const apply = resolveMode(
+    { write: opts.apply === true || opts.write === true, dryRun: opts.dryRun },
+    "--apply"
+  );
+  const cwd = process.cwd();
+  const projectDir = path19__default.resolve(opts.projectDir ?? findWorkspaceRoot(cwd) ?? cwd);
+  const plan = planHarnessMigration({ projectDir });
+  for (const note of plan.notes) console.log(`  ${note}`);
+  printChanges(plan.changes, projectDir);
+  finish(plan.changes, apply, projectDir, "--apply");
+}
+function addMigrateHarnessCommand(migrate) {
+  migrate.command("harness").description(
+    "Rename the `driver` key to `harness` in skaile.yaml agent-config and settings.json"
+  ).option("--project-dir <path>", "Project directory (default: the workspace root of the cwd)").option("--apply", "Write the changes (default: print a diff and write nothing)").option("--write", "Same as --apply").option("--dry-run", "Print the diff and write nothing (the default)").addHelpText(
+    "after",
+    `
+Rewrites (the connector/mount \`driver\` of connectors: and mounts: is never touched):
+  skaile.yaml agent-config.<profile>.driver   -> harness (also the flat agent-config: { driver: \u2026 } shape)
+  .skaile/settings.json, ~/.skaile/settings.json   driver -> harness
+A profile or file that sets both keeps \`harness\` and drops \`driver\`.
+
+Dry run by default: prints a unified diff per file. Pass --apply to write.
+`
+  ).action((opts) => runMigrateHarness(opts));
+}
 
 // cli/src/commands/migrate-legacy-entry.ts
 var ANTHROPIC_VERSION_HEADER = { "anthropic-version": "2023-06-01" };
@@ -8237,9 +8628,9 @@ function legacyProfileEntry(inputs = {}) {
 
 // cli/src/commands/migrate-providers.ts
 var LEGACY_PROFILE_KEYS = ["provider", "cloud", "cloud_config", "cloudConfig"];
-var AGENT_CONFIG_KEYS = ["agent-config", "agent_config", "agentConfig"];
+var AGENT_CONFIG_KEYS2 = ["agent-config", "agent_config", "agentConfig"];
 var FLAT_PROFILE_FIELDS = [
-  "driver",
+  "harness",
   "provider",
   "cloud",
   "model",
@@ -8278,10 +8669,10 @@ function workspaceConfigFiles(dir) {
   } catch {
     return [];
   }
-  return names.filter((name) => isWorkspaceConfigFilename(name)).sort().map((name) => path18__default.join(dir, name));
+  return names.filter((name) => isWorkspaceConfigFilename(name)).sort().map((name) => path19__default.join(dir, name));
 }
 function readAgentConfigBlock(raw) {
-  const key = AGENT_CONFIG_KEYS.find((candidate) => raw[candidate] !== void 0);
+  const key = AGENT_CONFIG_KEYS2.find((candidate) => raw[candidate] !== void 0);
   if (!key) return void 0;
   const block = raw[key];
   if (typeof block !== "object" || block === null || Array.isArray(block)) return void 0;
@@ -8290,7 +8681,7 @@ function readAgentConfigBlock(raw) {
   return flat ? { key, profiles: { default: profiles }, flat } : { key, profiles, flat };
 }
 function planProviderMigration(options) {
-  const projectDir = path18__default.resolve(options.projectDir);
+  const projectDir = path19__default.resolve(options.projectDir);
   const registryPath = options.workspace ? workspaceProviderRegistryPath(projectDir) : userProviderRegistryPath();
   const plan = {
     registryPath,
@@ -8306,7 +8697,7 @@ function planProviderMigration(options) {
       raw = parseDocument(readFileSync(file, "utf-8")).toJS() ?? {};
     } catch (error) {
       plan.warnings.push(
-        `${path18__default.basename(file)}: not valid YAML (${error instanceof Error ? error.message : String(error)}) \u2014 skipped`
+        `${path19__default.basename(file)}: not valid YAML (${error instanceof Error ? error.message : String(error)}) \u2014 skipped`
       );
       continue;
     }
@@ -8355,7 +8746,7 @@ function planProviderMigration(options) {
       });
       if (!model) {
         plan.warnings.push(
-          `${path18__default.basename(file)}: profile '${profile}' had no model: \u2014 it now resolves against registry order. Pin it with 'model: ${providerId}/<modelId>'.`
+          `${path19__default.basename(file)}: profile '${profile}' had no model: \u2014 it now resolves against registry order. Pin it with 'model: ${providerId}/<modelId>'.`
         );
       }
       touched = true;
@@ -8422,7 +8813,7 @@ function printPlan(plan) {
   for (const entry of plan.entries) {
     const base = entry.entry.base_url ?? S.dim("(transport-derived)");
     console.log(
-      `  ${S.label(`${path18__default.basename(entry.file)} ${entry.profile}`)} provider: ${entry.legacy.provider}, cloud: ${entry.legacy.cloud}`
+      `  ${S.label(`${path19__default.basename(entry.file)} ${entry.profile}`)} provider: ${entry.legacy.provider}, cloud: ${entry.legacy.cloud}`
     );
     console.log(`    \u2192 providers.yml ${S.bold(entry.providerId)}  ${base}`);
     console.log(
@@ -8438,7 +8829,7 @@ function printPlan(plan) {
   console.log();
 }
 async function runMigrateProviders(opts) {
-  const projectDir = opts.projectDir ? path18__default.resolve(opts.projectDir) : process.cwd();
+  const projectDir = opts.projectDir ? path19__default.resolve(opts.projectDir) : process.cwd();
   const plan = planProviderMigration({ projectDir, workspace: opts.workspace });
   for (const warning of plan.warnings) logWarn(warning);
   if (plan.entries.length === 0 && Object.keys(plan.providers).length === 0) {
@@ -8532,35 +8923,6 @@ Rewrites (run on a repo root):
 
 Dry run by default: prints a unified diff per file. Pass --write to apply.
 `;
-function resolveMode(opts) {
-  if (opts.write && opts.dryRun) {
-    logErr("--write and --dry-run are mutually exclusive.");
-    process.exit(1);
-  }
-  return opts.write === true;
-}
-function printChanges(changes, base) {
-  for (const change of changes) {
-    console.log();
-    console.log(colorizeDiff(renderChange(change, base)).trimEnd());
-  }
-}
-function finish(changes, write, base) {
-  console.log();
-  if (changes.length === 0) {
-    logOk("Nothing to migrate.");
-    return;
-  }
-  if (!write) {
-    logInfo(
-      `Dry run: ${changes.length} file change(s) planned, nothing written. Re-run with --write to apply.`
-    );
-    return;
-  }
-  applyChanges2(changes);
-  logOk(`Applied ${changes.length} file change(s):`);
-  for (const change of changes) console.log(`  ${S.dim(changeLabel(change, base))}`);
-}
 async function runMigrateAgents(paths, opts) {
   const write = resolveMode(opts);
   const base = process.cwd();
@@ -8571,7 +8933,7 @@ async function runMigrateAgents(paths, opts) {
   let failures = 0;
   let manualCount = 0;
   for (const report of plan.reports) {
-    const rel = path18__default.relative(base, report.file) || report.file;
+    const rel = path19__default.relative(base, report.file) || report.file;
     for (const note of report.notes) console.log(`  ${S.label(rel)} ${note}`);
     for (const note of report.manual) {
       manualCount++;
@@ -8598,7 +8960,7 @@ async function runMigrateAssets(root, opts) {
   const write = resolveMode(opts);
   const base = process.cwd();
   const plan = planAssetMigration({
-    root: path18__default.resolve(root ?? base),
+    root: path19__default.resolve(root ?? base),
     registry: getKindRegistry()
   });
   if (plan.conflicts.length > 0) {
@@ -8610,7 +8972,7 @@ async function runMigrateAssets(root, opts) {
   for (const note of plan.manual) logWarn(note);
   for (const { file, type } of plan.unknownTypes) {
     logWarn(
-      `${path18__default.relative(base, file) || file}: frontmatter type "${type}" is not a registered asset kind (reported, not rewritten)`
+      `${path19__default.relative(base, file) || file}: frontmatter type "${type}" is not a registered asset kind (reported, not rewritten)`
     );
   }
   printChanges(plan.changes, base);
@@ -8625,6 +8987,7 @@ function makeMigrateCommand() {
   cmd.command("assets").description(
     "Move persona/ruleset files, bundles and the publication half of skaile.yaml onto the kind model"
   ).argument("[root]", "Repo root to migrate (default: current directory)").option("--write", "Apply the changes (default: print a diff and write nothing)").option("--dry-run", "Print the diff and write nothing (the default)").addHelpText("after", ASSETS_HELP).action((root, opts) => runMigrateAssets(root, opts));
+  addMigrateHarnessCommand(cmd);
   return cmd;
 }
 function makeNpxCommand() {
@@ -8633,8 +8996,8 @@ function makeNpxCommand() {
   skills.command("add <url>").description(
     "Clone a repo, register it in the project's skaile.yaml sources[], and install a skill from it"
   ).requiredOption("--skill <name>", "Skill name to install from the repo").option("--project-dir <path>", "Project directory", process.cwd()).option("--target <agent>", `Agent framework (${TARGET_DEFAULT_HINT})`).option("--global", "Deploy globally").action(async (url, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
-    const projYaml = path18__default.join(projectDir, "skaile.yaml");
+    const projectDir = path19__default.resolve(opts.projectDir);
+    const projYaml = path19__default.join(projectDir, "skaile.yaml");
     if (!existsSync(projYaml)) {
       logErr(`No skaile.yaml in ${projectDir} \u2014 run \`skaile init\` first.`);
       process.exit(1);
@@ -8647,11 +9010,11 @@ function makeNpxCommand() {
     }
     const spinner = createSpinner();
     const key = sourceCacheKey(url);
-    const clonePath = path18__default.join(getGlobalCacheDir(), key);
+    const clonePath = path19__default.join(getGlobalCacheDir(), key);
     spinner.start(`Cloning ${url}`);
     try {
       if (!existsSync(clonePath)) {
-        mkdirSync(path18__default.dirname(clonePath), { recursive: true });
+        mkdirSync(path19__default.dirname(clonePath), { recursive: true });
         execSync(`git clone ${url} ${clonePath}`, { stdio: "ignore" });
       }
       spinner.stop(`Cloned to ${key}`);
@@ -8680,7 +9043,7 @@ function makeNpxCommand() {
       registry: getKindRegistry(),
       projectDir,
       global: opts.global,
-      driverTarget: opts.target,
+      harness: opts.target,
       onLibraryCollision: warnings.push
     });
     spinner.start(`Installing ${skillRef}`);
@@ -8706,7 +9069,7 @@ function makeNpxCommand() {
   return npx;
 }
 function resolvePublisher(clonePath, url) {
-  const manifestPath = path18__default.join(clonePath, SKAILE_MANIFEST_FILENAME);
+  const manifestPath = path19__default.join(clonePath, SKAILE_MANIFEST_FILENAME);
   if (existsSync(manifestPath)) {
     try {
       const { manifest } = decodeSkaileManifest(readFileSync(manifestPath, "utf8"));
@@ -8719,12 +9082,12 @@ function resolvePublisher(clonePath, url) {
   return url.match(/github\.com[/:]([^/]+)\/[^/]+/)?.[1];
 }
 function resolveSkillName(clonePath, requested) {
-  const skillsDir = path18__default.join(clonePath, "skills");
-  if (existsSync(path18__default.join(skillsDir, requested, "SKILL.md"))) return requested;
+  const skillsDir = path19__default.join(clonePath, "skills");
+  if (existsSync(path19__default.join(skillsDir, requested, "SKILL.md"))) return requested;
   if (!existsSync(skillsDir)) return requested;
   for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    const md = path18__default.join(skillsDir, entry.name, "SKILL.md");
+    const md = path19__default.join(skillsDir, entry.name, "SKILL.md");
     if (!existsSync(md)) continue;
     try {
       const { data } = parseFrontmatter(readFileSync(md, "utf8"));
@@ -8771,15 +9134,15 @@ function outdatedStatus(e) {
 }
 function makeOutdatedCommand() {
   return new Command("outdated").description("Check for assets behind their repo or library").argument("[ref]", "Check a specific asset (kind:@publisher/name)").option("--project-dir <path>", "Project directory", process.cwd()).addOption(
-    new Option("--target <agent>", `Driver target (${TARGET_DEFAULT_HINT})`).choices(
-      SUPPORTED_DRIVER_TARGETS
+    new Option("--target <agent>", `Harness target (${TARGET_DEFAULT_HINT})`).choices(
+      SUPPORTED_HARNESSES
     )
   ).action(async (filter, opts) => {
     requireProjectConfig(opts.projectDir);
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir),
-      driverTarget: opts.target
+      projectDir: path19__default.resolve(opts.projectDir),
+      harness: opts.target
     });
     const entries = await am2.outdated();
     if (entries.length === 0) {
@@ -8821,7 +9184,7 @@ function makePatchCommand() {
   cmd.command("extract <ref>").alias("start").description("Extract asset for local editing").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     try {
       const dest = await am2.patch(ref);
@@ -8835,7 +9198,7 @@ function makePatchCommand() {
   cmd.command("commit <ref>").description("Generate .patch file from edits").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     try {
       const patchFile = await am2.patchCommit(ref);
@@ -8849,7 +9212,7 @@ function makePatchCommand() {
   cmd.command("submit <ref>").description("Apply patch to repo clone and prepare for PR").option("--project-dir <path>", "Project directory", process.cwd()).action(async (ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     try {
       await am2.patchSubmit(ref);
@@ -8865,7 +9228,7 @@ function makePatchCommand() {
   cmd.command("remove <ref>").description("Remove local patch after upstream merge").option("--project-dir <path>", "Project directory", process.cwd()).action((ref, opts) => {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     am2.patchRemove(ref);
     logOk(`Patch removed for ${ref}`);
@@ -8884,7 +9247,7 @@ function action2(fn) {
   };
 }
 async function reconcileAndReport(projectDir, plugins, opts = {}) {
-  const { reconcilePlugins } = await import('../plugin-store-G2GWAHSD.js');
+  const { reconcilePlugins } = await import('../plugin-store-ABE35NRX.js');
   if (plugins.length === 0) {
     logInfo("No plugins declared \u2014 nothing to reconcile.");
     return;
@@ -8899,22 +9262,22 @@ async function reconcileAndReport(projectDir, plugins, opts = {}) {
   }
 }
 async function verifyPluginLoads(projectDir, spec) {
-  const { loadPlugins } = await import('../plugin-store-G2GWAHSD.js');
+  const { loadPlugins } = await import('../plugin-store-ABE35NRX.js');
   const { createPluginRegistry } = await import('../plugin-registry/index.js');
   const registry = createPluginRegistry();
   const result = await loadPlugins(projectDir, [spec], registry);
   const failure = result.failed[0];
   if (failure) throw new Error(failure.error);
-  const contributed = ["driver", "connector", "deployTarget"].flatMap(
+  const contributed = ["harness", "connector", "deployTarget"].flatMap(
     (kind) => registry.list(kind).map((m) => `${kind} ${m.id}`)
   );
   logOk(`Loaded ${S.cmd(spec)}${contributed.length > 0 ? ` (${contributed.join(", ")})` : ""}`);
 }
 async function runInstall2(spec, opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName, rollbackPluginStore } = await import('../plugin-store-G2GWAHSD.js');
-  const yamlPath = path18__default.join(projectDir, "skaile.yaml");
+  const { specName, rollbackPluginStore } = await import('../plugin-store-ABE35NRX.js');
+  const yamlPath = path19__default.join(projectDir, "skaile.yaml");
   if (!existsSync(yamlPath)) {
     throw new Error(`no skaile.yaml in ${projectDir}; run \`skaile init\` first`);
   }
@@ -8940,10 +9303,10 @@ async function runInstall2(spec, opts) {
   }
 }
 async function runRemove(name, opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-G2GWAHSD.js');
-  const yamlPath = path18__default.join(projectDir, "skaile.yaml");
+  const { specName } = await import('../plugin-store-ABE35NRX.js');
+  const yamlPath = path19__default.join(projectDir, "skaile.yaml");
   if (!existsSync(yamlPath)) {
     logInfo(`No plugin matching ${S.cmd(name)}: there is no skaile.yaml in ${projectDir}.`);
     return;
@@ -8959,7 +9322,7 @@ async function runRemove(name, opts) {
   await reconcileAndReport(projectDir, editor.getPlugins());
 }
 async function runList(opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
   const config = resolveSkWorkspaceConfig2(projectDir);
   const declared = config.plugins ?? [];
@@ -8974,7 +9337,7 @@ async function runList(opts) {
   const registry = createPluginRegistry();
   if (declared.length > 0) {
     try {
-      const { loadPlugins } = await import('../plugin-store-G2GWAHSD.js');
+      const { loadPlugins } = await import('../plugin-store-ABE35NRX.js');
       const result = await loadPlugins(projectDir, declared, registry);
       for (const f of result.failed) logWarn(f.error);
     } catch (err) {
@@ -8982,7 +9345,7 @@ async function runList(opts) {
     }
   }
   const kinds = [
-    { kind: "driver", label: "drivers" },
+    { kind: "harness", label: "harnesses" },
     { kind: "connector", label: "connectors" },
     { kind: "deployTarget", label: "deploy targets" }
   ];
@@ -9000,7 +9363,7 @@ async function runList(opts) {
 }
 function makePluginCommand() {
   const cmd = new Command("plugin").description(
-    "Manage registry plugins (drivers / connectors / deploy targets) declared in skaile.yaml"
+    "Manage registry plugins (harnesses / connectors / deploy targets) declared in skaile.yaml"
   );
   cmd.command("install <spec>").description("Add a plugin spec to skaile.yaml plugins and reconcile the store").option("--project-dir <path>", "Project directory", process.cwd()).action(action2(runInstall2));
   cmd.command("remove <name>").description("Remove a plugin (by package name) from skaile.yaml plugins and reconcile").option("--project-dir <path>", "Project directory", process.cwd()).action(action2(runRemove));
@@ -9242,8 +9605,8 @@ function redactSecrets(preset, findings) {
   }
   return { preset: next, keys };
 }
-function placeholderKey(itemId, path41) {
-  return `${itemId}_${path41}`.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
+function placeholderKey(itemId, path43) {
+  return `${itemId}_${path43}`.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
 }
 function setAtPath(root, segments, value) {
   let node = root;
@@ -9266,7 +9629,7 @@ function makePresetCommand() {
   cmd.command("init [name]").description("Scaffold a new .preset.yaml file").option("--dir <path>", "Output directory", process.cwd()).action(async (name, opts) => {
     const presetName = name ?? "my-preset";
     const filename = `${presetName}.preset.yaml`;
-    const outPath = path18__default.join(path18__default.resolve(opts.dir), filename);
+    const outPath = path19__default.join(path19__default.resolve(opts.dir), filename);
     if (existsSync(outPath)) {
       logErr(`File already exists: ${outPath}`);
       logInfo("Choose a different name or remove the existing file.");
@@ -9299,7 +9662,7 @@ function makePresetCommand() {
   return cmd;
 }
 async function runPresetExport(name, opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const file = loadSkWorkspaceConfig(projectDir);
   if (!file) {
     logErr(`No skaile.yaml found in ${projectDir}`);
@@ -9309,7 +9672,7 @@ async function runPresetExport(name, opts) {
   const presetName = name ?? file.config.name ?? "my-preset";
   let lock = null;
   try {
-    lock = readLock(path18__default.join(projectDir, "skaile.lock.yaml"));
+    lock = readLock(path19__default.join(projectDir, "skaile.lock.yaml"));
   } catch {
     lock = null;
   }
@@ -9350,7 +9713,7 @@ async function runPresetExport(name, opts) {
   const contents = header ? `${header}
 ${body}` : body;
   if (opts.out && opts.dir !== process.cwd()) logWarn("--dir is ignored when --out is set.");
-  const outPath = opts.out ? path18__default.resolve(opts.out) : path18__default.join(path18__default.resolve(opts.dir), `${presetName}.preset.yaml`);
+  const outPath = opts.out ? path19__default.resolve(opts.out) : path19__default.join(path19__default.resolve(opts.dir), `${presetName}.preset.yaml`);
   if (existsSync(outPath) && !opts.force) {
     logErr(`File already exists: ${outPath}`);
     logInfo("Pass --force to overwrite, or choose a different --out/--dir.");
@@ -9362,7 +9725,7 @@ ${body}` : body;
     logErr(`Failed to write ${outPath}: ${e.message}`);
     process.exit(1);
   }
-  logOk(`Exported ${S.brand(path18__default.basename(outPath))}`);
+  logOk(`Exported ${S.brand(path19__default.basename(outPath))}`);
   logInfo(`Path: ${outPath}`);
   if (unresolved.length > 0) {
     console.error(S.err("This file is NOT safe to share."));
@@ -9403,13 +9766,13 @@ function collectInput(value, acc) {
   return acc;
 }
 async function runPresetApply(filePath, opts) {
-  const projectDir = path18__default.resolve(opts.projectDir);
+  const projectDir = path19__default.resolve(opts.projectDir);
   const file = loadSkWorkspaceConfig(projectDir);
   if (!file) {
     logErr("No skaile.yaml \u2014 run `skaile init` first");
     process.exit(1);
   }
-  const resolved = path18__default.resolve(filePath);
+  const resolved = path19__default.resolve(filePath);
   if (!existsSync(resolved)) {
     logErr(`File not found: ${resolved}`);
     process.exit(1);
@@ -9627,7 +9990,7 @@ async function reportNestedPresetRefs(preset) {
 }
 async function checkPresetCycles(preset, resolved) {
   const { detectCycles } = await import('../discovery/index.js');
-  const presetRef = path18__default.basename(resolved, ".preset.yaml");
+  const presetRef = path19__default.basename(resolved, ".preset.yaml");
   const edges = [];
   for (const item of preset.items) {
     if (item.ref) {
@@ -9679,7 +10042,7 @@ function printPresetSummary(preset, placeholderCount, hasWarnings) {
   }
 }
 async function runPresetValidate(filePath) {
-  const resolved = path18__default.resolve(filePath);
+  const resolved = path19__default.resolve(filePath);
   const preset = await loadPresetForValidation(resolved);
   await reportNestedPresetRefs(preset);
   await checkPresetCycles(preset, resolved);
@@ -9732,7 +10095,7 @@ function resolveNamedAgent(projectDir, arg) {
     logErr(message);
     process.exit(1);
   };
-  const asPath = path18__default.resolve(projectDir, arg);
+  const asPath = path19__default.resolve(projectDir, arg);
   const isPath = arg.includes("/") || arg.includes("\\");
   const viaRef = (ref) => {
     try {
@@ -9757,7 +10120,7 @@ function resolveNamedAgent(projectDir, arg) {
     if (!(err instanceof AgentRefResolutionError)) throw err;
     if (err.code === "ambiguous") return fail(err.message);
   }
-  if (existsSync(path18__default.join(asPath, "agent.yaml"))) return asPath;
+  if (existsSync(path19__default.join(asPath, "agent.yaml"))) return asPath;
   const known = Object.keys(instances);
   return fail(
     `No agent "${arg}" found. Give an agent name, an agent: ref or a path` + (known.length > 0 ? ` (agent instances of this project: ${known.join(", ")})` : "") + "."
@@ -9768,7 +10131,7 @@ function makeRebuildCommand() {
     "[agent]",
     "Agent name, agent: ref, instance id or path (defaults to the project agent)"
   ).option("--project-dir <dir>", "Project directory", process.cwd()).action(async (agentArg, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     requireProjectConfig(projectDir, { allowMissing: true });
     let agentDir;
     if (agentArg) {
@@ -9826,26 +10189,26 @@ function makeRebuildCommand() {
 }
 function resolveSingleShotAgentDir(projectDir, agentDefinition) {
   if (!agentDefinition) return resolveAgentDir(projectDir);
-  const asPath = agentDefinition.endsWith("agent.yaml") ? path18__default.dirname(path18__default.resolve(projectDir, agentDefinition)) : agentDefinition;
+  const asPath = agentDefinition.endsWith("agent.yaml") ? path19__default.dirname(path19__default.resolve(projectDir, agentDefinition)) : agentDefinition;
   const dir = resolveAgentDefinitionDir(projectDir, asPath);
-  if (!dir || !fs8__default.existsSync(path18__default.join(dir, "agent.yaml"))) {
+  if (!dir || !fs8__default.existsSync(path19__default.join(dir, "agent.yaml"))) {
     throw new Error(
       `--agent-definition "${agentDefinition}" does not resolve to an agent directory with agent.yaml${dir ? ` (looked in ${dir})` : ""}`
     );
   }
   return dir;
 }
-async function printCompositionDryRun(projectDir, agentDir, driver, model, instanceIdOverride) {
+async function printCompositionDryRun(projectDir, agentDir, harness, model, instanceIdOverride) {
   const manifest = agentDir ? await loadAgentManifest(agentDir) : void 0;
-  const refusal = checkDriverModel(driver, {
+  const refusal = checkHarnessModel(harness, {
     registry: loadRegistryView({ projectDir }).merged,
-    model: model ?? manifestModelForDriver(manifest, driver)
+    model: model ?? manifestModelForHarness(manifest, harness)
   });
   if (refusal) throw new Error(refusal);
   console.log();
   console.log(`  ${S.label("Project dir:")} ${projectDir}`);
   console.log(`  ${S.label("Agent dir:")}   ${agentDir ?? S.dim("(none)")}`);
-  console.log(`  ${S.label("Driver:")}      ${driver}${model ? S.dim(` / ${model}`) : ""}`);
+  console.log(`  ${S.label("Harness:")}      ${harness}${model ? S.dim(` / ${model}`) : ""}`);
   console.log(`  ${S.warn("(dry run \u2014 no model will be started)")}`);
   console.log();
   if (!agentDir || !manifest) {
@@ -9863,7 +10226,7 @@ async function printCompositionDryRun(projectDir, agentDir, driver, model, insta
     asset: { manifest, dir: agentDir },
     projectDir,
     registry: getKindRegistry(),
-    host: { nativeSubagents: driverTargetForDriver(driver) !== void 0 },
+    host: { nativeSubagents: harnessNameForHarnessId(harness) !== void 0 },
     dryRun: true
   });
   console.log(`  ${S.label("Instance:")}    ${instanceId2}`);
@@ -9886,8 +10249,8 @@ async function printCompositionDryRun(projectDir, agentDir, driver, model, insta
 }
 async function findSkillFile(projectDir, skill) {
   const name = skill.trim().replace(/^skill:/, "").replace(/^@[^/]+\//, "").replace(/#.*$/, "");
-  for (const target of SUPPORTED_DRIVER_TARGETS) {
-    const file = path18__default.join(deployedDir("skill", name, target, false, projectDir), "SKILL.md");
+  for (const target of SUPPORTED_HARNESSES) {
+    const file = path19__default.join(deployedDir("skill", name, target, false, projectDir), "SKILL.md");
     if (fs8__default.existsSync(file)) return file;
   }
   const am2 = new AssetManager({ registry: getKindRegistry(), projectDir });
@@ -9903,6 +10266,14 @@ async function printSkillDryRun(projectDir, skill) {
     return false;
   }
   const content = fs8__default.readFileSync(file, "utf-8");
+  const prerequisiteErrors = checkAssetFile(file, "skill", getKindRegistry()).filter(
+    (f) => f.text.startsWith("metadata.prerequisites")
+  );
+  if (prerequisiteErrors.length > 0) {
+    for (const f of prerequisiteErrors) logErr(`${file} [${f.tag}] - ${f.text}`);
+    logErr(`Fix the skill's metadata.prerequisites (see \`skaile validate\`), then run it again.`);
+    return false;
+  }
   const { data } = parseFrontmatter(content);
   const meta = data.metadata ?? {};
   console.log(`  ${S.label("Skill:")}       ${S.heading(String(data.name ?? skill))}`);
@@ -9999,20 +10370,21 @@ function isNearFlowId(typed, id) {
   const b = id.toLowerCase();
   return a.length >= 3 && (b.includes(a) || a.includes(b) || editDistance2(a, b) <= 2);
 }
-function driverOptionDescription() {
-  return `Harness to run (${listDrivers().map((d) => d.id).join(", ")})`;
+function harnessOptionDescription() {
+  return `Harness to run (${listHarnesses().map((d) => d.id).join(", ")})`;
 }
 function makeRunCommand() {
-  const cmd = new Command("run").description("Start a flow or run a single-shot text prompt").argument("[flow-id-or-text...]", "Flow ID or text prompt").option("--project-dir <path>", "Project directory", process.cwd()).option("--driver <name>", driverOptionDescription()).option("--model <name>", "Model override").option("--label <label>", "Human-readable session label").option("--dry-run", "Print plan without executing (single-shot: resolved composition items)").option(
+  const cmd = new Command("run").description("Start a flow or run a single-shot text prompt").argument("[flow-id-or-text...]", "Flow ID or text prompt").option("--project-dir <path>", "Project directory", process.cwd()).option("--harness <name>", harnessOptionDescription()).addOption(driverAliasOption()).option("--model <name>", "Model override").option("--label <label>", "Human-readable session label").option("--dry-run", "Print plan without executing (single-shot: resolved composition items)").option(
     "--agent-definition <ref|path>",
     "Agent asset for this one invocation (agent:@pub/name, ai-assets://\u2026, or a directory with agent.yaml); single-shot prompts only"
   ).option(
     "--instance <id>",
     "Run the skaile.yaml `agents:` instance <id> (`default` is the primary `agent:`) with its overrides; single-shot prompts only"
   ).option("--skill <name>", "Skill name (for single-shot mode)").action(async (positional, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     await loadDeclaredPlugins(projectDir);
-    const cliDriver = opts.driver;
+    await reportProjectConfig(projectDir, { harness: false });
+    const cliHarness = foldDriverFlag(opts).harness;
     const dryRun = opts.dryRun ?? false;
     const agentDefinition = opts.agentDefinition?.trim() || void 0;
     const instanceId2 = opts.instance?.trim() || void 0;
@@ -10046,17 +10418,17 @@ function makeRunCommand() {
       flowId = selected;
     }
     const config = await resolveSettings(projectDir, {
-      driver: cliDriver,
+      harness: cliHarness,
       model: opts.model
     });
-    const driver = config.driver ?? DEFAULT_DRIVER_ID;
+    const harness = config.harness ?? DEFAULT_HARNESS_ID;
     const model = config.model;
-    const unknownDriver = unknownDriverMessage(driver);
-    if (unknownDriver) {
-      logErr(unknownDriver);
+    const unknownHarness = unknownHarnessMessage(harness);
+    if (unknownHarness) {
+      logErr(unknownHarness);
       process.exit(1);
     }
-    const providerRefusal = checkModelProvider(driver, {
+    const providerRefusal = checkModelProvider(harness, {
       registry: loadRegistryView({ projectDir }).merged,
       model
     });
@@ -10104,7 +10476,7 @@ function makeRunCommand() {
       try {
         const agentDir = instanceId2 ? resolveInstanceAgentDir(projectDir, resolveSkWorkspaceConfig(projectDir), instanceId2) : resolveSingleShotAgentDir(projectDir, agentDefinition);
         if (dryRun) {
-          await printCompositionDryRun(projectDir, agentDir, driver, model, instanceId2);
+          await printCompositionDryRun(projectDir, agentDir, harness, model, instanceId2);
           if (opts.skill && !await printSkillDryRun(projectDir, opts.skill)) {
             process.exit(1);
           }
@@ -10116,7 +10488,7 @@ function makeRunCommand() {
           projectDir,
           ...agentDir ? { agentDir } : {},
           ...instanceId2 ? { instanceId: instanceId2 } : {},
-          driver: config.driver,
+          harness: config.harness,
           model: instanceModel ?? config.model,
           ...instanceModel ? { modelRef: instanceModel } : {},
           ...overrides.maxTurns !== void 0 ? { maxTurns: overrides.maxTurns } : {},
@@ -10129,12 +10501,12 @@ function makeRunCommand() {
           logErr(`${err.code}: ${err.message}`);
           process.exit(1);
         }
-        const friendly = friendlyDriverError(err);
+        const friendly = friendlyHarnessError(err);
         if (friendly) {
           logErr(friendly);
         } else {
           logErr(err instanceof Error ? err.message : String(err));
-          for (const note of driverErrorNotes(err)) console.error(`    ${S.dim(note)}`);
+          for (const note of harnessErrorNotes(err)) console.error(`    ${S.dim(note)}`);
         }
         process.exit(1);
       }
@@ -10152,7 +10524,7 @@ function makeRunCommand() {
     console.log();
     console.log(`  ${S.label("Flow:")}        ${S.heading(flow.name)}`);
     console.log(`  ${S.label("Project dir:")} ${projectDir}`);
-    console.log(`  ${S.label("Driver:")}      ${driver}${model ? S.dim(` / ${model}`) : ""}`);
+    console.log(`  ${S.label("Harness:")}      ${harness}${model ? S.dim(` / ${model}`) : ""}`);
     if (opts.label) console.log(`  ${S.label("Label:")}       ${opts.label}`);
     if (dryRun) console.log(`  ${S.warn("(dry run \u2014 no agent will be started)")}`);
     console.log();
@@ -10160,7 +10532,7 @@ function makeRunCommand() {
       await runFlow({
         projectDir,
         flowPath,
-        driver,
+        harness,
         model,
         sessionLabel: opts.label,
         dryRun,
@@ -10168,7 +10540,7 @@ function makeRunCommand() {
         onLog: (line) => console.log(line)
       });
     } catch (err) {
-      const friendly = friendlyDriverError(err);
+      const friendly = friendlyHarnessError(err);
       logErr(friendly ?? (err instanceof Error ? err.message : String(err)));
       process.exit(1);
     }
@@ -10180,7 +10552,7 @@ function makeResumeCommand() {
     "--session <run-id>",
     "Target session by runId (full ID or the prefix `session list` prints)"
   ).option("--dry-run", "Print plan without executing").action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     let sessionId = opts.session;
     const dryRun = opts.dryRun ?? false;
     if (sessionId) {
@@ -10212,7 +10584,7 @@ function makeResumeCommand() {
         onLog: (line) => console.log(line)
       });
     } catch (err) {
-      const friendly = friendlyDriverError(err);
+      const friendly = friendlyHarnessError(err);
       logErr(friendly ?? (err instanceof Error ? err.message : String(err)));
       process.exit(1);
     }
@@ -10221,7 +10593,7 @@ function makeResumeCommand() {
 }
 function makeStatusCommand() {
   return new Command("status").description("Show current session state").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const session = await loadSession(projectDir);
     if (!session) {
       logInfo("No active session.");
@@ -10236,7 +10608,7 @@ function makeStatusCommand() {
     console.log(`  ${S.label("Status:")}    ${statusColor(session.status ?? "unknown")}`);
     if (session.error) console.log(`  ${S.label("Error:")}     ${session.error}`);
     console.log(
-      `  ${S.label("Driver:")}    ${session.driver}${session.model ? S.dim(` / ${session.model}`) : ""}`
+      `  ${S.label("Harness:")}    ${session.harness}${session.model ? S.dim(` / ${session.model}`) : ""}`
     );
     console.log(`  ${S.label("Updated:")}   ${session.updatedAt} ${S.dim(`(${age}s ago)`)}`);
     console.log(
@@ -10247,25 +10619,25 @@ function makeStatusCommand() {
 }
 function makeClearCommand() {
   return new Command("clear").description("Unset current session pointer").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     await clearSession(projectDir);
     logOk("Session cleared.");
   });
 }
 function makeReplCommand() {
-  return new Command("repl").description("Start an interactive agent session").option("--project-dir <path>", "Project directory").option("--driver <name>", driverOptionDescription()).option("--model <name>", "Model override").option("--resume", "Resume last session").option("--resume-session <id>", "Resume specific session").option(
+  return new Command("repl").description("Start an interactive agent session").option("--project-dir <path>", "Project directory").option("--harness <name>", harnessOptionDescription()).addOption(driverAliasOption()).option("--model <name>", "Model override").option("--resume", "Resume last session").option("--resume-session <id>", "Resume specific session").option(
     "--instance <id>",
     "Run the skaile.yaml `agents:` instance <id> (`default` is the primary `agent:`) with its overrides"
   ).action(async (opts) => {
-    const { findWorkspaceRoot } = await import('../core/index.js');
+    const { findWorkspaceRoot: findWorkspaceRoot2 } = await import('../core/index.js');
     const { startRepl } = await import('../tui/index.js');
-    const os2 = await import('os');
-    const userCwd = path18__default.resolve(opts.projectDir ?? process.cwd());
-    const workspaceRoot = findWorkspaceRoot(userCwd);
+    const os3 = await import('os');
+    const userCwd = path19__default.resolve(opts.projectDir ?? process.cwd());
+    const workspaceRoot = findWorkspaceRoot2(userCwd);
     const instanceId2 = opts.instance?.trim() || void 0;
     let projectDir;
     let agentCwd;
-    let driverOverride = opts.driver;
+    let harnessOverride = foldDriverFlag(opts).harness;
     if (workspaceRoot) {
       projectDir = workspaceRoot;
       agentCwd = userCwd;
@@ -10289,25 +10661,26 @@ function makeReplCommand() {
         p4.cancel("Cancelled.");
         process.exit(0);
       }
-      const tmpDir = fs8__default.mkdtempSync(path18__default.join(os2.tmpdir(), "skaile-repl-"));
+      const tmpDir = fs8__default.mkdtempSync(path19__default.join(os3.tmpdir(), "skaile-repl-"));
       projectDir = tmpDir;
       agentCwd = userCwd;
       logOk(`Temporary workspace: ${S.cmd(tmpDir)}`);
-      if (!driverOverride) {
-        const claudeDir = path18__default.join(os2.homedir(), ".claude");
+      if (!harnessOverride) {
+        const claudeDir = path19__default.join(os3.homedir(), ".claude");
         if (fs8__default.existsSync(claudeDir)) {
-          driverOverride = "claude-sdk";
+          harnessOverride = "claude-sdk";
           logInfo(`Detected ${S.cmd("~/.claude")} \u2192 using ${S.cmd("claude-sdk")} harness`);
         } else {
-          driverOverride = "omp";
+          harnessOverride = "omp";
           logInfo(`Using ${S.cmd("omp")} harness`);
         }
       }
       console.log();
     }
     await loadDeclaredPlugins(projectDir);
+    await reportProjectConfig(projectDir, { harness: false });
     const effective = await resolveSettings(projectDir, {
-      driver: driverOverride,
+      harness: harnessOverride,
       model: opts.model
     });
     let effectiveModel = effective.model;
@@ -10317,7 +10690,7 @@ function makeReplCommand() {
       } catch {
       }
     }
-    const providerRefusal = checkModelProvider(effective.driver ?? DEFAULT_DRIVER_ID, {
+    const providerRefusal = checkModelProvider(effective.harness ?? DEFAULT_HARNESS_ID, {
       registry: loadRegistryView({ projectDir }).merged,
       model: effectiveModel
     });
@@ -10329,14 +10702,14 @@ function makeReplCommand() {
       await startRepl({
         projectDir,
         cwd: agentCwd !== projectDir ? agentCwd : void 0,
-        driver: driverOverride,
+        harness: harnessOverride,
         model: opts.model,
         resume: opts.resume,
         resumeSessionId: opts.resumeSession,
         ...instanceId2 ? { instanceId: instanceId2 } : {}
       });
     } catch (err) {
-      logErr(friendlyDriverError(err) ?? (err instanceof Error ? err.message : String(err)));
+      logErr(friendlyHarnessError(err) ?? (err instanceof Error ? err.message : String(err)));
       process.exit(1);
     }
   });
@@ -10393,12 +10766,12 @@ function makeServeCommand() {
   ).option("--project-dir <path>", "Project directory", process.cwd()).option(
     "--managed-codex-config <path>",
     "Explicit private host configuration for managed Codex"
-  ).option("--driver <name>", "Override driver").option("--model <name>", "Override model").option("--provider <name>", "Override provider").option(
+  ).option("--harness <name>", "Override harness").addOption(driverAliasOption()).option("--model <name>", "Override model").option("--provider <name>", "Override provider").option(
     "--session-id <id>",
     "Label for the session; does not restore the conversation (use --resume-session-id)"
   ).option(
     "--resume-session-id <id>",
-    "driverSessionId of an earlier session (from its session_info event); restores that conversation"
+    "harnessSessionId of an earlier session (from its session_info event); restores that conversation"
   ).option(
     "--providers <ids>",
     "Restrict the AI provider registry to these entry ids (comma-separated)"
@@ -10409,7 +10782,8 @@ function makeServeCommand() {
     "--with-codex",
     "Include the Codex harness in the compiled binary (used with --compile-test)"
   ).action(
-    async (opts) => {
+    async (rawOpts) => {
+      const opts = foldDriverFlag(rawOpts);
       if (opts.compileTest && opts.managedCodexConfig)
         throw new Error("Managed Codex configuration is unsupported with --compile-test");
       if (opts.compileTest) {
@@ -10455,10 +10829,10 @@ function makeServeCommand() {
       }
       const providers = parseProviderIds(opts.providers);
       const modelEndpoint = parseModelEndpointFlag(opts.modelEndpoint);
-      const { checkDriverSdk, checkModelEndpointPeer, checkServeModel } = await import('../serve-preflight-QXRKGOI5.js');
-      const driverProblem = managedCodex ? null : await checkDriverSdk(opts.projectDir, opts.driver);
-      if (driverProblem) {
-        logErr(driverProblem);
+      const { checkHarnessSdk, checkModelEndpointPeer, checkServeModel } = await import('../serve-preflight-FLTIBTEX.js');
+      const harnessProblem = managedCodex ? null : await checkHarnessSdk(opts.projectDir, opts.harness);
+      if (harnessProblem) {
+        logErr(harnessProblem);
         process.exitCode = 1;
         return;
       }
@@ -10469,7 +10843,7 @@ function makeServeCommand() {
         return;
       }
       const modelProblem = managedCodex ? null : await checkServeModel(opts.projectDir, {
-        driver: opts.driver,
+        harness: opts.harness,
         model: opts.model,
         providers
       });
@@ -10498,7 +10872,7 @@ function makeServeCommand() {
           // `nix` deploy targets set it for children meant to outlive them.
           exitOnBrokenPipe: process.env.SKAILE_SERVE_EXIT_ON_BROKEN_STDOUT !== "0",
           projectDir: opts.projectDir,
-          driver: opts.driver,
+          harness: opts.harness,
           model: opts.model,
           provider: opts.provider,
           sessionId: opts.sessionId,
@@ -10516,12 +10890,12 @@ function makeServeCommand() {
   );
 }
 async function ensurePluginsLoadedForServe(projectDir) {
-  const { logInfo: logInfo2, logWarn: logWarn2 } = await import('../helpers-34QNVIGB.js');
+  const { logInfo: logInfo2, logWarn: logWarn2 } = await import('../helpers-JNMK3FC2.js');
   try {
     const { resolveSkWorkspaceConfig: resolveSkWorkspaceConfig2 } = await import('../core/index.js');
     const config = resolveSkWorkspaceConfig2(projectDir);
     if (!config.plugins || config.plugins.length === 0) return;
-    const { ensurePluginsLoaded } = await import('../plugin-store-G2GWAHSD.js');
+    const { ensurePluginsLoaded } = await import('../plugin-store-ABE35NRX.js');
     const { pluginRegistry } = await import('../plugin-registry/index.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     if (result.loaded.length > 0) {
@@ -10535,14 +10909,14 @@ async function ensurePluginsLoadedForServe(projectDir) {
   }
 }
 async function runCompileTest(opts) {
-  const { logOk: logOk2, logErr: logErr2, logInfo: logInfo2, S: S2 } = await import('../helpers-34QNVIGB.js');
+  const { logOk: logOk2, logErr: logErr2, logInfo: logInfo2, S: S2 } = await import('../helpers-JNMK3FC2.js');
   const { tmpdir } = await import('os');
   const { dirname: dirname3, join: join6, resolve: resolve4 } = await import('path');
   const { fileURLToPath: fileURLToPath2 } = await import('url');
-  const { unlinkSync, existsSync: existsSync21 } = await import('fs');
+  const { unlinkSync, existsSync: existsSync22 } = await import('fs');
   const { spawn } = await import('child_process');
   const { portableSpawnSync: portableSpawnSync2 } = await import('../core/index.js');
-  const { MONOREPO_ROOT } = await import('../paths-JLNX7Y4X.js');
+  const { MONOREPO_ROOT } = await import('../paths-UKWE35XS.js');
   if (MONOREPO_ROOT === null) {
     logErr2("--compile-test is only available inside the skaile-dev workspace.");
     logInfo2("Run it from a checkout of skaile-ai/skaile-dev (the monorepo shell).");
@@ -10586,7 +10960,7 @@ async function runCompileTest(opts) {
   }
   logOk2(`Binary built (${S2.dim(outfile)})`);
   const serveArgs = [outfile, "serve", "--port", opts.port, "--project-dir", opts.projectDir];
-  if (opts.driver) serveArgs.push("--driver", opts.driver);
+  if (opts.harness) serveArgs.push("--harness", opts.harness);
   if (opts.model) serveArgs.push("--model", opts.model);
   if (opts.provider) serveArgs.push("--provider", opts.provider);
   if (opts.sessionId) serveArgs.push("--session-id", opts.sessionId);
@@ -10604,7 +10978,7 @@ async function runCompileTest(opts) {
     } catch {
     }
     try {
-      if (existsSync21(outfile)) unlinkSync(outfile);
+      if (existsSync22(outfile)) unlinkSync(outfile);
     } catch {
     }
   }
@@ -10735,6 +11109,15 @@ function localQuery(dbPath, q) {
     db.close();
   }
 }
+function localSessionExists(dbPath, sessionId) {
+  const db = openSqlite(dbPath, { readonly: true });
+  try {
+    db.exec("PRAGMA query_only=1;");
+    return db.prepare("SELECT 1 AS found FROM log_entries WHERE session_id = $sid LIMIT 1").get({ $sid: sessionId }) != null;
+  } finally {
+    db.close();
+  }
+}
 function buildSelect(q) {
   const where = ["session_id = $sid"];
   const params = { $sid: q.sessionId };
@@ -11025,7 +11408,7 @@ function resolveMode2(opts) {
   if (opts.forceLocal && opts.forceRemote) {
     throw new Error("Cannot use both --local and --remote");
   }
-  const startDir = path18__default.resolve(opts.projectDir ?? process.cwd());
+  const startDir = path19__default.resolve(opts.projectDir ?? process.cwd());
   const localDb = findLogsDb(startDir);
   if (opts.forceLocal) {
     if (!localDb) {
@@ -11058,14 +11441,14 @@ function resolveMode2(opts) {
 function findLogsDb(startDir) {
   let dir = startDir;
   for (let i = 0; i < MAX_WALK_LEVELS; i++) {
-    const candidate = path18__default.join(dir, ".skaile", "logs.db");
+    const candidate = path19__default.join(dir, ".skaile", "logs.db");
     if (existsSync(candidate)) {
       try {
         if (statSync(candidate).isFile()) return candidate;
       } catch {
       }
     }
-    const parent = path18__default.dirname(dir);
+    const parent = path19__default.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -11164,6 +11547,9 @@ function buildLogQuery(opts) {
 async function fetchEntries(sessionId, opts, resolved, query) {
   if (resolved.mode === "local") {
     const result2 = localQuery(resolved.dbPath, { ...query, sessionId });
+    if (result2.entries.length === 0 && !localSessionExists(resolved.dbPath, sessionId)) {
+      throw new Error(`No session ${sessionId} in this project's log database.`);
+    }
     return { entries: result2.entries, nextCursor: result2.nextCursor };
   }
   if (!opts.projectId) {
@@ -11255,7 +11641,7 @@ async function requireSession(projectDir, idOrPrefix) {
 function makeSessionCommand() {
   const cmd = new Command("session").description("Manage sessions");
   cmd.command("list").description("List all sessions for a project").option("--project-dir <path>", "Project directory", process.cwd()).action(async (opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const sessions = await listSessions(projectDir);
     const current = await loadSession(projectDir);
     if (sessions.length === 0) {
@@ -11283,18 +11669,18 @@ function makeSessionCommand() {
     console.log();
   });
   cmd.command("show <run-id>").description("Show a specific session (full run ID or the prefix `session list` prints)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (idOrPrefix, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const { session } = await requireSession(projectDir, idOrPrefix);
     console.log(JSON.stringify(session, null, 2));
   });
   cmd.command("switch <run-id>").description("Switch the current session (full run ID or the prefix `session list` prints)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (idOrPrefix, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const { runId } = await requireSession(projectDir, idOrPrefix);
     await setCurrentSession(projectDir, runId);
     logOk(`Switched to session: ${S.dim(runId.slice(0, 8))}`);
   });
   cmd.command("delete <run-id>").description("Delete a session (full run ID or the prefix `session list` prints)").option("--project-dir <path>", "Project directory", process.cwd()).action(async (idOrPrefix, opts) => {
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const projectDir = path19__default.resolve(opts.projectDir);
     const { runId } = await requireSession(projectDir, idOrPrefix);
     await deleteSession(projectDir, runId);
     logOk(`Deleted session: ${S.dim(runId.slice(0, 8))}`);
@@ -11371,8 +11757,8 @@ function makeShowCommand() {
     requireProjectConfig(opts.projectDir, { allowMissing: true });
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir),
-      driverTarget: opts.target
+      projectDir: path19__default.resolve(opts.projectDir),
+      harness: opts.target
     });
     if (!kind) {
       showOverview(am2);
@@ -11399,7 +11785,7 @@ function searchCuratedManifests(query) {
     const slug = file.slice(0, -".yaml".length);
     let manifest;
     try {
-      manifest = decodeSkaileManifest(readFileSync(path18.join(dir, file), "utf-8")).manifest;
+      manifest = decodeSkaileManifest(readFileSync(path19.join(dir, file), "utf-8")).manifest;
     } catch {
       continue;
     }
@@ -11419,6 +11805,13 @@ async function fetchIdentity() {
   const jwt = await getStoreToken();
   return storeFetch({ ...getStoreConfig(), jwt }, "/api/v1/me");
 }
+function storeRefProblem(ref, err) {
+  const message = err instanceof Error ? err.message : String(err);
+  const plain = message.replace(/ Run the `migrate-skaile-manifest`.*$/, "");
+  if (!plain.startsWith("publisher required")) return message;
+  const name = /^(?:[^:@/#\s]+:)?([^@/#\s]+)/.exec(ref.trim())?.[1];
+  return name ? `${plain} Find the publisher with \`skaile store search ${name}\`.` : plain;
+}
 async function storeNotFoundMessage(remote, ref) {
   const parsed = parseAssetRef(ref);
   let versions = [];
@@ -11473,7 +11866,7 @@ function makeStoreCommand() {
   });
   store.command("mode <auto|local|remote>").description("Set the catalog resolution mode (not yet wired)").action((_mode) => {
     logErr(
-      `\`skaile store mode\` is scaffolded but not yet wired. Store config lives at ${path18__default.join(globalSkaileDir(), "store", "config.yaml")}.`
+      `\`skaile store mode\` is scaffolded but not yet wired. Store config lives at ${path19__default.join(globalSkaileDir(), "store", "config.yaml")}.`
     );
     process.exit(2);
   });
@@ -11481,9 +11874,9 @@ function makeStoreCommand() {
     "--all",
     `List every match (default: ${STORE_ROW_LIMIT} rows, only what \`skaile add\` can install)`
   ).option("-C, --project-dir <dir>", "Project directory (catalog config overlay)", process.cwd()).action(async (query, opts) => {
-    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-PVTIUQUF.js');
-    const { getKnownKinds: getKnownKinds2 } = await import('../open-registry-SOIS3TA2.js');
-    const projectDir = path18__default.resolve(opts.projectDir);
+    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-NKKUJLWA.js');
+    const { getKnownKinds: getKnownKinds2 } = await import('../open-registry-BYAXSHUI.js');
+    const projectDir = path19__default.resolve(opts.projectDir);
     if (opts.kind && !getKnownKinds2().has(opts.kind)) {
       logErr(
         `Unknown kind "${opts.kind}". Valid kinds: ${[...getKnownKinds2()].sort().join(", ")}`
@@ -11540,16 +11933,16 @@ function makeStoreCommand() {
     }
   });
   store.command("show <ref>").description("Show a store asset's details + provenance (source, files, integrity)").option("-C, --project-dir <dir>", "Project directory (catalog config overlay)", process.cwd()).action(async (ref, opts) => {
-    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-PVTIUQUF.js');
-    const { supportsInstallManifest: supportsInstallManifest2 } = await import('../project-EX47PUBN.js');
+    const { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-NKKUJLWA.js');
+    const { supportsInstallManifest: supportsInstallManifest2 } = await import('../project-BIPK47JK.js');
     try {
       parseAssetRef(ref);
     } catch (e) {
-      logErr(`Invalid asset ref "${ref}": ${e instanceof Error ? e.message : String(e)}`);
+      logErr(`Invalid asset ref "${ref}": ${storeRefProblem(ref, e)}`);
       process.exit(1);
     }
     try {
-      const remote = await openCatalogSource2({ projectDir: path18__default.resolve(opts.projectDir) });
+      const remote = await openCatalogSource2({ projectDir: path19__default.resolve(opts.projectDir) });
       const asset = await remote.resolve(ref);
       if (!asset) {
         logErr(await storeNotFoundMessage(remote, ref));
@@ -11560,7 +11953,7 @@ function makeStoreCommand() {
       const manifestFailure = {};
       if (supportsInstallManifest2(remote)) {
         manifest = await remote.getInstallManifest(canonical).catch(async (err) => {
-          manifestFailure.text = await describeStoreFailure(err, path18__default.resolve(opts.projectDir));
+          manifestFailure.text = await describeStoreFailure(err, path19__default.resolve(opts.projectDir));
           return null;
         });
       }
@@ -11608,9 +12001,14 @@ function makeStoreCommand() {
       }
       console.log();
       const notInstallable = storeNotInstallableReason(asset);
-      console.log(
-        notInstallable ? `  ${S.dim(`Not installable: ${notInstallable}`)}` : `  ${S.dim(`Install:  skaile add ${canonical}`)}`
-      );
+      const notRunnable = !notInstallable && asset.kind === "mcp-server" && manifest ? await mcpNotRunnableHere(manifest, asset.name) : void 0;
+      if (notInstallable) console.log(`  ${S.dim(`Not installable: ${notInstallable}`)}`);
+      else if (notRunnable) {
+        console.log(`  ${S.dim(`Not runnable here: ${notRunnable}`)}`);
+        console.log(
+          `  ${S.dim(`skaile add ${canonical} still records it in the lock, but writes no .mcp.json entry.`)}`
+        );
+      } else console.log(`  ${S.dim(`Install:  skaile add ${canonical}`)}`);
       console.log();
     } catch (e) {
       if (e instanceof LocalCatalogDisabledError2) {
@@ -11619,7 +12017,7 @@ function makeStoreCommand() {
         );
       } else {
         logErr(
-          `Store show failed: ${await describeStoreFailure(e, path18__default.resolve(opts.projectDir))}`
+          `Store show failed: ${await describeStoreFailure(e, path19__default.resolve(opts.projectDir))}`
         );
       }
       process.exit(1);
@@ -11693,7 +12091,7 @@ function makeTreeCommand() {
     requireProjectConfig(opts.projectDir);
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     const root = await am2.tree();
     if (root.children.length === 0) {
@@ -11719,9 +12117,12 @@ function makeUpdateCommand() {
   return new Command("update").description("Refresh the Catalog cache and re-deploy outdated assets in the current project").argument(
     "[name]",
     "Update only this declared asset (kind:@publisher/name, kind:name or name); exits 1 when none matches"
-  ).option("--project-dir <path>", "Project directory", process.cwd()).option("--no-catalog", "Skip refreshing the catalog cache").option("--catalog-only", "Refresh the catalog cache only; do not re-deploy assets").option("--no-sync", "Skip syncing sources from upstream before re-deploying").option("-y, --yes", "Sync sources without the confirmation prompt").action(
+  ).option("--project-dir <path>", "Project directory", process.cwd()).option("--no-catalog", "Skip refreshing the catalog cache").option("--catalog-only", "Refresh the catalog cache only; do not re-deploy assets").option("--no-sync", "Skip syncing sources from upstream before re-deploying").option("-y, --yes", "Sync sources without the confirmation prompt").option(
+    "--force",
+    "Delete files the new content does not ship, and overwrite hand-edited agent files"
+  ).action(
     async (name, opts) => {
-      const projectDir = path18__default.resolve(opts.projectDir);
+      const projectDir = path19__default.resolve(opts.projectDir);
       if (!opts.catalogOnly) requireProjectConfig(projectDir);
       const am2 = new AssetManager({
         registry: getKindRegistry(),
@@ -11741,7 +12142,7 @@ function makeUpdateCommand() {
         const catalogSpinner = createSpinner();
         catalogSpinner.start("Refreshing catalog cache");
         try {
-          const remote = await openCatalogSource({ projectDir: path18__default.resolve(opts.projectDir) });
+          const remote = await openCatalogSource({ projectDir: path19__default.resolve(opts.projectDir) });
           const result2 = await remote.refresh({ timeoutMs: CATALOG_REFRESH_TIMEOUT_MS });
           catalogSpinner.stop(
             `Catalog refreshed: ${S.heading(String(result2.assetsCached))} assets cached`
@@ -11782,7 +12183,7 @@ function makeUpdateCommand() {
       spinner.start("Re-deploying assets");
       let result;
       try {
-        result = await am2.install({ moveLibraries: true });
+        result = await am2.install({ moveLibraries: true, force: opts.force });
       } catch (err) {
         spinner.stop("Failed");
         logErr(String(err));
@@ -11876,13 +12277,13 @@ async function resolveUpdateTarget(am2, name) {
 async function needsCatalog(am2, projectDir) {
   let lock = null;
   try {
-    lock = readLock(path18__default.join(projectDir, "skaile.lock.yaml"));
+    lock = readLock(path19__default.join(projectDir, "skaile.lock.yaml"));
   } catch {
     lock = null;
   }
   let declaredUrls = /* @__PURE__ */ new Set();
   try {
-    const yamlPath = path18__default.join(projectDir, "skaile.yaml");
+    const yamlPath = path19__default.join(projectDir, "skaile.yaml");
     declaredUrls = new Set(
       WorkspaceYamlEditor.load(yamlPath).getSources().map((s) => normalizeRepoUrl(s.url))
     );
@@ -11918,7 +12319,7 @@ function readText2(file) {
   }
 }
 async function updateOne(am2, projectDir, target) {
-  const lockPath = path18__default.join(projectDir, "skaile.lock.yaml");
+  const lockPath = path19__default.join(projectDir, "skaile.lock.yaml");
   const before = readText2(lockPath);
   const spinner = createSpinner();
   spinner.start(`Updating ${target.ref}`);
@@ -12114,7 +12515,7 @@ function makeWhyCommand() {
     requireProjectConfig(opts.projectDir);
     const am2 = new AssetManager({
       registry: getKindRegistry(),
-      projectDir: path18__default.resolve(opts.projectDir)
+      projectDir: path19__default.resolve(opts.projectDir)
     });
     const chain = await am2.why(ref);
     if (chain.length === 0) {
@@ -12186,7 +12587,7 @@ function isIndexBusyError(err) {
 var _defaultFormatHelp = Help.prototype.formatHelp;
 var pkg = JSON.parse(
   readFileSync(
-    path18__default.resolve(path18__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
+    path19__default.resolve(path19__default.dirname(fileURLToPath(import.meta.url)), "../../package.json"),
     "utf-8"
   )
 );
@@ -12197,7 +12598,7 @@ for (const key of [
   "SKAILE_CACHE_DIR"
 ]) {
   const value = process.env[key];
-  if (value) process.env[key] = path18__default.resolve(value);
+  if (value) process.env[key] = path19__default.resolve(value);
 }
 var program = new Command("skaile").description("AI asset manager").version(pkg.version, "-v, --version", "Show the skaile CLI version").enablePositionalOptions().configureHelp({
   formatHelp(cmd, helper) {
@@ -12212,6 +12613,7 @@ Project:
   clean [--all] [--dry-run]    Remove skaile-managed assets
   setup                        Interactive provider setup wizard
   config show|get|set          Personal settings
+  harness set <name>           Switch the project to claude-code | omp | codex and install
 
 Assets (skill, agent, prompt, flow, preset, contract):
   add <ref> [--global]         Add to skaile.yaml + deploy
@@ -12243,8 +12645,8 @@ Execution:
   resume                       Resume last session
   serve [--compile-test]       Start WebSocket agent server
   mcp-server                   Start workspace MCP server (for .mcp.json)
-  integration install [--driver all]    Install agent integration (claude-code | omp | codex)
-  integration uninstall [--driver all]  Uninstall agent integration
+  integration install [--harness all]    Install agent integration (claude-code | omp | codex)
+  integration uninstall [--harness all]  Uninstall agent integration
   integration enable                     Enable integration (claude-code only)
   integration disable                    Disable integration (claude-code only)
   integration status                     Show install / enable state across harnesses
@@ -12308,50 +12710,63 @@ Advanced:
 `;
   }
 });
-var HARNESS_DEFAULTS = {
-  "claude-code": { driver: "claude-sdk" },
-  omp: { driver: "omp" },
-  codex: { driver: "codex" }
+var INIT_HARNESS_DEFAULTS = {
+  "claude-code": { harness: HARNESS_ID_OF_TARGET["claude-code"] },
+  omp: { harness: HARNESS_ID_OF_TARGET.omp },
+  codex: { harness: HARNESS_ID_OF_TARGET.codex }
 };
-program.command("init [project-dir]").description("Initialize a project directory (defaults to current directory)").option("--harness <name>", "Coding-agent harness (claude-code | omp | codex)", "claude-code").option("--no-git", "Skip git init and .gitignore").action(
+program.command("init [project-dir]").description("Initialize a project directory (defaults to current directory)").option(
+  "--harness <name>",
+  "Coding-agent harness of a new project (claude-code | omp | codex; default claude-code)"
+).option("--no-git", "Skip git init and .gitignore").action(
   (projectDir, opts) => runInit(projectDir, opts)
 );
 async function runInit(projectDir, opts) {
   const { mkdirSync: mkdirSync5, writeFileSync: writeFileSync7 } = await import('fs');
   const { stringify: stringify2 } = await import('yaml');
-  const { DRIVER_TARGETS: DRIVER_TARGETS2, SUPPORTED_DRIVER_TARGETS: SUPPORTED_DRIVER_TARGETS2 } = await import('../core/index.js');
-  const harness = opts.harness;
-  if (!SUPPORTED_DRIVER_TARGETS2.includes(harness)) {
-    logErr(`Unknown harness "${opts.harness}". Supported: ${SUPPORTED_DRIVER_TARGETS2.join(", ")}`);
+  const { HARNESS_TARGETS: HARNESS_TARGETS2, SUPPORTED_HARNESSES: SUPPORTED_HARNESSES2, resolveConfiguredHarnessName: resolveConfiguredHarnessName2 } = await import('../core/index.js');
+  const harness = opts.harness ?? "claude-code";
+  if (!SUPPORTED_HARNESSES2.includes(harness)) {
+    logErr(`Unknown harness "${opts.harness}". Supported: ${SUPPORTED_HARNESSES2.join(", ")}`);
     process.exitCode = 1;
     return;
   }
-  const resolved = path18__default.resolve(projectDir ?? ".");
-  const projectName = path18__default.basename(resolved);
+  const resolved = path19__default.resolve(projectDir ?? ".");
+  if (opts.harness && (await import('fs')).existsSync(path19__default.join(resolved, "skaile.yaml"))) {
+    const current = resolveConfiguredHarnessName2(resolved);
+    if (current !== harness) {
+      logErr(
+        `${resolved} is already a skaile project${current ? ` on ${current}` : ""}. To switch it to ${harness}, run: skaile harness set ${harness}`
+      );
+      process.exitCode = 1;
+      return;
+    }
+  }
+  const projectName = path19__default.basename(resolved);
   const created = [];
-  const { existsSync: existsSync21 } = await import('fs');
-  if (!existsSync21(resolved)) {
+  const { existsSync: existsSync22 } = await import('fs');
+  if (!existsSync22(resolved)) {
     mkdirSync5(resolved, { recursive: true });
     created.push(".");
   }
-  const skaileDir = path18__default.join(resolved, ".skaile");
-  if (!existsSync21(skaileDir)) {
-    mkdirSync5(path18__default.join(skaileDir, "sessions"), { recursive: true });
+  const skaileDir = path19__default.join(resolved, ".skaile");
+  if (!existsSync22(skaileDir)) {
+    mkdirSync5(path19__default.join(skaileDir, "sessions"), { recursive: true });
     created.push(".skaile/");
   }
-  const settingsPath = path18__default.join(skaileDir, "settings.json");
-  if (!existsSync21(settingsPath)) {
+  const settingsPath = path19__default.join(skaileDir, "settings.json");
+  if (!existsSync22(settingsPath)) {
     writeFileSync7(settingsPath, "{}\n");
     created.push(".skaile/settings.json");
   }
-  const wsConfigPath = path18__default.join(resolved, "skaile.yaml");
-  if (!existsSync21(wsConfigPath)) {
+  const wsConfigPath = path19__default.join(resolved, "skaile.yaml");
+  if (!existsSync22(wsConfigPath)) {
     writeFileSync7(wsConfigPath, stringify2(buildInitWorkspaceConfig(projectName, harness)));
     created.push("skaile.yaml");
   }
-  for (const dir of new Set(Object.values(DRIVER_TARGETS2[harness].local))) {
-    const full = path18__default.join(resolved, dir);
-    if (!existsSync21(full)) {
+  for (const dir of new Set(Object.values(HARNESS_TARGETS2[harness].local))) {
+    const full = path19__default.join(resolved, dir);
+    if (!existsSync22(full)) {
       mkdirSync5(full, { recursive: true });
       created.push(`${dir}/`);
     }
@@ -12364,7 +12779,7 @@ async function runInit(projectDir, opts) {
   printInitSummary(resolved, projectDir, created);
 }
 function buildInitWorkspaceConfig(projectName, harness) {
-  const harnessDefaults = HARNESS_DEFAULTS[harness];
+  const harnessDefaults = INIT_HARNESS_DEFAULTS[harness];
   return {
     name: projectName,
     description: `${projectName} AI skill dependencies`,
@@ -12373,7 +12788,7 @@ function buildInitWorkspaceConfig(projectName, harness) {
         agent: harness,
         // model is omitted unless a harness fixes it (none do today).
         ...harnessDefaults.model ? { model: harnessDefaults.model } : {},
-        driver: harnessDefaults.driver,
+        harness: harnessDefaults.harness,
         max_turns: 200
       }
     }
@@ -12381,8 +12796,8 @@ function buildInitWorkspaceConfig(projectName, harness) {
 }
 async function initGitScaffold(resolved, created) {
   const { execSync: execSync2 } = await import('child_process');
-  const { existsSync: existsSync21, readFileSync: readFileSync13, writeFileSync: writeFileSync7 } = await import('fs');
-  const gitignorePath = path18__default.join(resolved, ".gitignore");
+  const { existsSync: existsSync22, readFileSync: readFileSync13, writeFileSync: writeFileSync7 } = await import('fs');
+  const gitignorePath = path19__default.join(resolved, ".gitignore");
   const entries = [
     "node_modules/",
     // Python bytecode a deployed skill script leaves inside `.claude/skills` and friends.
@@ -12417,7 +12832,7 @@ async function initGitScaffold(resolved, created) {
     ".env",
     ".env.local"
   ];
-  const existing = existsSync21(gitignorePath) ? readFileSync13(gitignorePath, "utf-8") : "";
+  const existing = existsSync22(gitignorePath) ? readFileSync13(gitignorePath, "utf-8") : "";
   const have = new Set(existing.split("\n").map((l) => l.trim()));
   const append = entries.filter((e) => !have.has(e));
   if (append.length > 0) {
@@ -12426,7 +12841,7 @@ async function initGitScaffold(resolved, created) {
 `);
     if (!existing) created.push(".gitignore");
   }
-  if (!existsSync21(path18__default.join(resolved, ".git"))) {
+  if (!existsSync22(path19__default.join(resolved, ".git"))) {
     try {
       execSync2("git init", { cwd: resolved, stdio: "pipe" });
       created.push(".git/");
@@ -12456,7 +12871,7 @@ async function bootstrapUserConfig() {
 }
 async function hydrateInitSources(resolved, created) {
   try {
-    const { ensureSourcesCloned } = await import('../ensure-sources-GKVLE6L5.js');
+    const { ensureSourcesCloned } = await import('../ensure-sources-IH7CHSJF.js');
     const hydrate = ensureSourcesCloned(resolved, { quiet: true });
     for (const n of hydrate.cloned) created.push(`~/.skaile/cache/sources/${n}/`);
     if (hydrate.failed.length > 0) {
@@ -12472,7 +12887,7 @@ function printInitSummary(resolved, projectDir, created) {
   logOk(`Initialized project at ${S.heading(resolved)}`);
   console.log();
   console.log(S.heading("  Next steps:"));
-  const isCurrentDir = resolved === path18__default.resolve(".");
+  const isCurrentDir = resolved === path19__default.resolve(".");
   let step = 1;
   if (!isCurrentDir) {
     console.log(`  ${S.dim(`${step}.`)} ${S.cmd(`cd ${projectDir}`)}`);
@@ -12496,7 +12911,7 @@ function printInitSummary(resolved, projectDir, created) {
   console.log();
 }
 program.command("setup").description("Interactive provider setup wizard").action(async () => {
-  const { cmdSetup } = await import('../setup-AFZQNGKA.js');
+  const { cmdSetup } = await import('../setup-AG6NFHSN.js');
   await cmdSetup([], { projectDir: process.cwd() });
 });
 program.addCommand(makeInstallCommand());
@@ -12504,6 +12919,7 @@ program.addCommand(makeCheckCommand());
 program.addCommand(makeCleanCommand());
 program.addCommand(makeCacheCommand());
 program.addCommand(makeConfigCommand());
+program.addCommand(makeHarnessCommand());
 program.addCommand(makeProvidersCommand());
 program.addCommand(makeMigrateCommand());
 program.addCommand(makeAddCommand());
@@ -12575,8 +12991,8 @@ program.hook("postAction", async (_thisCommand, actionCommand) => {
   if (!["add", "remove", "install", "update"].includes(actionCommand.name())) return;
   const opts = actionCommand.opts();
   if (opts.global || opts.dryRun) return;
-  const projectDir = path18__default.resolve(opts.projectDir ?? process.cwd());
-  const { refreshPluginSkills } = await import('../claude-code-2PU7TITZ.js');
+  const projectDir = path19__default.resolve(opts.projectDir ?? process.cwd());
+  const { refreshPluginSkills } = await import('../claude-code-RE46FJXI.js');
   try {
     if (await refreshPluginSkills(projectDir)) {
       logInfo(`Updated ${S.cmd(".claude/plugins/skaile/skills")} (the --full plugin copy)`);
@@ -12594,6 +13010,9 @@ process.once("beforeExit", () => {
   logErr("The command ended before it finished (nothing left to wait for).");
   process.exit(1);
 });
+setLibraryAssetCheck(
+  (asset, libraryPath) => libraryAssetRefusals(asset, libraryPath, getKindRegistry())
+);
 try {
   await program.parseAsync();
   commandSettled = true;