@porte/cli 0.1.3 → 0.1.5

package/dist/main.js

@@ -11,7 +11,7 @@ setLogSink((_level, line) => {
 });
 const verbose = process.argv.includes("--verbose") || process.argv.includes("-v");
 process.env.LOG_LEVEL ??= verbose ? "DEBUG" : "WARN";
-const { run } = await import("./run-cli-CEPB1b8j.js");
+const { run } = await import("./run-cli-cm8fOj7d.js");
 const code = await run(process.argv.slice(2), {
 	stdout: process.stdout,
 	stderr: process.stderr,

package/dist/{run-cli-CEPB1b8j.js → run-cli-cm8fOj7d.js}

@@ -168,7 +168,7 @@ var WebSocketHandlerError = class extends h("WebSocketHandlerError") {
 //#endregion
 //#region src/entrypoints/cli/version.ts
 /** Package version. Source is `package.json`. */
-const VERSION = "0.1.3";
+const VERSION = "0.1.5";
 //#endregion
 //#region src/entrypoints/cli/cli-error.ts
 /** Bad arguments or missing required flags. */
@@ -373,9 +373,11 @@ async function pairHost(input) {
 async function waitForApproval(input, grant) {
 	const deadline = input.now() + grant.expiresInSeconds * 1e3;
 	let intervalSeconds = grant.intervalSeconds;
+	let attempt = 0;
 	while (input.now() < deadline) {
 		await input.sleep(intervalSeconds * 1e3);
 		const answer = await input.authorizer.poll(grant.deviceCode);
+		attempt += 1;
 		if (answer.status === "granted") return {
 			status: "paired",
 			token: answer.token
@@ -383,6 +385,10 @@ async function waitForApproval(input, grant) {
 		if (answer.status === "denied") return { status: "denied" };
 		if (answer.status === "expired") return { status: "expired" };
 		if (answer.status === "slow-down") intervalSeconds += answer.intervalSeconds;
+		input.onPoll?.({
+			attempt,
+			intervalSeconds
+		});
 	}
 	return { status: "expired" };
 }
@@ -717,20 +723,26 @@ async function runPairCommand(input) {
 	const { code, url, quiet, strong, ok } = output.emphasis;
 	const interactive = process.stdin.isTTY;
 	let stopWatching;
+	let showingWait = false;
+	let lastPoll;
+	const waiting = (poll) => quiet(poll === void 0 ? `Waiting for approval — checking with Porte…  ${WAITING_EMOJI}` : `Waiting for approval — checking with Porte every ${String(poll.intervalSeconds)}s (${String(poll.attempt)} so far)  ${WAITING_EMOJI}`);
 	const paired = await pairHost({
 		authorizer: resources.authorizer,
 		credentials: resources.credentials,
 		baseUrl: input.config.baseUrl,
 		host: describeThisMachine(),
+		onPoll: (poll) => {
+			lastPoll = poll;
+			if (showingWait) output.status(waiting(poll));
+		},
 		onPrompt: (prompt) => {
 			const shown = formatPairingCode(prompt.userCode);
-			const waiting = `Waiting for approval — the code expires in ${String(Math.round(prompt.expiresInSeconds / 60))} minutes.  ${WAITING_EMOJI}`;
 			output.title("Pair this machine with Porte", PAIR_EMOJI);
 			if (!interactive) {
 				output.raw(`First copy your pairing code:  ${code(shown)}`);
 				output.raw(`Then open ${url(prompt.verificationUri)} in your browser.`);
 				output.blank();
-				output.raw(quiet(waiting));
+				output.raw(waiting(void 0));
 				return;
 			}
 			const codeLine = (hint) => `First copy your pairing code:  ${code(shown)}   ${hint}`;
@@ -742,7 +754,8 @@ async function runPairCommand(input) {
 					stopWatching?.();
 					output.blank();
 					output.blank();
-					output.raw(quiet(waiting));
+					showingWait = true;
+					output.status(waiting(lastPoll));
 					openUrl(prompt.verificationUri);
 					return;
 				}
@@ -4186,17 +4199,23 @@ async function run(argv, io) {
 		return reportUnexpectedCliError(io.stderr, cause);
 	}
 }
+/** What a bug report needs: version, runtime, platform, and which relay this machine is paired with. */
+async function versionReport(config) {
+	const stored = await createPairingResources(config).credentials.read();
+	const pairing = stored === null ? "not paired" : `paired with ${new URL(stored.baseUrl).host}`;
+	return [`porte ${VERSION} · node ${process.versions.node} · ${process.platform} ${process.arch}`, pairing].join("\n");
+}
 async function dispatch(argv, io) {
 	const command = parseCommand(argv);
 	if (command.kind === "help") {
 		io.stdout.write(`${command.text}\n`);
 		return 0;
 	}
+	const config = loadConfig(io.env);
 	if (command.kind === "version") {
-		io.stdout.write(`${VERSION}\n`);
+		io.stdout.write(`${await versionReport(config)}\n`);
 		return 0;
 	}
-	const config = loadConfig(io.env);
 	if (command.kind === "up") {
 		await runUpCommand({
 			config,

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@porte/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Run your local Grok sessions from your phone. The daemon that pairs a machine with useporte.dev.",
   "keywords": [
     "acp",