codetime-cli 0.4.0 → 0.5.0

package/bin/codetime.mjs

@@ -973,7 +973,7 @@ import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
 import path2 from "node:path";
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.4.0" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.5.0" : "0.1.1";
 var DEFAULT_API_URL = "https://codetime.dev";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -4578,6 +4578,40 @@ async function logError(scope, error, meta = {}, home = homedir2()) {
   await writeLog({ scope, error, meta, level: "error" }, home);
 }
 
+// src/lib/login.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function openBrowser(ctx, url) {
+  const { command, args } = browserCommand(ctx.env.CODETIME_OS ?? process.platform, url);
+  try {
+    const child = ctx.spawn(command, args, { detached: true, stdio: "ignore" });
+    child.unref?.();
+  } catch {
+  }
+}
+function browserCommand(platform, url) {
+  if (platform === "darwin") {
+    return { command: "open", args: [url] };
+  }
+  if (platform === "win32") {
+    return { command: "cmd", args: ["/c", "start", "", url] };
+  }
+  return { command: "xdg-open", args: [url] };
+}
+function isHeadless(ctx) {
+  if (ctx.env.CODETIME_NO_BROWSER) {
+    return true;
+  }
+  if (ctx.env.SSH_CONNECTION || ctx.env.SSH_TTY) {
+    return true;
+  }
+  if (process.platform === "linux") {
+    return !ctx.env.DISPLAY && !ctx.env.WAYLAND_DISPLAY;
+  }
+  return false;
+}
+
 // src/lib/progress.ts
 var BAR_WIDTH = 24;
 var ProgressBar = class {
@@ -4737,6 +4771,28 @@ async function deleteRollupsBySource(remote, source, machine) {
   const body = await response.json();
   return Number(body.deleted) || 0;
 }
+async function startCliLink(remote) {
+  const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/agent/cli/link/start"), {
+    method: "POST",
+    headers: buildHeaders(),
+    body: "{}"
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to start login: ${response.status}`);
+  }
+  return await response.json();
+}
+async function pollCliLink(remote, deviceCode) {
+  const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/agent/cli/link/poll"), {
+    method: "POST",
+    headers: buildHeaders(),
+    body: JSON.stringify({ deviceCode })
+  });
+  if (!response.ok) {
+    throw new Error(`Login poll failed: ${response.status}`);
+  }
+  return await response.json();
+}
 async function listMachines(remote) {
   const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/machines"), {
     headers: buildHeaders(remote.token)
@@ -4843,6 +4899,11 @@ function createCli(ctx, registry) {
   cli.command("sync-local-trigger", "Trigger one background local sync with throttle and locking").option("--min-interval <seconds>", "Minimum seconds between sync triggers").action((options) => syncLocalTriggerCommand(normalizeOptions(options), ctx, registry));
   cli.command("sync-local-runner", "Internal background local sync runner").option("--lock-file <path>", "Lock file for the active sync").option("--state-file <path>", "State file for trigger metadata").action((options) => syncLocalRunnerCommand(normalizeOptions(options), ctx, registry));
   cli.command("backfill [action]", "Inspect local history import candidates").option("--source <source>", "Backfill source").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--source-root <path>", "Override source history root").option("--include-source-path", "Include local source paths in output").option("--import-run <id>", "Import run id for verify/resume workflows").option("--limit <count>", "Maximum session files to parse").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--batch-bytes <bytes>", "Soft byte cap for the JSON body of a single ingest POST").option("--replace", "Replace conflicting records during import (default)").option("--skip-conflicts", "Skip conflicting records instead of replacing them").option("--force", "Force full re-import: clear watermark and re-process all files").action((action, options) => backfillCommand({ ...normalizeOptions(options), action }, ctx, registry));
+  cli.command("sync", "Import and upload all local agent history (shorthand for `backfill import --source all`)").option("--source <source>", "Limit to one source (default: all)").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--force", "Force full re-import: clear watermark and re-process all files").option("--dry-run", "Print the planned import without uploading").action((options) => {
+    const opts = normalizeOptions(options);
+    return backfillCommand({ ...opts, action: "import", source: stringOption(opts.source) || "all" }, ctx, registry);
+  });
+  cli.command("login", "Authorize this machine by signing in through your browser").option("--remote <url>", "Override API base URL for this login").option("--no-browser", "Print the login URL instead of opening a browser").action((options) => loginCommand(normalizeOptions(options), ctx));
   cli.command("token [action] [value]", "Set, show, or clear the persisted API token").option("--remote <url>", "Override API base URL when setting a token").action((action, value, options) => tokenCommand(action, value, normalizeOptions(options), ctx));
   cli.command("machine [action]", "List or rename machines (requires login)").option("--name <name>", "New display name (used by `machine rename`)").option("--id <id>", "Machine id (defaults to current machine)").action((action, options) => machineCommand(action, normalizeOptions(options), ctx));
   return cli;
@@ -5716,6 +5777,80 @@ function maskToken(token) {
   }
   return `${token.slice(0, 3)}\u2026${token.slice(-4)}`;
 }
+var LOGIN_MAX_WAIT_MS = 15 * 60 * 1e3;
+async function loginCommand(options, ctx) {
+  const home = resolveHome(options, ctx);
+  const remoteOverride = stringOption(options.remote) || stringOption(options["api-url"]);
+  const existing = readConfig(home);
+  const baseUrl = (remoteOverride || ctx.env.CODETIME_API_URL || existing.remoteUrl || DEFAULT_API_URL).replace(/\/$/, "");
+  const remote = resolveRemote({
+    apiUrl: baseUrl,
+    env: ctx.env,
+    fetch: ctx.fetch,
+    homeOverride: home
+  });
+  if (!remote) {
+    write(ctx.stderr, "No fetch implementation available.\n");
+    return 1;
+  }
+  let link;
+  try {
+    link = await startCliLink(remote);
+  } catch (error) {
+    write(ctx.stderr, `${error.message}
+`);
+    return 1;
+  }
+  const authUrl = `${baseUrl}/cli/auth?code=${encodeURIComponent(link.userCode)}`;
+  const noBrowser = options.browser === false;
+  const headless = isHeadless(ctx);
+  write(ctx.stdout, `
+To sign in, visit:
+
+  ${authUrl}
+
+and confirm this code:  ${link.userCode}
+
+`);
+  if (!noBrowser && !headless) {
+    openBrowser(ctx, authUrl);
+  }
+  write(ctx.stdout, "Waiting for authorization\u2026\n");
+  const intervalMs = Math.max(1, link.interval || 4) * 1e3;
+  const deadline = Date.now() + Math.min(LOGIN_MAX_WAIT_MS, Math.max(1, link.expiresIn || 600) * 1e3);
+  while (Date.now() < deadline) {
+    let poll;
+    try {
+      poll = await pollCliLink(remote, link.deviceCode);
+    } catch (error) {
+      void error;
+      await sleep(intervalMs);
+      continue;
+    }
+    if (poll.status === "pending") {
+      await sleep(intervalMs);
+      continue;
+    }
+    if (poll.status === "expired") {
+      write(ctx.stderr, "Login code expired before it was approved. Re-run `codetime login`.\n");
+      return 1;
+    }
+    writeConfig({
+      ...existing,
+      token: poll.token,
+      ...poll.userId == null ? {} : { userId: String(poll.userId) },
+      // Persist the host only when explicitly overridden, matching
+      // `token set` so a default-host login never clobbers an earlier
+      // --remote choice.
+      ...remoteOverride ? { remoteUrl: remoteOverride } : {}
+    }, home);
+    write(ctx.stdout, `Logged in. Token saved (${maskToken(poll.token)}).
+`);
+    return 0;
+  }
+  write(ctx.stderr, "Timed out waiting for authorization. Re-run `codetime login`.\n");
+  return 1;
+}
 async function tokenCommand(action, value, options, ctx) {
   const verb = action || "show";
   const home = resolveHome(options, ctx);
@@ -5827,20 +5962,25 @@ Usage:
   codetime detect [--json] [--home <path>]
   codetime install [--target codex,claude,opencode,pi] [--all] [--dry-run] [--force] [--home <path>]
   codetime hook --agent <name>
+  codetime sync [--source <source>] [--force] [--dry-run]
   codetime backfill discover|plan|import|verify --source codex|claude-code|opencode|pi|all --dry-run [--json] [--batch-size <count>]
+  codetime login [--no-browser] [--remote <url>]
   codetime token set <token>
   codetime token show
   codetime token clear
 
 Setup:
-  Copy your upload token from https://codetime.dev/dashboard/settings,
-  then run: codetime token set <token>
+  Run: codetime login  (signs in through your browser)
+  Or copy your upload token from https://codetime.dev/dashboard/settings
+  and run: codetime token set <token>
 
 Commands:
   detect    Show supported local targets and install status.
   install   Install integration files into detected or requested targets.
   hook      Read agent hook JSON from stdin and report a throttled event.
+  sync      Import and upload all local agent history (backfill import --source all).
   backfill  Discover local history and create metadata-only import plans.
+  login     Authorize this machine by signing in through your browser.
   token     Set, show, or clear the persisted API token.
   machine   List your machines (read-only).
   version   Print CLI version.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codetime-cli",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "codetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to codetime.dev.",
   "license": "MIT",
   "publishConfig": {