haansi 0.1.26 → 0.1.28

package/dist/haansi.js

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "haansi",
-      version: "0.1.26",
+      version: "0.1.28",
       description: "Haansi CLI - Session collector and MCP server for Claude Code & OpenAI Codex",
       bin: {
         haansi: "./dist/haansi.js"
@@ -807,6 +807,8 @@ function readRolloutMeta(filePath, content) {
   let cwd = null;
   let timestamp = null;
   let gitBranch = null;
+  let gitRemoteUrl = null;
+  let gitCommit = null;
   let metaId = null;
   const lines = content.split("\n").filter((l) => l.trim()).slice(0, 50);
   for (const line of lines) {
@@ -819,10 +821,15 @@ function readRolloutMeta(filePath, content) {
       if (entry.type === "session_meta") {
         if (typeof p.cwd === "string") cwd = p.cwd;
         if (typeof p.id === "string") metaId = p.id;
-        const branch = p.git?.branch ?? p.git_branch;
+        const g = p.git ?? {};
+        const branch = g.branch ?? p.git_branch;
         if (typeof branch === "string") gitBranch = branch;
+        const remote = g.repository_url ?? g.remote_url;
+        if (typeof remote === "string") gitRemoteUrl = remote;
+        const commit = g.commit_hash ?? g.commit;
+        if (typeof commit === "string") gitCommit = commit;
       }
-      if (cwd && gitBranch && timestamp && metaId) break;
+      if (cwd && gitBranch && gitCommit && timestamp && metaId) break;
     } catch {
     }
   }
@@ -830,7 +837,9 @@ function readRolloutMeta(filePath, content) {
     sessionId: fromName ?? metaId ?? fileName,
     cwd,
     timestamp,
-    gitBranch
+    gitBranch,
+    gitRemoteUrl,
+    gitCommit
   };
 }
 var import_fs2, import_path2, import_os2, UUID_RE, codexAgent;
@@ -869,7 +878,9 @@ var init_codex = __esm({
               sizeBytes: stat.size,
               cwd: meta3.cwd,
               timestamp: meta3.timestamp,
-              gitBranch: meta3.gitBranch
+              gitBranch: meta3.gitBranch,
+              gitRemoteUrl: meta3.gitRemoteUrl,
+              gitCommit: meta3.gitCommit
             });
           } catch {
           }
@@ -940,41 +951,49 @@ function extractGitInfo(projectDir, sessionTimestamp, sessionBranch) {
     gitCommit: null,
     gitBranch: null
   };
-  const opts = { cwd: projectDir, timeout: 5e3, encoding: "utf-8" };
+  const opts = {
+    cwd: projectDir,
+    timeout: 5e3,
+    encoding: "utf-8",
+    stdio: "pipe"
+  };
+  const git = (args) => (0, import_child_process.execFileSync)("git", args, opts).trim();
   try {
-    (0, import_child_process.execSync)("git rev-parse --is-inside-work-tree", { ...opts, stdio: "pipe" });
-  } catch {
+    git(["rev-parse", "--is-inside-work-tree"]);
+  } catch (err) {
+    logger.warn("Git metadata skipped \u2014 cwd not a resolvable git repo", {
+      projectDir,
+      reason: err?.code === "ENOENT" ? "cwd-missing" : err?.status === 128 ? "not-a-git-repo" : "git-check-failed",
+      error: err?.message?.slice(0, 200)
+    });
     return empty;
   }
   const result = { ...empty };
   try {
-    result.gitRemoteUrl = (0, import_child_process.execSync)("git remote get-url origin", {
-      ...opts,
-      stdio: "pipe"
-    }).trim() || null;
+    result.gitRemoteUrl = git(["remote", "get-url", "origin"]) || null;
   } catch {
   }
   if (sessionTimestamp) {
     const branch = sessionBranch ?? "HEAD";
     try {
-      result.gitCommit = (0, import_child_process.execSync)(
-        `git log --before="${sessionTimestamp}" -1 --format=%H ${branch}`,
-        { ...opts, stdio: "pipe" }
-      ).trim() || null;
+      result.gitCommit = git([
+        "log",
+        `--before=${sessionTimestamp}`,
+        "-1",
+        "--format=%H",
+        branch
+      ]) || null;
     } catch {
     }
   }
   if (!result.gitCommit) {
     try {
-      result.gitCommit = (0, import_child_process.execSync)("git rev-parse HEAD", { ...opts, stdio: "pipe" }).trim() || null;
+      result.gitCommit = git(["rev-parse", "HEAD"]) || null;
     } catch {
     }
   }
   try {
-    result.gitBranch = (0, import_child_process.execSync)("git rev-parse --abbrev-ref HEAD", {
-      ...opts,
-      stdio: "pipe"
-    }).trim() || null;
+    result.gitBranch = git(["rev-parse", "--abbrev-ref", "HEAD"]) || null;
   } catch {
   }
   if (!result.gitBranch && sessionBranch) {
@@ -1113,15 +1132,30 @@ async function collect(options) {
     try {
       const rawContent = (0, import_fs3.readFileSync)(session.filePath, "utf-8");
       const scrubbed = edgeScrub(rawContent);
-      const gitInfo = session.cwd ? extractGitInfo(
-        session.cwd,
-        session.timestamp ?? void 0,
-        session.gitBranch ?? void 0
-      ) : {
-        gitRemoteUrl: null,
-        gitCommit: null,
-        gitBranch: session.gitBranch
-      };
+      let gitInfo;
+      if (session.gitRemoteUrl || session.gitCommit) {
+        gitInfo = {
+          gitRemoteUrl: session.gitRemoteUrl ?? null,
+          gitCommit: session.gitCommit ?? null,
+          gitBranch: session.gitBranch
+        };
+      } else if (session.cwd) {
+        gitInfo = extractGitInfo(
+          session.cwd,
+          session.timestamp ?? void 0,
+          session.gitBranch ?? void 0
+        );
+      } else {
+        logger.warn("Git metadata skipped \u2014 no cwd resolved for session", {
+          sessionId: shortId,
+          agentSource: session.agentId
+        });
+        gitInfo = {
+          gitRemoteUrl: null,
+          gitCommit: null,
+          gitBranch: session.gitBranch
+        };
+      }
       if (options.dryRun) {
         logger.info(
           `[dry-run] Would upload ${shortId} (${session.agentId}, ${session.lineCount} lines)`,
@@ -51185,7 +51219,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;
@@ -51224,7 +51258,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);
       }
@@ -57896,6 +57930,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`;
@@ -57942,6 +57999,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.26",
+  "version": "0.1.28",
   "description": "Haansi CLI - Session collector and MCP server for Claude Code & OpenAI Codex",
   "bin": {
     "haansi": "./dist/haansi.js"