@runeya/runeya 2.0.87 → 2.0.88

package/agent/index.js

@@ -4928,12 +4928,69 @@ var terminalRouter = router({
 // src/trpc/routers/git.ts
 import { z as z25 } from "zod";
 import { TRPCError as TRPCError4 } from "@trpc/server";
-import { execFile as execFile4, spawn as spawn3 } from "child_process";
-import { promisify as promisify2 } from "util";
+import { execFile as execFile5, spawn as spawn3 } from "child_process";
+import { promisify as promisify3 } from "util";
 import { existsSync, watch as fsWatch } from "fs";
 import { promises as fsPromises2 } from "fs";
 import { join as join4, resolve as resolvePath } from "path";
+
+// src/utils/git-remote.ts
+import { execFile as execFile4 } from "child_process";
+import { promisify as promisify2 } from "util";
 var execFileAsync2 = promisify2(execFile4);
+function parseGitRemote(url) {
+  const trimmed = url.trim();
+  if (!trimmed) return null;
+  let host;
+  let path3;
+  const scp = /^(?:[^/@]+@)?([^/:]+):(?!\/)(.+)$/.exec(trimmed);
+  if (scp) {
+    host = scp[1];
+    path3 = scp[2];
+  } else {
+    let parsed;
+    try {
+      parsed = new URL(trimmed);
+    } catch {
+      return null;
+    }
+    if (parsed.protocol === "file:" || !parsed.hostname) return null;
+    host = parsed.hostname;
+    path3 = parsed.pathname;
+  }
+  path3 = path3.replace(/^\/+/, "").replace(/\/+$/, "").replace(/\.git$/i, "");
+  if (!host || !path3) return null;
+  return { host: host.toLowerCase(), path: path3.toLowerCase() };
+}
+async function resolveSshHost(host) {
+  if (!/^[a-zA-Z0-9._-]+$/.test(host)) return host;
+  try {
+    const { stdout } = await execFileAsync2("ssh", ["-G", host], {
+      timeout: 3e3,
+      env: { PATH: process.env["PATH"] ?? "", HOME: process.env["HOME"] ?? "" }
+    });
+    const match = /^hostname (.+)$/m.exec(stdout);
+    return match ? match[1].trim().toLowerCase() : host;
+  } catch {
+    return host;
+  }
+}
+async function sameGitRemote(a, b, resolveHost = resolveSshHost) {
+  if (a.trim() === b.trim()) return true;
+  const left = parseGitRemote(a);
+  const right = parseGitRemote(b);
+  if (!left || !right) return false;
+  if (left.path !== right.path) return false;
+  if (left.host === right.host) return true;
+  const [leftHost, rightHost] = await Promise.all([
+    resolveHost(left.host),
+    resolveHost(right.host)
+  ]);
+  return leftHost === rightHost;
+}
+
+// src/trpc/routers/git.ts
+var execFileAsync3 = promisify3(execFile5);
 var GIT_TIMEOUT = 15e3;
 var DIFF_MAX_BYTES = 512 * 1024;
 var CWD_SCHEMA = z25.string().min(1).max(4096);
@@ -4975,7 +5032,7 @@ async function git(args, cwd, readOnly = false) {
   const env2 = gitSafeEnv();
   if (readOnly) env2["GIT_OPTIONAL_LOCKS"] = "0";
   try {
-    const result = execFileAsync2("git", args, { cwd, signal: ac.signal, env: env2 });
+    const result = execFileAsync3("git", args, { cwd, signal: ac.signal, env: env2 });
     if (result.child) {
       activeGitProcesses.add(result.child);
       result.child.on("close", () => activeGitProcesses.delete(result.child));
@@ -5067,20 +5124,21 @@ var gitRouter = router({
     const resolvedCwd = expandEnvVar(input.cwd);
     const unresolvedVars = [...resolvedCwd.matchAll(/\$\{?(\w+)\}?/g)].map((m) => m[1]);
     if (unresolvedVars.length > 0) {
-      return { exists: false, actualRemote: null, unreachable: false, resolvedCwd, unresolvedVars };
+      return { exists: false, actualRemote: null, remoteMatches: false, unreachable: false, resolvedCwd, unresolvedVars };
     }
     const absoluteCwd = resolvePath(resolvedCwd);
     const exists = existsSync(absoluteCwd);
     if (!exists || !input.remote) {
-      return { exists, actualRemote: null, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
+      return { exists, actualRemote: null, remoteMatches: false, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
     }
     const { code: urlCode, out: actualRemote } = await runGitRaw(["-C", absoluteCwd, "remote", "get-url", "origin"], 5e3);
-    if (urlCode !== 0) return { exists, actualRemote: null, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
+    if (urlCode !== 0) return { exists, actualRemote: null, remoteMatches: false, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
+    const remoteMatches = await sameGitRemote(actualRemote, input.remote);
     if (input.checkReachability) {
       const { code: showCode } = await runGitRaw(["-C", absoluteCwd, "remote", "show", "origin"], 1e4);
-      return { exists, actualRemote, unreachable: showCode !== 0, resolvedCwd: absoluteCwd, unresolvedVars: [] };
+      return { exists, actualRemote, remoteMatches, unreachable: showCode !== 0, resolvedCwd: absoluteCwd, unresolvedVars: [] };
     }
-    return { exists, actualRemote, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
+    return { exists, actualRemote, remoteMatches, unreachable: false, resolvedCwd: absoluteCwd, unresolvedVars: [] };
   }),
   /** Clone a git repository into a target directory */
   clone: protectedProcedure.input(z25.object({
@@ -6625,12 +6683,12 @@ function appendToPath(dir, environment = process.env) {
 }
 
 // ../../packages/shared/src/node/user-path.ts
-import { execFile as execFile5 } from "child_process";
-import { promisify as promisify3 } from "util";
+import { execFile as execFile6 } from "child_process";
+import { promisify as promisify4 } from "util";
 import { homedir as homedir7 } from "os";
 import { existsSync as existsSync4, statSync } from "fs";
 import { join as join6, delimiter as delimiter2 } from "path";
-var execFileAsync3 = promisify3(execFile5);
+var execFileAsync4 = promisify4(execFile6);
 var MARKER = "__RUNEYA_PATH__";
 var SHELL_TIMEOUT_MS = 3e3;
 function commonUserBins(home) {
@@ -6649,7 +6707,7 @@ async function readLoginShellPath() {
   const shell = process.env["SHELL"];
   if (!shell || !existsSync4(shell)) return null;
   try {
-    const { stdout } = await execFileAsync3(shell, ["-l", "-i", "-c", `echo "${MARKER}$PATH"`], {
+    const { stdout } = await execFileAsync4(shell, ["-l", "-i", "-c", `echo "${MARKER}$PATH"`], {
       timeout: SHELL_TIMEOUT_MS,
       shell: false,
       encoding: "utf8",