@dboio/cli 0.6.13 → 0.7.2

package/src/commands/content.js

@@ -116,7 +116,7 @@ const deployCmd = new Command('deploy')
       }
 
       // Retry with prompted params if needed (ticket, user, repo mismatch)
-      const errorResult = await checkSubmitErrors(result);
+      const errorResult = await checkSubmitErrors(result, { rowUid: uid });
       if (errorResult) {
         if (errorResult.skipRecord || errorResult.skipAll) {
           log.info('Submission cancelled');

package/src/commands/deploy.js

@@ -156,7 +156,7 @@ export const deployCommand = new Command('deploy')
         }
 
         // Retry with prompted params if needed (ticket, user, repo mismatch)
-        const errorResult = await checkSubmitErrors(result);
+        const errorResult = await checkSubmitErrors(result, { rowUid: uid });
         if (errorResult) {
           if (errorResult.skipRecord) {
             log.warn(`  Skipping "${entryName}"`);

package/src/commands/init.js

@@ -1,9 +1,11 @@
 import { Command } from 'commander';
-import { access } from 'fs/promises';
+import { access, readdir } from 'fs/promises';
 import { join } from 'path';
-import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore, saveTransactionKeyPreset } from '../lib/config.js';
+import { isInitialized, hasLegacyConfig, readLegacyConfig, initConfig, saveCredentials, ensureGitignore, saveTransactionKeyPreset, saveTicketSuggestionOutput } from '../lib/config.js';
 import { installOrUpdateClaudeCommands } from './install.js';
+import { scaffoldProjectDirs, logScaffoldResult } from '../lib/scaffold.js';
 import { log } from '../lib/logger.js';
+import { checkDomainChange, writeAppJsonDomain } from '../lib/domain-guard.js';
 
 export const initCommand = new Command('init')
   .description('Initialize DBO CLI configuration for the current directory')
@@ -16,11 +18,17 @@ export const initCommand = new Command('init')
   .option('--non-interactive', 'Skip all interactive prompts')
   .option('-g, --global', 'Install Claude commands to user home directory (~/.claude/commands/)')
   .option('--local', 'Install Claude commands to project directory (.claude/commands/)')
+  .option('--scaffold', 'Create standard project directories (App Versions, Automations, Bins, …)')
   .action(async (options) => {
     // Merge --yes into nonInteractive
     if (options.yes) options.nonInteractive = true;
     try {
       if (await isInitialized() && !options.force) {
+        if (options.scaffold) {
+          const result = await scaffoldProjectDirs();
+          logScaffoldResult(result);
+          return;
+        }
         log.warn('Already initialized. Use --force to overwrite.');
         return;
       }
@@ -49,18 +57,32 @@ export const initCommand = new Command('init')
       if (!domain || !username) {
         const inquirer = (await import('inquirer')).default;
         const answers = await inquirer.prompt([
-          { type: 'input', name: 'domain', message: 'Domain (e.g., myapp.dbo.io):', default: domain || undefined, when: !domain, validate: v => v ? true : 'Domain is required' },
+          { type: 'input', name: 'domain', message: 'Domain (e.g., myapp.dbo.io):', default: domain || undefined, when: !domain },
           { type: 'input', name: 'username', message: 'Username (email):', when: !username },
         ]);
         domain = domain || answers.domain;
         username = username || answers.username;
       }
 
+      let domainChanged = false;
+      if (options.force) {
+        const { changed, proceed } = await checkDomainChange(domain, options);
+        if (changed && !proceed) {
+          log.info('Init aborted: domain change denied.');
+          return;
+        }
+        domainChanged = changed;
+      }
+
       await initConfig(domain);
       if (username) {
         await saveCredentials(username);
       }
 
+      if (options.force && domainChanged) {
+        await writeAppJsonDomain(domain);
+      }
+
       // Ensure sensitive files are gitignored
       await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/config.local.json', '.dbo/ticketing.local.json']);
 
@@ -85,6 +107,48 @@ export const initCommand = new Command('init')
         await saveTransactionKeyPreset('RowUID');
       }
 
+      // Prompt for TicketSuggestionOutput
+      const DEFAULT_TICKET_SUGGESTION_OUTPUT = 'ojaie9t3o0kfvliahnuuda';
+      if (!options.nonInteractive) {
+        const inquirer = (await import('inquirer')).default;
+        const { ticketSuggestionOutput } = await inquirer.prompt([{
+          type: 'input',
+          name: 'ticketSuggestionOutput',
+          message: 'Output UID for ticket suggestions (leave blank to skip):',
+          default: DEFAULT_TICKET_SUGGESTION_OUTPUT,
+        }]);
+        const tsVal = ticketSuggestionOutput.trim();
+        if (tsVal) {
+          await saveTicketSuggestionOutput(tsVal);
+          log.dim(`  TicketSuggestionOutput: ${tsVal}`);
+        }
+      } else {
+        await saveTicketSuggestionOutput(DEFAULT_TICKET_SUGGESTION_OUTPUT);
+      }
+
+      // ─── Scaffold ─────────────────────────────────────────────────────────────
+      let shouldScaffold = options.scaffold;
+
+      if (!shouldScaffold && !options.nonInteractive) {
+        const entries = await readdir(process.cwd());
+        const IGNORED = new Set(['.dbo', '.claude', '.idea', '.vscode']);
+        const isEmpty = entries.every(e => IGNORED.has(e));
+
+        const inquirer = (await import('inquirer')).default;
+        const { doScaffold } = await inquirer.prompt([{
+          type: 'confirm',
+          name: 'doScaffold',
+          message: 'Would you like to scaffold the standard project directory structure?',
+          default: isEmpty,
+        }]);
+        shouldScaffold = doScaffold;
+      }
+
+      if (shouldScaffold) {
+        const result = await scaffoldProjectDirs();
+        logScaffoldResult(result);
+      }
+
       // Clone if requested
       if (options.clone || options.app) {
         let appShortName = options.app;

package/src/commands/login.js

@@ -50,22 +50,17 @@ export const loginCommand = new Command('login')
         // Ensure sensitive files are gitignored
         await ensureGitignore(['.dbo/credentials.json', '.dbo/cookies.txt', '.dbo/ticketing.local.json']);
 
-        // Fetch current user info to store ID and UID for future submissions
+        // Fetch current user info to store ID for future submissions
         try {
           const userResult = await client.get('/api/output/31799e38f0854956a47f10', { '_format': 'json_raw' });
           const userData = userResult.payload || userResult.data;
           const rows = Array.isArray(userData) ? userData : (userData?.Rows || userData?.rows || []);
           if (rows.length > 0) {
             const row = rows[0];
-            const userUid = row.UID || row.uid;
             const userId = row.ID || row.id || row.UserID || row.userId;
-            const info = {};
-            if (userUid) info.userUid = userUid;
-            if (userId) info.userId = String(userId);
-            if (info.userUid || info.userId) {
-              await saveUserInfo(info);
-              if (info.userId) log.dim(`  User ID:  ${info.userId}`);
-              if (info.userUid) log.dim(`  User UID: ${info.userUid}`);
+            if (userId) {
+              await saveUserInfo({ userId: String(userId) });
+              log.dim(`  User ID: ${userId}`);
             }
 
             // Save user profile (name, email) for package.json population

package/src/commands/output.js

@@ -25,6 +25,22 @@ export const outputCommand = new Command('output')
   .option('--template <value>', 'Custom template')
   .option('--debug', 'Include debug info')
   .option('--debug-sql', 'Include SQL debug info')
+  .option('--debug-verbose', 'Verbose debug output')
+  .option('--debug-analysis', 'Analysis debug output')
+  .option('--limit <n>', 'Maximum rows to return (_limit)')
+  .option('--rowcount <bool>', 'Include row count: true (default) or false for performance')
+  .option('--display <expr>', 'Show/hide template tags (repeatable), e.g., "sidebar=hide"', collect, [])
+  .option('--format-values', 'Enable value formatting in json_raw output')
+  .option('--empty-response-code <code>', 'HTTP status code when output returns no results')
+  .option('--fallback-content <expr>', 'Fallback content UID for error codes, e.g., "404=contentUID"')
+  .option('--escape-html <bool>', 'Control HTML escaping: true or false')
+  .option('--mime <type>', 'Override MIME/content type')
+  .option('--strict', 'Strict error mode')
+  .option('--confirm', 'Confirmation flag')
+  .option('--include <expr>', 'Include token')
+  .option('--no-transaction', 'Disable transaction wrapping')
+  .option('--skip <phase>', 'Skip execution phases (repeatable, admin-only)', collect, [])
+  .option('--profile', 'Enable MiniProfiler output')
   .option('--meta', 'Use meta output endpoint')
   .option('--meta-column <uid>', 'Column metadata')
   .option('--save', 'Interactive save-to-disk mode')
@@ -66,8 +82,45 @@ export const outputCommand = new Command('output')
       if (options.maxrows) params['_maxrows'] = options.maxrows;
       if (options.rows) params['_rows'] = options.rows;
       if (options.template) params['_template'] = options.template;
+      if (options.limit) params['_limit'] = options.limit;
+      if (options.rowcount !== undefined) params['_rowcount'] = options.rowcount;
       if (options.debug) params['_debug'] = 'true';
       if (options.debugSql) params['_debug_sql'] = 'true';
+      if (options.debugVerbose) params['_debug:verbose'] = 'true';
+      if (options.debugAnalysis) params['_debug:analysis'] = 'true';
+      if (options.formatValues) params['_format_values'] = 'true';
+      if (options.emptyResponseCode) params['_empty_response_code'] = options.emptyResponseCode;
+      if (options.escapeHtml !== undefined) params['_escape_html'] = options.escapeHtml;
+      if (options.mime) params['_mime'] = options.mime;
+      if (options.strict) params['_strict'] = 'true';
+      if (options.confirm) params['_confirm'] = 'true';
+      if (options.include) params['_include'] = options.include;
+      if (options.transaction === false) params['_no_transaction'] = 'true';
+      if (options.profile) params['_profile'] = 'true';
+
+      // --display: "tagName=show|hide" → _display@tagName=show|hide
+      for (const d of options.display) {
+        const eqIdx = d.indexOf('=');
+        if (eqIdx !== -1) {
+          params[`_display@${d.substring(0, eqIdx)}`] = d.substring(eqIdx + 1);
+        }
+      }
+
+      // --fallback-content: "404=contentUID" → _fallback_content:404=contentUID
+      if (options.fallbackContent) {
+        const fb = options.fallbackContent;
+        if (fb.includes('=')) {
+          const [code, uid] = fb.split('=', 2);
+          params[`_fallback_content:${code}`] = uid;
+        } else {
+          params['_fallback_content'] = fb;
+        }
+      }
+
+      // --skip: repeatable → array
+      if (options.skip.length > 0) {
+        params['_skip'] = options.skip;
+      }
 
       for (const f of options.filter) {
         const atIdx = f.indexOf('=');
@@ -84,9 +137,9 @@ export const outputCommand = new Command('output')
         }
       }
 
-      for (const s of options.sort) {
-        const [col, dir] = s.includes(':') ? s.split(':') : [s, 'asc'];
-        params[`_sort@${col}`] = dir;
+      // Pass sort values through directly — API expects _sort=Column:DIR
+      if (options.sort.length > 0) {
+        params['_sort'] = options.sort;
       }
 
       // For save mode or jq mode, force json_raw if user didn't set a custom format

package/src/commands/pull.js

@@ -40,9 +40,9 @@ export const pullCommand = new Command('pull')
         }
       }
 
-      for (const s of options.sort) {
-        const [col, dir] = s.includes(':') ? s.split(':') : [s, 'asc'];
-        params[`_sort@${col}`] = dir;
+      // Pass sort values through directly — API expects _sort=Column:DIR
+      if (options.sort.length > 0) {
+        params['_sort'] = options.sort;
       }
 
       let path;

package/src/commands/push.js

@@ -13,7 +13,7 @@ import { resolveTransactionKey } from '../lib/transaction-key.js';
 import { setFileTimestamps } from '../lib/timestamps.js';
 import { findMetadataFiles } from '../lib/diff.js';
 import { detectChangedColumns, findBaselineEntry } from '../lib/delta.js';
-import { buildDependencyGraph } from '../lib/dependencies.js';
+import { ENTITY_DEPENDENCIES } from '../lib/dependencies.js';
 
 export const pushCommand = new Command('push')
   .description('Push local files back to DBO.io using metadata from pull')
@@ -262,13 +262,12 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
     }
   }
 
-  // Group by entity and apply dependency ordering
-  const byEntity = {};
-  for (const item of toPush) {
-    const entity = item.meta._entity;
-    if (!byEntity[entity]) byEntity[entity] = [];
-    byEntity[entity].push(item);
-  }
+  // Sort by dependency level: children first (ascending level) for add/edit operations
+  toPush.sort((a, b) => {
+    const levelA = ENTITY_DEPENDENCIES[a.meta._entity] || 0;
+    const levelB = ENTITY_DEPENDENCIES[b.meta._entity] || 0;
+    return levelA - levelB;
+  });
 
   // Process in dependency order
   let succeeded = 0;
@@ -361,6 +360,7 @@ async function pushFromMetadata(meta, metaPath, client, options, changedColumns
   for (const [key, value] of Object.entries(meta)) {
     if (shouldSkipColumn(key)) continue;
     if (key === 'UID') continue; // UID is the identifier, not a column to update
+    if (key === 'children') continue; // Output hierarchy structural field, not a server column
     if (value === null || value === undefined) continue;
 
     // Delta sync: skip columns not in changedColumns
@@ -413,7 +413,7 @@ async function pushFromMetadata(meta, metaPath, client, options, changedColumns
   }
 
   // Retry with prompted params if needed (ticket, user, repo mismatch)
-  const retryResult = await checkSubmitErrors(result);
+  const retryResult = await checkSubmitErrors(result, { rowUid: uid });
   if (retryResult) {
     // Handle skip actions
     if (retryResult.skipRecord) {

package/src/commands/status.js

@@ -18,7 +18,6 @@ export const statusCommand = new Command('status')
       log.label('Username', config.username || '(not set)');
       const userInfo = await loadUserInfo();
       log.label('User ID', userInfo.userId || '(not set)');
-      log.label('User UID', userInfo.userUid || '(not set — run "dbo login")');
       log.label('Directory', process.cwd());
 
       const cookiesPath = await getActiveCookiesPath();

package/src/lib/config.js

@@ -69,7 +69,7 @@ export async function initConfig(domain) {
 
 export async function saveCredentials(username) {
   await mkdir(dboDir(), { recursive: true });
-  // Preserve existing fields (like userUid) — never store password
+  // Preserve existing fields (like userId) — never store password
   let existing = {};
   try {
     existing = JSON.parse(await readFile(credentialsPath(), 'utf8'));
@@ -79,14 +79,13 @@ export async function saveCredentials(username) {
   await writeFile(credentialsPath(), JSON.stringify(existing, null, 2) + '\n');
 }
 
-export async function saveUserInfo({ userId, userUid }) {
+export async function saveUserInfo({ userId }) {
   await mkdir(dboDir(), { recursive: true });
   let existing = {};
   try {
     existing = JSON.parse(await readFile(credentialsPath(), 'utf8'));
   } catch { /* no existing file */ }
   if (userId !== undefined) existing.userId = userId;
-  if (userUid !== undefined) existing.userUid = userUid;
   await writeFile(credentialsPath(), JSON.stringify(existing, null, 2) + '\n');
 }
 
@@ -94,12 +93,9 @@ export async function loadUserInfo() {
   try {
     const raw = await readFile(credentialsPath(), 'utf8');
     const creds = JSON.parse(raw);
-    return {
-      userId: creds.userId || null,
-      userUid: creds.userUid || null,
-    };
+    return { userId: creds.userId || null };
   } catch {
-    return { userId: null, userUid: null };
+    return { userId: null };
   }
 }
 
@@ -529,6 +525,50 @@ export async function getAllPluginScopes() {
   return result;
 }
 
+// ─── Output Hierarchy Filename Preferences ────────────────────────────────
+
+/**
+ * Config keys for output hierarchy filename column preferences.
+ * Maps physical table names to config key names.
+ */
+const OUTPUT_FILENAME_CONFIG_KEYS = {
+  output: 'OutputFilenameCol',
+  output_value: 'OutputColumnFilenameCol',
+  output_value_filter: 'OutputFilterFilenameCol',
+  output_value_entity_column_rel: 'OutputJoinFilenameCol',
+};
+
+/**
+ * Load output filename column preference for an entity type.
+ * @param {string} entityKey - Physical table name (e.g., 'output', 'output_value')
+ * @returns {Promise<string|null>}
+ */
+export async function loadOutputFilenamePreference(entityKey) {
+  try {
+    const raw = await readFile(configPath(), 'utf8');
+    const config = JSON.parse(raw);
+    const configKey = OUTPUT_FILENAME_CONFIG_KEYS[entityKey];
+    return configKey ? (config[configKey] || null) : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Save output filename column preference for an entity type.
+ * @param {string} entityKey - Physical table name
+ * @param {string} columnName - Column name to use as filename
+ */
+export async function saveOutputFilenamePreference(entityKey, columnName) {
+  const configKey = OUTPUT_FILENAME_CONFIG_KEYS[entityKey];
+  if (!configKey) return;
+  await mkdir(dboDir(), { recursive: true });
+  let existing = {};
+  try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
+  existing[configKey] = columnName;
+  await writeFile(configPath(), JSON.stringify(existing, null, 2) + '\n');
+}
+
 // ─── AppModifyKey ─────────────────────────────────────────────────────────
 
 /**
@@ -580,6 +620,32 @@ export async function loadTransactionKeyPreset() {
   } catch { return null; }
 }
 
+// ─── TicketSuggestionOutput ────────────────────────────────────────────────
+
+/**
+ * Save TicketSuggestionOutput to .dbo/config.json.
+ * This is the output UID used to fetch ticket suggestions.
+ */
+export async function saveTicketSuggestionOutput(outputUid) {
+  await mkdir(dboDir(), { recursive: true });
+  let existing = {};
+  try { existing = JSON.parse(await readFile(configPath(), 'utf8')); } catch {}
+  if (outputUid != null) existing.TicketSuggestionOutput = outputUid;
+  else delete existing.TicketSuggestionOutput;
+  await writeFile(configPath(), JSON.stringify(existing, null, 2) + '\n');
+}
+
+/**
+ * Load TicketSuggestionOutput from .dbo/config.json.
+ * Returns the output UID string or null if not set.
+ */
+export async function loadTicketSuggestionOutput() {
+  try {
+    const raw = await readFile(configPath(), 'utf8');
+    return JSON.parse(raw).TicketSuggestionOutput || null;
+  } catch { return null; }
+}
+
 // ─── Gitignore ────────────────────────────────────────────────────────────
 
 /**

package/src/lib/diff.js

@@ -28,7 +28,8 @@ async function fileExists(path) {
 }
 
 /**
- * Recursively find all .metadata.json files in a directory.
+ * Recursively find all metadata files in a directory.
+ * Includes .metadata.json files and output hierarchy files (_output~*.json).
  */
 export async function findMetadataFiles(dir) {
   const results = [];
@@ -42,6 +43,9 @@ export async function findMetadataFiles(dir) {
       results.push(...await findMetadataFiles(fullPath));
     } else if (entry.name.endsWith('.metadata.json')) {
       results.push(fullPath);
+    } else if (entry.name.startsWith('_output~') && entry.name.endsWith('.json') && !entry.name.includes('.CustomSQL.')) {
+      // Output hierarchy files: _output~<name>~<uid>.json and nested entity files
+      results.push(fullPath);
     }
   }
 

package/src/lib/domain-guard.js

@@ -0,0 +1,95 @@
+import { readFile, writeFile, stat, utimes } from 'fs/promises';
+import { join } from 'path';
+import { loadConfig, loadTransactionKeyPreset } from './config.js';
+import { log } from './logger.js';
+
+const appJsonPath = () => join(process.cwd(), 'app.json');
+
+/** Read _domain from app.json. Returns null if file missing or field absent. */
+export async function readAppJsonDomain() {
+  try {
+    const obj = JSON.parse(await readFile(appJsonPath(), 'utf8'));
+    return obj._domain || null;
+  } catch { return null; }
+}
+
+/**
+ * Write _domain to app.json, preserving mtime so git doesn't see a spurious change.
+ * No-op if app.json does not exist.
+ */
+export async function writeAppJsonDomain(domain) {
+  const path = appJsonPath();
+  let originalStat;
+  try { originalStat = await stat(path); } catch { return; }
+  const obj = JSON.parse(await readFile(path, 'utf8'));
+  obj._domain = domain;
+  await writeFile(path, JSON.stringify(obj, null, 2) + '\n');
+  await utimes(path, originalStat.atime, originalStat.mtime); // restore mtime
+}
+
+/**
+ * Check whether newDomain differs from the project reference domain.
+ * Reference = app.json._domain (authoritative) → fallback: config.json.domain.
+ * If reference is absent entirely, returns { changed: false } (no warning).
+ *
+ * Returns { changed: false } or { changed: true, proceed: bool }.
+ * Throws in non-interactive mode when TransactionKeyPreset=RowID and domain changes.
+ */
+export async function checkDomainChange(newDomain, options = {}) {
+  let referenceDomain = await readAppJsonDomain();
+  if (!referenceDomain) {
+    const config = await loadConfig();
+    referenceDomain = config.domain || null;
+  }
+  if (!referenceDomain) return { changed: false };
+
+  const norm = d => d ? String(d).replace(/^https?:\/\//, '').replace(/\/$/, '').toLowerCase() : null;
+  if (norm(newDomain) === norm(referenceDomain)) return { changed: false };
+
+  const preset = await loadTransactionKeyPreset();
+  const isRowID = preset === 'RowID';
+
+  if (options.yes || !process.stdin.isTTY) {
+    if (isRowID) {
+      throw new Error(
+        `Domain change detected: "${referenceDomain}" → "${newDomain}"\n` +
+        `Cannot proceed in non-interactive mode with TransactionKeyPreset=RowID. ` +
+        `Numeric IDs are not unique across domains — submitting to the wrong domain may overwrite or corrupt records.`
+      );
+    }
+    log.warn(`Domain change detected: "${referenceDomain}" → "${newDomain}". Proceeding (TransactionKeyPreset=RowUID).`);
+    return { changed: true, proceed: true };
+  }
+
+  const inquirer = (await import('inquirer')).default;
+  log.plain('');
+
+  if (isRowID) {
+    log.error('⛔  CRITICAL: Domain change detected');
+    log.warn(`  Reference domain : ${referenceDomain}`);
+    log.warn(`  New domain       : ${newDomain}`);
+    log.plain('');
+    log.warn('  TransactionKeyPreset=RowID is active. Numeric IDs are NOT unique across');
+    log.warn('  domains. Pushing to the wrong domain may overwrite or corrupt records in');
+    log.warn('  a different app.');
+    log.plain('');
+    const { confirmText } = await inquirer.prompt([{
+      type: 'input',
+      name: 'confirmText',
+      message: `Type "yes, change domain" to confirm switching to "${newDomain}":`,
+    }]);
+    return { changed: true, proceed: confirmText.trim() === 'yes, change domain' };
+  }
+
+  log.warn('⚠  Domain change detected');
+  log.dim(`  Reference domain : ${referenceDomain}`);
+  log.dim(`  New domain       : ${newDomain}`);
+  log.plain('');
+  const { confirm } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'confirm',
+    message: `Switch domain from "${referenceDomain}" to "${newDomain}"?`,
+    default: false,
+  }]);
+  return { changed: true, proceed: confirm };
+}