@ibm/ixora 0.1.0 → 0.1.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // src/lib/constants.ts
 import { homedir } from "os";
 import { join } from "path";
-var SCRIPT_VERSION = "0.1.0";
+var SCRIPT_VERSION = "0.1.1";
 var HEALTH_TIMEOUT = 30;
 var IXORA_DIR = join(homedir(), ".ixora");
 var COMPOSE_FILE = join(IXORA_DIR, "docker-compose.yml");
@@ -171,6 +171,7 @@ IXORA_TEAM_MODEL='${sqEscape(config.teamModel)}'
 DB2i_HOST='${sqEscape(config.db2Host)}'
 DB2i_USER='${sqEscape(config.db2User)}'
 DB2i_PASS='${sqEscape(config.db2Pass)}'
+DB2_PORT='${sqEscape(config.db2Port)}'
 
 # Deployment
 IXORA_PROFILE='${sqEscape(config.profile)}'
@@ -810,7 +811,7 @@ async function cmdVersion(opts) {
           for (const img of images) {
             const tag = img.Tag || "unknown";
             const id = img.ID ? dim(` (${img.ID.slice(0, 12)})`) : "";
-            const imageStr = tag === "latest" ? `${img.Repository || ""}:latest${id}` : `${img.Repository || ""}:${tag}`;
+            const imageStr = `${img.Repository || ""}:${tag}${id}`;
             console.log(
               `    ${(img.Service || "").padEnd(22)} ${dim(imageStr)}`
             );
@@ -1105,6 +1106,43 @@ async function cmdLogs(opts, service) {
   }
 }
 
+// src/commands/upgrade.ts
+import { select } from "@inquirer/prompts";
+
+// src/lib/registry.ts
+var GHCR_TOKEN_URL = "https://ghcr.io/token";
+var GHCR_TAGS_URL = "https://ghcr.io/v2";
+var RELEASE_TAG = /^v\d+\.\d+\.\d+$/;
+async function fetchImageTags(image) {
+  const tokenRes = await fetch(
+    `${GHCR_TOKEN_URL}?scope=repository:${image}:pull`
+  );
+  if (!tokenRes.ok) {
+    throw new Error(`Failed to get registry token: ${tokenRes.status}`);
+  }
+  const { token } = await tokenRes.json();
+  const tagsRes = await fetch(`${GHCR_TAGS_URL}/${image}/tags/list`, {
+    headers: { Authorization: `Bearer ${token}` }
+  });
+  if (!tagsRes.ok) {
+    throw new Error(`Failed to fetch tags: ${tagsRes.status}`);
+  }
+  const { tags } = await tagsRes.json();
+  return tags.filter((t) => RELEASE_TAG.test(t)).sort((a, b) => compareSemver(b, a));
+}
+function compareSemver(a, b) {
+  const pa = a.replace(/^v/, "").split(".").map(Number);
+  const pb = b.replace(/^v/, "").split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] !== pb[i]) return pa[i] - pb[i];
+  }
+  return 0;
+}
+function normalizeVersion(version) {
+  const v = version.trim();
+  return v.startsWith("v") ? v : `v${v}`;
+}
+
 // src/commands/upgrade.ts
 async function cmdUpgrade(opts) {
   try {
@@ -1121,13 +1159,35 @@ async function cmdUpgrade(opts) {
   }
   detectPlatform();
   const previousVersion = envGet("IXORA_VERSION") || "latest";
-  info("Upgrading ixora...");
+  let targetVersion;
+  const explicitVersion = opts.version || opts.imageVersion;
+  if (explicitVersion) {
+    targetVersion = normalizeVersion(explicitVersion);
+  } else {
+    let tags;
+    try {
+      tags = await fetchImageTags("ibmi-agi/ixora-api");
+    } catch {
+      warn("Could not fetch available versions from registry");
+      die("Specify a version: ixora upgrade <version>");
+    }
+    if (tags.length === 0) {
+      die("No release versions found in registry");
+    }
+    targetVersion = await select({
+      message: "Select version to upgrade to",
+      choices: tags.map((t) => ({
+        value: t,
+        name: t === previousVersion ? `${t} (current)` : t
+      }))
+    });
+  }
+  info(`Upgrading ixora: ${previousVersion} \u2192 ${targetVersion}`);
+  info("Stopping services...");
+  await runCompose(composeCmd, ["down", "--remove-orphans"]);
+  updateEnvKey("IXORA_VERSION", targetVersion);
   writeComposeFile();
   success("Wrote docker-compose.yml");
-  if (opts.imageVersion) {
-    info(`Pinning version: ${previousVersion} \u2192 ${opts.imageVersion}`);
-    updateEnvKey("IXORA_VERSION", opts.imageVersion);
-  }
   if (opts.profile) {
     if (!VALID_PROFILES.includes(opts.profile)) {
       die(
@@ -1138,19 +1198,18 @@ async function cmdUpgrade(opts) {
     updateEnvKey("IXORA_PROFILE", opts.profile);
   }
   if (opts.pull !== false) {
-    info("Pulling latest images...");
+    info("Pulling images...");
     await runCompose(composeCmd, ["pull"]);
   }
   info("Restarting services...");
   await runCompose(composeCmd, ["up", "-d"]);
   await waitForHealthy(composeCmd);
-  const newVersion = envGet("IXORA_VERSION") || "latest";
   const profile = envGet("IXORA_PROFILE") || "full";
   console.log();
   success("Upgrade complete!");
-  console.log(`  ${bold("Version:")} ${newVersion}`);
+  console.log(`  ${bold("Version:")} ${targetVersion}`);
   console.log(`  ${bold("Profile:")} ${profile}`);
-  if (opts.imageVersion && previousVersion !== opts.imageVersion) {
+  if (previousVersion !== targetVersion) {
     console.log(`  ${dim(`(was ${previousVersion})`)}`);
   }
   console.log();
@@ -1237,7 +1296,7 @@ import { existsSync as existsSync6 } from "fs";
 import {
   input,
   password,
-  select
+  select as select2
 } from "@inquirer/prompts";
 async function promptModelProvider() {
   const curAgentModel = envGet("IXORA_AGENT_MODEL");
@@ -1245,7 +1304,7 @@ async function promptModelProvider() {
   if (curAgentModel.startsWith("openai:")) defaultProvider = "openai";
   else if (curAgentModel.startsWith("google:")) defaultProvider = "google";
   else if (curAgentModel.startsWith("ollama:")) defaultProvider = "ollama";
-  const provider = await select({
+  const provider = await select2({
     message: "Select a model provider",
     choices: [
       {
@@ -1360,28 +1419,38 @@ async function promptIbmiConnection() {
   const curHost = envGet("DB2i_HOST");
   const curUser = envGet("DB2i_USER");
   const curPass = envGet("DB2i_PASS");
+  const curPort = envGet("DB2_PORT");
   const host = await input({
-    message: "IBM i hostname",
+    message: "IBM i hostname:",
     default: curHost || void 0,
     validate: (value) => value.trim() ? true : "IBM i hostname is required"
   });
   const user = await input({
-    message: "IBM i username",
+    message: "IBM i username:",
     default: curUser || void 0,
     validate: (value) => value.trim() ? true : "IBM i username is required"
   });
   const pass = await password({
-    message: "IBM i password",
+    message: "IBM i password:",
     validate: (value) => {
       if (!value && !curPass) return "IBM i password is required";
       return true;
     }
   });
-  return { host: host.trim(), user: user.trim(), pass: pass || curPass };
+  const port = await input({
+    message: "IBM i port:",
+    default: curPort || "8076",
+    validate: (value) => {
+      const n = parseInt(value.trim(), 10);
+      if (isNaN(n) || n < 1 || n > 65535) return "Enter a valid port number";
+      return true;
+    }
+  });
+  return { host: host.trim(), user: user.trim(), pass: pass || curPass, port: port.trim() };
 }
 async function promptProfile() {
   const curProfile = envGet("IXORA_PROFILE") || "full";
-  const profile = await select({
+  const profile = await select2({
     message: "Select an agent profile",
     choices: VALID_PROFILES.map((p) => ({
       name: `${PROFILES[p].name.padEnd(14)} ${dim(PROFILES[p].description)}`,
@@ -1407,7 +1476,7 @@ async function cmdInstall(opts) {
   console.log();
   if (existsSync6(IXORA_DIR)) {
     warn(`Existing installation found at ${IXORA_DIR}`);
-    const action = await select({
+    const action = await select2({
       message: "What would you like to do?",
       choices: [
         { name: "Reconfigure \u2014 re-run setup prompts (overwrites current config)", value: "reconfigure" },
@@ -1424,11 +1493,34 @@ async function cmdInstall(opts) {
   }
   const { agentModel, teamModel, apiKeyVar, apiKeyValue, ollamaHost } = await promptModelProvider();
   console.log();
-  const { host, user, pass } = await promptIbmiConnection();
+  const { host, user, pass, port } = await promptIbmiConnection();
   console.log();
   const profile = opts.profile ? opts.profile : await promptProfile();
   console.log();
-  const version = opts.imageVersion ?? envGet("IXORA_VERSION") ?? "latest";
+  let version;
+  if (opts.imageVersion) {
+    version = normalizeVersion(opts.imageVersion);
+  } else {
+    let tags = [];
+    try {
+      tags = await fetchImageTags("ibmi-agi/ixora-api");
+    } catch {
+      warn("Could not fetch available versions from registry");
+    }
+    if (tags.length > 0) {
+      const curVersion = envGet("IXORA_VERSION") || void 0;
+      version = await select2({
+        message: "Select image version",
+        choices: tags.map((t) => ({
+          value: t,
+          name: t === curVersion ? `${t} (current)` : t
+        }))
+      });
+    } else {
+      version = envGet("IXORA_VERSION") || "latest";
+    }
+  }
+  console.log();
   const envConfig = {
     agentModel,
     teamModel,
@@ -1438,6 +1530,7 @@ async function cmdInstall(opts) {
     db2Host: host,
     db2User: user,
     db2Pass: pass,
+    db2Port: port,
     profile,
     version
   };
@@ -1581,7 +1674,7 @@ async function cmdConfigEdit() {
 }
 
 // src/commands/system.ts
-import { input as input2, password as password2, select as select2 } from "@inquirer/prompts";
+import { input as input2, password as password2, select as select3 } from "@inquirer/prompts";
 import chalk6 from "chalk";
 async function cmdSystemAdd() {
   info("Add an IBM i system");
@@ -1620,7 +1713,7 @@ async function cmdSystemAdd() {
     message: "IBM i password",
     validate: (value) => value ? true : "Password is required"
   });
-  const agentChoice = await select2({
+  const agentChoice = await select3({
     message: "Select agents for this system",
     choices: [
       {
@@ -1728,9 +1821,9 @@ function createProgram() {
     const opts = program2.opts();
     await cmdStatus(opts);
   });
-  program2.command("upgrade").description("Pull latest images and restart").action(async () => {
+  program2.command("upgrade").description("Pull latest images and restart").argument("[version]", "Target version (e.g., 0.0.11 or v0.0.11)").action(async (version) => {
     const opts = program2.opts();
-    await cmdUpgrade(opts);
+    await cmdUpgrade({ ...opts, version });
   });
   program2.command("uninstall").description("Stop services and remove images").action(async () => {
     const opts = program2.opts();

package/package.json

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