adhdev 0.9.82-rc.4 → 0.9.82-rc.6

package/dist/cli/index.js

@@ -46402,6 +46402,26 @@ function readBooleanValue(...values) {
   }
   return void 0;
 }
+function readGitSubmodules(value) {
+  if (!Array.isArray(value)) return void 0;
+  const submodules = value.map((entry) => {
+    const submodule = readObjectRecord(entry);
+    const path42 = readStringValue(submodule.path);
+    const commit = readStringValue(submodule.commit);
+    const repoPath = readStringValue(submodule.repoPath, submodule.repo_root);
+    if (!path42 || !commit || !repoPath) return null;
+    return {
+      path: path42,
+      commit,
+      repoPath,
+      dirty: readBooleanValue(submodule.dirty) ?? false,
+      outOfSync: readBooleanValue(submodule.outOfSync, submodule.out_of_sync) ?? false,
+      lastCheckedAt: readNumberValue(submodule.lastCheckedAt, submodule.last_checked_at) ?? Date.now(),
+      ...readStringValue(submodule.error) ? { error: readStringValue(submodule.error) } : {}
+    };
+  }).filter((entry) => entry !== null);
+  return submodules.length > 0 ? submodules : void 0;
+}
 function buildCachedInlineMeshGitStatus(node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
   const cachedGit = readObjectRecord(cachedStatus.git);
@@ -46411,6 +46431,7 @@ function buildCachedInlineMeshGitStatus(node) {
     const hasConflicts2 = readBooleanValue(cachedGit.hasConflicts) ?? conflictCount2 > 0;
     const isGitRepo2 = readBooleanValue(cachedGit.isGitRepo);
     if (isGitRepo2 !== void 0) {
+      const submodules2 = readGitSubmodules(cachedGit.submodules);
       return {
         workspace: readStringValue(cachedGit.workspace, node?.workspace) || "",
         repoRoot: readStringValue(cachedGit.repoRoot, node?.repoRoot, node?.workspace) || null,
@@ -46429,7 +46450,8 @@ function buildCachedInlineMeshGitStatus(node) {
         hasConflicts: hasConflicts2,
         conflictFiles: conflictFiles2,
         stashCount: readNumberValue(cachedGit.stashCount) ?? 0,
-        lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now()
+        lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now(),
+        ...submodules2 ? { submodules: submodules2 } : {}
       };
     }
   }
@@ -46448,6 +46470,7 @@ function buildCachedInlineMeshGitStatus(node) {
   const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((value) => typeof value === "string") : [];
   const conflictCount = readNumberValue(status.conflicts) ?? conflictFiles.length;
   const hasConflicts = readBooleanValue(status.hasConflicts) ?? conflictCount > 0;
+  const submodules = readGitSubmodules(status.submodules);
   return {
     workspace: readStringValue(status.workspace, node?.workspace) || "",
     repoRoot: readStringValue(status.repoRoot, node?.repoRoot, node?.workspace) || null,
@@ -46466,7 +46489,8 @@ function buildCachedInlineMeshGitStatus(node) {
     hasConflicts,
     conflictFiles,
     stashCount: readNumberValue(status.stashCount) ?? 0,
-    lastCheckedAt: Date.now()
+    lastCheckedAt: Date.now(),
+    ...submodules ? { submodules } : {}
   };
 }
 function applyCachedInlineMeshNodeStatus(status, node) {
@@ -46878,6 +46902,7 @@ var init_router = __esm({
     init_chat_history();
     init_ide_detector();
     init_cli_detector();
+    init_git_status();
     init_logger();
     init_command_log();
     init_js_yaml();
@@ -48785,63 +48810,15 @@ ${block}`);
                     continue;
                   }
                   try {
-                    const { execFile: execFile3 } = await import("child_process");
-                    const { promisify: promisify3 } = await import("util");
-                    const execFileAsync3 = promisify3(execFile3);
-                    const runGit2 = async (args2) => {
-                      const result = await execFileAsync3("git", ["-C", node.workspace, ...args2], {
-                        encoding: "utf8",
-                        timeout: 1e4
-                      });
-                      return result.stdout.trim();
-                    };
-                    const branch = await runGit2(["branch", "--show-current"]).catch(() => "");
-                    const porc = await runGit2(["status", "--porcelain"]).catch(() => "");
-                    const headCommit = await runGit2(["rev-parse", "--short", "HEAD"]).catch(() => null);
-                    const headMessage = await runGit2(["log", "-1", "--format=%s"]).catch(() => null);
-                    const upstream = await runGit2(["rev-parse", "--abbrev-ref", "@{upstream}"]).catch(() => null);
-                    const aheadBehind = await runGit2(["rev-list", "--left-right", "--count", "@{upstream}...HEAD"]).catch(() => "");
-                    const stashCount = await runGit2(["stash", "list"]).catch(() => "");
-                    let ahead = 0, behind = 0;
-                    if (aheadBehind) {
-                      const parts = aheadBehind.split(/\s+/);
-                      if (parts.length >= 2) {
-                        behind = parseInt(parts[0], 10) || 0;
-                        ahead = parseInt(parts[1], 10) || 0;
-                      }
-                    }
-                    const dirty = porc.length > 0;
-                    const lines = porc ? porc.split("\n").filter(Boolean) : [];
-                    let staged = 0, modified = 0, untracked = 0, deleted = 0, renamed2 = 0;
-                    for (const line of lines) {
-                      const xy = line.slice(0, 2);
-                      if (xy[0] !== " " && xy[0] !== "?") staged++;
-                      if (xy[1] === "M") modified++;
-                      if (xy[1] === "D") deleted++;
-                      if (xy[0] === "R" || xy[1] === "R") renamed2++;
-                      if (xy === "??") untracked++;
+                    const gitStatus = await getGitRepoStatus(node.workspace, { timeoutMs: 1e4 });
+                    status.git = gitStatus;
+                    if (gitStatus.isGitRepo) {
+                      const dirty = gitStatus.staged + gitStatus.modified + gitStatus.untracked + gitStatus.deleted + gitStatus.renamed > 0;
+                      status.health = gitStatus.branch ? dirty ? "dirty" : "online" : "degraded";
+                    } else {
+                      status.health = "degraded";
+                      if (gitStatus.error && !status.error) status.error = gitStatus.error;
                     }
-                    status.git = {
-                      workspace: node.workspace,
-                      repoRoot: node.workspace,
-                      isGitRepo: true,
-                      branch: branch || null,
-                      headCommit,
-                      headMessage,
-                      upstream,
-                      ahead,
-                      behind,
-                      staged,
-                      modified,
-                      untracked,
-                      deleted,
-                      renamed: renamed2,
-                      hasConflicts: false,
-                      conflictFiles: [],
-                      stashCount: stashCount ? stashCount.split("\n").filter(Boolean).length : 0,
-                      lastCheckedAt: Date.now()
-                    };
-                    status.health = branch ? dirty ? "dirty" : "online" : "degraded";
                   } catch {
                     if (!applyCachedInlineMeshNodeStatus(status, node)) {
                       status.health = "degraded";
@@ -97817,7 +97794,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.4" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.6" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;