chat-recall 0.5.28 → 0.5.29

package/dist/cli.js

@@ -13266,9 +13266,9 @@ function doResolve(realPath) {
   const bot = resolveBotWorktree(realPath);
   if (bot)
     return bot;
-  const git = resolveGit(realPath);
-  if (git)
-    return git;
+  const git2 = resolveGit(realPath);
+  if (git2)
+    return git2;
   const ws = resolveAutoWorkspace(realPath, cfg.autoWorkspaceMinRepos ?? DEFAULT_AUTO_WORKSPACE_MIN_REPOS);
   if (ws)
     return ws;
@@ -13337,9 +13337,9 @@ function resolveGit(realPath) {
   const toplevel = findGitToplevel(realPath);
   if (!toplevel)
     return null;
-  const remote = getGitRemote(toplevel);
-  if (remote) {
-    const parsed = parseGitRemote(remote);
+  const probe = getGitRemote(toplevel);
+  if (probe.kind === "remote") {
+    const parsed = parseGitRemote(probe.url);
     if (parsed) {
       return {
         id: `git:${parsed.host}/${parsed.owner}/${parsed.repo}`,
@@ -13348,6 +13348,9 @@ function resolveGit(realPath) {
       };
     }
   }
+  if (probe.kind === "failed") {
+    console.error(`[project] could not read git remotes in ${toplevel} \u2014 filing it as a local-only repo for now, which is probably wrong: ${probe.reason}`);
+  }
   const hash = createHash6("sha1").update(toplevel).digest("hex").slice(0, 12);
   return {
     id: `git-local:${hash}`,
@@ -13366,23 +13369,39 @@ function findGitToplevel(realPath) {
   }
   return null;
 }
+function git(toplevel, args) {
+  return execSync(`git ${args}`, {
+    cwd: toplevel,
+    stdio: ["ignore", "pipe", "ignore"],
+    encoding: "utf-8",
+    timeout: GIT_TIMEOUT_MS
+  });
+}
+function probeGitRemote(toplevel) {
+  let names;
+  try {
+    names = git(toplevel, "remote").split("\n").map((n) => n.trim()).filter(Boolean);
+  } catch (err) {
+    return { kind: "failed", reason: err instanceof Error ? err.message : String(err) };
+  }
+  if (names.length === 0)
+    return { kind: "none" };
+  const pick = names.includes("origin") ? "origin" : names[0];
+  try {
+    const url = git(toplevel, `remote get-url ${pick}`).trim();
+    return url ? { kind: "remote", url } : { kind: "none" };
+  } catch (err) {
+    return { kind: "failed", reason: err instanceof Error ? err.message : String(err) };
+  }
+}
 function getGitRemote(toplevel) {
   const cached = gitCache.get(toplevel);
   if (cached)
-    return cached.remote;
-  let remote = null;
-  try {
-    remote = execSync("git remote get-url origin", {
-      cwd: toplevel,
-      stdio: ["ignore", "pipe", "ignore"],
-      encoding: "utf-8",
-      timeout: 2e3
-    }).trim() || null;
-  } catch {
-    remote = null;
-  }
-  gitCache.set(toplevel, { remote });
-  return remote;
+    return cached;
+  const probe = probeGitRemote(toplevel);
+  if (probe.kind !== "failed")
+    gitCache.set(toplevel, probe);
+  return probe;
 }
 function parseGitRemote(url) {
   const trimmed = url.trim().replace(/\.git$/, "");
@@ -13512,7 +13531,7 @@ function globToRegex(glob) {
 function escapeRe(s) {
   return s.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 }
-var DEFAULT_AUTO_WORKSPACE_MIN_REPOS, BOT_WORKTREE_MARKERS, resolveCache, gitCache, workspaceCache, wsIdCache, cachedConfig, AUTO_WORKSPACE_MAX_DEPTH;
+var DEFAULT_AUTO_WORKSPACE_MIN_REPOS, BOT_WORKTREE_MARKERS, resolveCache, gitCache, workspaceCache, wsIdCache, cachedConfig, GIT_TIMEOUT_MS, AUTO_WORKSPACE_MAX_DEPTH;
 var init_project_resolver = __esm({
   "../engine/dist/core/project-resolver.js"() {
     "use strict";
@@ -13524,6 +13543,7 @@ var init_project_resolver = __esm({
     workspaceCache = /* @__PURE__ */ new Map();
     wsIdCache = /* @__PURE__ */ new Map();
     cachedConfig = null;
+    GIT_TIMEOUT_MS = 1e4;
     AUTO_WORKSPACE_MAX_DEPTH = 2;
   }
 });
@@ -19730,7 +19750,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync33(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.5.28";
+        if (true) CLI_VERSION = "0.5.29";
       } catch {
       }
     }
@@ -20242,7 +20262,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.5.28" : "dev";
+        return true ? "0.5.29" : "dev";
       } catch {
         return "dev";
       }
@@ -22250,7 +22270,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync37(join44(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.5.28";
+        if (true) ownVersion = "0.5.29";
       } catch {
       }
     }
@@ -22479,11 +22499,17 @@ function writeFileMkdir(path, body) {
   mkdirSync10(dirname20(path), { recursive: true });
   writeFileSync11(path, body);
 }
+function readJsonObject(path) {
+  const raw = readFileSync39(path, "utf-8");
+  if (raw.trim() === "")
+    return {};
+  return JSON.parse(raw);
+}
 function registerMcpServersJson(target, path, spec) {
   let cfg = {};
   if (existsSync44(path)) {
     try {
-      cfg = JSON.parse(readFileSync39(path, "utf-8"));
+      cfg = readJsonObject(path);
     } catch (err) {
       return { id: target.id, label: target.label, path, state: "unparseable", error: String(err) };
     }
@@ -22512,7 +22538,7 @@ function registerOpencodeJson(path, spec) {
   let cfg = {};
   if (existsSync44(path)) {
     try {
-      cfg = JSON.parse(readFileSync39(path, "utf-8"));
+      cfg = readJsonObject(path);
     } catch (err) {
       return { id, label, path, state: "unparseable", error: String(err) };
     }
@@ -26001,7 +26027,7 @@ var init_intent_drain = __esm({
       ownVersion2 = JSON.parse(readFileSync46(join55(dir, "../package.json"), "utf-8")).version || ownVersion2;
     } catch {
       try {
-        if (true) ownVersion2 = "0.5.28";
+        if (true) ownVersion2 = "0.5.29";
       } catch {
       }
     }
@@ -27872,7 +27898,9 @@ program.command("init").description("Set up chat-recall: connect to your server,
       if (ok.length) {
       }
       for (const r of bad) {
-        rep.warn(`${chalk.yellow(`${r.label} config left alone \u2014 the file does not parse`)} ${chalk.dim(r.path)}`);
+        const why = (r.error ?? "").replace(/^SyntaxError:\s*/, "").split("\n")[0];
+        rep.warn(`${chalk.yellow(`${r.label} config left alone \u2014 ${why || "the file does not parse"}`)} ${chalk.dim(r.path)}`);
+        rep.warn(`${chalk.dim(`   fix that file, then: chat-recall init   (nothing else needs redoing)`)}`);
       }
       if (process.env.CHAT_RECALL_VERBOSE) {
       }
@@ -27981,12 +28009,12 @@ program.command("init").description("Set up chat-recall: connect to your server,
       }
     }
     if (deadTarget) {
-      console.log(chalk.bold("6. Skipping first sync \u2014 the saved server is not serving chat-recall"));
+      console.log(chalk.bold("Skipping first sync \u2014 the saved server is not serving chat-recall"));
       console.log(`   ${chalk.dim(`Re-point with the two commands above, then run ${chalk.bold("chat-recall sync")}.`)}`);
     } else if (!options.skipSync && firstTarget()) {
       const { watchFirstSync: watchFirstSync2, spawnDetachedSync: spawnDetachedSync2, handOffLine: handOffLine2, progressLine: renderProgress } = await Promise.resolve().then(() => (init_init_progress(), init_progress_exports));
       const { readCollectorHealth: readCollectorHealth2 } = await Promise.resolve().then(() => (init_collector_health(), collector_health_exports));
-      const label = (text) => `${chalk.bold("6. Indexing")}    ${text}`;
+      const label = (text) => `${chalk.bold("Indexing")}  ${text}`;
       const tty = process.stdout.isTTY === true;
       const outcome = await watchFirstSync2({
         startWorker: () => spawnDetachedSync2(),
@@ -28007,11 +28035,11 @@ program.command("init").description("Set up chat-recall: connect to your server,
         console.log(label(chalk.green(renderProgress(outcome.snapshot))));
       } else {
         console.log(label(chalk.dim(handOffLine2(outcome.snapshot))));
-        console.log(`              ${chalk.dim("watch it with: " + chalk.bold("chat-recall status"))}`);
+        console.log(`          ${chalk.dim("watch it with: " + chalk.bold("chat-recall status"))}`);
       }
       const failed = Object.entries(readCollectorHealth2()?.targets ?? {}).filter(([, t]) => (t.failures ?? 0) > 0 && t.lastError);
       for (const [server, t] of failed) {
-        console.log(`              ${chalk.yellow("sync error")} ${chalk.dim(server)}: ${t.lastError}`);
+        console.log(`          ${chalk.yellow("sync error")} ${chalk.dim(server)}: ${t.lastError}`);
       }
     } else if (!options.skipSync) {
     } else {