@aikdna/kdna-cli 0.17.0 → 0.19.0

package/src/cmds/cluster.js

@@ -8,6 +8,16 @@ const {
   detectDomainConflicts,
   generateClusterTrace,
 } = require('@aikdna/kdna-core');
+const { getInstalled, readContainer } = require('../package-store');
+
+function loadInstalledDomain(domainId) {
+  const full = domainId.startsWith('@') ? domainId : `@aikdna/${domainId}`;
+  const installed = getInstalled(full);
+  if (!installed) return null;
+  const { core, patterns } = readContainer(installed.asset_path);
+  if (!core || !patterns) return null;
+  return { core, patterns };
+}
 
 function cmdCluster(args) {
   const { cmdClusterLint } = require('../cluster');
@@ -30,7 +40,10 @@ function cmdCluster(args) {
     if (!target) error('Usage: kdna cluster match <cluster.json> --input "<task>"');
     cmdClusterMatch(target, args);
   } else if (sub === 'compose') {
-    if (!target) error('Usage: kdna cluster compose <cluster.json> --input "<task>" [--profile=compact] [--json]');
+    if (!target)
+      error(
+        'Usage: kdna cluster compose <cluster.json> --input "<task>" [--profile=compact] [--json]',
+      );
     cmdClusterCompose(target, args);
   } else if (sub === 'conflicts') {
     if (!target) error('Usage: kdna cluster conflicts <cluster.json> --input "<task>" [--json]');
@@ -101,7 +114,7 @@ function cmdClusterInfo(target, _format = 'human') {
 }
 
 /**
- * Load a cluster: resolve domains from installed ~/.kdna/domains/,
+ * Load a cluster: resolve domains from installed .kdna assets,
  * classify input signals, compose context with attribution, detect
  * conflicts, and emit the composed context.
  */
@@ -116,23 +129,7 @@ function cmdClusterLoad(target, args = []) {
   const manifest = readJson(abs);
   if (!manifest || !manifest.cluster_id) error('Not a valid cluster manifest');
 
-  const INSTALL_DIR = path.join(
-    process.env.HOME || process.env.USERPROFILE || '.',
-    '.kdna',
-    'domains',
-  );
-
-  // Domain loader: resolve from installed ~/.kdna/domains/
-  const domainLoader = (domainId) => {
-    const [scope, ident] = domainId.startsWith('@')
-      ? [domainId.slice(0, domainId.indexOf('/')), domainId.slice(domainId.indexOf('/') + 1)]
-      : ['@aikdna', domainId];
-    const dir = path.join(INSTALL_DIR, scope, ident);
-    const core = readJson(path.join(dir, 'KDNA_Core.json'));
-    const pat = readJson(path.join(dir, 'KDNA_Patterns.json'));
-    if (!core || !pat) return null;
-    return { core, patterns: pat };
-  };
+  const domainLoader = loadInstalledDomain;
 
   const result = loadCluster(abs, domainLoader);
   if (result.errors.length) {
@@ -208,22 +205,7 @@ function cmdClusterMatch(target, args = []) {
   const manifest = readJson(abs);
   if (!manifest || !manifest.cluster_id) error('Not a valid cluster manifest');
 
-  const INSTALL_DIR = path.join(
-    process.env.HOME || process.env.USERPROFILE || '.',
-    '.kdna',
-    'domains',
-  );
-
-  const domainLoader = (domainId) => {
-    const [scope, ident] = domainId.startsWith('@')
-      ? [domainId.slice(0, domainId.indexOf('/')), domainId.slice(domainId.indexOf('/') + 1)]
-      : ['@aikdna', domainId];
-    const dir = path.join(INSTALL_DIR, scope, ident);
-    const core = readJson(path.join(dir, 'KDNA_Core.json'));
-    const pat = readJson(path.join(dir, 'KDNA_Patterns.json'));
-    if (!core || !pat) return null;
-    return { core, patterns: pat };
-  };
+  const domainLoader = loadInstalledDomain;
 
   const result = loadCluster(abs, domainLoader);
   const classification = classifySignalsAcrossDomains(input, result.domains);
@@ -273,20 +255,26 @@ function cmdClusterCompose(target, args = []) {
   const { context } = composeContextWithAttribution(classification.selected);
 
   if (jsonMode) {
-    console.log(JSON.stringify({
-      cluster: manifest.cluster_id,
-      input: input.slice(0, 200),
-      selected: classification.selected.map((d) => ({
-        id: d.id,
-        role: d.role,
-        reason: d.reason,
-      })),
-      excluded: classification.excluded.map((d) => ({
-        id: d.id,
-        reason: d.reason,
-      })),
-      context,
-    }, null, 2));
+    console.log(
+      JSON.stringify(
+        {
+          cluster: manifest.cluster_id,
+          input: input.slice(0, 200),
+          selected: classification.selected.map((d) => ({
+            id: d.id,
+            role: d.role,
+            reason: d.reason,
+          })),
+          excluded: classification.excluded.map((d) => ({
+            id: d.id,
+            reason: d.reason,
+          })),
+          context,
+        },
+        null,
+        2,
+      ),
+    );
     return;
   }
 
@@ -294,7 +282,9 @@ function cmdClusterCompose(target, args = []) {
   console.log(`Profile: ${profile}`);
   console.log(`Input:   ${input.slice(0, 100)}${input.length > 100 ? '...' : ''}`);
   console.log('');
-  console.log(`Selected: ${classification.selected.length} | Excluded: ${classification.excluded.length}`);
+  console.log(
+    `Selected: ${classification.selected.length} | Excluded: ${classification.excluded.length}`,
+  );
   console.log('');
   console.log('─'.repeat(64));
   console.log(context);
@@ -321,25 +311,33 @@ function cmdClusterConflicts(target, args = []) {
   const conflicts = detectDomainConflicts(classification.selected);
 
   if (jsonMode) {
-    console.log(JSON.stringify({
-      cluster: manifest.cluster_id,
-      input: input.slice(0, 200),
-      selected: classification.selected.map((d) => ({ id: d.id, role: d.role })),
-      conflicts: conflicts.map((c) => ({
-        type: c.type,
-        domains: c.domains,
-        description: c.description,
-        severity: c.severity || 'warn',
-      })),
-      conflict_count: conflicts.length,
-      safe: conflicts.length === 0,
-    }, null, 2));
+    console.log(
+      JSON.stringify(
+        {
+          cluster: manifest.cluster_id,
+          input: input.slice(0, 200),
+          selected: classification.selected.map((d) => ({ id: d.id, role: d.role })),
+          conflicts: conflicts.map((c) => ({
+            type: c.type,
+            domains: c.domains,
+            description: c.description,
+            severity: c.severity || 'warn',
+          })),
+          conflict_count: conflicts.length,
+          safe: conflicts.length === 0,
+        },
+        null,
+        2,
+      ),
+    );
     process.exit(conflicts.length ? EXIT.HUMAN_LOCK_REQUIRED : EXIT.OK);
   }
 
   console.log(`Cluster: ${manifest.cluster_id}`);
   console.log(`Input:   ${input.slice(0, 100)}${input.length > 100 ? '...' : ''}`);
-  console.log(`Selected: ${classification.selected.length} domains | Conflicts: ${conflicts.length}`);
+  console.log(
+    `Selected: ${classification.selected.length} domains | Conflicts: ${conflicts.length}`,
+  );
   console.log('');
 
   if (!conflicts.length) {
@@ -403,15 +401,21 @@ function cmdClusterGraph(target, args = []) {
   for (const d of manifest.domains || []) {
     const shape = d.role === 'primary' ? 'box' : d.role === 'critic' ? 'diamond' : 'ellipse';
     const required = d.required !== false ? ',style=filled,fillcolor="#e8f0fe"' : ',style=dashed';
-    console.log(`  "${d.id || d.role}" [label="${d.id || d.role}\\n[${d.role}]",shape=${shape}${required}];`);
+    console.log(
+      `  "${d.id || d.role}" [label="${d.id || d.role}\\n[${d.role}]",shape=${shape}${required}];`,
+    );
   }
 
   // Edges
   if (manifest.relationships) {
     console.log('');
     for (const r of manifest.relationships) {
-      const style = r.type === 'conflicts' ? ',style=dashed,color=red' :
-                    r.type === 'extends' ? ',style=bold' : '';
+      const style =
+        r.type === 'conflicts'
+          ? ',style=dashed,color=red'
+          : r.type === 'extends'
+            ? ',style=bold'
+            : '';
       console.log(`  "${r.from}" -> "${r.to}" [label="${r.type}"${style}];`);
     }
   }
@@ -423,24 +427,15 @@ function cmdClusterGraph(target, args = []) {
  * Shared domain loader for cluster commands.
  */
 function loadClusterDomains(manifest) {
-  const INSTALL_DIR = path.join(
-    process.env.HOME || process.env.USERPROFILE || '.',
-    '.kdna',
-    'domains',
-  );
-
-  return (manifest.domains || []).map((d) => {
-    const domainId = d.id;
-    if (!domainId) return null;
-    const [scope, ident] = domainId.startsWith('@')
-      ? [domainId.slice(0, domainId.indexOf('/')), domainId.slice(domainId.indexOf('/') + 1)]
-      : ['@aikdna', domainId];
-    const dir = path.join(INSTALL_DIR, scope, ident);
-    const core = readJson(path.join(dir, 'KDNA_Core.json'));
-    const pat = readJson(path.join(dir, 'KDNA_Patterns.json'));
-    if (!core || !pat) return null;
-    return { id: domainId, role: d.role, required: d.required !== false, core, patterns: pat };
-  }).filter(Boolean);
+  return (manifest.domains || [])
+    .map((d) => {
+      const domainId = d.id;
+      if (!domainId) return null;
+      const loaded = loadInstalledDomain(domainId);
+      if (!loaded) return null;
+      return { id: domainId, role: d.role, required: d.required !== false, ...loaded };
+    })
+    .filter(Boolean);
 }
 
 module.exports = { cmdCluster };

package/src/cmds/doctor.js

@@ -1,8 +1,9 @@
 const fs = require('fs');
 const path = require('path');
-const { EXIT, error } = require('./_common');
+const { EXIT } = require('./_common');
 const USER_KDNA_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.kdna');
-const INSTALL_DIR = path.join(USER_KDNA_DIR, 'domains');
+const PATHS = require('../paths');
+const { listInstalled } = require('../package-store');
 
 const AGENTS = [
   { name: 'OpenCode', dir: path.join(process.env.HOME || '', '.agents'), skillsDir: 'skills' },
@@ -17,11 +18,6 @@ const AGENTS = [
 ];
 
 const V2_1_MARKER = 'kdna available';
-
-function detectAgents() {
-  return AGENTS.filter((a) => fs.existsSync(a.dir));
-}
-
 function checkAgentSkill(agent) {
   const skillPath = path.join(agent.dir, agent.skillsDir, 'kdna-loader', 'SKILL.md');
   if (!fs.existsSync(skillPath)) return { installed: false, version: null, path: skillPath };
@@ -74,38 +70,25 @@ function cmdDoctor(args) {
       checks.push({ name: 'KDNA data directory', status: 'warn', detail: '~/.kdna/ not found' });
     }
 
-    // 4. ~/.kdna/domains/ exists and has domains
-    if (fs.existsSync(INSTALL_DIR)) {
-      const domains = fs
-        .readdirSync(INSTALL_DIR, { withFileTypes: true })
-        .filter((d) => d.isDirectory())
-        .reduce((acc, scopeDir) => {
-          if (scopeDir.name.startsWith('@')) {
-            try {
-              return acc + fs.readdirSync(path.join(INSTALL_DIR, scopeDir.name)).length;
-            } catch {
-              return acc;
-            }
-          }
-          return acc + 1;
-        }, 0);
+    // 4. ~/.kdna/packages/ exists and has .kdna assets
+    if (fs.existsSync(PATHS.packages)) {
+      const domains = listInstalled().length;
       checks.push({
-        name: 'Installed domains',
+        name: 'Installed assets',
         status: domains > 0 ? 'ok' : 'warn',
-        detail: `${domains} domain${domains !== 1 ? 's' : ''} installed`,
+        detail: `${domains} .kdna asset${domains !== 1 ? 's' : ''} installed`,
       });
     } else {
       checks.push({
-        name: 'Domains directory',
+        name: 'Package asset store',
         status: 'warn',
-        detail: '~/.kdna/domains/ not found',
+        detail: '~/.kdna/packages/ not found',
       });
     }
   }
 
   if (!domainsOnly) {
     // 5. Agent integration check
-    const detected = detectAgents();
     for (const agent of AGENTS) {
       const agentDirExists = fs.existsSync(agent.dir);
       const skill = agentDirExists