@skaile/workspaces 5.18.1 → 6.0.0

package/dist/{chunk-2NOLF7B2.js → chunk-OHNKYHRR.js}

@@ -1,6 +1,6 @@
 import { globalCacheRoot, globalSkaileDir, mergeLegacyEntriesInto, mergeLegacyEntriesKeyed } from './chunk-L5VSIPQD.js';
-import { SUPPORTED_DRIVER_TARGETS, globalHarnessRoot } from './chunk-IG5LZ3WU.js';
-import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-CKICWXMU.js';
+import { SUPPORTED_HARNESSES, globalHarnessRoot } from './chunk-VTETQCR6.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-UQ33Y4DM.js';
 import { readPluginGroupings } from './chunk-RVRB27AN.js';
 import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires } from './chunk-GOCWM7FN.js';
 import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-WDXZA7QW.js';
@@ -1365,6 +1365,12 @@ var SourceEntryError = class extends Error {
     this.name = "SourceEntryError";
   }
 };
+var LegacyKeyError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "LegacyKeyError";
+  }
+};
 function parseSourceEntries(raw) {
   return raw.map((item, i) => {
     const s = item && typeof item === "object" && !Array.isArray(item) ? item : void 0;
@@ -1511,7 +1517,7 @@ function configParseError(label, d) {
   return new Error(`${label} \u2014 parse error: ${reason}`);
 }
 function rejectedKeyError(d) {
-  return d.code === "invalid_source_entry" ? new SourceEntryError(d.message) : new Error(d.message);
+  return d.code === "invalid_source_entry" ? new SourceEntryError(d.message) : new LegacyKeyError(d.message);
 }
 function resolveSkWorkspaceConfig(projectDir, opts) {
   const name = opts?.name ?? SK_WORKSPACE_DEFAULT_NAME;
@@ -1550,7 +1556,7 @@ function resolveGlobalSkWorkspaceConfig() {
 function resolveGlobalHarnesses() {
   const explicit = resolveGlobalSkWorkspaceConfig().global_harnesses;
   if (explicit && explicit.length > 0) return [...new Set(explicit)];
-  return SUPPORTED_DRIVER_TARGETS.filter((t) => existsSync(globalHarnessRoot(t)));
+  return SUPPORTED_HARNESSES.filter((t) => existsSync(globalHarnessRoot(t)));
 }
 function findWorkspaceRoot(startDir) {
   let dir = resolve(startDir);
@@ -1663,12 +1669,14 @@ function mergeWorkspaceConfig(base, overlay) {
     container: overlay?.container ?? base?.container
   };
 }
-var KNOWN_DRIVERS = ["omp", "claude-sdk", "codex"];
+var KNOWN_HARNESSES = ["omp", "claude-sdk", "codex"];
 var KNOWN_ACCESS = ["read-only", "read-write"];
 var KNOWN_LAUNCHERS = ["recipe", "package-runner", "path"];
 var KNOWN_TRANSPORTS = ["stdio", "sse", "http"];
 var AGENT_PROFILE_FIELDS = [
+  "harness",
   "driver",
+  // pre-6.0 spelling of `harness`, still read (see applyDriverAlias)
   "provider",
   "cloud",
   "model",
@@ -1749,12 +1757,37 @@ function normalizeAgentConfigSection(raw, config, diagnostics) {
       path: agentConfigKey
     });
   }
+  const aliased = {};
   for (const [name, profile] of Object.entries(profiles)) {
     if (profile && typeof profile === "object" && !Array.isArray(profile)) {
       assertNoProviderDefinitionKeys(name, profile);
+      aliased[name] = applyDriverAlias(name, profile, diagnostics);
+    } else {
+      aliased[name] = profile;
     }
   }
-  config.agent_config = profiles;
+  config.agent_config = aliased;
+}
+function applyDriverAlias(name, profile, diagnostics) {
+  if (!("driver" in profile)) return profile;
+  const { driver, ...rest } = profile;
+  const path = `agent-config.${name}`;
+  if (rest.harness !== void 0) {
+    diagnostics.push({
+      code: "harness_key_conflict",
+      severity: "error",
+      message: `\`harness\` and \`driver\` both set in ${path}; keep \`harness\``,
+      path: `${path}.driver`
+    });
+    return rest;
+  }
+  diagnostics.push({
+    code: "deprecated_harness_key",
+    severity: "warning",
+    message: `\`${path}.driver\` is deprecated; rename it to \`harness\` (run \`skaile migrate harness\`)`,
+    path: `${path}.driver`
+  });
+  return typeof driver === "string" ? { ...rest, harness: driver } : rest;
 }
 function normalizeRolesSection(raw, config, diagnostics) {
   if (!raw.roles || typeof raw.roles !== "object" || Array.isArray(raw.roles)) {
@@ -1812,7 +1845,7 @@ function assertNoLegacyTopLevelKeys(raw) {
   }
   if (isRecord(raw.agent) && raw.agent.subagents !== void 0) {
     throw new Error(
-      "skaile.yaml: `agent.subagents:` was removed \u2014 inline prompt-only subagents had no driver consumer. Declare each one as an agent asset (`.skaile/agents/<name>/agent.yaml`) and bind it under the root `agents:` map (`agents.<name>: { ref: ./.skaile/agents/<name>, lifecycle: role }`). See MIGRATION.md."
+      "skaile.yaml: `agent.subagents:` was removed \u2014 inline prompt-only subagents had no harness consumer. Declare each one as an agent asset (`.skaile/agents/<name>/agent.yaml`) and bind it under the root `agents:` map (`agents.<name>: { ref: ./.skaile/agents/<name>, lifecycle: role }`). See MIGRATION.md."
     );
   }
 }
@@ -1976,7 +2009,7 @@ function normalizeDependencySection(raw, config) {
   const rawHarnesses = raw.global_harnesses ?? raw["global-harnesses"] ?? raw.global_backends ?? raw["global-backends"];
   if (Array.isArray(rawHarnesses)) {
     const valid = rawHarnesses.filter(
-      (b) => SUPPORTED_DRIVER_TARGETS.includes(b)
+      (b) => SUPPORTED_HARNESSES.includes(b)
     );
     if (valid.length > 0) config.global_harnesses = [...new Set(valid)];
   }
@@ -2075,12 +2108,12 @@ function symlinkEscapeOfProject(dir, projectDir) {
 }
 function validateConfigValues(config, diagnostics) {
   for (const [profile, p] of Object.entries(config.agent_config ?? {})) {
-    if (p?.driver && !KNOWN_DRIVERS.includes(p.driver)) {
+    if (p?.harness && !KNOWN_HARNESSES.includes(p.harness)) {
       diagnostics.push({
-        code: "unknown_driver",
+        code: "unknown_harness",
         severity: "warning",
-        message: `Unknown driver "${p.driver}" \u2014 expected one of: ${KNOWN_DRIVERS.join(", ")}.`,
-        path: `agent-config.${profile}.driver`
+        message: `Unknown harness "${p.harness}" \u2014 expected one of: ${KNOWN_HARNESSES.join(", ")}.`,
+        path: `agent-config.${profile}.harness`
       });
     }
   }
@@ -2747,11 +2780,14 @@ function upsertGatedMcpDecls(decls, explicit, mcpRefStrings, upsert) {
     if (declaredNames.has(decl.id) || declaredNames.has(unscopedTail(decl.id))) upsert(decl);
   }
 }
-async function loadMcpServerDeclarations(projectDir) {
+async function loadMcpServerDeclarations(projectDir, opts) {
   const config = resolveSkWorkspaceConfig(projectDir);
   const explicit = config.mcp_servers ?? [];
   const materialized = loadMaterializedMcpDeclarations(projectDir);
-  const mcpRefStrings = collectMcpRefStrings(config.dependencies);
+  const mcpRefStrings = collectMcpRefStrings([
+    ...config.dependencies ?? [],
+    ...opts?.alsoDeclared ?? []
+  ]);
   const provenanceIndex = await buildMcpProvenanceIndex(config.sources ?? [], projectDir);
   const byId = /* @__PURE__ */ new Map();
   const order = [];
@@ -2917,6 +2953,6 @@ function resolveAgentDefinitionDir(projectDir, definition) {
   return resolve(projectDir, definition);
 }
 
-export { AGENT_INSTANCE_ID_PATTERN, AGENT_INSTANCE_LIFECYCLES, AGENT_INSTANCE_MEMORY_SCOPES, AGENT_INSTANCE_TRIGGER_KINDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, MAX_PRESET_DEPTH, PresetDepthError, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SKILL_ALLOWLIST_FILE, SKILL_ALLOWLIST_VERSION, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, STAGED_SKILL_MARKER, SourceEntryError, UnknownAssetKindError, agentBlockKeyDiagnostics, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isCommitOnRemote, isInsideProject, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, parseSourceEntries, priorSourceCacheKeys, priorStoreManifestSlugs, pullRepo, pullRepoResult, readLinks, readSkillAllowList, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, slashGitSourceCacheKey, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, symlinkEscapeOfProject, unlinkRepo, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-2NOLF7B2.js.map
-//# sourceMappingURL=chunk-2NOLF7B2.js.map
+export { AGENT_INSTANCE_ID_PATTERN, AGENT_INSTANCE_LIFECYCLES, AGENT_INSTANCE_MEMORY_SCOPES, AGENT_INSTANCE_TRIGGER_KINDS, AGENT_PROFILE_FIELDS, AgentRefResolutionError, COMPACTION_DEFAULTS, CanonicalRefConflictError, DEFAULT_AGENT_INSTANCE_ID, DEFAULT_RECIPE_ATTR, LegacyKeyError, MAX_PRESET_DEPTH, PresetDepthError, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SKILL_ALLOWLIST_FILE, SKILL_ALLOWLIST_VERSION, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, STAGED_SKILL_MARKER, SourceEntryError, UnknownAssetKindError, agentBlockKeyDiagnostics, agentInstanceDiagnostics, agentSourceCacheDir, attachToBranch, buildProvenanceIndex, checkRepoStatus, checkoutPin, cloneRepo, coerceVersion, decodeSkaileYaml, deriveSingleMaterializedMcpDeclaration, effectiveAgentInstances, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isCommitOnRemote, isInsideProject, isStagedSkillMarkerFor, isWorkspaceConfigFilename, legacySourceCacheKey, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, localConnectorMountDir, matchPin, mergeAgentInstances, mergeAgentPermissions, mergeSkWorkspaceConfigs, normalizeAgentInstances, normalizeConfig, parseSourceEntries, priorSourceCacheKeys, priorStoreManifestSlugs, pullRepo, pullRepoResult, readLinks, readSkillAllowList, resolveAgentDefinitionDir, resolveAgentDir, resolveAll, resolveAsset, resolveCompactionThresholdPercent, resolveGlobalHarnesses, resolveGlobalSkWorkspaceConfig, resolveSkWorkspaceConfig, resolveSourcePublisher, saveSkWorkspaceConfig, scanRepo, slashGitSourceCacheKey, sourceCacheKey, sourceShortName, stageMaterializedSkills, stagedSkillMarkerState, storeManifestSlug, symlinkEscapeOfProject, unlinkRepo, unstageSkill, validateAssetRecipeAttr, validateAssetRecipeFlake, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-OHNKYHRR.js.map
+//# sourceMappingURL=chunk-OHNKYHRR.js.map