@dboio/cli 0.11.4 → 0.15.0

package/src/commands/deploy.js

@@ -57,10 +57,17 @@ export const deployCommand = new Command('deploy')
         process.exit(1);
       }
 
+      // If name doesn't match a key directly, try scanning by UID value
+      let resolvedName = name;
+      if (name && !manifest.deployments[name]) {
+        const byUid = Object.entries(manifest.deployments).find(([, v]) => v && v.uid === name);
+        if (byUid) resolvedName = byUid[0];
+      }
+
       const entries = options.all
         ? Object.entries(manifest.deployments)
-        : name
-          ? [[name, manifest.deployments[name]]]
+        : resolvedName
+          ? [[resolvedName, manifest.deployments[resolvedName]]]
           : [];
 
       if (entries.length === 0 || (entries.length === 1 && !entries[0][1])) {

package/src/commands/diff.js

@@ -14,6 +14,7 @@ import {
 } from '../lib/diff.js';
 import { fetchServerRecordsBatch } from '../lib/toe-stepping.js';
 import { findBaselineEntry } from '../lib/delta.js';
+import { isMetadataFile, parseMetaFilename, findMetadataForCompanion } from '../lib/filenames.js';
 import { runPendingMigrations } from '../lib/migrations.js';
 
 export const diffCommand = new Command('diff')
@@ -81,7 +82,7 @@ export const diffCommand = new Command('diff')
       let bulkAction = null;
 
       for (const metaPath of metaFiles) {
-        const metaBase = basename(metaPath, '.metadata.json');
+        const metaBase = parseMetaFilename(basename(metaPath))?.naturalBase ?? basename(metaPath, '.metadata.json');
 
         const result = await compareRecord(metaPath, config, serverRecordsMap);
 
@@ -203,7 +204,7 @@ async function resolveTargetToMetaFiles(targetPath) {
     pathStat = await stat(targetPath);
   } catch {
     // Maybe it's a file without extension — try finding metadata
-    const metaPath = targetPath.endsWith('.metadata.json')
+    const metaPath = (isMetadataFile(basename(targetPath)) || targetPath.endsWith('.metadata.json'))
       ? targetPath
       : `${targetPath}.metadata.json`;
 
@@ -220,7 +221,7 @@ async function resolveTargetToMetaFiles(targetPath) {
   }
 
   // Single file — find its companion metadata
-  if (targetPath.endsWith('.metadata.json')) {
+  if (isMetadataFile(basename(targetPath)) || targetPath.endsWith('.metadata.json')) {
     return [targetPath];
   }
 
@@ -239,6 +240,9 @@ async function resolveTargetToMetaFiles(targetPath) {
       await stat(mediaMetaPath);
       return [mediaMetaPath];
     } catch {
+      // Fallback: scan sibling metadata files for @reference match
+      const found = await findMetadataForCompanion(targetPath);
+      if (found) return [found];
       log.warn(`No metadata found for "${targetPath}"`);
       return [];
     }

package/src/commands/init.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { mkdir } from 'fs/promises';
+import { mkdir, writeFile, access } from 'fs/promises';
 import { join } from 'path';
 import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore, saveTransactionKeyPreset, saveTicketSuggestionOutput } from '../lib/config.js';
 import { installOrUpdateClaudeCommands } from './install.js';
@@ -102,7 +102,7 @@ export const initCommand = new Command('init')
       }
 
       // Ensure sensitive files are gitignored
-      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json', '.dbo/ticketing.local.json', '.dbo/errors.log', 'trash/', 'Icon\\r']);
+      await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json', '.dbo/ticketing.local.json', '.dbo/scripts.local.json', '.dbo/errors.log', 'trash/', 'Icon\\r']);
 
       const createdIgnore = await createDboignore();
       if (createdIgnore) log.dim('  Created .dboignore');
@@ -114,6 +114,20 @@ export const initCommand = new Command('init')
       }
       log.dim('  Created .claude/ directory structure');
 
+      // Create empty scripts.json and scripts.local.json if they don't exist
+      const emptyScripts = JSON.stringify({ scripts: {}, targets: {}, entities: {} }, null, 2) + '\n';
+      const dboDir = join(process.cwd(), '.dbo');
+      const scriptsPath = join(dboDir, 'scripts.json');
+      const scriptsLocalPath = join(dboDir, 'scripts.local.json');
+      try { await access(scriptsPath); } catch {
+        await writeFile(scriptsPath, emptyScripts);
+        log.dim('  Created .dbo/scripts.json');
+      }
+      try { await access(scriptsLocalPath); } catch {
+        await writeFile(scriptsLocalPath, emptyScripts);
+        log.dim('  Created .dbo/scripts.local.json');
+      }
+
       log.success(`Initialized .dbo/ for ${domain}`);
 
       // Authenticate early so the session is ready for subsequent operations

package/src/commands/input.js

@@ -60,8 +60,10 @@ export const inputCommand = new Command('input')
       if (modifyKeyResult.modifyKey) extraParams['_modify_key'] = modifyKeyResult.modifyKey;
 
       // Check if data expressions include AppID; if not and config has one, prompt
+      // Skip AppID prompt for delete-only submissions — deletes don't need it
       const allDataText = options.data.join(' ');
-      const hasAppId = /\.AppID[=@]/.test(allDataText) || /AppID=/.test(allDataText);
+      const isDeleteOnly = options.data.every(d => /RowID:del\d+/.test(d));
+      const hasAppId = isDeleteOnly || /\.AppID[=@]/.test(allDataText) || /AppID=/.test(allDataText);
       if (!hasAppId) {
         const appConfig = await loadAppConfig();
         if (appConfig.AppID) {

package/src/commands/login.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { loadConfig, saveUserInfo, saveUserProfile, ensureGitignore } from '../lib/config.js';
+import { loadConfig, initConfig, saveUserInfo, saveUserProfile, ensureGitignore } from '../lib/config.js';
 import { DboClient } from '../lib/client.js';
 import { log } from '../lib/logger.js';
 
@@ -13,13 +13,24 @@ import { log } from '../lib/logger.js';
  */
 export async function performLogin(domain, knownUsername) {
   const config = await loadConfig();
+  const inquirer = (await import('inquirer')).default;
+
+  // Prompt for domain if not provided and not configured
+  if (!domain && !config.domain) {
+    const { domain: inputDomain } = await inquirer.prompt([
+      { type: 'input', name: 'domain', message: 'Domain (e.g. myapp.dbo.io):' },
+    ]);
+    if (!inputDomain) throw new Error('Domain is required.');
+    domain = inputDomain.trim();
+    await initConfig(domain);
+  }
+
   const client = new DboClient({ domain });
 
   let username = knownUsername || config.username;
   let password;
 
   // Interactive prompt for missing credentials
-  const inquirer = (await import('inquirer')).default;
   const answers = await inquirer.prompt([
     { type: 'input', name: 'username', message: 'Username (email):', default: username || undefined, when: !username },
     { type: 'password', name: 'password', message: 'Password:', mask: '*' },
@@ -83,7 +94,23 @@ export const loginCommand = new Command('login')
   .action(async (options) => {
     try {
       const config = await loadConfig();
-      const client = new DboClient({ domain: options.domain });
+      const inquirer = (await import('inquirer')).default;
+      let domain = options.domain;
+
+      // Prompt for domain if not provided and not configured
+      if (!domain && !config.domain) {
+        const { domain: inputDomain } = await inquirer.prompt([
+          { type: 'input', name: 'domain', message: 'Domain (e.g. myapp.dbo.io):' },
+        ]);
+        if (!inputDomain) {
+          log.error('Domain is required.');
+          process.exit(1);
+        }
+        domain = inputDomain.trim();
+        await initConfig(domain);
+      }
+
+      const client = new DboClient({ domain });
 
       let username = options.username || options.email || options.phone;
       let password = options.password || options.passkey;
@@ -93,7 +120,6 @@ export const loginCommand = new Command('login')
 
       // Interactive prompt if still missing
       if (!username || !password) {
-        const inquirer = (await import('inquirer')).default;
         const answers = await inquirer.prompt([
           { type: 'input', name: 'username', message: 'Username (email):', default: config.username, when: !username },
           { type: 'password', name: 'password', message: 'Password:', mask: '*', when: !password },

package/src/commands/mv.js

@@ -13,7 +13,9 @@ import {
   BINS_DIR
 } from '../lib/structure.js';
 import { findMetadataFiles } from '../lib/diff.js';
+import { isMetadataFile, parseMetaFilename, findMetadataForCompanion } from '../lib/filenames.js';
 import { runPendingMigrations } from '../lib/migrations.js';
+import { removeDeployEntry, upsertDeployEntry } from '../lib/deploy-config.js';
 
 export const mvCommand = new Command('mv')
   .description('Move files or bins to a new location and update metadata')
@@ -199,7 +201,7 @@ function checkCircularReference(sourceBinId, targetBinId, structure) {
  * Resolve a file path to its metadata.json path.
  */
 function resolveMetaPath(filePath) {
-  if (filePath.endsWith('.metadata.json')) {
+  if (isMetadataFile(basename(filePath)) || filePath.endsWith('.metadata.json')) {
     return filePath;
   }
   const dir = dirname(filePath);
@@ -507,14 +509,21 @@ async function checkNameConflict(fileName, targetDir, options) {
  */
 async function mvFile(sourceFile, targetBinId, structure, options) {
   // Resolve metadata
-  const metaPath = resolveMetaPath(sourceFile);
+  let metaPath = resolveMetaPath(sourceFile);
   let meta;
   try {
     meta = JSON.parse(await readFile(metaPath, 'utf8'));
   } catch {
-    log.error(`No metadata found for "${sourceFile}"`);
-    log.dim('  Use "dbo content pull" or "dbo output --save" to create metadata files.');
-    process.exit(1);
+    const found = await findMetadataForCompanion(sourceFile);
+    if (found) {
+      metaPath = found;
+      try { meta = JSON.parse(await readFile(metaPath, 'utf8')); } catch {}
+    }
+    if (!meta) {
+      log.error(`No metadata found for "${basename(sourceFile)}"`);
+      log.dim('  Use "dbo pull" to create metadata files.');
+      process.exit(1);
+    }
   }
 
   const entity = meta._entity;
@@ -536,13 +545,13 @@ async function mvFile(sourceFile, targetBinId, structure, options) {
   // Calculate paths
   const targetDir = resolveBinPath(targetBinId, structure);
   const sourceDir = dirname(metaPath);
-  const contentFileName = sourceFile.endsWith('.metadata.json')
+  const contentFileName = (isMetadataFile(basename(sourceFile)) || sourceFile.endsWith('.metadata.json'))
     ? null
     : basename(sourceFile);
   const metaFileName = basename(metaPath);
 
   // Determine display name
-  const displayName = basename(metaPath, '.metadata.json');
+  const displayName = parseMetaFilename(basename(metaPath))?.naturalBase ?? basename(metaPath, '.metadata.json');
   const targetBin = structure[targetBinId];
   const targetBinName = targetBin ? targetBin.name : String(targetBinId);
   const targetBinFullPath = targetBin ? `${BINS_DIR}/${targetBin.fullPath}` : targetDir;
@@ -664,6 +673,18 @@ async function mvFile(sourceFile, targetBinId, structure, options) {
     }
   }
 
+  if (!options.dryRun) {
+    // Update deploy config: remove old entry (by UID), re-insert with new path + correct key
+    await removeDeployEntry(uid);
+    if (newContentPath) {
+      const col = (meta._contentColumns || [])[0] || 'Content';
+      await upsertDeployEntry(newContentPath, uid, entity, col);
+    } else if (meta._mediaFile && String(meta._mediaFile).startsWith('@')) {
+      const movedMediaPath = join(targetDir, String(meta._mediaFile).substring(1));
+      await upsertDeployEntry(movedMediaPath, uid, entity, 'File');
+    }
+  }
+
   if (options.dryRun) {
     log.info(`[DRY RUN] Would move "${displayName}" to "${targetBinName}" (${targetBinFullPath})`);
   } else {