hillclimb 0.1.4 → 0.1.5

package/dist/cli.js

@@ -382,7 +382,6 @@ var PlatformClient = class {
     if (!data?.session?.user || !data.session.session) return null;
     return {
       session: {
-        activeOrganizationId: data.session.session.activeOrganizationId ?? null,
         userId: data.session.user.id ?? "",
         email: data.session.user.email ?? "",
         role: data.session.user.role ?? null
@@ -391,24 +390,18 @@ var PlatformClient = class {
         id: o.id,
         name: o.name,
         slug: o.slug
+      })),
+      projects: (data.projects ?? []).map((p7) => ({
+        id: p7.id,
+        name: p7.name,
+        slug: p7.slug
       }))
     };
   }
-  async setActiveOrganization(organizationId) {
-    await this.request("POST", "/api/auth/organization/set-active", {
-      organizationId
-    });
-  }
-  async setActiveOrganizationAsAdmin(organizationId) {
-    await this.request(
-      "POST",
-      `/api/v1/admin/organizations/${organizationId}/set-active`
-    );
-  }
-  async listWorkspaces(organizationId) {
+  async listProjects() {
     const data = await this.request(
       "GET",
-      `/api/v1/organizations/${organizationId}/workspaces`
+      "/api/v1/projects"
     );
     return data.workspaces ?? [];
   }
@@ -507,8 +500,8 @@ var PlatformClient = class {
 import fs4 from "fs";
 import os2 from "os";
 import path5 from "path";
-var HOOK_CMD = (sub) => `npx hillclimb ${sub}`;
-var GIT_TRACES_CMD = (tool) => `npx hillclimb git-traces --tool=${tool}`;
+var HOOK_CMD = (sub) => `npx hillclimb@latest ${sub}`;
+var GIT_TRACES_CMD = (tool) => `npx hillclimb@latest git-traces --tool=${tool}`;
 var TOOLS = [
   {
     tool: "claude",
@@ -542,7 +535,7 @@ var TOOLS = [
     // a plugin file at .opencode/plugins/hillclimb.js — auto-discovered by
     // opencode with no registration. The plugin subscribes to session.created
     // (SessionStart), session.idle (Stop, per-turn), and
-    // server.instance.disposed (SessionEnd) and shells out to `npx hillclimb`.
+    // server.instance.disposed (SessionEnd) and shells out to `npx hillclimb@latest`.
     tool: "opencode",
     label: "opencode",
     settingsFile: ".opencode/plugins/hillclimb.js",
@@ -737,7 +730,7 @@ function copilotUninstall(settings, eventName, command) {
   }
   return true;
 }
-var OPENCODE_PLUGIN_VERSION = 2;
+var OPENCODE_PLUGIN_VERSION = 3;
 var OPENCODE_PLUGIN_MARKER = `// HILLCLIMB_OPENCODE_PLUGIN_VERSION=${OPENCODE_PLUGIN_VERSION}`;
 var OPENCODE_PLUGIN_CONTENT = `${OPENCODE_PLUGIN_MARKER}
 // Auto-installed by \`npx hillclimb\`. Do not edit manually \u2014 re-running
@@ -785,7 +778,7 @@ function writeTranscript(sessionID) {
 function spawnHillclimb(subcommand, payload) {
   try {
     const args = subcommand.split(" ").filter(Boolean);
-    const child = spawn("npx", ["hillclimb"].concat(args), {
+    const child = spawn("npx", ["hillclimb@latest"].concat(args), {
       detached: true,
       stdio: ["pipe", "ignore", "ignore"],
     });
@@ -936,10 +929,11 @@ function uninstall(settings, format, eventName, command) {
   }
 }
 function legacyCommandsFor(command) {
-  const prefix = "npx hillclimb ";
+  const prefix = "npx hillclimb@latest ";
   if (!command.startsWith(prefix)) return [];
   const sub = command.slice(prefix.length);
   const legacy = [
+    `npx hillclimb ${sub}`,
     `hillclimb-extract ${sub}`,
     `npx hillclimb-extract ${sub}`,
     `npx @hillclimb/extract ${sub}`
@@ -947,6 +941,7 @@ function legacyCommandsFor(command) {
   const toolMatch = sub.match(/^(\S+)\s+--tool=\S+$/);
   if (toolMatch) {
     const bareSub = toolMatch[1];
+    legacy.push(`npx hillclimb@latest ${bareSub}`);
     legacy.push(`npx hillclimb ${bareSub}`);
   }
   return legacy;
@@ -1039,20 +1034,45 @@ async function ensureCodexHooksEnabled() {
       });
       await fs4.promises.writeFile(
         CODEX_CONFIG_PATH,
-        "[features]\ncodex_hooks = true\n"
+        "[features]\nhooks = true\n"
       );
       return true;
     }
     throw err;
   }
-  if (/codex_hooks\s*=\s*true/i.test(content)) return false;
+  const original = content;
+  content = content.replace(
+    /^\s*codex_hooks\s*=\s*(true|false)\s*(?:#.*)?\r?\n?/gim,
+    ""
+  );
   const featuresMatch = content.match(/^\[features\]\s*$/m);
   if (featuresMatch) {
-    const idx = featuresMatch.index + featuresMatch[0].length;
-    content = content.slice(0, idx) + "\ncodex_hooks = true" + content.slice(idx);
+    const matchIndex = featuresMatch.index;
+    if (matchIndex === void 0) {
+      throw new Error("Could not locate [features] section.");
+    }
+    const bodyStart = matchIndex + featuresMatch[0].length;
+    const nextSectionOffset = content.slice(bodyStart).search(/\n\[[^\n]+\]\s*(?:\r?\n|$)/);
+    const bodyEnd = nextSectionOffset === -1 ? content.length : bodyStart + nextSectionOffset;
+    const body = content.slice(bodyStart, bodyEnd);
+    const hooksMatch = body.match(/^(\s*)hooks\s*=\s*(true|false)(.*)$/im);
+    if (hooksMatch?.[2]?.toLowerCase() === "true") {
+    } else if (hooksMatch?.index !== void 0) {
+      const lineStart = bodyStart + hooksMatch.index;
+      const lineEnd = lineStart + hooksMatch[0].length;
+      content = content.slice(0, lineStart) + `${hooksMatch[1]}hooks = true${hooksMatch[3]}` + content.slice(lineEnd);
+    } else {
+      content = `${content.slice(0, bodyStart)}
+hooks = true${content.slice(bodyStart)}`;
+    }
   } else {
-    content = content.trimEnd() + "\n\n[features]\ncodex_hooks = true\n";
+    content = `${content.trimEnd()}
+
+[features]
+hooks = true
+`;
   }
+  if (content === original) return false;
   await fs4.promises.writeFile(CODEX_CONFIG_PATH, content);
   return true;
 }
@@ -1312,130 +1332,61 @@ async function runInit(args = []) {
       );
     }
   }
-  let activeOrgId = bootstrap.session.activeOrganizationId;
-  const orgs = bootstrap.organizations;
-  const isAdmin = bootstrap.session.role === "admin";
-  if (orgs.length === 0 && !isAdmin) {
-    p3.log.error(
-      "You do not belong to any organization. Ask a platform admin to add you."
-    );
-    p3.outro("Aborted.");
-    process.exit(1);
-  }
-  let pickedId;
   let workspace;
   if (workspaceSlugFlag) {
     const resolved = await withSpinner(
-      `Looking up workspace "${workspaceSlugFlag}"...`,
-      (w) => `Found workspace: ${w.name}`,
-      `Could not find workspace "${workspaceSlugFlag}".`,
+      `Looking up project "${workspaceSlugFlag}"...`,
+      (w) => `Found project: ${w.name}`,
+      `Could not find project "${workspaceSlugFlag}".`,
       () => client.getWorkspaceBySlug(workspaceSlugFlag)
     );
     if (resolved.status !== "active") {
       p3.log.error(
-        `Workspace "${resolved.name}" is ${resolved.status}. Only active workspaces can be initialized.`
+        `Project "${resolved.name}" is ${resolved.status}. Only active projects can be initialized.`
       );
       p3.outro("Aborted.");
       process.exit(1);
     }
-    pickedId = resolved.organizationId;
     workspace = resolved;
     appendLog(
       "info",
-      `init: workspace pre-scoped (slug=${workspaceSlugFlag}, id=${resolved.id}, orgId=${pickedId})`
+      `init: project pre-scoped (slug=${workspaceSlugFlag}, id=${resolved.id})`
     );
-    const belongs = orgs.some((o) => o.id === pickedId);
-    if (!belongs && !isAdmin) {
-      p3.log.error(
-        "You do not have access to this workspace's organization."
-      );
-      p3.outro("Aborted.");
-      process.exit(1);
-    }
-    if (pickedId !== activeOrgId) {
-      try {
-        if (isAdmin) {
-          await client.setActiveOrganizationAsAdmin(pickedId);
-        } else {
-          await client.setActiveOrganization(pickedId);
-        }
-      } catch (err) {
-        appendLog("error", `init: setActiveOrganization failed: ${formatError(err)}`);
-        p3.log.error(err instanceof Error ? err.message : String(err));
-        p3.outro("Aborted.");
-        process.exit(1);
-      }
-    }
-    activeOrgId = pickedId;
   } else {
-    if (orgs.length === 1) {
-      const only = orgs[0];
-      if (!only) {
-        p3.log.error("Unexpected empty organization list.");
-        p3.outro("Aborted.");
-        process.exit(1);
-      }
-      pickedId = only.id;
-      p3.log.info(`Using organization: ${only.name}`);
-    } else {
-      const selected = await p3.select({
-        message: "Select an organization",
-        options: orgs.map((o) => ({
-          value: o.id,
-          label: o.name,
-          hint: o.id === activeOrgId ? `${o.slug ?? ""} (active)` : o.slug ?? ""
-        })),
-        initialValue: activeOrgId ?? orgs[0]?.id
-      });
-      if (p3.isCancel(selected)) {
-        p3.cancel("Cancelled.");
-        process.exit(0);
-      }
-      pickedId = selected;
-    }
-    if (pickedId !== activeOrgId) {
-      try {
-        if (isAdmin) {
-          await client.setActiveOrganizationAsAdmin(pickedId);
-        } else {
-          await client.setActiveOrganization(pickedId);
-        }
-      } catch (err) {
-        appendLog("error", `init: setActiveOrganization failed: ${formatError(err)}`);
-        p3.log.error(err instanceof Error ? err.message : String(err));
-        p3.outro("Aborted.");
-        process.exit(1);
-      }
-    }
-    activeOrgId = pickedId;
     const workspaces = await withSpinner(
-      "Loading workspaces...",
-      (ws) => `Found ${ws.length} workspace(s).`,
-      "Could not list workspaces.",
-      () => client.listWorkspaces(pickedId)
+      "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) {
       p3.log.error(
-        "This organization has no workspaces. Create one in the web UI first."
+        "You do not have access to any projects. Create one in the web UI first."
       );
       p3.outro("Aborted.");
       process.exit(1);
     }
-    const selectedWorkspaceId = await p3.select({
-      message: "Select a workspace",
-      options: workspaceChoices.map((w) => ({
-        value: w.id,
-        label: w.name,
-        hint: `${w.slug} (${w.status})`
-      }))
-    });
-    if (p3.isCancel(selectedWorkspaceId)) {
-      p3.cancel("Cancelled.");
-      process.exit(0);
+    let picked;
+    if (workspaceChoices.length === 1) {
+      picked = workspaceChoices[0];
+      p3.log.info(`Using project: ${picked.name}`);
+    } else {
+      const selectedWorkspaceId = await p3.select({
+        message: "Select a project",
+        options: workspaceChoices.map((w) => ({
+          value: w.id,
+          label: w.name,
+          hint: `${w.slug} (${w.status})`
+        }))
+      });
+      if (p3.isCancel(selectedWorkspaceId)) {
+        p3.cancel("Cancelled.");
+        process.exit(0);
+      }
+      picked = workspaceChoices.find((w) => w.id === selectedWorkspaceId);
     }
-    const picked = workspaceChoices.find((w) => w.id === selectedWorkspaceId);
     if (!picked) {
       p3.log.error("Invalid workspace selection.");
       p3.outro("Aborted.");
@@ -1444,7 +1395,7 @@ async function runInit(args = []) {
     workspace = picked;
     appendLog(
       "info",
-      `init: workspace selected (slug=${workspace.slug}, id=${workspace.id}, orgId=${pickedId})`
+      `init: project selected (slug=${workspace.slug}, id=${workspace.id})`
     );
   }
   const types = await withSpinner(
@@ -1455,7 +1406,7 @@ async function runInit(args = []) {
   );
   if (types.length === 0) {
     p3.log.error(
-      `Workspace "${workspace.name}" has no contribution types. Create one in the web UI first.`
+      `Project "${workspace.name}" has no contribution types. Create one in the web UI first.`
     );
     p3.outro("Aborted.");
     process.exit(1);
@@ -1468,7 +1419,7 @@ async function runInit(args = []) {
     p3.log.info(`Using contribution type: ${type.name}`);
   } else {
     p3.log.warn(
-      'Could not find the default "Agent Traces" contribution type in this workspace. Please contact the workspace maintainer.'
+      'Could not find the default "Agent Traces" contribution type in this project. Please contact the project maintainer.'
     );
     const selectedTypeId = await p3.select({
       message: "Select a contribution type",
@@ -1500,11 +1451,9 @@ async function runInit(args = []) {
     "info",
     `init: contribution type selected (slug=${type.slug}, name=${type.name})`
   );
-  const pickedOrg = orgs.find((o) => o.id === activeOrgId);
   await upsertProject(repoRoot, {
     apiBaseUrl,
-    organizationId: activeOrgId,
-    organizationName: pickedOrg?.name,
+    organizationId: workspace.organizationId,
     workspaceId: workspace.id,
     workspaceSlug: workspace.slug,
     workspaceName: workspace.name,
@@ -1548,19 +1497,16 @@ async function runInit(args = []) {
         try {
           const changed = await ensureCodexHooksEnabled();
           if (changed) {
-            appendLog(
-              "info",
-              "init: enabled codex_hooks in ~/.codex/config.toml"
-            );
-            p3.log.success("Enabled codex_hooks in ~/.codex/config.toml");
+            appendLog("info", "init: enabled hooks in ~/.codex/config.toml");
+            p3.log.success("Enabled hooks in ~/.codex/config.toml");
           }
         } catch (err) {
           appendLog(
             "warn",
-            `init: could not enable codex_hooks: ${formatError(err)}`
+            `init: could not enable Codex hooks: ${formatError(err)}`
           );
           p3.log.warn(
-            `Could not enable codex_hooks in config.toml: ${err instanceof Error ? err.message : String(err)}`
+            `Could not enable hooks in config.toml: ${err instanceof Error ? err.message : String(err)}`
           );
         }
       }
@@ -1575,7 +1521,7 @@ async function runInit(args = []) {
   }
   appendLog(
     "info",
-    `init: completed (workspace=${workspace.slug}, contributionType=${type.slug})`
+    `init: completed (project=${workspace.slug}, contributionType=${type.slug})`
   );
   p3.outro(
     `Done. Your next coding session in this repo will upload automatically to ${workspace.name}.`
@@ -1827,18 +1773,19 @@ async function runStatus(args = []) {
   const identity = await loadIdentity(config.apiBaseUrl);
   let signedInEmail = null;
   let loginError = null;
-  let orgNameFromBootstrap = null;
   if (!identity) {
     loginError = "expired";
   } else {
-    const client = new PlatformClient(config.apiBaseUrl, identity.sessionCookie);
+    const client = new PlatformClient(
+      config.apiBaseUrl,
+      identity.sessionCookie
+    );
     try {
       const bootstrap = await client.getBootstrap();
       if (!bootstrap) {
         loginError = "expired";
       } else {
         signedInEmail = bootstrap.session.email;
-        orgNameFromBootstrap = bootstrap.organizations.find((o) => o.id === config.organizationId)?.name ?? null;
       }
     } catch (err) {
       if (err instanceof PlatformError && err.status === 401) {
@@ -1858,9 +1805,7 @@ async function runStatus(args = []) {
   } else {
     row(CROSS, "Login", dim(`couldn't reach ${config.apiBaseUrl}`));
   }
-  const orgDisplay = config.organizationName ?? orgNameFromBootstrap ?? config.organizationId;
-  row(CHECK, "Organization", bold(orgDisplay));
-  row(CHECK, "Workspace", bold(config.workspaceName));
+  row(CHECK, "Project", bold(config.workspaceName));
   row(CHECK, "Contribution", bold(config.contributionTypeName));
   row(CHECK, "Repo", bold(repoName));
   let anyHookInstalled = false;
@@ -1898,9 +1843,11 @@ async function runStatus(args = []) {
   debugRow("Configured repos:", String(Object.keys(projects.projects).length));
   debugRow("Repo root:", repoRoot);
   debugRow("API URL:", config.apiBaseUrl);
-  debugRow("Organization ID:", config.organizationId);
+  if (config.organizationId) {
+    debugRow("Legacy org ID:", config.organizationId);
+  }
   const wsIdent = config.workspaceSlug === config.workspaceId ? config.workspaceId : `${config.workspaceSlug} / ${config.workspaceId}`;
-  debugRow("Workspace:", `${config.workspaceName} (${wsIdent})`);
+  debugRow("Project:", `${config.workspaceName} (${wsIdent})`);
   debugRow(
     "Contribution type:",
     `${config.contributionTypeName} (${config.contributionTypeSlug})`
@@ -11717,13 +11664,8 @@ async function readStdin() {
 function sanitize(value) {
   return value.replace(/[^a-zA-Z0-9._-]/g, "_");
 }
-function formatTimestamp(date) {
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}-${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
-}
-function formatTitleTimestamp(date) {
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
+function formatEpochSeconds(date) {
+  return String(Math.floor(date.getTime() / 1e3));
 }
 function lineHasAssistant(line) {
   return line.includes('"type":"assistant"') || line.includes('"role":"assistant"') || line.includes('"type":"assistant.');
@@ -11871,12 +11813,13 @@ async function uploadSession(args) {
     opencode: "opencode"
   };
   const toolLabel = toolLabels[sourceTool] ?? "Claude";
-  const title = `${toolLabel} session ${shortId} \u2014 ${formatTitleTimestamp(now)}`;
+  const epochSeconds = formatEpochSeconds(now);
+  const title = `${toolLabel} session ${shortId} \u2014 ${epochSeconds}`;
   const body = `Session ID: ${sessionId}
 Tool: ${toolLabel}
 Repo: ${repoRoot}
 Uploaded: ${now.toISOString()}`;
-  const zipFilename = `${sourceTool}-${sanitize(shortId)}-${formatTimestamp(now)}.zip`;
+  const zipFilename = `${sourceTool}-${sanitize(shortId)}-${epochSeconds}.zip`;
   const output = new PlatformUploadOutput({
     client,
     workspaceId: config.workspaceId,
@@ -12519,9 +12462,8 @@ async function releaseLock(repoRoot, tool) {
 var CLI_VERSION = "0.1.0";
 var GIT_TRACES_SLUG = "git-traces";
 var MAX_UPLOAD_BYTES = 500 * 1024 * 1024;
-function formatTitleTimestamp2(date) {
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
+function formatEpochSeconds2(date) {
+  return String(Math.floor(date.getTime() / 1e3));
 }
 var TOOL_LABELS = {
   cursor: "Cursor",
@@ -12768,12 +12710,13 @@ async function handleStop(payload, tool) {
       if (!artifacts) return;
       const toolLabel = TOOL_LABELS[tool] ?? "Claude";
       const now = /* @__PURE__ */ new Date();
+      const epochSeconds = formatEpochSeconds2(now);
       const shortId = state.sessionId.slice(0, 12);
       const contribution = await client.createContribution(
         project.config.workspaceId,
         {
           contributionTypeSlug: GIT_TRACES_SLUG,
-          title: `${toolLabel} session ${shortId} \u2014 ${formatTitleTimestamp2(now)}`,
+          title: `${toolLabel} session ${shortId} \u2014 ${epochSeconds}`,
           body: `Session ID: ${state.sessionId}
 Tool: ${toolLabel}
 Repo: ${cwd}
@@ -13130,9 +13073,8 @@ var ZipOutput = class {
     const repoName = sanitizeFilename(path15.basename(group.repoPath));
     const timeRange = options.timeRange;
     const rangePart = timeRange?.label ?? "all";
-    const now = /* @__PURE__ */ new Date();
-    const timestamp = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, "0")}${String(now.getDate()).padStart(2, "0")}-${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(2, "0")}`;
-    const baseName = `logs-${repoName}-${rangePart}-${timestamp}`;
+    const epochSeconds = Math.floor(Date.now() / 1e3);
+    const baseName = `logs-${repoName}-${rangePart}-${epochSeconds}`;
     const outputPath = getUniqueFilename(downloadsDir, baseName, ".zip");
     const output = fs12.createWriteStream(outputPath);
     const archive = archiver2("zip", { zlib: { level: 6 } });

package/package.json

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