@celilo/cli 0.3.16 → 0.3.17

package/src/cli/commands/service-add-proxmox.ts

@@ -7,10 +7,6 @@ import * as p from '@clack/prompts';
 import {
   buildProxmoxApiUrl,
   buildTemplatePath,
-  buildTemplateUrl,
-  checkTaskStatus,
-  downloadTemplate,
-  extractTemplateFilename,
   listAvailableTemplates,
   listNodeStorage,
 } from '../../api-clients/proxmox';
@@ -20,10 +16,13 @@ import {
   testConnection as testServiceConnection,
   updateVerificationStatus,
 } from '../../services/container-service';
-import { FuelGauge } from '../fuel-gauge';
 import { celiloIntro, celiloOutro, promptPassword, promptText } from '../prompts';
 import type { CommandResult } from '../types';
 import { validateRequired } from '../validators';
+import {
+  runApplianceDownload,
+  selectUbuntuApplianceFromCatalog,
+} from './proxmox-template-selection';
 
 /**
  * Handle service add proxmox command
@@ -123,35 +122,19 @@ export async function handleServiceAddProxmox(
       validate: validateRequired('Storage'),
     });
 
-    const ubuntuVersion = await p.select({
-      message: 'Ubuntu LTS version for default template:',
-      options: [
-        { value: '24.04', label: 'Ubuntu 24.04 LTS (Noble Numbat)' },
-        { value: '22.04', label: 'Ubuntu 22.04 LTS (Jammy Jellyfish)', hint: 'Recommended' },
-        { value: '20.04', label: 'Ubuntu 20.04 LTS (Focal Fossa)' },
-      ],
-      initialValue: '22.04',
-    });
-
-    if (p.isCancel(ubuntuVersion)) {
-      p.cancel('Operation cancelled');
-      return { success: false, error: 'Cancelled by user' };
-    }
-
-    // Find storage that supports vztmpl content
+    // Find storage that supports vztmpl content. We do this BEFORE prompting
+    // for a template so the user only ever sees one storage in subsequent
+    // messages, and so the saved volid uses the right storage.
+    const credentials = {
+      api_url: apiUrl,
+      api_token_id: apiTokenId,
+      api_token_secret: apiTokenSecret,
+    };
     console.log('\nFinding storage for templates...');
-    const storageListResult = await listNodeStorage(
-      {
-        api_url: apiUrl,
-        api_token_id: apiTokenId,
-        api_token_secret: apiTokenSecret,
-      },
-      targetNode,
-    );
+    const storageListResult = await listNodeStorage(credentials, targetNode);
 
-    let templateStorage = 'local'; // Default fallback
+    let templateStorage = 'local';
     if (storageListResult.success) {
-      // Find first active storage that supports 'vztmpl' content
       const vztmplStorage = storageListResult.data.find(
         (s) => s.active && s.enabled && s.content.includes('vztmpl'),
       );
@@ -163,37 +146,34 @@ export async function handleServiceAddProxmox(
       }
     }
 
-    // Build template path
-    const lxcTemplate = buildTemplatePath(templateStorage, ubuntuVersion as string);
-    const templateFilename = extractTemplateFilename(lxcTemplate);
+    // Pick a template from Proxmox's live catalog (replaces the old hardcoded
+    // version select that built `-1`-revision URLs by hand).
+    const selectionResult = await selectUbuntuApplianceFromCatalog(credentials, targetNode);
+    if (selectionResult.kind === 'cancelled') {
+      p.cancel('Operation cancelled');
+      return { success: false, error: 'Cancelled by user' };
+    }
+    if (selectionResult.kind === 'error') {
+      return { success: false, error: selectionResult.message };
+    }
+    const templateFilename = selectionResult.choice.template;
+    const lxcTemplate = buildTemplatePath(templateStorage, templateFilename);
 
-    // Check if template exists
+    // Check if the template is already cached in the chosen storage.
     console.log(`\nChecking if template '${templateFilename}' exists...`);
-    const templatesResult = await listAvailableTemplates(
-      {
-        api_url: apiUrl,
-        api_token_id: apiTokenId,
-        api_token_secret: apiTokenSecret,
-      },
-      targetNode,
-      templateStorage,
-    );
+    const templatesResult = await listAvailableTemplates(credentials, targetNode, templateStorage);
 
     let templateExists = false;
     if (templatesResult.success) {
       templateExists = templatesResult.data.some((t) => t.volid.includes(templateFilename));
     }
 
-    // Save the service FIRST so credentials aren't lost if template download fails
+    // Save the service FIRST so credentials aren't lost if the download fails.
     const service = await addContainerService({
       name,
       providerName: 'proxmox',
       zones: zones as unknown as NetworkZone[],
-      apiCredentials: {
-        api_url: apiUrl,
-        api_token_id: apiTokenId,
-        api_token_secret: apiTokenSecret,
-      },
+      apiCredentials: credentials,
       providerConfig: {
         default_target_node: targetNode,
         lxc_template: lxcTemplate,
@@ -203,7 +183,6 @@ export async function handleServiceAddProxmox(
 
     console.log(`✓ Service '${service.serviceId}' saved\n`);
 
-    // Now attempt template download (service is already saved)
     let templateReady = templateExists;
 
     if (!templateExists) {
@@ -220,89 +199,32 @@ export async function handleServiceAddProxmox(
       }
 
       if (shouldDownload) {
-        const templateUrl = buildTemplateUrl(ubuntuVersion as string);
-
-        const downloadResult = await downloadTemplate(
-          {
-            api_url: apiUrl,
-            api_token_id: apiTokenId,
-            api_token_secret: apiTokenSecret,
-          },
+        const downloadOutcome = await runApplianceDownload({
+          credentials,
           targetNode,
           templateStorage,
-          templateUrl,
-        );
-
-        if (!downloadResult.success) {
-          console.log(`\n✗ Failed to start download: ${downloadResult.message}`);
-        } else {
-          // Wait for download to complete with fuel-gauge progress
-          const upid = downloadResult.data;
-          const gauge = new FuelGauge(`Downloading ${templateFilename}`);
-          gauge.start();
-
-          let downloadComplete = false;
-          let attempts = 0;
-          const maxAttempts = 60;
-
-          while (!downloadComplete && attempts < maxAttempts) {
-            await new Promise((resolve) => setTimeout(resolve, 5000));
-
-            const statusResult = await checkTaskStatus(
-              {
-                api_url: apiUrl,
-                api_token_id: apiTokenId,
-                api_token_secret: apiTokenSecret,
-              },
-              targetNode,
-              upid,
-            );
-
-            if (statusResult.success) {
-              if (statusResult.data.status === 'stopped') {
-                if (statusResult.data.exitstatus === 'OK') {
-                  downloadComplete = true;
-                  templateReady = true;
-                  gauge.stop(true);
-                } else {
-                  gauge.stop(false);
-                  console.log(`\n✗ Template download failed: ${statusResult.data.exitstatus}`);
-                  break;
-                }
-              } else {
-                gauge.addOutput(`Status: ${statusResult.data.status} (${attempts * 5}s elapsed)`);
-              }
-            } else {
-              gauge.addOutput(`Waiting for status... (${attempts * 5}s elapsed)`);
-            }
-
-            attempts++;
-          }
-
-          if (!downloadComplete && !templateReady) {
-            gauge.stop(false);
-            console.log('\n✗ Template download timed out after 5 minutes');
-          }
-        }
-
-        if (!templateReady) {
-          console.log(
-            '\nTemplate is not available. The service has been saved but needs a template.\n',
-          );
-          console.log('Next steps:');
-          console.log(
-            `  1. Try a different version: celilo service reconfigure ${service.serviceId}`,
-          );
-          console.log(
-            `  2. Download manually: ssh root@${ipAddress} pveam download ${templateStorage} ${templateFilename}`,
-          );
-          console.log(`  3. Then verify: celilo service verify ${service.serviceId}`);
-        }
+          templateFilename,
+        });
+        templateReady = downloadOutcome.ready;
       } else {
         console.log(
           '\nTemplate not downloaded. Service saved but will need a template before deployment.',
         );
       }
+
+      if (!templateReady) {
+        console.log(
+          '\nTemplate is not available. The service has been saved but needs a template.\n',
+        );
+        console.log('Next steps:');
+        console.log(
+          `  1. Try a different version: celilo service reconfigure ${service.serviceId}`,
+        );
+        console.log(
+          `  2. Download manually: ssh root@${ipAddress} pveam download ${templateStorage} ${templateFilename}`,
+        );
+        console.log(`  3. Then verify: celilo service verify ${service.serviceId}`);
+      }
     } else {
       console.log(`✓ Template '${templateFilename}' found`);
     }

package/src/cli/commands/service-reconfigure.ts

@@ -5,29 +5,24 @@
 
 import * as p from '@clack/prompts';
 import {
+  type ProxmoxCredentials,
   buildTemplatePath,
-  buildTemplateUrl,
-  checkTaskStatus,
-  downloadTemplate,
   extractTemplateFilename,
   listAvailableTemplates,
   listNodeStorage,
 } from '../../api-clients/proxmox';
 import {
-  getContainerServiceByName,
+  getContainerServiceByServiceId,
   getServiceCredentials,
   updateServiceProviderConfig,
 } from '../../services/container-service';
-import { FuelGauge } from '../fuel-gauge';
 import { celiloIntro, celiloOutro, promptText } from '../prompts';
 import type { CommandResult } from '../types';
 import { validateRequired } from '../validators';
-
-interface ProxmoxCredentials {
-  api_url: string;
-  api_token_id: string;
-  api_token_secret: string;
-}
+import {
+  runApplianceDownload,
+  selectUbuntuApplianceFromCatalog,
+} from './proxmox-template-selection';
 
 interface ProxmoxProviderConfig {
   default_target_node: string;
@@ -48,7 +43,7 @@ export async function handleServiceReconfigure(
   }
 
   try {
-    const service = await getContainerServiceByName(serviceId);
+    const service = await getContainerServiceByServiceId(serviceId);
     if (!service) {
       return { success: false, error: `Service '${serviceId}' not found` };
     }
@@ -87,27 +82,8 @@ export async function handleServiceReconfigure(
       validate: validateRequired('Storage'),
     });
 
-    // Detect current Ubuntu version from template filename
-    const currentTemplateFile = extractTemplateFilename(currentConfig.lxc_template);
-    const versionMatch = currentTemplateFile.match(/ubuntu-(\d+\.\d+)-/);
-    const currentVersion = versionMatch?.[1] || '22.04';
-
-    const ubuntuVersion = await p.select({
-      message: 'Ubuntu LTS version for default template:',
-      options: [
-        { value: '24.04', label: 'Ubuntu 24.04 LTS (Noble Numbat)' },
-        { value: '22.04', label: 'Ubuntu 22.04 LTS (Jammy Jellyfish)' },
-        { value: '20.04', label: 'Ubuntu 20.04 LTS (Focal Fossa)' },
-      ],
-      initialValue: currentVersion,
-    });
-
-    if (p.isCancel(ubuntuVersion)) {
-      p.cancel('Operation cancelled');
-      return { success: false, error: 'Cancelled by user' };
-    }
-
-    // Find template storage
+    // Find template storage. Done before catalog selection so the user only
+    // ever sees the chosen storage in subsequent messages.
     console.log('\nFinding storage for templates...');
     const storageListResult = await listNodeStorage(credentials, targetNode);
 
@@ -122,10 +98,22 @@ export async function handleServiceReconfigure(
       }
     }
 
-    const lxcTemplate = buildTemplatePath(templateStorage, ubuntuVersion as string);
-    const templateFilename = extractTemplateFilename(lxcTemplate);
+    // Pick a template from Proxmox's live catalog. Pre-selects the family
+    // matching the existing volid (e.g. user has 24.04 -1 cached, mirror has -2).
+    const selectionResult = await selectUbuntuApplianceFromCatalog(credentials, targetNode, {
+      currentTemplate: extractTemplateFilename(currentConfig.lxc_template),
+    });
+    if (selectionResult.kind === 'cancelled') {
+      p.cancel('Operation cancelled');
+      return { success: false, error: 'Cancelled by user' };
+    }
+    if (selectionResult.kind === 'error') {
+      return { success: false, error: selectionResult.message };
+    }
+    const templateFilename = selectionResult.choice.template;
+    const lxcTemplate = buildTemplatePath(templateStorage, templateFilename);
 
-    // Check if new template exists
+    // Check if new template exists in storage.
     console.log(`\nChecking if template '${templateFilename}' exists...`);
     const templatesResult = await listAvailableTemplates(credentials, targetNode, templateStorage);
 
@@ -147,54 +135,23 @@ export async function handleServiceReconfigure(
           '\nTemplate not downloaded. Service will be updated but may fail verification.',
         );
       } else {
-        const templateUrl = buildTemplateUrl(ubuntuVersion as string);
-        const downloadResult = await downloadTemplate(
+        const outcome = await runApplianceDownload({
           credentials,
           targetNode,
           templateStorage,
-          templateUrl,
-        );
-
-        if (!downloadResult.success) {
-          return {
-            success: false,
-            error: `Failed to download template: ${downloadResult.message}\n\nTroubleshooting:\n  1. SSH into your Proxmox host and test: curl -I https://download.proxmox.com\n  2. Try downloading manually: pveam download ${templateStorage} ${templateFilename}\n  3. Check DNS and firewall settings on the Proxmox host`,
-          };
-        }
-
-        const upid = downloadResult.data;
-        const gauge = new FuelGauge(`Downloading ${templateFilename}`);
-        gauge.start();
-
-        let downloadComplete = false;
-        let attempts = 0;
-
-        while (!downloadComplete && attempts < 60) {
-          await new Promise((resolve) => setTimeout(resolve, 5000));
-          const statusResult = await checkTaskStatus(credentials, targetNode, upid);
-
-          if (statusResult.success && statusResult.data.status === 'stopped') {
-            if (statusResult.data.exitstatus === 'OK') {
-              downloadComplete = true;
-              gauge.stop(true);
-            } else {
-              gauge.stop(false);
-              return {
-                success: false,
-                error: `Template download failed: ${statusResult.data.exitstatus}\n\nThis usually means the Proxmox host cannot reach download.proxmox.com.\n\nTroubleshooting:\n  1. Try a different Ubuntu version: celilo service reconfigure ${serviceId}\n  2. Download manually: pveam download ${templateStorage} ${templateFilename}\n  3. Check DNS and firewall settings on the Proxmox host`,
-              };
-            }
-          } else {
-            gauge.addOutput(`Status: downloading... (${attempts * 5}s elapsed)`);
-          }
-          attempts++;
-        }
-
-        if (!downloadComplete) {
-          gauge.stop(false);
+          templateFilename,
+        });
+
+        if (!outcome.ready) {
+          const detail =
+            outcome.reason === 'task-failed'
+              ? `pveam download exited with status: ${outcome.exitStatus ?? 'unknown'}`
+              : outcome.reason === 'started-failed'
+                ? `Proxmox rejected the download request: ${outcome.startError ?? 'unknown error'}`
+                : 'Template download did not complete in time';
           return {
             success: false,
-            error: 'Template download timed out after 5 minutes.',
+            error: `${detail}\n\nTroubleshooting:\n  1. SSH into your Proxmox host and run: pveam update && pveam download ${templateStorage} ${templateFilename}\n  2. Re-try: celilo service reconfigure ${serviceId}\n  3. Check DNS and firewall settings on the Proxmox host`,
           };
         }
       }

package/src/cli/commands/service-verify.ts

@@ -4,21 +4,16 @@
  */
 
 import * as p from '@clack/prompts';
-import {
-  buildTemplateUrl,
-  checkTaskStatus,
-  downloadTemplate,
-  extractTemplateFilename,
-} from '../../api-clients/proxmox';
+import { extractTemplateFilename } from '../../api-clients/proxmox';
 import {
   type ProxmoxCredentials,
   getContainerServiceByServiceId,
   getServiceCredentials,
   verifyContainerService,
 } from '../../services/container-service';
-import { FuelGauge } from '../fuel-gauge';
 import { celiloIntro, celiloOutro } from '../prompts';
 import type { CommandResult } from '../types';
+import { runApplianceDownload } from './proxmox-template-selection';
 
 /**
  * Handle service verify command
@@ -108,7 +103,6 @@ export async function handleServiceVerify(
 
       if (shouldDownload) {
         try {
-          // Get credentials and config
           const credentials = (await getServiceCredentials(service.id)) as ProxmoxCredentials;
           const providerConfig = service.providerConfig as {
             default_target_node: string;
@@ -116,86 +110,33 @@ export async function handleServiceVerify(
             storage: string;
           };
 
-          // Extract template info
           const templateFilename = extractTemplateFilename(providerConfig.lxc_template);
-          const templateParts = providerConfig.lxc_template.split(':');
-          const templateStorage = templateParts[0] || 'local';
-
-          // Detect Ubuntu version from template filename
-          const versionMatch = templateFilename.match(/ubuntu-(\d+\.\d+)-/);
-          if (!versionMatch) {
-            return {
-              success: false,
-              error: 'Cannot auto-download: unrecognized template format',
-            };
-          }
-          const ubuntuVersion = versionMatch[1];
-
-          const templateUrl = buildTemplateUrl(ubuntuVersion);
+          const templateStorage = providerConfig.lxc_template.split(':')[0] || 'local';
 
-          const downloadResult = await downloadTemplate(
+          // The saved volid was the canonical filename when the service was
+          // created; if Proxmox refreshed the revision since then, this download
+          // will fail with `started-failed` and the user can `service reconfigure`
+          // to pick a fresh filename from the catalog.
+          const outcome = await runApplianceDownload({
             credentials,
-            providerConfig.default_target_node,
+            targetNode: providerConfig.default_target_node,
             templateStorage,
-            templateUrl,
-          );
-
-          if (!downloadResult.success) {
-            return {
-              success: false,
-              error: `Failed to download template: ${downloadResult.message}`,
-            };
-          }
-
-          // Wait for download to complete with fuel-gauge progress
-          const upid = downloadResult.data;
-          const gauge = new FuelGauge(`Downloading ${templateFilename}`);
-          gauge.start();
-
-          let downloadComplete = false;
-          let attempts = 0;
-          const maxAttempts = 60; // 5 minutes
-
-          while (!downloadComplete && attempts < maxAttempts) {
-            await new Promise((resolve) => setTimeout(resolve, 5000));
-
-            const statusResult = await checkTaskStatus(
-              credentials,
-              providerConfig.default_target_node,
-              upid,
-            );
-
-            if (statusResult.success) {
-              if (statusResult.data.status === 'stopped') {
-                if (statusResult.data.exitstatus === 'OK') {
-                  downloadComplete = true;
-                  gauge.stop(true);
-                } else {
-                  gauge.stop(false);
-                  return {
-                    success: false,
-                    error: `Template download failed: ${statusResult.data.exitstatus}\n\nThis usually means the Proxmox host cannot reach download.proxmox.com.\n\nTroubleshooting:\n  1. SSH into your Proxmox host and test: curl -I https://download.proxmox.com\n  2. Try downloading manually: pveam download ${templateStorage} ${templateFilename}\n  3. Choose a different Ubuntu version: celilo service reconfigure ${service.serviceId}\n  4. Check DNS and firewall settings on the Proxmox host`,
-                  };
-                }
-              } else {
-                gauge.addOutput(`Status: ${statusResult.data.status} (${attempts * 5}s elapsed)`);
-              }
-            } else {
-              gauge.addOutput(`Waiting for status... (${attempts * 5}s elapsed)`);
-            }
-
-            attempts++;
-          }
-
-          if (!downloadComplete) {
-            gauge.stop(false);
+            templateFilename,
+          });
+
+          if (!outcome.ready) {
+            const detail =
+              outcome.reason === 'task-failed'
+                ? `pveam download exited with status: ${outcome.exitStatus ?? 'unknown'}\n\nThis usually means the saved template revision is no longer available on Proxmox's mirror.`
+                : outcome.reason === 'started-failed'
+                  ? `Proxmox rejected the download request: ${outcome.startError ?? 'unknown error'}\n\nThis usually means the saved template name does not match Proxmox's current catalog.`
+                  : 'Template download did not complete in time. The Proxmox host may have slow internet or connectivity issues.';
             return {
               success: false,
-              error: `Template download timed out after 5 minutes.\n\nThe Proxmox host may have slow internet or connectivity issues.\nTry downloading manually: ssh root@<proxmox-host> pveam download ${templateStorage} ${templateFilename}`,
+              error: `${detail}\n\nTroubleshooting:\n  1. Pick a fresh template version: celilo service reconfigure ${service.serviceId}\n  2. SSH into your Proxmox host and run: pveam update && pveam download ${templateStorage} ${templateFilename}\n  3. Check DNS and firewall settings on the Proxmox host`,
             };
           }
 
-          // Retry verification
           console.log('\nRetrying verification...');
           const retryResult = await verifyContainerService(service.id);
 

package/src/cli/commands/{doctor.test.ts → system-doctor.test.ts}

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test';
-import { compareVersions } from './doctor';
+import { compareVersions } from './system-doctor';
 
 describe('compareVersions', () => {
   test('detects ascending major/minor/patch', () => {