norn-cli 4.0.0 → 4.0.1

package/dist/cli.js

@@ -158674,15 +158674,6 @@ var MCP_DIRECTIVES = {
 };
 var MCP_DIRECTIVE_NAMES = Object.keys(MCP_DIRECTIVES);
 var MCP_SESSION_SCOPES = ["run", "agent", "call"];
-function splitCommandParts(value) {
-  const parts = [];
-  const pattern = /"([^"]*)"|'([^']*)'|(\S+)/g;
-  let match2;
-  while ((match2 = pattern.exec(value)) !== null) {
-    parts.push(match2[1] ?? match2[2] ?? match2[3]);
-  }
-  return parts;
-}
 function splitNamedDirective(value) {
   const match2 = value.trim().match(/^(\S+)\s+(.+)$/);
   if (!match2) {
@@ -159007,7 +158998,7 @@ end mcp
           mcp.invalid = true;
         }
       }
-      if (resolvedTransport === "stdio" && mcp.commandTemplates.length === 0) {
+      if (resolvedTransport === "stdio" && !mcp.commandTemplate) {
         errors.push(parseError(
           mcp.lineNumber,
           `MCP server '${mcp.alias}' uses transport stdio and requires a command directive.`,
@@ -159060,7 +159051,7 @@ end mcp
     mcpServers.set(mcp.alias.toLowerCase(), {
       alias: mcp.alias,
       transportTemplate: transport.value,
-      commandTemplates: mcp.commandTemplates,
+      ...mcp.commandTemplate ? { commandTemplate: mcp.commandTemplate } : {},
       ...mcp.values.cwd ? { cwdTemplate: mcp.values.cwd.value } : {},
       ...mcp.envTemplates.length > 0 ? { envTemplates: mcp.envTemplates } : {},
       ...mcp.values.url ? { urlTemplate: mcp.values.url.value } : {},
@@ -159396,7 +159387,7 @@ end mcp
           lineNumber: index
         };
         if (directive === "command") {
-          pendingMcp.commandTemplates = splitCommandParts(rawValue);
+          pendingMcp.commandTemplate = rawValue;
         }
         continue;
       }
@@ -159531,7 +159522,6 @@ end model`,
           alias,
           lineNumber: index,
           values: {},
-          commandTemplates: [],
           envTemplates: [],
           headerTemplates: [],
           sawDirective: false,
@@ -160471,7 +160461,7 @@ function extractImports(text) {
 }
 function sameMcpServerDeclaration(left, right) {
   const named = (entries) => (entries ?? []).map((entry) => `${entry.name}=${entry.valueTemplate}`).join("\0");
-  return left.transportTemplate === right.transportTemplate && left.commandTemplates.join("\0") === right.commandTemplates.join("\0") && left.cwdTemplate === right.cwdTemplate && left.urlTemplate === right.urlTemplate && left.timeoutMs === right.timeoutMs && left.session === right.session && named(left.envTemplates) === named(right.envTemplates) && named(left.headerTemplates) === named(right.headerTemplates);
+  return left.transportTemplate === right.transportTemplate && left.commandTemplate === right.commandTemplate && left.cwdTemplate === right.cwdTemplate && left.urlTemplate === right.urlTemplate && left.timeoutMs === right.timeoutMs && left.session === right.session && named(left.envTemplates) === named(right.envTemplates) && named(left.headerTemplates) === named(right.headerTemplates);
 }
 async function resolveImports(text, baseDir, readFile4, alreadyImported = /* @__PURE__ */ new Set(), importStack = /* @__PURE__ */ new Set(), sourceFilePath = path4.resolve(baseDir, "__norn_root__.norn"), sqlImportedPathsBySource = /* @__PURE__ */ new Map(), sqlOperationsBySource = /* @__PURE__ */ new Map(), agentImportedPathsBySource = /* @__PURE__ */ new Map(), agentDefinitionsBySource = /* @__PURE__ */ new Map(), mcpServersBySource = /* @__PURE__ */ new Map()) {
   const imports = extractImports(text);
@@ -184779,6 +184769,15 @@ function resolveTemplateString(value, envVariables) {
   const scopedVariables = attachEnvironmentScope({}, envVariables);
   return substituteVariables(value, scopedVariables);
 }
+function splitCommandLine(value) {
+  const parts = [];
+  const pattern = /"([^"]*)"|'([^']*)'|(\S+)/g;
+  let match2;
+  while ((match2 = pattern.exec(value)) !== null) {
+    parts.push(match2[1] ?? match2[2] ?? match2[3]);
+  }
+  return parts;
+}
 function resolveCommandParts2(originPath, command, envVariables) {
   const configDir = path10.dirname(originPath);
   return command.map((part, index) => {
@@ -184907,9 +184906,16 @@ function resolveNamedTemplates(entries, declaration, directive, envVariables) {
 function resolveMcpServerDeclaration(declaration, envVariables) {
   const transport = resolveTemplate(declaration.transportTemplate, declaration, "transport", envVariables).toLowerCase();
   if (transport === "stdio") {
-    const command = declaration.commandTemplates.map(
-      (part) => resolveTemplate(part, declaration, "command", envVariables)
+    const resolvedCommand = resolveTemplate(
+      declaration.commandTemplate ?? "",
+      declaration,
+      "command",
+      envVariables
     );
+    const command = splitCommandLine(resolvedCommand);
+    if (command.length === 0) {
+      throw new Error(`MCP server '${declaration.alias}' resolved to an empty command.`);
+    }
     return {
       transport: "stdio",
       // Reuse the config path's own resolution so a bare name stays a PATH lookup and a

package/dist/knowledgeIndexWorker.js

@@ -7612,15 +7612,6 @@ var MCP_DIRECTIVES = {
 };
 var MCP_DIRECTIVE_NAMES = Object.keys(MCP_DIRECTIVES);
 var MCP_SESSION_SCOPES = ["run", "agent", "call"];
-function splitCommandParts(value) {
-  const parts = [];
-  const pattern = /"([^"]*)"|'([^']*)'|(\S+)/g;
-  let match;
-  while ((match = pattern.exec(value)) !== null) {
-    parts.push(match[1] ?? match[2] ?? match[3]);
-  }
-  return parts;
-}
 function splitNamedDirective(value) {
   const match = value.trim().match(/^(\S+)\s+(.+)$/);
   if (!match) {
@@ -7945,7 +7936,7 @@ end mcp
           mcp.invalid = true;
         }
       }
-      if (resolvedTransport === "stdio" && mcp.commandTemplates.length === 0) {
+      if (resolvedTransport === "stdio" && !mcp.commandTemplate) {
         errors.push(parseError(
           mcp.lineNumber,
           `MCP server '${mcp.alias}' uses transport stdio and requires a command directive.`,
@@ -7998,7 +7989,7 @@ end mcp
     mcpServers.set(mcp.alias.toLowerCase(), {
       alias: mcp.alias,
       transportTemplate: transport.value,
-      commandTemplates: mcp.commandTemplates,
+      ...mcp.commandTemplate ? { commandTemplate: mcp.commandTemplate } : {},
       ...mcp.values.cwd ? { cwdTemplate: mcp.values.cwd.value } : {},
       ...mcp.envTemplates.length > 0 ? { envTemplates: mcp.envTemplates } : {},
       ...mcp.values.url ? { urlTemplate: mcp.values.url.value } : {},
@@ -8334,7 +8325,7 @@ end mcp
           lineNumber: index
         };
         if (directive === "command") {
-          pendingMcp.commandTemplates = splitCommandParts(rawValue);
+          pendingMcp.commandTemplate = rawValue;
         }
         continue;
       }
@@ -8469,7 +8460,6 @@ end model`,
           alias,
           lineNumber: index,
           values: {},
-          commandTemplates: [],
           envTemplates: [],
           headerTemplates: [],
           sawDirective: false,

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn",
   "description": "Version-controlled API and database tests. Author in VS Code, then run the same files from the CLI and CI.",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"