norn-cli 4.4.0 → 4.5.1

package/dist/knowledgeIndexWorker.js

@@ -6653,7 +6653,7 @@ function ensureNornCacheDir(rootPath) {
 }
 
 // src/knowledge/knowledgeIndex.ts
-var KNOWLEDGE_SCHEMA_VERSION = 2;
+var KNOWLEDGE_SCHEMA_VERSION = 3;
 var BUSY_TIMEOUT_MS = 5e3;
 var SCHEMA = `
 CREATE TABLE IF NOT EXISTS control (
@@ -6717,6 +6717,7 @@ CREATE TABLE IF NOT EXISTS snapshot_occurrences (
     topic_hash TEXT NOT NULL REFERENCES topics(topic_hash),
     authored_type TEXT,
     authored_use_when TEXT,
+    environment_import TEXT,
     effective_type TEXT NOT NULL,
     start_line INTEGER NOT NULL,
     end_line INTEGER NOT NULL,
@@ -6907,7 +6908,7 @@ var KnowledgeIndex = class {
     fs2.mkdirSync(path2.dirname(this.databasePath), { recursive: true, mode: 448 });
     let database = new import_node_sqlite.DatabaseSync(this.databasePath);
     const version = currentSchemaVersion(database);
-    if (version !== 0 && version !== 1 && version !== KNOWLEDGE_SCHEMA_VERSION) {
+    if (version !== 0 && version !== 1 && version !== 2 && version !== KNOWLEDGE_SCHEMA_VERSION) {
       database.close();
       if (options.rejectUnsupportedSchema) {
         throw new Error(`Unsupported knowledge index schema ${version}; expected ${KNOWLEDGE_SCHEMA_VERSION}.`);
@@ -6918,6 +6919,10 @@ var KnowledgeIndex = class {
     this.database = database;
     this.database.exec(`PRAGMA journal_mode = WAL; PRAGMA busy_timeout = ${BUSY_TIMEOUT_MS}; PRAGMA foreign_keys = ON;`);
     this.database.exec(SCHEMA);
+    const occurrenceColumns = this.database.prepare("PRAGMA table_info(snapshot_occurrences)").all();
+    if (!occurrenceColumns.some((column) => column.name === "environment_import")) {
+      this.database.exec("ALTER TABLE snapshot_occurrences ADD COLUMN environment_import TEXT");
+    }
     this.database.exec(`PRAGMA user_version = ${KNOWLEDGE_SCHEMA_VERSION}`);
     try {
       fs2.chmodSync(this.databasePath, 384);
@@ -6994,6 +6999,9 @@ var KnowledgeIndex = class {
       if (row.authored_use_when) {
         metadata.useWhen = { origin: "authored", value: String(row.authored_use_when) };
       }
+      if (row.environment_import) {
+        metadata.import = { origin: "authored", value: String(row.environment_import) };
+      }
       return {
         declarationId: String(row.declaration_id),
         declarationPath: String(row.declaration_path),
@@ -7252,7 +7260,7 @@ function queryKnowledgeEditorFacts(query, options = {}) {
     for (const context of query.contexts) {
       const rows = index.all(`
                 SELECT topic_hash, domain_path, item_key, ordinal, heading_text, effective_type,
-                       authored_type, authored_use_when
+                       authored_type, authored_use_when, environment_import
                 FROM snapshot_occurrences
                 WHERE snapshot_id = ? AND declaration_id = ? AND source_id = ? AND item_key = ?
                 ORDER BY ordinal
@@ -7265,6 +7273,9 @@ function queryKnowledgeEditorFacts(query, options = {}) {
         if (row.authored_use_when !== null) {
           metadata.useWhen = { origin: "authored", value: String(row.authored_use_when) };
         }
+        if (row.environment_import !== null) {
+          metadata.import = { origin: "authored", value: String(row.environment_import) };
+        }
         const topicHash = String(row.topic_hash);
         const bucket = occurrencesByHash.get(topicHash) ?? [];
         bucket.push({
@@ -8937,10 +8948,26 @@ function parseMetaBlock(lines, startLine, endLine, diagnostics) {
       } else {
         metadata.useWhen = authored(value);
       }
+    } else if (key === "import") {
+      if (metadata.import) {
+        diagnostics.push({
+          lineNumber: startLine + offset,
+          message: "norn:meta declares import more than once.",
+          code: "knowledge-meta-import-duplicate"
+        });
+      } else if (!/^(["']).*\.nornenv\1$/.test(value)) {
+        diagnostics.push({
+          lineNumber: startLine + offset,
+          message: "The environment import must be a quoted .nornenv path.",
+          code: "knowledge-meta-import-invalid"
+        });
+      } else {
+        metadata.import = authored(value.slice(1, -1));
+      }
     } else {
       diagnostics.push({
         lineNumber: startLine + offset,
-        message: `Unknown norn:meta key '${match[1]}'. Expected type or use_when.`,
+        message: `Unknown norn:meta key '${match[1]}'. Expected type, use_when, or import.`,
         code: "knowledge-meta-key-unknown"
       });
     }
@@ -8993,6 +9020,15 @@ function mergeMetadata(target, incoming, lineNumber, diagnostics) {
   } else if (incoming.useWhen) {
     target.useWhen = incoming.useWhen;
   }
+  if (target.import && incoming.import) {
+    diagnostics.push({
+      lineNumber,
+      message: "A topic may have only one environment import.",
+      code: "knowledge-meta-import-duplicate"
+    });
+  } else if (incoming.import) {
+    target.import = incoming.import;
+  }
 }
 function firstContentLine(lines, from, to, metaByLine) {
   for (let line = from; line <= to; line++) {
@@ -9085,6 +9121,14 @@ function extractKnowledgeTopics(text, filePath, headingDepth = 2) {
   const preambleEnd = firstBoundary - 1;
   const preamble = metadataFor(h1Line >= 0 ? h1Line : -1, preambleEnd);
   const preambleMetadata = preamble.metadata;
+  if (preambleMetadata.import && h1Line < 0) {
+    diagnostics.push({
+      lineNumber: preamble.block?.startLine ?? 0,
+      message: "An environment import must sit under a # title.",
+      code: "knowledge-meta-import-placement"
+    });
+    delete preambleMetadata.import;
+  }
   const preambleBody = bodyBetween(lines, 0, preambleEnd, removedLines);
   if (h1Text || preambleBody) {
     topics.push({
@@ -9108,6 +9152,17 @@ function extractKnowledgeTopics(text, filePath, headingDepth = 2) {
     const endLine = (boundaries[index + 1] ?? lines.length) - 1;
     const headingText = headingPattern.exec(lines[headingLine])?.[1].trim() ?? "";
     const { metadata, block } = metadataFor(headingLine, endLine);
+    if (metadata.import) {
+      diagnostics.push({
+        lineNumber: block?.startLine ?? headingLine,
+        message: "An environment import belongs under the # title, not a section.",
+        code: "knowledge-meta-import-placement"
+      });
+      delete metadata.import;
+    }
+    if (preambleMetadata.import) {
+      metadata.import = preambleMetadata.import;
+    }
     const body = bodyBetween(lines, headingLine + 1, endLine, removedLines);
     let excluded = fileExcluded;
     let exclusionReason = fileExcluded ? "file marker <!-- norn:exclude -->" : void 0;
@@ -9160,7 +9215,7 @@ function extractKnowledgeTopics(text, filePath, headingDepth = 2) {
 
 // src/knowledge/knowledgeBuilder.ts
 var DEFAULT_EXTENSIONS = [".md"];
-var KNOWLEDGE_MARKDOWN_ANALYZER_VERSION = 2;
+var KNOWLEDGE_MARKDOWN_ANALYZER_VERSION = 3;
 function normalizeRelative(filePath) {
   return filePath.split(path7.sep).join("/").replace(/^\.\//, "");
 }
@@ -10723,8 +10778,8 @@ function commitSnapshot(index, projectRoot, snapshotId, manifestJson, builtAt, d
                 INSERT OR IGNORE INTO snapshot_occurrences(
                     snapshot_id, declaration_id, declaration_path, declaration_alias, source_id, source_path,
                     item_key, domain_path, heading_text, ordinal, topic_hash, authored_type, authored_use_when,
-                    effective_type, start_line, end_line
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    environment_import, effective_type, start_line, end_line
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             `,
         snapshotId,
         occurrence.declarationId,
@@ -10739,6 +10794,7 @@ function commitSnapshot(index, projectRoot, snapshotId, manifestJson, builtAt, d
         occurrence.topicHash,
         occurrence.metadata.type?.value ?? null,
         occurrence.metadata.useWhen?.value ?? null,
+        occurrence.metadata.import?.value ?? null,
         occurrence.effectiveType,
         occurrence.startLine,
         occurrence.endLine
@@ -10923,7 +10979,8 @@ function buildKnowledgeIndex(startPath, options = {}) {
         ordinal: occurrence.ordinal,
         topicHash: occurrence.topicHash,
         authoredType: occurrence.metadata.type?.value ?? null,
-        authoredUseWhen: occurrence.metadata.useWhen?.value ?? null
+        authoredUseWhen: occurrence.metadata.useWhen?.value ?? null,
+        authoredImport: occurrence.metadata.import?.value ?? null
       })),
       projectInputs: projectInputs.map((input) => ({ path: input.projectPath, contentHash: input.contentHash })).sort((left, right) => left.path.localeCompare(right.path)),
       analyzers: [

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.4.0",
+  "version": "4.5.1",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"
@@ -47,6 +47,7 @@
     "onLanguage:nornenv",
     "onLanguage:nornk8s",
     "onLanguage:nornagent",
+    "onLanguage:markdown",
     "workspaceContains:**/*.nornagent",
     "workspaceContains:**/*.nornai",
     "workspaceContains:**/norn.config.json",
@@ -638,7 +639,7 @@
     "test:regression": "node ./tests/test-scripts/run-regression.js",
     "test:prerelease": "npm test && npm run test:regression",
     "publish:npm": "node -e \"const fs=require('fs');const p=require('./package.json');p.name='norn-cli';fs.writeFileSync('package.json',JSON.stringify(p,null,2)+'\\n')\" && npm publish; exit_code=$?; node -e \"const fs=require('fs');const p=require('./package.json');p.name='norn';fs.writeFileSync('package.json',JSON.stringify(p,null,2)+'\\n')\"; exit $exit_code",
-    "publish:vsce": "vsce publish",
+    "publish:vsce": "node ./scripts/publish-vsce.mjs",
     "publish:all": "npm run publish:npm && npm run publish:vsce"
   },
   "devDependencies": {