@ibm/ixora 0.1.3 → 0.1.5

package/dist/{chunk-4XGJZZ73.js → chunk-K2GF2QLM.js}

@@ -6,7 +6,7 @@ import {
   IXORA_DIR,
   SYSTEMS_CONFIG,
   readSystems
-} from "./chunk-VCQRSQ4F.js";
+} from "./chunk-KFC4SP2O.js";
 
 // src/lib/compose.ts
 import { execa as execa2 } from "execa";
@@ -250,6 +250,7 @@ function section(title) {
 
 // src/lib/compose.ts
 async function runCompose(composeCmd, args, options = {}) {
+  const { throwOnError, ...execaOpts } = options;
   const [bin, subArgs] = getComposeParts(composeCmd);
   const fullArgs = [
     ...subArgs,
@@ -264,7 +265,7 @@ async function runCompose(composeCmd, args, options = {}) {
   try {
     const result = await execa2(bin, fullArgs, {
       stdio: "inherit",
-      ...options
+      ...execaOpts
     });
     return {
       stdout: String(result.stdout ?? ""),
@@ -273,6 +274,11 @@ async function runCompose(composeCmd, args, options = {}) {
     };
   } catch (err) {
     const exitCode = err && typeof err === "object" && "exitCode" in err ? err.exitCode : 1;
+    if (throwOnError) {
+      throw new Error(
+        `Compose command failed (exit ${exitCode}): ${args.join(" ")}`
+      );
+    }
     error(`Command failed: ${composeCmd} ${args.join(" ")}`);
     console.log(`  Check ${bold("ixora logs")} for details.`);
     process.exit(exitCode);

package/dist/{chunk-VCQRSQ4F.js → chunk-KFC4SP2O.js}

@@ -2,18 +2,36 @@
 
 // src/lib/systems.ts
 import {
-  readFileSync as readFileSync2,
+  readFileSync as readFileSync3,
   writeFileSync as writeFileSync2,
   existsSync as existsSync2,
   mkdirSync as mkdirSync2,
   chmodSync as chmodSync2
 } from "fs";
-import { dirname as dirname2 } from "path";
+import { dirname as dirname3 } from "path";
 
 // src/lib/constants.ts
+import { readFileSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
-var SCRIPT_VERSION = "0.1.3";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+function readCliVersion() {
+  let dir = dirname(fileURLToPath(import.meta.url));
+  for (let i = 0; i < 5; i++) {
+    try {
+      const pkg = JSON.parse(
+        readFileSync(join(dir, "package.json"), "utf8")
+      );
+      if (pkg.name === "@ibm/ixora" && pkg.version) return pkg.version;
+    } catch {
+    }
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return "unknown";
+}
+var SCRIPT_VERSION = readCliVersion();
 var HEALTH_TIMEOUT = 30;
 var IXORA_DIR = join(homedir(), ".ixora");
 var COMPOSE_FILE = join(IXORA_DIR, "docker-compose.yml");
@@ -112,19 +130,19 @@ var AGENT_PRESETS = {
 
 // src/lib/env.ts
 import {
-  readFileSync,
+  readFileSync as readFileSync2,
   writeFileSync,
   existsSync,
   mkdirSync,
   chmodSync
 } from "fs";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 function sqEscape(value) {
   return value.replace(/'/g, "'\\''");
 }
 function envGet(key, envFile = ENV_FILE) {
   if (!existsSync(envFile)) return "";
-  const content = readFileSync(envFile, "utf-8");
+  const content = readFileSync2(envFile, "utf-8");
   for (const line of content.split("\n")) {
     if (line.startsWith(`${key}=`)) {
       let val = line.slice(key.length + 1);
@@ -147,21 +165,28 @@ var KNOWN_KEYS = [
   "DB2_PORT",
   "IXORA_PROFILE",
   "IXORA_VERSION",
+  "IXORA_PREVIOUS_VERSION",
   "IXORA_AGENT_MODEL",
   "IXORA_TEAM_MODEL"
 ];
 function writeEnvFile(config, envFile = ENV_FILE) {
-  mkdirSync(dirname(envFile), { recursive: true });
+  mkdirSync(dirname2(envFile), { recursive: true });
   let extra = "";
+  let prevVersionLine = "";
   if (existsSync(envFile)) {
-    const existing = readFileSync(envFile, "utf-8");
-    const extraLines = existing.split("\n").filter((line) => {
+    const existing = readFileSync2(envFile, "utf-8");
+    const lines = existing.split("\n");
+    const extraLines = lines.filter((line) => {
       const trimmed = line.trim();
       if (!trimmed || trimmed.startsWith("#")) return false;
       const lineKey = trimmed.split("=")[0];
       return !KNOWN_KEYS.includes(lineKey);
     });
     extra = extraLines.join("\n");
+    const pvLine = lines.find(
+      (l) => l.startsWith("IXORA_PREVIOUS_VERSION=")
+    );
+    if (pvLine) prevVersionLine = pvLine;
   }
   let content = `# Model provider
 IXORA_AGENT_MODEL='${sqEscape(config.agentModel)}'
@@ -186,6 +211,10 @@ DB2_PORT='${sqEscape(config.db2Port)}'
 IXORA_PROFILE='${sqEscape(config.profile)}'
 IXORA_VERSION='${sqEscape(config.version)}'
 `;
+  if (prevVersionLine) {
+    content += `${prevVersionLine}
+`;
+  }
   if (extra) {
     content += `
 # Preserved user settings
@@ -198,7 +227,7 @@ ${extra}
 function updateEnvKey(key, value, envFile = ENV_FILE) {
   const escaped = sqEscape(value);
   if (existsSync(envFile)) {
-    const content = readFileSync(envFile, "utf-8");
+    const content = readFileSync2(envFile, "utf-8");
     const lines = content.split("\n");
     let found = false;
     const updated = lines.map((line) => {
@@ -211,7 +240,7 @@ function updateEnvKey(key, value, envFile = ENV_FILE) {
     if (found) {
       writeFileSync(envFile, updated.join("\n"), "utf-8");
     } else {
-      const existing = readFileSync(envFile, "utf-8");
+      const existing = readFileSync2(envFile, "utf-8");
       const suffix = existing.endsWith("\n") ? "" : "\n";
       writeFileSync(
         envFile,
@@ -221,7 +250,7 @@ function updateEnvKey(key, value, envFile = ENV_FILE) {
       );
     }
   } else {
-    mkdirSync(dirname(envFile), { recursive: true });
+    mkdirSync(dirname2(envFile), { recursive: true });
     writeFileSync(envFile, `${key}='${escaped}'
 `, "utf-8");
   }
@@ -231,7 +260,7 @@ function updateEnvKey(key, value, envFile = ENV_FILE) {
 // src/lib/systems.ts
 function readSystems(configFile = SYSTEMS_CONFIG) {
   if (!existsSync2(configFile)) return [];
-  const content = readFileSync2(configFile, "utf-8");
+  const content = readFileSync3(configFile, "utf-8");
   const systems = [];
   let current = null;
   for (const line of content.split("\n")) {
@@ -297,7 +326,7 @@ function addSystem(system, envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
     profile: ${profile}
     agents: [${agentsList}]
 `;
-  mkdirSync2(dirname2(configFile), { recursive: true });
+  mkdirSync2(dirname3(configFile), { recursive: true });
   if (!existsSync2(configFile) || systemCount(configFile) === 0) {
     const content = `# yaml-language-server: $schema=
 # Ixora Systems Configuration
@@ -307,7 +336,7 @@ systems:
 ${entry}`;
     writeFileSync2(configFile, content, "utf-8");
   } else {
-    const existing = readFileSync2(configFile, "utf-8");
+    const existing = readFileSync3(configFile, "utf-8");
     writeFileSync2(configFile, `${existing}${entry}`, "utf-8");
   }
   chmodSync2(configFile, 384);
@@ -319,7 +348,7 @@ function removeSystem(id, envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
   if (!systemIdExists(id, configFile)) {
     throw new Error(`System '${id}' not found`);
   }
-  const content = readFileSync2(configFile, "utf-8");
+  const content = readFileSync3(configFile, "utf-8");
   const lines = content.split("\n");
   const output = [];
   let skip = false;
@@ -339,7 +368,7 @@ function removeSystem(id, envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
   chmodSync2(configFile, 384);
   if (existsSync2(envFile)) {
     const idUpper = id.toUpperCase().replace(/-/g, "_");
-    const envContent = readFileSync2(envFile, "utf-8");
+    const envContent = readFileSync3(envFile, "utf-8");
     const filtered = envContent.split("\n").filter((line) => !line.startsWith(`SYSTEM_${idUpper}_`)).join("\n");
     writeFileSync2(envFile, filtered, "utf-8");
     chmodSync2(envFile, 384);

package/dist/index.js

@@ -22,7 +22,7 @@ import {
   waitForHealthy,
   warn,
   writeComposeFile
-} from "./chunk-4XGJZZ73.js";
+} from "./chunk-K2GF2QLM.js";
 import {
   COMPOSE_FILE,
   ENV_FILE,
@@ -39,7 +39,7 @@ import {
   systemIdExists,
   updateEnvKey,
   writeEnvFile
-} from "./chunk-VCQRSQ4F.js";
+} from "./chunk-KFC4SP2O.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -297,6 +297,12 @@ function normalizeVersion(version) {
 }
 
 // src/commands/upgrade.ts
+function rollback(previousVersion) {
+  warn("Rolling back to previous version...");
+  updateEnvKey("IXORA_VERSION", previousVersion);
+  writeComposeFile();
+  info(`Reverted IXORA_VERSION to ${previousVersion}`);
+}
 async function cmdUpgrade(opts) {
   try {
     requireInstalled();
@@ -335,7 +341,8 @@ async function cmdUpgrade(opts) {
       }))
     });
   }
-  info(`Upgrading ixora: ${previousVersion} \u2192 ${targetVersion}`);
+  info(`Upgrading ixora: ${previousVersion} -> ${targetVersion}`);
+  updateEnvKey("IXORA_PREVIOUS_VERSION", previousVersion);
   info("Stopping services...");
   await runCompose(composeCmd, ["down", "--remove-orphans"]);
   updateEnvKey("IXORA_VERSION", targetVersion);
@@ -350,13 +357,31 @@ async function cmdUpgrade(opts) {
     info(`Setting profile: ${opts.profile}`);
     updateEnvKey("IXORA_PROFILE", opts.profile);
   }
-  if (opts.pull !== false) {
-    info("Pulling images...");
-    await runCompose(composeCmd, ["pull"]);
+  try {
+    if (opts.pull !== false) {
+      info("Pulling images...");
+      await runCompose(composeCmd, ["pull"], { throwOnError: true });
+    }
+    info("Starting services...");
+    await runCompose(composeCmd, ["up", "-d"], { throwOnError: true });
+    const healthy = await waitForHealthy(composeCmd);
+    if (!healthy) {
+      throw new Error(
+        "Services did not become healthy after upgrade"
+      );
+    }
+  } catch (err) {
+    rollback(previousVersion);
+    try {
+      await runCompose(composeCmd, ["down", "--remove-orphans"]);
+    } catch {
+    }
+    error(err.message);
+    info(
+      `Run ${bold("ixora logs")} to investigate, then retry with ${bold(`ixora upgrade ${targetVersion}`)}`
+    );
+    process.exit(1);
   }
-  info("Restarting services...");
-  await runCompose(composeCmd, ["up", "-d"]);
-  await waitForHealthy(composeCmd);
   const profile = envGet("IXORA_PROFILE") || "full";
   console.log();
   success("Upgrade complete!");
@@ -703,7 +728,7 @@ async function cmdInstall(opts) {
   writeEnvFile(envConfig);
   success("Wrote .env");
   if (systemIdExists("default")) {
-    const { removeSystem: removeSystem2 } = await import("./systems-KIQ3KFX3.js");
+    const { removeSystem: removeSystem2 } = await import("./systems-JHJ3CQRN.js");
     removeSystem2("default");
   }
   addSystem({
@@ -931,7 +956,7 @@ async function cmdSystemAdd() {
     default: true
   });
   if (shouldRestart) {
-    const { cmdRestart: cmdRestart2 } = await import("./restart-7ECL2NPC.js");
+    const { cmdRestart: cmdRestart2 } = await import("./restart-VIVFUUQG.js");
     await cmdRestart2({});
   } else {
     console.log(`  Restart to apply: ${bold("ixora restart")}`);

package/dist/{restart-7ECL2NPC.js → restart-VIVFUUQG.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   cmdRestart
-} from "./chunk-4XGJZZ73.js";
-import "./chunk-VCQRSQ4F.js";
+} from "./chunk-K2GF2QLM.js";
+import "./chunk-KFC4SP2O.js";
 export {
   cmdRestart
 };

package/dist/{systems-KIQ3KFX3.js → systems-JHJ3CQRN.js}

@@ -6,7 +6,7 @@ import {
   systemCount,
   systemIdExists,
   totalSystemCount
-} from "./chunk-VCQRSQ4F.js";
+} from "./chunk-KFC4SP2O.js";
 export {
   addSystem,
   readSystems,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibm/ixora",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CLI for managing ixora AI agent deployments on IBM i",
   "type": "module",
   "bin": {