@dboio/cli 0.6.14 → 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,7 +1,7 @@
 import { Command } from 'commander';
 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';
@@ -107,6 +107,25 @@ 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;
 

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/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/input-parser.js

@@ -1,7 +1,8 @@
 import { readFile } from 'fs/promises';
 import { log } from './logger.js';
-import { loadUserInfo } from './config.js';
+import { loadUserInfo, loadTicketSuggestionOutput } from './config.js';
 import { buildTicketExpression, setGlobalTicket, setRecordTicket, getGlobalTicket, getRecordTicket } from './ticketing.js';
+import { DboClient } from './client.js';
 
 /**
  * Parse DBO input syntax and build form data.
@@ -84,6 +85,7 @@ function findValueAtSign(expr) {
 }
 
 // Patterns that indicate a missing user identity in the server response
+// Note: the user entity only has an ID (never a UID), so all patterns resolve to _OverrideUserID.
 const USER_ID_PATTERNS = [
   'LoggedInUser_UID',
   'LoggedInUserID',
@@ -101,7 +103,7 @@ const USER_ID_PATTERNS = [
  * - repo_mismatch → repository mismatch recovery (6 options)
  * - ticket_lookup_required_error → prompts for Ticket ID (legacy)
  * - LoggedInUser_UID, LoggedInUserID, CurrentUserID, UserID not found
- *   → prompts for User ID or UID (session not authenticated)
+ *   → prompts for User ID (session not authenticated)
  *
  * Returns an object with retry information, or null if no recoverable errors found.
  *
@@ -109,9 +111,9 @@ const USER_ID_PATTERNS = [
  *   { retryParams, ticketExpressions, skipRecord, skipAll }
  *
  * Return shape for legacy/user errors (backward compatible):
- *   { _OverrideTicketID, _OverrideUserUID, _OverrideUserID, ... }
+ *   { _OverrideTicketID, _OverrideUserID, ... }
  */
-export async function checkSubmitErrors(result) {
+export async function checkSubmitErrors(result, context = {}) {
   const messages = result.messages || result.data?.Messages || [];
   const allText = messages.filter(m => typeof m === 'string').join(' ');
 
@@ -121,7 +123,7 @@ export async function checkSubmitErrors(result) {
   const hasRepoMismatch = allText.includes('repo_mismatch');
 
   if (hasTicketError) {
-    return await handleTicketError(allText);
+    return await handleTicketError(allText, context);
   }
 
   if (hasRepoMismatch) {
@@ -132,7 +134,6 @@ export async function checkSubmitErrors(result) {
   const needsTicket = allText.includes('ticket_lookup_required_error');
   const matchedUserPattern = USER_ID_PATTERNS.find(p => allText.includes(p));
   const needsUser = !!matchedUserPattern;
-  const needsUserUid = matchedUserPattern && matchedUserPattern.includes('UID');
 
   if (!needsTicket && !needsUser) return null;
 
@@ -142,14 +143,9 @@ export async function checkSubmitErrors(result) {
   if (!process.stdin.isTTY) {
     if (needsUser) {
       const stored = await loadUserInfo();
-      const storedValue = needsUserUid ? stored.userUid : (stored.userId || stored.userUid);
-      if (storedValue) {
-        log.info(`Using stored user ${needsUserUid ? 'UID' : 'ID'}: ${storedValue} (non-interactive mode)`);
-        if (needsUserUid) {
-          retryParams['_OverrideUserUID'] = storedValue;
-        } else {
-          retryParams['_OverrideUserID'] = storedValue;
-        }
+      if (stored.userId) {
+        log.info(`Using stored user ID: ${stored.userId} (non-interactive mode)`);
+        retryParams['_OverrideUserID'] = stored.userId;
       } else {
         log.error(`This operation requires an authenticated user (${matchedUserPattern}).`);
         log.dim('  Run "dbo login" first, or use an interactive terminal.');
@@ -167,41 +163,36 @@ export async function checkSubmitErrors(result) {
   const prompts = [];
 
   if (needsUser) {
-    const idType = needsUserUid ? 'UID' : 'ID';
     log.warn(`This operation requires an authenticated user (${matchedUserPattern}).`);
     log.dim('  Your session may have expired, or you may not be logged in.');
     log.dim('  You can log in with "dbo login" to avoid this prompt in the future.');
 
     const stored = await loadUserInfo();
-    const storedValue = needsUserUid ? stored.userUid : (stored.userId || stored.userUid);
-    const storedLabel = needsUserUid
-      ? (stored.userUid ? `UID: ${stored.userUid}` : null)
-      : (stored.userId ? `ID: ${stored.userId}` : (stored.userUid ? `UID: ${stored.userUid}` : null));
 
-    if (storedValue) {
-      log.dim(`  Stored session user ${storedLabel}`);
+    if (stored.userId) {
+      log.dim(`  Stored session user ID: ${stored.userId}`);
       prompts.push({
         type: 'list',
         name: 'userChoice',
-        message: `User ${idType} Required:`,
+        message: 'User ID Required:',
         choices: [
-          { name: `Use session user (${storedLabel})`, value: storedValue },
-          { name: `Enter a different User ${idType}`, value: '_custom' },
+          { name: `Use session user (ID: ${stored.userId})`, value: stored.userId },
+          { name: 'Enter a different User ID', value: '_custom' },
         ],
       });
       prompts.push({
         type: 'input',
         name: 'customUserValue',
-        message: `Custom User ${idType}:`,
+        message: 'Custom User ID:',
         when: (answers) => answers.userChoice === '_custom',
-        validate: v => v.trim() ? true : `User ${idType} is required`,
+        validate: v => v.trim() ? true : 'User ID is required',
       });
     } else {
       prompts.push({
         type: 'input',
         name: 'userValue',
-        message: `User ${idType} Required:`,
-        validate: v => v.trim() ? true : `User ${idType} is required`,
+        message: 'User ID Required:',
+        validate: v => v.trim() ? true : 'User ID is required',
       });
     }
   }
@@ -224,11 +215,7 @@ export async function checkSubmitErrors(result) {
   const userValue = answers.userValue
     || (answers.userChoice === '_custom' ? answers.customUserValue : answers.userChoice);
   if (userValue) {
-    if (needsUserUid) {
-      retryParams['_OverrideUserUID'] = userValue.trim();
-    } else {
-      retryParams['_OverrideUserID'] = userValue.trim();
-    }
+    retryParams['_OverrideUserID'] = userValue.trim();
   }
 
   return retryParams;
@@ -238,7 +225,7 @@ export async function checkSubmitErrors(result) {
  * Handle ticket_error: Record update requires a Ticket ID but none was provided.
  * Prompts the user with 4 recovery options.
  */
-async function handleTicketError(allText) {
+async function handleTicketError(allText, context = {}) {
   // Try to extract record details from error text
   const entityMatch = allText.match(/entity:(\w+)/);
   const rowIdMatch = allText.match(/RowID:(\d+)/);
@@ -262,9 +249,63 @@ async function handleTicketError(allText) {
     return null;
   }
 
+  // Fetch ticket suggestions if configured
+  let suggestionChoices = [];
+  const ticketSuggestionUid = await loadTicketSuggestionOutput();
+  const rowUid = context.rowUid || uid || null;
+
+  if (ticketSuggestionUid && rowUid) {
+    try {
+      const client = new DboClient();
+      const suggestResult = await client.get(`/api/output/${ticketSuggestionUid}`, {
+        '_limit': '5',
+        '_rowcount': 'false',
+        '_template': 'json_raw',
+        '_filter@AssetUID': rowUid,
+      });
+      const rows = suggestResult.payload || suggestResult.data;
+      const rowArray = Array.isArray(rows) ? rows : (rows?.Rows || rows?.rows || []);
+      for (let i = 0; i < rowArray.length; i++) {
+        const row = rowArray[i];
+        const ticketId = row.TicketID || row.ticket_id;
+        const title = row.Title || row.Name || '';
+        const shortName = row.ShortName || row.short_name || '';
+        if (ticketId) {
+          const label = `${i + 1} (${ticketId}): ${title}${shortName ? ` [${shortName}]` : ''}`;
+          suggestionChoices.push({ name: label, value: String(ticketId) });
+        }
+      }
+    } catch (err) {
+      log.dim(`  (Could not fetch ticket suggestions: ${err.message})`);
+    }
+  }
+
   log.warn('This record update requires a Ticket ID.');
 
   const inquirer = (await import('inquirer')).default;
+
+  // Build the ticket ID prompt — list with suggestions or manual input
+  const needsTicket = (a) => a.ticketAction === 'apply_one' || a.ticketAction === 'apply_all';
+
+  const ticketIdPrompt = suggestionChoices.length > 0
+    ? {
+        type: 'list',
+        name: 'ticketId',
+        message: 'Select a Ticket ID:',
+        choices: [
+          ...suggestionChoices,
+          { name: 'Enter a Ticket ID manually\u2026', value: '_manual' },
+        ],
+        when: needsTicket,
+      }
+    : {
+        type: 'input',
+        name: 'ticketId',
+        message: 'Enter Ticket ID:',
+        when: needsTicket,
+        validate: v => v.trim() ? true : 'Ticket ID is required',
+      };
+
   const answers = await inquirer.prompt([
     {
       type: 'list',
@@ -277,11 +318,12 @@ async function handleTicketError(allText) {
         { name: 'Skip all updates that require a Ticket ID', value: 'skip_all' },
       ],
     },
+    ticketIdPrompt,
     {
       type: 'input',
-      name: 'ticketId',
-      message: 'Enter Ticket ID:',
-      when: (a) => a.ticketAction === 'apply_one' || a.ticketAction === 'apply_all',
+      name: 'ticketIdManual',
+      message: 'Ticket ID:',
+      when: (a) => needsTicket(a) && a.ticketId === '_manual',
       validate: v => v.trim() ? true : 'Ticket ID is required',
     },
   ]);
@@ -293,7 +335,14 @@ async function handleTicketError(allText) {
     return { skipAll: true };
   }
 
-  const ticketId = answers.ticketId.trim();
+  const ticketId = (answers.ticketIdManual?.trim()) ||
+    (answers.ticketId !== '_manual' ? answers.ticketId?.trim() : null);
+
+  if (!ticketId) {
+    log.error('  No Ticket ID provided. Skipping record.');
+    return { skipRecord: true };
+  }
+
   const ticketExpressions = [];
 
   if (entity && rowId) {

package/src/lib/structure.js

@@ -19,6 +19,22 @@ export const DEFAULT_PROJECT_DIRS = [
   'Integrations',
 ];
 
+/** Map from physical output table names → documentation/display names */
+export const OUTPUT_ENTITY_MAP = {
+  output: 'output',
+  output_value: 'column',
+  output_value_filter: 'filter',
+  output_value_entity_column_rel: 'join',
+};
+
+/** All output hierarchy entity types (physical table names) */
+export const OUTPUT_HIERARCHY_ENTITIES = [
+  'output',
+  'output_value',
+  'output_value_filter',
+  'output_value_entity_column_rel',
+];
+
 /** Map from server entity key → local project directory name */
 export const ENTITY_DIR_MAP = {
   extension:    'Extensions',