haansi 0.1.27 → 0.1.29

package/dist/haansi.js

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "haansi",
-      version: "0.1.27",
+      version: "0.1.29",
       description: "Haansi CLI - Session collector and MCP server for Claude Code & OpenAI Codex",
       bin: {
         haansi: "./dist/haansi.js"
@@ -945,25 +945,55 @@ function edgeScrub(content) {
   }
   return result;
 }
+function resolveGitBin() {
+  if (resolvedGitBin !== void 0) return resolvedGitBin;
+  for (const bin of GIT_BIN_CANDIDATES) {
+    try {
+      (0, import_child_process.execFileSync)(bin, ["--version"], { timeout: 5e3, stdio: "pipe" });
+      resolvedGitBin = bin;
+      return bin;
+    } catch {
+    }
+  }
+  resolvedGitBin = null;
+  return null;
+}
+function effectiveGitDir(cwd) {
+  if ((0, import_fs3.existsSync)(cwd)) return cwd;
+  const m = cwd.match(/^(.*)\/\.claude\/worktrees\/[^/]+/);
+  if (m && (0, import_fs3.existsSync)(m[1])) return m[1];
+  return cwd;
+}
 function extractGitInfo(projectDir, sessionTimestamp, sessionBranch) {
   const empty = {
     gitRemoteUrl: null,
     gitCommit: null,
     gitBranch: null
   };
+  const gitBin = resolveGitBin();
+  if (!gitBin) {
+    logger.warn("Git metadata skipped \u2014 git binary not found", {
+      projectDir,
+      reason: "git-not-on-path",
+      tried: GIT_BIN_CANDIDATES
+    });
+    return empty;
+  }
+  const dir = effectiveGitDir(projectDir);
   const opts = {
-    cwd: projectDir,
+    cwd: dir,
     timeout: 5e3,
     encoding: "utf-8",
     stdio: "pipe"
   };
-  const git = (args) => (0, import_child_process.execFileSync)("git", args, opts).trim();
+  const git = (args) => (0, import_child_process.execFileSync)(gitBin, args, opts).trim();
   try {
     git(["rev-parse", "--is-inside-work-tree"]);
   } catch (err) {
-    logger.warn("Git metadata skipped \u2014 not a resolvable git repo", {
+    logger.warn("Git metadata skipped \u2014 cwd not a resolvable git repo", {
       projectDir,
-      reason: err?.code === "ENOENT" ? "git-not-on-path" : err?.status === 128 ? "not-a-git-repo-or-missing-dir" : "git-check-failed",
+      resolvedDir: dir,
+      reason: err?.code === "ENOENT" ? "cwd-missing" : err?.status === 128 ? "not-a-git-repo" : "git-check-failed",
       error: err?.message?.slice(0, 200)
     });
     return empty;
@@ -1205,7 +1235,7 @@ async function main() {
   });
   if (errors > 0) process.exit(1);
 }
-var import_dotenv, import_path3, import_fs3, import_os3, import_zlib, import_child_process, logger, DEFAULT_API_URL3, CREDENTIALS_FILE3, MIN_LINES, EDGE_SCRUB_PATTERNS;
+var import_dotenv, import_path3, import_fs3, import_os3, import_zlib, import_child_process, logger, DEFAULT_API_URL3, CREDENTIALS_FILE3, MIN_LINES, EDGE_SCRUB_PATTERNS, GIT_BIN_CANDIDATES, resolvedGitBin;
 var init_collector = __esm({
   "../service-capture/claude-sessions/collector.ts"() {
     "use strict";
@@ -1261,6 +1291,12 @@ var init_collector = __esm({
         replacement: "[REDACTED:API_KEY]"
       }
     ];
+    GIT_BIN_CANDIDATES = [
+      "git",
+      "/opt/homebrew/bin/git",
+      "/usr/local/bin/git",
+      "/usr/bin/git"
+    ];
     if (require.main === module) {
       main().catch((err) => {
         logger.error("Collector failed", err);
@@ -51219,7 +51255,7 @@ var require_view = __commonJS({
     var debug = require_src()("express:view");
     var path = require("node:path");
     var fs = require("node:fs");
-    var dirname2 = path.dirname;
+    var dirname3 = path.dirname;
     var basename3 = path.basename;
     var extname = path.extname;
     var join12 = path.join;
@@ -51258,7 +51294,7 @@ var require_view = __commonJS({
       for (var i = 0; i < roots.length && !path2; i++) {
         var root = roots[i];
         var loc = resolve4(root, name);
-        var dir = dirname2(loc);
+        var dir = dirname3(loc);
         var file2 = basename3(loc);
         path2 = this.resolve(dir, file2);
       }
@@ -57930,6 +57966,29 @@ function findHaansiBin() {
     );
   }
 }
+function warnIfStaleDevBundle(haansiPath) {
+  try {
+    const bundle = (0, import_node_fs6.realpathSync)(haansiPath);
+    const repoRoot = (0, import_node_path5.dirname)((0, import_node_path5.dirname)((0, import_node_path5.dirname)((0, import_node_path5.dirname)(bundle))));
+    const sources = [
+      "apps/service-capture/claude-sessions/collector.ts",
+      "apps/service-capture/claude-sessions/collector-daemon.ts",
+      "apps/service-capture/common/agents/codex.ts",
+      "apps/service-capture/common/agents/claude-code.ts"
+    ].map((p) => (0, import_node_path5.join)(repoRoot, p));
+    if (!(0, import_node_fs6.existsSync)(sources[0])) return;
+    const bundleMtime = (0, import_node_fs6.statSync)(bundle).mtimeMs;
+    const newestSrc = Math.max(
+      ...sources.filter(import_node_fs6.existsSync).map((p) => (0, import_node_fs6.statSync)(p).mtimeMs)
+    );
+    if (newestSrc > bundleMtime) {
+      console.warn(
+        "\n\u26A0\uFE0F  The compiled CLI bundle is OLDER than the collector source.\n   The daemon runs the bundle, so it would start with stale code.\n   Rebuild first:  npm run build --workspace apps/cli\n   then re-run:    haansi setup-daemon\n"
+      );
+    }
+  } catch {
+  }
+}
 function buildPlist(haansiPath) {
   const binDir = haansiPath.replace(/\/[^/]+$/, "");
   const path = `${binDir}:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin`;
@@ -57976,6 +58035,7 @@ async function setupDaemon(uninstall) {
     return;
   }
   const haansiPath = findHaansiBin();
+  warnIfStaleDevBundle(haansiPath);
   (0, import_node_fs6.mkdirSync)((0, import_node_path5.join)((0, import_node_os5.homedir)(), ".haansi"), { recursive: true });
   (0, import_node_fs6.writeFileSync)(PLIST_PATH, buildPlist(haansiPath), "utf-8");
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haansi",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Haansi CLI - Session collector and MCP server for Claude Code & OpenAI Codex",
   "bin": {
     "haansi": "./dist/haansi.js"