@lifestreamdynamics/vault-cli 1.3.4 → 1.3.6

package/dist/commands/webhooks.js

@@ -2,16 +2,18 @@ import chalk from 'chalk';
 import { getClientAsync } from '../client.js';
 import { addGlobalFlags, resolveFlags } from '../utils/flags.js';
 import { createOutput, handleError } from '../utils/output.js';
+import { resolveVaultId } from '../utils/resolve-vault.js';
 export function registerWebhookCommands(program) {
     const webhooks = program.command('webhooks').description('Manage vault webhooks');
     addGlobalFlags(webhooks.command('list')
         .description('List all webhooks for a vault')
-        .argument('<vaultId>', 'Vault ID'))
+        .argument('<vaultId>', 'Vault ID or slug'))
         .action(async (vaultId, _opts) => {
         const flags = resolveFlags(_opts);
         const out = createOutput(flags);
         out.startSpinner('Fetching webhooks...');
         try {
+            vaultId = await resolveVaultId(vaultId);
             const client = await getClientAsync();
             const webhookList = await client.webhooks.list(vaultId);
             out.stopSpinner();
@@ -42,18 +44,45 @@ export function registerWebhookCommands(program) {
     });
     addGlobalFlags(webhooks.command('create')
         .description('Create a new webhook')
-        .argument('<vaultId>', 'Vault ID')
+        .argument('<vaultId>', 'Vault ID or slug')
         .argument('<url>', 'Webhook endpoint URL')
-        .option('--events <events>', 'Comma-separated events (e.g., create,update,delete)', 'create,update,delete'))
+        .option('--events <events>', 'Comma-separated events (document.created, document.updated, document.deleted, document.moved, document.copied, or * for all)', 'document.created,document.updated,document.deleted')
+        .addHelpText('after', `
+VALID EVENT NAMES
+  document.created   Document was created
+  document.updated   Document content was updated
+  document.deleted   Document was deleted
+  document.moved     Document was moved or renamed
+  document.copied    Document was copied
+  *                  All events
+
+EXAMPLES
+  lsvault webhooks create <vaultId> https://example.com/hook
+  lsvault webhooks create <vaultId> https://example.com/hook --events "document.created,document.deleted"
+  lsvault webhooks create <vaultId> https://example.com/hook --events "*"`))
         .action(async (vaultId, url, _opts) => {
         const flags = resolveFlags(_opts);
         const out = createOutput(flags);
+        if (!/^https?:\/\//i.test(url)) {
+            out.error(`Invalid webhook URL "${url}". URL must start with http:// or https://`);
+            process.exitCode = 1;
+            return;
+        }
+        const VALID_EVENTS = ['document.created', 'document.updated', 'document.deleted', 'document.moved', 'document.copied', '*'];
+        const events = String(_opts.events || 'document.created,document.updated,document.deleted').split(',').map((e) => e.trim());
+        const invalid = events.filter(e => !VALID_EVENTS.includes(e));
+        if (invalid.length > 0) {
+            out.error(`Invalid event name(s): ${invalid.join(', ')}. Valid values: ${VALID_EVENTS.join(', ')}`);
+            process.exitCode = 1;
+            return;
+        }
         out.startSpinner('Creating webhook...');
         try {
+            vaultId = await resolveVaultId(vaultId);
             const client = await getClientAsync();
             const params = {
                 url,
-                events: String(_opts.events || 'create,update,delete').split(',').map((e) => e.trim()),
+                events,
             };
             const webhook = await client.webhooks.create(vaultId, params);
             out.stopSpinner();
@@ -79,7 +108,7 @@ export function registerWebhookCommands(program) {
     });
     addGlobalFlags(webhooks.command('update')
         .description('Update a webhook')
-        .argument('<vaultId>', 'Vault ID')
+        .argument('<vaultId>', 'Vault ID or slug')
         .argument('<webhookId>', 'Webhook ID')
         .option('--url <url>', 'New webhook URL')
         .option('--events <events>', 'Comma-separated events')
@@ -95,6 +124,7 @@ export function registerWebhookCommands(program) {
         }
         out.startSpinner('Updating webhook...');
         try {
+            vaultId = await resolveVaultId(vaultId);
             const client = await getClientAsync();
             const params = {};
             if (_opts.url)
@@ -118,7 +148,7 @@ export function registerWebhookCommands(program) {
     });
     addGlobalFlags(webhooks.command('delete')
         .description('Delete a webhook')
-        .argument('<vaultId>', 'Vault ID')
+        .argument('<vaultId>', 'Vault ID or slug')
         .argument('<webhookId>', 'Webhook ID')
         .option('-y, --yes', 'Skip confirmation prompt'))
         .action(async (vaultId, webhookId, _opts) => {
@@ -130,6 +160,7 @@ export function registerWebhookCommands(program) {
         }
         out.startSpinner('Deleting webhook...');
         try {
+            vaultId = await resolveVaultId(vaultId);
             const client = await getClientAsync();
             await client.webhooks.delete(vaultId, webhookId);
             out.success('Webhook deleted successfully', { id: webhookId, deleted: true });
@@ -140,13 +171,14 @@ export function registerWebhookCommands(program) {
     });
     addGlobalFlags(webhooks.command('deliveries')
         .description('List recent deliveries for a webhook')
-        .argument('<vaultId>', 'Vault ID')
+        .argument('<vaultId>', 'Vault ID or slug')
         .argument('<webhookId>', 'Webhook ID'))
         .action(async (vaultId, webhookId, _opts) => {
         const flags = resolveFlags(_opts);
         const out = createOutput(flags);
         out.startSpinner('Fetching deliveries...');
         try {
+            vaultId = await resolveVaultId(vaultId);
             const client = await getClientAsync();
             const deliveries = await client.webhooks.listDeliveries(vaultId, webhookId);
             out.stopSpinner();

package/dist/lib/credential-manager.js

@@ -69,8 +69,14 @@ export function createCredentialManager(options = {}) {
         async saveCredentials(config) {
             // Prefer keychain if available
             if (await keychain.isAvailable()) {
-                await keychain.saveCredentials(config);
-                return;
+                try {
+                    await keychain.saveCredentials(config);
+                    return;
+                }
+                catch {
+                    // Keychain reported available but failed to save — fall through
+                    // to encrypted config silently.
+                }
             }
             // Fall back to encrypted config
             encryptedConfig.saveCredentials(config, passphrase);

package/dist/lib/keychain.js

@@ -9,7 +9,19 @@ const ACCOUNT_REFRESH_TOKEN = 'refresh-token';
  */
 async function loadKeytar() {
     try {
-        return await import('keytar');
+        const mod = await import('keytar');
+        // CJS-in-ESM interop: keytar is a native CJS addon, so dynamic import
+        // wraps it as { default: { getPassword, setPassword, ... } }.
+        const resolved = (mod.default && typeof mod.default.getPassword === 'function')
+            ? mod.default
+            : mod;
+        // Validate that the resolved module has the methods we need
+        if (typeof resolved.getPassword !== 'function' ||
+            typeof resolved.setPassword !== 'function' ||
+            typeof resolved.deletePassword !== 'function') {
+            return null;
+        }
+        return resolved;
     }
     catch {
         return null;

package/dist/utils/flags.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
  */
 export function addGlobalFlags(cmd) {
     return cmd
-        .option('-o, --output <format>', 'Output format: text, json, table (default: auto)')
+        .option('-o, --output <format>', 'Output format: text, json, table (default: auto — text for TTY, json for pipes)')
         .option('-v, --verbose', 'Verbose output (debug info)')
         .option('-q, --quiet', 'Minimal output (errors only)')
         .option('--no-color', 'Disable colored output')

package/dist/utils/output.d.ts

@@ -1,4 +1,4 @@
-import type { GlobalFlags } from './flags.js';
+import type { GlobalFlags, OutputFormat } from './flags.js';
 /**
  * Column definition for table output.
  */
@@ -41,8 +41,11 @@ export declare class Output {
     debug(message: string): void;
     /**
      * Print an error message to stderr.
+     * When output format is json, writes a JSON error envelope instead of colored text.
      */
     error(message: string): void;
+    /** Expose the current output format (for error handlers that need it). */
+    get format(): OutputFormat;
     /**
      * Print a warning message to stderr.
      */

package/dist/utils/output.js

@@ -67,9 +67,19 @@ export class Output {
     }
     /**
      * Print an error message to stderr.
+     * When output format is json, writes a JSON error envelope instead of colored text.
      */
     error(message) {
-        process.stderr.write(chalk.red(message) + '\n');
+        if (this.flags.output === 'json') {
+            process.stderr.write(JSON.stringify({ error: true, message }) + '\n');
+        }
+        else {
+            process.stderr.write(chalk.red(message) + '\n');
+        }
+    }
+    /** Expose the current output format (for error handlers that need it). */
+    get format() {
+        return this.flags.output;
     }
     /**
      * Print a warning message to stderr.
@@ -107,14 +117,16 @@ export class Output {
      */
     list(data, options) {
         if (data.length === 0) {
+            if (this.flags.quiet)
+                return;
             if (this.flags.output === 'json') {
                 process.stdout.write('[]\n');
                 return;
             }
-            if (options?.emptyMessage && !this.flags.quiet) {
+            if (options?.emptyMessage) {
                 this.status(options.emptyMessage);
             }
-            else if (!this.flags.quiet && !options?.emptyMessage) {
+            else {
                 process.stdout.write('No results found.\n');
             }
             return;

package/dist/utils/resolve-vault.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Accepts either a vault UUID or a vault slug. If a UUID is given it is
+ * returned unchanged. If a slug is given, the vault list is fetched and the
+ * matching vault's ID is returned.
+ *
+ * @throws {Error} If the slug does not match any vault.
+ */
+export declare function resolveVaultId(idOrSlug: string): Promise<string>;

package/dist/utils/resolve-vault.js

@@ -0,0 +1,19 @@
+import { getClientAsync } from '../client.js';
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * Accepts either a vault UUID or a vault slug. If a UUID is given it is
+ * returned unchanged. If a slug is given, the vault list is fetched and the
+ * matching vault's ID is returned.
+ *
+ * @throws {Error} If the slug does not match any vault.
+ */
+export async function resolveVaultId(idOrSlug) {
+    if (UUID_RE.test(idOrSlug))
+        return idOrSlug;
+    const client = await getClientAsync();
+    const vaults = await client.vaults.list();
+    const match = vaults.find(v => v.slug === idOrSlug);
+    if (!match)
+        throw new Error(`Vault not found: "${idOrSlug}"`);
+    return match.id;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifestreamdynamics/vault-cli",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Command-line interface for Lifestream Vault",
   "engines": {
     "node": ">=20"