@mondaydotcomorg/z2h-cli 0.11.5 → 0.12.0

package/dist/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C7F"}

package/dist/commands/create-workspace.js

@@ -22,7 +22,11 @@ async function createWorkspaceCommand(opts = {}) {
     if (await fs.pathExists(home)) {
         const entries = await fs.readdir(home);
         if (entries.length > 0) {
-            throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+            util_logger.output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+                ok: true,
+                workspace: home,
+            });
+            return;
         }
     }
     else {

package/dist/commands/dev.d.ts

@@ -1,5 +1,6 @@
 export interface DevOptions {
     json?: boolean;
+    open?: boolean;
 }
 export declare function devCommand(opts?: DevOptions): Promise<void>;
 //# sourceMappingURL=dev.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAKD,wBAAsB,UAAU,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ErE"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAKD,wBAAsB,UAAU,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ErE"}

package/dist/commands/dev.js

@@ -9,6 +9,7 @@ const util_logger = require('../util/logger.js');
 const shadow_prepare = require('../shadow/prepare.js');
 const shadow_consumerPkg = require('../shadow/consumer-pkg.js');
 const shadow_sync = require('../shadow/sync.js');
+const util_openBrowser = require('../util/open-browser.js');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
@@ -68,6 +69,9 @@ async function devCommand(opts = {}) {
                 port,
                 url,
             });
+            if (opts.open) {
+                void util_openBrowser.openInBrowser(url);
+            }
         }
     });
     // Only watch consumer package.json. Source changes flow through Vite's

package/dist/commands/generate-z2h-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAuED,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B/F"}
+{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAwDD,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B/F"}

package/dist/commands/generate-z2h-token.js

@@ -2,10 +2,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const readline = require('node:readline/promises');
 const node_process = require('node:process');
-const execa = require('execa');
 const util_logger = require('../util/logger.js');
 const util_auth_writeAuth = require('../util/auth/write-auth.js');
 const util_auth_loopbackServer = require('../util/auth/loopback-server.js');
+const util_openBrowser = require('../util/open-browser.js');
 
 const _interopDefault = e => e && e.__esModule ? e : { default: e };
 
@@ -13,19 +13,6 @@ const readline__default = /*#__PURE__*/_interopDefault(readline);
 
 const DEFAULT_TOKEN_PAGE_URL = 'https://bigbrain.me/bigbrain-vibe/generate-z2h-token';
 const LOOPBACK_TIMEOUT_MS = 120_000;
-function browserOpenCommand() {
-    switch (process.platform) {
-        case 'darwin':
-            return 'open';
-        case 'win32':
-            return 'start';
-        default:
-            return 'xdg-open';
-    }
-}
-async function openInBrowser(url) {
-    await execa.execa(browserOpenCommand(), [url], { stdio: 'ignore' });
-}
 async function promptForToken() {
     const rl = readline__default.default.createInterface({ input: node_process.stdin, output: node_process.stdout });
     try {
@@ -58,7 +45,7 @@ async function runLoopbackFlow(pageUrl) {
     util_logger.info('opening your browser to mint a Z2H deploy token');
     util_logger.info(`  ${fullUrl}`);
     try {
-        await openInBrowser(fullUrl);
+        await util_openBrowser.openInBrowser(fullUrl);
     }
     catch {
         util_logger.warn('could not auto-open the browser. please visit the URL above manually.');

package/dist/esm/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C7F"}

package/dist/esm/commands/create-workspace.mjs

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { pathExists, readdir, ensureDir, writeFile, copy } from 'fs-extra';
-import { setOutputMode, info, output } from '../util/logger.mjs';
+import { setOutputMode, output, info } from '../util/logger.mjs';
 import { getWorkspaceHome } from '../util/workspace.mjs';
 import { getTemplatesDir } from '../util/templates.mjs';
 import { runYarnInstall } from '../util/npm/install.mjs';
@@ -16,7 +16,11 @@ async function createWorkspaceCommand(opts = {}) {
     if (await pathExists(home)) {
         const entries = await readdir(home);
         if (entries.length > 0) {
-            throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+            output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+                ok: true,
+                workspace: home,
+            });
+            return;
         }
     }
     else {

package/dist/esm/commands/dev.d.ts

@@ -1,5 +1,6 @@
 export interface DevOptions {
     json?: boolean;
+    open?: boolean;
 }
 export declare function devCommand(opts?: DevOptions): Promise<void>;
 //# sourceMappingURL=dev.d.ts.map

package/dist/esm/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAKD,wBAAsB,UAAU,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ErE"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAKD,wBAAsB,UAAU,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ErE"}

package/dist/esm/commands/dev.mjs

@@ -7,6 +7,7 @@ import { setOutputMode, info, output, warn, errorLog } from '../util/logger.mjs'
 import { prepareShadow } from '../shadow/prepare.mjs';
 import { ensureConsumerPkg } from '../shadow/consumer-pkg.mjs';
 import { syncShadow } from '../shadow/sync.mjs';
+import { openInBrowser } from '../util/open-browser.mjs';
 
 const TRIDENT_READY_PATTERN = /Server started at/i;
 // Should be run from the consumer app directory — uses process.cwd() to locate it.
@@ -61,6 +62,9 @@ async function devCommand(opts = {}) {
                 port,
                 url,
             });
+            if (opts.open) {
+                void openInBrowser(url);
+            }
         }
     });
     // Only watch consumer package.json. Source changes flow through Vite's

package/dist/esm/commands/generate-z2h-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAuED,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B/F"}
+{"version":3,"file":"generate-z2h-token.d.ts","sourceRoot":"","sources":["../../../src/commands/generate-z2h-token.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,sBAAsB,yDAAyD,CAAC;AAC7F,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,MAAM,WAAW,uBAAuB;IACtC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+DAA+D;IAC/D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAwDD,wBAAsB,uBAAuB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CA+B/F"}

package/dist/esm/commands/generate-z2h-token.mjs

@@ -1,25 +1,12 @@
 import readline from 'node:readline/promises';
 import { stdin, stdout } from 'node:process';
-import { execa } from 'execa';
 import { setOutputMode, warn, output, info } from '../util/logger.mjs';
 import { validateJwtPattern, writeZthAuth } from '../util/auth/write-auth.mjs';
 import { startLoopbackServer } from '../util/auth/loopback-server.mjs';
+import { openInBrowser } from '../util/open-browser.mjs';
 
 const DEFAULT_TOKEN_PAGE_URL = 'https://bigbrain.me/bigbrain-vibe/generate-z2h-token';
 const LOOPBACK_TIMEOUT_MS = 120_000;
-function browserOpenCommand() {
-    switch (process.platform) {
-        case 'darwin':
-            return 'open';
-        case 'win32':
-            return 'start';
-        default:
-            return 'xdg-open';
-    }
-}
-async function openInBrowser(url) {
-    await execa(browserOpenCommand(), [url], { stdio: 'ignore' });
-}
 async function promptForToken() {
     const rl = readline.createInterface({ input: stdin, output: stdout });
     try {

package/dist/esm/index.mjs

@@ -70,6 +70,7 @@ async function main() {
     program
         .command('dev')
         .description('Start the Trident dev server against .zth/ with native Vite HMR')
+        .option('--open', 'open the browser automatically when the dev server is ready')
         .option('--json', 'emit structured JSON on stdout')
         .action(async (opts) => {
         try {
@@ -232,5 +233,8 @@ void main()
     process.exit(0);
 })
     .catch(async (err) => {
-    await fail(`main failed: ${err.message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+        command: 'cli-main',
+    });
 });

package/dist/esm/util/git/repo.mjs

@@ -81,7 +81,7 @@ async function pullAndResolve(dir, env) {
         }
         await safeBackupIfDirty(dir);
         const info = await gatherConflictInfo(dir, gitEnv);
-        throw new GitConflictError(JSON.stringify(info));
+        throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
 }
 /**
@@ -109,7 +109,7 @@ async function pushToRemote(dir, env) {
         }
         if (isRejected) {
             const info = await gatherConflictInfo(dir, gitEnv);
-            throw new GitConflictError(JSON.stringify(info));
+            throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
         }
         throw err;
     }

package/dist/esm/util/open-browser.d.ts

@@ -0,0 +1,2 @@
+export declare function openInBrowser(url: string): Promise<void>;
+//# sourceMappingURL=open-browser.d.ts.map

package/dist/esm/util/open-browser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../../src/util/open-browser.ts"],"names":[],"mappings":"AAcA,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D"}

package/dist/esm/util/open-browser.mjs

@@ -0,0 +1,20 @@
+import { execa } from 'execa';
+import { errorLog } from './logger.mjs';
+
+function browserOpenCommand() {
+    switch (process.platform) {
+        case 'darwin':
+            return 'open';
+        case 'win32':
+            return 'start';
+        default:
+            return 'xdg-open';
+    }
+}
+async function openInBrowser(url) {
+    await execa(browserOpenCommand(), [url], { stdio: 'ignore' }).catch(() => {
+        errorLog(`Failed to open browser for ${url}, open it manually.`);
+    });
+}
+
+export { openInBrowser };

package/dist/index.js

@@ -76,6 +76,7 @@ async function main() {
     program
         .command('dev')
         .description('Start the Trident dev server against .zth/ with native Vite HMR')
+        .option('--open', 'open the browser automatically when the dev server is ready')
         .option('--json', 'emit structured JSON on stdout')
         .action(async (opts) => {
         try {
@@ -238,5 +239,8 @@ void main()
     process.exit(0);
 })
     .catch(async (err) => {
-    await util_logger.fail(`main failed: ${err.message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await util_logger.fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+        command: 'cli-main',
+    });
 });

package/dist/util/git/repo.js

@@ -88,7 +88,7 @@ async function pullAndResolve(dir, env) {
         }
         await safeBackupIfDirty(dir);
         const info = await gatherConflictInfo(dir, gitEnv);
-        throw new GitConflictError(JSON.stringify(info));
+        throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
 }
 /**
@@ -116,7 +116,7 @@ async function pushToRemote(dir, env) {
         }
         if (isRejected) {
             const info = await gatherConflictInfo(dir, gitEnv);
-            throw new GitConflictError(JSON.stringify(info));
+            throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
         }
         throw err;
     }

package/dist/util/open-browser.d.ts

@@ -0,0 +1,2 @@
+export declare function openInBrowser(url: string): Promise<void>;
+//# sourceMappingURL=open-browser.d.ts.map

package/dist/util/open-browser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../src/util/open-browser.ts"],"names":[],"mappings":"AAcA,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D"}

package/dist/util/open-browser.js

@@ -0,0 +1,22 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const execa = require('execa');
+const util_logger = require('./logger.js');
+
+function browserOpenCommand() {
+    switch (process.platform) {
+        case 'darwin':
+            return 'open';
+        case 'win32':
+            return 'start';
+        default:
+            return 'xdg-open';
+    }
+}
+async function openInBrowser(url) {
+    await execa.execa(browserOpenCommand(), [url], { stdio: 'ignore' }).catch(() => {
+        util_logger.errorLog(`Failed to open browser for ${url}, open it manually.`);
+    });
+}
+
+exports.openInBrowser = openInBrowser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.11.5",
+  "version": "0.12.0",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/commands/__tests__/create-workspace.test.ts

@@ -51,11 +51,11 @@ describe('create-workspace', () => {
     expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
   });
 
-  it('refuses if the target dir is non-empty', async () => {
+  it('skips gracefully if the target dir is non-empty', async () => {
     await ensureDir(tmp);
     await writeJson(path.join(tmp, 'somefile.json'), { hello: 'world' });
 
-    await expect(createWorkspaceCommand()).rejects.toThrow(/Workspace already exists/);
+    await expect(createWorkspaceCommand()).resolves.toBeUndefined();
     expect(runYarnInstall).not.toHaveBeenCalled();
   });
 

package/src/commands/create-workspace.ts

@@ -22,7 +22,11 @@ export async function createWorkspaceCommand(opts: CreateWorkspaceOptions = {}):
   if (await pathExists(home)) {
     const entries = await readdir(home);
     if (entries.length > 0) {
-      throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+      output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+        ok: true,
+        workspace: home,
+      });
+      return;
     }
   } else {
     await ensureDir(home);

package/src/commands/dev.ts

@@ -7,10 +7,12 @@ import { info, warn, errorLog, output, setOutputMode } from '../util/logger';
 import { prepareShadow } from '../shadow/prepare';
 import { ensureConsumerPkg } from '../shadow/consumer-pkg';
 import { syncShadow } from '../shadow/sync';
+import { openInBrowser } from '../util/open-browser';
 import type { ConsumerPkg } from '../types';
 
 export interface DevOptions {
   json?: boolean;
+  open?: boolean;
 }
 
 const TRIDENT_READY_PATTERN = /Server started at/i;
@@ -71,6 +73,9 @@ export async function devCommand(opts: DevOptions = {}): Promise<void> {
         port,
         url,
       });
+      if (opts.open) {
+        void openInBrowser(url);
+      }
     }
   });
 

package/src/commands/generate-z2h-token.ts

@@ -1,9 +1,9 @@
 import readline from 'node:readline/promises';
 import { stdin, stdout } from 'node:process';
-import { execa } from 'execa';
 import { info, warn, output, setOutputMode } from '../util/logger';
 import { writeZthAuth, validateJwtPattern } from '../util/auth/write-auth';
 import { startLoopbackServer } from '../util/auth/loopback-server';
+import { openInBrowser } from '../util/open-browser';
 
 export const DEFAULT_TOKEN_PAGE_URL = 'https://bigbrain.me/bigbrain-vibe/generate-z2h-token';
 export const LOOPBACK_TIMEOUT_MS = 120_000;
@@ -21,21 +21,6 @@ export interface GenerateZ2HTokenOptions {
   json?: boolean;
 }
 
-function browserOpenCommand(): string {
-  switch (process.platform) {
-    case 'darwin':
-      return 'open';
-    case 'win32':
-      return 'start';
-    default:
-      return 'xdg-open';
-  }
-}
-
-async function openInBrowser(url: string): Promise<void> {
-  await execa(browserOpenCommand(), [url], { stdio: 'ignore' });
-}
-
 async function promptForToken(): Promise<string> {
   const rl = readline.createInterface({ input: stdin, output: stdout });
   try {

package/src/index.ts

@@ -78,8 +78,9 @@ async function main(): Promise<void> {
   program
     .command('dev')
     .description('Start the Trident dev server against .zth/ with native Vite HMR')
+    .option('--open', 'open the browser automatically when the dev server is ready')
     .option('--json', 'emit structured JSON on stdout')
-    .action(async (opts: { json?: boolean }) => {
+    .action(async (opts: { open?: boolean; json?: boolean }) => {
       try {
         await devCommand(opts);
       } catch (err) {
@@ -258,5 +259,8 @@ void main()
     process.exit(0);
   })
   .catch(async (err: unknown) => {
-    await fail(`main failed: ${(err as Error).message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+      command: 'cli-main',
+    });
   });

package/src/util/git/__tests__/repo.test.ts

@@ -196,7 +196,7 @@ describe('pullAndResolve', () => {
     const err = await pullAndResolve(DIR).catch(e => e);
 
     expect(err).toBeInstanceOf(GitConflictError);
-    const info = JSON.parse(err.message);
+    const info = JSON.parse(err.message.split('Git conflict detected: ')[1]);
     expect(info.localCommits).toEqual(['abc local commit']);
     expect(info.remoteCommits).toEqual(['def remote commit']);
     expect(info.conflictingFiles).toEqual(['src/index.ts']);
@@ -225,7 +225,7 @@ describe('pushToRemote', () => {
     const err = await pushToRemote(DIR).catch(e => e);
 
     expect(err).toBeInstanceOf(GitConflictError);
-    const info = JSON.parse(err.message);
+    const info = JSON.parse(err.message.split('Git conflict detected: ')[1]);
     expect(info.localCommits).toEqual(['abc local']);
     expect(info.remoteCommits).toEqual(['def remote']);
     expect(info.conflictingFiles).toEqual(['file.ts']);

package/src/util/git/repo.ts

@@ -97,7 +97,7 @@ export async function pullAndResolve(dir: string, env?: Record<string, string>):
     }
     await safeBackupIfDirty(dir);
     const info = await gatherConflictInfo(dir, gitEnv);
-    throw new GitConflictError(JSON.stringify(info));
+    throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
   }
 }
 
@@ -125,7 +125,7 @@ export async function pushToRemote(dir: string, env?: Record<string, string>): P
     }
     if (isRejected) {
       const info = await gatherConflictInfo(dir, gitEnv);
-      throw new GitConflictError(JSON.stringify(info));
+      throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
     throw err;
   }

package/src/util/open-browser.ts

@@ -0,0 +1,19 @@
+import { execa } from 'execa';
+import { errorLog } from './logger';
+
+function browserOpenCommand(): string {
+  switch (process.platform) {
+    case 'darwin':
+      return 'open';
+    case 'win32':
+      return 'start';
+    default:
+      return 'xdg-open';
+  }
+}
+
+export async function openInBrowser(url: string): Promise<void> {
+  await execa(browserOpenCommand(), [url], { stdio: 'ignore' }).catch(() => {
+    errorLog(`Failed to open browser for ${url}, open it manually.`);
+  });
+}