@arkhera30/cli 0.1.7 → 0.1.9

package/compose/docker-compose.yml

@@ -198,8 +198,9 @@ services:
       - FORGE_HOST_ANVIL_URL=http://localhost:${ANVIL_PORT:-8100}
       - FORGE_HOST_VAULT_URL=http://localhost:${VAULT_MCP_PORT:-8300}
       - FORGE_HOST_FORGE_URL=http://localhost:${FORGE_PORT:-8200}
-      # Colon-separated list of in-container paths to scan for git repos
-      - FORGE_SCAN_PATHS=/data/repos
+      # Colon-separated list of in-container paths to scan for git repos.
+      # Generated by the CLI from host_repos_extra_scan_dirs config — do not edit manually.
+      - FORGE_SCAN_PATHS=${FORGE_SCAN_PATHS:-/data/repos}
       - GITHUB_TOKEN=${GITHUB_TOKEN:-}
     depends_on:
       anvil:

package/dist/index.js

@@ -12,7 +12,7 @@ import ora from "ora";
 import { execSync } from "child_process";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
 import { join as join3 } from "path";
-import { input, confirm, number, select } from "@inquirer/prompts";
+import { input, confirm, number, select, password } from "@inquirer/prompts";
 
 // src/lib/config.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
@@ -58,6 +58,7 @@ function defaultConfig() {
     git_host: "github.com",
     repos: { ...DEFAULT_REPOS },
     host_repos_path: "",
+    host_repos_extra_scan_dirs: [],
     github_token: ""
   };
 }
@@ -91,6 +92,7 @@ function loadConfig() {
       forge_registry: parsed.repos?.forge_registry ?? defaults.repos.forge_registry
     },
     host_repos_path: parsed.host_repos_path ?? defaults.host_repos_path,
+    host_repos_extra_scan_dirs: parsed.host_repos_extra_scan_dirs ?? defaults.host_repos_extra_scan_dirs,
     github_token: parsed.github_token ?? defaults.github_token
   };
 }
@@ -108,6 +110,9 @@ function resolvePath(p) {
 function generateEnv(config) {
   const dataDir = resolvePath(config.data_dir);
   const hostReposPath = config.host_repos_path ? resolvePath(config.host_repos_path) : "";
+  const baseScanPath = "/data/repos";
+  const extraScanPaths = (config.host_repos_extra_scan_dirs ?? []).map((d) => d.trim()).filter(Boolean).map((d) => `${baseScanPath}/${d}`);
+  const forgeScanPaths = [baseScanPath, ...extraScanPaths].join(":");
   const lines = [
     "# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "# Horus \u2014 Generated .env file",
@@ -116,6 +121,7 @@ function generateEnv(config) {
     "",
     `HORUS_DATA_PATH=${dataDir}`,
     `HOST_REPOS_PATH=${hostReposPath}`,
+    `FORGE_SCAN_PATHS=${forgeScanPaths}`,
     "",
     "# Ports",
     `ANVIL_PORT=${config.ports.anvil}`,
@@ -127,6 +133,9 @@ function generateEnv(config) {
     `ANVIL_REPO_URL=${config.repos.anvil_notes}`,
     `VAULT_KNOWLEDGE_REPO_URL=${config.repos.vault_knowledge}`,
     `FORGE_REGISTRY_REPO_URL=${config.repos.forge_registry}`,
+    "",
+    "# Authentication",
+    `GITHUB_TOKEN=${config.github_token}`,
     ""
   ];
   return lines.join("\n");
@@ -139,6 +148,7 @@ function writeEnvFile(config) {
 var CONFIG_KEYS = [
   "data-dir",
   "host-repos-path",
+  "host-repos-extra-scan-dirs",
   "runtime",
   "port.anvil",
   "port.vault-rest",
@@ -156,6 +166,8 @@ function getConfigValue(config, key) {
       return config.data_dir;
     case "host-repos-path":
       return config.host_repos_path;
+    case "host-repos-extra-scan-dirs":
+      return (config.host_repos_extra_scan_dirs ?? []).join(", ");
     case "runtime":
       return config.runtime;
     case "port.anvil":
@@ -187,6 +199,9 @@ function setConfigValue(config, key, value) {
     case "host-repos-path":
       updated.host_repos_path = value;
       break;
+    case "host-repos-extra-scan-dirs":
+      updated.host_repos_extra_scan_dirs = value.split(",").map((d) => d.trim()).filter(Boolean);
+      break;
     case "runtime":
       if (value !== "docker" && value !== "podman") {
         throw new Error(`Invalid runtime: ${value}. Must be "docker" or "podman".`);
@@ -255,11 +270,13 @@ async function commandExists(command) {
 }
 function createRuntime(name) {
   const bin = name;
+  const composeEnv = { ...process.env, HORUS_RUNTIME: name };
   return {
     name,
     async compose(...args) {
       const result = await execa(bin, ["compose", ...args], {
         cwd: HORUS_DIR,
+        env: composeEnv,
         reject: false
       });
       if (result.exitCode !== 0) {
@@ -287,6 +304,7 @@ function createRuntime(name) {
       try {
         const result = await execa(bin, ["compose", "ps", "--format", "json"], {
           cwd: HORUS_DIR,
+          env: composeEnv,
           reject: false
         });
         return result.exitCode === 0 && result.stdout.toString().trim().length > 0;
@@ -328,6 +346,7 @@ async function composeStreaming(runtime, args) {
   const bin = runtime.name;
   const result = await execa(bin, ["compose", ...args], {
     cwd: HORUS_DIR,
+    env: { ...process.env, HORUS_RUNTIME: runtime.name },
     stdio: "inherit",
     reject: false
   });
@@ -417,18 +436,38 @@ function getBundledComposePath() {
 Searched: ${candidates.join(", ")}`
   );
 }
+function applyPodmanUserOverride(compose) {
+  return compose.replace(
+    /^(    image: .+)$/gm,
+    '$1\n    user: "0:0"'
+  );
+}
 function composeFileExists() {
   return existsSync2(COMPOSE_PATH);
 }
-function installComposeFile() {
+function installComposeFile(runtime) {
   ensureHorusDir();
   const bundledPath = getBundledComposePath();
-  const content = readFileSync2(bundledPath, "utf-8");
+  let content = readFileSync2(bundledPath, "utf-8");
+  if (runtime === "podman") {
+    content = applyPodmanUserOverride(content);
+  }
   writeFileSync2(COMPOSE_PATH, content, "utf-8");
 }
 
 // src/commands/setup.ts
-var setupCommand = new Command("setup").description("Interactive first-run setup for Horus").option("-y, --yes", "Non-interactive mode (use defaults + env vars)").option("--runtime <runtime>", "Container runtime to use: docker or podman (non-interactive only)").option("--data-dir <path>", "Data directory path").option("--repos-path <path>", "Host repos path for Forge scanning").option("--git-host <host>", "Git server hostname (e.g., github.com, gitlab.corp.com)").option("--anvil-repo <url>", "Anvil notes repository URL").option("--vault-repo <url>", "Vault knowledge-base repository URL").option("--forge-repo <url>", "Forge registry repository URL").action(async (opts) => {
+function injectToken(url, token) {
+  if (!token) return url;
+  try {
+    const parsed = new URL(url);
+    parsed.username = "oauth2";
+    parsed.password = token;
+    return parsed.toString();
+  } catch {
+    return url;
+  }
+}
+var setupCommand = new Command("setup").description("Interactive first-run setup for Horus").option("-y, --yes", "Non-interactive mode (use defaults + env vars)").option("--runtime <runtime>", "Container runtime to use: docker or podman (non-interactive only)").option("--data-dir <path>", "Data directory path").option("--repos-path <path>", "Host repos path for Forge scanning").option("--git-host <host>", "Git server hostname (e.g., github.com, gitlab.corp.com)").option("--anvil-repo <url>", "Anvil notes repository URL").option("--vault-repo <url>", "Vault knowledge-base repository URL").option("--forge-repo <url>", "Forge registry repository URL").option("--github-token <token>", "GitHub personal access token for private repos").action(async (opts) => {
   console.log("");
   console.log(chalk.bold("Horus Setup"));
   console.log(chalk.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
@@ -500,7 +539,8 @@ var setupCommand = new Command("setup").description("Interactive first-run setup
         anvil_notes: opts.anvilRepo || process.env.ANVIL_REPO_URL || defaults.repos.anvil_notes,
         vault_knowledge: opts.vaultRepo || process.env.VAULT_KNOWLEDGE_REPO_URL || defaults.repos.vault_knowledge,
         forge_registry: opts.forgeRepo || process.env.FORGE_REGISTRY_REPO_URL || defaults.repos.forge_registry
-      }
+      },
+      github_token: opts.githubToken || process.env.GITHUB_TOKEN || ""
     };
   } else {
     const data_dir = await input({
@@ -511,6 +551,11 @@ var setupCommand = new Command("setup").description("Interactive first-run setup
       message: "Host repos path (for Forge repo scanning, leave empty to skip):",
       default: ""
     });
+    const extra_scan_dirs_raw = await input({
+      message: "Extra subdirectories to scan within repos path (comma-separated, e.g. ArjunKhera \u2014 leave empty to skip):",
+      default: ""
+    });
+    const host_repos_extra_scan_dirs = extra_scan_dirs_raw.split(",").map((d) => d.trim()).filter(Boolean);
     const customize_ports = await confirm({
       message: "Customize port assignments?",
       default: false
@@ -547,7 +592,6 @@ var setupCommand = new Command("setup").description("Interactive first-run setup
     console.log("");
     console.log(chalk.yellow("  Use HTTPS URLs \u2014 container services do not have SSH keys."));
     console.log(chalk.dim("  SSH URLs (git@github.com:...) will fail at runtime inside Docker/Podman."));
-    console.log(chalk.dim("  Set GITHUB_TOKEN for private repos."));
     console.log("");
     const git_host = await input({
       message: "Git server hostname:",
@@ -574,10 +618,19 @@ ${example("forge-registry")}
 `,
       validate: (v) => v.trim().length > 0 || "Forge needs a registry repo."
     });
+    console.log("");
+    console.log(chalk.bold("Authentication"));
+    console.log(chalk.dim("A personal access token is required for private repositories."));
+    console.log("");
+    const github_token = await password({
+      message: "GitHub personal access token (leave empty to skip):",
+      mask: "*"
+    });
     config = {
       ...defaultConfig(),
       data_dir,
       host_repos_path,
+      host_repos_extra_scan_dirs,
       runtime: runtime.name,
       ports,
       git_host: git_host.trim(),
@@ -585,7 +638,8 @@ ${example("forge-registry")}
         anvil_notes: anvil_notes.trim(),
         vault_knowledge: vault_knowledge.trim(),
         forge_registry: forge_registry.trim()
-      }
+      },
+      github_token: github_token.trim()
     };
   }
   const configSpinner = ora("Saving configuration...").start();
@@ -608,7 +662,7 @@ ${example("forge-registry")}
   }
   const composeSpinner = ora("Installing docker-compose.yml...").start();
   try {
-    installComposeFile();
+    installComposeFile(runtime.name);
     composeSpinner.succeed("Compose file installed to ~/.horus/docker-compose.yml");
   } catch (error) {
     composeSpinner.fail("Failed to install compose file");
@@ -633,7 +687,8 @@ ${example("forge-registry")}
       }
       try {
         mkdirSync2(repo.dest, { recursive: true });
-        execSync(`git clone "${repo.url}" "${repo.dest}"`, {
+        const cloneUrl = injectToken(repo.url, config.github_token);
+        execSync(`git clone "${cloneUrl}" "${repo.dest}"`, {
           stdio: "pipe",
           timeout: 6e4
         });
@@ -647,7 +702,9 @@ ${example("forge-registry")}
           console.log(chalk.dim(`  ${msg.split("\n")[0]}`));
         }
         console.log(chalk.dim(`  URL: ${repo.url}`));
-        console.log(chalk.dim("  Ensure you have git access (SSH key or credential helper)."));
+        if (!config.github_token) {
+          console.log(chalk.dim("  Tip: Re-run setup and provide a GitHub token if the repo is private."));
+        }
         process.exit(1);
       }
     }
@@ -715,7 +772,7 @@ ${example("forge-registry")}
 import { Command as Command2 } from "commander";
 import chalk2 from "chalk";
 import ora2 from "ora";
-var upCommand = new Command2("up").description("Start the Horus stack").action(async () => {
+var upCommand = new Command2("up").description("Start the Horus stack").option("--no-pull", "Skip pulling latest images before starting").action(async (opts) => {
   if (!configExists() || !composeFileExists()) {
     console.log(chalk2.red("Horus is not set up yet."));
     console.log(chalk2.dim("Run `horus setup` first."));
@@ -732,6 +789,15 @@ var upCommand = new Command2("up").description("Start the Horus stack").action(a
     console.log(error.message);
     process.exit(1);
   }
+  if (opts.pull) {
+    const pullSpinner = ora2("Pulling latest images...").start();
+    try {
+      await composeStreaming(runtime, ["pull", "--ignore-pull-failures"]);
+      pullSpinner.succeed("Images up to date");
+    } catch {
+      pullSpinner.warn("Could not pull images, using cached");
+    }
+  }
   console.log("");
   console.log(chalk2.bold("Starting Horus services..."));
   try {
@@ -904,8 +970,10 @@ var configCommand = new Command5("config").description("View or modify Horus con
   console.log(`  ${chalk5.bold("version:")}          ${config.version}`);
   console.log(`  ${chalk5.bold("data-dir:")}         ${config.data_dir}`);
   console.log(`  ${chalk5.bold("runtime:")}          ${config.runtime}`);
-  console.log(`  ${chalk5.bold("host-repos-path:")}  ${config.host_repos_path || chalk5.dim("(not set)")}`);
-  console.log(`  ${chalk5.bold("git-host:")}         ${config.git_host || chalk5.dim("(not set)")}`);
+  console.log(`  ${chalk5.bold("host-repos-path:")}             ${config.host_repos_path || chalk5.dim("(not set)")}`);
+  const extraDirs = (config.host_repos_extra_scan_dirs ?? []).join(", ");
+  console.log(`  ${chalk5.bold("host-repos-extra-scan-dirs:")}  ${extraDirs || chalk5.dim("(not set)")}`);
+  console.log(`  ${chalk5.bold("git-host:")}                    ${config.git_host || chalk5.dim("(not set)")}`);
   console.log(`  ${chalk5.bold("github-token:")}     ${config.github_token ? maskApiKey(config.github_token) : chalk5.dim("(not set)")}`);
   console.log("");
   console.log(chalk5.bold("  Ports:"));
@@ -966,6 +1034,7 @@ configCommand.command("set <key> <value>").description("Set a configuration valu
   const needsRestart = [
     "data-dir",
     "host-repos-path",
+    "host-repos-extra-scan-dirs",
     "runtime",
     "port.anvil",
     "port.vault-rest",
@@ -999,6 +1068,7 @@ import { checkbox } from "@inquirer/prompts";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir3 } from "os";
+import { execa as execa2 } from "execa";
 function detectInstalledClients() {
   const detected = [];
   const home = homedir3();
@@ -1044,6 +1114,32 @@ function mergeAndWriteConfig(configPath, mcpServers) {
   mkdirSync3(dir, { recursive: true });
   writeFileSync3(configPath, JSON.stringify(existing, null, 2) + "\n", "utf-8");
 }
+async function isClaudeCliAvailable() {
+  try {
+    const result = await execa2("claude", ["--version"], { reject: false });
+    return result.exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+async function registerWithClaudeCode(mcpServers) {
+  const registered = [];
+  const failed = [];
+  for (const [name, entry] of Object.entries(mcpServers)) {
+    const baseUrl = entry.url.replace(/\/sse$/, "");
+    const result = await execa2(
+      "claude",
+      ["mcp", "add", "--transport", "http", "--scope", "user", name, baseUrl],
+      { reject: false }
+    );
+    if (result.exitCode === 0) {
+      registered.push(name);
+    } else {
+      failed.push(name);
+    }
+  }
+  return { registered, failed };
+}
 async function syncSkills(runtime) {
   const home = homedir3();
   const skillsBase = join4(home, ".claude", "skills");
@@ -1164,14 +1260,41 @@ var connectCommand = new Command6("connect").description("Configure Claude/Curso
     forge: { url: `http://${host}:${config.ports.forge}/sse` }
   };
   for (const target of targets) {
-    const configPath = getConfigPath(target);
-    const writeSpinner = ora5(`Configuring ${chalk6.cyan(target)}...`).start();
-    try {
-      mergeAndWriteConfig(configPath, mcpServers);
-      writeSpinner.succeed(`Configured ${chalk6.cyan(target)} \u2014 ${chalk6.dim(configPath)}`);
-    } catch (error) {
-      writeSpinner.fail(`Failed to configure ${target}`);
-      console.log(chalk6.dim(error.message));
+    if (target === "claude-code") {
+      const cliSpinner = ora5("Registering MCP servers with Claude Code CLI...").start();
+      const cliAvailable = await isClaudeCliAvailable();
+      if (cliAvailable) {
+        const { registered, failed } = await registerWithClaudeCode(mcpServers);
+        if (failed.length === 0) {
+          cliSpinner.succeed(
+            `Registered with Claude Code: ${registered.map((n) => chalk6.cyan(n)).join(", ")}`
+          );
+        } else if (registered.length > 0) {
+          cliSpinner.warn(
+            `Partially registered \u2014 ok: ${registered.join(", ")}, failed: ${failed.join(", ")}`
+          );
+        } else {
+          cliSpinner.fail("Failed to register MCP servers with Claude Code CLI");
+        }
+      } else {
+        cliSpinner.warn("claude CLI not found on PATH \u2014 register manually:");
+        for (const [name, entry] of Object.entries(mcpServers)) {
+          const baseUrl = entry.url.replace(/\/sse$/, "");
+          console.log(
+            chalk6.dim(`  claude mcp add --transport http --scope user ${name} ${baseUrl}`)
+          );
+        }
+      }
+    } else {
+      const configPath = getConfigPath(target);
+      const writeSpinner = ora5(`Configuring ${chalk6.cyan(target)}...`).start();
+      try {
+        mergeAndWriteConfig(configPath, mcpServers);
+        writeSpinner.succeed(`Configured ${chalk6.cyan(target)} \u2014 ${chalk6.dim(configPath)}`);
+      } catch (error) {
+        writeSpinner.fail(`Failed to configure ${target}`);
+        console.log(chalk6.dim(error.message));
+      }
     }
   }
   if (targets.includes("claude-code")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkhera30/cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "CLI for managing the Horus AI development stack",
   "type": "module",
   "bin": {