@skaile/workspaces 0.30.1 → 0.31.0

package/dist/{chunk-XOAF5QAE.js → chunk-IENYMRZ6.js}

@@ -1,17 +1,17 @@
-import { WorkspacePlugin } from './chunk-5MJJYIL4.js';
+import { WorkspacePlugin } from './chunk-ZM7UOJR2.js';
 import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { PROTOCOL_VERSION } from './chunk-TDSRLMDB.js';
-import { EventNormalizer } from './chunk-5XAQDOMU.js';
+import { EventNormalizer } from './chunk-7FLLPKX3.js';
 import { classifyClaudeSdkError } from './chunk-NGJ6E344.js';
-import { createDriver } from './chunk-IZIFMNTI.js';
+import { createDriver } from './chunk-OEXA7BBK.js';
 import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-FRRTUVUM.js';
-import { loadConnectorDeclarations, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-DAI754GK.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-QF6LBS2C.js';
+import { loadConnectorDeclarations, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-VO7QQ76S.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-DEYYRFQU.js';
-import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-YBJLYT4S.js';
-import { resolveRuntimeAssets } from './chunk-2VKVWN5E.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr } from './chunk-5DQOZFWJ.js';
+import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-G247J4MC.js';
+import { resolveRuntimeAssets } from './chunk-CBIPUBUS.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr } from './chunk-DKAV43NI.js';
 import { parseAssetRef } from './chunk-LFDZYCEO.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
 import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-JB35MVBN.js';
@@ -774,55 +774,73 @@ function loadRecipeMap() {
   recipeMapMemo = { path: path5, mtimeMs, map };
   return map;
 }
-function resolveRecipePath(flakeRef, attr, cache) {
-  const key = `${flakeRef}#${attr}`;
+var MapRecipeProducer = class {
+  constructor(load = loadRecipeMap) {
+    this.load = load;
+  }
+  load;
+  kind = "map";
+  resolve(_ref, attr) {
+    const map = this.load();
+    if (!map) return null;
+    const hit = attr.split(".").reduce(
+      (o, k) => o && typeof o === "object" ? o[k] : void 0,
+      map
+    );
+    return typeof hit === "string" && hit.startsWith("/nix/store/") ? hit : null;
+  }
+};
+var NixRecipeProducer = class {
+  kind = "nix";
+  resolve(ref, attr) {
+    const result = spawnSync("nix", ["path-info", "--offline", `${ref}#${attr}`], {
+      encoding: "utf8"
+    });
+    if (result.error) throw new RecipeUnavailableError(ref, attr, result.error);
+    if (result.status !== 0) {
+      throw new RecipeUnavailableError(
+        ref,
+        attr,
+        new Error(`nix path-info exited ${result.status}: ${result.stderr.trim()}`)
+      );
+    }
+    const outPath = result.stdout.trim().split("\n")[0];
+    if (!outPath?.startsWith("/nix/store/")) {
+      throw new RecipeUnavailableError(ref, attr, new Error(`Unexpected output: ${result.stdout}`));
+    }
+    return outPath;
+  }
+};
+function defaultRecipeProducers() {
+  return [new MapRecipeProducer(), new NixRecipeProducer()];
+}
+function resolveViaProducers(ref, attr, cache, producers = defaultRecipeProducers()) {
+  const key = `${ref}#${attr}`;
   const cached = cache.get(key);
   if (cached) return cached;
   try {
     validateAssetRecipeAttr(attr);
   } catch (err) {
     throw new RecipeUnavailableError(
-      flakeRef,
+      ref,
       attr,
       err instanceof Error ? err : new Error(String(err))
     );
   }
   const log = createLogger({ kind: "mcp", subkind: "recipe-resolve" });
-  log.debug("resolving recipe", { flakeRef, attr });
-  const map = loadRecipeMap();
-  if (map) {
-    const hit = attr.split(".").reduce(
-      (o, k) => o && typeof o === "object" ? o[k] : void 0,
-      map
-    );
-    if (typeof hit === "string" && hit.startsWith("/nix/store/")) {
-      cache.set(key, hit);
-      log.info("resolved recipe (map)", { flakeRef, attr, outPath: hit });
-      return hit;
+  log.debug("resolving recipe", { flakeRef: ref, attr });
+  for (const producer of producers) {
+    const out = producer.resolve(ref, attr);
+    if (out) {
+      cache.set(key, out);
+      log.info("resolved recipe", { flakeRef: ref, attr, outPath: out, producer: producer.kind });
+      return out;
     }
   }
-  const result = spawnSync("nix", ["path-info", "--offline", `${flakeRef}#${attr}`], {
-    encoding: "utf8"
-  });
-  if (result.error) throw new RecipeUnavailableError(flakeRef, attr, result.error);
-  if (result.status !== 0) {
-    throw new RecipeUnavailableError(
-      flakeRef,
-      attr,
-      new Error(`nix path-info exited ${result.status}: ${result.stderr.trim()}`)
-    );
-  }
-  const outPath = result.stdout.trim().split("\n")[0];
-  if (!outPath?.startsWith("/nix/store/")) {
-    throw new RecipeUnavailableError(
-      flakeRef,
-      attr,
-      new Error(`Unexpected output: ${result.stdout}`)
-    );
-  }
-  cache.set(key, outPath);
-  log.info("resolved recipe", { flakeRef, attr, outPath });
-  return outPath;
+  throw new RecipeUnavailableError(ref, attr, new Error("no producer resolved the recipe"));
+}
+function resolveRecipePath(flakeRef, attr, cache) {
+  return resolveViaProducers(flakeRef, attr, cache);
 }
 var RECIPE_MARKER = /\$\{recipe:([a-z0-9_-]+)(?::([a-z0-9_/.-]+))?\}/g;
 function substituteRecipeTemplating(value, recipeOutPaths) {
@@ -893,10 +911,17 @@ function resolveExternalMcpDeclarations(projectDir, sessionId) {
       mcpLog.warn("MCP server skipped: reserved id", { id: decl.id });
       continue;
     }
-    if (!decl.recipe) {
+    const wantsRecipe = decl.launcher === "recipe" || decl.launcher == null && decl.recipe != null;
+    if (!wantsRecipe) {
       resolved.push(decl);
       continue;
     }
+    if (!decl.recipe) {
+      mcpLog.warn("MCP server skipped: launcher 'recipe' without a recipe binding", {
+        id: decl.id
+      });
+      continue;
+    }
     const resolvedDecl = resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache);
     if (resolvedDecl) resolved.push(resolvedDecl);
   }
@@ -905,6 +930,7 @@ function resolveExternalMcpDeclarations(projectDir, sessionId) {
 function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
   const recipe = decl.recipe;
   const recipeLogKey = recipe.flake ? { flake: recipe.flake } : { attr: recipe.attr };
+  const recipeLog = createLogger({ kind: "mcp", subkind: decl.id, instance: "recipe-resolve" });
   try {
     const recipeKey = recipe.flake ? `mcps.${decl.id}` : recipe.attr ?? `mcps.${decl.id}`;
     const outPath = resolveRecipePath(nixFlakeRef, recipeKey, recipeCache);
@@ -918,11 +944,6 @@ function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
       args: resolvedArgs,
       env: resolvedEnv
     };
-    const recipeLog = createLogger({
-      kind: "mcp",
-      subkind: decl.id,
-      instance: "recipe-resolve"
-    });
     warnUnresolvedRecipeMarkers(recipeLog, decl.id, resolvedCommand, resolvedArgs, resolvedEnv);
     const missingPaths = validateSubstitutedPaths(resolvedCommand, resolvedArgs);
     if (missingPaths.length > 0) {
@@ -936,11 +957,11 @@ function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
     recipeLog.info("recipe substitution complete", { ...recipeLogKey, outPath });
     return resolvedDecl;
   } catch (err) {
-    createLogger({ kind: "mcp", subkind: decl.id, instance: "recipe-resolve" }).error(
-      "MCP server skipped: recipe resolution failed",
-      err,
-      { id: decl.id, ...recipeLogKey, flakeRef: nixFlakeRef }
-    );
+    recipeLog.error("MCP server skipped: recipe resolution failed", err, {
+      id: decl.id,
+      ...recipeLogKey,
+      flakeRef: nixFlakeRef
+    });
     return void 0;
   }
 }
@@ -4826,5 +4847,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildContextSection, buildEnvironmentSection, builtinCapabilities, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, installPreInitRingSink, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, newSession, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, touchSession, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-XOAF5QAE.js.map
-//# sourceMappingURL=chunk-XOAF5QAE.js.map
+//# sourceMappingURL=chunk-IENYMRZ6.js.map
+//# sourceMappingURL=chunk-IENYMRZ6.js.map