@aikdna/kdna-cli 0.20.3 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikdna/kdna-cli",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "description": "KDNA CLI — runtime control plane for verifying, installing, loading, comparing, publishing, and auditing existing .kdna assets.",
   "type": "commonjs",
   "bin": {

package/src/cmds/domain.js

@@ -493,7 +493,11 @@ function inspectKdnaFile(filePath, jsonMode = false) {
   const isZip = head[0] === 0x50 && head[1] === 0x4b;
   if (!isZip) error('Invalid .kdna asset: expected ZIP container');
 
-  const { listContainerEntries, readContainerJson } = require('../package-store');
+  const {
+    listContainerEntries,
+    readContainerJson,
+    readContainerDataMap,
+  } = require('../package-store');
   const { licenseDecryptOptionsForManifest } = require('./license');
   const presentFiles = listContainerEntries(abs).filter(
     (f) => (f.startsWith('KDNA_') && f.endsWith('.json')) || f === 'README.md' || f === 'LICENSE',
@@ -513,8 +517,20 @@ function inspectKdnaFile(filePath, jsonMode = false) {
   let core = null;
   let patterns = null;
   try {
-    core = decryptError ? null : readContainerJson(abs, 'KDNA_Core.json', decryptOptions);
-    patterns = decryptError ? null : readContainerJson(abs, 'KDNA_Patterns.json', decryptOptions);
+    if (decryptError) {
+      /* skip */
+    }
+    // v2 container: use readDataMap
+    else if (listContainerEntries(abs).includes('payload.kdnab')) {
+      const dm = readContainerDataMap(abs, decryptOptions);
+      core = dm['KDNA_Core.json'] || null;
+      patterns = dm['KDNA_Patterns.json'] || null;
+    }
+    // v1 container: read individual files
+    else {
+      core = readContainerJson(abs, 'KDNA_Core.json', decryptOptions);
+      patterns = readContainerJson(abs, 'KDNA_Patterns.json', decryptOptions);
+    }
   } catch (e) {
     if (!encryptedEntries.length) error(`Cannot inspect .kdna asset: ${e.message}`);
     decryptError = e.message;

package/src/package-store.js

@@ -11,25 +11,6 @@ if (typeof core.createKdnaAssetReader !== 'function') {
 
 const assetReader = core.createKdnaAssetReader();
 
-const V1_ENTRIES = [
-  'KDNA_Core.json',
-  'KDNA_Patterns.json',
-  'KDNA_Scenarios.json',
-  'KDNA_Cases.json',
-  'KDNA_Reasoning.json',
-  'KDNA_Evolution.json',
-];
-
-function validateContainerV2(asset, assetPath) {
-  const hasPayload = asset.entries.has('payload.kdnab');
-  if (hasPayload) return; // v2, OK
-  const hasV1 = V1_ENTRIES.some((e) => asset.entries.has(e));
-  if (!hasV1) return; // neither v1 nor v2, probably empty — let caller decide
-  const found = V1_ENTRIES.filter((e) => asset.entries.has(e));
-  const msg = `ERR_LEGACY_PLAINTEXT_CONTAINER: This .kdna uses the removed v1 plaintext ZIP format (found: ${found.join(', ')}). Rebuild from source with KDNA Container v2.`;
-  throw Object.assign(new Error(msg), { code: 'ERR_LEGACY_PLAINTEXT_CONTAINER' });
-}
-
 const INDEX_VERSION = 2;
 
 function ensureDir(dir) {
@@ -87,33 +68,9 @@ function readContainerJson(kdnaPath, fileName, options = {}) {
 
 function readContainerDataMap(kdnaPath, options = {}) {
   const asset = assetReader.openSync(kdnaPath);
-  if (asset.entries.has('payload.kdnab')) {
-    const dataMap = assetReader.readDataMapSync(asset, undefined, options);
-    // readDataMapSync only returns judgment files — add kdna.json explicitly
-    if (asset.entries.has('kdna.json')) {
-      dataMap['kdna.json'] = assetReader.readJsonSync(asset, 'kdna.json', options);
-    }
-    return dataMap;
-  }
-  // v1 fallback: read individual JSON files
-  const dataMap = {};
-  const v1Files = [
-    'kdna.json',
-    'KDNA_Core.json',
-    'KDNA_Patterns.json',
-    'KDNA_Scenarios.json',
-    'KDNA_Cases.json',
-    'KDNA_Reasoning.json',
-    'KDNA_Evolution.json',
-  ];
-  for (const f of v1Files) {
-    if (asset.entries.has(f)) {
-      try {
-        dataMap[f] = assetReader.readJsonSync(asset, f, options);
-      } catch {
-        /* skip */
-      }
-    }
+  const dataMap = assetReader.readDataMapSync(asset, undefined, options);
+  if (asset.entries.has('kdna.json')) {
+    dataMap['kdna.json'] = assetReader.readJsonSync(asset, 'kdna.json', options);
   }
   return dataMap;
 }
@@ -130,7 +87,6 @@ function listContainerEntries(kdnaPath) {
 
 function readContainer(kdnaPath, options = {}) {
   const asset = assetReader.openSync(kdnaPath);
-  validateContainerV2(asset, kdnaPath);
   const dataMap = assetReader.readDataMapSync(asset, undefined, options);
   return {
     manifest: dataMap['kdna.json'] || {},

package/src/verify.js

@@ -109,87 +109,31 @@ function directoryView(root) {
 
 function assetView(kdnaPath, options = {}) {
   const entries = new Set(listContainerEntries(kdnaPath));
-
-  // v2 container: synthesize view from CBOR payload
-  if (entries.has('payload.kdnab')) {
-    let dataMap = null;
-    const _ensureDataMap = () => {
-      if (!dataMap) dataMap = readContainerDataMap(kdnaPath, options);
-      return dataMap;
-    };
-
-    const v2Entries = new Set(entries);
-    v2Entries.add('KDNA_Core.json');
-    v2Entries.add('KDNA_Patterns.json');
-    if (dataMap) {
-      for (const k of [
-        'KDNA_Scenarios.json',
-        'KDNA_Cases.json',
-        'KDNA_Reasoning.json',
-        'KDNA_Evolution.json',
-      ]) {
-        if (dataMap[k]) v2Entries.add(k);
-      }
-    }
-
-    return {
-      kind: 'asset',
-      path: kdnaPath,
-      exists(name) {
-        if (v2Entries.has(name)) return true;
-        return entries.has(name);
-      },
-      readJson(name) {
-        if (entries.has(name)) return readContainerJson(kdnaPath, name, options);
-        const dm = _ensureDataMap();
-        return dm[name] || null;
-      },
-      readText(name) {
-        if (entries.has(name)) return readContainerEntry(kdnaPath, name).toString('utf8');
-        const dm = _ensureDataMap();
-        return dm[name] ? JSON.stringify(dm[name]) : '';
-      },
-      listDirFiles(dirName) {
-        const prefix = `${dirName.replace(/\/+$/, '')}/`;
-        const files = [];
-        for (const e of entries) {
-          if (e.startsWith(prefix)) {
-            const rest = e.slice(prefix.length);
-            if (rest && !rest.includes('/')) files.push(rest);
-          }
-        }
-        return files;
-      },
-    };
-  }
-
-  // v1 container: standard ZIP entry view
+  let dataMap = null;
+  const _ensureDataMap = () => {
+    if (!dataMap) dataMap = readContainerDataMap(kdnaPath, options);
+    return dataMap;
+  };
+  const allEntries = new Set(entries);
+  allEntries.add('KDNA_Core.json');
+  allEntries.add('KDNA_Patterns.json');
   return {
-    kind: 'asset',
-    path: kdnaPath,
-    exists(name) {
-      return entries.has(name);
-    },
+    kind: 'asset', path: kdnaPath,
+    exists(name) { return allEntries.has(name) || entries.has(name); },
     readJson(name) {
-      return readContainerJson(kdnaPath, name, options);
+      if (entries.has(name)) return readContainerJson(kdnaPath, name, options);
+      return _ensureDataMap()[name] || null;
     },
     readText(name) {
-      if (!entries.has(name)) return '';
-      return readContainerEntry(kdnaPath, name).toString('utf8');
+      if (entries.has(name)) return readContainerEntry(kdnaPath, name).toString('utf8');
+      const dm = _ensureDataMap();
+      return dm[name] ? JSON.stringify(dm[name]) : '';
     },
     listDirFiles(dirName) {
-      const prefix = `${dirName.replace(/\/+$/, '')}/`;
-      const files = [];
-      for (const entryName of entries) {
-        if (!entryName.startsWith(prefix)) continue;
-        const rest = entryName.slice(prefix.length);
-        if (rest && !rest.includes('/')) files.push(rest);
-      }
-      return files;
+      return [...entries].filter(e => e.startsWith(dirName.replace(//+$/,'')+'/')).map(e => { const r = e.slice(dirName.length+1); return r.includes('/') ? null : r; }).filter(Boolean);
     },
   };
 }
-
 function asView(input, options = {}) {
   if (input && typeof input.exists === 'function') return input;
   return directoryView(input, options);