@gpdoc/cli 1.2.0 → 1.2.2

package/README.md

@@ -18,7 +18,7 @@ Conversions write to standard output or an explicit output path. Existing files
 
 ## Account and remote providers
 
-Use `gpdoc login` to begin GPDoc's device authorization flow, open the printed verification URL in a browser, and then run `gpdoc login complete`. `gpdoc whoami --json` reports the CLI session without including credentials. `gpdoc logout` clears only the local CLI credential file.
+Use `gpdoc login` to begin GPDoc's device authorization flow. It attempts to open your browser, waits for authorization, and writes the local CLI session before returning. If it cannot launch a browser, use the printed URL and code manually. Use `gpdoc login --no-browser` in a headless session. If you interrupt the command after completing browser authorization, run `gpdoc login complete` before the displayed expiry to finish saving the local session. `gpdoc whoami --json` reports the CLI session without including credentials. `gpdoc logout` clears only the local CLI credential file.
 
 For CI, set `GPDOC_ACCESS_TOKEN` instead of signing in interactively. The CLI does not persist that environment value. Interactive credentials are stored outside the current workspace with user-only permissions. Provider tokens are not shown in command output.
 

package/bin/gpdoc.js

@@ -27,7 +27,7 @@ class CliError extends Error {
 }
 
 function usage() {
-  return `Usage:\n  gpdoc new OUTPUT [--title TITLE] [--json]\n  gpdoc inspect INPUT [--json]\n  gpdoc validate INPUT [--json]\n  gpdoc convert INPUT --to gpdoc|markdown|html|text|json|docx|pdf [--output PATH | --in-place] [--json]\n  gpdoc edit INPUT [--json]\n  gpdoc login [complete] [--json]\n  gpdoc logout [--json]\n  gpdoc whoami [--json]\n  gpdoc google upload INPUT [--title TITLE] [--json]\n  gpdoc google update INPUT --drive-id ID --item-id ID --revision REVISION [--json]\n  gpdoc microsoft upload INPUT [--filename NAME] [--json]\n  gpdoc microsoft update INPUT --drive-id ID --item-id ID [--json]\n  gpdoc microsoft share --drive-id ID --item-id ID --role view|edit --scope anonymous|organization [--json]\n  gpdoc gist create INPUT [--private] [--description TEXT] [--json]\n  gpdoc gist update GIST_ID INPUT [--description TEXT] [--json]\n  gpdoc repo put OWNER/REPOSITORY INPUT --path REMOTE_PATH [--branch BRANCH] [--message TEXT] [--json]\n`;
+  return `Usage:\n  gpdoc new OUTPUT [--title TITLE] [--json]\n  gpdoc inspect INPUT [--json]\n  gpdoc validate INPUT [--json]\n  gpdoc convert INPUT --to gpdoc|markdown|html|text|json|docx|pdf [--output PATH | --in-place] [--json]\n  gpdoc edit INPUT [--json]\n  gpdoc login [complete] [--no-browser] [--json]\n  gpdoc logout [--json]\n  gpdoc whoami [--json]\n  gpdoc google upload INPUT [--title TITLE] [--json]\n  gpdoc google update INPUT --drive-id ID --item-id ID --revision REVISION [--json]\n  gpdoc microsoft upload INPUT [--filename NAME] [--json]\n  gpdoc microsoft update INPUT --drive-id ID --item-id ID [--json]\n  gpdoc microsoft share --drive-id ID --item-id ID --role view|edit --scope anonymous|organization [--json]\n  gpdoc gist create INPUT [--private] [--description TEXT] [--json]\n  gpdoc gist update GIST_ID INPUT [--description TEXT] [--json]\n  gpdoc repo put OWNER/REPOSITORY INPUT --path REMOTE_PATH [--branch BRANCH] [--message TEXT] [--json]\n`;
 }
 
 function parseArguments(argv) {
@@ -42,7 +42,7 @@ function parseArguments(argv) {
       continue;
     }
     const key = value.slice(2);
-    if (['json', 'in-place', 'private'].includes(key)) {
+    if (['json', 'in-place', 'private', 'no-browser'].includes(key)) {
       options[key] = true;
       continue;
     }
@@ -105,6 +105,29 @@ function printResult(result, json) {
   else process.stdout.write(`${Object.entries(result).map(([key, value]) => `${key}: ${value}`).join('\n')}\n`);
 }
 
+// @spec CLI-029
+function renderWhoami(status) {
+  const { identity, pending, ...fields } = status;
+  const lines = Object.entries(fields).map(([key, value]) => `${key}: ${value}`);
+  if (identity && typeof identity === 'object') {
+    const orderedClaims = ['email', 'name', 'nickname', 'sub'];
+    const claimEntries = [
+      ...orderedClaims.filter((key) => typeof identity[key] === 'string').map((key) => [key, identity[key]]),
+      ...Object.entries(identity).filter(([key, value]) => !orderedClaims.includes(key) && typeof value === 'string'),
+    ];
+    if (claimEntries.length) {
+      lines.push('identity:');
+      lines.push(...claimEntries.map(([key, value]) => `  ${key}: ${value}`));
+    } else {
+      lines.push('identity: unavailable');
+    }
+  } else if (identity === null) {
+    lines.push('identity: null');
+  }
+  if (pending) lines.push('pending: true');
+  return lines.join('\n');
+}
+
 function printError(error, json) {
   const result = { error: error.code || 'ERROR', message: error.message || String(error) };
   if (json) process.stderr.write(`${JSON.stringify(result)}\n`);
@@ -119,6 +142,47 @@ function launchEditor(editor, target) {
   });
 }
 
+function delay(milliseconds) {
+  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+
+// The device flow does not send a callback to the local terminal. The foreground
+// CLI process opens the provider page, then polls the token endpoint itself.
+export async function openBrowser(url, { platform = process.platform, spawnImpl = spawn } = {}) {
+  const command = platform === 'darwin'
+    ? ['open', [url]]
+    : platform === 'win32'
+      ? ['cmd', ['/c', 'start', '', url]]
+      : ['xdg-open', [url]];
+  try {
+    return await new Promise((resolve) => {
+      let settled = false;
+      const complete = (opened) => {
+        if (settled) return;
+        settled = true;
+        resolve(opened);
+      };
+      const child = spawnImpl(command[0], command[1], { detached: true, stdio: 'ignore', windowsHide: true });
+      child.once('error', () => complete(false));
+      child.once('spawn', () => {
+        child.unref?.();
+        complete(true);
+      });
+    });
+  } catch {
+    return false;
+  }
+}
+
+async function waitForDeviceAuthorization(auth, sleep = delay) {
+  for (;;) {
+    const result = await auth.complete();
+    if (result.status !== 'pending') return result;
+    const retryAfterSeconds = Math.max(1, Number(result.retryAfterSeconds || 1));
+    await sleep(retryAfterSeconds * 1000);
+  }
+}
+
 function requireOption(options, key, message) {
   if (!options[key]) throw new CliError('USAGE', message || `--${key} is required.`);
   return options[key];
@@ -139,7 +203,7 @@ function renderRemote(result, json) {
   return printResult(result, false);
 }
 
-// @spec CLI-001, CLI-002, CLI-003, CLI-004, CLI-005, CLI-006, CLI-007, CLI-008, CLI-009, CLI-014, CLI-015, CLI-016, CLI-017, CLI-018, CLI-019, CLI-020, CLI-021, CLI-022, CLI-023, CLI-024, CLI-025
+// @spec CLI-001, CLI-002, CLI-003, CLI-004, CLI-005, CLI-006, CLI-007, CLI-008, CLI-009, CLI-014, CLI-015, CLI-016, CLI-017, CLI-018, CLI-019, CLI-020, CLI-021, CLI-022, CLI-023, CLI-024, CLI-025, CLI-028
 export async function run(argv, runtime = {}) {
   const parsed = parseArguments(argv);
   if (parsed.command === 'help') {
@@ -154,8 +218,22 @@ export async function run(argv, runtime = {}) {
   const remote = runtime.remote || createRemoteClient({ auth, env: runtime.env || process.env, fetchImpl: runtime.fetchImpl || globalThis.fetch });
 
   if (parsed.command === 'login') {
-    const result = parsed.positionals[0] === 'complete' ? await auth.complete() : await auth.start();
-    printResult(result, parsed.options.json);
+    if (parsed.positionals[0] === 'complete') {
+      printResult(await auth.complete(), parsed.options.json);
+      return;
+    }
+    const started = await auth.start();
+    const verificationUrl = started.verificationUriComplete || started.verificationUri;
+    const browserOpened = parsed.options['no-browser']
+      ? false
+      : await (runtime.openBrowser || openBrowser)(verificationUrl);
+    if (!parsed.options.json) {
+      printResult(started, false);
+      if (browserOpened) process.stdout.write('Opened your browser. Complete sign-in there; GPDoc will finish this command automatically.\n');
+      else process.stdout.write(`Open ${verificationUrl} in a browser, then return here. GPDoc is waiting for authorization.\n`);
+    }
+    const completed = await waitForDeviceAuthorization(auth, runtime.sleep || delay);
+    printResult({ ...started, browserOpened, ...completed }, parsed.options.json);
     return;
   }
   if (parsed.command === 'logout') {
@@ -163,7 +241,8 @@ export async function run(argv, runtime = {}) {
     return;
   }
   if (parsed.command === 'whoami') {
-    printResult(await auth.status(), parsed.options.json);
+    const status = await auth.status();
+    printResult(parsed.options.json ? status : renderWhoami(status), parsed.options.json);
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpdoc/cli",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "type": "module",
   "description": "GPDoc command-line file conversion and validation tools",
   "repository": "https://github.com/repetere/gpdoc.git",