@dboio/cli 0.6.10 → 0.6.11

package/README.md

@@ -1165,15 +1165,23 @@ The submission is then retried with `_OverrideTicketID`. To skip the prompt, pas
 
 #### Pre-submission ticket prompt
 
-When a stored ticket exists in `.dbo/ticketing.local.json`, the CLI prompts before batch submissions:
+When a stored ticket exists in `.dbo/ticketing.local.json`, the CLI prompts before batch submissions (`push`, `input`, `add`, `content deploy`, `deploy`):
 
 ```
 ? Use stored Ticket ID "TICKET-123" for this submission?
 ❯ Yes, use "TICKET-123"
+  Use a different ticket for this submission only
+  Use a different ticket for this and future submissions
   No, clear stored ticket
   Cancel submission
 ```
 
+- **Yes** — applies the stored ticket to all records in this submission
+- **Different ticket (this submission only)** — prompts for a ticket ID, uses it for all records in this invocation without updating `ticketing.local.json`
+- **Different ticket (this and future)** — prompts for a ticket ID, updates `ticketing.local.json`, and uses it for this and all future submissions
+- **No, clear** — removes the stored `ticket_id` and proceeds without a ticket
+- **Cancel** — aborts the submission
+
 #### `.dbo/ticketing.local.json`
 
 Stores ticket IDs for automatic application during submissions:
@@ -1327,6 +1335,11 @@ dbo deploy css:colors --confirm false
 | `-C, --confirm <true\|false>` | Commit (default: `true`) |
 | `--ticket <id>` | Override ticket ID |
 | `--modify-key <key>` | Provide ModifyKey directly (skips interactive prompt) |
+| `--json` | Output raw JSON |
+| `-v, --verbose` | Show HTTP request details |
+| `--domain <host>` | Override domain |
+
+The `deploy` command includes the same automatic error recovery as `push`, `input`, and `add` — including ticket error handling, repository mismatch recovery, user identity prompts, and ModifyKey protection. When a stored ticket exists, you'll be prompted before the first submission (see [Pre-submission ticket prompt](#pre-submission-ticket-prompt)).
 
 #### `dbo.deploy.json` manifest
 
@@ -1362,6 +1375,33 @@ Create a `dbo.deploy.json` file in your project root to define named deployments
 
 This replaces the curl commands typically embedded in `package.json` scripts.
 
+#### Non-interactive mode (npm scripts)
+
+When running `dbo deploy` (or any submission command) inside npm scripts or piped commands where stdin is not a TTY, the CLI automatically skips all interactive prompts and uses stored credentials:
+
+- **Stored ticket** — auto-applied from `.dbo/ticketing.local.json`
+- **ModifyKey** — auto-applied from `.dbo/config.json` (`AppModifyKey`)
+- **User identity** — auto-applied from `.dbo/credentials.json`
+
+If a required value is missing and no interactive prompt is possible, the command fails with a clear error message explaining how to set up the missing value.
+
+Example `package.json` scripts:
+
+```json
+{
+  "scripts": {
+    "deploy:css": "dbo deploy css:colors && dbo deploy css:layout",
+    "deploy:docs": "dbo deploy doc:readme && dbo deploy doc:api",
+    "deploy:all": "dbo deploy --all"
+  }
+}
+```
+
+To set up for non-interactive use:
+1. Run `dbo login` to store user credentials
+2. Run `dbo clone` to store the ModifyKey (if applicable)
+3. Set a ticket interactively once — it persists in `ticketing.local.json` for future npm script runs
+
 ---
 
 ## Global Flags

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "CLI for the DBO.io framework",
   "type": "module",
   "bin": {

package/src/commands/content.js

@@ -2,10 +2,11 @@ import { Command } from 'commander';
 import { writeFile } from 'fs/promises';
 import chalk from 'chalk';
 import { DboClient } from '../lib/client.js';
-import { buildInputBody } from '../lib/input-parser.js';
+import { buildInputBody, checkSubmitErrors } from '../lib/input-parser.js';
 import { formatResponse, formatError } from '../lib/formatter.js';
 import { saveToDisk } from '../lib/save-to-disk.js';
 import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/modify-key.js';
+import { checkStoredTicket, applyStoredTicketToSubmission, clearGlobalTicket, getGlobalTicket, getRecordTicket } from '../lib/ticketing.js';
 import { log } from '../lib/logger.js';
 
 function collect(value, previous) {
@@ -44,11 +45,38 @@ const deployCmd = new Command('deploy')
         return;
       }
 
+      // Pre-flight ticket validation (only if no --ticket flag)
+      let sessionTicketOverride = null;
+      if (!options.ticket) {
+        const ticketCheck = await checkStoredTicket(options);
+        if (ticketCheck.cancel) {
+          log.info('Submission cancelled');
+          return;
+        }
+        if (ticketCheck.clearTicket) {
+          await clearGlobalTicket();
+          log.dim('  Cleared stored ticket');
+        }
+        if (ticketCheck.overrideTicket) {
+          sessionTicketOverride = ticketCheck.overrideTicket;
+        }
+      }
+
       const extraParams = { '_confirm': options.confirm };
       if (options.ticket) extraParams['_OverrideTicketID'] = options.ticket;
       if (modifyKeyResult.modifyKey) extraParams['_modify_key'] = modifyKeyResult.modifyKey;
 
       const dataExprs = [`RowUID:${uid};column:content.Content@${filepath}`];
+
+      // Apply stored ticket if no --ticket flag
+      if (!options.ticket) {
+        const storedTicket = sessionTicketOverride || await getRecordTicket(uid) || await getGlobalTicket();
+        if (storedTicket) {
+          extraParams['_OverrideTicketID'] = storedTicket;
+        }
+      }
+      await applyStoredTicketToSubmission(dataExprs, 'content', uid, uid, options, sessionTicketOverride);
+
       let body = await buildInputBody(dataExprs, extraParams);
       let result = await client.postUrlEncoded('/api/input/submit', body);
 
@@ -61,6 +89,22 @@ const deployCmd = new Command('deploy')
         result = await client.postUrlEncoded('/api/input/submit', body);
       }
 
+      // Retry with prompted params if needed (ticket, user, repo mismatch)
+      const errorResult = await checkSubmitErrors(result);
+      if (errorResult) {
+        if (errorResult.skipRecord || errorResult.skipAll) {
+          log.info('Submission cancelled');
+          return;
+        }
+        if (errorResult.ticketExpressions?.length > 0) {
+          dataExprs.push(...errorResult.ticketExpressions);
+        }
+        const params = errorResult.retryParams || errorResult;
+        Object.assign(extraParams, params);
+        body = await buildInputBody(dataExprs, extraParams);
+        result = await client.postUrlEncoded('/api/input/submit', body);
+      }
+
       formatResponse(result, { json: options.json });
       if (!result.successful) process.exit(1);
     } catch (err) {

package/src/commands/deploy.js

@@ -1,9 +1,10 @@
 import { Command } from 'commander';
 import { readFile } from 'fs/promises';
 import { DboClient } from '../lib/client.js';
-import { buildInputBody } from '../lib/input-parser.js';
+import { buildInputBody, checkSubmitErrors } from '../lib/input-parser.js';
 import { formatResponse, formatError } from '../lib/formatter.js';
 import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/modify-key.js';
+import { checkStoredTicket, applyStoredTicketToSubmission, clearGlobalTicket, getGlobalTicket, getRecordTicket } from '../lib/ticketing.js';
 import { log } from '../lib/logger.js';
 
 const MANIFEST_FILE = 'dbo.deploy.json';
@@ -61,6 +62,23 @@ export const deployCommand = new Command('deploy')
       }
       let activeModifyKey = modifyKeyResult.modifyKey;
 
+      // Pre-flight ticket validation (only if no --ticket flag)
+      let sessionTicketOverride = null;
+      if (!options.ticket) {
+        const ticketCheck = await checkStoredTicket(options);
+        if (ticketCheck.cancel) {
+          log.info('Submission cancelled');
+          return;
+        }
+        if (ticketCheck.clearTicket) {
+          await clearGlobalTicket();
+          log.dim('  Cleared stored ticket');
+        }
+        if (ticketCheck.overrideTicket) {
+          sessionTicketOverride = ticketCheck.overrideTicket;
+        }
+      }
+
       for (const [entryName, entry] of entries) {
         if (!entry) {
           log.warn(`Skipping unknown deployment: ${entryName}`);
@@ -84,6 +102,16 @@ export const deployCommand = new Command('deploy')
         if (activeModifyKey) extraParams['_modify_key'] = activeModifyKey;
 
         const dataExprs = [`RowUID:${uid};column:${entity}.${column}@${file}`];
+
+        // Apply stored ticket if no --ticket flag
+        if (!options.ticket) {
+          const storedTicket = sessionTicketOverride || await getRecordTicket(uid) || await getGlobalTicket();
+          if (storedTicket) {
+            extraParams['_OverrideTicketID'] = storedTicket;
+          }
+        }
+        await applyStoredTicketToSubmission(dataExprs, entity, uid, uid, options, sessionTicketOverride);
+
         let body = await buildInputBody(dataExprs, extraParams);
         let result = await client.postUrlEncoded('/api/input/submit', body);
 
@@ -97,11 +125,31 @@ export const deployCommand = new Command('deploy')
           result = await client.postUrlEncoded('/api/input/submit', body);
         }
 
+        // Retry with prompted params if needed (ticket, user, repo mismatch)
+        const errorResult = await checkSubmitErrors(result);
+        if (errorResult) {
+          if (errorResult.skipRecord) {
+            log.warn(`  Skipping "${entryName}"`);
+            continue;
+          }
+          if (errorResult.skipAll) {
+            log.warn(`  Skipping "${entryName}" and all remaining`);
+            break;
+          }
+          if (errorResult.ticketExpressions?.length > 0) {
+            dataExprs.push(...errorResult.ticketExpressions);
+          }
+          const params = errorResult.retryParams || errorResult;
+          Object.assign(extraParams, params);
+          body = await buildInputBody(dataExprs, extraParams);
+          result = await client.postUrlEncoded('/api/input/submit', body);
+        }
+
         if (result.successful) {
           log.success(`${entryName} deployed`);
         } else {
           log.error(`${entryName} failed`);
-          for (const msg of result.messages) log.label('Message', msg);
+          formatResponse(result, { json: options.json });
           if (!options.all) process.exit(1);
         }
       }

package/src/lib/input-parser.js

@@ -1,7 +1,7 @@
 import { readFile } from 'fs/promises';
 import { log } from './logger.js';
 import { loadUserInfo } from './config.js';
-import { buildTicketExpression, setGlobalTicket, setRecordTicket } from './ticketing.js';
+import { buildTicketExpression, setGlobalTicket, setRecordTicket, getGlobalTicket, getRecordTicket } from './ticketing.js';
 
 /**
  * Parse DBO input syntax and build form data.
@@ -136,9 +136,36 @@ export async function checkSubmitErrors(result) {
 
   if (!needsTicket && !needsUser) return null;
 
-  const prompts = [];
   const retryParams = {};
 
+  // Non-interactive mode: use stored credentials automatically
+  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;
+        }
+      } else {
+        log.error(`This operation requires an authenticated user (${matchedUserPattern}).`);
+        log.dim('  Run "dbo login" first, or use an interactive terminal.');
+        return null;
+      }
+    }
+    if (needsTicket) {
+      log.error('This operation requires a Ticket ID.');
+      log.dim('  Use --ticket <id> or run interactively first to set a ticket.');
+      return null;
+    }
+    return Object.keys(retryParams).length > 0 ? retryParams : null;
+  }
+
+  const prompts = [];
+
   if (needsUser) {
     const idType = needsUserUid ? 'UID' : 'ID';
     log.warn(`This operation requires an authenticated user (${matchedUserPattern}).`);
@@ -212,8 +239,6 @@ export async function checkSubmitErrors(result) {
  * Prompts the user with 4 recovery options.
  */
 async function handleTicketError(allText) {
-  const inquirer = (await import('inquirer')).default;
-
   // Try to extract record details from error text
   const entityMatch = allText.match(/entity:(\w+)/);
   const rowIdMatch = allText.match(/RowID:(\d+)/);
@@ -222,8 +247,24 @@ async function handleTicketError(allText) {
   const rowId = rowIdMatch?.[1];
   const uid = uidMatch?.[1];
 
+  // Non-interactive mode: try stored ticket, otherwise fail with instructions
+  if (!process.stdin.isTTY) {
+    const storedTicket = (uid && await getRecordTicket(uid)) || await getGlobalTicket();
+    if (storedTicket) {
+      log.info(`Using stored ticket "${storedTicket}" (non-interactive mode)`);
+      return {
+        retryParams: { '_OverrideTicketID': storedTicket },
+        ticketExpressions: entity && rowId ? [buildTicketExpression(entity, rowId, storedTicket)] : [],
+      };
+    }
+    log.error('This record requires a Ticket ID but no stored ticket is available.');
+    log.dim('  Run interactively first to set a ticket, or use --ticket <id>');
+    return null;
+  }
+
   log.warn('This record update requires a Ticket ID.');
 
+  const inquirer = (await import('inquirer')).default;
   const answers = await inquirer.prompt([
     {
       type: 'list',
@@ -279,8 +320,6 @@ async function handleTicketError(allText) {
  * Prompts the user with 6 recovery options.
  */
 async function handleRepoMismatch(allText) {
-  const inquirer = (await import('inquirer')).default;
-
   // Try to extract ticket ID from error text
   const ticketMatch = allText.match(/Ticket(?:\s+ID)?\s+(?:of\s+)?([A-Za-z0-9_-]+)/i);
   const ticketId = ticketMatch?.[1] || 'unknown';
@@ -293,8 +332,18 @@ async function handleRepoMismatch(allText) {
   const rowId = rowIdMatch?.[1];
   const uid = uidMatch?.[1];
 
+  // Non-interactive mode: commit anyway with the existing ticket
+  if (!process.stdin.isTTY) {
+    log.warn(`Ticket "${ticketId}" is for another repository — committing anyway (non-interactive mode)`);
+    return {
+      retryParams: { '_OverrideTicketID': ticketId },
+      ticketExpressions: [],
+    };
+  }
+
   log.warn(`Ticket "${ticketId}" is for another repository.`);
 
+  const inquirer = (await import('inquirer')).default;
   const answers = await inquirer.prompt([
     {
       type: 'list',

package/src/lib/modify-key.js

@@ -15,6 +15,12 @@ export async function checkModifyKey(options = {}) {
   const storedKey = await loadAppModifyKey();
   if (!storedKey) return { modifyKey: null, cancel: false };
 
+  // Non-interactive mode: use stored key automatically
+  if (!process.stdin.isTTY) {
+    log.info('Using stored ModifyKey (non-interactive mode)');
+    return { modifyKey: storedKey, cancel: false };
+  }
+
   log.warn('');
   log.warn('  ⚠  This app is locked (production mode). A ModifyKey is required to submit changes.');
   log.warn('');
@@ -61,6 +67,13 @@ export function isModifyKeyError(responseMessage) {
  * Returns { modifyKey: string } on success or { modifyKey: null, cancel: true } on cancel.
  */
 export async function handleModifyKeyError() {
+  // Non-interactive mode: cannot recover without user input
+  if (!process.stdin.isTTY) {
+    log.error('This app requires a ModifyKey but none is stored locally.');
+    log.dim('  Run "dbo clone" to fetch the key, or use --modify-key <key>');
+    return { modifyKey: null, cancel: true };
+  }
+
   log.warn('');
   log.warn('  ⚠  This app requires a ModifyKey. The key has not been set locally (try re-running `dbo clone`).');
   log.warn('');

package/src/lib/ticketing.js

@@ -21,7 +21,13 @@ const DEFAULT_TICKETING = { ticket_id: null, records: [] };
 export async function loadTicketing() {
   try {
     const raw = await readFile(ticketingPath(), 'utf8');
-    const data = JSON.parse(raw);
+    const trimmed = raw.trim();
+    if (!trimmed) {
+      const defaults = { ...DEFAULT_TICKETING, records: [] };
+      await saveTicketing(defaults);
+      return defaults;
+    }
+    const data = JSON.parse(trimmed);
     return {
       ticket_id: data.ticket_id || null,
       records: Array.isArray(data.records) ? data.records : [],
@@ -30,7 +36,9 @@ export async function loadTicketing() {
     if (err.code !== 'ENOENT') {
       log.warn('Ticketing config is corrupted or unreadable — starting fresh.');
     }
-    return { ...DEFAULT_TICKETING, records: [] };
+    const defaults = { ...DEFAULT_TICKETING, records: [] };
+    try { await saveTicketing(defaults); } catch { /* ignore write errors */ }
+    return defaults;
   }
 }
 
@@ -123,9 +131,12 @@ export async function clearAllRecordTickets() {
 
 /**
  * Build a ticket column expression for DBO input syntax.
+ * Uses RowUID when rowId is non-numeric (a UID string).
  */
 export function buildTicketExpression(entity, rowId, ticketId) {
-  return `RowID:${rowId};column:${entity}._LastUpdatedTicketID=${ticketId}`;
+  const isNumeric = /^-?\d+$/.test(String(rowId));
+  const rowKey = isNumeric ? 'RowID' : 'RowUID';
+  return `${rowKey}:${rowId};column:${entity}._LastUpdatedTicketID=${ticketId}`;
 }
 
 /**
@@ -145,6 +156,12 @@ export async function checkStoredTicket(options) {
     return { useTicket: false, clearTicket: false, cancel: false };
   }
 
+  // Non-interactive mode: auto-use stored ticket
+  if (!process.stdin.isTTY) {
+    log.info(`Using stored ticket "${data.ticket_id}" (non-interactive mode)`);
+    return { useTicket: true, clearTicket: false, cancel: false };
+  }
+
   const inquirer = (await import('inquirer')).default;
   const { action } = await inquirer.prompt([{
     type: 'list',
@@ -152,11 +169,31 @@ export async function checkStoredTicket(options) {
     message: `Use stored Ticket ID "${data.ticket_id}" for this submission?`,
     choices: [
       { name: `Yes, use "${data.ticket_id}"`, value: 'use' },
+      { name: 'Use a different ticket for this submission only', value: 'alt_once' },
+      { name: 'Use a different ticket for this and future submissions', value: 'alt_save' },
       { name: 'No, clear stored ticket', value: 'clear' },
       { name: 'Cancel submission', value: 'cancel' },
     ],
   }]);
 
+  if (action === 'alt_once' || action === 'alt_save') {
+    const { altTicket } = await inquirer.prompt([{
+      type: 'input',
+      name: 'altTicket',
+      message: 'Ticket ID:',
+    }]);
+    const ticket = altTicket.trim();
+    if (!ticket) {
+      log.error('  No Ticket ID entered. Submission cancelled.');
+      return { useTicket: false, clearTicket: false, cancel: true };
+    }
+    if (action === 'alt_save') {
+      await saveTicketing({ ...data, ticket_id: ticket });
+      log.dim(`  Stored ticket updated to "${ticket}"`);
+    }
+    return { useTicket: true, clearTicket: false, cancel: false, overrideTicket: ticket };
+  }
+
   return {
     useTicket: action === 'use',
     clearTicket: action === 'clear',
@@ -173,13 +210,14 @@ export async function checkStoredTicket(options) {
  * @param {string|number} rowId - Row ID or UID used in the submission
  * @param {string} uid - Record UID for per-record lookup
  * @param {Object} options - Command options
+ * @param {string|null} [sessionOverride] - One-time ticket override from pre-flight prompt
  */
-export async function applyStoredTicketToSubmission(dataExprs, entity, rowId, uid, options) {
+export async function applyStoredTicketToSubmission(dataExprs, entity, rowId, uid, options, sessionOverride = null) {
   if (options.ticket) return; // --ticket flag takes precedence
 
   const recordTicket = await getRecordTicket(uid);
   const globalTicket = await getGlobalTicket();
-  const ticketToUse = recordTicket || globalTicket;
+  const ticketToUse = sessionOverride || recordTicket || globalTicket;
 
   if (ticketToUse) {
     const ticketExpr = buildTicketExpression(entity, rowId, ticketToUse);