@doist/twist-cli 2.36.3 → 2.36.4

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.36.4](https://github.com/Doist/twist-cli/compare/v2.36.3...v2.36.4) (2026-05-13)
+
+### Bug Fixes
+
+- surface batch API errors in commands ([#159](https://github.com/Doist/twist-cli/issues/159)) ([3b30c3c](https://github.com/Doist/twist-cli/commit/3b30c3ccc17138b257e850562b4e80e500c68d34))
+
 ## [2.36.3](https://github.com/Doist/twist-cli/compare/v2.36.2...v2.36.3) (2026-05-09)
 
 ### Bug Fixes

package/dist/commands/auth/helpers.d.ts

@@ -1,3 +1,10 @@
 import type { TokenStorageResult } from '../../lib/auth.js';
-export declare function logTokenStorageResult(result: TokenStorageResult, secureStoreMessage: string): void;
+/**
+ * Surface a `TokenStorageResult` from a save/clear operation: the
+ * human-readable confirmation goes to stdout, any keyring-fallback warning
+ * goes to stderr. Pass `isMachineOutput: true` when the command is in
+ * `--json` / `--ndjson` mode so the stdout confirmation is suppressed and
+ * the warning still reaches the operator on stderr.
+ */
+export declare function logTokenStorageResult(result: TokenStorageResult, secureStoreMessage: string, isMachineOutput?: boolean): void;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/commands/auth/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAE3D,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,kBAAkB,EAC1B,kBAAkB,EAAE,MAAM,GAC3B,IAAI,CAUN"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAE3D;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,kBAAkB,EAC1B,kBAAkB,EAAE,MAAM,EAC1B,eAAe,UAAQ,GACxB,IAAI,CAON"}

package/dist/commands/auth/helpers.js

@@ -1,12 +1,17 @@
 import chalk from 'chalk';
-export function logTokenStorageResult(result, secureStoreMessage) {
-    if (result.storage === 'secure-store') {
+/**
+ * Surface a `TokenStorageResult` from a save/clear operation: the
+ * human-readable confirmation goes to stdout, any keyring-fallback warning
+ * goes to stderr. Pass `isMachineOutput: true` when the command is in
+ * `--json` / `--ndjson` mode so the stdout confirmation is suppressed and
+ * the warning still reaches the operator on stderr.
+ */
+export function logTokenStorageResult(result, secureStoreMessage, isMachineOutput = false) {
+    if (!isMachineOutput && result.storage === 'secure-store') {
         console.log(chalk.dim(secureStoreMessage));
-        if (result.warning) {
-            console.error(chalk.yellow('Warning:'), result.warning);
-        }
-        return;
     }
-    console.error(chalk.yellow('Warning:'), result.warning);
+    if (result.warning) {
+        console.error(chalk.yellow('Warning:'), result.warning);
+    }
 }
 //# sourceMappingURL=helpers.js.map

package/dist/commands/auth/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/auth/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,MAAM,UAAU,qBAAqB,CACjC,MAA0B,EAC1B,kBAA0B;IAE1B,IAAI,MAAM,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAA;QAC1C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QAC3D,CAAC;QACD,OAAM;IACV,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;AAC3D,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/auth/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACjC,MAA0B,EAC1B,kBAA0B,EAC1B,eAAe,GAAG,KAAK;IAEvB,IAAI,CAAC,eAAe,IAAI,MAAM,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAC9C,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;IAC3D,CAAC;AACL,CAAC"}

package/dist/commands/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAMnC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkB1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAOnC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgB1D"}

package/dist/commands/auth/index.js

@@ -1,20 +1,20 @@
-import { loginWithOAuth } from './login.js';
-import { logout } from './logout.js';
-import { showStatus } from './status.js';
+import { createTwistTokenStore } from '../../lib/auth-provider.js';
+import { attachTwistLoginCommand } from './login.js';
+import { attachTwistLogoutCommand } from './logout.js';
+import { attachTwistStatusCommand } from './status.js';
 import { loginWithToken } from './token.js';
 export function registerAuthCommand(program) {
     const auth = program.command('auth').description('Manage authentication');
-    auth.command('login')
-        .description('Authenticate using OAuth (opens browser)')
-        .option('--read-only', 'Authenticate with read-only scope (no write operations)')
-        .action(loginWithOAuth);
+    // Shared store instance: login stashes the post-`set` storage result for
+    // its success handler, logout reads the post-`clear` result for the same
+    // keyring-fallback warning surface. Status uses `active()` as the
+    // authenticated-snapshot gate.
+    const store = createTwistTokenStore();
+    attachTwistLoginCommand(auth, store);
+    attachTwistLogoutCommand(auth, store);
+    attachTwistStatusCommand(auth, store);
     auth.command('token [token]')
         .description('Save API token for CLI authentication')
         .action(loginWithToken);
-    auth.command('status')
-        .description('Show current authentication status')
-        .option('--json', 'Output as JSON')
-        .action(showStatus);
-    auth.command('logout').description('Remove saved authentication token').action(logout);
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAA;IAEzE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,0CAA0C,CAAC;SACvD,MAAM,CAAC,aAAa,EAAE,yDAAyD,CAAC;SAChF,MAAM,CAAC,cAAc,CAAC,CAAA;IAE3B,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,cAAc,CAAC,CAAA;IAE3B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,oCAAoC,CAAC;SACjD,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;SAClC,MAAM,CAAC,UAAU,CAAC,CAAA;IAEvB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,mCAAmC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAC1F,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAA;IAEzE,yEAAyE;IACzE,yEAAyE;IACzE,kEAAkE;IAClE,+BAA+B;IAC/B,MAAM,KAAK,GAAG,qBAAqB,EAAE,CAAA;IAErC,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACpC,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACrC,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IAErC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,cAAc,CAAC,CAAA;AAC/B,CAAC"}

package/dist/commands/auth/login.d.ts

@@ -1,4 +1,4 @@
-export declare function loginWithOAuth(options: {
-    readOnly?: boolean;
-}): Promise<void>;
+import type { Command } from 'commander';
+import { type TwistTokenStore } from '../../lib/auth-provider.js';
+export declare function attachTwistLoginCommand(parent: Command, store: TwistTokenStore): Command;
 //# sourceMappingURL=login.d.ts.map

package/dist/commands/auth/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAcA,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEnF"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,4BAA4B,CAAA;AAKnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CA0BxF"}

package/dist/commands/auth/login.js

@@ -1,67 +1,29 @@
+import { attachLoginCommand } from '@doist/cli-core/auth';
 import chalk from 'chalk';
-import { saveApiToken } from '../../lib/auth.js';
-import { CliError } from '../../lib/errors.js';
-import { startCallbackServer } from '../../lib/oauth-server.js';
-import { buildAuthorizationUrl, exchangeCodeForToken, READ_ONLY_SCOPES, READ_WRITE_SCOPES, registerDynamicClient, } from '../../lib/oauth.js';
-import { generateCodeChallenge, generateCodeVerifier, generateState } from '../../lib/pkce.js';
+import { renderError, renderSuccess } from '../../lib/auth-pages.js';
+import { createTwistAuthProvider, READ_ONLY_SCOPES, READ_WRITE_SCOPES, } from '../../lib/auth-provider.js';
 import { logTokenStorageResult } from './helpers.js';
-export async function loginWithOAuth(options) {
-    const modeLabel = options.readOnly ? 'read-only' : 'read-write';
-    console.log(chalk.blue(`Starting OAuth authentication (${modeLabel})...`));
-    try {
-        // Register dynamic client
-        console.log(chalk.dim('Registering OAuth client...'));
-        const client = await registerDynamicClient();
-        // Generate PKCE parameters
-        const codeVerifier = generateCodeVerifier();
-        const codeChallenge = generateCodeChallenge(codeVerifier);
-        const state = generateState();
-        // Start callback server
-        console.log(chalk.dim('Starting local callback server...'));
-        let cleanup;
-        try {
-            const open = (await import('open')).default;
-            // Open browser in background after a delay
-            setTimeout(async () => {
-                try {
-                    const authUrl = buildAuthorizationUrl(client.client_id, codeChallenge, state, {
-                        readOnly: options.readOnly,
-                    });
-                    console.log(chalk.dim('Opening browser for authorization...'));
-                    console.log(chalk.dim(`If the browser doesn't open, visit: ${authUrl}`));
-                    await open(authUrl);
-                }
-                catch {
-                    // Browser opening failure is not critical - user can use the URL manually
-                }
-            }, 1000);
-            // Wait for callback - this gives us both code and cleanup
-            const result = await startCallbackServer(state);
-            cleanup = result.cleanup;
-            console.log(chalk.dim('Exchanging authorization code for token...'));
-            const accessToken = await exchangeCodeForToken(result.code, codeVerifier, client);
-            const saveResult = await saveApiToken(accessToken, {
-                authMode: options.readOnly ? 'read-only' : 'read-write',
-                authScope: options.readOnly ? READ_ONLY_SCOPES : READ_WRITE_SCOPES,
-            });
-            console.log(chalk.green('✓'), 'OAuth authentication successful!');
-            logTokenStorageResult(saveResult, 'Token stored securely in the system credential manager');
-        }
-        finally {
-            // Always cleanup the server
-            if (cleanup) {
-                cleanup();
+const PREFERRED_CALLBACK_PORT = 8766;
+export function attachTwistLoginCommand(parent, store) {
+    const provider = createTwistAuthProvider();
+    return attachLoginCommand(parent, {
+        provider,
+        store,
+        preferredPort: PREFERRED_CALLBACK_PORT,
+        resolveScopes: ({ readOnly }) => (readOnly ? READ_ONLY_SCOPES : READ_WRITE_SCOPES),
+        renderSuccess,
+        renderError,
+        onSuccess({ view, account }) {
+            const isMachineOutput = view.json || view.ndjson;
+            if (!isMachineOutput) {
+                console.log(chalk.green('✓'), 'OAuth authentication successful!');
+                console.log(chalk.dim(`Logged in as ${account.label}`));
             }
-        }
-    }
-    catch (error) {
-        if (error instanceof CliError)
-            throw error;
-        const detail = error instanceof Error ? `: ${error.message}` : '';
-        throw new CliError('AUTH_FAILED', `OAuth authentication failed${detail}`, [
-            'Try again: tw auth login',
-            'Or set TWIST_API_TOKEN environment variable',
-        ]);
-    }
+            const result = store.getLastStorageResult();
+            if (result) {
+                logTokenStorageResult(result, 'Token stored securely in the system credential manager', isMachineOutput);
+            }
+        },
+    }).description('Authenticate using OAuth (opens browser)');
 }
 //# sourceMappingURL=login.js.map

package/dist/commands/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EACH,uBAAuB,EACvB,gBAAgB,EAChB,iBAAiB,GAEpB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,MAAM,uBAAuB,GAAG,IAAI,CAAA;AAEpC,MAAM,UAAU,uBAAuB,CAAC,MAAe,EAAE,KAAsB;IAC3E,MAAM,QAAQ,GAAG,uBAAuB,EAAE,CAAA;IAE1C,OAAO,kBAAkB,CAAC,MAAM,EAAE;QAC9B,QAAQ;QACR,KAAK;QACL,aAAa,EAAE,uBAAuB;QACtC,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QAClF,aAAa;QACb,WAAW;QACX,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;YACvB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAA;YAChD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,kCAAkC,CAAC,CAAA;gBACjE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC3D,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAA;YAC3C,IAAI,MAAM,EAAE,CAAC;gBACT,qBAAqB,CACjB,MAAM,EACN,wDAAwD,EACxD,eAAe,CAClB,CAAA;YACL,CAAC;QACL,CAAC;KACJ,CAAC,CAAC,WAAW,CAAC,0CAA0C,CAAC,CAAA;AAC9D,CAAC"}

package/dist/commands/auth/logout.d.ts

@@ -1,2 +1,11 @@
-export declare function logout(): Promise<void>;
+import type { Command } from 'commander';
+import type { TwistTokenStore } from '../../lib/auth-provider.js';
+/**
+ * Attach `tw auth logout` via cli-core's generic `attachLogoutCommand`. The
+ * registrar emits the success line (`✓ Logged out` / `{ok:true}` / silent
+ * ndjson); `onCleared` only surfaces the keyring-fallback warning carried by
+ * `TokenStorageResult` — cli-core's `TokenStore.clear: void` contract can't
+ * expose it directly, so we stash it on the adapter (`getLastClearResult`).
+ */
+export declare function attachTwistLogoutCommand(auth: Command, store: TwistTokenStore): Command;
 //# sourceMappingURL=logout.d.ts.map

package/dist/commands/auth/logout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAIA,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAI5C"}
+{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAgB,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAG/E;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAavF"}

package/dist/commands/auth/logout.js

@@ -1,9 +1,21 @@
-import chalk from 'chalk';
-import { clearApiToken } from '../../lib/auth.js';
+import { attachLogoutCommand } from '@doist/cli-core/auth';
 import { logTokenStorageResult } from './helpers.js';
-export async function logout() {
-    const clearResult = await clearApiToken();
-    console.log(chalk.green('✓'), 'Logged out');
-    logTokenStorageResult(clearResult, 'Stored token removed from the system credential manager');
+/**
+ * Attach `tw auth logout` via cli-core's generic `attachLogoutCommand`. The
+ * registrar emits the success line (`✓ Logged out` / `{ok:true}` / silent
+ * ndjson); `onCleared` only surfaces the keyring-fallback warning carried by
+ * `TokenStorageResult` — cli-core's `TokenStore.clear: void` contract can't
+ * expose it directly, so we stash it on the adapter (`getLastClearResult`).
+ */
+export function attachTwistLogoutCommand(auth, store) {
+    return attachLogoutCommand(auth, {
+        store,
+        onCleared: ({ view }) => {
+            const result = store.getLastClearResult();
+            if (!result)
+                return;
+            logTokenStorageResult(result, 'Stored token removed from the system credential manager', view.json || view.ndjson);
+        },
+    });
 }
 //# sourceMappingURL=logout.js.map

package/dist/commands/auth/logout.js.map

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,MAAM,CAAC,KAAK,UAAU,MAAM;IACxB,MAAM,WAAW,GAAG,MAAM,aAAa,EAAE,CAAA;IACzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAA;IAC3C,qBAAqB,CAAC,WAAW,EAAE,yDAAyD,CAAC,CAAA;AACjG,CAAC"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAG1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD;;;;;;GAMG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAa,EAAE,KAAsB;IAC1E,OAAO,mBAAmB,CAAe,IAAI,EAAE;QAC3C,KAAK;QACL,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACpB,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAA;YACzC,IAAI,CAAC,MAAM;gBAAE,OAAM;YACnB,qBAAqB,CACjB,MAAM,EACN,yDAAyD,EACzD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAC3B,CAAA;QACL,CAAC;KACJ,CAAC,CAAA;AACN,CAAC"}

package/dist/commands/auth/status.d.ts

@@ -1,4 +1,16 @@
-export declare function showStatus(options: {
-    json?: boolean;
-}): Promise<void>;
+import type { Command } from 'commander';
+import type { TwistTokenStore } from '../../lib/auth-provider.js';
+/**
+ * Attach `tw auth status` via cli-core's generic `attachStatusCommand`.
+ *
+ * `TwistTokenStore.active()` returns a snapshot whenever a token resolves
+ * (per the adapter's documented contract — see `auth-provider.ts`), so
+ * `fetchLive` covers every token-present path: secure-store, plaintext
+ * config fallback, env-token mode, and manual `tw auth token`. The
+ * snapshot's token is reused inside `gatherStatusData` so credentials are
+ * read once per invocation. `onNotAuthenticated` only fires when nothing
+ * is stored — it throws `NoTokenError` so the standard CliError envelope
+ * reaches the operator unchanged.
+ */
+export declare function attachTwistStatusCommand(auth: Command, store: TwistTokenStore): Command;
 //# sourceMappingURL=status.d.ts.map

package/dist/commands/auth/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAOA,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B3E"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,KAAK,EAAgB,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAiE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CA+BvF"}

package/dist/commands/auth/status.js

@@ -1,17 +1,34 @@
+import { attachStatusCommand } from '@doist/cli-core/auth';
 import { TwistRequestError } from '@doist/twist-sdk';
 import chalk from 'chalk';
-import { getSessionUser } from '../../lib/api.js';
-import { NoTokenError, getAuthMetadata } from '../../lib/auth.js';
+import { createWrappedTwistClient } from '../../lib/api.js';
+import { getAuthMetadata, NoTokenError } from '../../lib/auth.js';
 import { CliError } from '../../lib/errors.js';
-import { formatJson } from '../../lib/output.js';
-export async function showStatus(options) {
-    let user;
+function formatAuthMode(authMode, authScope) {
+    if (authMode === 'read-only') {
+        return `read-only (scope: ${authScope ?? 'unknown'})`;
+    }
+    if (authMode === 'read-write') {
+        return 'read-write';
+    }
+    return 'unknown (manual token or env var; assuming write access)';
+}
+/**
+ * Fetch the live session user (via the snapshot token) and the local auth
+ * metadata concurrently — the API call dominates and the metadata read is
+ * independent. 401-translation lives here so both the snapshot path and any
+ * future callers emit the same `NO_TOKEN` envelope when the token is
+ * rejected by the API.
+ */
+async function gatherStatusData(token) {
     try {
-        user = await getSessionUser();
+        const [user, metadata] = await Promise.all([
+            createWrappedTwistClient(token).users.getSessionUser(),
+            getAuthMetadata(),
+        ]);
+        return { user, metadata };
     }
     catch (error) {
-        if (error instanceof NoTokenError)
-            throw error;
         if (error instanceof TwistRequestError && error.httpStatusCode === 401) {
             throw new CliError('NO_TOKEN', 'Not authenticated (token expired or invalid)', [
                 'Run `tw auth login` to re-authenticate',
@@ -19,19 +36,67 @@ export async function showStatus(options) {
         }
         throw error;
     }
-    if (options.json) {
-        console.log(formatJson({ id: user.id, email: user.email, name: user.name }));
-        return;
-    }
-    const metadata = await getAuthMetadata();
-    const modeLabel = metadata.authMode === 'read-only'
-        ? `read-only (scope: ${metadata.authScope ?? 'unknown'})`
-        : metadata.authMode === 'read-write'
-            ? 'read-write'
-            : 'unknown (manual token or env var; assuming write access)';
-    console.log(chalk.green('✓'), 'Authenticated');
-    console.log(`  Email: ${user.email}`);
-    console.log(`  Name:  ${user.name}`);
-    console.log(`  Mode:  ${modeLabel}`);
+}
+function buildStatusText({ user, metadata }) {
+    const modeLabel = formatAuthMode(metadata.authMode, metadata.authScope);
+    return [
+        `${chalk.green('✓')} Authenticated`,
+        `  Email: ${user.email}`,
+        `  Name:  ${user.name}`,
+        `  Mode:  ${modeLabel}`,
+    ];
+}
+function buildStatusJson({ user, metadata }) {
+    return {
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        authMode: metadata.authMode,
+        authScope: metadata.authScope,
+        source: metadata.source,
+    };
+}
+/**
+ * Attach `tw auth status` via cli-core's generic `attachStatusCommand`.
+ *
+ * `TwistTokenStore.active()` returns a snapshot whenever a token resolves
+ * (per the adapter's documented contract — see `auth-provider.ts`), so
+ * `fetchLive` covers every token-present path: secure-store, plaintext
+ * config fallback, env-token mode, and manual `tw auth token`. The
+ * snapshot's token is reused inside `gatherStatusData` so credentials are
+ * read once per invocation. `onNotAuthenticated` only fires when nothing
+ * is stored — it throws `NoTokenError` so the standard CliError envelope
+ * reaches the operator unchanged.
+ */
+export function attachTwistStatusCommand(auth, store) {
+    let data = null;
+    return attachStatusCommand(auth, {
+        store,
+        description: 'Show current authentication status',
+        fetchLive: async ({ token }) => {
+            data = await gatherStatusData(token);
+            return {
+                id: String(data.user.id),
+                label: data.user.name,
+                authMode: data.metadata.authMode,
+                authScope: data.metadata.authScope ?? '',
+            };
+        },
+        renderText: () => {
+            if (!data) {
+                throw new CliError('INTERNAL_ERROR', 'status renderText called before fetchLive');
+            }
+            return buildStatusText(data);
+        },
+        renderJson: () => {
+            if (!data) {
+                throw new CliError('INTERNAL_ERROR', 'status renderJson called before fetchLive');
+            }
+            return buildStatusJson(data);
+        },
+        onNotAuthenticated: () => {
+            throw new NoTokenError();
+        },
+    });
 }
 //# sourceMappingURL=status.js.map

package/dist/commands/auth/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA2B;IACxD,IAAI,IAAI,CAAA;IACR,IAAI,CAAC;QACD,IAAI,GAAG,MAAM,cAAc,EAAE,CAAA;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,YAAY;YAAE,MAAM,KAAK,CAAA;QAC9C,IAAI,KAAK,YAAY,iBAAiB,IAAI,KAAK,CAAC,cAAc,KAAK,GAAG,EAAE,CAAC;YACrE,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,8CAA8C,EAAE;gBAC3E,wCAAwC;aAC3C,CAAC,CAAA;QACN,CAAC;QACD,MAAM,KAAK,CAAA;IACf,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QAC5E,OAAM;IACV,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,eAAe,EAAE,CAAA;IACxC,MAAM,SAAS,GACX,QAAQ,CAAC,QAAQ,KAAK,WAAW;QAC7B,CAAC,CAAC,qBAAqB,QAAQ,CAAC,SAAS,IAAI,SAAS,GAAG;QACzD,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,YAAY;YAClC,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,0DAA0D,CAAA;IAEtE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAA;IAC9C,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;IACrC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACpC,OAAO,CAAC,GAAG,CAAC,YAAY,SAAS,EAAE,CAAC,CAAA;AACxC,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/auth/status.ts"],"names":[],"mappings":"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"}

package/dist/commands/changelog.d.ts

@@ -1,8 +1,3 @@
 import type { Command } from 'commander';
-interface ChangelogOptions {
-    count: string;
-}
-export declare function changelogAction(options: ChangelogOptions): Promise<void>;
 export declare function registerChangelogCommand(program: Command): void;
-export {};
 //# sourceMappingURL=changelog.d.ts.map

package/dist/commands/changelog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../src/commands/changelog.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AA4FxC,UAAU,gBAAgB;IACtB,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB9E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAM/D"}
+{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../src/commands/changelog.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAKxC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAS/D"}

package/dist/commands/changelog.js

@@ -1,110 +1,16 @@
-import { readFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import chalk from 'chalk';
+import { registerChangelogCommand as registerCoreChangelogCommand } from '@doist/cli-core/commands';
 import packageJson from '../../package.json' with { type: 'json' };
-import { CliError } from '../lib/errors.js';
 const CHANGELOG_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'CHANGELOG.md');
-const CHANGELOG_URL = `https://github.com/Doist/twist-cli/blob/v${packageJson.version}/CHANGELOG.md`;
-function formatInline(text) {
-    return text
-        .replace(/\*\*([^*]+)\*\*/g, (_, content) => chalk.bold(content))
-        .replace(/`([^`]+)`/g, (_, code) => chalk.cyan(code));
-}
-function formatForTerminal(text) {
-    let inBullet = false;
-    return text
-        .split('\n')
-        .map((line) => {
-        // Version headers: # 1.25.0 or ## 1.25.0 (date) → bold green
-        if (/^#{1,2} \d/.test(line)) {
-            inBullet = false;
-            const content = line.replace(/^#{1,2} /, '');
-            return chalk.green.bold(content);
-        }
-        // Section headers: ### Features → bold
-        if (line.startsWith('### ')) {
-            inBullet = false;
-            return chalk.bold(line.slice(4));
-        }
-        // Bullet items: * description → dimmed bullet + text
-        if (line.startsWith('* ')) {
-            inBullet = true;
-            return `  ${chalk.dim('•')} ${formatInline(line.slice(2))}`;
-        }
-        // Continuation lines of a bullet item → indent to match
-        if (inBullet && line.length > 0) {
-            return `    ${formatInline(line)}`;
-        }
-        if (line.length === 0) {
-            inBullet = false;
-        }
-        return formatInline(line);
-    })
-        .join('\n');
-}
-function cleanChangelog(text) {
-    return (text
-        // Version headers: # [1.25.0](https://...) or ## [1.25.0](https://...) → keep heading level
-        .replace(/(#{1,2}) \[([^\]]+)\]\([^)]*\)/g, '$1 $2')
-        // Remove commit hash links: ([abc1234](https://...))
-        .replace(/ \([a-f0-9]{7}\)/g, '')
-        .replace(/ \(\[[a-f0-9]{7}\]\([^)]*\)\)/g, '')
-        // Issue/PR links: [#151](https://...) → #151
-        .replace(/\[#(\d+)\]\([^)]*\)/g, '#$1')
-        // Remove **deps:** dependency update lines (not useful to end users)
-        .replace(/^\* \*\*deps:\*\*.*$/gm, '')
-        // Remove **scope:** prefixes but keep the text: **task:** foo → foo
-        .replace(/\*\*[\w-]+:\*\* /g, '')
-        // Clean up blank lines left by removed dep lines
-        .replace(/\n{3,}/g, '\n\n')
-        // Remove section headers left empty after filtering (e.g. ### Bug Fixes with no items)
-        .replace(/### [\w ]+\n\n(?=#{1,3} |$)/gm, ''));
-}
-function isEmptyAfterClean(section) {
-    const cleaned = cleanChangelog(section);
-    // A section is empty if it only contains the version header line(s) and whitespace
-    const withoutHeader = cleaned.replace(/^#{1,2} .+$/m, '').trim();
-    return withoutHeader.length === 0;
-}
-function parseChangelog(content, count) {
-    const sections = content.split(/\n(?=#{1,2} \[)/);
-    // Skip preamble (non-version content) if present
-    const allVersions = /^#{1,2} \[/.test(sections[0]) ? sections : sections.slice(1);
-    // Filter out versions that become empty after cleaning (e.g. deps-only releases)
-    const versionSections = allVersions.filter((s) => !isEmptyAfterClean(s));
-    const selected = versionSections.slice(0, count);
-    if (selected.length === 0) {
-        return { text: 'No changelog entries found.', hasMore: false };
-    }
-    return {
-        text: cleanChangelog(selected.join('\n').trimEnd()),
-        hasMore: versionSections.length > count,
-    };
-}
-export async function changelogAction(options) {
-    const count = parseInt(options.count, 10);
-    if (Number.isNaN(count) || count < 1) {
-        throw new CliError('INVALID_TYPE', 'Count must be a positive number');
-    }
-    let content;
-    try {
-        content = await readFile(CHANGELOG_PATH, 'utf-8');
-    }
-    catch {
-        throw new CliError('FILE_READ_ERROR', 'Could not read changelog file');
-    }
-    const { text, hasMore } = parseChangelog(content, count);
-    console.log(formatForTerminal(text));
-    if (hasMore) {
-        console.log(chalk.dim(`\nView full changelog: ${CHANGELOG_URL}`));
-    }
-}
 export function registerChangelogCommand(program) {
-    program
-        .command('changelog')
-        .description('Show recent changelog entries')
-        .option('-n, --count <number>', 'Number of versions to show', '5')
-        .action(changelogAction);
+    registerCoreChangelogCommand(program, {
+        path: CHANGELOG_PATH,
+        repoUrl: 'https://github.com/Doist/twist-cli',
+        version: packageJson.version,
+        headingLevel: 'flexible',
+        continuationIndent: true,
+        filterEmptyVersions: true,
+    });
 }
 //# sourceMappingURL=changelog.js.map

package/dist/commands/changelog.js.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../src/commands/changelog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../src/commands/changelog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,wBAAwB,IAAI,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAEnG,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAElE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;AAEhG,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACrD,4BAA4B,CAAC,OAAO,EAAE;QAClC,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,oCAAoC;QAC7C,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,YAAY,EAAE,UAAU;QACxB,kBAAkB,EAAE,IAAI;QACxB,mBAAmB,EAAE,IAAI;KAC5B,CAAC,CAAA;AACN,CAAC"}