hillclimb 0.5.5 → 0.6.2

package/dist/cli.js

@@ -9,22 +9,6 @@ import * as p6 from "@clack/prompts";
 import path7 from "path";
 import * as p3 from "@clack/prompts";
 
-// src/color.ts
-var IS_TTY = Boolean(process.stdout.isTTY);
-var NO_COLOR = process.env.FORCE_COLOR !== void 0 ? false : process.env.NO_COLOR !== void 0 || process.env.TERM === "dumb" || !IS_TTY;
-function wrap(open, close) {
-  if (NO_COLOR) return (s) => s;
-  const o = `\x1B[${open}m`;
-  const c = `\x1B[${close}m`;
-  return (s) => `${o}${s}${c}`;
-}
-var bold = wrap(1, 22);
-var dim = wrap(2, 22);
-var red = wrap(31, 39);
-var green = wrap(32, 39);
-var yellow = wrap(33, 39);
-var cyan = wrap(36, 39);
-
 // src/config.ts
 import fs from "fs";
 import os from "os";
@@ -369,18 +353,18 @@ var PlatformClient = class {
       let code;
       let message = `${method} ${relative} failed: HTTP ${res.status}`;
       try {
-        const text3 = await res.text();
-        if (text3) {
+        const text2 = await res.text();
+        if (text2) {
           try {
-            const parsed = JSON.parse(text3);
+            const parsed = JSON.parse(text2);
             if (parsed.error?.code) code = parsed.error.code;
             if (parsed.error?.message) {
               message = `${method} ${relative} failed: ${parsed.error.message}`;
             } else {
-              message = `${method} ${relative} failed: ${text3}`;
+              message = `${method} ${relative} failed: ${text2}`;
             }
           } catch {
-            message = `${method} ${relative} failed: ${text3}`;
+            message = `${method} ${relative} failed: ${text2}`;
           }
         }
       } catch {
@@ -397,17 +381,6 @@ var PlatformClient = class {
     }
     return void 0;
   }
-  async signInWithEmail(email, password2) {
-    await this.request("POST", "/api/auth/sign-in/email", {
-      email,
-      password: password2
-    });
-    if (!this.sessionCookie) {
-      throw new PlatformError(
-        "Sign-in succeeded but no session cookie was returned"
-      );
-    }
-  }
   async getBootstrap() {
     const data = await this.request("GET", "/api/v1/app/bootstrap");
     if (!data?.session?.user || !data.session.session) return null;
@@ -1483,22 +1456,6 @@ var CLAUDE_DEF = TOOLS[0];
 
 // src/commands/_shared.ts
 import * as p from "@clack/prompts";
-async function requireText(label, opts = {}) {
-  const result = opts.password ? await p.password({
-    message: label,
-    validate: (v) => v && v.length > 0 ? void 0 : "Required"
-  }) : await p.text({
-    message: label,
-    placeholder: opts.placeholder,
-    initialValue: opts.initialValue,
-    validate: (v) => v && v.trim().length > 0 ? void 0 : "Required"
-  });
-  if (p.isCancel(result)) {
-    p.cancel("Cancelled.");
-    process.exit(0);
-  }
-  return typeof result === "string" ? result.trim() : "";
-}
 async function withSpinner(startLabel, onSuccess, onFailureLabel, fn) {
   const spinner5 = p.spinner();
   spinner5.start(startLabel);
@@ -1517,6 +1474,24 @@ async function withSpinner(startLabel, onSuccess, onFailureLabel, fn) {
 // src/commands/web-auth.ts
 import { spawn } from "child_process";
 import * as p2 from "@clack/prompts";
+
+// src/color.ts
+var IS_TTY = Boolean(process.stdout.isTTY);
+var NO_COLOR = process.env.FORCE_COLOR !== void 0 ? false : process.env.NO_COLOR !== void 0 || process.env.TERM === "dumb" || !IS_TTY;
+function wrap(open, close) {
+  if (NO_COLOR) return (s) => s;
+  const o = `\x1B[${open}m`;
+  const c = `\x1B[${close}m`;
+  return (s) => `${o}${s}${c}`;
+}
+var bold = wrap(1, 22);
+var dim = wrap(2, 22);
+var red = wrap(31, 39);
+var green = wrap(32, 39);
+var yellow = wrap(33, 39);
+var cyan = wrap(36, 39);
+
+// src/commands/web-auth.ts
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -1531,10 +1506,6 @@ function openBrowser(url) {
   }
 }
 async function webAuth(apiBaseUrl) {
-  if (!IS_TTY) {
-    appendLog("info", "web-auth: skipped (not a TTY)");
-    return null;
-  }
   appendLog("info", `web-auth: started (apiBaseUrl=${apiBaseUrl})`);
   const client = new PlatformClient(apiBaseUrl);
   const codeResponse = await withSpinner(
@@ -1548,9 +1519,16 @@ async function webAuth(apiBaseUrl) {
     `web-auth: code prepared (expiresIn=${codeResponse.expiresIn}s, pollInterval=${codeResponse.interval}s)`
   );
   const url = codeResponse.verificationUrl;
-  openBrowser(url);
-  p2.log.info(`Opening browser to: ${cyan(url)}`);
-  p2.log.info(dim("If the browser did not open, copy the URL above."));
+  if (IS_TTY) {
+    openBrowser(url);
+    p2.log.info(`Opening browser to: ${cyan(url)}`);
+    p2.log.info(dim("If the browser did not open, copy the URL above."));
+  } else {
+    p2.log.info(
+      "To sign in, open this URL in a browser and approve the request:"
+    );
+    p2.log.info(cyan(url));
+  }
   const deadline = Date.now() + codeResponse.expiresIn * 1e3;
   const interval = codeResponse.interval * 1e3;
   const spinner5 = p2.spinner();
@@ -1674,66 +1652,24 @@ async function runInit(args = []) {
     bootstrap = await tryReuseIdentity(apiBaseUrl, client, saved);
   }
   if (!bootstrap) {
-    let method = projectSlugFlag ? "web" : "email";
-    if (IS_TTY && !projectSlugFlag) {
-      const selected = await p3.select({
-        message: "How would you like to sign in?",
-        options: [
-          {
-            value: "web",
-            label: "Web authentication (recommended)",
-            hint: "opens browser"
-          },
-          { value: "email", label: "Email and password" }
-        ],
-        initialValue: "web"
-      });
-      if (p3.isCancel(selected)) {
-        p3.cancel("Cancelled.");
-        process.exit(0);
-      }
-      method = selected;
+    const result = await webAuth(apiBaseUrl);
+    if (!result) {
+      appendLog("error", "init: web authentication failed");
+      p3.log.error("Web authentication failed.");
+      p3.outro("Aborted.");
+      process.exit(1);
     }
-    appendLog("info", `init: auth method selected (${method})`);
-    if (method === "web") {
-      const result = await webAuth(apiBaseUrl);
-      if (!result) {
-        appendLog("error", "init: web authentication failed");
-        p3.log.error("Web authentication failed.");
-        p3.outro("Aborted.");
-        process.exit(1);
+    client = result.client;
+    bootstrap = await withSpinner(
+      "Loading account...",
+      (b) => `Signed in as ${b.session.email}${b.session.role === "admin" ? " (admin)" : ""}.`,
+      "Could not load account.",
+      async () => {
+        const data = await client.getBootstrap();
+        if (!data) throw new Error("Bootstrap returned no session.");
+        return data;
       }
-      client = result.client;
-      bootstrap = await withSpinner(
-        "Loading account...",
-        (b) => `Signed in as ${b.session.email}${b.session.role === "admin" ? " (admin)" : ""}.`,
-        "Could not load account.",
-        async () => {
-          const data = await client.getBootstrap();
-          if (!data) throw new Error("Bootstrap returned no session.");
-          return data;
-        }
-      );
-    } else {
-      const email = await requireText("Email");
-      const password2 = await requireText("Password", { password: true });
-      await withSpinner(
-        "Signing in...",
-        () => "Signed in.",
-        "Sign-in failed.",
-        () => client.signInWithEmail(email, password2)
-      );
-      bootstrap = await withSpinner(
-        "Loading account...",
-        (b) => `Signed in as ${b.session.email}${b.session.role === "admin" ? " (admin)" : ""}.`,
-        "Could not load account.",
-        async () => {
-          const data = await client.getBootstrap();
-          if (!data) throw new Error("Bootstrap returned no session.");
-          return data;
-        }
-      );
-    }
+    );
   }
   let project;
   if (projectSlugFlag) {
@@ -2070,87 +2006,23 @@ async function runLogin(_args = []) {
       println();
     }
   }
-  let method = "email";
-  if (IS_TTY) {
-    const selected = await p4.select({
-      message: "How would you like to sign in?",
-      options: [
-        {
-          value: "web",
-          label: "Web authentication (recommended)",
-          hint: "opens browser"
-        },
-        { value: "email", label: "Email and password" }
-      ],
-      initialValue: "web"
-    });
-    if (p4.isCancel(selected)) {
-      p4.cancel("Cancelled.");
-      process.exit(0);
-    }
-    method = selected;
-  }
-  appendLog("info", `login: auth method selected (${method})`);
-  if (method === "web") {
-    const result = await webAuth(apiBaseUrl);
-    if (!result) {
-      appendLog("error", "login: web authentication failed");
-      p4.log.error("Web authentication failed.");
-      p4.outro("Aborted.");
-      process.exit(1);
-    }
-    await saveIdentity({
-      apiBaseUrl,
-      sessionCookie: result.sessionCookie,
-      email: result.email,
-      userId: result.userId,
-      savedAt: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    appendLog("info", `login: completed via web auth (email=${result.email})`);
-    println();
-    row(CHECK, "Signed in", cyan(result.email));
-    footer("Run `npx hillclimb` in a repo to wire up auto-upload.");
-    return;
-  }
-  const email = await requireText("Email");
-  const password2 = await requireText("Password", { password: true });
-  const client = new PlatformClient(apiBaseUrl);
-  await withSpinner(
-    "Signing in...",
-    () => "Signed in.",
-    "Sign-in failed.",
-    () => client.signInWithEmail(email, password2)
-  );
-  const bootstrap = await withSpinner(
-    "Loading account...",
-    (b) => `Signed in as ${b.session.email}.`,
-    "Could not load account.",
-    async () => {
-      const data = await client.getBootstrap();
-      if (!data) throw new Error("Bootstrap returned no session.");
-      return data;
-    }
-  );
-  const cookie = client.getSessionCookie();
-  if (!cookie) {
-    appendLog("error", "login: session cookie missing after sign-in");
-    p4.log.error("Session cookie was lost during sign-in.");
+  const result = await webAuth(apiBaseUrl);
+  if (!result) {
+    appendLog("error", "login: web authentication failed");
+    p4.log.error("Web authentication failed.");
     p4.outro("Aborted.");
     process.exit(1);
   }
   await saveIdentity({
     apiBaseUrl,
-    sessionCookie: cookie,
-    email: bootstrap.session.email,
-    userId: bootstrap.session.userId,
+    sessionCookie: result.sessionCookie,
+    email: result.email,
+    userId: result.userId,
     savedAt: (/* @__PURE__ */ new Date()).toISOString()
   });
-  appendLog(
-    "info",
-    `login: completed via email/password (email=${bootstrap.session.email})`
-  );
+  appendLog("info", `login: completed via web auth (email=${result.email})`);
   println();
-  row(CHECK, "Signed in", cyan(bootstrap.session.email));
+  row(CHECK, "Signed in", cyan(result.email));
   footer("Run `npx hillclimb` in a repo to wire up auto-upload.");
 }
 
@@ -11845,9 +11717,9 @@ function extractTextReasoningToolUses(content) {
   } else if (content !== void 0 && content !== null) {
     textParts.push(stringify(content));
   }
-  const text3 = textParts.filter((p7) => p7 && p7.trim()).map((p7) => p7.trim()).join("\n\n");
+  const text2 = textParts.filter((p7) => p7 && p7.trim()).map((p7) => p7.trim()).join("\n\n");
   const reasoning = reasoningParts.filter((p7) => p7 && p7.trim()).map((p7) => p7.trim()).join("\n\n");
-  return [text3, reasoning || void 0, toolBlocks];
+  return [text2, reasoning || void 0, toolBlocks];
 }
 function buildMetrics(usage) {
   if (typeof usage !== "object" || usage === null) return void 0;
@@ -11876,8 +11748,8 @@ function formatToolResult(block, toolUseResult) {
     if (content.trim()) parts.push(content.trim());
   } else if (Array.isArray(content)) {
     for (const item of content) {
-      const text3 = stringify(item);
-      if (text3.trim()) parts.push(text3.trim());
+      const text2 = stringify(item);
+      if (text2.trim()) parts.push(text2.trim());
     }
   } else if (content !== void 0 && content !== null && content !== "") {
     parts.push(stringify(content));
@@ -12005,7 +11877,7 @@ function convertClaudeToTrajectory(jsonlContent, sessionId) {
     const eventType = event.type;
     const timestamp = event.timestamp;
     if (eventType === "assistant") {
-      const [text3, reasoning, toolBlocks] = extractTextReasoningToolUses(
+      const [text2, reasoning, toolBlocks] = extractTextReasoningToolUses(
         msg.content
       );
       const msgId = msg.id;
@@ -12029,12 +11901,12 @@ function convertClaudeToTrajectory(jsonlContent, sessionId) {
         extra.user_type = event.userType;
       extra.is_sidechain = event.isSidechain ?? false;
       const modelName = msg.model || defaultModelName;
-      if (text3 || reasoning || toolBlocks.length === 0) {
+      if (text2 || reasoning || toolBlocks.length === 0) {
         normalizedEvents.push({
           kind: "message",
           timestamp,
           role: msg.role ?? "assistant",
-          text: text3 || "",
+          text: text2 || "",
           reasoning: msg.role === "assistant" ? reasoning : void 0,
           metrics,
           extra: Object.keys(extra).length > 0 ? extra : void 0,
@@ -12074,13 +11946,13 @@ function convertClaudeToTrajectory(jsonlContent, sessionId) {
     if (eventType === "user") {
       const content = msg.content;
       if (typeof content === "string") {
-        const text3 = content.trim();
-        if (text3) {
+        const text2 = content.trim();
+        if (text2) {
           normalizedEvents.push({
             kind: "message",
             timestamp,
             role: "user",
-            text: text3,
+            text: text2,
             extra: { is_sidechain: event.isSidechain ?? false }
           });
         }
@@ -12142,13 +12014,13 @@ function convertClaudeToTrajectory(jsonlContent, sessionId) {
         continue;
       }
       if (content !== void 0 && content !== null && content !== "") {
-        const text3 = stringify(content).trim();
-        if (text3) {
+        const text2 = stringify(content).trim();
+        if (text2) {
           normalizedEvents.push({
             kind: "message",
             timestamp,
             role: "user",
-            text: text3
+            text: text2
           });
         }
       }
@@ -12284,8 +12156,8 @@ function extractMessageText(content) {
   const parts = [];
   for (const block of content) {
     if (typeof block === "object" && block !== null) {
-      const text3 = block.text;
-      if (typeof text3 === "string") parts.push(text3);
+      const text2 = block.text;
+      if (typeof text2 === "string") parts.push(text2);
     }
   }
   return parts.join("");
@@ -12417,12 +12289,12 @@ function convertCodexToTrajectory(jsonlContent, sessionId) {
     }
     if (payloadType === "message") {
       const content = payload.content;
-      const text3 = Array.isArray(content) ? extractMessageText(content) : "";
+      const text2 = Array.isArray(content) ? extractMessageText(content) : "";
       normalizedEvents.push({
         kind: "message",
         timestamp,
         role: payload.role ?? "user",
-        text: text3,
+        text: text2,
         reasoning: payload.role === "assistant" ? pendingReasoning : void 0
       });
       pendingReasoning = void 0;
@@ -12928,7 +12800,7 @@ function convertCursorToTrajectory(jsonlContent, sessionId) {
     else if (role === "user") source = "user";
     else source = "system";
     const contentParts = entry.message?.content;
-    let text3 = "";
+    let text2 = "";
     if (Array.isArray(contentParts)) {
       const textParts = [];
       for (const part of contentParts) {
@@ -12936,13 +12808,13 @@ function convertCursorToTrajectory(jsonlContent, sessionId) {
           textParts.push(part.text);
         }
       }
-      text3 = textParts.join("\n\n").trim();
+      text2 = textParts.join("\n\n").trim();
     }
-    if (!text3) continue;
+    if (!text2) continue;
     const step = {
       step_id: stepId,
       source,
-      message: text3
+      message: text2
     };
     steps.push(step);
     stepId++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hillclimb",
-  "version": "0.5.5",
+  "version": "0.6.2",
   "description": "Extract and export AI coding tool logs grouped by repo",
   "license": "MIT",
   "type": "module",
@@ -36,7 +36,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@clack/prompts": "^1.1.0",
+    "@clack/prompts": "1.0.1",
     "archiver": "^7.0.1"
   },
   "devDependencies": {