@eve-horizon/cli 0.2.39 → 0.2.41

package/dist/index.js

@@ -62220,7 +62220,7 @@ var import_child_process = require("child_process");
 var import_util4 = require("util");
 var execFileAsync = (0, import_util4.promisify)(import_child_process.execFile);
 
-// src/lib/logs.ts
+// ../shared/dist/log-normalize.js
 function normalizeLogLine(line) {
   const kind = line.kind;
   const raw = line.raw;
@@ -67380,32 +67380,46 @@ async function resolveGitRef(context2, projectId, ref, repoDir) {
     return ref;
   }
   const resolvedRepoDir = repoDir ?? getGitRoot();
-  if (!resolvedRepoDir) {
-    throw new Error(
-      `Failed to resolve git ref '${ref}': not in a git repository.
-Run the command from the project repository, pass --repo-dir <path>, or use a 40-character SHA.`
-    );
-  }
+  let useLocal = !!resolvedRepoDir;
+  let projectRepoUrl;
   if (projectId) {
     const project = await requestJson(context2, `/projects/${projectId}`);
+    projectRepoUrl = project.repo_url;
     const expected = normalizeRepoIdentity(project.repo_url);
-    const actual = normalizeRepoIdentity(getGitOriginUrl(resolvedRepoDir));
-    const repoDirIdentity = normalizeRepoIdentity(resolvedRepoDir);
+    const actual = resolvedRepoDir ? normalizeRepoIdentity(getGitOriginUrl(resolvedRepoDir)) : null;
+    const repoDirIdentity = resolvedRepoDir ? normalizeRepoIdentity(resolvedRepoDir) : null;
     if (expected && actual && expected !== actual) {
-      throw new Error(
-        `Failed to resolve git ref '${ref}': current repo does not match project repo.
-  Project repo: ${project.repo_url}
-  Current repo: ${getGitOriginUrl(resolvedRepoDir)}
-Run the command from the project repository, pass --repo-dir <path>, or use a 40-character SHA.`
-      );
+      useLocal = false;
     }
     if (expected && !actual && (!repoDirIdentity || repoDirIdentity !== expected)) {
-      throw new Error(
-        `Failed to resolve git ref '${ref}': current repo has no origin remote to validate against project repo.
-  Project repo: ${project.repo_url}
-Run the command from the project repository, pass --repo-dir <path>, or use a 40-character SHA.`
-      );
+      useLocal = false;
+    }
+  }
+  if (useLocal && resolvedRepoDir) {
+    try {
+      return (0, import_node_child_process5.execSync)(`git rev-parse ${ref}`, {
+        cwd: resolvedRepoDir,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+    } catch {
+    }
+  }
+  if (projectRepoUrl) {
+    const sha = resolveRefRemote(projectRepoUrl, ref);
+    if (sha) {
+      return sha;
     }
+    throw new Error(
+      `Failed to resolve git ref '${ref}' against remote '${projectRepoUrl}'.
+Make sure the ref (branch or tag) exists in the remote repository, or use a 40-character SHA.`
+    );
+  }
+  if (!resolvedRepoDir) {
+    throw new Error(
+      `Failed to resolve git ref '${ref}': not in a git repository.
+Run the command from the project repository, pass --repo-dir <path>, or use a 40-character SHA.`
+    );
   }
   try {
     return (0, import_node_child_process5.execSync)(`git rev-parse ${ref}`, {
@@ -67470,6 +67484,25 @@ function resolveGitBranch(repoDir, ref) {
     return null;
   }
 }
+function resolveRefRemote(repoUrl, ref) {
+  try {
+    const output = (0, import_node_child_process5.execSync)(`git ls-remote ${repoUrl} ${ref}`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 15e3
+    }).trim();
+    for (const line of output.split("\n")) {
+      const [sha, refName] = line.split("	");
+      if (!sha || !refName) continue;
+      if (refName === `refs/heads/${ref}` || refName === `refs/tags/${ref}` || refName === ref) {
+        return sha;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 function getGitOriginUrl(repoDir) {
   try {
     const url = (0, import_node_child_process5.execSync)("git config --get remote.origin.url", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eve-horizon/cli",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "description": "Eve Horizon CLI",
   "license": "MIT",
   "repository": {
@@ -18,9 +18,6 @@
     "assets",
     "README.md"
   ],
-  "scripts": {
-    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node22 --outfile=dist/index.js --format=cjs --external:yaml"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -31,11 +28,14 @@
     "yaml": "^2.5.1"
   },
   "devDependencies": {
-    "@eve/migrate": "workspace:*",
-    "@eve/shared": "workspace:*",
     "@types/node": "^22.0.0",
     "esbuild": "^0.27.3",
     "postgres": "^3.4.0",
-    "typescript": "^5.7.0"
+    "typescript": "^5.7.0",
+    "@eve/migrate": "0.0.1",
+    "@eve/shared": "0.0.1"
+  },
+  "scripts": {
+    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node22 --outfile=dist/index.js --format=cjs --external:yaml"
   }
-}
+}