norn-cli 4.6.2 → 5.0.0

package/dist/knowledgeIndexWorker.js

@@ -7888,6 +7888,7 @@ function parseNornAgentFile(content, sourcePath) {
   const models = /* @__PURE__ */ new Map();
   const mcpServers = /* @__PURE__ */ new Map();
   const knowledgeBases = /* @__PURE__ */ new Map();
+  const databases = /* @__PURE__ */ new Map();
   const agents = [];
   const errors = [];
   const agentNames = /* @__PURE__ */ new Map();
@@ -7895,8 +7896,10 @@ function parseNornAgentFile(content, sourcePath) {
   let pendingModel;
   let pendingMcp;
   let pendingKnowledge;
+  let pendingDatabase;
   let sawAgent = false;
   let sawMcpDeclaration = false;
+  let sawDatabaseDeclaration = false;
   const reportBareMcpAlias = (mcp) => {
     errors.push(parseError(
       mcp.lineNumber,
@@ -8051,6 +8054,36 @@ end mcp
       sourcePath
     });
   };
+  const finishDatabase = (lineNumber) => {
+    if (!pendingDatabase) {
+      errors.push(parseError(lineNumber, "Unexpected 'end database' without a matching database block.", "agent-database-end-unexpected"));
+      return;
+    }
+    const database = pendingDatabase;
+    pendingDatabase = void 0;
+    for (const required of ["adapter", "connectionString"]) {
+      if (!database.values[required]) {
+        errors.push(parseError(database.lineNumber, `Database '${database.alias}' requires ${required}.`, `agent-database-${required}-missing`));
+        database.invalid = true;
+      }
+    }
+    const access = database.values.access?.value.toLowerCase() ?? "read";
+    if (access !== "read" && access !== "full") {
+      errors.push(parseError(database.values.access.lineNumber, `Database '${database.alias}' access must be read or full.`, "agent-database-access-invalid"));
+      database.invalid = true;
+    }
+    if (!database.invalid) {
+      databases.set(database.alias.toLowerCase(), {
+        alias: database.alias,
+        adapter: database.values.adapter.value,
+        connectionStringTemplate: database.values.connectionString.value,
+        access,
+        lineNumber: database.lineNumber,
+        endLineNumber: lineNumber,
+        sourcePath
+      });
+    }
+  };
   const finishModel = (lineNumber) => {
     if (!pendingModel) {
       errors.push(parseError(lineNumber, "Unexpected 'end model' without a matching model block.", "agent-model-end-unexpected"));
@@ -8185,8 +8218,10 @@ end mcp
         ...pending.grantedMcpServers.length > 0 ? { grantedMcpServers: pending.grantedMcpServers } : {},
         callableAgents: pending.callableAgents,
         ...pending.knowledge.length > 0 ? { knowledge: pending.knowledge } : {},
+        ...pending.databases.length > 0 ? { grantedDatabases: pending.databases } : {},
         mcpServers,
         knowledgeBases,
+        databases,
         accepts: pending.accepts,
         returns: pending.returns,
         maxTokens: pending.maxTokens?.value,
@@ -8207,6 +8242,44 @@ end mcp
     const rawLine = lines[index];
     const withoutComment = stripInlineComment(rawLine);
     const trimmed = withoutComment.trim();
+    if (pendingDatabase) {
+      if (!trimmed) {
+        continue;
+      }
+      if (/^end\s+database$/i.test(trimmed)) {
+        finishDatabase(index);
+        continue;
+      }
+      const directive = trimmed.match(/^(adapter|connectionString|access)\s+(.+)$/i);
+      if (directive) {
+        const key = ["adapter", "connectionString", "access"].find((value) => value.toLowerCase() === directive[1].toLowerCase());
+        if (pendingDatabase.values[key]) {
+          errors.push(parseError(index, `Database '${pendingDatabase.alias}' declares ${key} more than once.`, "agent-database-directive-duplicate"));
+          pendingDatabase.invalid = true;
+        } else {
+          pendingDatabase.values[key] = { value: normalizeDirectiveValue(directive[2]), lineNumber: index };
+        }
+        continue;
+      }
+      if (/^command\b/i.test(trimmed)) {
+        errors.push(parseError(
+          index,
+          `Database '${pendingDatabase.alias}' uses a script path in adapter; remove command and set adapter to ./path/to/adapter.js.`,
+          "agent-database-command-removed"
+        ));
+        pendingDatabase.invalid = true;
+        continue;
+      }
+      if (/^(agent|model|mcp|knowledge|database)\b/i.test(trimmed)) {
+        errors.push(parseError(pendingDatabase.lineNumber, `Database '${pendingDatabase.alias}' is missing 'end database'.`, "agent-database-end-missing"));
+        pendingDatabase = void 0;
+        index--;
+        continue;
+      }
+      errors.push(parseError(index, `Unknown directive in database '${pendingDatabase.alias}': '${trimmed}'.`, "agent-database-directive-unknown"));
+      pendingDatabase.invalid = true;
+      continue;
+    }
     if (pendingKnowledge) {
       if (!trimmed) {
         continue;
@@ -8259,7 +8332,7 @@ end mcp
         }
         continue;
       }
-      if (/^(agent|model|mcp|knowledge)\b/i.test(trimmed)) {
+      if (/^(agent|model|mcp|knowledge|database)\b/i.test(trimmed)) {
         errors.push(parseError(
           pendingKnowledge.lineNumber,
           `Knowledge '${pendingKnowledge.alias}' is missing 'end knowledge'.`,
@@ -8357,7 +8430,7 @@ end mcp
       }
       if (/^mcp\b/i.test(trimmed)) {
         errors.push(parseError(index, `Nested mcp blocks are not allowed (inside '${pendingMcp.alias}').`, "agent-mcp-nested"));
-      } else if (/^(agent|model|knowledge)\b/i.test(trimmed)) {
+      } else if (/^(agent|model|knowledge|database)\b/i.test(trimmed)) {
         errors.push(parseError(pendingMcp.lineNumber, `MCP server '${pendingMcp.alias}' is missing 'end mcp'.`, "agent-mcp-unterminated"));
         pendingMcp = void 0;
         index--;
@@ -8408,7 +8481,7 @@ end mcp
       }
       if (/^model\b/i.test(trimmed)) {
         errors.push(parseError(index, `Nested model blocks are not allowed (inside '${pendingModel.alias}').`, "agent-model-nested"));
-      } else if (/^(agent|knowledge)\b/i.test(trimmed)) {
+      } else if (/^(agent|knowledge|database|mcp)\b/i.test(trimmed)) {
         errors.push(parseError(pendingModel.lineNumber, `Model '${pendingModel.alias}' is missing 'end model'.`, "agent-model-end-missing"));
         pendingModel = void 0;
         index--;
@@ -8517,6 +8590,20 @@ end model`,
         };
         continue;
       }
+      const databaseMatch = trimmed.match(new RegExp(`^database\\s+(${IDENTIFIER})$`, "i"));
+      if (databaseMatch) {
+        sawDatabaseDeclaration = true;
+        const alias = databaseMatch[1];
+        const invalid = sawAgent || databases.has(alias.toLowerCase());
+        if (sawAgent) {
+          errors.push(parseError(index, "Database blocks must be declared before the first agent block.", "agent-database-not-at-top"));
+        }
+        if (databases.has(alias.toLowerCase())) {
+          errors.push(parseError(index, `Duplicate database alias '${alias}'.`, "agent-database-duplicate"));
+        }
+        pendingDatabase = { alias, lineNumber: index, values: {}, invalid };
+        continue;
+      }
       if (/^end\s+mcp$/i.test(trimmed)) {
         finishMcp(index);
         continue;
@@ -8525,6 +8612,10 @@ end model`,
         finishKnowledge(index);
         continue;
       }
+      if (/^end\s+database$/i.test(trimmed)) {
+        finishDatabase(index);
+        continue;
+      }
       const agentMatch = trimmed.match(new RegExp(`^agent\\s+(${IDENTIFIER})$`, "i"));
       if (agentMatch) {
         sawAgent = true;
@@ -8544,6 +8635,7 @@ end model`,
           tools: [],
           grantedMcpServers: [],
           knowledge: [],
+          databases: [],
           callableAgents: [],
           invalid
         };
@@ -8559,6 +8651,8 @@ end model`,
         errors.push(parseError(index, "Malformed MCP declaration. Expected: mcp <Alias>, then transport and its directives, then end mcp.", "agent-mcp-malformed"));
       } else if (/^knowledge\b/i.test(trimmed)) {
         errors.push(parseError(index, "Malformed knowledge declaration. Expected: knowledge <Alias>, then source/exclude directives, then end knowledge.", "agent-knowledge-malformed"));
+      } else if (/^database\b/i.test(trimmed)) {
+        errors.push(parseError(index, "Malformed database declaration. Expected: database <Alias>, then adapter/connectionString/access directives, then end database.", "agent-database-malformed"));
       } else if (/^agent\b/i.test(trimmed)) {
         errors.push(parseError(index, "Malformed agent declaration. Expected: agent <Name>.", "agent-declaration-malformed"));
       } else {
@@ -8632,6 +8726,27 @@ end model`,
       }
       continue;
     }
+    const databaseGrantMatch = trimmed.match(/^database(?:\s+(.*))?$/i);
+    if (databaseGrantMatch) {
+      const aliases = (databaseGrantMatch[1] ?? "").split(",").map((value) => value.trim());
+      if (aliases.some((alias) => !new RegExp(`^${IDENTIFIER}$`).test(alias))) {
+        errors.push(parseError(index, `Invalid database grant '${trimmed}'. Expected: database <Alias>[, <Alias>\u2026].`, "agent-database-grant-invalid"));
+        pending.invalid = true;
+        continue;
+      }
+      for (const alias of aliases) {
+        if (pending.databases.some((grant) => grant.alias.toLowerCase() === alias.toLowerCase())) {
+          errors.push(parseError(index, `Agent '${pending.name}' grants database '${alias}' more than once.`, "agent-database-grant-duplicate"));
+          pending.invalid = true;
+        } else if (!databases.has(alias.toLowerCase())) {
+          errors.push(parseError(index, `Unknown database alias '${alias}' in agent '${pending.name}'.`, "agent-database-alias-unknown"));
+          pending.invalid = true;
+        } else {
+          pending.databases.push({ alias, lineNumber: index });
+        }
+      }
+      continue;
+    }
     const returnsMatch = trimmed.match(/^returns\s+(.+)$/i);
     if (returnsMatch) {
       if (pending.returns) {
@@ -8830,7 +8945,7 @@ end model`,
       errors.push(parseError(index, 'Malformed describe block. Expected: describe "..." (multi-line allowed) or describe file <path>.', "agent-describe-malformed"));
     } else if (/^system\b/i.test(trimmed)) {
       errors.push(parseError(index, 'Malformed system prompt. Expected: system "..." (multi-line allowed) or system file <path>.', "agent-system-malformed"));
-    } else if (new RegExp(`^(accepts|returns|tools|agents|model|knowledge|${Object.keys(LIMIT_DIRECTIVES).join("|")})\\b`, "i").test(trimmed)) {
+    } else if (new RegExp(`^(accepts|returns|tools|agents|model|knowledge|database|${Object.keys(LIMIT_DIRECTIVES).join("|")})\\b`, "i").test(trimmed)) {
       errors.push(parseError(index, `Malformed agent directive: '${trimmed}'.`, "agent-directive-malformed"));
     } else if (/^agent\b/i.test(trimmed)) {
       errors.push(parseError(index, `Nested agent blocks are not allowed (inside '${pending.name}').`, "agent-nested"));
@@ -8859,10 +8974,13 @@ end model`,
       "agent-knowledge-end-missing"
     ));
   }
-  if (!sawMcpDeclaration && models.size === 0) {
+  if (pendingDatabase) {
+    errors.push(parseError(pendingDatabase.lineNumber, `Database '${pendingDatabase.alias}' is missing 'end database'.`, "agent-database-end-missing"));
+  }
+  if (!sawMcpDeclaration && !sawDatabaseDeclaration && models.size === 0) {
     errors.push(parseError(0, "An agent sidecar must declare at least one model block.", "agent-model-required"));
   }
-  if (!sawMcpDeclaration && agentNames.size === 0) {
+  if (!sawMcpDeclaration && !sawDatabaseDeclaration && agentNames.size === 0) {
     errors.push(parseError(0, "An agent sidecar must declare at least one agent.", "agent-required"));
   }
   const localScope = new Map(agents.map((agent) => [agent.name.toLowerCase(), agent]));
@@ -8870,7 +8988,7 @@ end model`,
     const { sourcePath: _sourcePath, ...parseValidationError } = validationError;
     errors.push(parseValidationError);
   }
-  return { sourcePath, models, mcpServers, knowledgeBases, agents, errors };
+  return { sourcePath, models, mcpServers, knowledgeBases, databases, agents, errors };
 }
 
 // src/knowledge/knowledgeBuilder.ts
@@ -9741,7 +9859,7 @@ function isNornProjectConfig(value) {
   if (value.version !== 1) {
     return false;
   }
-  return isNornHttpConfig(value.http) && isKnownSection(value.sql) && isKnownSection(value.mcp) && isNornContractsConfig(value.contracts) && isNornAgentsConfig(value.agents) && isNornKnowledgeConfig(value.knowledge);
+  return value.sql === void 0 && isNornHttpConfig(value.http) && isKnownSection(value.mcp) && isNornContractsConfig(value.contracts) && isNornAgentsConfig(value.agents) && isNornKnowledgeConfig(value.knowledge);
 }
 function loadNornConfig(startPath) {
   const filePath = findNearestConfigFile(startPath, NORN_CONFIG_FILENAME);

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn",
   "description": "Build version-controlled agentic flows in VS Code and run them from the CLI or CI.",
-  "version": "4.6.2",
+  "version": "5.0.0",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"

package/schemas/norn.config.schema.json

@@ -18,29 +18,6 @@
         }
       }
     },
-    {
-      "label": "Norn config with SQL",
-      "description": "Create a Norn config with an editable SQL connection and custom adapter example.",
-      "body": {
-        "version": 1,
-        "sql": {
-          "connections": {
-            "${1:appDb}": {
-              "adapter": "${2:postgres}",
-              "profile": "${3:appDb}"
-            }
-          },
-          "adapters": {
-            "${4:custom-adapter}": {
-              "command": [
-                "${5:node}",
-                "${6:./tools/adapters/my-adapter.js}"
-              ]
-            }
-          }
-        }
-      }
-    },
     {
       "label": "Norn config with MCP",
       "description": "Create a Norn config with editable local and remote MCP server examples.",
@@ -128,35 +105,6 @@
         }
       ]
     },
-    "sql": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/sqlSection"
-        }
-      ],
-      "defaultSnippets": [
-        {
-          "label": "SQL section definition",
-          "description": "Insert editable SQL connections and custom adapter config.",
-          "body": {
-            "connections": {
-              "${1:appDb}": {
-                "adapter": "${2:postgres}",
-                "profile": "${3:appDb}"
-              }
-            },
-            "adapters": {
-              "${4:custom-adapter}": {
-                "command": [
-                  "${5:node}",
-                  "${6:./tools/adapters/my-adapter.js}"
-                ]
-              }
-            }
-          }
-        }
-      ]
-    },
     "mcp": {
       "allOf": [
         {
@@ -332,80 +280,6 @@
         }
       }
     },
-    "sqlSection": {
-      "type": "object",
-      "additionalProperties": false,
-      "description": "SQL connections and optional custom adapter commands available to .nornsql files.",
-      "anyOf": [
-        {
-          "required": [
-            "connections"
-          ]
-        },
-        {
-          "required": [
-            "adapters"
-          ]
-        }
-      ],
-      "properties": {
-        "_comment": {
-          "$ref": "#/definitions/comment",
-          "description": "Optional human-readable guidance ignored by Norn at runtime."
-        },
-        "connections": {
-          "type": "object",
-          "description": "Named SQL connection aliases referenced from .nornsql files.",
-          "minProperties": 1,
-          "additionalProperties": {
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-              "adapter",
-              "profile"
-            ],
-            "properties": {
-              "adapter": {
-                "type": "string",
-                "description": "Built-in adapter ID or a custom adapter key from sql.adapters.",
-                "examples": [
-                  "postgres",
-                  "sqlserver",
-                  "sqlserver-windows"
-                ]
-              },
-              "profile": {
-                "type": "string",
-                "description": "Connection profile prefix resolved from .nornenv connectionString entries."
-              }
-            }
-          }
-        },
-        "adapters": {
-          "type": "object",
-          "description": "Custom SQL adapter commands. Built-in adapters do not need entries here.",
-          "minProperties": 1,
-          "additionalProperties": {
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-              "command"
-            ],
-            "properties": {
-              "command": {
-                "type": "array",
-                "description": "Command and arguments used to start the custom SQL adapter. Relative paths resolve from norn.config.json.",
-                "minItems": 1,
-                "items": {
-                  "type": "string",
-                  "minLength": 1
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "contractsSection": {
       "type": "object",
       "additionalProperties": false,