chapa-cli 0.1.2 → 0.2.0

package/README.md

@@ -4,44 +4,55 @@ Merge GitHub EMU (Enterprise Managed User) contributions into your [Chapa](https
 
 If your employer uses GitHub EMU accounts, your work contributions are invisible on your personal profile. This CLI fetches your EMU stats and uploads them to Chapa so your badge reflects your full impact.
 
-## Usage
+## Quick start
 
 ```bash
-npx chapa-cli merge \
-  --handle your-personal-handle \
-  --emu-handle your-emu-handle
+# 1. Authenticate with Chapa (opens browser)
+npx chapa-cli login
+
+# 2. Merge your EMU stats
+npx chapa-cli merge --emu-handle your-emu-handle
 ```
 
-## Options
+That's it! Your personal handle and auth token are auto-detected from the login step.
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `chapa login` | Authenticate via browser (like `npm login`) |
+| `chapa logout` | Clear stored credentials |
+| `chapa merge` | Fetch EMU stats and upload to Chapa |
+
+## Options (for merge)
 
 | Flag | Description | Required |
 |------|-------------|----------|
-| `--handle <handle>` | Your personal GitHub handle | Yes |
 | `--emu-handle <handle>` | Your EMU GitHub handle | Yes |
 | `--emu-token <token>` | EMU GitHub token | No* |
-| `--token <token>` | Personal GitHub token | No* |
+| `--handle <handle>` | Override personal handle | No |
+| `--token <token>` | Override auth token | No |
 | `--server <url>` | Chapa server URL | No |
 | `--version`, `-v` | Show version number | |
 | `--help`, `-h` | Show help message | |
 
-*Tokens are resolved in order: flag > environment variable > `gh auth token`.
+*EMU token is resolved from: flag > `GITHUB_EMU_TOKEN` env var.
 
-## Token setup
+## EMU token setup
 
-Set tokens via environment variables to avoid passing them on every run:
+You need one token from your EMU (work) GitHub account with `read:user` scope:
 
 ```bash
-export GITHUB_TOKEN=ghp_your_personal_token
 export GITHUB_EMU_TOKEN=ghp_your_emu_token
 ```
 
-Tokens need the `read:user` scope at minimum.
-
 ## How it works
 
-1. Fetches your last 90 days of activity from the EMU account via GitHub GraphQL API
-2. Uploads the stats (commits, PRs merged, reviews) to the Chapa server
-3. Your Chapa badge recalculates on next refresh, combining personal + EMU contributions
+1. `chapa login` opens your browser for OAuth authentication with Chapa
+2. After approval, a signed CLI token is saved to `~/.chapa/credentials.json`
+3. `chapa merge` fetches your last 12 months of EMU activity via GitHub GraphQL API
+4. Stats (commits, PRs merged, reviews) are uploaded to the Chapa server
+5. Your badge recalculates on next refresh, combining personal + EMU contributions
 
 ## License
 

package/dist/index.js

@@ -3,9 +3,10 @@
 // src/cli.ts
 import { parseArgs as nodeParseArgs } from "util";
 var DEFAULT_SERVER = "https://chapa.thecreativetoken.com";
+var VALID_COMMANDS = ["merge", "login", "logout"];
 function parseArgs(argv) {
-  const positional = argv.find((a) => !a.startsWith("--"));
-  const command = positional === "merge" ? "merge" : null;
+  const positional = argv.find((a) => !a.startsWith("--") && !a.startsWith("-"));
+  const command = VALID_COMMANDS.includes(positional) ? positional : null;
   const flagArgs = argv.filter((a) => a !== positional || a.startsWith("--"));
   const { values } = nodeParseArgs({
     args: flagArgs,
@@ -90,6 +91,9 @@ query($login: String!, $since: DateTime!, $until: DateTime!, $historySince: GitT
         }
       }
     }
+    ownedRepos: repositories(ownerAffiliations: OWNER, first: 100, orderBy: {field: STARGAZERS, direction: DESC}) {
+      nodes { stargazerCount forkCount watchers { totalCount } }
+    }
   }
 }
 `;
@@ -100,8 +104,12 @@ function computePrWeight(pr) {
   return Math.min(w, 3);
 }
 
+// ../shared/src/constants.ts
+var SCORING_WINDOW_DAYS = 365;
+var PR_WEIGHT_AGG_CAP = 120;
+
 // ../shared/src/stats-aggregation.ts
-function buildStats90dFromRaw(raw) {
+function buildStatsFromRaw(raw) {
   const heatmapData = [];
   for (const week of raw.contributionCalendar.weeks) {
     for (const day of week.contributionDays) {
@@ -114,7 +122,7 @@ function buildStats90dFromRaw(raw) {
   const prsMergedCount = mergedPRs.length;
   const prsMergedWeight = Math.min(
     mergedPRs.reduce((sum, pr) => sum + computePrWeight(pr), 0),
-    40
+    PR_WEIGHT_AGG_CAP
   );
   const linesAdded = mergedPRs.reduce((sum, pr) => sum + pr.additions, 0);
   const linesDeleted = mergedPRs.reduce((sum, pr) => sum + pr.deletions, 0);
@@ -129,6 +137,18 @@ function buildStats90dFromRaw(raw) {
   const topRepoShare = totalRepoCommits > 0 ? Math.max(...repoCommits.map((r) => r.commits)) / totalRepoCommits : 0;
   const maxDailyCount = Math.max(...heatmapData.map((d) => d.count), 0);
   const maxCommitsIn10Min = maxDailyCount >= 30 ? maxDailyCount : 0;
+  const totalStars = raw.ownedRepoStars.nodes.reduce(
+    (sum, r) => sum + r.stargazerCount,
+    0
+  );
+  const totalForks = raw.ownedRepoStars.nodes.reduce(
+    (sum, r) => sum + r.forkCount,
+    0
+  );
+  const totalWatchers = raw.ownedRepoStars.nodes.reduce(
+    (sum, r) => sum + r.watchers.totalCount,
+    0
+  );
   return {
     handle: raw.login,
     displayName: raw.name ?? void 0,
@@ -144,16 +164,19 @@ function buildStats90dFromRaw(raw) {
     reposContributed,
     topRepoShare,
     maxCommitsIn10Min,
+    totalStars,
+    totalForks,
+    totalWatchers,
     heatmapData,
     fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
 }
 
 // src/fetch-emu.ts
-async function fetchEmuStats(login, emuToken) {
+async function fetchEmuStats(login2, emuToken) {
   const now = /* @__PURE__ */ new Date();
   const since = new Date(now);
-  since.setDate(since.getDate() - 90);
+  since.setDate(since.getDate() - SCORING_WINDOW_DAYS);
   try {
     const res = await fetch("https://api.github.com/graphql", {
       method: "POST",
@@ -165,7 +188,7 @@ async function fetchEmuStats(login, emuToken) {
       body: JSON.stringify({
         query: CONTRIBUTION_QUERY,
         variables: {
-          login,
+          login: login2,
           since: since.toISOString(),
           until: now.toISOString(),
           historySince: since.toISOString(),
@@ -179,6 +202,9 @@ async function fetchEmuStats(login, emuToken) {
       return null;
     }
     const json = await res.json();
+    if (json.errors) {
+      console.error(`[cli] GraphQL errors for ${login2}:`, json.errors);
+    }
     if (!json.data?.user) return null;
     const user = json.data.user;
     const cc = user.contributionsCollection;
@@ -201,9 +227,12 @@ async function fetchEmuStats(login, emuToken) {
       repositories: {
         totalCount: user.repositories.totalCount,
         nodes: user.repositories.nodes
+      },
+      ownedRepoStars: {
+        nodes: (user.ownedRepos?.nodes ?? []).filter((n) => n != null).map((n) => ({ stargazerCount: n.stargazerCount, forkCount: n.forkCount, watchers: { totalCount: n.watchers.totalCount } }))
       }
     };
-    return buildStats90dFromRaw(raw);
+    return buildStatsFromRaw(raw);
   } catch (err) {
     console.error(`[cli] fetch error:`, err);
     return null;
@@ -243,20 +272,117 @@ async function uploadSupplementalStats(opts) {
   }
 }
 
+// src/config.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+import { join } from "path";
+import { homedir } from "os";
+function configDir() {
+  return join(homedir(), ".chapa");
+}
+function configPath() {
+  return join(configDir(), "credentials.json");
+}
+function loadConfig() {
+  const path = configPath();
+  if (!existsSync(path)) return null;
+  try {
+    const raw = readFileSync(path, "utf8");
+    const data = JSON.parse(raw);
+    if (data.token && data.handle && data.server) {
+      return data;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function saveConfig(config) {
+  const dir = configDir();
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { mode: 448, recursive: true });
+  }
+  writeFileSync(configPath(), JSON.stringify(config, null, 2) + "\n", {
+    mode: 384
+  });
+}
+function deleteConfig() {
+  const path = configPath();
+  if (!existsSync(path)) return false;
+  unlinkSync(path);
+  return true;
+}
+
+// src/login.ts
+import { randomUUID } from "crypto";
+import { exec } from "child_process";
+var POLL_INTERVAL_MS = 2e3;
+var MAX_POLL_ATTEMPTS = 150;
+function openBrowser(url) {
+  const cmd = process.platform === "win32" ? `start "" "${url}"` : process.platform === "darwin" ? `open "${url}"` : `xdg-open "${url}"`;
+  exec(cmd, () => {
+  });
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function login(serverUrl) {
+  const baseUrl = serverUrl.replace(/\/+$/, "");
+  const sessionId = randomUUID();
+  const authorizeUrl = `${baseUrl}/cli/authorize?session=${sessionId}`;
+  console.log("Opening browser for authentication...");
+  console.log(`If your browser didn't open, visit:
+  ${authorizeUrl}
+`);
+  openBrowser(authorizeUrl);
+  console.log("Waiting for approval...");
+  for (let i = 0; i < MAX_POLL_ATTEMPTS; i++) {
+    await sleep(POLL_INTERVAL_MS);
+    let data = null;
+    try {
+      const res = await fetch(
+        `${baseUrl}/api/cli/auth/poll?session=${sessionId}`
+      );
+      if (!res.ok) continue;
+      data = await res.json();
+    } catch {
+      continue;
+    }
+    if (data?.status === "approved" && data.token && data.handle) {
+      saveConfig({
+        token: data.token,
+        handle: data.handle,
+        server: baseUrl
+      });
+      console.log(`
+Logged in as ${data.handle}!`);
+      console.log("Credentials saved to ~/.chapa/credentials.json");
+      return;
+    }
+    if (data?.status === "expired") {
+      console.error("\nSession expired. Please try again.");
+      process.exit(1);
+    }
+  }
+  console.error("\nTimed out waiting for approval. Please try again.");
+  process.exit(1);
+}
+
 // src/index.ts
-var VERSION = true ? "0.1.2" : "0.0.0-dev";
+var VERSION = true ? "0.2.0" : "0.0.0-dev";
 var HELP_TEXT = `chapa-cli v${VERSION}
 
 Merge GitHub EMU (Enterprise Managed User) contributions into your Chapa badge.
 
-Usage:
-  chapa merge --handle <personal> --emu-handle <emu> [options]
+Commands:
+  chapa login                          Authenticate with Chapa (opens browser)
+  chapa logout                         Clear stored credentials
+  chapa merge --emu-handle <emu>       Merge EMU stats into your badge
 
 Options:
-  --handle <handle>       Your personal GitHub handle (required)
-  --emu-handle <handle>   Your EMU GitHub handle (required)
+  --emu-handle <handle>   Your EMU GitHub handle (required for merge)
   --emu-token <token>     EMU GitHub token (or set GITHUB_EMU_TOKEN)
-  --token <token>         Personal GitHub token (or set GITHUB_TOKEN)
+  --handle <handle>       Override personal handle (auto-detected from login)
+  --token <token>         Override auth token (auto-detected from login)
   --server <url>          Chapa server URL (default: https://chapa.thecreativetoken.com)
   --version, -v           Show version number
   --help, -h              Show this help message
@@ -271,25 +397,43 @@ async function main() {
     console.log(HELP_TEXT);
     process.exit(0);
   }
+  if (args.command === "login") {
+    await login(args.server);
+    return;
+  }
+  if (args.command === "logout") {
+    const removed = deleteConfig();
+    if (removed) {
+      console.log("Logged out. Credentials removed from ~/.chapa/credentials.json");
+    } else {
+      console.log("Not logged in (no credentials found).");
+    }
+    return;
+  }
   if (args.command !== "merge") {
-    console.error("Usage: chapa merge --handle <personal> --emu-handle <emu> [--emu-token <token>] [--token <token>] [--server <url>]");
+    console.error("Usage: chapa <login | logout | merge> [options]");
     console.error("\nRun 'chapa --help' for more information.");
     process.exit(1);
   }
-  const handle = args.handle;
+  const config = loadConfig();
+  const handle = args.handle ?? config?.handle;
   const emuHandle = args.emuHandle;
-  if (!handle || !emuHandle) {
-    console.error("Error: --handle and --emu-handle are required.");
+  if (!emuHandle) {
+    console.error("Error: --emu-handle is required.");
+    process.exit(1);
+  }
+  if (!handle) {
+    console.error("Error: No personal handle found. Run 'chapa login' first, or pass --handle.");
     process.exit(1);
   }
   const emuToken = resolveToken(args.emuToken, "GITHUB_EMU_TOKEN");
   if (!emuToken) {
-    console.error("Error: EMU token required. Use --emu-token, set GITHUB_EMU_TOKEN, or ensure `gh auth token` works.");
+    console.error("Error: EMU token required. Use --emu-token or set GITHUB_EMU_TOKEN.");
     process.exit(1);
   }
-  const personalToken = resolveToken(args.token, "GITHUB_TOKEN");
-  if (!personalToken) {
-    console.error("Error: Personal token required. Use --token, set GITHUB_TOKEN, or ensure `gh auth token` works.");
+  const authToken = args.token ?? config?.token;
+  if (!authToken) {
+    console.error("Error: Not authenticated. Run 'chapa login' first, or pass --token.");
     process.exit(1);
   }
   console.log(`Fetching stats for EMU account: ${emuHandle}...`);
@@ -299,13 +443,14 @@ async function main() {
     process.exit(1);
   }
   console.log(`Found: ${emuStats.commitsTotal} commits, ${emuStats.prsMergedCount} PRs merged, ${emuStats.reviewsSubmittedCount} reviews`);
-  console.log(`Uploading supplemental stats to ${args.server}...`);
+  const serverUrl = args.server !== "https://chapa.thecreativetoken.com" ? args.server : config?.server ?? args.server;
+  console.log(`Uploading supplemental stats to ${serverUrl}...`);
   const result = await uploadSupplementalStats({
     targetHandle: handle,
     sourceHandle: emuHandle,
     stats: emuStats,
-    token: personalToken,
-    serverUrl: args.server
+    token: authToken,
+    serverUrl
   });
   if (!result.success) {
     console.error(`Error: ${result.error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chapa-cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Merge GitHub EMU contributions into your Chapa developer impact badge",
   "type": "module",
   "bin": {