hillclimb 0.1.6 → 0.1.7

package/dist/cli.js

@@ -501,6 +501,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 +509,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 +598,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 +606,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 +629,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 +679,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 +691,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 +703,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 +723,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 +735,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 +918,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 +982,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 +1008,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}`);
     }
   }

package/package.json

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