@doow/cli 0.1.6 → 0.1.7

package/dist/cli.cjs

@@ -184,6 +184,9 @@ async function deleteProfile(name) {
     if (config.activeProfile === name) {
         throw new Error(`Cannot delete the active profile "${name}". Switch to another profile first.`);
     }
+    if (!config.profiles[name]) {
+        throw new Error(`Profile "${name}" does not exist.`);
+    }
     delete config.profiles[name];
     await writeConfig(config);
     await clearProfileCredentials(name);
@@ -791,6 +794,33 @@ function isLegacyPendingPollResponse(status, body) {
         legacyBody.message === 'Bad Request Exception' &&
         legacyBody.response === 'Bad Request Exception');
 }
+function isThrottledPollResponse(status, body) {
+    const legacyBody = body;
+    return (status === 429 ||
+        legacyBody.status === 429 ||
+        legacyBody.statusCode === 429 ||
+        legacyBody.message?.toLowerCase().includes('too many requests') === true);
+}
+function getRetryAfterSeconds(headers) {
+    const headerValue = headers.get('retry-after-auth') ?? headers.get('retry-after');
+    if (!headerValue)
+        return undefined;
+    const seconds = Number.parseInt(headerValue, 10);
+    return Number.isFinite(seconds) && seconds > 0 ? seconds : undefined;
+}
+function formatPollFailure(status, body) {
+    if (typeof body.error === 'string' && body.error.length > 0) {
+        return body.error_description ? `${body.error} — ${body.error_description}` : body.error;
+    }
+    const legacyBody = body;
+    if (typeof legacyBody.message === 'string' && legacyBody.message.length > 0) {
+        return legacyBody.message;
+    }
+    if (typeof legacyBody.response === 'string' && legacyBody.response.length > 0) {
+        return legacyBody.response;
+    }
+    return `HTTP ${status}`;
+}
 // ---------------------------------------------------------------------------
 // Core function
 // ---------------------------------------------------------------------------
@@ -893,7 +923,11 @@ async function executeDeviceFlow(options = {}) {
                 if (isLegacyPendingPollResponse(tokenRes.status, errBody)) {
                     continue;
                 }
-                throw new Error(`Token polling failed: ${errBody.error}${errBody.error_description ? ` — ${errBody.error_description}` : ''}`);
+                if (isThrottledPollResponse(tokenRes.status, errBody)) {
+                    pollInterval = getRetryAfterSeconds(tokenRes.headers) ?? Math.max(pollInterval + 5, 30);
+                    continue;
+                }
+                throw new Error(`Token polling failed: ${formatPollFailure(tokenRes.status, errBody)}`);
         }
     }
 }
@@ -1562,7 +1596,11 @@ function getValue(row, key) {
 function truncate(s, max) {
     if (s.length <= max)
         return s;
-    return s.slice(0, max - 1) + '…'; // …
+    if (max <= 0)
+        return '';
+    if (max <= 3)
+        return '.'.repeat(max);
+    return s.slice(0, max - 3) + '...';
 }
 /**
  * Calculate the display width for a column, taking into account the header
@@ -1595,9 +1633,9 @@ function printTable(rows, columns) {
     })
         .join('  ');
     process.stderr.write(header + '\n');
-    // Separator (─ chars)
+    // Separator (ASCII-only hyphen chars)
     const totalWidth = widths.reduce((sum, w) => sum + w, 0) + (columns.length - 1) * 2;
-    const separator = '─'.repeat(Math.min(totalWidth, termWidth));
+    const separator = '-'.repeat(Math.min(totalWidth, termWidth));
     process.stderr.write(separator + '\n');
     // Data rows
     for (const row of rows) {
@@ -2858,9 +2896,15 @@ function registerAppsCommands(program) {
         .command('add-manager <appId> <memberId>')
         .description('Add a manager to an application')
         .action(async (appId, memberId) => {
-        const format = resolveFormat(program.opts());
+        const globalOpts = program.opts();
+        const format = resolveFormat(globalOpts);
         try {
-            const data = await gqlFetch(ADD_APP_MANAGER, { input: { application_id: appId, member_id: memberId } }, clientOpts$4(program));
+            const variables = { input: { application_id: appId, member_id: memberId } };
+            if (isDryRun(globalOpts)) {
+                printDryRun({ operation: 'mutation', name: 'UpdateAppManager', variables });
+                return;
+            }
+            const data = await gqlFetch(ADD_APP_MANAGER, variables, clientOpts$4(program));
             const result = data.updateAppManager
                 ?? data.addAppManager
                 ?? { success: false, message: 'No response', appManagerId: null };
@@ -4208,13 +4252,23 @@ function registerLicensesCommands(program) {
         .command('assign <licenseId> <memberId>')
         .description('Assign a license to a user')
         .action(async (licenseId, memberId) => {
-        const format = resolveFormat(program.opts());
+        const globalOpts = program.opts();
+        const format = resolveFormat(globalOpts);
         try {
-            const data = await gqlFetch(ASSIGN_LICENSE, {
+            const variables = {
                 input: { license_id: licenseId, user_id: memberId },
                 licenseId,
                 memberId,
-            }, clientOpts$2(program));
+            };
+            if (isDryRun(globalOpts)) {
+                printDryRun({
+                    operation: 'mutation',
+                    name: 'AddUserToLicense',
+                    variables: { input: variables.input },
+                });
+                return;
+            }
+            const data = await gqlFetch(ASSIGN_LICENSE, variables, clientOpts$2(program));
             const legacy = data;
             const license = normalizeLicense(legacy.addUserToLicense?.data ?? legacy.assignLicense);
             if (format === 'json') {
@@ -4918,7 +4972,7 @@ async function cardsListHandler(opts, override) {
         { header: 'APPS', key: 'applications', width: 24 },
     ]);
     if (payload.cursor) {
-        process.stderr.write(`\n  … more results available (cursor: ${payload.cursor})\n`);
+        process.stderr.write(`\n  ... more results available (cursor: ${payload.cursor})\n`);
     }
 }
 async function cardGetHandler(id, opts, override) {
@@ -4991,7 +5045,7 @@ async function cardTransactionsHandler(id, opts, override) {
         { header: 'DATE', key: 'date', width: 24 },
     ]);
     if (payload.cursor !== undefined && payload.cursor !== null) {
-        process.stderr.write(`\n  … more results available (cursor: ${payload.cursor})\n`);
+        process.stderr.write(`\n  ... more results available (cursor: ${payload.cursor})\n`);
     }
 }
 async function cardsCreateHandler(opts, override) {
@@ -7030,10 +7084,10 @@ function printMoreResultsHint$2(nextPageAvailable, cursor) {
     if (!nextPageAvailable)
         return;
     if (cursor) {
-        process.stderr.write(`\n  … more results available (cursor: ${cursor})\n`);
+        process.stderr.write(`\n  ... more results available (cursor: ${cursor})\n`);
         return;
     }
-    process.stderr.write('\n  … more results available\n');
+    process.stderr.write('\n  ... more results available\n');
 }
 function getConnectResultSummary(result) {
     const name = result.integration.integration?.name ?? '(unknown)';
@@ -7326,6 +7380,55 @@ function registerIntegrationsCommands(program) {
     });
 }
 
+/**
+ * ASCII-only bar chart renderer for human-readable terminal summaries.
+ *
+ * All output goes to stderr so stdout stays clean for JSON / piping.
+ */
+function truncateAscii(s, max) {
+    if (s.length <= max)
+        return s;
+    if (max <= 0)
+        return '';
+    if (max <= 3)
+        return '.'.repeat(max);
+    return s.slice(0, max - 3) + '...';
+}
+function resolveBarWidth(rows, options, labelWidth) {
+    if (options.barWidth !== undefined)
+        return Math.max(8, options.barWidth);
+    const termWidth = process.stderr.columns ?? 120;
+    const suffixWidth = rows.reduce((max, row) => {
+        const valueText = options.valueFormatter
+            ? options.valueFormatter(row.value, row)
+            : String(row.value);
+        const detailText = row.detail ? `  ${row.detail}` : '';
+        return Math.max(max, (valueText + detailText).length);
+    }, 0);
+    return Math.max(8, Math.min(40, termWidth - labelWidth - suffixWidth - 5));
+}
+function printBarChart(rows, options = {}) {
+    if (rows.length === 0)
+        return;
+    const widestLabel = rows.reduce((max, row) => Math.max(max, row.label.length), 0);
+    const labelWidth = options.labelWidth ??
+        Math.min(options.maxLabelWidth ?? 24, widestLabel);
+    const barWidth = resolveBarWidth(rows, options, labelWidth);
+    const maxValue = rows.reduce((max, row) => Math.max(max, row.value), 0);
+    for (const row of rows) {
+        const label = truncateAscii(row.label, labelWidth).padEnd(labelWidth);
+        const valueText = options.valueFormatter
+            ? options.valueFormatter(row.value, row)
+            : String(row.value);
+        const detailText = row.detail ? `  ${row.detail}` : '';
+        const barLength = row.value <= 0 || maxValue <= 0
+            ? 0
+            : Math.max(1, Math.round((row.value / maxValue) * barWidth));
+        const bar = '#'.repeat(barLength).padEnd(barWidth, ' ');
+        process.stderr.write(`${label} | ${bar} ${valueText}${detailText}\n`);
+    }
+}
+
 /**
  * gql/operations/insights.ts
  *
@@ -7438,7 +7541,7 @@ function isRead(notification) {
     return notification.status !== 'UNREAD' || notification.read_at !== null;
 }
 async function insightsListHandler(opts) {
-    const format = resolveFormat(opts);
+    const format = opts.chart && !opts.json ? 'table' : resolveFormat(opts);
     const data = await gqlFetch(GET_NOTIFICATION_STATS, undefined, buildClientOpts(opts));
     const stats = data.getAppNotificationStats;
     if (format === 'json') {
@@ -7453,6 +7556,16 @@ async function insightsListHandler(opts) {
         ['Actionable', String(stats.actionable)],
         ['Persistent', String(stats.persistent)],
     ]);
+    if (opts.chart) {
+        process.stderr.write('\n--- Notification Mix (ASCII Chart) ---\n');
+        printBarChart([
+            { label: 'Unread', value: stats.unread },
+            { label: 'Read', value: stats.read },
+            { label: 'Dismissed', value: stats.dismissed },
+            { label: 'Actionable', value: stats.actionable },
+            { label: 'Persistent', value: stats.persistent },
+        ]);
+    }
 }
 async function needsAttentionHandler(opts) {
     const format = resolveFormat(opts);
@@ -7500,7 +7613,7 @@ async function notificationsListHandler(opts) {
         { header: 'CREATED', key: 'created_at', width: 20 },
     ]);
     if (page < total_pages) {
-        process.stderr.write(`\n  … more results available (page ${page} of ${total_pages})\n`);
+        process.stderr.write(`\n  ... more results available (page ${page} of ${total_pages})\n`);
     }
 }
 async function notificationsReadHandler(id, opts) {
@@ -7569,10 +7682,11 @@ function registerInsightsCommands(program) {
         .command('stats')
         .alias('list')
         .description('Show notification summary stats')
-        .action(async () => {
+        .option('--chart', 'Render ASCII charts in human output')
+        .action(async (opts) => {
         const globalOpts = program.opts();
         try {
-            await insightsListHandler(globalOpts);
+            await insightsListHandler({ ...globalOpts, ...opts });
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -8179,7 +8293,7 @@ async function uploadFile(options) {
     const fileBuffer = fs$1.readFileSync(options.filePath);
     const fileName = node_path.basename(options.filePath);
     const formData = new FormData();
-    formData.append('file', new Blob([fileBuffer], { type: 'application/octet-stream' }), fileName);
+    formData.append('files', new Blob([fileBuffer], { type: 'application/octet-stream' }), fileName);
     if (options.chatId !== undefined) {
         formData.append('chat_id', options.chatId);
     }
@@ -8824,8 +8938,18 @@ function formatAmount(value) {
 function formatPercent(value) {
     return `${value.toFixed(1)}%`;
 }
+function shouldRenderChart(opts, format) {
+    return opts.chart === true && format !== 'json';
+}
+function formatDelta(changeAmount, changePercentage, valueFormatter = (value) => String(value)) {
+    if (changeAmount === undefined || changePercentage === undefined)
+        return undefined;
+    const amountPrefix = changeAmount > 0 ? '+' : '';
+    const percentPrefix = changePercentage > 0 ? '+' : '';
+    return `${amountPrefix}${valueFormatter(changeAmount)} (${percentPrefix}${changePercentage.toFixed(1)}%)`;
+}
 async function dashboardOverviewHandler(opts) {
-    const format = resolveFormat(opts);
+    const format = opts.chart && !opts.json ? 'table' : resolveFormat(opts);
     const clientOpts = buildClientOptions(opts);
     const period = parseDashboardPeriod(opts.period);
     const [spendData, topAppsData, renewalsData] = await Promise.all([
@@ -8849,6 +8973,16 @@ async function dashboardOverviewHandler(opts) {
         ['Period', overview.period],
         ['Total spend', formatAmount(overview.spend.totalSpend)],
     ]);
+    if (shouldRenderChart(opts, format) && overview.top_apps.length > 0) {
+        process.stderr.write('\n--- Top Applications (ASCII Chart) ---\n');
+        printBarChart(overview.top_apps.map((app) => ({
+            label: app.name,
+            value: app.totalCost,
+            detail: `${app.userCount} users`,
+        })), {
+            valueFormatter: (value) => formatAmount(value),
+        });
+    }
     if (overview.top_apps.length > 0) {
         process.stderr.write('\n--- Top Applications ---\n');
         printTable(overview.top_apps, [
@@ -8866,6 +9000,16 @@ async function dashboardOverviewHandler(opts) {
             },
         ]);
     }
+    if (shouldRenderChart(opts, format) && overview.upcoming_renewals.length > 0) {
+        process.stderr.write('\n--- Upcoming Renewals (ASCII Chart) ---\n');
+        printBarChart(overview.upcoming_renewals.map((renewal) => ({
+            label: renewal.appName,
+            value: renewal.amount,
+            detail: `${renewal.daysUntilRenewal}d  ${renewal.renewalDate}`,
+        })), {
+            valueFormatter: (value) => formatAmount(value),
+        });
+    }
     if (overview.upcoming_renewals.length > 0) {
         process.stderr.write('\n--- Upcoming Renewals (30 days) ---\n');
         printTable(overview.upcoming_renewals, [
@@ -8886,7 +9030,7 @@ async function dashboardOverviewHandler(opts) {
     }
 }
 async function dashboardSpendHandler(opts) {
-    const format = resolveFormat(opts);
+    const format = opts.chart && !opts.json ? 'table' : resolveFormat(opts);
     const clientOpts = buildClientOptions(opts);
     const period = parseDashboardPeriod(opts.period);
     const [overviewData, categoryData] = await Promise.all([
@@ -8908,6 +9052,16 @@ async function dashboardSpendHandler(opts) {
         ['Total spend', formatAmount(spend.overview.totalSpend)],
         ['Category total', formatAmount(spend.category_total)],
     ]);
+    if (shouldRenderChart(opts, format) && spend.by_category.length > 0) {
+        process.stderr.write('\n--- Spend by Category (ASCII Chart) ---\n');
+        printBarChart(spend.by_category.map((category) => ({
+            label: category.name,
+            value: category.amount,
+            detail: formatPercent(category.percentage),
+        })), {
+            valueFormatter: (value) => formatAmount(value),
+        });
+    }
     if (spend.by_category.length > 0) {
         process.stderr.write('\n--- Spend by Category ---\n');
         printTable(spend.by_category, [
@@ -8926,7 +9080,7 @@ async function dashboardSpendHandler(opts) {
     }
 }
 async function dashboardRenewalsHandler(opts) {
-    const format = resolveFormat(opts);
+    const format = opts.chart && !opts.json ? 'table' : resolveFormat(opts);
     const clientOpts = buildClientOptions(opts);
     const days = opts.days ? Number.parseInt(opts.days, 10) : undefined;
     const data = await gqlFetch(GET_UPCOMING_RENEWALS, days !== undefined ? { days } : undefined, clientOpts);
@@ -8939,6 +9093,17 @@ async function dashboardRenewalsHandler(opts) {
         process.stderr.write('No upcoming renewals found.\n');
         return;
     }
+    if (shouldRenderChart(opts, format)) {
+        process.stderr.write('\n--- Upcoming Renewals (ASCII Chart) ---\n');
+        printBarChart(renewals.map((renewal) => ({
+            label: renewal.appName,
+            value: renewal.amount,
+            detail: `${renewal.daysUntilRenewal}d  ${renewal.renewalDate}`,
+        })), {
+            valueFormatter: (value) => formatAmount(value),
+        });
+        process.stderr.write('\n');
+    }
     printTable(renewals, [
         { header: 'APP', key: 'appName', width: 24 },
         {
@@ -8957,7 +9122,7 @@ async function dashboardRenewalsHandler(opts) {
     ]);
 }
 async function dashboardMetricsHandler(opts) {
-    const format = resolveFormat(opts);
+    const format = opts.chart && !opts.json ? 'table' : resolveFormat(opts);
     const clientOpts = buildClientOptions(opts);
     const period = parseDashboardPeriod(opts.period);
     const data = await gqlFetch(GET_DASHBOARD_METRICS, { input: buildDashboardMetricsInput(opts.period) }, clientOpts);
@@ -8970,29 +9135,91 @@ async function dashboardMetricsHandler(opts) {
     const applicationMetrics = metrics.applicationMetrics;
     const userMetrics = metrics.userMetrics;
     const subscriptionMetrics = metrics.subscriptionMetrics;
-    printKeyValue([
-        ['Period', period.label],
-        ['Filter', metrics.filter],
-        ['Paid apps', String(allMetrics?.paidApplications.current ?? 0)],
-        ['Free apps', String(allMetrics?.freeApplications.current ?? 0)],
-        ['Active apps', String(applicationMetrics?.activeApplications.current ?? 0)],
-        ['Inactive apps', String(applicationMetrics?.inactiveApplications.current ?? 0)],
-        ['Users', String(allMetrics?.totalUsers.current ?? userMetrics?.activeUsers.current ?? 0)],
-        ['Active subscriptions', String(subscriptionMetrics?.activeSubscriptions.currentCount ?? 0)],
-        ['Active licenses', String(subscriptionMetrics?.activeLicenses.currentCount ?? 0)],
-        [
-            'Total spend',
-            formatAmount(allMetrics?.totalSubscriptionSpend.current ??
-                subscriptionMetrics?.totalSubscriptionValue.currentValue ??
-                0),
-        ],
-    ]);
+    const rows = [['Period', period.label], ['Filter', metrics.filter]];
+    const paidApps = allMetrics?.paidApplications.current;
+    if (paidApps !== undefined)
+        rows.push(['Paid apps', String(paidApps)]);
+    const freeApps = allMetrics?.freeApplications.current;
+    if (freeApps !== undefined)
+        rows.push(['Free apps', String(freeApps)]);
+    const activeApps = applicationMetrics?.activeApplications.current;
+    if (activeApps !== undefined)
+        rows.push(['Active apps', String(activeApps)]);
+    const inactiveApps = applicationMetrics?.inactiveApplications.current;
+    if (inactiveApps !== undefined)
+        rows.push(['Inactive apps', String(inactiveApps)]);
+    const users = allMetrics?.totalUsers.current ?? userMetrics?.activeUsers.current;
+    if (users !== undefined)
+        rows.push(['Users', String(users)]);
+    const activeSubscriptions = subscriptionMetrics?.activeSubscriptions.currentCount;
+    if (activeSubscriptions !== undefined) {
+        rows.push(['Active subscriptions', String(activeSubscriptions)]);
+    }
+    const activeLicenses = subscriptionMetrics?.activeLicenses.currentCount;
+    if (activeLicenses !== undefined) {
+        rows.push(['Active licenses', String(activeLicenses)]);
+    }
+    const totalSpend = allMetrics?.totalSubscriptionSpend.current ??
+        subscriptionMetrics?.totalSubscriptionValue.currentValue;
+    if (totalSpend !== undefined)
+        rows.push(['Total spend', formatAmount(totalSpend)]);
+    printKeyValue(rows);
+    if (shouldRenderChart(opts, format)) {
+        const metricRows = [];
+        if (paidApps !== undefined) {
+            metricRows.push({
+                label: 'Paid apps',
+                value: paidApps,
+                detail: formatDelta(allMetrics?.paidApplications.changeAmount, allMetrics?.paidApplications.changePercentage),
+            });
+        }
+        if (freeApps !== undefined) {
+            metricRows.push({
+                label: 'Free apps',
+                value: freeApps,
+                detail: formatDelta(allMetrics?.freeApplications.changeAmount, allMetrics?.freeApplications.changePercentage),
+            });
+        }
+        if (activeApps !== undefined) {
+            metricRows.push({
+                label: 'Active apps',
+                value: activeApps,
+                detail: formatDelta(applicationMetrics?.activeApplications.changeAmount, applicationMetrics?.activeApplications.changePercentage),
+            });
+        }
+        if (users !== undefined) {
+            metricRows.push({
+                label: 'Users',
+                value: users,
+                detail: formatDelta(allMetrics?.totalUsers.changeAmount ?? userMetrics?.activeUsers.changeAmount, allMetrics?.totalUsers.changePercentage ?? userMetrics?.activeUsers.changePercentage),
+            });
+        }
+        if (activeSubscriptions !== undefined) {
+            metricRows.push({
+                label: 'Active subscriptions',
+                value: activeSubscriptions,
+                detail: formatDelta(subscriptionMetrics?.activeSubscriptions.changeAmount, subscriptionMetrics?.activeSubscriptions.changePercentage),
+            });
+        }
+        if (activeLicenses !== undefined) {
+            metricRows.push({
+                label: 'Active licenses',
+                value: activeLicenses,
+                detail: formatDelta(subscriptionMetrics?.activeLicenses.changeAmount, subscriptionMetrics?.activeLicenses.changePercentage),
+            });
+        }
+        if (metricRows.length > 0) {
+            process.stderr.write('\n--- Metrics (ASCII Chart) ---\n');
+            printBarChart(metricRows);
+        }
+    }
 }
 function registerDashboardCommands(program) {
     const dashboard = program
         .command('dashboard')
         .description('View dashboard overview and key metrics')
         .option('--period <period>', 'Time period (e.g. 7d, 30d, 90d, 12m, all)')
+        .option('--chart', 'Render ASCII charts in human output')
         .action(async (opts) => {
         const globalOpts = program.opts();
         try {
@@ -9013,6 +9240,7 @@ function registerDashboardCommands(program) {
         .command('overview')
         .description('View dashboard overview')
         .option('--period <period>', 'Time period (e.g. 7d, 30d, 90d, 12m, all)')
+        .option('--chart', 'Render ASCII charts in human output')
         .action(async (opts) => {
         const globalOpts = program.opts();
         try {
@@ -9033,6 +9261,7 @@ function registerDashboardCommands(program) {
         .command('spend')
         .description('View spend breakdown')
         .option('--period <period>', 'Time period (e.g. 7d, 30d, 90d, 12m, all)')
+        .option('--chart', 'Render ASCII charts in human output')
         .action(async (opts) => {
         const globalOpts = program.opts();
         try {
@@ -9053,6 +9282,7 @@ function registerDashboardCommands(program) {
         .command('renewals')
         .description('View upcoming renewals')
         .option('--days <n>', 'Number of days ahead to look (default: 30)')
+        .option('--chart', 'Render ASCII charts in human output')
         .action(async (opts) => {
         const globalOpts = program.opts();
         try {
@@ -9073,6 +9303,7 @@ function registerDashboardCommands(program) {
         .command('metrics')
         .description('View key dashboard metrics')
         .option('--period <period>', 'Time period (e.g. 7d, 30d, 90d, 12m, all)')
+        .option('--chart', 'Render ASCII charts in human output')
         .action(async (opts) => {
         const globalOpts = program.opts();
         try {
@@ -9496,10 +9727,10 @@ function printMoreResultsHint$1(pagination) {
     if (!pagination.has_more)
         return;
     if (pagination.cursor) {
-        process.stderr.write(`\n  … more results available (cursor: ${pagination.cursor})\n`);
+        process.stderr.write(`\n  ... more results available (cursor: ${pagination.cursor})\n`);
         return;
     }
-    process.stderr.write('\n  … more results available\n');
+    process.stderr.write('\n  ... more results available\n');
 }
 async function expensesListHandler(opts) {
     const format = resolveFormat(opts);
@@ -9960,10 +10191,10 @@ function printMoreResultsHint(pagination) {
     if (!pagination.has_more)
         return;
     if (pagination.cursor) {
-        process.stderr.write(`\n  … more results available (cursor: ${pagination.cursor})\n`);
+        process.stderr.write(`\n  ... more results available (cursor: ${pagination.cursor})\n`);
         return;
     }
-    process.stderr.write('\n  … more results available\n');
+    process.stderr.write('\n  ... more results available\n');
 }
 async function overagesListHandler(opts) {
     const format = resolveFormat(opts);
@@ -10467,6 +10698,56 @@ function decodeReportBuffer$1(data, reportFormat) {
         ? Buffer.from(data, 'base64')
         : Buffer.from(data, 'utf-8');
 }
+const DEFAULT_EXPENSE_REPORT_COLUMNS = [
+    'Total',
+    'Month',
+    'Year',
+    'Date',
+    'App ID',
+    'Transaction ID',
+    'Source',
+    'Payment Channel',
+    'Transaction Status',
+    'Vendor',
+    'App Name',
+    'Description',
+];
+const EXPENSE_REPORT_COLUMN_LOOKUP = new Map(DEFAULT_EXPENSE_REPORT_COLUMNS.map((column) => [normalizeExpenseReportColumnToken(column), column]));
+function normalizeExpenseReportColumnToken(value) {
+    return value.trim().toLowerCase().replace(/[\s_-]+/g, '');
+}
+function dedupe(values) {
+    return Array.from(new Set(values));
+}
+function resolveExpenseReportColumns(raw) {
+    if (Array.isArray(raw)) {
+        return raw.length > 0 ? dedupe(raw) : [...DEFAULT_EXPENSE_REPORT_COLUMNS];
+    }
+    if (!raw || raw.trim().length === 0) {
+        return [...DEFAULT_EXPENSE_REPORT_COLUMNS];
+    }
+    const requested = raw
+        .split(',')
+        .map((value) => value.trim())
+        .filter(Boolean);
+    if (requested.length === 0) {
+        return [...DEFAULT_EXPENSE_REPORT_COLUMNS];
+    }
+    const resolved = [];
+    const unknown = [];
+    for (const token of requested) {
+        const normalized = EXPENSE_REPORT_COLUMN_LOOKUP.get(normalizeExpenseReportColumnToken(token));
+        if (!normalized) {
+            unknown.push(token);
+            continue;
+        }
+        resolved.push(normalized);
+    }
+    if (unknown.length > 0) {
+        throw new Error(`Unknown expense report columns: ${unknown.join(', ')}. Allowed columns: ${DEFAULT_EXPENSE_REPORT_COLUMNS.join(', ')}`);
+    }
+    return dedupe(resolved);
+}
 function buildExpenseReportInput(filters) {
     const input = {};
     if (filters.from)
@@ -10487,6 +10768,7 @@ function buildExpenseReportInput(filters) {
         input['amount_min'] = filters.amountMin;
     if (filters.amountMax !== undefined)
         input['amount_max'] = filters.amountMax;
+    input['columns'] = resolveExpenseReportColumns(filters.columns);
     return input;
 }
 async function expenseReportHandler(opts) {
@@ -10609,6 +10891,7 @@ function registerReportsCommands(program) {
         .option('--source <source>', 'Filter by source')
         .option('--amount-min <number>', 'Minimum amount filter', parseFloat)
         .option('--amount-max <number>', 'Maximum amount filter', parseFloat)
+        .option('--columns <items>', 'Comma-separated columns (default: Total,Month,Year,Date,App ID,Transaction ID,Source,Payment Channel,Transaction Status,Vendor,App Name,Description)')
         .option('--output <path>', 'Write report to file (required for PDF when not piped)')
         .option('--email <addresses>', 'Comma-separated email addresses — send report by email instead of downloading')
         .action(async (opts) => {
@@ -11705,38 +11988,63 @@ const GLOBAL_FLAGS = [
     '--api-url',
     '--debug',
 ];
-const SUBCOMMAND_TREE = {
-    login: ['--device', '--api-key', '--token-stdin'],
-    logout: [],
-    whoami: [],
-    profiles: ['list', 'switch', 'delete'],
-    apps: ['list', 'get', 'create', 'update', 'deactivate', 'add-manager', 'compare', 'metrics', 'insights', 'alternatives'],
-    contracts: ['list', 'get', 'create', 'update', 'delete', 'metrics', 'renewals'],
-    licenses: ['list', 'get', 'create', 'update', 'delete', 'assign', 'spend-pool', 'vintage', 'metrics', 'usage'],
-    cards: ['list', 'get', 'create', 'fund', 'withdraw', 'topup', 'freeze', 'unfreeze', 'assign', 'map-app', 'transactions'],
-    team: ['list', 'get', 'invite', 'update', 'deactivate', 'reactivate', 'departments'],
-    integrations: ['list', 'get', 'connect', 'disconnect', 'logs'],
-    insights: ['list', 'needs-attention', 'notifications'],
-    dashboard: ['overview', 'spend', 'renewals', 'metrics'],
-    search: [],
-    expenses: ['list', 'get', 'create', 'update'],
-    overages: ['list', 'get', 'create', 'update', 'delete'],
-    'usage-tuples': ['link-binding'],
-    reports: ['expense', 'contracts', 'licenses', 'cards', 'departments', 'department-users'],
-    chat: ['send', 'sessions', 'upload'],
-    mcp: ['--list-tools', '--transport'],
-    doctor: [],
-    completion: ['bash', 'zsh', 'install'],
-};
-const TOP_LEVEL_SUBCOMMANDS = Object.keys(SUBCOMMAND_TREE);
+function unique(values) {
+    return Array.from(new Set(values));
+}
+function visibleSubcommands(command) {
+    return command.commands.filter((child) => child.name() !== 'help');
+}
+function commandNames(command) {
+    return unique([command.name(), ...command.aliases()]);
+}
+function commandChildren(command) {
+    const subcommands = visibleSubcommands(command);
+    if (subcommands.length > 0) {
+        return unique(subcommands.flatMap((child) => commandNames(child)));
+    }
+    return unique(command.options
+        .map((option) => option.long)
+        .filter((flag) => Boolean(flag) && flag !== '--help'));
+}
+function buildCompletionGraph(program) {
+    const pathChildren = {};
+    const topLevelCommands = unique(visibleSubcommands(program).flatMap((command) => commandNames(command)));
+    function visit(command, pathVariants) {
+        const children = commandChildren(command);
+        for (const path of pathVariants) {
+            pathChildren[path.join(' ')] = children;
+        }
+        for (const child of visibleSubcommands(command)) {
+            const childVariants = pathVariants.flatMap((path) => commandNames(child).map((name) => [...path, name]));
+            visit(child, childVariants);
+        }
+    }
+    for (const command of visibleSubcommands(program)) {
+        const variants = commandNames(command).map((name) => [name]);
+        visit(command, variants);
+    }
+    const commandPaths = Object.keys(pathChildren).sort((a, b) => {
+        const depth = a.split(' ').length - b.split(' ').length;
+        return depth !== 0 ? depth : a.localeCompare(b);
+    });
+    return { commandPaths, pathChildren, topLevelCommands };
+}
+function shellSingleQuote(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
 // ---------------------------------------------------------------------------
 // Bash completion script generator
 // ---------------------------------------------------------------------------
-function completionBashHandler() {
-    const subcommandCases = Object.entries(SUBCOMMAND_TREE)
-        .map(([cmd, children]) => {
-        const words = children.join(' ');
-        return `        ${cmd}) COMPREPLY=( $(compgen -W "${words}" -- "$cur") ) ; return ;;`;
+function completionBashHandler(program) {
+    const graph = buildCompletionGraph(program);
+    const knownPaths = graph.commandPaths.map((path) => `        ${shellSingleQuote(path)}`).join('\n');
+    const subcommandCases = graph.commandPaths
+        .map((path) => {
+        const words = unique([
+            ...(graph.pathChildren[path] ?? []),
+            ...GLOBAL_FLAGS,
+        ]).join(' ');
+        return `        ${shellSingleQuote(path)}) COMPREPLY=( $(compgen -W "${words}" -- "$cur") ) ; return ;;`;
     })
         .join('\n');
     const script = `# doow bash completion
@@ -11752,10 +12060,13 @@ _doow_completions() {
     }
 
     local global_flags="${GLOBAL_FLAGS.join(' ')}"
-    local top_cmds="${TOP_LEVEL_SUBCOMMANDS.join(' ')}"
+    local top_cmds="${graph.topLevelCommands.join(' ')}"
+    local -a known_paths=(
+${knownPaths}
+    )
 
-    # Determine which top-level subcommand is in the line
-    local top_cmd=""
+    local command_path=""
+    local candidate=""
     local i
     for (( i=1; i<COMP_CWORD; i++ )); do
         local w="\${COMP_WORDS[i]}"
@@ -11763,22 +12074,31 @@ _doow_completions() {
             --*) ;;
             -*) ;;
             *)
-                if [[ " $top_cmds " == *" $w "* ]]; then
-                    top_cmd="$w"
+                candidate="\${candidate:+\$candidate }\$w"
+                local matched=0
+                local known
+                for known in "\${known_paths[@]}"; do
+                    if [[ "$known" == "$candidate" ]]; then
+                        matched=1
+                        command_path="$candidate"
+                        break
+                    fi
+                done
+                if [[ $matched -eq 0 ]]; then
                     break
                 fi
                 ;;
         esac
     done
 
-    if [[ -z "$top_cmd" ]]; then
+    if [[ -z "$command_path" ]]; then
         # Complete top-level subcommands and global flags
         COMPREPLY=( $(compgen -W "$top_cmds $global_flags" -- "$cur") )
         return
     fi
 
     # Complete within a subcommand
-    case "$top_cmd" in
+    case "$command_path" in
 ${subcommandCases}
         *) COMPREPLY=( $(compgen -W "$global_flags" -- "$cur") ) ; return ;;
     esac
@@ -11791,67 +12111,61 @@ complete -F _doow_completions doow
 // ---------------------------------------------------------------------------
 // Zsh completion script generator
 // ---------------------------------------------------------------------------
-function completionZshHandler() {
-    const subcommandDescriptions = TOP_LEVEL_SUBCOMMANDS.map((cmd) => {
-        const children = SUBCOMMAND_TREE[cmd] ?? [];
-        const desc = children.length > 0 ? `${children.slice(0, 3).join(',')}...` : cmd;
-        return `    '${cmd}:${desc}'`;
-    }).join('\n');
-    const subcommandCases = Object.entries(SUBCOMMAND_TREE)
-        .map(([cmd, children]) => {
-        if (children.length === 0)
-            return `        (${cmd})\n            ;;`;
-        const isFlags = children.every((c) => c.startsWith('-'));
-        if (isFlags) {
-            const flagArgs = children.map((f) => `'${f}[${f}]'`).join(' ');
-            return `        (${cmd})\n            _arguments ${flagArgs}\n            ;;`;
-        }
-        const subcmds = children.map((c) => `'${c}'`).join(' ');
-        return `        (${cmd})\n            local -a subcmds\n            subcmds=(${subcmds})\n            _describe 'subcommand' subcmds\n            ;;`;
+function completionZshHandler(program) {
+    const graph = buildCompletionGraph(program);
+    const topLevelCommands = graph.topLevelCommands.map(shellSingleQuote).join(' ');
+    const globalFlags = GLOBAL_FLAGS.map(shellSingleQuote).join(' ');
+    const childAssignments = graph.commandPaths
+        .map((path) => {
+        const words = unique([
+            ...(graph.pathChildren[path] ?? []),
+            ...GLOBAL_FLAGS,
+        ]).join(' ');
+        return `    completion_children[${shellSingleQuote(path)}]=${shellSingleQuote(words)}`;
     })
         .join('\n');
-    const globalFlagArgs = GLOBAL_FLAGS.map((f) => `'${f}[${f}]'`).join(' ');
     const script = `#compdef doow
 # doow zsh completion
 # Source this file or add the following line to ~/.zshrc:
 #   eval "$(doow completion zsh)"
 
 _doow() {
-    local state
-
-    _arguments \\
-        '(-j --json)'{-j,--json}'[JSON output]' \\
-        '--table[Table output]' \\
-        '--agent[Agent mode]' \\
-        '(-q --quiet)'{-q,--quiet}'[Suppress progress output]' \\
-        '--no-input[Disable interactive prompts]' \\
-        '(-y --yes)'{-y,--yes}'[Skip confirmation gates]' \\
-        '(-n --dry-run)'{-n,--dry-run}'[Preview without executing]' \\
-        '--profile[Multi-org profile selection]:profile' \\
-        '--api-key[Override auth with dak_ token]:key' \\
-        '--api-url[Override API base URL]:url' \\
-        '--debug[Verbose HTTP logging to stderr]' \\
-        '1: :->command' \\
-        '*: :->args'
-
-    case $state in
-        command)
-            local -a commands
-            commands=(
-${subcommandDescriptions}
-            )
-            _describe 'command' commands
-            ;;
-        args)
-            local cmd="\${words[2]}"
-            case $cmd in
-${subcommandCases}
-                *)
-                    _arguments ${globalFlagArgs}
-                    ;;
-            esac
-            ;;
-    esac
+    local cur="\${words[CURRENT]}"
+    local candidate=""
+    local command_path=""
+    local -a top_level global_flags
+    typeset -A completion_children
+
+    top_level=(${topLevelCommands})
+    global_flags=(${globalFlags})
+${childAssignments}
+
+    local i
+    for (( i=2; i<CURRENT; i++ )); do
+        local w="\${words[i]}"
+        [[ "$w" == -* ]] && continue
+        candidate="\${candidate:+\$candidate }\$w"
+        if [[ -n "\${completion_children[$candidate]+x}" ]]; then
+            command_path="$candidate"
+        else
+            break
+        fi
+    done
+
+    if [[ -z "$command_path" ]]; then
+        compadd -- "\${top_level[@]}" "\${global_flags[@]}"
+        return
+    fi
+
+    local children="\${completion_children[$command_path]}"
+    if [[ -n "$children" ]]; then
+        local -a suggestions
+        suggestions=(\${=children})
+        compadd -- "\${suggestions[@]}"
+        return
+    fi
+
+    compadd -- "\${global_flags[@]}"
 }
 
 compdef _doow doow
@@ -11901,13 +12215,13 @@ function registerCompletionCommands(program) {
         .command('bash')
         .description('Output bash completion script')
         .action(() => {
-        completionBashHandler();
+        completionBashHandler(program);
     });
     completion
         .command('zsh')
         .description('Output zsh completion script')
         .action(() => {
-        completionZshHandler();
+        completionZshHandler(program);
     });
     completion
         .command('install')
@@ -36634,7 +36948,7 @@ async function startStdioServer(options) {
     await server.connect(transport);
 }
 
-const VERSION = "0.1.6" ;
+const VERSION = "0.1.7" ;
 const ASCII_LOGO = `
      _
   __| |  ___    ___   __      __