gitdog 0.2.1 → 0.2.2

package/README.md

@@ -17,7 +17,7 @@
 </p>
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/hyodotdev/gitdog-cli/main/.github/assets/terminal.svg?v=0.2.1" alt="Gitdog terminal: connect a project, configure automation and review pending actions" width="800">
+  <img src="https://raw.githubusercontent.com/hyodotdev/gitdog-cli/main/.github/assets/terminal.svg?v=0.2.2" alt="Gitdog terminal: connect a project, configure automation and review pending actions" width="800">
 </p>
 
 Connect repositories, configure issue, discussion and PR automation, review
@@ -64,7 +64,7 @@ Use `npx gitdog@latest --help` to explore commands. Add `--json` for scripts.
 
 ```sh
 npx gitdog@latest keys create --name ci
-npx --yes gitdog@0.2.1 --key-file /path/to/key.json projects list --json
+npx --yes gitdog@0.2.2 --key-file /path/to/key.json projects list --json
 npx gitdog@latest keys revoke KEY_ID --yes
 ```
 

package/dist/auth.d.ts

@@ -1,13 +1,17 @@
 import { SessionStore } from "./storage.js";
 import { type Ui } from "./ui.js";
 export declare const CALLBACK_PATH = "/gitdog/callback";
+export declare const LOGIN_RESULT_PATH = "/cli/login";
+type LoginOutcome = "success" | "failed";
 export declare function openBrowser(url: string, signal?: AbortSignal): Promise<boolean>;
-export declare function createLoginListener(timeoutMs?: number): Promise<{
+export declare function createLoginListener(timeoutMs?: number, siteUrl?: string): Promise<{
     redirectTo: string;
     signal: AbortSignal;
     code: Promise<string>;
+    complete: (outcome: LoginOutcome) => Promise<void>;
     close: () => Promise<void>;
 }>;
 export declare function validateAuthRedirect(value: string, apiUrl: string): void;
 export declare function login(apiUrl: string, siteUrl: string, ui: Ui, noBrowser?: boolean): Promise<void>;
 export declare function logout(ui: Ui, localOnly?: boolean, store?: SessionStore): Promise<void>;
+export {};

package/dist/auth.js

@@ -3,10 +3,23 @@ import { promisify } from "node:util";
 import { createServer } from "node:http";
 import { randomBytes } from "node:crypto";
 import { httpClient, invoke } from "./client.js";
-import { SessionStore, validTokens, tokenExpiresSoon } from "./storage.js";
+import { DEFAULT_API_URL, DEFAULT_AUTH_SITE_URL, DEFAULT_SITE_URL, SessionStore, validTokens, tokenExpiresSoon, } from "./storage.js";
 import { asRecord } from "./ui.js";
 const runFile = promisify(execFile);
 export const CALLBACK_PATH = "/gitdog/callback";
+export const LOGIN_RESULT_PATH = "/cli/login";
+function sendToLoginResult(response, siteUrl, outcome) {
+    if (response.destroyed)
+        return Promise.resolve();
+    const location = new URL(LOGIN_RESULT_PATH, siteUrl);
+    location.searchParams.set("status", outcome);
+    return new Promise((resolve) => {
+        response.once("close", resolve);
+        response
+            .writeHead(302, { Location: location.href, Connection: "close" })
+            .end();
+    });
+}
 export async function openBrowser(url, signal) {
     signal?.throwIfAborted();
     const parsed = new URL(url);
@@ -33,7 +46,7 @@ export async function openBrowser(url, signal) {
         return false;
     }
 }
-export async function createLoginListener(timeoutMs = 300_000) {
+export async function createLoginListener(timeoutMs = 300_000, siteUrl = DEFAULT_SITE_URL) {
     const cancellation = new AbortController();
     const state = randomBytes(32).toString("hex");
     let resolveCode;
@@ -45,6 +58,14 @@ export async function createLoginListener(timeoutMs = 300_000) {
     void code.catch(() => { });
     let expectedHost = "";
     let settled = false;
+    // Held open so the browser reports the real result, not just a received code.
+    let pendingResponse;
+    const complete = async (outcome) => {
+        const response = pendingResponse;
+        pendingResponse = undefined;
+        if (response)
+            await sendToLoginResult(response, siteUrl, outcome);
+    };
     const finish = (error, value) => {
         if (settled)
             return;
@@ -88,28 +109,19 @@ export async function createLoginListener(timeoutMs = 300_000) {
             response.writeHead(410).end("This sign-in has already completed.");
             return;
         }
-        if (url.searchParams.has("error")) {
-            response
-                .writeHead(400)
-                .end("Gitdog sign-in was not completed. Return to your terminal.");
+        if (url.searchParams.has("error") || !url.searchParams.has("code")) {
+            void sendToLoginResult(response, siteUrl, "failed");
             finish(new Error("GitHub sign-in was declined or failed."));
             return;
         }
         const value = url.searchParams.get("code");
-        if (!url.searchParams.has("code")) {
-            response
-                .writeHead(400)
-                .end("Gitdog sign-in was not completed. Return to your terminal.");
-            finish(new Error("GitHub sign-in was declined or failed."));
-            return;
-        }
         if (url.searchParams.getAll("code").length !== 1 ||
             !value ||
             value.length > 4096) {
             response.writeHead(400).end("Missing or invalid sign-in code.");
             return;
         }
-        response.end("Gitdog received your sign-in. Return to your terminal to finish. You can close this tab.");
+        pendingResponse = response;
         finish(undefined, value);
     });
     const timer = setTimeout(() => finish(new Error("Sign-in timed out. Run npx gitdog@latest login to try again.")), timeoutMs);
@@ -142,8 +154,10 @@ export async function createLoginListener(timeoutMs = 300_000) {
         redirectTo,
         signal: cancellation.signal,
         code,
+        complete,
         close: async () => {
             finish(new Error("Sign-in cancelled."));
+            await complete("failed");
             process.off("SIGINT", onInterrupt);
             server.closeAllConnections();
             await new Promise((resolve) => server.close(() => resolve()));
@@ -154,7 +168,10 @@ export function validateAuthRedirect(value, apiUrl) {
     const url = new URL(value);
     const api = new URL(apiUrl);
     const siteOrigin = api.origin.replace(/\.convex\.cloud$/, ".convex.site");
-    if (![api.origin, siteOrigin].includes(url.origin) ||
+    const allowedOrigins = [api.origin, siteOrigin];
+    if (api.origin === new URL(DEFAULT_API_URL).origin)
+        allowedOrigins.push(new URL(DEFAULT_AUTH_SITE_URL).origin);
+    if (!allowedOrigins.includes(url.origin) ||
         url.pathname !== "/api/auth/signin/github" ||
         url.username ||
         url.password ||
@@ -166,7 +183,7 @@ export async function login(apiUrl, siteUrl, ui, noBrowser = false) {
     if (ui.json)
         throw new Error("Browser login needs human interaction. Omit --json; use GITDOG_TOKEN for automation.");
     ui.banner();
-    const listener = await createLoginListener();
+    const listener = await createLoginListener(undefined, siteUrl);
     const client = httpClient(apiUrl, 30_000, listener.signal);
     try {
         ui.info("1 / 2  Sign in with your GitHub account");
@@ -207,6 +224,7 @@ export async function login(apiUrl, siteUrl, ui, noBrowser = false) {
         const store = new SessionStore();
         await store.locked(() => store.save({ ...tokens, apiUrl, siteUrl }, listener.signal), undefined, listener.signal);
         listener.signal.throwIfAborted();
+        await listener.complete("success");
         ui.output(`✓ Signed in as ${String(user.name ?? "GitHub user")}.`);
         if (user.requiresCurrentLegalAttestation)
             ui.info(`Complete account consent at ${siteUrl}/legal/consent before running AI workflows.`);

package/dist/storage.d.ts

@@ -1,5 +1,6 @@
 export declare const DEFAULT_API_URL = "https://calm-hippopotamus-56.convex.cloud";
 export declare const DEFAULT_SITE_URL = "https://gitdog.dev";
+export declare const DEFAULT_AUTH_SITE_URL = "https://auth.gitdog.dev";
 export type Tokens = {
     token: string;
     refreshToken: string;

package/dist/storage.js

@@ -5,6 +5,7 @@ import { randomUUID } from "node:crypto";
 import { asRecord } from "./ui.js";
 export const DEFAULT_API_URL = "https://calm-hippopotamus-56.convex.cloud";
 export const DEFAULT_SITE_URL = "https://gitdog.dev";
+export const DEFAULT_AUTH_SITE_URL = "https://auth.gitdog.dev";
 export function configDirectory() {
     return (process.env.GITDOG_CONFIG_DIR ||
         join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "gitdog"));

package/dist/ui.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "0.2.1";
+export declare const VERSION = "0.2.2";
 export declare const DOG: string;
 export declare function redactSecrets(value: string): string;
 export declare function clean(value: string): string;

package/dist/ui.js

@@ -1,6 +1,6 @@
 import { createInterface } from "node:readline/promises";
 import { stripVTControlCharacters } from "node:util";
-export const VERSION = "0.2.1";
+export const VERSION = "0.2.2";
 export const DOG = String.raw `
   ▗██▄▄                      ▄▄██▖
   ██▀▜██▙▄  ▙▄            ▄▟██▛▀██

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitdog",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Manage Gitdog projects, GitHub automation and API keys from your terminal",
   "type": "module",
   "bin": {