@knolo/cli 6.2.2 → 6.2.3

package/README.md

@@ -13,8 +13,8 @@ reader.
 
 `knolo compose`, `knolo attest`, and `knolo verify-attestation` cite local
 Knowledge Images and write an attestation sidecar. This tree's `@knolo/cli`
-package file is `6.2.2` and depends on `@knolo/core` `^6.2.0`. npm
-`latest` is `6.2.1` until `6.2.2` is published. They do not fetch Hub. Verification
+package file is `6.2.3` and depends on `@knolo/core` `^6.2.0`. npm
+`latest` is `6.2.2` until `6.2.3` is published. They do not fetch Hub. Verification
 recomputes `compositionRoot` and checks bundled excerpt bytes. A keyring key
 must fall inside `notBefore`, `notAfter`, and `revokedAt`. `used` means a
 query or evaluation ran. It does not mean `SATISFIED`, and it does not mean a
@@ -188,9 +188,11 @@ every `publisher/name`. `check` reads a source directory that contains
 when `knolo-box` is on `PATH`. It scans `~/.grok` when that directory
 exists, plus every `--root`. It does not require `~/.grok`. It always
 includes `~/.knolo/skills`. An existing `~/.knolo/box/box.config.json` is
-kept and rebuilt. `--reset` replaces it. `--agent` sets the caller name.
-`--auto-rebuild` turns on a rebuild at the next search. Those flags require
-`--reset` when a config file is already there. Setup does not prompt,
+kept and rebuilt. `--reset` replaces it. `--agent`, `--auto-rebuild`,
+`--root`, and the scope paths merge into that file. `--root` may be the
+parent of `agent-data`, or the `agent-data` directory itself. `--agent` sets
+the caller name. `--auto-rebuild` turns on a rebuild at the next search.
+Setup does not prompt,
 install a pack, or call the hub. A missing `knolo-box` is one line, and
 setup still exits 0. It prints the config path, `knolo skill install <publisher>/<name>`,
 and `knolo-box mcp --config <path>`. The install path, auth, trust, and
@@ -359,7 +361,7 @@ This ensures:
 ## 🗺 Roadmap
 
 The active roadmap is maintained in [`../../docs/ROADMAP.md`](../../docs/ROADMAP.md).
-The published npm release is `6.2.1`. This package file is `6.2.2`. It preserves the V4 CLI, keeps V5 verification,
+The published npm release is `6.2.2`. This package file is `6.2.3` until that version is published. It preserves the V4 CLI, keeps V5 verification,
 migration, diagnostics, and read-only Studio management, and adds offline
 composition, attestation, and `knolo cortex`. Cortex verification does not
 mean an answer is true.

package/bin/knolo.mjs

@@ -225,9 +225,12 @@ function printCommandHelp(command) {
 
 Resolves the hub the same way as the other hub commands.
 Scans ~/.grok when that directory exists, plus every --root.
+--root may be the parent of agent-data, or the agent-data directory itself.
 Runs knolo-box init --tolerant, then knolo-box build --config.
 Keeps an existing config and rebuilds it. Pass --reset to replace it.
+--agent, --auto-rebuild, --root, and the scope paths merge into an existing config.
 Always includes ~/.knolo/skills as a skills root.
+When no skill folder is found, setup names the roots it scanned.
 Pass --agent to set the caller name. Pass --auto-rebuild to rebuild on the next search.
 Does not prompt. Does not install a pack or call the hub.
 A missing knolo-box is printed, and setup still exits 0.
@@ -1902,27 +1905,27 @@ async function main() {
         return printCommandHelp(command);
       if (command === 'kar') {
         const { runKarCli } = await import('./kar.mjs');
-        return runKarCli(commandArgs);
+        return await runKarCli(commandArgs);
       }
       if (command === 'compose' || command === 'attest' || command === 'verify-attestation') {
         const { runComposeCli } = await import('./compose.mjs');
-        return runComposeCli(command, commandArgs);
+        return await runComposeCli(command, commandArgs);
       }
       if (command === 'cortex') {
         const { runCortexCli } = await import('./cortex.mjs');
-        return runCortexCli(commandArgs);
+        return await runCortexCli(commandArgs);
       }
       if (command === 'flight') {
         const { runFlightCli } = await import('./flight.mjs');
-        return runFlightCli(commandArgs);
+        return await runFlightCli(commandArgs);
       }
       if (command === 'skill') {
         const { runSkillCli } = await import('./skill.mjs');
-        return runSkillCli(commandArgs);
+        return await runSkillCli(commandArgs);
       }
       if (command === 'setup') {
         const { runKnoloSetup } = await import('./setup.mjs');
-        return runKnoloSetup(commandArgs);
+        return await runKnoloSetup(commandArgs);
       }
       if (command === 'init') return await cmdInit();
       if (command === 'add') return await cmdAdd(commandArgs);
@@ -1931,8 +1934,8 @@ async function main() {
       if (command === 'login') return await runHubLogin(commandArgs);
       if (command === 'whoami') return await runHubWhoami(commandArgs);
       if (command === 'logout') return await runHubLogout(commandArgs);
-      if (command === 'publish') return runHubPublish(commandArgs);
-      if (command === 'yank') return runHubYank(commandArgs);
+      if (command === 'publish') return await runHubPublish(commandArgs);
+      if (command === 'yank') return await runHubYank(commandArgs);
 
       const core = await loadCore();
       if (command === 'build') return await cmdBuild(core);

package/bin/setup.mjs

@@ -16,9 +16,12 @@ export const SETUP_HELP = `Usage: knolo setup [--registry <url>] [--root <dir>]
 
 Resolves the hub the same way as the other hub commands.
 Scans ~/.grok when that directory exists, plus every --root.
+--root may be the parent of agent-data, or the agent-data directory itself.
 Runs knolo-box init --tolerant, then knolo-box build --config.
 Keeps an existing config and rebuilds it. Pass --reset to replace it.
+--agent, --auto-rebuild, --root, and the scope paths merge into an existing config.
 Always includes ~/.knolo/skills as a skills root.
+When no skill folder is found, setup names the roots it scanned.
 Pass --agent to set the caller name. Pass --auto-rebuild to rebuild on the next search.
 Does not prompt. Does not install a pack or call the hub.
 A missing knolo-box is printed, and setup still exits 0.
@@ -51,18 +54,16 @@ export async function runKnoloSetup(
   for (const root of parsed.roots) roots.push(root);
 
   const existing = await fileExists(configPath);
-  if (existing && !parsed.reset && requestsNewConfig(parsed)) {
-    throw new Error(
-      `Config already exists: ${configPath}. Pass --reset to replace it.`
-    );
-  }
+  const hubPresent =
+    existing && (await configHasHubRoot(configPath, hubSkills, homeDir));
   const replace = !existing || parsed.reset === true;
+  const merge = existing && !parsed.reset && (requestsNewConfig(parsed) || !hubPresent);
 
   let built = false;
   if (!box) {
     printError('knolo-box is not on PATH. Skipping the local index.');
     if (existing && !parsed.reset) printError('Kept the existing config.');
-  } else if (!replace) {
+  } else if (existing && !replace && !merge) {
     const buildStatus = await spawnImpl(
       box,
       ['build', '--config', configPath],
@@ -82,6 +83,8 @@ export async function runKnoloSetup(
       '--hub-skills',
       hubSkills,
     ];
+    if (parsed.reset && existing) initArgs.push('--force');
+    if (merge) initArgs.push('--merge');
     for (const root of roots) initArgs.push('--root', root);
     if (parsed.agent) initArgs.push('--agent', parsed.agent);
     if (parsed.autoRebuild) initArgs.push('--auto-rebuild');
@@ -102,8 +105,13 @@ export async function runKnoloSetup(
       throw new Error(`knolo-box build exited with status ${buildStatus}.`);
     }
     built = true;
-    if ((await skillRootsBesideHub(configPath, hubSkills)).length === 0) {
+    if (existing && !parsed.reset) printError('Kept the existing config.');
+    if ((await skillRootsBesideHub(configPath, hubSkills, homeDir)).length === 0) {
       printError('No Grok skill folder was found.');
+      const scanned = roots.length > 0 ? roots.join(', ') : grokHome;
+      printError(
+        `Scanned ${scanned}. A root needs to contain agent-data or sand-data, or be the skill folder itself.`
+      );
     }
   }
 
@@ -217,7 +225,27 @@ async function directoryExists(candidate) {
   }
 }
 
-async function skillRootsBesideHub(configPath, hubSkills) {
+async function configHasHubRoot(configPath, hubSkills, homeDir) {
+  const roots = await skillRoots(configPath);
+  const hub = await canonicalDir(hubSkills);
+  for (const root of roots) {
+    if ((await canonicalDir(expandHome(root, homeDir))) === hub) return true;
+  }
+  return false;
+}
+
+async function skillRootsBesideHub(configPath, hubSkills, homeDir) {
+  const roots = await skillRoots(configPath);
+  const hub = await canonicalDir(hubSkills);
+  const others = [];
+  for (const root of roots) {
+    if ((await canonicalDir(expandHome(root, homeDir))) === hub) continue;
+    others.push(root);
+  }
+  return others;
+}
+
+async function skillRoots(configPath) {
   let config;
   try {
     config = JSON.parse(await readFile(configPath, 'utf8'));
@@ -226,14 +254,13 @@ async function skillRootsBesideHub(configPath, hubSkills) {
   }
   const roots = config?.scopes?.skills?.roots;
   if (!Array.isArray(roots)) return [];
-  const hub = await canonicalDir(hubSkills);
-  const others = [];
-  for (const root of roots) {
-    if (typeof root !== 'string' || root.length === 0) continue;
-    if ((await canonicalDir(root)) === hub) continue;
-    others.push(root);
-  }
-  return others;
+  return roots.filter((root) => typeof root === 'string' && root.length > 0);
+}
+
+function expandHome(input, homeDir) {
+  if (input === '~') return homeDir;
+  if (input.startsWith('~/')) return path.join(homeDir, input.slice(2));
+  return input;
 }
 
 async function canonicalDir(candidate) {

package/bin/skill.mjs

@@ -8,7 +8,17 @@
  */
 import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { lstat, mkdir, mkdtemp, readdir, readFile, realpath, rm, writeFile } from 'node:fs/promises';
+import {
+  chmod,
+  lstat,
+  mkdir,
+  mkdtemp,
+  readdir,
+  readFile,
+  realpath,
+  rm,
+  writeFile,
+} from 'node:fs/promises';
 import { homedir, tmpdir } from 'node:os';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -341,8 +351,19 @@ async function indexInstalledSkill(destRoot, flags) {
   } catch {
     config = null;
   }
-  const roots = skillRootsFromConfig(config, env, home);
   const dest = await canonicalDir(destRoot);
+  const hubSkills = path.resolve(path.join(home, '.knolo', 'skills'));
+  if (config && (await canonicalDir(hubSkills)) === dest) {
+    const added = await ensureHubSkillsRoot(configPath, config, dest, env, home);
+    if (added) {
+      try {
+        config = JSON.parse(await readFile(configPath, 'utf8'));
+      } catch {
+        config = null;
+      }
+    }
+  }
+  const roots = skillRootsFromConfig(config, env, home);
   let indexed = false;
   for (const root of roots) {
     if (typeof root !== 'string' || root.length === 0) continue;
@@ -370,6 +391,33 @@ async function indexInstalledSkill(destRoot, flags) {
   }
 }
 
+async function ensureHubSkillsRoot(configPath, config, dest, env, home) {
+  const roots = skillRootsFromConfig(config, env, home);
+  for (const root of roots) {
+    if ((await canonicalDir(root)) === dest) return false;
+  }
+  const next = { ...config };
+  const scopes =
+    next.scopes && typeof next.scopes === 'object' && !Array.isArray(next.scopes)
+      ? { ...next.scopes }
+      : {};
+  const skills =
+    scopes.skills && typeof scopes.skills === 'object' && !Array.isArray(scopes.skills)
+      ? { ...scopes.skills }
+      : {};
+  const hadRoots = Array.isArray(skills.roots);
+  const prior = hadRoots
+    ? skills.roots.filter((item) => typeof item === 'string' && item.length > 0)
+    : roots;
+  skills.roots = [...prior, dest];
+  scopes.skills = skills;
+  next.scopes = scopes;
+  await mkdir(path.dirname(configPath), { recursive: true, mode: 0o700 });
+  await writeFile(configPath, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 });
+  await chmod(configPath, 0o600);
+  return true;
+}
+
 function skillRootsFromConfig(config, env, home) {
   if (!config || typeof config !== 'object' || Array.isArray(config)) return [];
   const fallbackGrok = path.resolve(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knolo/cli",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "type": "module",
   "bin": {
     "knolo": "bin/knolo.mjs"