@celilo/cli 0.3.26 → 0.3.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/cli",
-  "version": "0.3.26",
+  "version": "0.3.27",
   "description": "Celilo — home lab orchestration CLI",
   "type": "module",
   "bin": {

package/src/cli/commands/storage-add-local.ts

@@ -4,7 +4,8 @@
  */
 
 import { homedir } from 'node:os';
-import { resolve } from 'node:path';
+import { join, resolve } from 'node:path';
+import { getDataDir } from '../../config/paths';
 import {
   addBackupStorage,
   setDefaultBackupStorage,
@@ -45,11 +46,21 @@ export async function handleStorageAddLocal(
         validate: validateRequired('Storage name'),
       }));
 
+    // Default path lives under celilo's own data dir
+    // (~/.local/share/celilo/backups on Linux, ~/Library/Application
+    // Support/celilo/backups on macOS). The directory is owned by the
+    // running user, mkdir -p succeeds without sudo, and operators who
+    // want NAS / external paths can override at the prompt. This
+    // replaces the prior placeholder of "/var/backups/celilo" which
+    // looked authoritative but required root to write.
+    const defaultPath = join(getDataDir(), 'backups');
+
     const path =
       flagPath ??
       (await promptText({
         message: 'Storage directory path:',
-        placeholder: 'e.g., /mnt/nas/backups or /var/backups/celilo',
+        defaultValue: defaultPath,
+        placeholder: defaultPath,
         validate: validateRequired('Storage path'),
       }));
 

package/src/cli/commands/system-update.test.ts

@@ -0,0 +1,103 @@
+/**
+ * Tests for the `system update` storage pre-flight.
+ *
+ * Background: an operator on celilo-mgmt hit a confusing chain when
+ * they ran `celilo storage add local /var/backups/celilo` (a system
+ * path that needs root). The verify step failed with EACCES, leaving
+ * an unverified storage row on disk. The next `celilo system update`
+ * said "No default backup storage configured" — technically true
+ * (unverified storage never auto-defaults), but misleading: there
+ * IS a storage, it just needs fixing. The pre-flight now distinguishes
+ * the cases and points at the right next command for each.
+ */
+
+import { describe, expect, test } from 'bun:test';
+import { type BackupStorageLike, checkBackupStoragePreflight } from './system-update';
+
+const verified = (id: string): BackupStorageLike => ({ storageId: id, verified: true });
+const unverified = (id: string): BackupStorageLike => ({ storageId: id, verified: false });
+
+describe('checkBackupStoragePreflight', () => {
+  test('verified default → ok', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: verified('home-backups'),
+      allStorages: [verified('home-backups')],
+    });
+    expect(result.kind).toBe('ok');
+  });
+
+  test('default exists but unverified → suggests `storage verify`', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: unverified('home-backups'),
+      allStorages: [unverified('home-backups')],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain("Default backup storage 'home-backups' is not verified");
+    expect(result.message).toContain('celilo storage verify home-backups');
+  });
+
+  test('no storage at all → suggests `storage add local`', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: null,
+      allStorages: [],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain('No backup storage configured');
+    expect(result.message).toContain('celilo storage add local');
+    // Always offer the --no-backup escape so the operator knows the
+    // CLI self-update can still run on a system without storage.
+    expect(result.message).toContain('--no-backup');
+  });
+
+  // The exact case the operator hit on celilo-mgmt: ran storage add,
+  // path was unwriteable (/var/backups/celilo without sudo), verify
+  // failed, the unverified row stayed in the DB and isn't default.
+  test('only unverified storage → suggests `storage verify`, not `storage add`', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: null,
+      allStorages: [unverified('local-backups')],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain('none is verified yet');
+    expect(result.message).toContain('Storages: local-backups');
+    expect(result.message).toContain('celilo storage verify <storage-id>');
+    // Critically, this case does NOT direct the operator to run
+    // `storage add local` — they already did, the row exists.
+    expect(result.message).not.toContain('celilo storage add local');
+    // Surface the most common cause inline rather than burying it.
+    expect(result.message).toContain('elevated permissions');
+    expect(result.message).toContain('--no-backup');
+  });
+
+  test('multiple unverified storages → lists all storage IDs', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: null,
+      allStorages: [unverified('local-a'), unverified('local-b'), unverified('local-c')],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain('Storages: local-a, local-b, local-c');
+  });
+
+  test('verified storage exists but none is default → suggests `storage set-default`', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: null,
+      allStorages: [verified('home-backups'), unverified('s3-cold')],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain('verified but no default is set');
+    expect(result.message).toContain('Verified: home-backups');
+    // Doesn't mention the unverified one in the "Verified:" listing
+    // (that would mislead).
+    expect(result.message).not.toContain('Verified: home-backups, s3-cold');
+    expect(result.message).toContain('celilo storage set-default <storage-id>');
+  });
+
+  test('multiple verified, no default → lists all verified IDs', () => {
+    const result = checkBackupStoragePreflight({
+      defaultStorage: null,
+      allStorages: [verified('home-backups'), verified('s3-cold'), unverified('nas')],
+    });
+    if (result.kind !== 'error') throw new Error('expected error');
+    expect(result.message).toContain('Verified: home-backups, s3-cold');
+  });
+});

package/src/cli/commands/system-update.ts

@@ -17,6 +17,7 @@
 
 import { spawnSync } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { eq } from 'drizzle-orm';
@@ -50,6 +51,103 @@ import { fetchAndUpgrade } from './module-upgrade';
  */
 const MANAGED_PACKAGES = ['@celilo/cli', '@celilo/event-bus', '@celilo/e2e'] as const;
 
+/**
+ * Result of inspecting backup-storage configuration before letting
+ * `runSystemUpdate` take a celilo-DB snapshot. Three failure shapes
+ * the operator might hit, each with a distinct friendly message:
+ *
+ *   1. No storage rows at all          → run `storage add local`
+ *   2. Storage rows exist, none verified → run `storage verify <id>`
+ *      (the case the operator hits when an unverified storage was
+ *      left behind by a failed verify)
+ *   3. Verified storage exists, none is default → run
+ *      `storage set-default <id>`
+ *   4. Default exists but isn't verified → run `storage verify <id>`
+ *
+ * Pure data in / data out so it's testable without setting up an
+ * audit, registry, or DB.
+ */
+export interface BackupStorageLike {
+  storageId: string;
+  verified: boolean;
+}
+
+export function checkBackupStoragePreflight(input: {
+  defaultStorage: BackupStorageLike | null;
+  allStorages: BackupStorageLike[];
+}): { kind: 'ok' } | { kind: 'error'; message: string } {
+  const { defaultStorage, allStorages } = input;
+
+  if (defaultStorage) {
+    if (defaultStorage.verified) return { kind: 'ok' };
+    return {
+      kind: 'error',
+      message: `Default backup storage '${defaultStorage.storageId}' is not verified.
+
+Run:  celilo storage verify ${defaultStorage.storageId}
+
+Then re-run system update.`,
+    };
+  }
+
+  if (allStorages.length === 0) {
+    return {
+      kind: 'error',
+      message: `No backup storage configured.
+
+celilo system update snapshots the celilo DB before applying module
+updates as a safety net. Configure backup storage first:
+
+  celilo storage add local
+
+Or skip the safety net entirely (the CLI self-update still runs):
+
+  celilo system update --no-backup`,
+    };
+  }
+
+  const verified = allStorages.filter((s) => s.verified);
+  if (verified.length === 0) {
+    const ids = allStorages.map((s) => s.storageId).join(', ');
+    return {
+      kind: 'error',
+      message: `Backup storage exists but none is verified yet.
+
+Storages: ${ids}
+
+Verify one before re-running system update:
+
+  celilo storage verify <storage-id>
+
+Common causes of failed verification:
+  - The path requires elevated permissions (try a path under your
+    home directory; the default '${join(homedir(), '.local/share/celilo/backups')}'
+    works without sudo).
+  - The disk is full or the mount point isn't writeable.
+
+Or skip the safety net entirely (the CLI self-update still runs):
+
+  celilo system update --no-backup`,
+    };
+  }
+
+  const ids = verified.map((s) => s.storageId).join(', ');
+  return {
+    kind: 'error',
+    message: `Backup storage is verified but no default is set.
+
+Verified: ${ids}
+
+Set a default before re-running system update:
+
+  celilo storage set-default <storage-id>
+
+Or skip the safety net entirely (the CLI self-update still runs):
+
+  celilo system update --no-backup`,
+  };
+}
+
 function readInstalledCliVersion(): string {
   const here = dirname(fileURLToPath(import.meta.url));
   const candidates = [
@@ -498,36 +596,20 @@ export async function handleSystemUpdate(
   );
   const effectiveNoBackup = noBackup || !hasModuleUpdates;
 
-  // Pre-flight the storage check so a missing default doesn't reach the
-  // orchestrator's snapshot hook (where the throw would surface as a
-  // hostile stack trace). Skip when we're already not going to backup.
+  // Pre-flight the storage check so a missing/unusable default doesn't
+  // reach the orchestrator's snapshot hook (where the throw would
+  // surface as a hostile stack trace). Skip when we're already not
+  // going to backup.
   if (!effectiveNoBackup) {
-    const { getDefaultBackupStorage } = await import('../../services/backup-storage');
-    const storage = getDefaultBackupStorage();
-    if (!storage) {
-      return {
-        success: false,
-        error: `No default backup storage configured.
-
-celilo system update snapshots the celilo DB before applying module
-updates as a safety net. Configure backup storage first:
-
-  celilo storage add local
-
-Or skip the safety net entirely (the CLI self-update still runs):
-
-  celilo system update --no-backup`,
-      };
-    }
-    if (!storage.verified) {
-      return {
-        success: false,
-        error: `Default backup storage '${storage.storageId}' is not verified.
-
-Run:  celilo storage verify ${storage.storageId}
-
-Then re-run system update.`,
-      };
+    const { getDefaultBackupStorage, listBackupStorages } = await import(
+      '../../services/backup-storage'
+    );
+    const preflight = checkBackupStoragePreflight({
+      defaultStorage: getDefaultBackupStorage(),
+      allStorages: listBackupStorages(),
+    });
+    if (preflight.kind === 'error') {
+      return { success: false, error: preflight.message };
     }
   }