@skaile/workspaces 0.19.0 → 0.21.0

package/dist/{chunk-N2C3A5PS.js → chunk-5QNQLSBW.js}

@@ -1,4 +1,4 @@
-import { scanDirectory } from './chunk-FRPKLIEZ.js';
+import { scanDirectory, fromMcpServerMd } from './chunk-FRPKLIEZ.js';
 import { parseAssetRef } from './chunk-37JKX6D7.js';
 import { mkdirSync, existsSync, readFileSync, writeFileSync, lstatSync, symlinkSync, rmSync, readdirSync } from 'fs';
 import { homedir } from 'os';
@@ -379,7 +379,7 @@ function saveSkWorkspaceConfig(dir, config, name) {
   if (!existsSync(resolvedDir)) {
     mkdirSync(resolvedDir, { recursive: true });
   }
-  writeFileSync(filePath, stringify(config, { lineWidth: 120 }));
+  writeFileSync(filePath, encodeSkaileYaml(config));
   return filePath;
 }
 function listSkWorkspaceConfigs(dir) {
@@ -521,21 +521,107 @@ function mergeSkWorkspaceConfigs(base, overlay) {
     sources: dedupeByKey([...base.sources ?? [], ...overlay.sources ?? []], "name")
   };
 }
+var KNOWN_DRIVERS = ["omp", "claude-sdk", "codex"];
+var KNOWN_PROVIDERS = [
+  "anthropic",
+  "openai",
+  "google",
+  "mistral",
+  "groq",
+  "openrouter",
+  "deepseek",
+  "xai",
+  "together",
+  "fireworks",
+  "deepgram",
+  "elevenlabs"
+];
+var KNOWN_ACCESS = ["read-only", "read-write"];
+var AGENT_PROFILE_FIELDS = [
+  "driver",
+  "provider",
+  "model",
+  "thinking",
+  "effort",
+  "skills_dir",
+  "agents_dir",
+  "prompts_dir"
+];
+function normalizeAgentConfig(raw) {
+  const looksFlat = AGENT_PROFILE_FIELDS.some((f) => typeof raw[f] === "string");
+  return looksFlat ? { profiles: { default: raw }, wrappedFlat: true } : { profiles: raw, wrappedFlat: false };
+}
 function normalizeConfig(raw) {
+  return normalizeConfigInternal(raw).config;
+}
+function normalizeConfigInternal(raw) {
   const config = {};
+  const diagnostics = [];
   if (raw.name) config.name = String(raw.name);
   if (raw.description) config.description = String(raw.description);
-  const agentConfigRaw = raw["agent-config"] ?? raw.agent_config;
+  let agentConfigRaw;
+  let agentConfigKey;
+  if (raw["agent-config"] !== void 0) {
+    agentConfigRaw = raw["agent-config"];
+    agentConfigKey = "agent-config";
+  } else if (raw.agent_config !== void 0) {
+    agentConfigRaw = raw.agent_config;
+    agentConfigKey = "agent_config";
+  } else if (raw.agentConfig !== void 0) {
+    agentConfigRaw = raw.agentConfig;
+    agentConfigKey = "agentConfig";
+  }
   if (agentConfigRaw && typeof agentConfigRaw === "object" && !Array.isArray(agentConfigRaw)) {
-    config.agent_config = agentConfigRaw;
+    if (agentConfigKey === "agentConfig") {
+      diagnostics.push({
+        code: "legacy_key_camelcase",
+        severity: "warning",
+        message: 'Non-canonical key "agentConfig" \u2014 use "agent-config".',
+        path: "agentConfig"
+      });
+    }
+    const { profiles, wrappedFlat } = normalizeAgentConfig(
+      agentConfigRaw
+    );
+    if (wrappedFlat) {
+      diagnostics.push({
+        code: "legacy_agent_config_flat",
+        severity: "warning",
+        message: 'Flat agent-config block wrapped as the "default" profile \u2014 nest fields under "default:".',
+        path: agentConfigKey
+      });
+    }
+    config.agent_config = profiles;
   }
   if (Array.isArray(raw.startup)) {
     config.startup = raw.startup;
   }
-  const aiResRaw = raw.ai_resources;
+  let aiResRaw;
+  let aiResKey;
+  if (raw.ai_resources !== void 0) {
+    aiResRaw = raw.ai_resources;
+    aiResKey = "ai_resources";
+  } else if (raw.aiResources !== void 0) {
+    aiResRaw = raw.aiResources;
+    aiResKey = "aiResources";
+  }
+  if (aiResKey === "aiResources") {
+    diagnostics.push({
+      code: "legacy_key_camelcase",
+      severity: "warning",
+      message: 'Non-canonical key "aiResources" \u2014 use "ai_resources".',
+      path: "aiResources"
+    });
+  }
   if (Array.isArray(aiResRaw)) {
     config.ai_resources = aiResRaw;
   } else if (aiResRaw && typeof aiResRaw === "object") {
+    diagnostics.push({
+      code: "legacy_ai_resources_object",
+      severity: "warning",
+      message: "Legacy ai_resources object form ({sources, requires}) \u2014 use an array of {name, path, dependencies}.",
+      path: aiResKey
+    });
     const old = aiResRaw;
     const sources = Array.isArray(old.sources) ? old.sources : [];
     const requires = Array.isArray(old.requires) ? old.requires.filter(Boolean) : [];
@@ -565,6 +651,12 @@ function normalizeConfig(raw) {
   if (raw.secrets && typeof raw.secrets === "object") {
     config.secrets = raw.secrets;
   }
+  if (raw.compaction && typeof raw.compaction === "object" && !Array.isArray(raw.compaction)) {
+    config.compaction = raw.compaction;
+  }
+  if (raw.patches && typeof raw.patches === "object" && !Array.isArray(raw.patches)) {
+    config.patches = raw.patches;
+  }
   if (Array.isArray(raw.dependencies)) {
     config.dependencies = raw.dependencies.filter((d) => typeof d === "string");
   }
@@ -585,7 +677,110 @@ function normalizeConfig(raw) {
   if (raw.telemetry && typeof raw.telemetry === "object" && !Array.isArray(raw.telemetry)) {
     config.telemetry = raw.telemetry;
   }
-  return config;
+  return { config, diagnostics };
+}
+function decodeSkaileYaml(text) {
+  let parsed;
+  try {
+    parsed = parse(text) ?? {};
+  } catch (err) {
+    return {
+      config: {},
+      diagnostics: [
+        {
+          code: "yaml_syntax",
+          severity: "error",
+          message: `Invalid YAML: ${err instanceof Error ? err.message : String(err)}`
+        }
+      ]
+    };
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return {
+      config: {},
+      diagnostics: [
+        {
+          code: "non_object_root",
+          severity: "error",
+          message: "skaile.yaml must be a mapping at the top level."
+        }
+      ]
+    };
+  }
+  const result = normalizeConfigInternal(parsed);
+  validateConfigValues(result.config, result.diagnostics);
+  return result;
+}
+function encodeSkaileYaml(config) {
+  return stringify(toCanonicalObject(config), { lineWidth: 120 });
+}
+function validateConfigValues(config, diagnostics) {
+  for (const [profile, p] of Object.entries(config.agent_config ?? {})) {
+    if (p?.driver && !KNOWN_DRIVERS.includes(p.driver)) {
+      diagnostics.push({
+        code: "unknown_driver",
+        severity: "warning",
+        message: `Unknown driver "${p.driver}" \u2014 expected one of: ${KNOWN_DRIVERS.join(", ")}.`,
+        path: `agent-config.${profile}.driver`
+      });
+    }
+    if (p?.provider && !KNOWN_PROVIDERS.includes(p.provider)) {
+      diagnostics.push({
+        code: "unknown_provider",
+        severity: "warning",
+        message: `Unknown provider "${p.provider}" \u2014 expected one of: ${KNOWN_PROVIDERS.join(", ")}.`,
+        path: `agent-config.${profile}.provider`
+      });
+    }
+  }
+  const checkAccess = (access, path) => {
+    if (access && !KNOWN_ACCESS.includes(access)) {
+      diagnostics.push({
+        code: "unknown_access",
+        severity: "warning",
+        message: `Unknown access "${access}" \u2014 expected "read-only" or "read-write".`,
+        path
+      });
+    }
+  };
+  for (const c of config.connectors ?? []) checkAccess(c.access, `connectors.${c.id}.access`);
+  for (const m of config.mounts ?? []) checkAccess(m.access, `mounts.${m.id}.access`);
+}
+var CANONICAL_KEY_ORDER = [
+  "name",
+  "description",
+  "agent_config",
+  "dependencies",
+  "sources",
+  "startup",
+  "ai_resources",
+  "connectors",
+  "mcp_servers",
+  "mounts",
+  "agent",
+  "workspace",
+  "secrets",
+  "telemetry",
+  "compaction",
+  "patches",
+  "repositories"
+];
+var CONFIG_KEY_TO_YAML = {
+  agent_config: "agent-config"
+};
+function toCanonicalObject(config) {
+  const out = {};
+  const emit = (key) => {
+    const value = config[key];
+    if (value === void 0) return;
+    out[CONFIG_KEY_TO_YAML[key] ?? key] = value;
+  };
+  for (const key of CANONICAL_KEY_ORDER) emit(key);
+  for (const key of Object.keys(config)) {
+    if (CANONICAL_KEY_ORDER.includes(key)) continue;
+    emit(key);
+  }
+  return out;
 }
 function parseConfigFile(filePath, name) {
   let raw;
@@ -594,14 +789,9 @@ function parseConfigFile(filePath, name) {
   } catch {
     return null;
   }
-  let parsed;
-  try {
-    parsed = parse(raw) ?? {};
-  } catch {
-    return null;
-  }
-  const config = normalizeConfig(parsed);
-  return { path: filePath, name, config };
+  const { config, diagnostics } = decodeSkaileYaml(raw);
+  if (diagnostics.some((d) => d.code === "yaml_syntax")) return null;
+  return { path: filePath, name, config, diagnostics };
 }
 function dedupe(arr) {
   return [...new Set(arr)];
@@ -675,9 +865,60 @@ function mergeMcpDeclarations(base, overlay) {
     recipe: overlay.recipe ?? base.recipe
   };
 }
+function loadMaterializedMcpDeclarations(projectDir) {
+  const dir = join(projectDir, ".skaile/assets/mcp-server");
+  if (!existsSync(dir)) return [];
+  const result = [];
+  let subdirs;
+  try {
+    subdirs = readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return [];
+  }
+  for (const name of subdirs) {
+    const subDir = join(dir, name);
+    const mdPath = join(subDir, "MCP.md");
+    if (!existsSync(mdPath)) continue;
+    try {
+      const entry = fromMcpServerMd(mdPath, name);
+      const decl = mcpDeclFromCatalogEntry(entry);
+      if (!decl) continue;
+      decl.id = entry.name || name;
+      const instancePath = join(subDir, ".instance.json");
+      if (existsSync(instancePath)) {
+        try {
+          const instance = JSON.parse(readFileSync(instancePath, "utf8"));
+          const env = { ...decl.env ?? {} };
+          if (instance.config && typeof instance.config === "object") {
+            for (const [k, v] of Object.entries(instance.config)) {
+              if (typeof v === "string") env[k] = v;
+            }
+          }
+          if (instance.resolvedSecrets && typeof instance.resolvedSecrets === "object") {
+            for (const [k, v] of Object.entries(instance.resolvedSecrets)) {
+              if (typeof v === "string") env[k] = v;
+            }
+          }
+          if (Object.keys(env).length > 0) decl.env = env;
+        } catch (err) {
+          console.warn(
+            `[workspace-config] loadMaterializedMcpDeclarations: ignoring malformed ".instance.json" for "${name}": ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+      result.push(decl);
+    } catch (err) {
+      console.warn(
+        `[workspace-config] loadMaterializedMcpDeclarations: failed to load "${mdPath}": ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return result;
+}
 function loadMcpServerDeclarations(projectDir) {
   const config = resolveSkWorkspaceConfig(projectDir);
   const explicit = config.mcp_servers ?? [];
+  const materialized = loadMaterializedMcpDeclarations(projectDir);
   const mcpRefStrings = [];
   for (const dep of config.dependencies ?? []) {
     const ref = parseAssetRef(dep);
@@ -689,7 +930,6 @@ function loadMcpServerDeclarations(projectDir) {
       if (ref.kind === "mcp-server") mcpRefStrings.push(dep);
     }
   }
-  if (mcpRefStrings.length === 0) return explicit;
   const repositories = config.repositories ?? {};
   const allRepos = { ...repositories };
   for (const res of config.ai_resources ?? []) {
@@ -702,8 +942,17 @@ function loadMcpServerDeclarations(projectDir) {
     }
   }
   const reposDir = getGlobalCacheDir();
-  const explicitById = new Map(explicit.map((d) => [d.id, d]));
-  const result = [];
+  const byId = /* @__PURE__ */ new Map();
+  const order = [];
+  const upsert = (decl) => {
+    const existing = byId.get(decl.id);
+    if (existing) {
+      byId.set(decl.id, mergeMcpDeclarations(existing, decl));
+    } else {
+      byId.set(decl.id, decl);
+      order.push(decl.id);
+    }
+  };
   const seen = /* @__PURE__ */ new Set();
   for (const refStr of mcpRefStrings) {
     const ref = parseAssetRef(refStr);
@@ -713,18 +962,15 @@ function loadMcpServerDeclarations(projectDir) {
     if (!entry) continue;
     const catalogDecl = mcpDeclFromCatalogEntry(entry);
     if (!catalogDecl) continue;
-    const override = explicitById.get(entry.name);
-    if (override) {
-      explicitById.delete(entry.name);
-      result.push(mergeMcpDeclarations(catalogDecl, override));
-    } else {
-      result.push(catalogDecl);
-    }
+    upsert(catalogDecl);
   }
-  for (const decl of explicitById.values()) {
-    result.push(decl);
+  for (const decl of materialized) {
+    upsert(decl);
   }
-  return result;
+  for (const decl of explicit) {
+    upsert(decl);
+  }
+  return order.map((id) => byId.get(id));
 }
 function findAiAssetsDir(from) {
   let dir = resolve(from);
@@ -758,6 +1004,6 @@ function resolveAgentDir(projectDir) {
   return resolve(projectDir, definition);
 }
 
-export { COMPACTION_DEFAULTS, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, checkRepoStatus, checkoutPin, cloneRepo, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeSkWorkspaceConfigs, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, unlinkRepo, validateAssetRecipeAttr, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
-//# sourceMappingURL=chunk-N2C3A5PS.js.map
-//# sourceMappingURL=chunk-N2C3A5PS.js.map
+export { COMPACTION_DEFAULTS, SKAILE_YAML_DEFAULT, SKAILE_YAML_SUFFIX, SK_WORKSPACE_DEFAULT_NAME, SK_WORKSPACE_SUFFIX, checkRepoStatus, checkoutPin, cloneRepo, decodeSkaileYaml, encodeSkaileYaml, ensureRepo, findWorkspaceRoot, getGlobalCacheDir, getRepoCommit, isWorkspaceConfigFilename, linkRepo, listSkWorkspaceConfigs, loadMcpServerDeclarations, loadSkWorkspaceConfig, mergeSkWorkspaceConfigs, normalizeConfig, pullRepo, readLinks, resolveAgentDir, resolveAll, resolveAsset, resolveSkWorkspaceConfig, saveSkWorkspaceConfig, scanRepo, unlinkRepo, validateAssetRecipeAttr, workspaceConfigFilename, workspaceNameFromFilename, writeLinks };
+//# sourceMappingURL=chunk-5QNQLSBW.js.map
+//# sourceMappingURL=chunk-5QNQLSBW.js.map