@skaile/workspaces 5.19.0 → 6.0.0

package/dist/cli/index.js

@@ -1,65 +1,65 @@
 #!/usr/bin/env node
-import { makeValidateCommand, scanIdentities, isRecord } from '../chunk-ZQSOJH6I.js';
+import { makeValidateCommand, scanIdentities, isRecord } from '../chunk-NMI2TWMH.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 { makeProvidersCommand, loadRegistryView, addProviderEntry, ProviderRegistryWriteError, removeProviderEntry } from '../chunk-3IXIEHUB.js';
+import { makeInstallCommand, makeCheckCommand, makeCleanCommand, pinComposedAgents, reportRewritten, reportReplaced, reportRelocked, reportMoved, reportStoreNotChecked, globalProblems, editedConventionFiles, supportsInstallManifest, REF_HINT, reportInstalledSoftDeps } from '../chunk-WEH33JSG.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 { getStoreConfig, storeFetch, isStoreAuthenticated, getStoreToken } from '../chunk-VXEYX73S.js';
+import { makeSourceCommand, syncProjectSources, divergedSourceClones } from '../chunk-WYHQUCHR.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-TKHJXPSB.js';
+import { openCatalogSource, LocalCatalogDisabledError, openLibraryManager, openLibrary } from '../chunk-DHYSUJ3H.js';
+import { AI_RESOURCES } from '../chunk-2UUKCROR.js';
+import { loadDeclaredPlugins } from '../chunk-YGRZNFRO.js';
+import { status, enable, disable, install, uninstall } from '../chunk-Y2TO2U7W.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-KX2PT5Q4.js';
+import { getKindRegistry, getKnownKinds } from '../chunk-ARWKK325.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 { resolveInstanceAgentDir, instanceSessionOverrides, runAgentChat, isCompositionError, resolveSessionId, loadSessionById, loadSession, listSessions, setCurrentSession, deleteSession, clearSession, loadAgentManifest, hashAgentFiles, createCompositionContentSource, compileComposition, manifestModelForHarness, instanceForSession, resolveAgentInstance, describeComposition, MarkdownStreamer, createFinalTextFallback } from '../chunk-VJRTDKXS.js';
+import '../chunk-VBI7HGHB.js';
+import '../chunk-OULSJRXV.js';
+import '../chunk-7TPYPVAH.js';
+import '../chunk-SRODW6M2.js';
+import '../chunk-WYZXSJBK.js';
+import '../chunk-U56GGCC2.js';
 import '../chunk-6Z5KTFJT.js';
-import '../chunk-4ZTPYIBE.js';
-import '../chunk-X5YPJV4N.js';
-import '../chunk-XJVBUDDJ.js';
+import '../chunk-KW37WNXY.js';
+import '../chunk-3MWQKQUB.js';
+import '../chunk-E3GPGTW3.js';
 import '../chunk-O7SG5PC2.js';
 import '../chunk-7QBNJTTQ.js';
 import '../chunk-O2SYFJWP.js';
-import '../chunk-Y5MBW5EU.js';
+import '../chunk-AF432MS3.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-T2BDID2J.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 '../chunk-SNEE6UGY.js';
+import '../chunk-6GWSDPBP.js';
+import '../chunk-LN6QB7XI.js';
+import { checkModelProvider, checkHarnessModel } from '../chunk-4XWLB7JB.js';
+import '../chunk-WDAIWDLK.js';
+import '../chunk-4DWBSTYA.js';
+import '../chunk-JDR6ILCW.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-7CV3HFWJ.js';
+import '../chunk-GEQSUC6U.js';
+import '../chunk-XFIEVEU7.js';
+import '../chunk-7DN6JKP2.js';
+import '../chunk-UVVVR4XO.js';
+import { listHarnesses, getProviderPreset, AI_PROVIDER_PRESETS } from '../chunk-F2GOZMRA.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-SZXGRHQQ.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-JCPD4QRM.js';
+import { LibraryEntryError, AssetManager, parseRefTolerant, MissingManifestError, parseCanonicalLockKey, normalizeRepoUrl, FACTORY_SOURCE_URL } from '../chunk-OAHVKSQJ.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-UL22SDGR.js';
+import { flowFileNameError, SEMVER_RE } from '../chunk-QOM5Z62G.js';
 import '../chunk-7XSAW5OC.js';
 import '../chunk-BFMYYNDT.js';
 import '../chunk-3TXEJN4W.js';
@@ -67,28 +67,28 @@ import '../chunk-ISHJITXJ.js';
 import '../chunk-LNFKL23K.js';
 import '../chunk-X3RMRJNR.js';
 import '../chunk-NUELZWCF.js';
-import { installTargetOf, SCAFFOLD_KINDS } from '../chunk-JTOWA6RS.js';
+import { installTargetOf, SCAFFOLD_KINDS } from '../chunk-3JKGY2YC.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-DUMTLYSO.js';
+import { effectiveComposes, validatePreset, validateAgent, composeSlotDiagnostics, agentDeprecationDiagnostics, SLOT_ID_PATTERN } from '../chunk-E572OHGY.js';
+import { loadSettings, globalSettingsPath, resolveSettings, projectSettingsPath, saveSettings, WorkspaceYamlEditor, resolveLibraryDir, checkAgentSkillConformance, resolveSettingsWithSources, readLock, globalInstallDir, GLOBAL_INSTALL_DIR_NAME, workspaceProviderRegistryPath, userProviderRegistryPath, loadProviderRegistryFile, aiResourceRoots } from '../chunk-L4YKW5AY.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-OTIB4D2K.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-OHNKYHRR.js';
 import { globalCacheRoot, globalSkaileDir, userConfigPath } from '../chunk-L5VSIPQD.js';
-import { DRIVER_TARGETS, SUPPORTED_DRIVER_TARGETS, driverTargetForDriver } from '../chunk-IG5LZ3WU.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-UQ33Y4DM.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 { 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';
@@ -233,7 +233,7 @@ async function runSearch(kind, query, opts) {
   }
 }
 async function searchIndex(query, kind) {
-  const { openLibrary: openLibrary2 } = await import('../open-library-PVTIUQUF.js');
+  const { openLibrary: openLibrary2 } = await import('../open-library-RJGJIW5H.js');
   const library = await openLibrary2();
   try {
     const { libraryDirMissing: libraryDirMissing2 } = await import('../library/index.js');
@@ -385,14 +385,14 @@ async function expandCompetingOrigins(entries, projectDir) {
 }
 async function searchLocal(query, kind, opts, showStore, airGapped) {
   const projectDir = path18__default.resolve(opts.projectDir);
-  const { restoreSourceReaders } = await import('../source-DGPCT5IC.js');
+  const { restoreSourceReaders } = await import('../source-GBMYD3RO.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);
   if (entries.length === 0 && !query && !kind && !airGapped) {
-    const { autoSyncForSearch } = await import('../source-DGPCT5IC.js');
+    const { autoSyncForSearch } = await import('../source-GBMYD3RO.js');
     if (await autoSyncForSearch(projectDir)) {
       entries = unionEntries(await searchIndex(query, kind), factory);
     }
@@ -506,7 +506,7 @@ 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-RJGJIW5H.js');
   try {
     const remote = await openCatalogSource2({ projectDir: path18__default.resolve(opts.projectDir) });
     const assets = await remote.listAssets(kind ? { kind } : {});
@@ -615,7 +615,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(
@@ -638,7 +638,7 @@ function makeAddCommand() {
       projectDir: path18__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]]);
@@ -706,7 +706,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 +715,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);
@@ -764,7 +764,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) => {
@@ -776,7 +776,7 @@ function makeRemoveCommand() {
       projectDir: path18__default.resolve(opts.projectDir),
       global: opts.global || harnesses !== void 0,
       harnesses,
-      driverTarget: opts.target
+      harness: opts.target
     });
     let result;
     try {
@@ -834,8 +834,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);
@@ -846,7 +846,7 @@ function makeListCommand() {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
       projectDir: path18__default.resolve(opts.projectDir),
-      driverTarget: opts.target
+      harness: opts.target
     });
     let declared;
     try {
@@ -1014,7 +1014,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-RJGJIW5H.js');
     const { source, close } = await resolveCatalogSource({ projectDir: opts.projectDir });
     try {
       return await source.listAssets(filter);
@@ -1030,7 +1030,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-RJGJIW5H.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 } : {} };
@@ -1741,7 +1741,7 @@ function makeCatalogCommand() {
   return catalog;
 }
 async function runLocalCatalogTest(projectDir) {
-  const { resolveCatalogSource } = await import('../open-library-PVTIUQUF.js');
+  const { resolveCatalogSource } = await import('../open-library-RJGJIW5H.js');
   let resolved;
   try {
     resolved = await resolveCatalogSource({ projectDir });
@@ -1917,7 +1917,7 @@ 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-3QS3J7KO.js');
     const index = new LocalIndex({ indexPath });
     try {
       for (const { library, assets } of await scanAuthoringLibraries(index, getKindRegistry2())) {
@@ -2023,7 +2023,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,14 +2070,26 @@ 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 unknownHarnessMessage(harness) {
+  const known = listHarnesses().map((d) => d.id);
+  if (known.includes(harness)) return void 0;
+  return `Unknown agent harness: "${harness}". Available: ${known.join(", ")}`;
+}
+var warnedDriverFlag = false;
+function warnDriverFlagDeprecated() {
+  if (warnedDriverFlag) return;
+  warnedDriverFlag = true;
+  console.error("--driver is deprecated; use --harness");
+}
+function driverAliasOption() {
+  return new Option("--driver <name>", "Deprecated alias of --harness").hideHelp();
 }
-function friendlyDriverError(err) {
+function foldDriverFlag(opts, fallback) {
+  const { driver, ...rest } = opts;
+  if (driver !== void 0) warnDriverFlagDeprecated();
+  return { ...rest, harness: rest.harness ?? driver ?? fallback };
+}
+function friendlyHarnessError(err) {
   const e = err;
   if (!e) return null;
   const isSpawnEnoent = e.code === "ENOENT" && (e.syscall?.startsWith("spawn") === true || /^spawn .*ENOENT/.test(e.message ?? ""));
@@ -2086,9 +2098,9 @@ function friendlyDriverError(err) {
   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\`.`;
+Try a different harness with \`--harness claude-sdk\`.`;
 }
-function driverErrorNotes(err) {
+function harnessErrorNotes(err) {
   const e = err;
   const notes = [];
   const category = e?.category ?? e?.detail?.category;
@@ -2102,7 +2114,12 @@ function driverErrorNotes(err) {
 }
 
 // cli/src/commands/config.ts
-var PERSONAL_KEYS = /* @__PURE__ */ new Set(["driver", "model"]);
+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";
+}
 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 +2177,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 +2191,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 +2218,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 +2250,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})`)}`);
@@ -2309,7 +2326,8 @@ 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) => {
+  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 ? path18__default.resolve(opts.projectDir) : process.cwd();
     if (CATALOG_KEYS.has(key)) {
       const { resolveConfig } = await import('../library/index.js');
@@ -2322,74 +2340,78 @@ 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 ? 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.
   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);
+        }
+      }
+      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>`"
+          `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" : ""}`
         );
-      } else {
-        console.log(
-          S.dim(
-            `  \u2192 resolves to ${resolved.providerId}${resolved.providerModelId ? `/${resolved.providerModelId}` : ""}`
-          )
-        );
-        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) => {
+    "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 ? path18__default.resolve(opts.projectDir) : process.cwd();
     if (CATALOG_KEYS.has(key)) {
       await unsetCatalogKey(key);
@@ -2998,7 +3020,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) => {
@@ -3058,7 +3080,7 @@ 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-MSH6GK6T.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     for (const f of result.failed) logWarn(f.error);
   }
@@ -3627,12 +3649,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();
@@ -3698,7 +3723,7 @@ ${await trustEntry(projectDir)}`
 }
 async function runInstall(opts) {
   const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3761,7 +3786,7 @@ async function uninstallCodex(projectDir) {
 }
 async function runUninstall(opts) {
   const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   let exitCode = 0;
   if (targets.includes("claude-code")) {
@@ -3866,8 +3891,8 @@ 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 requestedAll = opts.harness === "all";
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   const usageError = checkToggleSupported(targets, requestedAll, action3);
   if (usageError !== null) return usageError;
@@ -3879,7 +3904,7 @@ async function runToggle(opts, action3) {
 }
 async function runStatus2(opts) {
   const projectDir = path18__default.resolve(opts.projectDir);
-  const targets = resolveDriver(opts.driver);
+  const targets = resolveHarness(opts.harness);
   if (!targets) return 1;
   const rows = [];
   let exitCode = 0;
@@ -4008,23 +4033,23 @@ 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)"
@@ -4220,7 +4245,7 @@ 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")
     )
   )
@@ -4427,7 +4452,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-KKQ2ULLX.js');
   if (!isGithubRemote(url)) logWarn(notGithubRemoteMessage(name, url));
 }
 function scaffoldLibraryFiles(dir, name) {
@@ -5149,16 +5174,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-KKQ2ULLX.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-KKQ2ULLX.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-KKQ2ULLX.js');
     await withStoreErrorHandling(() => runLibraryYank(lib, opts));
   });
   return cmd;
@@ -5308,7 +5333,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 +5843,7 @@ function scheduleSoftDepPreview() {
 }
 async function loadAssets() {
   softDepPreviewCache.clear();
-  const { gatherAssetFeeds } = await import('../asset-feeds-QGLI3AXI.js');
+  const { gatherAssetFeeds } = await import('../asset-feeds-PXUWCXVI.js');
   const { entries, notes } = await gatherAssetFeeds(am, am.projectDir);
   if (notes.length > 0) {
     state.message = notes.map((n) => `[${n.feed}] ${n.message}`).join(" \u2022 ");
@@ -6022,7 +6047,7 @@ 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-RJGJIW5H.js'),
       import('../core/index.js')
     ]);
     const { manager, library, close } = await openLibraryManager2();
@@ -6993,8 +7018,8 @@ function makeManageCommand() {
 }
 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 path42 = await import('path');
+    const projectDir = path42.default.resolve(opts.projectDir);
     const { LogStore: LogStore2, StdoutSink: StdoutSink2, registerLogStore: registerLogStore2 } = await import('../core/logging.js');
     registerLogStore2(
       new LogStore2({
@@ -7207,6 +7232,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";
@@ -8139,6 +8193,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(path18__default.join(projectDir, SKAILE_YAML_DEFAULT))) {
+    files.push(path18__default.join(projectDir, SKAILE_YAML_DEFAULT));
+  }
+  try {
+    for (const entry of readdirSync(projectDir).sort()) {
+      if (entry.endsWith(SKAILE_YAML_SUFFIX)) files.push(path18__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 = path18__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 = path18__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 +8427,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",
@@ -8281,7 +8471,7 @@ function workspaceConfigFiles(dir) {
   return names.filter((name) => isWorkspaceConfigFilename(name)).sort().map((name) => path18__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;
@@ -8532,35 +8722,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();
@@ -8625,6 +8786,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() {
@@ -8680,7 +8842,7 @@ function makeNpxCommand() {
       registry: getKindRegistry(),
       projectDir,
       global: opts.global,
-      driverTarget: opts.target,
+      harness: opts.target,
       onLibraryCollision: warnings.push
     });
     spinner.start(`Installing ${skillRef}`);
@@ -8771,15 +8933,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
+      harness: opts.target
     });
     const entries = await am2.outdated();
     if (entries.length === 0) {
@@ -8884,7 +9046,7 @@ function action2(fn) {
   };
 }
 async function reconcileAndReport(projectDir, plugins, opts = {}) {
-  const { reconcilePlugins } = await import('../plugin-store-G2GWAHSD.js');
+  const { reconcilePlugins } = await import('../plugin-store-MSH6GK6T.js');
   if (plugins.length === 0) {
     logInfo("No plugins declared \u2014 nothing to reconcile.");
     return;
@@ -8899,13 +9061,13 @@ 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-MSH6GK6T.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(", ")})` : ""}`);
@@ -8913,7 +9075,7 @@ async function verifyPluginLoads(projectDir, spec) {
 async function runInstall2(spec, opts) {
   const projectDir = path18__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName, rollbackPluginStore } = await import('../plugin-store-G2GWAHSD.js');
+  const { specName, rollbackPluginStore } = await import('../plugin-store-MSH6GK6T.js');
   const yamlPath = path18__default.join(projectDir, "skaile.yaml");
   if (!existsSync(yamlPath)) {
     throw new Error(`no skaile.yaml in ${projectDir}; run \`skaile init\` first`);
@@ -8942,7 +9104,7 @@ async function runInstall2(spec, opts) {
 async function runRemove(name, opts) {
   const projectDir = path18__default.resolve(opts.projectDir);
   const { WorkspaceYamlEditor: WorkspaceYamlEditor2 } = await import('../core/index.js');
-  const { specName } = await import('../plugin-store-G2GWAHSD.js');
+  const { specName } = await import('../plugin-store-MSH6GK6T.js');
   const yamlPath = path18__default.join(projectDir, "skaile.yaml");
   if (!existsSync(yamlPath)) {
     logInfo(`No plugin matching ${S.cmd(name)}: there is no skaile.yaml in ${projectDir}.`);
@@ -8974,7 +9136,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-MSH6GK6T.js');
       const result = await loadPlugins(projectDir, declared, registry);
       for (const f of result.failed) logWarn(f.error);
     } catch (err) {
@@ -8982,7 +9144,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 +9162,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 +9404,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, path42) {
+  return `${itemId}_${path42}`.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
 }
 function setAtPath(root, segments, value) {
   let node = root;
@@ -9835,17 +9997,17 @@ function resolveSingleShotAgentDir(projectDir, agentDefinition) {
   }
   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 +10025,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,7 +10048,7 @@ 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) {
+  for (const target of SUPPORTED_HARNESSES) {
     const file = path18__default.join(deployedDir("skill", name, target, false, projectDir), "SKILL.md");
     if (fs8__default.existsSync(file)) return file;
   }
@@ -9999,11 +10161,11 @@ 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(
@@ -10012,7 +10174,7 @@ function makeRunCommand() {
   ).option("--skill <name>", "Skill name (for single-shot mode)").action(async (positional, opts) => {
     const projectDir = path18__default.resolve(opts.projectDir);
     await loadDeclaredPlugins(projectDir);
-    const cliDriver = opts.driver;
+    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 +10208,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 +10266,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 +10278,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 +10291,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 +10314,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 +10322,7 @@ function makeRunCommand() {
       await runFlow({
         projectDir,
         flowPath,
-        driver,
+        harness,
         model,
         sessionLabel: opts.label,
         dryRun,
@@ -10168,7 +10330,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);
     }
@@ -10212,7 +10374,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);
     }
@@ -10236,7 +10398,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(
@@ -10253,19 +10415,19 @@ function makeClearCommand() {
   });
 }
 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 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;
@@ -10293,13 +10455,13 @@ function makeReplCommand() {
       projectDir = tmpDir;
       agentCwd = userCwd;
       logOk(`Temporary workspace: ${S.cmd(tmpDir)}`);
-      if (!driverOverride) {
+      if (!harnessOverride) {
         const claudeDir = path18__default.join(os2.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`);
         }
       }
@@ -10307,7 +10469,7 @@ function makeReplCommand() {
     }
     await loadDeclaredPlugins(projectDir);
     const effective = await resolveSettings(projectDir, {
-      driver: driverOverride,
+      harness: harnessOverride,
       model: opts.model
     });
     let effectiveModel = effective.model;
@@ -10317,7 +10479,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 +10491,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 +10555,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 +10571,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 +10618,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-L4POEHNQ.js');
+      const harnessProblem = managedCodex ? null : await checkHarnessSdk(opts.projectDir, opts.harness);
+      if (harnessProblem) {
+        logErr(harnessProblem);
         process.exitCode = 1;
         return;
       }
@@ -10469,7 +10632,7 @@ function makeServeCommand() {
         return;
       }
       const modelProblem = managedCodex ? null : await checkServeModel(opts.projectDir, {
-        driver: opts.driver,
+        harness: opts.harness,
         model: opts.model,
         providers
       });
@@ -10498,7 +10661,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 +10679,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-DE53KG3E.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-MSH6GK6T.js');
     const { pluginRegistry } = await import('../plugin-registry/index.js');
     const result = await ensurePluginsLoaded(projectDir, config.plugins, pluginRegistry);
     if (result.loaded.length > 0) {
@@ -10535,14 +10698,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-DE53KG3E.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-QAV4C3KX.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 +10749,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 +10767,7 @@ async function runCompileTest(opts) {
     } catch {
     }
     try {
-      if (existsSync21(outfile)) unlinkSync(outfile);
+      if (existsSync22(outfile)) unlinkSync(outfile);
     } catch {
     }
   }
@@ -11372,7 +11535,7 @@ function makeShowCommand() {
     const am2 = new AssetManager({
       registry: getKindRegistry(),
       projectDir: path18__default.resolve(opts.projectDir),
-      driverTarget: opts.target
+      harness: opts.target
     });
     if (!kind) {
       showOverview(am2);
@@ -11481,8 +11644,8 @@ 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 { openCatalogSource: openCatalogSource2, LocalCatalogDisabledError: LocalCatalogDisabledError2 } = await import('../open-library-RJGJIW5H.js');
+    const { getKnownKinds: getKnownKinds2 } = await import('../open-registry-3QS3J7KO.js');
     const projectDir = path18__default.resolve(opts.projectDir);
     if (opts.kind && !getKnownKinds2().has(opts.kind)) {
       logErr(
@@ -11540,8 +11703,8 @@ 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-RJGJIW5H.js');
+    const { supportsInstallManifest: supportsInstallManifest2 } = await import('../project-HZW2MZPA.js');
     try {
       parseAssetRef(ref);
     } catch (e) {
@@ -12243,8 +12406,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,10 +12471,10 @@ Advanced:
 `;
   }
 });
-var HARNESS_DEFAULTS = {
-  "claude-code": { driver: "claude-sdk" },
-  omp: { driver: "omp" },
-  codex: { driver: "codex" }
+var INIT_HARNESS_DEFAULTS = {
+  "claude-code": { harness: "claude-sdk" },
+  omp: { harness: "omp" },
+  codex: { harness: "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(
   (projectDir, opts) => runInit(projectDir, opts)
@@ -12319,39 +12482,39 @@ program.command("init [project-dir]").description("Initialize a project director
 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_TARGETS: HARNESS_TARGETS2, SUPPORTED_HARNESSES: SUPPORTED_HARNESSES2 } = 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(", ")}`);
+  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 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)) {
+  if (!existsSync22(skaileDir)) {
     mkdirSync5(path18__default.join(skaileDir, "sessions"), { recursive: true });
     created.push(".skaile/");
   }
   const settingsPath = path18__default.join(skaileDir, "settings.json");
-  if (!existsSync21(settingsPath)) {
+  if (!existsSync22(settingsPath)) {
     writeFileSync7(settingsPath, "{}\n");
     created.push(".skaile/settings.json");
   }
   const wsConfigPath = path18__default.join(resolved, "skaile.yaml");
-  if (!existsSync21(wsConfigPath)) {
+  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))) {
+  for (const dir of new Set(Object.values(HARNESS_TARGETS2[harness].local))) {
     const full = path18__default.join(resolved, dir);
-    if (!existsSync21(full)) {
+    if (!existsSync22(full)) {
       mkdirSync5(full, { recursive: true });
       created.push(`${dir}/`);
     }
@@ -12364,7 +12527,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 +12536,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,7 +12544,7 @@ 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 { existsSync: existsSync22, readFileSync: readFileSync13, writeFileSync: writeFileSync7 } = await import('fs');
   const gitignorePath = path18__default.join(resolved, ".gitignore");
   const entries = [
     "node_modules/",
@@ -12417,7 +12580,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 +12589,7 @@ async function initGitScaffold(resolved, created) {
 `);
     if (!existing) created.push(".gitignore");
   }
-  if (!existsSync21(path18__default.join(resolved, ".git"))) {
+  if (!existsSync22(path18__default.join(resolved, ".git"))) {
     try {
       execSync2("git init", { cwd: resolved, stdio: "pipe" });
       created.push(".git/");
@@ -12456,7 +12619,7 @@ async function bootstrapUserConfig() {
 }
 async function hydrateInitSources(resolved, created) {
   try {
-    const { ensureSourcesCloned } = await import('../ensure-sources-GKVLE6L5.js');
+    const { ensureSourcesCloned } = await import('../ensure-sources-UPTHZKGF.js');
     const hydrate = ensureSourcesCloned(resolved, { quiet: true });
     for (const n of hydrate.cloned) created.push(`~/.skaile/cache/sources/${n}/`);
     if (hydrate.failed.length > 0) {
@@ -12496,7 +12659,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-AGYB4PKR.js');
   await cmdSetup([], { projectDir: process.cwd() });
 });
 program.addCommand(makeInstallCommand());
@@ -12576,7 +12739,7 @@ program.hook("postAction", async (_thisCommand, actionCommand) => {
   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 { refreshPluginSkills } = await import('../claude-code-VJGYBXQR.js');
   try {
     if (await refreshPluginSkills(projectDir)) {
       logInfo(`Updated ${S.cmd(".claude/plugins/skaile/skills")} (the --full plugin copy)`);