dbdiagram 0.1.2 → 0.3.0

package/README.md

@@ -181,6 +181,19 @@ yarn build      # compile to dist/
 yarn start      # run compiled output
 ```
 
+### Telemetry in development
+
+Copy `.env.example` to `.env`. Its defaults point telemetry at a local collector
+(`TRACKING_COLLECTOR_URL=http://localhost:9090`) and tag events with a non-production app id (`TRACKING_APP_ID=dbdiagram-cli-test`), so development never writes to production analytics.
+
+To disable tracking entirely, point the collector at a local address with nothing listening:
+
+```sh
+TRACKING_COLLECTOR_URL=http://localhost:9090 yarn dev push ...
+```
+
+Sends fail silently (the CLI never retries and never surfaces telemetry errors), so no events leave your machine. To instead inspect what would be sent, run [Snowplow Micro](https://docs.snowplow.io/docs/data-product-studio/data-quality/snowplow-micro/) on that port and read `curl localhost:9090/micro/good` (passed validation) and `/micro/bad` (failed).
+
 ## Test
 
 ```sh

package/dist/actions/auth/auth-login.action.js

@@ -1,19 +1,13 @@
 import path from 'path';
-import { spinner, log } from '@clack/prompts';
+import { spinner } from '@clack/prompts';
 import open from 'open';
 import { storeCredential } from '../../config/credential-manager.js';
 import { PORTAL_LOGIN_CONFIGS, PORTAL_URLS } from '../../config.js';
-import { initAuthClient, PORTAL_AUTH_ERROR_CODES, PortalAuthenticationError, } from '../../libs/portal/index.js';
-const ERROR_MESSAGES = {
-    [PORTAL_AUTH_ERROR_CODES.loginTimeout]: 'Login timed out. Please try again.',
-    [PORTAL_AUTH_ERROR_CODES.loginCancelled]: 'Login cancelled.',
-    [PORTAL_AUTH_ERROR_CODES.stateMismatch]: 'Authentication failed: security validation error.',
-    [PORTAL_AUTH_ERROR_CODES.exchangeFailed]: 'Authentication failed: could not exchange token.',
-    [PORTAL_AUTH_ERROR_CODES.invalidCallback]: 'Authentication failed: invalid callback received.',
-    [PORTAL_AUTH_ERROR_CODES.loopbackServerError]: 'Authentication failed: could not start local server.',
-    [PORTAL_AUTH_ERROR_CODES.unknownError]: 'Authentication failed: an unexpected error occurred.',
-};
+import { initAuthClient } from '../../libs/portal/index.js';
+import { toCliError } from '../../utils/cli-error.util.js';
+import { displayError } from '../../utils/output.util.js';
 export async function loginAction() {
+    const s = spinner();
     try {
         const authClient = await initAuthClient({
             loginUrl: PORTAL_URLS.loginUrl,
@@ -25,7 +19,6 @@ export async function loginAction() {
                 error: path.join(import.meta.dirname, '../../assets/callback-error.html'),
             },
         });
-        const s = spinner();
         await open(authClient.getLoginUrl());
         s.start('Waiting for browser login...');
         const { accessToken } = await authClient.obtainTokens();
@@ -33,12 +26,8 @@ export async function loginAction() {
         s.stop('Login successful. Credentials saved.');
     }
     catch (error) {
-        if (error instanceof PortalAuthenticationError) {
-            const message = ERROR_MESSAGES[error.errorCode] || ERROR_MESSAGES[PORTAL_AUTH_ERROR_CODES.unknownError];
-            log.error(message);
-            process.exitCode = 1;
-            return;
-        }
-        throw error;
+        s.stop();
+        displayError(toCliError(error), 'plain');
+        process.exitCode = 1;
     }
 }

package/dist/actions/auth/auth-logout.action.js

@@ -1,13 +1,21 @@
 import { log } from '@clack/prompts';
 import { clearCredential } from '../../config/credential-manager.js';
-export async function logoutAction() {
+import { CliError } from '../../errors/cli.error.js';
+import { AUTH_LOGOUT_FAILED } from '../../constants/cli-error.constant.js';
+import { displayError, getOutputFormat, printJson } from '../../utils/output.util.js';
+export async function logoutAction(options = {}) {
     try {
         clearCredential();
-        log.success('Logout successful.');
+        if (options.json) {
+            printJson({ success: true });
+        }
+        else {
+            log.success('Logout successful.');
+        }
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        log.error(`Failed to log out: ${message}`);
+        displayError(new CliError(AUTH_LOGOUT_FAILED, message), getOutputFormat(options.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/auth/auth-status.action.js

@@ -1,15 +1,15 @@
-import { log, spinner } from '@clack/prompts';
+import { spinner } from '@clack/prompts';
 import { getCredential } from '../../config/credential-manager.js';
-import { NOT_LOGGED_IN_MESSAGE } from '../../constants/auth-message.constant.js';
+import { AUTH_NOT_LOGGED_IN } from '../../constants/cli-error.constant.js';
+import { CliError } from '../../errors/cli.error.js';
 import { portalIntegration } from '../../integrations/portal/portal.integration.js';
-import { isPortalApiError, getPortalApiErrorMessage } from '../../utils/portal-error.util.js';
-import { printJson } from '../../utils/output.util.js';
+import { getCliErrorMessageFromCode, toCliError } from '../../utils/cli-error.util.js';
+import { displayError, getOutputFormat, printJson } from '../../utils/output.util.js';
 export async function statusAction(options = {}) {
     const credential = getCredential();
     if (!credential) {
-        log.warn(NOT_LOGGED_IN_MESSAGE);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), getOutputFormat(options.json));
     }
     const s = spinner();
     s.start('Checking login status...');
@@ -26,13 +26,7 @@ export async function statusAction(options = {}) {
     }
     catch (error) {
         s.stop('Failed to check login status.');
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            const message = error instanceof Error ? error.message : String(error);
-            log.error(message);
-        }
+        displayError(toCliError(error), getOutputFormat(options.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/build/build-document.action.js

@@ -1,64 +1,56 @@
 import { readFile } from 'node:fs/promises';
 import { log, spinner } from '@clack/prompts';
+import { DBDOCS_CONFIGS } from '../../config.js';
 import { getCredential } from '../../config/credential-manager.js';
-import { NOT_LOGGED_IN_MESSAGE } from '../../constants/auth-message.constant.js';
+import { DOCUMENT_SOURCE_TYPE } from '../../constants/document.constant.js';
+import { AUTH_NOT_LOGGED_IN, DBML_PARSE_ERROR, FILE_READ_ERROR, PROJECT_NAME_INVALID, PROJECT_NAME_MISSING, SOURCE_MISSING, VERSION_NAME_INVALID, WORKSPACE_NAME_INVALID, WORKSPACE_NAME_MISSING, } from '../../constants/cli-error.constant.js';
+import { CliError } from '../../errors/cli.error.js';
+import { portalIntegration } from '../../integrations/portal/portal.integration.js';
+import { trackEvent } from '../../services/telemetry.service.js';
 import { prepareBuildDocumentData } from '../../services/dbml/dbml.service.js';
+import { getCliErrorMessageFromCode, toCliError } from '../../utils/cli-error.util.js';
 import { formatDbmlError, getDbmlVersion } from '../../utils/dbml.util.js';
-import { portalIntegration } from '../../integrations/portal/portal.integration.js';
-import { DBDOCS_CONFIGS } from '../../config.js';
-import { isPortalApiError, getPortalApiErrorMessage } from '../../utils/portal-error.util.js';
-import { printJson } from '../../utils/output.util.js';
+import { displayError, getOutputFormat, printJson } from '../../utils/output.util.js';
 import { validateProjectUrlName, validateVersionName, validateWorkspaceUrlName, } from '../../utils/validation.util.js';
-import { DOCUMENT_SOURCE_TYPE } from '../../constants/document.constant.js';
 const DOCUMENT_SOURCE_CLIENT_TYPE = 'dbdiagram-cli';
 export async function documentAction(options) {
     const credential = getCredential();
     if (!credential) {
-        log.error(NOT_LOGGED_IN_MESSAGE);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), getOutputFormat(options.json));
     }
     if (options.versionName !== undefined) {
         const versionError = validateVersionName(options.versionName);
         if (versionError) {
-            log.error(versionError);
             process.exitCode = 1;
-            return;
+            return displayError(new CliError(VERSION_NAME_INVALID, versionError), getOutputFormat(options.json));
         }
     }
     if (!options.workspaceUrlName) {
-        log.error('Workspace url name is required. Use --project <workspace>/<project> '
-            + 'or configure workspaceUrlName in settings.json');
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(WORKSPACE_NAME_MISSING, getCliErrorMessageFromCode(WORKSPACE_NAME_MISSING)), getOutputFormat(options.json));
     }
     const workspaceError = validateWorkspaceUrlName(options.workspaceUrlName);
     if (workspaceError) {
-        log.error(workspaceError);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(WORKSPACE_NAME_INVALID, workspaceError), getOutputFormat(options.json));
     }
     if (!options.projectUrlOrName) {
-        log.error('Project name/url name is required. Use --project <workspace>/<project> '
-            + 'or configure projectUrlName in settings.json');
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(PROJECT_NAME_MISSING, getCliErrorMessageFromCode(PROJECT_NAME_MISSING)), getOutputFormat(options.json));
     }
     if (options.projectUrlOrName.includes('/')) {
-        log.error('Invalid --project value. Expected <workspace>/<project> or <project>.');
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(PROJECT_NAME_INVALID, 'Invalid --project value. Expected <workspace>/<project> or <project>.'), getOutputFormat(options.json));
     }
     const projectError = validateProjectUrlName(options.projectUrlOrName);
     if (projectError) {
-        log.error(projectError);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(PROJECT_NAME_INVALID, projectError), getOutputFormat(options.json));
     }
     if (options.source === undefined) {
-        log.error('One source must be specified: --from-file or --from-diagram');
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(SOURCE_MISSING, getCliErrorMessageFromCode(SOURCE_MISSING)), getOutputFormat(options.json));
     }
     let content;
     if (options.source.type === DOCUMENT_SOURCE_TYPE.FILE) {
@@ -67,9 +59,8 @@ export async function documentAction(options) {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            log.error(`Failed to read file: ${message}`);
             process.exitCode = 1;
-            return;
+            return displayError(new CliError(FILE_READ_ERROR, `Failed to read file: ${message}`), getOutputFormat(options.json));
         }
     }
     else {
@@ -78,15 +69,8 @@ export async function documentAction(options) {
             content = diagram.content;
         }
         catch (error) {
-            if (isPortalApiError(error)) {
-                log.error(getPortalApiErrorMessage(error));
-            }
-            else {
-                const message = error instanceof Error ? error.message : String(error);
-                log.error(`Failed to fetch diagram: ${message}`);
-            }
             process.exitCode = 1;
-            return;
+            return displayError(toCliError(error), getOutputFormat(options.json));
         }
     }
     if (!content || !content.trim()) {
@@ -99,13 +83,13 @@ export async function documentAction(options) {
         preparedDocumentData = await prepareBuildDocumentData(content);
     }
     catch (error) {
-        log.error(`Failed to parse DBML: ${formatDbmlError(error)}`);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(DBML_PARSE_ERROR, `Failed to parse DBML: ${formatDbmlError(error)}`), getOutputFormat(options.json));
     }
     const s = spinner();
     s.start('Building document on dbdocs...');
     try {
+        const currentUser = await portalIntegration.getCurrentUser();
         const { project } = await portalIntegration.createDocument({
             projectName: options.projectUrlOrName,
             projectDescription: preparedDocumentData.description,
@@ -119,10 +103,16 @@ export async function documentAction(options) {
             normalizedDatabase: preparedDocumentData.normalizedDatabase,
             dbmlVersion: getDbmlVersion(),
         });
-        const url = `${DBDOCS_CONFIGS.baseUrl}/${project.workspaceUrl}/${project.urlName}`;
+        const { workspaceUrl: workspaceUrlName, urlName: projectUrlName } = project;
+        trackEvent({
+            name: 'cli_document_build',
+            properties: { workspaceUrlName, projectUrlName },
+            userId: currentUser.id.toString(),
+        });
+        const url = `${DBDOCS_CONFIGS.baseUrl}/${workspaceUrlName}/${projectUrlName}`;
         if (options.json) {
             s.stop();
-            printJson({ projectUrlName: `${project.workspaceUrl}/${project.urlName}`, url });
+            printJson({ projectUrlName: `${workspaceUrlName}/${projectUrlName}`, url });
         }
         else {
             s.stop(`Document built successfully. Visit: ${url}`);
@@ -130,13 +120,7 @@ export async function documentAction(options) {
     }
     catch (error) {
         s.stop('Failed to build document.');
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            const message = error instanceof Error ? error.message : String(error);
-            log.error(message);
-        }
+        displayError(toCliError(error), getOutputFormat(options.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/delete.action.js

@@ -1,21 +1,20 @@
 import { confirm, isCancel, log, spinner } from '@clack/prompts';
 import { getCredential } from '../config/credential-manager.js';
-import { NOT_LOGGED_IN_MESSAGE } from '../constants/auth-message.constant.js';
 import { getSettings, writeSettings } from '../config/settings-manager.js';
+import { AUTH_NOT_LOGGED_IN, DIAGRAM_ID_MISSING } from '../constants/cli-error.constant.js';
+import { CliError } from '../errors/cli.error.js';
 import { portalIntegration } from '../integrations/portal/portal.integration.js';
-import { isPortalApiError, getPortalApiErrorMessage } from '../utils/portal-error.util.js';
-import { printJson } from '../utils/output.util.js';
+import { getCliErrorMessageFromCode, toCliError } from '../utils/cli-error.util.js';
+import { displayError, getOutputFormat, printJson } from '../utils/output.util.js';
 export async function deleteAction(options) {
     const credential = getCredential();
     if (!credential) {
-        log.error(NOT_LOGGED_IN_MESSAGE);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), getOutputFormat(options.json));
     }
     if (!options.diagramId) {
-        log.error('Missing required flag: --diagram-id');
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(DIAGRAM_ID_MISSING, getCliErrorMessageFromCode(DIAGRAM_ID_MISSING)), getOutputFormat(options.json));
     }
     if (!options.force) {
         const shouldDelete = await confirm({
@@ -42,7 +41,7 @@ export async function deleteAction(options) {
             printJson({
                 diagramId: options.diagramId,
                 deleted: true,
-                ...(isRemoveInSettings ? {} : { diagramIdSettingCleared: true }),
+                ...(isRemoveInSettings ? { diagramIdSettingCleared: true } : {}),
             });
         }
         else {
@@ -55,13 +54,7 @@ export async function deleteAction(options) {
     catch (error) {
         s.error('Failed to delete diagram.');
         s.stop();
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            const message = error instanceof Error ? error.message : String(error);
-            log.error(message);
-        }
+        displayError(toCliError(error), getOutputFormat(options.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/list/list-document.action.js

@@ -1,12 +1,13 @@
 import { log, spinner } from '@clack/prompts';
 import { DBDOCS_CONFIGS } from '../../config.js';
 import { getCredential } from '../../config/credential-manager.js';
-import { NOT_LOGGED_IN_MESSAGE } from '../../constants/auth-message.constant.js';
+import { CliError } from '../../errors/cli.error.js';
+import { getCliErrorMessageFromCode, toCliError } from '../../utils/cli-error.util.js';
+import { AUTH_NOT_LOGGED_IN } from '../../constants/cli-error.constant.js';
 import { portalIntegration } from '../../integrations/portal/portal.integration.js';
+import { formatShortDateTime } from '../../utils/date.util.js';
 import { logConsole } from '../../utils/logger.util.js';
-import { printJson, printTable } from '../../utils/output.util.js';
-import { isPortalApiError, getPortalApiErrorMessage } from '../../utils/portal-error.util.js';
-import { computeColWidths } from '../../utils/table.util.js';
+import { displayError, getOutputFormat, printJson, printTable } from '../../utils/output.util.js';
 function mapRole(role) {
     switch (role) {
         case 'admin':
@@ -34,9 +35,8 @@ function mapAccessControl(ac) {
 export async function listDocumentAction(opts) {
     const credential = getCredential();
     if (!credential) {
-        log.error(NOT_LOGGED_IN_MESSAGE);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), getOutputFormat(opts.json));
     }
     const s = spinner();
     s.start('Fetching documents...');
@@ -87,30 +87,29 @@ export async function listDocumentAction(opts) {
                 return {
                     workspace: w.urlName,
                     name: p.name,
+                    url: `${DBDOCS_CONFIGS.baseUrl}/${w.urlName}/${p.urlName}`,
                     owner: ownerLabel,
                     permission: mapRole(p.role),
                     accessControl: mapAccessControl(p.accessControl),
-                    url: `${DBDOCS_CONFIGS.baseUrl}/${w.urlName}/${p.urlName}`,
-                    updatedAt: p.updatedAt,
+                    updatedAt: formatShortDateTime(p.updatedAt),
                 };
             }));
             printJson(allMappedData);
         }
         else {
             for (const w of workspacesWithProjects) {
-                logConsole(`\n${w.urlName}`);
+                logConsole(`\nWorkspace: ${w.urlName}`);
                 printTable(w.projects, {
-                    head: ['Name', 'Owner', 'Permission', 'Access Control', 'Url', 'Last updated'],
-                    colWidths: computeColWidths([0.14, 0.22, 0.12, 0.14, 0.24, 0.14]),
+                    head: ['Name', 'Url', 'Owner', 'Permission', 'Access Control', 'Last updated'],
                     rowMapper: (p) => {
                         const ownerLabel = p.owner.email === currentUser.email ? `${p.owner.email} (you)` : p.owner.email;
                         return [
                             p.name,
+                            `${DBDOCS_CONFIGS.baseUrl}/${w.urlName}/${p.urlName}`,
                             ownerLabel,
                             mapRole(p.role),
                             mapAccessControl(p.accessControl),
-                            `${DBDOCS_CONFIGS.baseUrl}/${w.urlName}/${p.urlName}`,
-                            new Date(p.updatedAt).toLocaleString(),
+                            formatShortDateTime(p.updatedAt),
                         ];
                     },
                 });
@@ -119,12 +118,7 @@ export async function listDocumentAction(opts) {
     }
     catch (error) {
         s.stop('Failed to fetch documents.');
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            log.error(error instanceof Error ? error.message : String(error));
-        }
+        displayError(toCliError(error), getOutputFormat(opts.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/list/list.action.js

@@ -1,11 +1,12 @@
-import { log, spinner } from '@clack/prompts';
+import { spinner } from '@clack/prompts';
 import { DBDIAGRAM_CONFIGS } from '../../config.js';
 import { getCredential } from '../../config/credential-manager.js';
-import { NOT_LOGGED_IN_MESSAGE } from '../../constants/auth-message.constant.js';
+import { CliError } from '../../errors/cli.error.js';
+import { getCliErrorMessageFromCode, toCliError } from '../../utils/cli-error.util.js';
+import { AUTH_NOT_LOGGED_IN } from '../../constants/cli-error.constant.js';
 import { portalIntegration } from '../../integrations/portal/portal.integration.js';
-import { isPortalApiError, getPortalApiErrorMessage } from '../../utils/portal-error.util.js';
-import { computeColWidths } from '../../utils/table.util.js';
-import { printJson, printTable } from '../../utils/output.util.js';
+import { formatShortDateTime } from '../../utils/date.util.js';
+import { displayError, getOutputFormat, printJson, printTable } from '../../utils/output.util.js';
 function mapStatus(status) {
     switch (status) {
         case 'public':
@@ -24,9 +25,8 @@ function ownerLabel(owner, currentUserEmail) {
 export async function listAction(opts) {
     const credential = getCredential();
     if (!credential) {
-        log.error(NOT_LOGGED_IN_MESSAGE);
         process.exitCode = 1;
-        return;
+        return displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), getOutputFormat(opts.json));
     }
     const s = spinner();
     s.start('Fetching diagrams...');
@@ -52,7 +52,7 @@ export async function listAction(opts) {
                 owner: ownerLabel(d.owner, currentUser.email),
                 status: mapStatus(d.status),
                 url: `${DBDIAGRAM_CONFIGS.baseUrl}/d/${d.id}`,
-                updatedAt: new Date(d.updatedAt).toLocaleString(),
+                updatedAt: formatShortDateTime(d.updatedAt),
             }));
             if (opts.json) {
                 printJson(mappedData);
@@ -60,7 +60,6 @@ export async function listAction(opts) {
             else {
                 printTable(mappedData, {
                     head: ['Name', 'ID', 'Owner', 'Status', 'Url', 'Last updated'],
-                    colWidths: computeColWidths([0.18, 0.22, 0.14, 0.09, 0.26, 0.11]),
                     rowMapper: (d) => [d.name, d.id, d.owner, d.status, d.url, d.updatedAt],
                 });
             }
@@ -76,28 +75,22 @@ export async function listAction(opts) {
                 name: d.name,
                 id: d.id,
                 url: `${DBDIAGRAM_CONFIGS.baseUrl}/d/${d.id}`,
-                updatedAt: new Date(d.updatedAt).toLocaleString(),
+                updatedAt: formatShortDateTime(d.updatedAt),
             }));
             if (opts.json) {
                 printJson(mappedData);
             }
             else {
                 printTable(mappedData, {
-                    head: ['Name', 'ID', 'Url', 'Last updated'],
-                    colWidths: computeColWidths([0.25, 0.18, 0.35, 0.22]),
-                    rowMapper: (d) => [d.name, d.id, d.url, d.updatedAt],
+                    head: ['ID', 'Url', 'Name', 'Last updated'],
+                    rowMapper: (d) => [d.id, d.url, d.name, d.updatedAt],
                 });
             }
         }
     }
     catch (error) {
         s.stop('Failed to fetch diagrams.');
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            log.error(error instanceof Error ? error.message : String(error));
-        }
+        displayError(toCliError(error), getOutputFormat(opts.json));
         process.exitCode = 1;
     }
 }

package/dist/actions/pull.action.js

@@ -1,22 +1,23 @@
-import { log, spinner } from '@clack/prompts';
-import { NOT_LOGGED_IN_MESSAGE } from '../constants/auth-message.constant.js';
+import { spinner } from '@clack/prompts';
 import { getCredential } from '../config/credential-manager.js';
 import { writeFileWithDir } from '../services/file.service.js';
 import { portalIntegration } from '../integrations/portal/portal.integration.js';
 import { deriveDiagramVizPathFromDBML, readDiagramVizFile, writeDiagramVizFile, } from '../services/viz/diagram-viz-file.service.js';
-import { getVizReadErrorMessage } from '../utils/diagram-viz-error.util.js';
 import { fromServerFormat } from '../services/viz/diagram-viz-converter.service.js';
 import { logConsole } from '../utils/logger.util.js';
-import { getPortalApiErrorMessage, isPortalApiError } from '../utils/portal-error.util.js';
+import { CliError } from '../errors/cli.error.js';
+import { AUTH_NOT_LOGGED_IN, DIAGRAM_ID_MISSING } from '../constants/cli-error.constant.js';
+import { getCliErrorMessageFromCode, toCliError } from '../utils/cli-error.util.js';
+import { displayError } from '../utils/output.util.js';
 export async function pullAction(options) {
     const credential = getCredential();
     if (!credential) {
-        log.error(NOT_LOGGED_IN_MESSAGE);
+        displayError(new CliError(AUTH_NOT_LOGGED_IN, getCliErrorMessageFromCode(AUTH_NOT_LOGGED_IN)), 'plain');
         process.exitCode = 1;
         return;
     }
     if (!options.diagramId) {
-        log.error('Missing required flag: --diagram-id');
+        displayError(new CliError(DIAGRAM_ID_MISSING, getCliErrorMessageFromCode(DIAGRAM_ID_MISSING)), 'plain');
         process.exitCode = 1;
         return;
     }
@@ -29,10 +30,6 @@ export async function pullAction(options) {
             if (diagram.vizData) {
                 const vizPath = deriveDiagramVizPathFromDBML(options.outFile);
                 const existingResult = await readDiagramVizFile(vizPath);
-                if (!existingResult.ok) {
-                    const message = getVizReadErrorMessage(existingResult.errorCode, vizPath);
-                    log.warn(message);
-                }
                 const state = fromServerFormat(diagram.vizData, existingResult.ok ? existingResult.state : undefined);
                 await writeDiagramVizFile(vizPath, state);
             }
@@ -46,13 +43,7 @@ export async function pullAction(options) {
     }
     catch (error) {
         s.stop('Failed to fetch diagram.');
-        if (isPortalApiError(error)) {
-            log.error(getPortalApiErrorMessage(error));
-        }
-        else {
-            const message = error instanceof Error ? error.message : String(error);
-            log.error(message);
-        }
+        displayError(toCliError(error), 'plain');
         process.exitCode = 1;
     }
 }