@arkhera30/cli 0.3.6 → 0.3.8

package/dist/index.js

@@ -601,6 +601,12 @@ var ANVIL_SERVICE = `  # \u2500\u2500 Anvil \u2500\u2500\u2500\u2500\u2500\u2500
       - ANVIL_SYNC_INTERVAL=\${ANVIL_SYNC_INTERVAL:-300}
       - ANVIL_DEBOUNCE_SECONDS=\${ANVIL_DEBOUNCE_SECONDS:-5}
       - GITHUB_TOKEN=\${GITHUB_TOKEN:-}
+      - TYPESENSE_HOST=typesense
+      - TYPESENSE_PORT=8108
+      - TYPESENSE_API_KEY=\${TYPESENSE_API_KEY:-horus-local-key}
+    depends_on:
+      typesense:
+        condition: service_healthy
     networks:
       - horus-net
     restart: unless-stopped
@@ -649,9 +655,14 @@ var FORGE_SERVICE = `  # \u2500\u2500 Forge \u2500\u2500\u2500\u2500\u2500\u2500
       - FORGE_HOST_FORGE_URL=http://localhost:\${FORGE_PORT:-8200}
       - FORGE_SCAN_PATHS=\${FORGE_SCAN_PATHS:-/data/repos}
       - GITHUB_TOKEN=\${GITHUB_TOKEN:-}
+      - TYPESENSE_HOST=typesense
+      - TYPESENSE_PORT=8108
+      - TYPESENSE_API_KEY=\${TYPESENSE_API_KEY:-horus-local-key}
     depends_on:
       anvil:
         condition: service_healthy
+      typesense:
+        condition: service_healthy
       vault-router:
         condition: service_healthy
     networks:
@@ -731,7 +742,11 @@ var HORUS_UI_SERVICE = `  # \u2500\u2500 Horus UI \u2500\u2500\u2500\u2500\u2500
       timeout: 5s
       start_period: 30s
       retries: 3`;
-var TEST_COMPOSE_CONTENT = `# \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
+function generateTestComposeFile(config) {
+  const vaultEntries = Object.entries(config.vaults).sort(([a], [b]) => a.localeCompare(b));
+  const defaultVaultEntry = vaultEntries.find(([, v]) => v.default);
+  const vaultName = defaultVaultEntry ? defaultVaultEntry[0] : vaultEntries[0]?.[0] ?? "default";
+  return `# \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 Shadow Stack Overlay for Integration Testing
 # \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
 # Usage (managed by \`horus test-env acquire\`):
@@ -744,9 +759,6 @@ var TEST_COMPOSE_CONTENT = `# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u
 #
 # All TEST_PORT_* and TEST_DATA_PATH are set by \`horus test-env acquire\`.
 # Slot 0 defaults: ports 9100-9399, data at ~/Horus/data/test-env/slot-0/
-#
-# NOTE: vault-personal is assumed as the primary vault name. If your config
-# uses a different vault name, set TEST_VAULT_NAME accordingly.
 # \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
 
 services:
@@ -756,11 +768,11 @@ services:
     volumes:
       - "\${TEST_DATA_PATH:-/tmp/horus-test}/notes:/data/notes:rw"
 
-  vault-personal:
+  vault-${vaultName}:
     ports:
       - "\${TEST_PORT_VAULT_SVC:-9101}:8000"
     volumes:
-      - "\${TEST_DATA_PATH:-/tmp/horus-test}/vaults/personal:/data/knowledge-repo:rw"
+      - "\${TEST_DATA_PATH:-/tmp/horus-test}/vaults/${vaultName}:/data/knowledge-repo:rw"
 
   vault-router:
     ports:
@@ -790,6 +802,7 @@ services:
     ports:
       - "\${TEST_PORT_UI:-9260}:8400"
 `;
+}
 function generateComposeFile(config, runtime) {
   const vaultEntries = Object.entries(config.vaults).sort(([a], [b]) => a.localeCompare(b));
   const vaultServices = vaultEntries.map(([name, vault], index) => {
@@ -939,7 +952,7 @@ function installComposeFile(config, runtime) {
   ensureHorusDir();
   const content = generateComposeFile(config, runtime);
   writeFileSync2(COMPOSE_PATH, content, "utf-8");
-  writeFileSync2(COMPOSE_TEST_PATH, TEST_COMPOSE_CONTENT, "utf-8");
+  writeFileSync2(COMPOSE_TEST_PATH, generateTestComposeFile(config), "utf-8");
 }
 
 // src/commands/connect.ts
@@ -1625,7 +1638,7 @@ ${example(`${vaultName.trim()}-knowledge`)}
   console.log("");
   console.log(chalk2.bold("Starting Horus services..."));
   try {
-    await composeStreaming(runtime, ["up", "-d"]);
+    await composeStreaming(runtime, ["up", "-d", "--remove-orphans"]);
   } catch (error) {
     console.log(chalk2.red("Failed to start services."));
     console.log(chalk2.dim(error.message));
@@ -1731,7 +1744,7 @@ var upCommand = new Command3("up").description("Start the Horus stack").option("
   console.log("");
   console.log(chalk3.bold("Starting Horus services..."));
   try {
-    const upArgs = opts.pull ? ["up", "-d", "--force-recreate"] : ["up", "-d"];
+    const upArgs = opts.pull ? ["up", "-d", "--force-recreate", "--remove-orphans"] : ["up", "-d", "--remove-orphans"];
     await composeStreaming(runtime, upArgs);
   } catch (error) {
     console.log(chalk3.red("Failed to start services."));
@@ -2131,7 +2144,7 @@ var updateCommand = new Command7("update").description("Update Horus to the late
     console.log("");
     console.log(chalk7.bold("Restarting from snapshot (using cached images)..."));
     try {
-      await composeStreaming(runtime, ["up", "-d"]);
+      await composeStreaming(runtime, ["up", "-d", "--remove-orphans"]);
     } catch (error) {
       console.log(chalk7.red("Failed to restart services."));
       console.log(chalk7.dim(error.message));
@@ -2209,7 +2222,7 @@ var updateCommand = new Command7("update").description("Update Horus to the late
   console.log("");
   console.log(chalk7.bold("Restarting services..."));
   try {
-    await composeStreaming(runtime, ["up", "-d", "--force-recreate"]);
+    await composeStreaming(runtime, ["up", "-d", "--force-recreate", "--remove-orphans"]);
   } catch (error) {
     console.log(chalk7.red("Failed to restart services."));
     console.log(chalk7.dim(error.message));
@@ -2843,10 +2856,10 @@ function findFreeSlot(dataDir, cfg) {
   }
   return null;
 }
-function createSlotDirs(slotDataPath) {
+function createSlotDirs(slotDataPath, vaultNames = ["default"]) {
   const dirs = [
     "notes",
-    join7("vaults", "personal"),
+    ...vaultNames.map((name) => join7("vaults", name)),
     "registry",
     "workspaces",
     "sessions",
@@ -2885,7 +2898,8 @@ async function preSeedNotesDir(dataDir, slotDataPath) {
     ]);
   }
 }
-function buildComposeEnv(runtime, ports, slotDataPath) {
+function buildComposeEnv(runtime, ports, slotDataPath, defaultVaultName = "default") {
+  const vaultPortEnvVar = `VAULT_REST_PORT_${defaultVaultName.toUpperCase().replace(/-/g, "_")}`;
   return {
     ...process.env,
     HORUS_RUNTIME: runtime.name,
@@ -2898,7 +2912,7 @@ function buildComposeEnv(runtime, ports, slotDataPath) {
     FORGE_PORT: String(ports.forge),
     VAULT_MCP_PORT: String(ports.vault_mcp),
     VAULT_ROUTER_PORT: String(ports.vault_router),
-    VAULT_REST_PORT_PERSONAL: String(ports.vault_svc),
+    [vaultPortEnvVar]: String(ports.vault_svc),
     TYPESENSE_PORT: String(ports.typesense),
     UI_PORT: String(ports.ui),
     // TEST_PORT_* vars for overlay reference (harmless duplicates after above fix)
@@ -2911,8 +2925,8 @@ function buildComposeEnv(runtime, ports, slotDataPath) {
     TEST_PORT_UI: String(ports.ui)
   };
 }
-async function composeUp(runtime, projectName2, ports, slotDataPath) {
-  const env = buildComposeEnv(runtime, ports, slotDataPath);
+async function composeUp(runtime, projectName2, ports, slotDataPath, defaultVaultName = "default") {
+  const env = buildComposeEnv(runtime, ports, slotDataPath, defaultVaultName);
   const result = await execa3(
     runtime.name,
     [
@@ -2935,8 +2949,8 @@ ${result.stderr}`
     );
   }
 }
-async function composeDown(runtime, projectName2, ports, slotDataPath) {
-  const env = buildComposeEnv(runtime, ports, slotDataPath);
+async function composeDown(runtime, projectName2, ports, slotDataPath, defaultVaultName = "default") {
+  const env = buildComposeEnv(runtime, ports, slotDataPath, defaultVaultName);
   await execa3(
     runtime.name,
     ["compose", "-p", projectName2, "down", "--volumes", "--remove-orphans"],
@@ -3023,6 +3037,9 @@ testEnvCommand.command("acquire").description("Start a shadow stack on alternate
   const config = loadConfig();
   const dataDir = config.data_dir;
   const testCfg = loadTestEnvConfig(dataDir);
+  const vaultNames = Object.keys(config.vaults).sort();
+  const defaultVaultEntry = Object.entries(config.vaults).find(([, v]) => v.default);
+  const defaultVaultName = defaultVaultEntry?.[0] ?? vaultNames[0] ?? "default";
   const spinner = ora8("Detecting runtime...").start();
   let runtime;
   try {
@@ -3044,7 +3061,7 @@ testEnvCommand.command("acquire").description("Start a shadow stack on alternate
   const slotDataPath = getSlotDataPath(dataDir, slot);
   const project = projectName(slot);
   const dirSpinner = ora8(`Creating slot-${slot} data directories...`).start();
-  createSlotDirs(slotDataPath);
+  createSlotDirs(slotDataPath, vaultNames);
   dirSpinner.succeed(`Data directory: ${chalk10.dim(slotDataPath)}`);
   const seedSpinner = ora8("Pre-seeding notes directory...").start();
   try {
@@ -3065,7 +3082,7 @@ testEnvCommand.command("acquire").description("Start a shadow stack on alternate
   });
   const upSpinner = ora8(`Starting shadow stack (project ${chalk10.cyan(project)})...`).start();
   try {
-    await composeUp(runtime, project, ports, slotDataPath);
+    await composeUp(runtime, project, ports, slotDataPath, defaultVaultName);
     upSpinner.succeed(`Shadow stack started`);
   } catch (error) {
     upSpinner.fail("Failed to start shadow stack");
@@ -3084,7 +3101,7 @@ testEnvCommand.command("acquire").description("Start a shadow stack on alternate
     healthSpinner.succeed("All services healthy");
   } catch (error) {
     healthSpinner.fail("Health check failed");
-    await composeDown(runtime, project, ports, slotDataPath);
+    await composeDown(runtime, project, ports, slotDataPath, defaultVaultName);
     removeLock(dataDir, slot);
     removeSlotDirs(slotDataPath);
     console.error(error.message);
@@ -3120,6 +3137,9 @@ testEnvCommand.command("release").description("Tear down a shadow stack and remo
   const config = loadConfig();
   const dataDir = config.data_dir;
   const testCfg = loadTestEnvConfig(dataDir);
+  const vaultNames = Object.keys(config.vaults).sort();
+  const defaultVaultEntry = Object.entries(config.vaults).find(([, v]) => v.default);
+  const defaultVaultName = defaultVaultEntry?.[0] ?? vaultNames[0] ?? "default";
   let slot;
   if (opts.slot !== void 0) {
     slot = parseInt(opts.slot, 10);
@@ -3148,7 +3168,7 @@ testEnvCommand.command("release").description("Tear down a shadow stack and remo
   }
   const downSpinner = ora8(`Stopping ${chalk10.cyan(project)}...`).start();
   try {
-    await composeDown(runtime, project, ports, slotDataPath);
+    await composeDown(runtime, project, ports, slotDataPath, defaultVaultName);
     downSpinner.succeed("Shadow stack stopped");
   } catch {
     downSpinner.warn("Failed to stop cleanly (continuing cleanup)");

package/package.json

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