@skaile/workspaces 5.19.0 → 6.1.0

package/dist/{chunk-V257LUBM.js → chunk-ZHGKAZJ7.js}

@@ -1,9 +1,9 @@
 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-UQ33Y4DM.js';
+import { SUPPORTED_HARNESSES, globalHarnessRoot } from './chunk-VTETQCR6.js';
+import { decodeSkaileManifest, compositeSha256, listAssetFiles, SKAILE_MANIFEST_FILENAME, sha256Hex } from './chunk-ZBHZLWV3.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';
+import { scanDirectory, parseFrontmatter, parseRequires, dedupeRequirementRefs, fromMcpServerMdContent, withFsDeadline, tryWithFsDeadline, fsDeadlineMs, assetDepRefs, agentYamlRequires } from './chunk-RHN5MRQO.js';
+import { isValidAssetName, slugifyAssetName, depToStr, parseAssetRef, assetRefToStr } from './chunk-LSSYC5IC.js';
 import { isRetentionValue } from './chunk-C3CAXQMA.js';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync, realpathSync, constants, statSync } from 'fs';
 import { readdir, stat, cp, rm, open, readFile } from 'fs/promises';
@@ -35,6 +35,29 @@ var INSTANCE_KEYS = {
   connectors: true,
   budget: true
 };
+var NESTED_KEYS = {
+  model: ["preferred", "fallback"],
+  memory: ["scope"],
+  budget: ["max_turns", "max_tokens"],
+  permissions: ["max_turns", "permission_mode", "deny_write", "deny_read", "network"],
+  "permissions.network": ["mode", "allowlist"]
+};
+function unknownNestedKeys(block, raw, at, subject, code) {
+  const known = NESTED_KEYS[block];
+  if (!known || !isRecord(raw)) return [];
+  const out = Object.keys(raw).filter((key) => !known.includes(key)).map((key) => ({
+    code,
+    severity: "warning",
+    message: `Unknown key "${key}" under \`${at}\` is ignored${subject} \u2014 expected one of: ${known.join(", ")}.`,
+    path: `${at}.${key}`
+  }));
+  if (block === "permissions") {
+    out.push(
+      ...unknownNestedKeys("permissions.network", raw.network, `${at}.network`, subject, code)
+    );
+  }
+  return out;
+}
 function normalizeAgentInstances(raw, diagnostics) {
   if (raw === void 0 || raw === null) return void 0;
   if (!isRecord(raw)) {
@@ -83,6 +106,17 @@ function normalizeInstance(id, raw, ref, diagnostics) {
       path: `${path}.${key}`
     });
   }
+  for (const block of ["model", "permissions", "memory", "budget"]) {
+    diagnostics.push(
+      ...unknownNestedKeys(
+        block,
+        raw[block],
+        `${path}.${block}`,
+        ` on agent instance "${id}"`,
+        "unknown_agent_instance_key"
+      )
+    );
+  }
   if (raw.lifecycle !== void 0) {
     if (AGENT_INSTANCE_LIFECYCLES.includes(raw.lifecycle)) {
       instance.lifecycle = raw.lifecycle;
@@ -269,12 +303,159 @@ var AGENT_BLOCK_KEYS = /* @__PURE__ */ new Set([
 ]);
 function agentBlockKeyDiagnostics(agent) {
   if (!isRecord(agent)) return [];
-  return Object.keys(agent).filter((key) => !AGENT_BLOCK_KEYS.has(key)).map((key) => ({
-    code: "unknown_agent_key",
-    severity: "warning",
-    message: `Unknown key "${key}" under \`agent:\` is ignored \u2014 expected one of: ${[...AGENT_BLOCK_KEYS].filter((k) => k !== "subagents").join(", ")}. Per-instance overrides (lifecycle, model, memory, triggers, connectors, budget) belong under \`agents.<id>\`.`,
-    path: `agent.${key}`
-  }));
+  const nested = unknownNestedKeys(
+    "permissions",
+    agent.permissions,
+    "agent.permissions",
+    "",
+    "unknown_agent_key"
+  );
+  return [
+    ...nested,
+    ...Object.keys(agent).filter((key) => !AGENT_BLOCK_KEYS.has(key)).map((key) => ({
+      code: "unknown_agent_key",
+      severity: "warning",
+      message: `Unknown key "${key}" under \`agent:\` is ignored \u2014 expected one of: ${[...AGENT_BLOCK_KEYS].filter((k) => k !== "subagents").join(", ")}. Per-instance overrides (lifecycle, model, memory, triggers, connectors, budget) belong under \`agents.<id>\`.`,
+      path: `agent.${key}`
+    }))
+  ];
+}
+
+// core/src/config-key-diagnostics.ts
+var TOP_LEVEL_KEYS = [
+  "name",
+  "description",
+  "agent-config",
+  "agent_config",
+  "agentConfig",
+  "roles",
+  "startup",
+  "dependencies",
+  "global_harnesses",
+  "global-harnesses",
+  "global_backends",
+  "global-backends",
+  "plugins",
+  "sources",
+  "stores",
+  "overrides",
+  "connectors",
+  "mcp_servers",
+  "deploy",
+  "mounts",
+  "agent",
+  "agents",
+  "workspace",
+  "secrets",
+  "telemetry",
+  "compaction",
+  "model_endpoint",
+  "patches",
+  "logging",
+  // Rejected with their own message before this check runs; listed so it never says more.
+  "repositories",
+  "ai_resources",
+  "aiResources",
+  "providers",
+  "base_url",
+  "credential",
+  "headers",
+  "query_params",
+  "transport",
+  "publisher",
+  "version",
+  "assets"
+];
+var PROFILE_KEYS = [
+  "agent",
+  "harness",
+  "driver",
+  "model",
+  "thinking",
+  "effort",
+  "max_turns",
+  "skills_dir",
+  "agents_dir",
+  "prompts_dir",
+  // Rejected with their own message (`skaile migrate providers`).
+  "provider",
+  "cloud",
+  "cloud_config",
+  "providers",
+  "base_url",
+  "credential",
+  "headers",
+  "query_params",
+  "transport"
+];
+var SUGGESTED_PROFILE_KEYS = PROFILE_KEYS.filter((k) => k !== "driver");
+var SUGGESTED_TOP_LEVEL_KEYS = TOP_LEVEL_KEYS.filter(
+  (k) => !["agent_config", "agentConfig", "global-harnesses", "global_backends"].includes(k)
+);
+function editDistance(a, b) {
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  for (let i = 1; i <= a.length; i++) {
+    const cur = [i];
+    for (let j = 1; j <= b.length; j++) {
+      cur[j] = Math.min(
+        (prev[j] ?? 0) + 1,
+        (cur[j - 1] ?? 0) + 1,
+        (prev[j - 1] ?? 0) + (a[i - 1] === b[j - 1] ? 0 : 1)
+      );
+    }
+    prev = cur;
+  }
+  return prev[b.length] ?? 0;
+}
+function nearestKey(typed, known) {
+  const t = typed.toLowerCase().replace(/_/g, "-");
+  let best;
+  for (const key of known) {
+    const k = key.toLowerCase().replace(/_/g, "-");
+    const d = editDistance(t, k);
+    if (!best || d < best.d) best = { key, d };
+  }
+  const limit = Math.max(2, Math.floor(t.length / 3));
+  if (!best || best.d > limit) return void 0;
+  return best.key === "driver" ? "harness" : best.key;
+}
+function agentConfigBlock(raw) {
+  for (const key of ["agent-config", "agent_config", "agentConfig"]) {
+    if (raw[key] !== void 0) return { key, block: raw[key] };
+  }
+  return void 0;
+}
+function unknownConfigKeyDiagnostics(raw) {
+  const out = [];
+  for (const key of Object.keys(raw)) {
+    if (TOP_LEVEL_KEYS.includes(key)) continue;
+    const near = nearestKey(key, SUGGESTED_TOP_LEVEL_KEYS);
+    out.push({
+      code: "unknown_config_key",
+      severity: "warning",
+      message: `Unknown key "${key}" is ignored${near ? `. Did you mean "${near}"?` : `. Known keys: ${SUGGESTED_TOP_LEVEL_KEYS.join(", ")}.`}`,
+      path: key
+    });
+  }
+  const found = agentConfigBlock(raw);
+  if (found && isRecord(found.block)) {
+    const block = found.block;
+    const flat = PROFILE_KEYS.some((k) => typeof block[k] === "string");
+    const profiles = flat ? [["default", block, found.key]] : Object.entries(block).filter((e) => isRecord(e[1])).map(([name, p]) => [name, p, `${found.key}.${name}`]);
+    for (const [, profile, where] of profiles) {
+      for (const key of Object.keys(profile)) {
+        if (PROFILE_KEYS.includes(key)) continue;
+        const near = nearestKey(key, SUGGESTED_PROFILE_KEYS);
+        out.push({
+          code: "unknown_profile_key",
+          severity: "warning",
+          message: `Unknown key "${key}" under \`${where}\` is ignored${near ? `. Did you mean "${near}"?` : `. Known keys: ${SUGGESTED_PROFILE_KEYS.slice(0, 7).join(", ")}.`}`,
+          path: `${where}.${key}`
+        });
+      }
+    }
+  }
+  return out;
 }
 function fileSha256(p) {
   return sha256Hex(readFileSync(p));
@@ -1556,7 +1737,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);
@@ -1669,12 +1850,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",
@@ -1755,12 +1938,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)) {
@@ -1818,7 +2026,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."
     );
   }
 }
@@ -1982,7 +2190,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)];
   }
@@ -2000,6 +2208,7 @@ function normalizeConfigInternal(raw) {
   assertNoLegacyTopLevelKeys(raw);
   if (raw.name) config.name = String(raw.name);
   if (raw.description) config.description = String(raw.description);
+  diagnostics.push(...unknownConfigKeyDiagnostics(raw));
   normalizeAgentConfigSection(raw, config, diagnostics);
   normalizeRolesSection(raw, config, diagnostics);
   if (Array.isArray(raw.startup)) {
@@ -2081,12 +2290,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`
       });
     }
   }
@@ -2410,6 +2619,16 @@ function foldInstanceEnv(decl, instancePath, name) {
     );
   }
 }
+function mcpDeclarationFromMdContent(mdContent, name) {
+  const { body } = parseFrontmatter(mdContent);
+  const entry = fromMcpServerMdContent(mdContent, name, `${name}/MCP.md`);
+  const decl = mcpDeclFromCatalogEntry(entry);
+  if (!decl) return null;
+  decl.id = entry.name || name;
+  const trimmedBody = body.trim();
+  if (trimmedBody.length > 0) decl.instructions = trimmedBody;
+  return decl;
+}
 function deriveSingleMaterializedMcpDeclaration(subDir, name) {
   const mdPath = join(subDir, "MCP.md");
   if (!existsSync(mdPath)) return null;
@@ -2722,11 +2941,13 @@ function collectMcpRefStrings(dependencies) {
   return mcpRefStrings;
 }
 var MCP_LOOKUP_KINDS = /* @__PURE__ */ new Set(["mcp-server"]);
-async function buildMcpProvenanceIndex(sources, projectDir) {
-  return sources.length > 0 ? await buildProvenanceIndex(buildSourceClones(sources), {
+async function buildMcpProvenanceIndex(sources, projectDir, mcpRefStrings) {
+  return sources.length > 0 && mcpRefStrings.length > 0 ? await buildProvenanceIndex(buildSourceClones(sources), {
     projectDir,
     // Only `mcp-server` refs are looked up in this index.
-    knownKinds: MCP_LOOKUP_KINDS
+    knownKinds: MCP_LOOKUP_KINDS,
+    onSourceError: () => {
+    }
   }) : /* @__PURE__ */ new Map();
 }
 function upsertCatalogMcpDecls(mcpRefStrings, provenanceIndex, upsert) {
@@ -2761,7 +2982,11 @@ async function loadMcpServerDeclarations(projectDir, opts) {
     ...config.dependencies ?? [],
     ...opts?.alsoDeclared ?? []
   ]);
-  const provenanceIndex = await buildMcpProvenanceIndex(config.sources ?? [], projectDir);
+  const provenanceIndex = await buildMcpProvenanceIndex(
+    config.sources ?? [],
+    projectDir,
+    mcpRefStrings
+  );
   const byId = /* @__PURE__ */ new Map();
   const order = [];
   const upsert = (decl) => {
@@ -2926,6 +3151,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, 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-V257LUBM.js.map
-//# sourceMappingURL=chunk-V257LUBM.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, mcpDeclarationFromMdContent, 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-ZHGKAZJ7.js.map
+//# sourceMappingURL=chunk-ZHGKAZJ7.js.map