@ibm/ixora 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,800 +1,60 @@
 #!/usr/bin/env node
+import {
+  bold,
+  cmdRestart,
+  cyan,
+  detectComposeCmd,
+  detectPlatform,
+  die,
+  dim,
+  error,
+  info,
+  isSensitiveKey,
+  maskValue,
+  requireComposeFile,
+  requireInstalled,
+  resolveService,
+  runCompose,
+  runComposeCapture,
+  section,
+  success,
+  verifyRuntimeRunning,
+  waitForHealthy,
+  warn,
+  writeComposeFile
+} from "./chunk-UYIZNGRR.js";
+import {
+  COMPOSE_FILE,
+  ENV_FILE,
+  IXORA_DIR,
+  PROFILES,
+  PROVIDERS,
+  SCRIPT_VERSION,
+  VALID_PROFILES,
+  addSystem,
+  envGet,
+  readSystems,
+  removeSystem,
+  systemCount,
+  systemIdExists,
+  updateEnvKey,
+  writeEnvFile
+} from "./chunk-F7YJCNQP.js";
 
 // src/cli.ts
 import { Command } from "commander";
 
-// src/lib/constants.ts
-import { homedir } from "os";
-import { join } from "path";
-var SCRIPT_VERSION = "0.1.0";
-var HEALTH_TIMEOUT = 30;
-var IXORA_DIR = join(homedir(), ".ixora");
-var COMPOSE_FILE = join(IXORA_DIR, "docker-compose.yml");
-var SYSTEMS_CONFIG = join(IXORA_DIR, "ixora-systems.yaml");
-var ENV_FILE = join(IXORA_DIR, ".env");
-var PROFILES = {
-  full: {
-    name: "full",
-    label: "Full",
-    description: "All agents, teams, and workflows (3 agents, 2 teams, 1 workflow)"
-  },
-  "sql-services": {
-    name: "sql-services",
-    label: "SQL Services",
-    description: "SQL Services agent for database queries and performance monitoring"
-  },
-  security: {
-    name: "security",
-    label: "Security",
-    description: "Security agent, multi-system security team, and assessment workflow"
-  },
-  knowledge: {
-    name: "knowledge",
-    label: "Knowledge",
-    description: "Knowledge agent only \u2014 documentation retrieval (lightest)"
-  }
-};
-var VALID_PROFILES = Object.keys(PROFILES);
-var PROVIDERS = {
-  anthropic: {
-    name: "anthropic",
-    label: "Anthropic",
-    agentModel: "anthropic:claude-sonnet-4-6",
-    teamModel: "anthropic:claude-haiku-4-5",
-    apiKeyVar: "ANTHROPIC_API_KEY",
-    description: "Claude Sonnet 4.6 / Haiku 4.5 (recommended)"
-  },
-  openai: {
-    name: "openai",
-    label: "OpenAI",
-    agentModel: "openai:gpt-4o",
-    teamModel: "openai:gpt-4o-mini",
-    apiKeyVar: "OPENAI_API_KEY",
-    description: "GPT-4o / GPT-4o-mini"
-  },
-  google: {
-    name: "google",
-    label: "Google",
-    agentModel: "google:gemini-2.5-pro",
-    teamModel: "google:gemini-2.5-flash",
-    apiKeyVar: "GOOGLE_API_KEY",
-    description: "Gemini 2.5 Pro / Gemini 2.5 Flash"
-  },
-  ollama: {
-    name: "ollama",
-    label: "Ollama",
-    agentModel: "ollama:llama3.1",
-    teamModel: "ollama:llama3.1",
-    apiKeyVar: "",
-    description: "Local models via Ollama (no API key needed)"
-  },
-  custom: {
-    name: "custom",
-    label: "Custom",
-    agentModel: "",
-    teamModel: "",
-    apiKeyVar: "",
-    description: "Enter provider:model strings"
-  }
-};
-var ALL_AGENTS = [
-  "ibmi-security-assistant",
-  "ibmi-system-health",
-  "ibmi-db-explorer",
-  "ibmi-db-performance",
-  "ibmi-work-management",
-  "ibmi-system-config",
-  "ibmi-sql-service-guide",
-  "ibmi-knowledge-agent"
-];
-var OPS_AGENTS = [
-  "ibmi-system-health",
-  "ibmi-db-explorer",
-  "ibmi-db-performance",
-  "ibmi-work-management",
-  "ibmi-system-config",
-  "ibmi-sql-service-guide"
-];
-var AGENT_PRESETS = {
-  all: [...ALL_AGENTS],
-  "security-ops": ["ibmi-security-assistant", ...OPS_AGENTS],
-  security: ["ibmi-security-assistant"],
-  operations: [...OPS_AGENTS],
-  knowledge: ["ibmi-knowledge-agent"]
-};
-
 // src/commands/version.ts
-import { existsSync as existsSync4 } from "fs";
-import chalk2 from "chalk";
-
-// src/lib/env.ts
-import { readFileSync, writeFileSync, existsSync, mkdirSync, chmodSync } from "fs";
-import { dirname } 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");
-  for (const line of content.split("\n")) {
-    if (line.startsWith(`${key}=`)) {
-      let val = line.slice(key.length + 1);
-      if (val.startsWith("'") && val.endsWith("'") || val.startsWith('"') && val.endsWith('"')) {
-        val = val.slice(1, -1);
-      }
-      return val;
-    }
-  }
-  return "";
-}
-var KNOWN_KEYS = [
-  "ANTHROPIC_API_KEY",
-  "OPENAI_API_KEY",
-  "GOOGLE_API_KEY",
-  "OLLAMA_HOST",
-  "DB2i_HOST",
-  "DB2i_USER",
-  "DB2i_PASS",
-  "DB2_PORT",
-  "IXORA_PROFILE",
-  "IXORA_VERSION",
-  "IXORA_AGENT_MODEL",
-  "IXORA_TEAM_MODEL"
-];
-function writeEnvFile(config, envFile = ENV_FILE) {
-  mkdirSync(dirname(envFile), { recursive: true });
-  let extra = "";
-  if (existsSync(envFile)) {
-    const existing = readFileSync(envFile, "utf-8");
-    const extraLines = existing.split("\n").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");
-  }
-  let content = `# Model provider
-IXORA_AGENT_MODEL='${sqEscape(config.agentModel)}'
-IXORA_TEAM_MODEL='${sqEscape(config.teamModel)}'
-`;
-  if (config.apiKeyVar && config.apiKeyValue) {
-    content += `${config.apiKeyVar}='${sqEscape(config.apiKeyValue)}'
-`;
-  }
-  if (config.ollamaHost) {
-    content += `OLLAMA_HOST='${sqEscape(config.ollamaHost)}'
-`;
-  }
-  content += `
-# IBM i connection
-DB2i_HOST='${sqEscape(config.db2Host)}'
-DB2i_USER='${sqEscape(config.db2User)}'
-DB2i_PASS='${sqEscape(config.db2Pass)}'
-
-# Deployment
-IXORA_PROFILE='${sqEscape(config.profile)}'
-IXORA_VERSION='${sqEscape(config.version)}'
-`;
-  if (extra) {
-    content += `
-# Preserved user settings
-${extra}
-`;
-  }
-  writeFileSync(envFile, content, "utf-8");
-  chmodSync(envFile, 384);
-}
-function updateEnvKey(key, value, envFile = ENV_FILE) {
-  const escaped = sqEscape(value);
-  if (existsSync(envFile)) {
-    const content = readFileSync(envFile, "utf-8");
-    const lines = content.split("\n");
-    let found = false;
-    const updated = lines.map((line) => {
-      if (line.startsWith(`${key}=`)) {
-        found = true;
-        return `${key}='${escaped}'`;
-      }
-      return line;
-    });
-    if (found) {
-      writeFileSync(envFile, updated.join("\n"), "utf-8");
-    } else {
-      const existing = readFileSync(envFile, "utf-8");
-      const suffix = existing.endsWith("\n") ? "" : "\n";
-      writeFileSync(
-        envFile,
-        `${existing}${suffix}${key}='${escaped}'
-`,
-        "utf-8"
-      );
-    }
-  } else {
-    mkdirSync(dirname(envFile), { recursive: true });
-    writeFileSync(envFile, `${key}='${escaped}'
-`, "utf-8");
-  }
-  chmodSync(envFile, 384);
-}
-
-// src/lib/compose.ts
-import { execa as execa2 } from "execa";
-import { existsSync as existsSync3, mkdirSync as mkdirSync3 } from "fs";
-import { writeFileSync as writeFileSync3 } from "fs";
-
-// src/lib/platform.ts
-import { arch } from "os";
-import { execa } from "execa";
-async function detectComposeCmd(optRuntime) {
-  if (optRuntime) {
-    switch (optRuntime) {
-      case "docker":
-        return "docker compose";
-      case "podman":
-        return "podman compose";
-      default:
-        throw new Error(
-          `Unknown runtime: ${optRuntime} (choose: docker, podman)`
-        );
-    }
-  }
-  try {
-    await execa("docker", ["compose", "version"]);
-    return "docker compose";
-  } catch {
-  }
-  try {
-    await execa("podman", ["compose", "version"]);
-    return "podman compose";
-  } catch {
-  }
-  try {
-    await execa("docker-compose", ["version"]);
-    return "docker-compose";
-  } catch {
-  }
-  throw new Error(
-    "Neither 'docker compose', 'podman compose', nor 'docker-compose' found.\nPlease install Docker or Podman first."
-  );
-}
-async function verifyRuntimeRunning(composeCmd) {
-  const runtime = composeCmd.startsWith("docker") ? "docker" : "podman";
-  try {
-    await execa(runtime, ["info"]);
-  } catch {
-    const name = runtime === "docker" ? "Docker Desktop" : "Podman";
-    throw new Error(
-      `${name} is not running. Please start it and try again.`
-    );
-  }
-}
-function detectPlatform() {
-  const cpuArch = arch();
-  if (cpuArch === "ppc64") {
-    return {
-      dbImage: process.env["IXORA_DB_IMAGE"] ?? `ghcr.io/ibmi-agi/ixora-db:${process.env["IXORA_VERSION"] ?? "latest"}`
-    };
-  }
-  return {};
-}
-function getComposeParts(cmd) {
-  if (cmd === "docker-compose") {
-    return ["docker-compose", []];
-  }
-  const [bin, sub] = cmd.split(" ");
-  return [bin, [sub]];
-}
-function getRuntimeBin(cmd) {
-  return cmd.startsWith("docker") ? "docker" : "podman";
-}
-
-// src/lib/systems.ts
-import {
-  readFileSync as readFileSync2,
-  writeFileSync as writeFileSync2,
-  existsSync as existsSync2,
-  mkdirSync as mkdirSync2,
-  chmodSync as chmodSync2
-} from "fs";
-import { dirname as dirname2 } from "path";
-function readSystems(configFile = SYSTEMS_CONFIG) {
-  if (!existsSync2(configFile)) return [];
-  const content = readFileSync2(configFile, "utf-8");
-  const systems = [];
-  let current = null;
-  for (const line of content.split("\n")) {
-    const idMatch = line.match(/^ {2}- id: (.+)$/);
-    if (idMatch) {
-      if (current?.id) {
-        systems.push({
-          id: current.id,
-          name: current.name ?? current.id,
-          agents: current.agents ?? []
-        });
-      }
-      current = { id: idMatch[1] };
-      continue;
-    }
-    if (!current) continue;
-    const nameMatch = line.match(/name: *'?([^']*)'?/);
-    if (nameMatch) {
-      current.name = nameMatch[1];
-      continue;
-    }
-    const agentsMatch = line.match(/agents: *\[([^\]]*)\]/);
-    if (agentsMatch) {
-      current.agents = agentsMatch[1].split(",").map((a) => a.trim()).filter(Boolean);
-    }
-  }
-  if (current?.id) {
-    systems.push({
-      id: current.id,
-      name: current.name ?? current.id,
-      agents: current.agents ?? []
-    });
-  }
-  return systems;
-}
-function systemCount(configFile = SYSTEMS_CONFIG) {
-  return readSystems(configFile).length;
-}
-function systemIdExists(id, configFile = SYSTEMS_CONFIG) {
-  return readSystems(configFile).some((s) => s.id === id);
-}
-function totalSystemCount(envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
-  const additional = systemCount(configFile);
-  const primaryHost = envGet("DB2i_HOST", envFile);
-  return primaryHost ? additional + 1 : additional;
-}
-function addSystem(system, envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
-  const idUpper = system.id.toUpperCase().replace(/-/g, "_");
-  updateEnvKey(`SYSTEM_${idUpper}_HOST`, system.host, envFile);
-  updateEnvKey(`SYSTEM_${idUpper}_PORT`, system.port, envFile);
-  updateEnvKey(`SYSTEM_${idUpper}_USER`, system.user, envFile);
-  updateEnvKey(`SYSTEM_${idUpper}_PASS`, system.pass, envFile);
-  const escapedName = system.name.replace(/'/g, "'\\''");
-  const agentsList = system.agents.join(", ");
-  const entry = `  - id: ${system.id}
-    name: '${escapedName}'
-    agents: [${agentsList}]
-`;
-  mkdirSync2(dirname2(configFile), { recursive: true });
-  if (!existsSync2(configFile) || systemCount(configFile) === 0) {
-    const content = `# yaml-language-server: $schema=
-# Ixora Systems Configuration
-# Manage with: ixora system add|remove|list
-# Credentials stored in .env (SYSTEM_<ID>_USER, SYSTEM_<ID>_PASS)
-systems:
-${entry}`;
-    writeFileSync2(configFile, content, "utf-8");
-  } else {
-    const existing = readFileSync2(configFile, "utf-8");
-    writeFileSync2(configFile, `${existing}${entry}`, "utf-8");
-  }
-  chmodSync2(configFile, 384);
-}
-function removeSystem(id, envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
-  if (!existsSync2(configFile)) {
-    throw new Error("No systems configured");
-  }
-  if (!systemIdExists(id, configFile)) {
-    throw new Error(`System '${id}' not found`);
-  }
-  const content = readFileSync2(configFile, "utf-8");
-  const lines = content.split("\n");
-  const output = [];
-  let skip = false;
-  for (const line of lines) {
-    if (line === `  - id: ${id}`) {
-      skip = true;
-      continue;
-    }
-    if (line.match(/^ {2}- id: /)) {
-      skip = false;
-    }
-    if (!skip) {
-      output.push(line);
-    }
-  }
-  writeFileSync2(configFile, output.join("\n"), "utf-8");
-  chmodSync2(configFile, 384);
-  if (existsSync2(envFile)) {
-    const idUpper = id.toUpperCase().replace(/-/g, "_");
-    const envContent = readFileSync2(envFile, "utf-8");
-    const filtered = envContent.split("\n").filter((line) => !line.startsWith(`SYSTEM_${idUpper}_`)).join("\n");
-    writeFileSync2(envFile, filtered, "utf-8");
-    chmodSync2(envFile, 384);
-  }
-}
-
-// src/lib/templates/single-compose.ts
-function generateSingleCompose() {
-  return `services:
-  agentos-db:
-    image: \${IXORA_DB_IMAGE:-agnohq/pgvector:18}
-    restart: unless-stopped
-    ports:
-      - "\${DB_PORT:-5432}:5432"
-    environment:
-      POSTGRES_USER: \${DB_USER:-ai}
-      POSTGRES_PASSWORD: \${DB_PASS:-ai}
-      POSTGRES_DB: \${DB_DATABASE:-ai}
-    volumes:
-      - pgdata:/var/lib/postgresql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U \${DB_USER:-ai}"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-  ibmi-mcp-server:
-    image: ghcr.io/ibmi-agi/ixora-mcp-server:\${IXORA_VERSION:-latest}
-    restart: unless-stopped
-    ports:
-      - "3010:3010"
-    environment:
-      DB2i_HOST: \${DB2i_HOST}
-      DB2i_USER: \${DB2i_USER}
-      DB2i_PASS: \${DB2i_PASS}
-      DB2_PORT: \${DB2_PORT:-8076}
-      MCP_TRANSPORT_TYPE: http
-      MCP_SESSION_MODE: stateless
-      YAML_AUTO_RELOAD: "true"
-      TOOLS_YAML_PATH: /usr/src/app/tools
-      YAML_ALLOW_DUPLICATE_SOURCES: "true"
-      IBMI_ENABLE_EXECUTE_SQL: "true"
-      IBMI_ENABLE_DEFAULT_TOOLS: "true"
-      MCP_AUTH_MODE: "none"
-      IBMI_HTTP_AUTH_ENABLED: "false"
-      MCP_RATE_LIMIT_ENABLED: "true"
-      MCP_RATE_LIMIT_MAX_REQUESTS: "5000"
-      MCP_RATE_LIMIT_WINDOW_MS: "60000"
-      MCP_RATE_LIMIT_SKIP_DEV: "true"
-      MCP_POOL_QUERY_TIMEOUT_MS: "120000"
-    healthcheck:
-      test: ["CMD-SHELL", "node -e \\"fetch('http://localhost:3010/healthz').then(function(r){process.exit(r.ok?0:1)}).catch(function(){process.exit(1)})\\""]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-      start_period: 3s
-
-  api:
-    image: ghcr.io/ibmi-agi/ixora-api:\${IXORA_VERSION:-latest}
-    command: uvicorn app.main:app --host 0.0.0.0 --port 8000
-    restart: unless-stopped
-    ports:
-      - "8000:8000"
-    environment:
-      ANTHROPIC_API_KEY: \${ANTHROPIC_API_KEY:-}
-      OPENAI_API_KEY: \${OPENAI_API_KEY:-}
-      GOOGLE_API_KEY: \${GOOGLE_API_KEY:-}
-      OLLAMA_HOST: \${OLLAMA_HOST:-http://host.docker.internal:11434}
-      IXORA_AGENT_MODEL: \${IXORA_AGENT_MODEL:-anthropic:claude-sonnet-4-6}
-      IXORA_TEAM_MODEL: \${IXORA_TEAM_MODEL:-anthropic:claude-haiku-4-5}
-      DB_HOST: agentos-db
-      DB_PORT: "5432"
-      DB_USER: \${DB_USER:-ai}
-      DB_PASS: \${DB_PASS:-ai}
-      DB_DATABASE: \${DB_DATABASE:-ai}
-      MCP_URL: http://ibmi-mcp-server:3010/mcp
-      IAASSIST_DEPLOYMENT_CONFIG: app/config/deployments/\${IXORA_PROFILE:-full}.yaml
-      DATA_DIR: /data
-      RUNTIME_ENV: docker
-      WAIT_FOR_DB: "True"
-      RAG_API_URL: \${RAG_API_URL:-}
-      RAG_API_TIMEOUT: \${RAG_API_TIMEOUT:-120}
-      AUTH_ENABLED: "false"
-      MCP_AUTH_MODE: "none"
-      CORS_ORIGINS: \${CORS_ORIGINS:-*}
-      IXORA_ENABLE_BUILDER: "true"
-      DB2i_HOST: \${DB2i_HOST}
-      DB2i_USER: \${DB2i_USER}
-      DB2i_PASS: \${DB2i_PASS}
-      DB2_PORT: \${DB2_PORT:-8076}
-    volumes:
-      - agentos-data:/data
-      - type: bind
-        source: \${HOME}/.ixora/user_tools
-        target: /data/user_tools
-        bind:
-          create_host_path: true
-    depends_on:
-      agentos-db:
-        condition: service_healthy
-      ibmi-mcp-server:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "python -c \\"import urllib.request,sys; sys.exit(0 if urllib.request.urlopen('http://127.0.0.1:8000/health', timeout=3).getcode()==200 else 1)\\""]
-      interval: 10s
-      timeout: 5s
-      retries: 6
-      start_period: 30s
-
-  ui:
-    image: ghcr.io/ibmi-agi/ixora-ui:\${IXORA_VERSION:-latest}
-    restart: unless-stopped
-    ports:
-      - "3000:3000"
-    environment:
-      NEXT_PUBLIC_API_URL: http://localhost:8000
-    depends_on:
-      api:
-        condition: service_healthy
-
-volumes:
-  pgdata:
-  agentos-data:
-`;
-}
-
-// src/lib/templates/multi-compose.ts
-function generateMultiCompose(envFile = ENV_FILE, configFile = SYSTEMS_CONFIG) {
-  const version = envGet("IXORA_VERSION", envFile) || "latest";
-  const dbImage = process.env["IXORA_DB_IMAGE"] ?? "agnohq/pgvector:18";
-  let content = `# Auto-generated for multi-system deployment
-# Regenerated on every start. Edit ixora-systems.yaml instead.
-services:
-  agentos-db:
-    image: ${dbImage}
-    restart: unless-stopped
-    ports:
-      - "\${DB_PORT:-5432}:5432"
-    environment:
-      POSTGRES_USER: \${DB_USER:-ai}
-      POSTGRES_PASSWORD: \${DB_PASS:-ai}
-      POSTGRES_DB: \${DB_DATABASE:-ai}
-    volumes:
-      - pgdata:/var/lib/postgresql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U \${DB_USER:-ai}"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-`;
-  let apiPort = 8e3;
-  let firstApi = "";
-  const allSystems = [];
-  const primaryHost = envGet("DB2i_HOST", envFile);
-  if (primaryHost) {
-    updateEnvKey("SYSTEM_DEFAULT_HOST", primaryHost, envFile);
-    updateEnvKey(
-      "SYSTEM_DEFAULT_PORT",
-      envGet("DB2_PORT", envFile) || "8076",
-      envFile
-    );
-    updateEnvKey("SYSTEM_DEFAULT_USER", envGet("DB2i_USER", envFile), envFile);
-    updateEnvKey("SYSTEM_DEFAULT_PASS", envGet("DB2i_PASS", envFile), envFile);
-    allSystems.push({ id: "default", name: primaryHost });
-  }
-  const additionalSystems = readSystems(configFile);
-  for (const sys of additionalSystems) {
-    allSystems.push({ id: sys.id, name: sys.name });
-  }
-  for (const sys of allSystems) {
-    const idUpper = sys.id.toUpperCase().replace(/-/g, "_");
-    content += `  mcp-${sys.id}:
-    image: ghcr.io/ibmi-agi/ixora-mcp-server:\${IXORA_VERSION:-${version}}
-    restart: unless-stopped
-    environment:
-      DB2i_HOST: \${SYSTEM_${idUpper}_HOST}
-      DB2i_USER: \${SYSTEM_${idUpper}_USER}
-      DB2i_PASS: \${SYSTEM_${idUpper}_PASS}
-      DB2_PORT: \${SYSTEM_${idUpper}_PORT:-8076}
-      MCP_TRANSPORT_TYPE: http
-      MCP_SESSION_MODE: stateless
-      YAML_AUTO_RELOAD: "true"
-      TOOLS_YAML_PATH: /usr/src/app/tools
-      YAML_ALLOW_DUPLICATE_SOURCES: "true"
-      IBMI_ENABLE_EXECUTE_SQL: "true"
-      IBMI_ENABLE_DEFAULT_TOOLS: "true"
-      MCP_AUTH_MODE: "none"
-      IBMI_HTTP_AUTH_ENABLED: "false"
-      MCP_POOL_QUERY_TIMEOUT_MS: "120000"
-    healthcheck:
-      test: ["CMD-SHELL", "node -e \\"fetch('http://localhost:3010/healthz').then(function(r){process.exit(r.ok?0:1)}).catch(function(){process.exit(1)})\\""]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-      start_period: 3s
-
-`;
-    content += `  api-${sys.id}:
-    image: ghcr.io/ibmi-agi/ixora-api:\${IXORA_VERSION:-${version}}
-    command: uvicorn app.main:app --host 0.0.0.0 --port 8000
-    restart: unless-stopped
-    ports:
-      - "${apiPort}:8000"
-    environment:
-      ANTHROPIC_API_KEY: \${ANTHROPIC_API_KEY:-}
-      OPENAI_API_KEY: \${OPENAI_API_KEY:-}
-      GOOGLE_API_KEY: \${GOOGLE_API_KEY:-}
-      OLLAMA_HOST: \${OLLAMA_HOST:-http://host.docker.internal:11434}
-      IXORA_AGENT_MODEL: \${IXORA_AGENT_MODEL:-anthropic:claude-sonnet-4-6}
-      IXORA_TEAM_MODEL: \${IXORA_TEAM_MODEL:-anthropic:claude-haiku-4-5}
-      DB_HOST: agentos-db
-      DB_PORT: "5432"
-      DB_USER: \${DB_USER:-ai}
-      DB_PASS: \${DB_PASS:-ai}
-      DB_DATABASE: \${DB_DATABASE:-ai}
-      MCP_URL: http://mcp-${sys.id}:3010/mcp
-      IXORA_SYSTEM_ID: ${sys.id}
-      IXORA_SYSTEM_NAME: ${sys.name}
-      IAASSIST_DEPLOYMENT_CONFIG: app/config/deployments/\${IXORA_PROFILE:-full}.yaml
-      DATA_DIR: /data
-      RUNTIME_ENV: docker
-      WAIT_FOR_DB: "True"
-      CORS_ORIGINS: \${CORS_ORIGINS:-*}
-      AUTH_ENABLED: "false"
-      MCP_AUTH_MODE: "none"
-      IXORA_ENABLE_BUILDER: "true"
-      DB2i_HOST: \${SYSTEM_${idUpper}_HOST}
-      DB2i_USER: \${SYSTEM_${idUpper}_USER}
-      DB2i_PASS: \${SYSTEM_${idUpper}_PASS}
-      DB2_PORT: \${SYSTEM_${idUpper}_PORT:-8076}
-    volumes:
-      - agentos-data:/data
-      - type: bind
-        source: \${HOME}/.ixora/user_tools
-        target: /data/user_tools
-        bind:
-          create_host_path: true
-    depends_on:
-      agentos-db:
-        condition: service_healthy
-      mcp-${sys.id}:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "python -c \\"import urllib.request,sys; sys.exit(0 if urllib.request.urlopen('http://127.0.0.1:8000/health', timeout=3).getcode()==200 else 1)\\""]
-      interval: 10s
-      timeout: 5s
-      retries: 6
-      start_period: 30s
-
-`;
-    if (!firstApi) firstApi = `api-${sys.id}`;
-    apiPort++;
-  }
-  content += `  ui:
-    image: ghcr.io/ibmi-agi/ixora-ui:\${IXORA_VERSION:-${version}}
-    restart: unless-stopped
-    ports:
-      - "3000:3000"
-    environment:
-      NEXT_PUBLIC_API_URL: http://localhost:8000
-    depends_on:
-      ${firstApi}:
-        condition: service_healthy
-
-volumes:
-  pgdata:
-  agentos-data:
-`;
-  return content;
-}
-
-// src/lib/ui.ts
+import { existsSync } from "fs";
 import chalk from "chalk";
-function info(message) {
-  console.log(`${chalk.blue("==>")} ${chalk.bold(message)}`);
-}
-function success(message) {
-  console.log(`${chalk.green("==>")} ${chalk.bold(message)}`);
-}
-function warn(message) {
-  console.log(`${chalk.yellow("Warning:")} ${message}`);
-}
-function error(message) {
-  console.error(`${chalk.red("Error:")} ${message}`);
-}
-function die(message) {
-  error(message);
-  process.exit(1);
-}
-function maskValue(value) {
-  if (!value) return chalk.dim("(not set)");
-  if (value.length <= 4) return "****";
-  return `${value.slice(0, 4)}****`;
-}
-function isSensitiveKey(key) {
-  const upper = key.toUpperCase();
-  return /KEY|TOKEN|PASS|SECRET|ENCRYPT/.test(upper);
-}
-function dim(message) {
-  return chalk.dim(message);
-}
-function bold(message) {
-  return chalk.bold(message);
-}
-function cyan(message) {
-  return chalk.cyan(message);
-}
-function section(title) {
-  console.log(
-    `  ${chalk.dim(`\u2500\u2500 ${title} ${"\u2500".repeat(Math.max(0, 49 - title.length))}`)}`
-  );
-}
-
-// src/lib/compose.ts
-async function runCompose(composeCmd, args, options = {}) {
-  const [bin, subArgs] = getComposeParts(composeCmd);
-  const fullArgs = [
-    ...subArgs,
-    "-p",
-    "ixora",
-    "-f",
-    COMPOSE_FILE,
-    "--env-file",
-    ENV_FILE,
-    ...args
-  ];
-  try {
-    const result = await execa2(bin, fullArgs, {
-      stdio: "inherit",
-      ...options
-    });
-    return {
-      stdout: String(result.stdout ?? ""),
-      stderr: String(result.stderr ?? ""),
-      exitCode: result.exitCode ?? 0
-    };
-  } catch (err) {
-    const exitCode = err && typeof err === "object" && "exitCode" in err ? err.exitCode : 1;
-    error(`Command failed: ${composeCmd} ${args.join(" ")}`);
-    console.log(`  Check ${bold("ixora logs")} for details.`);
-    process.exit(exitCode);
-  }
-}
-async function runComposeCapture(composeCmd, args) {
-  const [bin, subArgs] = getComposeParts(composeCmd);
-  const fullArgs = [
-    ...subArgs,
-    "-p",
-    "ixora",
-    "-f",
-    COMPOSE_FILE,
-    "--env-file",
-    ENV_FILE,
-    ...args
-  ];
-  const result = await execa2(bin, fullArgs, { stdio: "pipe" });
-  return result.stdout;
-}
-function writeComposeFile(envFile = ENV_FILE) {
-  mkdirSync3(IXORA_DIR, { recursive: true });
-  const total = totalSystemCount(envFile);
-  let content;
-  if (total > 1) {
-    content = generateMultiCompose(envFile);
-  } else {
-    content = generateSingleCompose();
-  }
-  writeFileSync3(COMPOSE_FILE, content, "utf-8");
-}
-function requireInstalled() {
-  if (!existsSync3(ENV_FILE)) {
-    throw new Error("ixora is not installed. Run: ixora install");
-  }
-}
-function requireComposeFile() {
-  if (!existsSync3(COMPOSE_FILE)) {
-    throw new Error("ixora is not installed. Run: ixora install");
-  }
-}
-function resolveService(input3) {
-  return input3.replace(/^ixora-/, "").replace(/-\d+$/, "");
-}
-
-// src/commands/version.ts
 async function cmdVersion(opts) {
   console.log(`ixora ${SCRIPT_VERSION}`);
-  if (!existsSync4(ENV_FILE)) return;
+  if (!existsSync(ENV_FILE)) return;
   const version = envGet("IXORA_VERSION") || "latest";
   const agentModel = envGet("IXORA_AGENT_MODEL") || "anthropic:claude-sonnet-4-6";
   console.log(`  images:  ${version}`);
   console.log(`  model:   ${agentModel}`);
-  if (existsSync4(COMPOSE_FILE)) {
+  if (existsSync(COMPOSE_FILE)) {
     try {
       const composeCmd = await detectComposeCmd(opts?.runtime);
       const output = await runComposeCapture(composeCmd, [
@@ -806,11 +66,11 @@ async function cmdVersion(opts) {
         const images = parseComposeImages(output);
         if (images.length > 0) {
           console.log();
-          console.log(`  ${chalk2.bold("Running containers:")}`);
+          console.log(`  ${chalk.bold("Running containers:")}`);
           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)}`
             );
@@ -840,7 +100,7 @@ function parseComposeImages(output) {
 }
 
 // src/commands/status.ts
-import chalk3 from "chalk";
+import chalk2 from "chalk";
 async function cmdStatus(opts) {
   try {
     requireComposeFile();
@@ -858,9 +118,9 @@ async function cmdStatus(opts) {
   const profile = envGet("IXORA_PROFILE") || "full";
   const version = envGet("IXORA_VERSION") || "latest";
   console.log();
-  console.log(`  ${chalk3.bold("Profile:")}  ${profile}`);
-  console.log(`  ${chalk3.bold("Version:")}  ${version}`);
-  console.log(`  ${chalk3.bold("Config:")}   ${IXORA_DIR}`);
+  console.log(`  ${chalk2.bold("Profile:")}  ${profile}`);
+  console.log(`  ${chalk2.bold("Version:")}  ${version}`);
+  console.log(`  ${chalk2.bold("Config:")}   ${IXORA_DIR}`);
   console.log();
   await runCompose(composeCmd, ["ps"]);
   try {
@@ -873,14 +133,12 @@ async function cmdStatus(opts) {
       const images = parseComposeImages2(output);
       if (images.length > 0) {
         console.log();
-        console.log(`  ${chalk3.bold("Images:")}`);
+        console.log(`  ${chalk2.bold("Images:")}`);
         for (const img of images) {
           const tag = img.Tag || "unknown";
           const id = img.ID ? ` (${img.ID.slice(0, 12)})` : "";
           const tagDisplay = tag === "latest" ? `${tag}${dim(id)}` : tag;
-          console.log(
-            `    ${dim(`${img.Repository || ""}:`)}${tagDisplay}`
-          );
+          console.log(`    ${dim(`${img.Repository || ""}:`)}${tagDisplay}`);
         }
         console.log();
       }
@@ -906,69 +164,6 @@ function parseComposeImages2(output) {
   }
 }
 
-// src/lib/health.ts
-import { execa as execa3 } from "execa";
-import ora from "ora";
-async function waitForHealthy(composeCmd, timeout = HEALTH_TIMEOUT) {
-  const spinner = ora("Waiting for services to become healthy...").start();
-  const runtime = getRuntimeBin(composeCmd);
-  let apiContainer = "";
-  try {
-    const output = await runComposeCapture(composeCmd, [
-      "ps",
-      "--format",
-      "{{.Name}}"
-    ]);
-    const containers = output.split("\n").filter(Boolean);
-    apiContainer = containers.find((c) => c.includes("ixora-api-")) ?? "";
-  } catch {
-  }
-  if (!apiContainer) {
-    spinner.stop();
-    warn("Could not find API container \u2014 skipping health check");
-    return true;
-  }
-  spinner.text = `Waiting for services to become healthy (up to ${timeout}s)...`;
-  let elapsed = 0;
-  while (elapsed < timeout) {
-    try {
-      const stateResult = await execa3(runtime, [
-        "inspect",
-        "--format",
-        "{{.State.Status}}",
-        apiContainer
-      ]);
-      const state = stateResult.stdout.trim();
-      if (state === "exited" || state === "dead") {
-        spinner.fail("API container failed to start");
-        console.log(`
-  Run ${bold("ixora logs api")} to investigate.`);
-        return false;
-      }
-      const healthResult = await execa3(runtime, [
-        "inspect",
-        "--format",
-        "{{.State.Health.Status}}",
-        apiContainer
-      ]);
-      const health = healthResult.stdout.trim();
-      if (health === "healthy") {
-        spinner.succeed("Services are healthy");
-        return true;
-      }
-    } catch {
-    }
-    await new Promise((r) => setTimeout(r, 2e3));
-    elapsed += 2;
-    spinner.text = `Waiting for services to become healthy (${elapsed}s/${timeout}s)...`;
-  }
-  spinner.warn(
-    `Services did not become healthy within ${timeout}s \u2014 they may still be starting`
-  );
-  console.log(`  Run ${bold("ixora logs api")} to investigate.`);
-  return false;
-}
-
 // src/commands/start.ts
 async function cmdStart(opts) {
   try {
@@ -996,24 +191,16 @@ async function cmdStart(opts) {
   writeComposeFile();
   success("Wrote docker-compose.yml");
   info("Starting ixora services...");
-  await runCompose(composeCmd, ["up", "-d"]);
+  await runCompose(composeCmd, ["up", "-d", "--remove-orphans"]);
   await waitForHealthy(composeCmd);
-  const profile = envGet("IXORA_PROFILE") || "full";
-  const total = totalSystemCount();
+  const systems = readSystems();
   console.log();
   success("ixora is running!");
   console.log(`  ${bold("UI:")}      http://localhost:3000`);
   console.log(`  ${bold("API:")}     http://localhost:8000`);
-  console.log(`  ${bold("Profile:")} ${profile}`);
-  if (total > 1) {
-    console.log(`  ${bold("Systems:")} ${total}`);
+  if (systems.length > 1) {
+    console.log(`  ${bold("Systems:")} ${systems.length}`);
     let port = 8e3;
-    const primaryHost = envGet("DB2i_HOST");
-    if (primaryHost) {
-      console.log(`    ${dim(`:${port} \u2192 default (${primaryHost})`)}`);
-      port++;
-    }
-    const systems = readSystems();
     for (const sys of systems) {
       const idUpper = sys.id.toUpperCase().replace(/-/g, "_");
       const sysHost = envGet(`SYSTEM_${idUpper}_HOST`);
@@ -1021,8 +208,10 @@ async function cmdStart(opts) {
       port++;
     }
     console.log(
-      `  ${dim("Note: UI connects to primary system (:8000) only. Use API ports for other systems.")}`
+      `  ${dim("Note: UI connects to first system (:8000) only. Use API ports for other systems.")}`
     );
+  } else if (systems.length === 1) {
+    console.log(`  ${bold("Profile:")} ${systems[0].profile || "full"}`);
   }
   console.log();
 }
@@ -1047,8 +236,8 @@ async function cmdStop(opts) {
   success("Services stopped");
 }
 
-// src/commands/restart.ts
-async function cmdRestart(opts, service) {
+// src/commands/logs.ts
+async function cmdLogs(opts, service) {
   try {
     requireComposeFile();
   } catch (e) {
@@ -1064,45 +253,47 @@ async function cmdRestart(opts, service) {
   detectPlatform();
   if (service) {
     const svc = resolveService(service);
-    info(`Restarting ${svc}...`);
-    await runCompose(composeCmd, [
-      "up",
-      "-d",
-      "--force-recreate",
-      "--no-deps",
-      svc
-    ]);
-    success(`Restarted ${svc}`);
+    await runCompose(composeCmd, ["logs", "-f", svc]);
   } else {
-    info("Restarting all services...");
-    await runCompose(composeCmd, ["up", "-d", "--force-recreate"]);
-    await waitForHealthy(composeCmd);
-    console.log();
-    success("All services restarted");
+    await runCompose(composeCmd, ["logs", "-f"]);
   }
 }
 
-// src/commands/logs.ts
-async function cmdLogs(opts, service) {
-  try {
-    requireComposeFile();
-  } catch (e) {
-    die(e.message);
+// 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}`);
   }
-  let composeCmd;
-  try {
-    composeCmd = await detectComposeCmd(opts.runtime);
-    await verifyRuntimeRunning(composeCmd);
-  } catch (e) {
-    die(e.message);
+  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}`);
   }
-  detectPlatform();
-  if (service) {
-    const svc = resolveService(service);
-    await runCompose(composeCmd, ["logs", "-f", svc]);
-  } else {
-    await runCompose(composeCmd, ["logs", "-f"]);
+  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
@@ -1121,13 +312,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,30 +351,29 @@ 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();
 }
 
 // src/commands/uninstall.ts
-import { existsSync as existsSync5, rmSync } from "fs";
+import { existsSync as existsSync2, rmSync } from "fs";
 import { confirm } from "@inquirer/prompts";
-import chalk4 from "chalk";
-import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import chalk3 from "chalk";
+import { homedir } from "os";
+import { join } from "path";
 async function cmdUninstall(opts) {
   let composeCmd;
   try {
@@ -1173,19 +385,17 @@ async function cmdUninstall(opts) {
   detectPlatform();
   if (opts.purge) {
     console.log(
-      chalk4.yellow(
+      chalk3.yellow(
         "This will remove all containers, images, volumes, and configuration."
       )
     );
     console.log(
-      chalk4.yellow(
+      chalk3.yellow(
         "All agent data (sessions, memory) will be permanently deleted."
       )
     );
   } else {
-    console.log(
-      chalk4.yellow("This will stop containers and remove images.")
-    );
+    console.log(chalk3.yellow("This will stop containers and remove images."));
     console.log(
       dim(
         `Configuration in ${IXORA_DIR} will be preserved. Run 'ixora start' to re-pull and restart.`
@@ -1200,7 +410,7 @@ async function cmdUninstall(opts) {
     info("Cancelled");
     return;
   }
-  if (existsSync5(COMPOSE_FILE)) {
+  if (existsSync2(COMPOSE_FILE)) {
     info("Stopping services and removing images...");
     try {
       if (opts.purge) {
@@ -1223,8 +433,8 @@ async function cmdUninstall(opts) {
       `  Run ${bold("ixora uninstall --purge")} to remove everything.`
     );
   }
-  const binPath = join2(homedir2(), ".local", "bin", "ixora");
-  if (existsSync5(binPath)) {
+  const binPath = join(homedir(), ".local", "bin", "ixora");
+  if (existsSync2(binPath)) {
     console.log(
       `  The ${bold("ixora")} command is still available at ${dim(binPath)}`
     );
@@ -1233,19 +443,15 @@ async function cmdUninstall(opts) {
 }
 
 // src/commands/install.ts
-import { existsSync as existsSync6 } from "fs";
-import {
-  input,
-  password,
-  select
-} from "@inquirer/prompts";
+import { existsSync as existsSync3 } from "fs";
+import { input, password, select as select2 } from "@inquirer/prompts";
 async function promptModelProvider() {
   const curAgentModel = envGet("IXORA_AGENT_MODEL");
   let defaultProvider = "anthropic";
   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: [
       {
@@ -1352,7 +558,14 @@ async function promptModelProvider() {
     if (!apiKeyValue && curKey) apiKeyValue = curKey;
   }
   success(`Provider: ${provider} (${agentModel})`);
-  return { provider, agentModel, teamModel, apiKeyVar, apiKeyValue, ollamaHost };
+  return {
+    provider,
+    agentModel,
+    teamModel,
+    apiKeyVar,
+    apiKeyValue,
+    ollamaHost
+  };
 }
 async function promptIbmiConnection() {
   info("IBM i Connection");
@@ -1360,28 +573,43 @@ 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)}`,
@@ -1405,12 +633,15 @@ async function cmdInstall(opts) {
   detectPlatform();
   info(`Using: ${composeCmd}`);
   console.log();
-  if (existsSync6(IXORA_DIR)) {
+  if (existsSync3(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" },
+        {
+          name: "Reconfigure \u2014 re-run setup prompts (overwrites current config)",
+          value: "reconfigure"
+        },
         { name: "Cancel \u2014 keep existing installation", value: "cancel" }
       ],
       default: "reconfigure"
@@ -1424,11 +655,38 @@ 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();
+  const displayName = await input({
+    message: "Display name:",
+    default: host
+  });
   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,11 +696,27 @@ async function cmdInstall(opts) {
     db2Host: host,
     db2User: user,
     db2Pass: pass,
+    db2Port: port,
     profile,
     version
   };
   writeEnvFile(envConfig);
   success("Wrote .env");
+  if (systemIdExists("default")) {
+    const { removeSystem: removeSystem2 } = await import("./systems-IM6IZCES.js");
+    removeSystem2("default");
+  }
+  addSystem({
+    id: "default",
+    name: displayName,
+    profile,
+    agents: [],
+    host,
+    port,
+    user,
+    pass
+  });
+  success("Wrote ixora-systems.yaml");
   writeComposeFile();
   success("Wrote docker-compose.yml");
   if (opts.pull !== false) {
@@ -1450,7 +724,7 @@ async function cmdInstall(opts) {
     await runCompose(composeCmd, ["pull"]);
   }
   info("Starting services...");
-  await runCompose(composeCmd, ["up", "-d"]);
+  await runCompose(composeCmd, ["up", "-d", "--remove-orphans"]);
   await waitForHealthy(composeCmd);
   console.log();
   success("ixora is running!");
@@ -1467,15 +741,15 @@ async function cmdInstall(opts) {
 }
 
 // src/commands/config.ts
-import { existsSync as existsSync7, readFileSync as readFileSync3 } from "fs";
-import { execa as execa4 } from "execa";
-import chalk5 from "chalk";
+import { existsSync as existsSync4, readFileSync } from "fs";
+import { execa } from "execa";
+import chalk4 from "chalk";
 function cmdConfigShow() {
-  if (!existsSync7(ENV_FILE)) {
+  if (!existsSync4(ENV_FILE)) {
     die("ixora is not installed. Run: ixora install");
   }
   console.log();
-  console.log(`  ${chalk5.bold("Configuration")}  ${ENV_FILE}`);
+  console.log(`  ${chalk4.bold("Configuration")}  ${ENV_FILE}`);
   console.log();
   section("Model");
   const agentModel = envGet("IXORA_AGENT_MODEL") || "anthropic:claude-sonnet-4-6";
@@ -1486,9 +760,12 @@ function cmdConfigShow() {
   const ollamaHost = envGet("OLLAMA_HOST");
   console.log(`  ${cyan("IXORA_AGENT_MODEL")}   ${agentModel}`);
   console.log(`  ${cyan("IXORA_TEAM_MODEL")}    ${teamModel}`);
-  if (anthKey) console.log(`  ${cyan("ANTHROPIC_API_KEY")}   ${maskValue(anthKey)}`);
-  if (oaiKey) console.log(`  ${cyan("OPENAI_API_KEY")}      ${maskValue(oaiKey)}`);
-  if (googKey) console.log(`  ${cyan("GOOGLE_API_KEY")}      ${maskValue(googKey)}`);
+  if (anthKey)
+    console.log(`  ${cyan("ANTHROPIC_API_KEY")}   ${maskValue(anthKey)}`);
+  if (oaiKey)
+    console.log(`  ${cyan("OPENAI_API_KEY")}      ${maskValue(oaiKey)}`);
+  if (googKey)
+    console.log(`  ${cyan("GOOGLE_API_KEY")}      ${maskValue(googKey)}`);
   if (ollamaHost) console.log(`  ${cyan("OLLAMA_HOST")}         ${ollamaHost}`);
   console.log();
   section("IBM i Connection");
@@ -1496,8 +773,12 @@ function cmdConfigShow() {
   const db2User = envGet("DB2i_USER");
   const db2Pass = envGet("DB2i_PASS");
   const db2Port = envGet("DB2_PORT");
-  console.log(`  ${cyan("DB2i_HOST")}           ${db2Host || dim("(not set)")}`);
-  console.log(`  ${cyan("DB2i_USER")}           ${db2User || dim("(not set)")}`);
+  console.log(
+    `  ${cyan("DB2i_HOST")}           ${db2Host || dim("(not set)")}`
+  );
+  console.log(
+    `  ${cyan("DB2i_USER")}           ${db2User || dim("(not set)")}`
+  );
   console.log(`  ${cyan("DB2i_PASS")}           ${maskValue(db2Pass)}`);
   console.log(`  ${cyan("DB2_PORT")}            ${db2Port || "8076"}`);
   console.log();
@@ -1521,7 +802,7 @@ function cmdConfigShow() {
     "IXORA_AGENT_MODEL",
     "IXORA_TEAM_MODEL"
   ]);
-  const content = readFileSync3(ENV_FILE, "utf-8");
+  const content = readFileSync(ENV_FILE, "utf-8");
   const extraLines = content.split("\n").filter((line) => {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) return false;
@@ -1546,7 +827,7 @@ function cmdConfigShow() {
   console.log();
 }
 function cmdConfigSet(key, value) {
-  if (!existsSync7(ENV_FILE)) {
+  if (!existsSync4(ENV_FILE)) {
     die("ixora is not installed. Run: ixora install");
   }
   updateEnvKey(key, value);
@@ -1554,7 +835,7 @@ function cmdConfigSet(key, value) {
   console.log(`  Restart to apply: ${bold("ixora restart")}`);
 }
 async function cmdConfigEdit() {
-  if (!existsSync7(ENV_FILE)) {
+  if (!existsSync4(ENV_FILE)) {
     die("ixora is not installed. Run: ixora install");
   }
   const editor = process.env["EDITOR"] ?? process.env["VISUAL"] ?? "";
@@ -1562,7 +843,7 @@ async function cmdConfigEdit() {
   if (!editorCmd) {
     for (const candidate of ["vim", "vi", "nano"]) {
       try {
-        await execa4("which", [candidate]);
+        await execa("which", [candidate]);
         editorCmd = candidate;
         break;
       } catch {
@@ -1574,15 +855,15 @@ async function cmdConfigEdit() {
     die("No editor found. Set $EDITOR or install vim/nano.");
   }
   info(`Opening ${editorCmd}...`);
-  await execa4(editorCmd, [ENV_FILE], { stdio: "inherit" });
+  await execa(editorCmd, [ENV_FILE], { stdio: "inherit" });
   console.log();
   success("Config saved");
   console.log(`  Restart to apply: ${bold("ixora restart")}`);
 }
 
 // src/commands/system.ts
-import { input as input2, password as password2, select as select2 } from "@inquirer/prompts";
-import chalk6 from "chalk";
+import { input as input2, password as password2, select as select3, confirm as confirm3 } from "@inquirer/prompts";
+import chalk5 from "chalk";
 async function cmdSystemAdd() {
   info("Add an IBM i system");
   console.log();
@@ -1591,10 +872,7 @@ async function cmdSystemAdd() {
     validate: (value) => {
       const cleaned = value.toLowerCase().replace(/[^a-z0-9-]/g, "");
       if (!cleaned) return "System ID must contain alphanumeric characters";
-      if (cleaned === "default")
-        return "System ID 'default' is reserved for the primary system";
-      if (systemIdExists(cleaned))
-        return `System '${cleaned}' already exists`;
+      if (systemIdExists(cleaned)) return `System '${cleaned}' already exists`;
       return true;
     },
     transformer: (value) => value.toLowerCase().replace(/[^a-z0-9-]/g, "")
@@ -1605,43 +883,39 @@ async function cmdSystemAdd() {
     default: cleanId
   });
   const host = await input2({
-    message: "IBM i hostname",
-    validate: (value) => value.trim() ? true : "Hostname is required"
-  });
-  const port = await input2({
-    message: "IBM i Mapepire port",
-    default: "8076"
+    message: "IBM i hostname:",
+    validate: (value) => value.trim() ? true : "IBM i hostname is required"
   });
   const user = await input2({
-    message: "IBM i username",
-    validate: (value) => value.trim() ? true : "Username is required"
+    message: "IBM i username:",
+    validate: (value) => value.trim() ? true : "IBM i username is required"
   });
   const pass = await password2({
-    message: "IBM i password",
+    message: "IBM i password:",
     validate: (value) => value ? true : "Password is required"
   });
-  const agentChoice = await select2({
-    message: "Select agents for this system",
-    choices: [
-      {
-        name: "All agents (security, operations, knowledge)",
-        value: "all"
-      },
-      { name: "Security + Operations", value: "security-ops" },
-      { name: "Security only", value: "security" },
-      {
-        name: "Operations only (health, database, work mgmt, config)",
-        value: "operations"
-      },
-      { name: "Knowledge only", value: "knowledge" }
-    ],
-    default: "all"
+  const port = await input2({
+    message: "IBM i port:",
+    default: "8076",
+    validate: (value) => {
+      const n = parseInt(value.trim(), 10);
+      if (isNaN(n) || n < 1 || n > 65535) return "Enter a valid port number";
+      return true;
+    }
+  });
+  const profile = await select3({
+    message: "Select an agent profile",
+    choices: VALID_PROFILES.map((p) => ({
+      name: `${PROFILES[p].name.padEnd(14)} ${dim(PROFILES[p].description)}`,
+      value: p
+    })),
+    default: "full"
   });
-  const agents = AGENT_PRESETS[agentChoice];
   addSystem({
     id: cleanId,
     name,
-    agents: [...agents],
+    profile,
+    agents: [],
     host: host.trim(),
     port: port.trim(),
     user: user.trim(),
@@ -1651,8 +925,18 @@ async function cmdSystemAdd() {
   success(`Added system '${cleanId}' (${host.trim()})`);
   console.log(`  Credentials stored in ${dim(ENV_FILE)}`);
   console.log(`  Systems: ${systemCount()}`);
-  console.log(`  Restart to apply: ${bold("ixora restart")}`);
   console.log();
+  const shouldRestart = await confirm3({
+    message: "Restart services now to apply?",
+    default: true
+  });
+  if (shouldRestart) {
+    const { cmdRestart: cmdRestart2 } = await import("./restart-FTYGBLP7.js");
+    await cmdRestart2({});
+  } else {
+    console.log(`  Restart to apply: ${bold("ixora restart")}`);
+    console.log();
+  }
 }
 function cmdSystemRemove(id) {
   try {
@@ -1664,31 +948,98 @@ function cmdSystemRemove(id) {
   console.log(`  Systems: ${systemCount()}`);
   console.log(`  Restart to apply: ${bold("ixora restart")}`);
 }
+function validateSystemId(id) {
+  if (!systemIdExists(id)) die(`System '${id}' not found`);
+}
+function systemServices(id) {
+  return [`mcp-${id}`, `api-${id}`];
+}
+async function cmdSystemStart(id) {
+  try {
+    requireInstalled();
+  } catch (e) {
+    die(e.message);
+  }
+  validateSystemId(id);
+  let composeCmd;
+  try {
+    composeCmd = await detectComposeCmd();
+    await verifyRuntimeRunning(composeCmd);
+  } catch (e) {
+    die(e.message);
+  }
+  detectPlatform();
+  writeComposeFile();
+  const services = systemServices(id);
+  info(`Starting system '${id}' (${services.join(", ")})...`);
+  await runCompose(composeCmd, ["up", "-d", ...services]);
+  await waitForHealthy(composeCmd);
+  success(`System '${id}' started`);
+}
+async function cmdSystemStop(id) {
+  try {
+    requireInstalled();
+  } catch (e) {
+    die(e.message);
+  }
+  validateSystemId(id);
+  let composeCmd;
+  try {
+    composeCmd = await detectComposeCmd();
+    await verifyRuntimeRunning(composeCmd);
+  } catch (e) {
+    die(e.message);
+  }
+  detectPlatform();
+  writeComposeFile();
+  const services = systemServices(id);
+  info(`Stopping system '${id}' (${services.join(", ")})...`);
+  await runCompose(composeCmd, ["stop", ...services]);
+  success(`System '${id}' stopped`);
+}
+async function cmdSystemRestart(id) {
+  try {
+    requireInstalled();
+  } catch (e) {
+    die(e.message);
+  }
+  validateSystemId(id);
+  let composeCmd;
+  try {
+    composeCmd = await detectComposeCmd();
+    await verifyRuntimeRunning(composeCmd);
+  } catch (e) {
+    die(e.message);
+  }
+  detectPlatform();
+  writeComposeFile();
+  const services = systemServices(id);
+  info(`Restarting system '${id}' (${services.join(", ")})...`);
+  await runCompose(composeCmd, ["up", "-d", "--force-recreate", ...services]);
+  await waitForHealthy(composeCmd);
+  success(`System '${id}' restarted`);
+}
 function cmdSystemList() {
-  const primaryHost = envGet("DB2i_HOST");
+  const systems = readSystems();
   console.log();
-  console.log(`  ${chalk6.bold("IBM i Systems")}`);
+  console.log(`  ${chalk5.bold("IBM i Systems")}`);
   console.log();
-  if (primaryHost) {
+  if (systems.length === 0) {
     console.log(
-      `  ${cyan("*")}  ${"default".padEnd(12)}  ${primaryHost.padEnd(30)}  ${dim("(primary \u2014 from install)")}`
+      `  ${dim(`No systems configured. Run: ${bold("ixora install")}`)}`
     );
   }
-  const systems = readSystems();
   for (const sys of systems) {
     const idUpper = sys.id.toUpperCase().replace(/-/g, "_");
     const sysHost = envGet(`SYSTEM_${idUpper}_HOST`) || dim("(no host)");
-    const agentsStr = sys.agents.join(", ");
+    const marker = sys.id === "default" ? cyan("*") : cyan(" ");
+    const profile = sys.profile || "full";
     console.log(
-      `  ${cyan(" ")}  ${sys.id.padEnd(12)}  ${String(sysHost).padEnd(30)}  ${agentsStr}`
+      `  ${marker}  ${sys.id.padEnd(12)}  ${String(sysHost).padEnd(30)}  ${dim(profile)}`
     );
   }
-  if (!primaryHost && systems.length === 0) {
-    console.log(`  ${dim(`No systems configured. Run: ${bold("ixora install")}`)}`);
-  }
   console.log();
-  const total = systems.length + (primaryHost ? 1 : 0);
-  if (total > 1) {
+  if (systems.length > 1) {
     console.log(
       `  ${dim("Multi-system mode: each system runs on its own port (8000, 8001, ...)")}`
     );
@@ -1704,10 +1055,7 @@ function createProgram() {
   const program2 = new Command().name("ixora").description("Manage ixora AI agent deployments on IBM i").version(SCRIPT_VERSION, "-V, --cli-version", "Show CLI version number").option(
     "--profile <name>",
     "Agent profile (full|sql-services|security|knowledge)"
-  ).option("--image-version <tag>", "Pin image version (e.g., v1.2.0)").option("--no-pull", "Skip pulling images").option("--purge", "Remove volumes too (with uninstall)").option(
-    "--runtime <name>",
-    "Force container runtime (docker or podman)"
-  );
+  ).option("--image-version <tag>", "Pin image version (e.g., v1.2.0)").option("--no-pull", "Skip pulling images").option("--purge", "Remove volumes too (with uninstall)").option("--runtime <name>", "Force container runtime (docker or podman)");
   program2.command("install").description("First-time setup (interactive)").action(async () => {
     const opts = program2.opts();
     await cmdInstall(opts);
@@ -1728,9 +1076,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();
@@ -1764,6 +1112,15 @@ function createProgram() {
   systemCmd.command("list", { isDefault: true }).description("List configured systems").action(() => {
     cmdSystemList();
   });
+  systemCmd.command("start").argument("<id>", "System ID (from ixora system)").description("Start a specific system's services").action(async (id) => {
+    await cmdSystemStart(id);
+  });
+  systemCmd.command("stop").argument("<id>", "System ID (from ixora system)").description("Stop a specific system's services").action(async (id) => {
+    await cmdSystemStop(id);
+  });
+  systemCmd.command("restart").argument("<id>", "System ID (from ixora system)").description("Restart a specific system's services").action(async (id) => {
+    await cmdSystemRestart(id);
+  });
   return program2;
 }