@doist/doistbot-cli 1.0.3 → 1.0.4

package/dist/actions/review-usage.js

@@ -1,4 +1,9 @@
-const REVIEW_USAGE_COMMANDS = ['doistbot review [staged]', 'db review [staged]'];
+const REVIEW_USAGE_COMMANDS = [
+    'doistbot review [--base <ref>]',
+    'doistbot review staged',
+    'db review [--base <ref>]',
+    'db review staged',
+];
 const REVIEW_SETUP_COMMANDS = [
     'doistbot review',
     'doistbot review staged',

package/dist/actions/review.js

@@ -1,7 +1,6 @@
 import { getApiKeys } from '../config.js';
 import { getRepositoryRoot, loadSandboxFormatModule, loadSandboxReviewModule } from '../runtime.js';
 import { formatReviewProgress, renderAlert, renderMarkdown, withSpinner, writeLine, } from '../terminal.js';
-import { formatReviewUsage } from './review-usage.js';
 const LOCAL_REVIEW_SOURCE_STAGED = 'staged';
 const JSON_SCHEMA_VERSION = 1;
 const PROVIDER_DISPLAY_NAMES = {
@@ -197,12 +196,8 @@ async function runLocalReviewForCli({ source, onProgress, }) {
         onProgress,
     });
 }
-export async function runReview(sourceArg, options = {}) {
-    if (sourceArg !== undefined && sourceArg !== LOCAL_REVIEW_SOURCE_STAGED) {
-        throw new Error(formatReviewUsage());
-    }
-    const source = sourceArg === LOCAL_REVIEW_SOURCE_STAGED ? LOCAL_REVIEW_SOURCE_STAGED : 'base';
-    if (options.json === true) {
+export async function runReview({ source, json = false } = { source: 'base' }) {
+    if (json) {
         const result = await runLocalReviewForCli({ source });
         const output = formatReviewForJson(result);
         writeLine(JSON.stringify(output, null, 2));

package/dist/index.js

@@ -6,6 +6,7 @@ import { Command, Option } from 'commander';
 import { AUTH_LOGOUT_PROVIDER_USAGE, runAuthLogout, runAuthSetup, runAuthStatus, } from './actions/auth.js';
 import { runDoctor } from './actions/doctor.js';
 import { runReview } from './actions/review.js';
+import { formatReviewUsage } from './actions/review-usage.js';
 import { runSetup } from './actions/setup.js';
 import { writeErrorLine } from './terminal.js';
 import { notifyAndRefreshCliUpdateCache, notifyIfCliUpdateAvailable } from './update-check.js';
@@ -21,9 +22,25 @@ function getPackageVersion() {
     }
 }
 const PACKAGE_VERSION = getPackageVersion();
+const LOCAL_REVIEW_SOURCE_STAGED = 'staged';
 function getUpdateCacheEntrypointPath() {
     return fileURLToPath(new URL('./update-cache-entrypoint.js', import.meta.url));
 }
+function parseReviewInput(sourceArg, options = {}) {
+    if (sourceArg !== undefined && sourceArg !== LOCAL_REVIEW_SOURCE_STAGED) {
+        throw new Error(formatReviewUsage());
+    }
+    if (sourceArg === LOCAL_REVIEW_SOURCE_STAGED && options.base) {
+        throw new Error(formatReviewUsage());
+    }
+    if (options.base !== undefined) {
+        return { source: { kind: 'base-ref', ref: options.base }, json: options.json === true };
+    }
+    return {
+        source: sourceArg === LOCAL_REVIEW_SOURCE_STAGED ? LOCAL_REVIEW_SOURCE_STAGED : 'base',
+        json: options.json === true,
+    };
+}
 export function createProgram({ runAuthLogout: authLogout = runAuthLogout, runAuthSetup: authSetup = runAuthSetup, runAuthStatus: authStatus = runAuthStatus, runDoctor: doctor = runDoctor, runSetup: setup = runSetup, runReview: review = runReview, runAutomaticUpdateCheck: automaticUpdateCheck = async () => await notifyAndRefreshCliUpdateCache({
     currentVersion: PACKAGE_VERSION,
     updateCacheEntrypointPath: getUpdateCacheEntrypointPath(),
@@ -79,8 +96,9 @@ export function createProgram({ runAuthLogout: authLogout = runAuthLogout, runAu
     withAutomaticUpdateCheck(program
         .command('review [source]')
         .description('Run a local self-review. Use `staged` to review only staged changes.')
+        .option('--base <ref>', 'Review local changes against a specific base ref')
         .addOption(new Option('--json', 'Print machine-readable JSON instead of terminal-formatted markdown').hideHelp())
-        .action(async (source, options) => await review(source, { json: options?.json === true })));
+        .action(async (source, options) => await review(parseReviewInput(source, options))));
     program
         .command('update')
         .description('Check whether a newer Doistbot CLI version is available')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@doist/doistbot-cli",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "Local self-review CLI for Doistbot",
     "type": "module",
     "main": "dist/index.js",

package/sandbox/dist/tasks/review/local-git.js

@@ -177,7 +177,9 @@ export function getLocalReviewFiles({ runner, source, }) {
             baseBranch: `commit ${source.baseSha.slice(0, 7)}`,
         };
     }
-    const baseBranch = resolveOriginBaseRef(runner);
+    const baseBranch = typeof source === 'object' && source.kind === 'base-ref'
+        ? source.ref
+        : resolveOriginBaseRef(runner);
     const mergeBase = runner(['merge-base', baseBranch, 'HEAD']).trim();
     const diff = runner(['diff', '--no-ext-diff', '--no-color', mergeBase]);
     return {