hillclimb 0.1.6 → 0.1.8

package/README.md

@@ -1,6 +1,6 @@
 # hillclimb
 
-Extract AI coding tool sessions (Claude Code, Cursor, Codex, opencode) and upload them to a Hillclimb workspace.
+Extract AI coding tool sessions (Claude Code, Cursor, Codex, opencode) and upload them to a Hillclimb project.
 
 ## Quickstart
 

package/dist/cli.js

@@ -30,6 +30,29 @@ import os from "os";
 import path from "path";
 var CONFIG_DIR = path.join(os.homedir(), ".hillclimb");
 var CONFIG_PATH = path.join(CONFIG_DIR, "projects.json");
+function normalizeProjectConfig(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const config = raw;
+  const projectId = config.projectId ?? config.workspaceId;
+  const projectSlug = config.projectSlug ?? config.workspaceSlug;
+  const projectName = config.projectName ?? config.workspaceName;
+  if (!config.apiBaseUrl || !projectId || !projectSlug || !projectName || !config.contributionTypeSlug || !config.contributionTypeName || typeof config.autoSubmit !== "boolean") {
+    return null;
+  }
+  return {
+    ...config,
+    apiBaseUrl: config.apiBaseUrl,
+    projectId,
+    projectSlug,
+    projectName,
+    workspaceId: config.workspaceId ?? projectId,
+    workspaceSlug: config.workspaceSlug ?? projectSlug,
+    workspaceName: config.workspaceName ?? projectName,
+    contributionTypeSlug: config.contributionTypeSlug,
+    contributionTypeName: config.contributionTypeName,
+    autoSubmit: config.autoSubmit
+  };
+}
 function configDir() {
   return CONFIG_DIR;
 }
@@ -43,7 +66,12 @@ async function loadProjects() {
     if (!parsed.projects || typeof parsed.projects !== "object") {
       return { projects: {} };
     }
-    return parsed;
+    const projects = {};
+    for (const [repoRoot, config] of Object.entries(parsed.projects)) {
+      const normalized = normalizeProjectConfig(config);
+      if (normalized) projects[repoRoot] = normalized;
+    }
+    return { projects };
   } catch {
     return { projects: {} };
   }
@@ -58,7 +86,9 @@ async function saveProjects(file) {
 }
 async function upsertProject(repoRoot, config) {
   const file = await loadProjects();
-  file.projects[path.resolve(repoRoot)] = config;
+  const normalized = normalizeProjectConfig(config);
+  if (!normalized) throw new Error("Invalid project config.");
+  file.projects[path.resolve(repoRoot)] = normalized;
   await saveProjects(file);
 }
 async function findProjectForCwd(cwd) {
@@ -398,30 +428,51 @@ var PlatformClient = class {
     };
   }
   async listProjects() {
-    const data = await this.request(
-      "GET",
-      "/api/v1/projects"
-    );
-    return data.workspaces ?? [];
+    const data = await this.request("GET", "/api/v1/projects");
+    return data.projects ?? data.workspaces ?? [];
   }
-  async getWorkspaceBySlug(slug) {
-    const data = await this.request(
-      "GET",
-      `/api/v1/workspaces/${encodeURIComponent(slug)}`
-    );
-    return data.workspace;
+  async getProjectBySlug(slug) {
+    try {
+      const data = await this.request("GET", `/api/v1/projects/by-slug/${encodeURIComponent(slug)}`);
+      const project = data.project ?? data.workspace;
+      if (!project) throw new PlatformError("Project response was empty.");
+      return project;
+    } catch (err) {
+      if (!(err instanceof PlatformError) || err.status !== 404) throw err;
+      const data = await this.request(
+        "GET",
+        `/api/v1/workspaces/${encodeURIComponent(slug)}`
+      );
+      return data.workspace;
+    }
   }
-  async listContributionTypes(workspaceId) {
-    const data = await this.request("GET", `/api/v1/workspaces/${workspaceId}/contribution-types`);
-    return data.contributionTypes ?? [];
+  async listContributionTypes(projectId) {
+    try {
+      const data = await this.request("GET", `/api/v1/projects/${projectId}/contribution-types`);
+      return data.contributionTypes ?? [];
+    } catch (err) {
+      if (!(err instanceof PlatformError) || err.status !== 404) throw err;
+      const data = await this.request("GET", `/api/v1/workspaces/${projectId}/contribution-types`);
+      return data.contributionTypes ?? [];
+    }
   }
-  async createContribution(workspaceId, input) {
-    const data = await this.request(
-      "POST",
-      `/api/v1/workspaces/${workspaceId}/contributions`,
-      input
-    );
-    return data.contribution;
+  async createContribution(projectId, input) {
+    try {
+      const data = await this.request(
+        "POST",
+        `/api/v1/projects/${projectId}/contributions`,
+        input
+      );
+      return data.contribution;
+    } catch (err) {
+      if (!(err instanceof PlatformError) || err.status !== 404) throw err;
+      const data = await this.request(
+        "POST",
+        `/api/v1/workspaces/${projectId}/contributions`,
+        input
+      );
+      return data.contribution;
+    }
   }
   async createUpload(contributionId, input) {
     return this.request(
@@ -501,6 +552,7 @@ import os2 from "os";
 import path5 from "path";
 var HOOK_CMD = (sub) => `npx hillclimb@latest ${sub}`;
 var GIT_TRACES_CMD = (tool) => `npx hillclimb@latest git-traces --tool=${tool}`;
+var CLAUDE_SESSIONEND_UPLOAD_TIMEOUT_SECONDS = 30;
 var TOOLS = [
   {
     tool: "claude",
@@ -508,7 +560,11 @@ var TOOLS = [
     settingsFile: ".claude/settings.local.json",
     format: "claude",
     events: [
-      { eventName: "SessionEnd", command: HOOK_CMD("upload") },
+      {
+        eventName: "SessionEnd",
+        command: HOOK_CMD("upload"),
+        timeout: CLAUDE_SESSIONEND_UPLOAD_TIMEOUT_SECONDS
+      },
       { eventName: "SessionStart", command: GIT_TRACES_CMD("claude") },
       { eventName: "Stop", command: GIT_TRACES_CMD("claude") },
       { eventName: "SessionEnd", command: GIT_TRACES_CMD("claude") }
@@ -593,11 +649,7 @@ function isDir(p7) {
 }
 function copilotChatDetect() {
   const home = os2.homedir();
-  const suffix = path5.join(
-    "User",
-    "globalStorage",
-    "github.copilot-chat"
-  );
+  const suffix = path5.join("User", "globalStorage", "github.copilot-chat");
   const candidates = [
     path5.join(home, "Library", "Application Support", "Code", suffix),
     path5.join(home, ".config", "Code", suffix),
@@ -605,6 +657,10 @@ function copilotChatDetect() {
   ].filter((p7) => p7 !== null);
   return candidates.some(isDir);
 }
+function ensureHooks(settings) {
+  if (!settings.hooks) settings.hooks = {};
+  return settings.hooks;
+}
 function settingsPath(repoRoot, def) {
   return path5.join(repoRoot, def.settingsFile);
 }
@@ -624,31 +680,45 @@ async function writeJson(file, obj) {
   await fs4.promises.writeFile(file, `${JSON.stringify(obj, null, 2)}
 `);
 }
-function claudeHookPresent(matchers, command) {
+function claudeHookPresent(matchers, command, options = {}) {
   return matchers.some(
-    (m) => (m.hooks ?? []).some(
-      (h) => h.type === "command" && h.command === command
-    )
+    (m) => (m.hooks ?? []).some((h) => {
+      if (h.type !== "command" || h.command !== command) return false;
+      if (options.timeout !== void 0 && h.timeout !== options.timeout) {
+        return false;
+      }
+      return true;
+    })
   );
 }
-function claudeInstall(settings, eventName, command) {
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks[eventName]) settings.hooks[eventName] = [];
-  const matchers = settings.hooks[eventName];
-  if (claudeHookPresent(matchers, command)) return false;
+function claudeInstall(settings, eventName, command, options = {}) {
+  const hooks = ensureHooks(settings);
+  if (!hooks[eventName]) hooks[eventName] = [];
+  const matchers = hooks[eventName];
+  for (const matcher of matchers) {
+    for (const hook of matcher.hooks ?? []) {
+      if (hook.type !== "command" || hook.command !== command) continue;
+      if (options.timeout === void 0 || hook.timeout === options.timeout) {
+        return false;
+      }
+      hook.timeout = options.timeout;
+      return true;
+    }
+  }
   matchers.push({
     matcher: "",
-    hooks: [{ type: "command", command }]
+    hooks: [{ type: "command", command, ...options }]
   });
   return true;
 }
-function claudeCheck(settings, eventName, command) {
+function claudeCheck(settings, eventName, command, options = {}) {
   const matchers = settings.hooks?.[eventName] ?? [];
-  return claudeHookPresent(matchers, command);
+  return claudeHookPresent(matchers, command, options);
 }
 function claudeUninstall(settings, eventName, command) {
-  const matchers = settings.hooks?.[eventName];
-  if (!matchers || matchers.length === 0) return false;
+  const hooks = settings.hooks;
+  const matchers = hooks?.[eventName];
+  if (!hooks || !matchers || matchers.length === 0) return false;
   let removedAny = false;
   const next = [];
   for (const m of matchers) {
@@ -660,10 +730,10 @@ function claudeUninstall(settings, eventName, command) {
   }
   if (!removedAny) return false;
   if (next.length > 0) {
-    settings.hooks[eventName] = next;
+    hooks[eventName] = next;
   } else {
-    delete settings.hooks[eventName];
-    if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
+    delete hooks[eventName];
+    if (Object.keys(hooks).length === 0) delete settings.hooks;
   }
   return true;
 }
@@ -672,9 +742,9 @@ function cursorHookPresent(entries, command) {
 }
 function cursorInstall(settings, eventName, command) {
   if (!settings.version) settings.version = 1;
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks[eventName]) settings.hooks[eventName] = [];
-  const entries = settings.hooks[eventName];
+  const hooks = ensureHooks(settings);
+  if (!hooks[eventName]) hooks[eventName] = [];
+  const entries = hooks[eventName];
   if (cursorHookPresent(entries, command)) return false;
   entries.push({ command });
   return true;
@@ -684,15 +754,16 @@ function cursorCheck(settings, eventName, command) {
   return cursorHookPresent(entries, command);
 }
 function cursorUninstall(settings, eventName, command) {
-  const entries = settings.hooks?.[eventName];
-  if (!entries || entries.length === 0) return false;
+  const hooks = settings.hooks;
+  const entries = hooks?.[eventName];
+  if (!hooks || !entries || entries.length === 0) return false;
   const next = entries.filter((e) => e.command !== command);
   if (next.length === entries.length) return false;
   if (next.length > 0) {
-    settings.hooks[eventName] = next;
+    hooks[eventName] = next;
   } else {
-    delete settings.hooks[eventName];
-    if (Object.keys(settings.hooks).length === 0) {
+    delete hooks[eventName];
+    if (Object.keys(hooks).length === 0) {
       delete settings.hooks;
       delete settings.version;
     }
@@ -703,9 +774,9 @@ function copilotHookPresent(entries, command) {
   return entries.some((e) => e.type === "command" && e.command === command);
 }
 function copilotInstall(settings, eventName, command) {
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks[eventName]) settings.hooks[eventName] = [];
-  const entries = settings.hooks[eventName];
+  const hooks = ensureHooks(settings);
+  if (!hooks[eventName]) hooks[eventName] = [];
+  const entries = hooks[eventName];
   if (copilotHookPresent(entries, command)) return false;
   entries.push({ type: "command", command });
   return true;
@@ -715,17 +786,18 @@ function copilotCheck(settings, eventName, command) {
   return copilotHookPresent(entries, command);
 }
 function copilotUninstall(settings, eventName, command) {
-  const entries = settings.hooks?.[eventName];
-  if (!entries || entries.length === 0) return false;
+  const hooks = settings.hooks;
+  const entries = hooks?.[eventName];
+  if (!hooks || !entries || entries.length === 0) return false;
   const next = entries.filter(
     (e) => !(e.type === "command" && e.command === command)
   );
   if (next.length === entries.length) return false;
   if (next.length > 0) {
-    settings.hooks[eventName] = next;
+    hooks[eventName] = next;
   } else {
-    delete settings.hooks[eventName];
-    if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
+    delete hooks[eventName];
+    if (Object.keys(hooks).length === 0) delete settings.hooks;
   }
   return true;
 }
@@ -897,24 +969,24 @@ async function opencodeCheck(file) {
     return false;
   }
 }
-function install(settings, format, eventName, command) {
+function install(settings, format, eventName, command, options = {}) {
   switch (format) {
     case "cursor":
       return cursorInstall(settings, eventName, command);
     case "copilot":
       return copilotInstall(settings, eventName, command);
     default:
-      return claudeInstall(settings, eventName, command);
+      return claudeInstall(settings, eventName, command, options);
   }
 }
-function check(settings, format, eventName, command) {
+function check(settings, format, eventName, command, options = {}) {
   switch (format) {
     case "cursor":
       return cursorCheck(settings, eventName, command);
     case "copilot":
       return copilotCheck(settings, eventName, command);
     default:
-      return claudeCheck(settings, eventName, command);
+      return claudeCheck(settings, eventName, command, options);
   }
 }
 function uninstall(settings, format, eventName, command) {
@@ -961,7 +1033,9 @@ async function installHooksForTool(repoRoot, def) {
         mutated = true;
       }
     }
-    const added = install(settings, def.format, evt.eventName, evt.command);
+    const added = install(settings, def.format, evt.eventName, evt.command, {
+      timeout: evt.timeout
+    });
     if (added) {
       installed++;
       mutated = true;
@@ -985,7 +1059,9 @@ async function checkHooksForTool(repoRoot, def) {
   const settings = await readJson(file);
   const missing = [];
   for (const evt of def.events) {
-    if (!check(settings, def.format, evt.eventName, evt.command)) {
+    if (!check(settings, def.format, evt.eventName, evt.command, {
+      timeout: evt.timeout
+    })) {
       missing.push(`${evt.eventName}:${evt.command}`);
     }
   }
@@ -1246,10 +1322,10 @@ async function tryReuseIdentity(apiBaseUrl, client, identity) {
 }
 async function runInit(args = []) {
   const forceLogin = args.includes("--login");
-  const workspaceSlugFlag = parseStringFlag(args, "workspace");
+  const projectSlugFlag = parseStringFlag(args, "project") ?? parseStringFlag(args, "workspace");
   appendLog(
     "info",
-    `init: started (cwd=${process.cwd()}, forceLogin=${forceLogin}, workspaceSlug=${workspaceSlugFlag ?? "<none>"})`
+    `init: started (cwd=${process.cwd()}, forceLogin=${forceLogin}, projectSlug=${projectSlugFlag ?? "<none>"})`
   );
   p3.intro("hillclimb");
   const repo = detectRepoRoot();
@@ -1270,8 +1346,8 @@ async function runInit(args = []) {
     bootstrap = await tryReuseIdentity(apiBaseUrl, client, saved);
   }
   if (!bootstrap) {
-    let method = workspaceSlugFlag ? "web" : "email";
-    if (IS_TTY && !workspaceSlugFlag) {
+    let method = projectSlugFlag ? "web" : "email";
+    if (IS_TTY && !projectSlugFlag) {
       const selected = await p3.select({
         message: "How would you like to sign in?",
         options: [
@@ -1331,13 +1407,13 @@ async function runInit(args = []) {
       );
     }
   }
-  let workspace;
-  if (workspaceSlugFlag) {
+  let project;
+  if (projectSlugFlag) {
     const resolved = await withSpinner(
-      `Looking up project "${workspaceSlugFlag}"...`,
+      `Looking up project "${projectSlugFlag}"...`,
       (w) => `Found project: ${w.name}`,
-      `Could not find project "${workspaceSlugFlag}".`,
-      () => client.getWorkspaceBySlug(workspaceSlugFlag)
+      `Could not find project "${projectSlugFlag}".`,
+      () => client.getProjectBySlug(projectSlugFlag)
     );
     if (resolved.status !== "active") {
       p3.log.error(
@@ -1346,21 +1422,21 @@ async function runInit(args = []) {
       p3.outro("Aborted.");
       process.exit(1);
     }
-    workspace = resolved;
+    project = resolved;
     appendLog(
       "info",
-      `init: project pre-scoped (slug=${workspaceSlugFlag}, id=${resolved.id})`
+      `init: project pre-scoped (slug=${projectSlugFlag}, id=${resolved.id})`
     );
   } else {
-    const workspaces = await withSpinner(
+    const projects = await withSpinner(
       "Loading projects...",
       (ws) => `Found ${ws.length} project(s).`,
       "Could not list projects.",
       () => client.listProjects()
     );
-    const activeWorkspaces = workspaces.filter((w) => w.status === "active");
-    const workspaceChoices = activeWorkspaces.length > 0 ? activeWorkspaces : workspaces;
-    if (workspaceChoices.length === 0) {
+    const activeProjects = projects.filter((w) => w.status === "active");
+    const projectChoices = activeProjects.length > 0 ? activeProjects : projects;
+    if (projectChoices.length === 0) {
       p3.log.error(
         "You do not have access to any projects. Create one in the web UI first."
       );
@@ -1368,44 +1444,44 @@ async function runInit(args = []) {
       process.exit(1);
     }
     let picked;
-    if (workspaceChoices.length === 1) {
-      picked = workspaceChoices[0];
+    if (projectChoices.length === 1) {
+      picked = projectChoices[0];
       p3.log.info(`Using project: ${picked.name}`);
     } else {
-      const selectedWorkspaceId = await p3.select({
+      const selectedProjectId = await p3.select({
         message: "Select a project",
-        options: workspaceChoices.map((w) => ({
+        options: projectChoices.map((w) => ({
           value: w.id,
           label: w.name,
           hint: `${w.slug} (${w.status})`
         }))
       });
-      if (p3.isCancel(selectedWorkspaceId)) {
+      if (p3.isCancel(selectedProjectId)) {
         p3.cancel("Cancelled.");
         process.exit(0);
       }
-      picked = workspaceChoices.find((w) => w.id === selectedWorkspaceId);
+      picked = projectChoices.find((w) => w.id === selectedProjectId);
     }
     if (!picked) {
-      p3.log.error("Invalid workspace selection.");
+      p3.log.error("Invalid project selection.");
       p3.outro("Aborted.");
       process.exit(1);
     }
-    workspace = picked;
+    project = picked;
     appendLog(
       "info",
-      `init: project selected (slug=${workspace.slug}, id=${workspace.id})`
+      `init: project selected (slug=${project.slug}, id=${project.id})`
     );
   }
   const types = await withSpinner(
     "Loading contribution types...",
     (t) => `Found ${t.length} contribution type(s).`,
     "Could not list contribution types.",
-    () => client.listContributionTypes(workspace.id)
+    () => client.listContributionTypes(project.id)
   );
   if (types.length === 0) {
     p3.log.error(
-      `Project "${workspace.name}" has no contribution types. Create one in the web UI first.`
+      `Project "${project.name}" has no contribution types. Create one in the web UI first.`
     );
     p3.outro("Aborted.");
     process.exit(1);
@@ -1452,10 +1528,13 @@ async function runInit(args = []) {
   );
   await upsertProject(repoRoot, {
     apiBaseUrl,
-    organizationId: workspace.organizationId,
-    workspaceId: workspace.id,
-    workspaceSlug: workspace.slug,
-    workspaceName: workspace.name,
+    organizationId: project.organizationId,
+    projectId: project.id,
+    projectSlug: project.slug,
+    projectName: project.name,
+    workspaceId: project.id,
+    workspaceSlug: project.slug,
+    workspaceName: project.name,
     contributionTypeSlug: type.slug,
     contributionTypeName: type.name,
     autoSubmit: true
@@ -1520,10 +1599,10 @@ async function runInit(args = []) {
   }
   appendLog(
     "info",
-    `init: completed (project=${workspace.slug}, contributionType=${type.slug})`
+    `init: completed (project=${project.slug}, contributionType=${type.slug})`
   );
   p3.outro(
-    `Done. Your next coding session in this repo will upload automatically to ${workspace.name}.`
+    `Done. Your next coding session in this repo will upload automatically to ${project.name}.`
   );
 }
 
@@ -1593,10 +1672,7 @@ async function runLogin(_args = []) {
       process.stdout.write("\r\x1B[K");
     }
     if (verified) {
-      appendLog(
-        "info",
-        `login: reused saved login (email=${verified.email})`
-      );
+      appendLog("info", `login: reused saved login (email=${verified.email})`);
       row(CHECK, "Signed in", cyan(verified.email));
       const fresh = probe.getSessionCookie();
       if (fresh) {
@@ -1737,9 +1813,7 @@ async function runLogout(args = []) {
     footer("Nothing to do.");
     return;
   }
-  println(
-    `  ${CHECK}  ${url ? `Signed out from ${bold(url)}` : "Signed out"}`
-  );
+  println(`  ${CHECK}  ${url ? `Signed out from ${bold(url)}` : "Signed out"}`);
   footer(
     "Per-repo upload hooks still active.",
     "Re-run `npx hillclimb` to re-authenticate a repo."
@@ -1804,7 +1878,7 @@ async function runStatus(args = []) {
   } else {
     row(CROSS, "Login", dim(`couldn't reach ${config.apiBaseUrl}`));
   }
-  row(CHECK, "Project", bold(config.workspaceName));
+  row(CHECK, "Project", bold(config.projectName));
   row(CHECK, "Contribution", bold(config.contributionTypeName));
   row(CHECK, "Repo", bold(repoName));
   let anyHookInstalled = false;
@@ -1845,8 +1919,8 @@ async function runStatus(args = []) {
   if (config.organizationId) {
     debugRow("Legacy org ID:", config.organizationId);
   }
-  const wsIdent = config.workspaceSlug === config.workspaceId ? config.workspaceId : `${config.workspaceSlug} / ${config.workspaceId}`;
-  debugRow("Project:", `${config.workspaceName} (${wsIdent})`);
+  const projectIdent = config.projectSlug === config.projectId ? config.projectId : `${config.projectSlug} / ${config.projectId}`;
+  debugRow("Project:", `${config.projectName} (${projectIdent})`);
   debugRow(
     "Contribution type:",
     `${config.contributionTypeName} (${config.contributionTypeSlug})`
@@ -10365,8 +10439,214 @@ var RedactMiddleware = class {
 // src/middleware/index.ts
 var middleware = [];
 
-// src/normalizer/index.ts
+// src/middleware/secrets.ts
+import fs6 from "fs";
 import path7 from "path";
+var KNOWN_NON_SECRETS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "yes",
+  "no",
+  "on",
+  "off",
+  "localhost",
+  "127.0.0.1",
+  "0.0.0.0",
+  "::1",
+  "development",
+  "production",
+  "staging",
+  "test"
+]);
+var STRUCTURAL_VARS = /* @__PURE__ */ new Set([
+  "PATH",
+  "HOME",
+  "SHELL",
+  "USER",
+  "LOGNAME",
+  "LANG",
+  "TERM",
+  "PWD",
+  "OLDPWD",
+  "HOSTNAME",
+  "DISPLAY",
+  "EDITOR",
+  "VISUAL",
+  "PAGER",
+  "SHLVL",
+  "_",
+  "NODE_ENV"
+]);
+var SENSITIVE_PATTERNS = [
+  /_TOKEN$/,
+  /_SECRET$/,
+  /_KEY$/,
+  /_PASSWORD$/,
+  /_API$/,
+  /_AUTH$/,
+  /_CREDENTIAL$/,
+  /_PASS$/,
+  /SECRET/,
+  /PASSWORD/,
+  /PRIVATE/
+];
+var SENSITIVE_EXACT = /* @__PURE__ */ new Set([
+  "DATABASE_URL",
+  "REDIS_URL",
+  "MONGO_URI",
+  "AWS_ACCESS_KEY_ID",
+  "AWS_SECRET_ACCESS_KEY",
+  "SENTRY_DSN",
+  "SLACK_WEBHOOK_URL",
+  "STRIPE_SK"
+]);
+function isSensitiveKey(key) {
+  if (SENSITIVE_EXACT.has(key)) return true;
+  return SENSITIVE_PATTERNS.some((pattern) => pattern.test(key));
+}
+function isStructuralVar(key) {
+  if (STRUCTURAL_VARS.has(key)) return true;
+  if (key.startsWith("XDG_")) return true;
+  return false;
+}
+function isUsableValue(value) {
+  if (value.length < 4) return false;
+  if (KNOWN_NON_SECRETS.has(value.toLowerCase())) return false;
+  if (/^\d+$/.test(value)) return false;
+  return true;
+}
+async function parseEnvFile(filePath) {
+  const values = [];
+  let content;
+  try {
+    content = await fs6.promises.readFile(filePath, "utf-8");
+  } catch {
+    return values;
+  }
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIndex = trimmed.indexOf("=");
+    if (eqIndex === -1) continue;
+    let value = trimmed.slice(eqIndex + 1).trim();
+    if (value.startsWith('"') || value.startsWith("'")) {
+      const quote = value[0];
+      let end = -1;
+      for (let i = 1; i < value.length; i++) {
+        if (value[i] === "\\" && i + 1 < value.length) {
+          i++;
+          continue;
+        }
+        if (value[i] === quote) {
+          end = i;
+          break;
+        }
+      }
+      if (end !== -1) {
+        value = value.slice(1, end).replace(/\\(.)/g, "$1");
+      } else {
+        value = value.slice(1);
+      }
+    } else {
+      const commentIndex = value.indexOf(" #");
+      if (commentIndex !== -1) {
+        value = value.slice(0, commentIndex);
+      }
+      value = value.trim();
+    }
+    if (!value) continue;
+    values.push(value);
+  }
+  return values;
+}
+function addWithVariants(set, value) {
+  set.add(value);
+  const encoded = encodeURIComponent(value);
+  if (encoded !== value) {
+    set.add(encoded);
+  }
+  if (value.includes("://")) {
+    try {
+      const url = new URL(value);
+      if (url.password) {
+        const rawPassword = url.password;
+        set.add(rawPassword);
+        const decodedPassword = decodeURIComponent(rawPassword);
+        if (decodedPassword !== rawPassword) {
+          set.add(decodedPassword);
+        }
+        const encodedPw = encodeURIComponent(decodedPassword);
+        if (encodedPw !== decodedPassword && encodedPw !== rawPassword) {
+          set.add(encodedPw);
+        }
+      }
+    } catch {
+    }
+  }
+}
+async function discoverEnvFiles(repoRoot) {
+  let entries;
+  try {
+    entries = await fs6.promises.readdir(repoRoot);
+  } catch {
+    return [];
+  }
+  const envFiles = [];
+  for (const name of entries) {
+    if (!name.startsWith(".env")) continue;
+    const filePath = path7.join(repoRoot, name);
+    try {
+      const stat = await fs6.promises.stat(filePath);
+      if (stat.isFile()) envFiles.push(name);
+    } catch {
+    }
+  }
+  return envFiles;
+}
+async function collectSecrets(repoRoot, envFiles, additionalFiles) {
+  const values = /* @__PURE__ */ new Set();
+  const sourceFiles = [];
+  let processEnvCount = 0;
+  let skippedCount = 0;
+  for (const filePath of envFiles) {
+    sourceFiles.push(filePath);
+    for (const value of await parseEnvFile(filePath)) {
+      if (isUsableValue(value)) {
+        addWithVariants(values, value);
+      } else {
+        skippedCount++;
+      }
+    }
+  }
+  for (const filePath of additionalFiles) {
+    const resolved = path7.resolve(repoRoot, filePath);
+    sourceFiles.push(resolved);
+    for (const value of await parseEnvFile(resolved)) {
+      if (isUsableValue(value)) {
+        addWithVariants(values, value);
+      } else {
+        skippedCount++;
+      }
+    }
+  }
+  for (const [key, value] of Object.entries(process.env)) {
+    if (!value) continue;
+    if (isStructuralVar(key)) continue;
+    if (!isSensitiveKey(key)) continue;
+    if (isUsableValue(value)) {
+      addWithVariants(values, value);
+      processEnvCount++;
+    } else {
+      skippedCount++;
+    }
+  }
+  return { values, sourceFiles, processEnvCount, skippedCount };
+}
+
+// src/normalizer/index.ts
+import path8 from "path";
 
 // src/normalizer/claude.ts
 function stringify(value) {
@@ -10771,8 +11051,7 @@ function convertClaudeToTrajectory(jsonlContent, sessionId) {
     finalExtra.service_tiers = [...serviceTiers].sort();
   if (cacheCreationSeen)
     finalExtra.total_cache_creation_input_tokens = cacheCreationTotal;
-  if (cacheReadSeen)
-    finalExtra.total_cache_read_input_tokens = cacheReadTotal;
+  if (cacheReadSeen) finalExtra.total_cache_read_input_tokens = cacheReadTotal;
   const finalMetrics = {
     total_prompt_tokens: promptValues.length > 0 ? promptValues.reduce((a, b) => a + b, 0) : void 0,
     total_completion_tokens: completionValues.length > 0 ? completionValues.reduce((a, b) => a + b, 0) : void 0,
@@ -10830,7 +11109,8 @@ function convertEventToStep(event, stepId, defaultModelName) {
     };
     const observation = event.output !== void 0 ? { results: [observationResult] } : void 0;
     const extra = { ...event.extra ?? {} };
-    if (event.metadata !== void 0) extra.metadata = extra.metadata ?? event.metadata;
+    if (event.metadata !== void 0)
+      extra.metadata = extra.metadata ?? event.metadata;
     if (event.raw_arguments !== void 0)
       extra.raw_arguments = extra.raw_arguments ?? event.raw_arguments;
     if (event.status !== void 0) extra.status = extra.status ?? event.status;
@@ -10902,7 +11182,7 @@ function convertCodexToTrajectory(jsonlContent, sessionId) {
   const sessionMeta = rawEvents.find((e) => e.type === "session_meta");
   const metaPayload = sessionMeta?.payload ?? {};
   const sid = sessionId ?? metaPayload.id ?? "";
-  let agentVersion = metaPayload.cli_version ?? "unknown";
+  const agentVersion = metaPayload.cli_version ?? "unknown";
   const agentExtra = {};
   for (const key of ["originator", "cwd", "git", "instructions"]) {
     const value = metaPayload[key];
@@ -11020,7 +11300,6 @@ function convertCodexToTrajectory(jsonlContent, sessionId) {
       callInfo.timestamp = callInfo.timestamp ?? timestamp;
       normalizedEvents.push(callInfo);
       pendingReasoning = void 0;
-      continue;
     }
   }
   const steps = [];
@@ -11235,7 +11514,7 @@ var NormalizeMiddleware = class {
       if (!["claude", "codex", "cursor"].includes(file.sourceName)) continue;
       const content = file.content ? file.content.toString("utf-8") : null;
       if (!content) continue;
-      const sessionId = file.metadata?.sessionId ?? path7.basename(file.absolutePath, ".jsonl");
+      const sessionId = file.metadata?.sessionId ?? path8.basename(file.absolutePath, ".jsonl");
       try {
         const trajectory = normalizeContent(
           file.sourceName,
@@ -11248,10 +11527,7 @@ var NormalizeMiddleware = class {
           null,
           2
         );
-        const atifPath = file.absolutePath.replace(
-          /\.jsonl$/,
-          ".atif.json"
-        );
+        const atifPath = file.absolutePath.replace(/\.jsonl$/, ".atif.json");
         newFiles.push({
           sourceName: file.sourceName,
           absolutePath: atifPath,
@@ -11266,212 +11542,6 @@ var NormalizeMiddleware = class {
   }
 };
 
-// src/middleware/secrets.ts
-import fs6 from "fs";
-import path8 from "path";
-var KNOWN_NON_SECRETS = /* @__PURE__ */ new Set([
-  "true",
-  "false",
-  "null",
-  "undefined",
-  "yes",
-  "no",
-  "on",
-  "off",
-  "localhost",
-  "127.0.0.1",
-  "0.0.0.0",
-  "::1",
-  "development",
-  "production",
-  "staging",
-  "test"
-]);
-var STRUCTURAL_VARS = /* @__PURE__ */ new Set([
-  "PATH",
-  "HOME",
-  "SHELL",
-  "USER",
-  "LOGNAME",
-  "LANG",
-  "TERM",
-  "PWD",
-  "OLDPWD",
-  "HOSTNAME",
-  "DISPLAY",
-  "EDITOR",
-  "VISUAL",
-  "PAGER",
-  "SHLVL",
-  "_",
-  "NODE_ENV"
-]);
-var SENSITIVE_PATTERNS = [
-  /_TOKEN$/,
-  /_SECRET$/,
-  /_KEY$/,
-  /_PASSWORD$/,
-  /_API$/,
-  /_AUTH$/,
-  /_CREDENTIAL$/,
-  /_PASS$/,
-  /SECRET/,
-  /PASSWORD/,
-  /PRIVATE/
-];
-var SENSITIVE_EXACT = /* @__PURE__ */ new Set([
-  "DATABASE_URL",
-  "REDIS_URL",
-  "MONGO_URI",
-  "AWS_ACCESS_KEY_ID",
-  "AWS_SECRET_ACCESS_KEY",
-  "SENTRY_DSN",
-  "SLACK_WEBHOOK_URL",
-  "STRIPE_SK"
-]);
-function isSensitiveKey(key) {
-  if (SENSITIVE_EXACT.has(key)) return true;
-  return SENSITIVE_PATTERNS.some((pattern) => pattern.test(key));
-}
-function isStructuralVar(key) {
-  if (STRUCTURAL_VARS.has(key)) return true;
-  if (key.startsWith("XDG_")) return true;
-  return false;
-}
-function isUsableValue(value) {
-  if (value.length < 4) return false;
-  if (KNOWN_NON_SECRETS.has(value.toLowerCase())) return false;
-  if (/^\d+$/.test(value)) return false;
-  return true;
-}
-async function parseEnvFile(filePath) {
-  const values = [];
-  let content;
-  try {
-    content = await fs6.promises.readFile(filePath, "utf-8");
-  } catch {
-    return values;
-  }
-  for (const line of content.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const eqIndex = trimmed.indexOf("=");
-    if (eqIndex === -1) continue;
-    let value = trimmed.slice(eqIndex + 1).trim();
-    if (value.startsWith('"') || value.startsWith("'")) {
-      const quote = value[0];
-      let end = -1;
-      for (let i = 1; i < value.length; i++) {
-        if (value[i] === "\\" && i + 1 < value.length) {
-          i++;
-          continue;
-        }
-        if (value[i] === quote) {
-          end = i;
-          break;
-        }
-      }
-      if (end !== -1) {
-        value = value.slice(1, end).replace(/\\(.)/g, "$1");
-      } else {
-        value = value.slice(1);
-      }
-    } else {
-      const commentIndex = value.indexOf(" #");
-      if (commentIndex !== -1) {
-        value = value.slice(0, commentIndex);
-      }
-      value = value.trim();
-    }
-    if (!value) continue;
-    values.push(value);
-  }
-  return values;
-}
-function addWithVariants(set, value) {
-  set.add(value);
-  const encoded = encodeURIComponent(value);
-  if (encoded !== value) {
-    set.add(encoded);
-  }
-  if (value.includes("://")) {
-    try {
-      const url = new URL(value);
-      if (url.password) {
-        const rawPassword = url.password;
-        set.add(rawPassword);
-        const decodedPassword = decodeURIComponent(rawPassword);
-        if (decodedPassword !== rawPassword) {
-          set.add(decodedPassword);
-        }
-        const encodedPw = encodeURIComponent(decodedPassword);
-        if (encodedPw !== decodedPassword && encodedPw !== rawPassword) {
-          set.add(encodedPw);
-        }
-      }
-    } catch {
-    }
-  }
-}
-async function discoverEnvFiles(repoRoot) {
-  let entries;
-  try {
-    entries = await fs6.promises.readdir(repoRoot);
-  } catch {
-    return [];
-  }
-  const envFiles = [];
-  for (const name of entries) {
-    if (!name.startsWith(".env")) continue;
-    const filePath = path8.join(repoRoot, name);
-    try {
-      const stat = await fs6.promises.stat(filePath);
-      if (stat.isFile()) envFiles.push(name);
-    } catch {
-    }
-  }
-  return envFiles;
-}
-async function collectSecrets(repoRoot, envFiles, additionalFiles) {
-  const values = /* @__PURE__ */ new Set();
-  const sourceFiles = [];
-  let processEnvCount = 0;
-  let skippedCount = 0;
-  for (const filePath of envFiles) {
-    sourceFiles.push(filePath);
-    for (const value of await parseEnvFile(filePath)) {
-      if (isUsableValue(value)) {
-        addWithVariants(values, value);
-      } else {
-        skippedCount++;
-      }
-    }
-  }
-  for (const filePath of additionalFiles) {
-    const resolved = path8.resolve(repoRoot, filePath);
-    sourceFiles.push(resolved);
-    for (const value of await parseEnvFile(resolved)) {
-      if (isUsableValue(value)) {
-        addWithVariants(values, value);
-      } else {
-        skippedCount++;
-      }
-    }
-  }
-  for (const [key, value] of Object.entries(process.env)) {
-    if (!value) continue;
-    if (isStructuralVar(key)) continue;
-    if (!isSensitiveKey(key)) continue;
-    if (isUsableValue(value)) {
-      addWithVariants(values, value);
-      processEnvCount++;
-    } else {
-      skippedCount++;
-    }
-  }
-  return { values, sourceFiles, processEnvCount, skippedCount };
-}
-
 // src/outputs/platform.ts
 import { PassThrough } from "stream";
 import archiver from "archiver";
@@ -11532,14 +11602,14 @@ var PlatformUploadOutput = class {
     const buffer = await buildZipBuffer(group, selectedSources);
     const {
       client,
-      workspaceId,
+      projectId,
       contributionTypeSlug,
       contributionTitle,
       contributionBody,
       zipFilename,
       autoSubmit
     } = this.opts;
-    const contribution = await client.createContribution(workspaceId, {
+    const contribution = await client.createContribution(projectId, {
       contributionTypeSlug,
       title: contributionTitle,
       body: contributionBody
@@ -11549,7 +11619,10 @@ var PlatformUploadOutput = class {
       mimeType: "application/zip",
       sizeBytes: buffer.byteLength
     });
-    appendLog("info", `uploading ${zipFilename} (${buffer.byteLength} bytes) to presigned URL`);
+    appendLog(
+      "info",
+      `uploading ${zipFilename} (${buffer.byteLength} bytes) to presigned URL`
+    );
     await client.uploadToPresignedUrl(
       presigned.presignedUrl,
       presigned.headers,
@@ -11821,7 +11894,7 @@ Uploaded: ${now.toISOString()}`;
   const zipFilename = `${sourceTool}-${sanitize(shortId)}-${epochSeconds}.zip`;
   const output = new PlatformUploadOutput({
     client,
-    workspaceId: config.workspaceId,
+    projectId: config.projectId,
     contributionTypeSlug: config.contributionTypeSlug,
     contributionTitle: title,
     contributionBody: body,
@@ -11835,7 +11908,7 @@ Uploaded: ${now.toISOString()}`;
     });
     appendLog(
       "info",
-      `Uploaded session ${sessionId} to workspace ${config.workspaceSlug} (${config.workspaceId}) as contribution ${contributionId}`
+      `Uploaded session ${sessionId} to project ${config.projectSlug} (${config.projectId}) as contribution ${contributionId}`
     );
   } catch (err) {
     if (err instanceof PlatformError && err.status === 401) {
@@ -12436,7 +12509,10 @@ async function acquireLock(repoRoot, tool, retries = 3, delayMs = 200) {
   await fs10.promises.mkdir(STATE_DIR, { recursive: true, mode: 448 });
   for (let i = 0; i < retries; i++) {
     try {
-      const fd = await fs10.promises.open(lockPath, fs10.constants.O_CREAT | fs10.constants.O_EXCL | fs10.constants.O_WRONLY);
+      const fd = await fs10.promises.open(
+        lockPath,
+        fs10.constants.O_CREAT | fs10.constants.O_EXCL | fs10.constants.O_WRONLY
+      );
       await fd.write(String(process.pid));
       await fd.close();
       return fd.fd;
@@ -12712,7 +12788,7 @@ async function handleStop(payload, tool) {
       const epochSeconds = formatEpochSeconds2(now);
       const shortId = state.sessionId.slice(0, 12);
       const contribution = await client.createContribution(
-        project.config.workspaceId,
+        project.config.projectId,
         {
           contributionTypeSlug: GIT_TRACES_SLUG,
           title: `${toolLabel} session ${shortId} \u2014 ${epochSeconds}`,
@@ -13773,12 +13849,12 @@ async function main() {
     case "-h":
     case "help": {
       process.stdout.write(
-        "Usage: npx hillclimb [subcommand]\n\nSubcommands:\n  (none)   Configure this repo for automatic upload\n  init     Configure this repo for automatic upload (--login forces fresh sign-in)\n  export   Interactive export flow (manual use)\n  login    Sign in and save the credential for reuse across repos\n  logout   Clear the saved sign-in (pass --url <api> to scope to one instance)\n  status   Show whether you're signed in and this repo is connected (pass --debug for details)\n  upload   Hook entry point \u2014 reads JSON payload from stdin and uploads one session\n  help     Show this message\n"
+        "Usage: npx hillclimb [subcommand]\n\nSubcommands:\n  (none)   Configure this repo for automatic upload\n  init     Configure this repo for automatic upload (--project scopes setup, --login forces fresh sign-in)\n  export   Interactive export flow (manual use)\n  login    Sign in and save the credential for reuse across repos\n  logout   Clear the saved sign-in (pass --url <api> to scope to one instance)\n  status   Show whether you're signed in and this repo is connected (pass --debug for details)\n  upload   Hook entry point \u2014 reads JSON payload from stdin and uploads one session\n  help     Show this message\n"
       );
       return;
     }
     default:
-      if (subcommand === "--login" || subcommand === "--workspace" || subcommand.startsWith("--workspace=")) {
+      if (subcommand === "--login" || subcommand === "--project" || subcommand.startsWith("--project=") || subcommand === "--workspace" || subcommand.startsWith("--workspace=")) {
         await runInit([subcommand, ...rest]);
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hillclimb",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Extract and export AI coding tool logs grouped by repo",
   "license": "MIT",
   "type": "module",