@celilo/cli 0.1.4 → 0.1.6

package/drizzle/0004_caddy_hostname_list.sql

@@ -0,0 +1,25 @@
+-- Caddy hostname list refactor (CADDY_HOSTNAME_LIST design).
+-- web_routes used to carry `subdomain` + `custom_domain` and a flat
+-- unique index on `path`. The new model has a single `hostname` FQDN
+-- and a (hostname, path) unique index. Phase 0 / no production users
+-- means this is a destructive migration — modules repopulate routes
+-- on their next deploy after the migration runs.
+DROP TABLE IF EXISTS `web_routes`;
+--> statement-breakpoint
+CREATE TABLE `web_routes` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`slug` text NOT NULL,
+	`module_id` text NOT NULL,
+	`type` text NOT NULL,
+	`path` text NOT NULL,
+	`hostname` text NOT NULL,
+	`target_host` text,
+	`target_port` integer,
+	`websocket` integer DEFAULT false NOT NULL,
+	`content_hash` text,
+	`created_at` integer DEFAULT (unixepoch()) NOT NULL,
+	`updated_at` integer DEFAULT (unixepoch()) NOT NULL,
+	FOREIGN KEY (`module_id`) REFERENCES `modules`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `web_routes_hostname_path_idx` ON `web_routes` (`hostname`,`path`);

package/drizzle/meta/_journal.json

@@ -22,6 +22,20 @@
       "when": 1774881303520,
       "tag": "0002_web_routes",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1774924800000,
+      "tag": "0003_backup_storage",
+      "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1777680000000,
+      "tag": "0004_caddy_hostname_list",
+      "breakpoints": true
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Celilo — home lab orchestration CLI",
   "type": "module",
   "bin": {
@@ -46,10 +46,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1024.0",
+    "@celilo/capabilities": "^0.1.2",
+    "@celilo/cli-display": "0.1.0",
     "@clack/prompts": "^1.1.0",
-    "@celilo/capabilities": "^0.1.1",
     "ajv": "^8.18.0",
     "drizzle-orm": "^0.36.4",
+    "ink": "^7.0.1",
+    "ink-spinner": "^5.0.0",
+    "ink-text-input": "^6.0.0",
+    "react": "^19.2.5",
     "tar": "^7.5.10",
     "xxhash-wasm": "^1.1.0",
     "yaml": "^2.8.2",
@@ -58,7 +63,9 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@types/bun": "^1.1.14",
+    "@types/react": "^19.2.14",
     "drizzle-kit": "^0.30.0",
+    "ink-testing-library": "^4.0.0",
     "typescript": "^5.9.3",
     "zod-to-json-schema": "^3.25.2"
   }

package/src/ansible/inventory.test.ts

@@ -75,13 +75,14 @@ describe('generateHostsIni', () => {
   });
 
   test('includes SSH private key file path when provided', () => {
+    const keyPath = '/tmp/celilo-ansible-keys/machine-machine-1.key';
     const hosts: InventoryHost[] = [
       {
         hostname: 'machine-host',
         ansibleHost: '192.168.1.100',
         ansibleUser: 'ubuntu',
         groups: ['machines'],
-        ansibleSshPrivateKeyFile: '/var/lib/celilo/tmp/ansible-keys/machine-machine-1.key',
+        ansibleSshPrivateKeyFile: keyPath,
       },
     ];
 
@@ -89,7 +90,7 @@ describe('generateHostsIni', () => {
 
     expect(result).toContain('[machines]');
     expect(result).toContain(
-      'machine-host ansible_host=192.168.1.100 ansible_user=ubuntu ansible_ssh_private_key_file=/var/lib/celilo/tmp/ansible-keys/machine-machine-1.key',
+      `machine-host ansible_host=192.168.1.100 ansible_user=ubuntu ansible_ssh_private_key_file=${keyPath}`,
     );
   });
 });
@@ -99,14 +100,14 @@ describe('generateHostVarsYaml', () => {
     const vars = {
       vmid: 2110,
       hostname: 'iot',
-      container_ip: '192.168.0.110/24',
+      target_ip: '192.168.0.110/24',
     };
 
     const result = generateHostVarsYaml(vars);
 
     expect(result).toContain('vmid: 2110');
     expect(result).toContain('hostname: iot');
-    expect(result).toContain('container_ip: 192.168.0.110/24');
+    expect(result).toContain('target_ip: 192.168.0.110/24');
   });
 
   test('generates YAML for arrays', () => {
@@ -289,7 +290,7 @@ describe('Database integration', () => {
           { moduleId: 'homebridge', key: 'hostname', value: 'iot', valueJson: null },
           {
             moduleId: 'homebridge',
-            key: 'container_ip',
+            key: 'target_ip',
             value: '192.168.0.110/24',
             valueJson: null,
           },
@@ -301,7 +302,7 @@ describe('Database integration', () => {
 
       expect(vars.vmid).toBe(2110);
       expect(vars.hostname).toBe('iot');
-      expect(vars.container_ip).toBe('192.168.0.110/24');
+      expect(vars.target_ip).toBe('192.168.0.110/24');
       expect(vars.cores).toBe(1);
     });
 
@@ -404,7 +405,7 @@ describe('Database integration', () => {
       db.insert(moduleConfigs)
         .values([
           { moduleId: 'homebridge', key: 'hostname', value: 'iot' },
-          { moduleId: 'homebridge', key: 'container_ip', value: '192.168.0.110/24' },
+          { moduleId: 'homebridge', key: 'target_ip', value: '192.168.0.110/24' },
         ])
         .run();
 
@@ -446,7 +447,7 @@ describe('Database integration', () => {
       db.insert(moduleConfigs)
         .values([
           { moduleId: 'test', key: 'hostname', value: 'iot' },
-          // Missing container_ip or vps_ip for ansible_host
+          // Missing target_ip or vps_ip for ansible_host
         ])
         .run();
 

package/src/ansible/inventory.ts

@@ -66,7 +66,11 @@ export function generateHostsIni(hosts: InventoryHost[]): string {
   // Add [all:vars] section with common variables
   lines.push('[all:vars]');
   lines.push('ansible_python_interpreter=/usr/bin/python3');
-  lines.push('ansible_ssh_common_args=-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null');
+  // Disable ControlMaster to avoid Python format string issues with ControlPath
+  // ControlPath uses %h, %p, %r placeholders which trigger Python's % formatter
+  lines.push(
+    'ansible_ssh_common_args=-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no',
+  );
   lines.push('');
 
   return lines.join('\n');
@@ -259,13 +263,11 @@ export function extractInventoryHost(moduleId: string, db: DbClient): InventoryH
   }
 
   // Auto-derive ansible_host from infrastructure variables
-  // Priority: container_ip > ip.primary > vps_ip (for backward compatibility)
-  if (moduleConfig.container_ip) {
-    const slashIndex = moduleConfig.container_ip.indexOf('/');
+  // Priority: target_ip > ip.primary > vps_ip (for backward compatibility)
+  if (moduleConfig.target_ip) {
+    const slashIndex = moduleConfig.target_ip.indexOf('/');
     derived['inventory.ansible_host'] =
-      slashIndex === -1
-        ? moduleConfig.container_ip
-        : moduleConfig.container_ip.slice(0, slashIndex);
+      slashIndex === -1 ? moduleConfig.target_ip : moduleConfig.target_ip.slice(0, slashIndex);
   } else if (moduleConfig['ip.primary']) {
     derived['inventory.ansible_host'] = moduleConfig['ip.primary'];
   } else if (moduleConfig.vps_ip) {

package/src/capabilities/public-web-helpers.test.ts

@@ -101,11 +101,11 @@ describe('validatePublishStaticSiteRequest', () => {
     expect(result.errors).toEqual([]);
   });
 
-  test('accepts a request with optional clientConfig and subdomain', () => {
+  test('accepts a request with optional clientConfig and hostname', () => {
     const result = validatePublishStaticSiteRequest(
       basePublishRequest({
         clientConfig: { FOO: 'bar' },
-        subdomain: 'app',
+        hostname: 'app.iamtheinternet.org',
       }),
     );
     expect(result.valid).toBe(true);

package/src/capabilities/public-web-publish.test.ts

@@ -53,9 +53,9 @@ function makeRouteOps(): { ops: RouteOps; routes: WebRoute[] } {
         moduleId: route.moduleId,
         type: route.type,
         path: route.path,
+        hostname: route.hostname,
         targetHost: route.targetHost ?? null,
         targetPort: route.targetPort ?? null,
-        subdomain: route.subdomain ?? null,
         websocket: route.websocket ?? false,
         contentHash: route.contentHash ?? null,
         createdAt: existing >= 0 ? routes[existing].createdAt : now,
@@ -109,13 +109,16 @@ describe('publishStaticSite — clientConfig injection', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     const result = await cap.publishStaticSite({
@@ -150,13 +153,16 @@ describe('publishStaticSite — clientConfig injection', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await cap.publishStaticSite({
@@ -174,13 +180,16 @@ describe('publishStaticSite — clientConfig injection', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await cap.publishStaticSite({
@@ -201,13 +210,16 @@ describe('publishStaticSite — clientConfig injection', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await expect(
@@ -225,13 +237,16 @@ describe('publishStaticSite — clientConfig injection', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await expect(
@@ -261,13 +276,16 @@ describe('registerReverseProxy', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     const result = await cap.registerReverseProxy({
@@ -294,13 +312,16 @@ describe('registerReverseProxy', () => {
       moduleId: 'lunacycle',
       logger: noopLogger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await expect(
@@ -337,13 +358,16 @@ describe('auto-logging — end-to-end through createPublicWeb', () => {
       moduleId: 'lunacycle',
       logger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await cap.register_route({
@@ -368,13 +392,16 @@ describe('auto-logging — end-to-end through createPublicWeb', () => {
       moduleId: 'lunacycle',
       logger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     // Bad path triggers the validator inside register_route, which
@@ -400,13 +427,16 @@ describe('auto-logging — end-to-end through createPublicWeb', () => {
       moduleId: 'lunacycle',
       logger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await cap.publishStaticSite({ path: '/lunacycle', sourceDir });
@@ -432,13 +462,16 @@ describe('auto-logging — end-to-end through createPublicWeb', () => {
       moduleId: 'lunacycle',
       logger,
       config: {
-        container_ip: '10.0.10.20/24',
+        target_ip: '10.0.10.20/24',
         hostname: 'www',
         primary_domain: 'example.com',
         email: 'admin@example.com',
       },
       secrets: {},
       routeOps: ops,
+      hostnames: ['www.example.com'],
+      caddyModuleId: 'caddy',
+      dnsManagedDomains: ['www.example.com'],
     });
 
     await cap.register_route({

package/src/capabilities/registration.test.ts

@@ -43,7 +43,7 @@ describe('Capability Registration', () => {
         version: '1.0.0',
         data: {
           server: {
-            ip: '$self:container_ip',
+            ip: '$self:target_ip',
             port: 443,
           },
         },
@@ -65,7 +65,7 @@ describe('Capability Registration', () => {
       // Variables are preserved, not resolved
       expect(result).toEqual({
         server: {
-          ip: '$self:container_ip',
+          ip: '$self:target_ip',
           port: 443,
         },
       });
@@ -177,7 +177,7 @@ describe('Capability Registration', () => {
         name: 'test_capability',
         version: '1.0.0',
         data: {
-          variable: '$self:container_ip',
+          variable: '$self:target_ip',
           literal: 'not-a-variable',
           with_dollar: '$100',
           empty: '',
@@ -198,7 +198,7 @@ describe('Capability Registration', () => {
       const result = buildCapabilityData(capability, manifest);
 
       expect(result).toEqual({
-        variable: '$self:container_ip',
+        variable: '$self:target_ip',
         literal: 'not-a-variable',
         with_dollar: '$100',
         empty: '',
@@ -337,7 +337,7 @@ describe('Capability Registration', () => {
         version: '1.0.0',
         data: {
           server: {
-            ip: '$self:container_ip',
+            ip: '$self:target_ip',
           },
         },
       };
@@ -360,7 +360,7 @@ describe('Capability Registration', () => {
       (result as any).server.ip = 'modified';
 
       // Original should be unchanged
-      expect(capability.data.server.ip).toBe('$self:container_ip');
+      expect(capability.data.server.ip).toBe('$self:target_ip');
     });
   });
 

package/src/capabilities/well-known.test.ts

@@ -170,7 +170,7 @@ describe('Well-Known Capabilities Registry', () => {
       expect(schema).toEqual({
         server: {
           ip: {
-            primary: '$self:container_ip',
+            primary: '$self:target_ip',
           },
           port: 443,
         },
@@ -196,7 +196,7 @@ describe('Well-Known Capabilities Registry', () => {
       expect(schema).toEqual({
         server: {
           ip: {
-            primary: '$self:container_ip',
+            primary: '$self:target_ip',
           },
           port: 9000,
         },

package/src/capabilities/well-known.ts

@@ -41,7 +41,7 @@ export const WELL_KNOWN_CAPABILITIES: Record<string, WellKnownCapability> = {
     data_schema: {
       server: {
         ip: {
-          primary: '$self:container_ip',
+          primary: '$self:target_ip',
         },
         port: 443,
       },
@@ -76,7 +76,7 @@ export const WELL_KNOWN_CAPABILITIES: Record<string, WellKnownCapability> = {
     data_schema: {
       server: {
         ip: {
-          primary: '$self:container_ip',
+          primary: '$self:target_ip',
         },
         port: 53,
       },
@@ -102,7 +102,7 @@ export const WELL_KNOWN_CAPABILITIES: Record<string, WellKnownCapability> = {
     data_schema: {
       server: {
         ip: {
-          primary: '$self:container_ip',
+          primary: '$self:target_ip',
         },
         port: 9000,
       },
@@ -121,12 +121,12 @@ export const WELL_KNOWN_CAPABILITIES: Record<string, WellKnownCapability> = {
     data_schema: {
       server: {
         ip: {
-          primary: '$self:container_ip',
+          primary: '$self:target_ip',
         },
         port: '$self:port', // Database-specific port
       },
       connection: {
-        host: '$self:container_ip',
+        host: '$self:target_ip',
         port: '$self:port',
         name: '$self:database_name',
       },

package/src/cli/cli.test.ts

@@ -574,12 +574,12 @@ secrets:
   });
 
   describe('module import', () => {
-    test('should error on missing path', async () => {
+    test('should error on missing subcommand', async () => {
       const result = await runCli(['node', 'celilo', 'module', 'import']);
 
       expect(result.success).toBe(false);
       if (result.success) return;
-      expect(result.error).toContain('Missing required arguments');
+      expect(result.error).toContain('Subcommand required');
     });
 
     test('should error on non-existent path', async () => {