@sentry/junior-github 0.176.2 → 0.178.0

package/dist/index.js

@@ -5227,6 +5227,10 @@ async function prepareWorkspace(ctx) {
     }
     paths.add(key);
   }
+  const gitEnv = {
+    GIT_CONFIG_GLOBAL: "/dev/null",
+    GIT_CONFIG_NOSYSTEM: "1"
+  };
   for (const { owner, name, path, repo } of repos) {
     const parent = path.includes("/") ? path.slice(0, path.lastIndexOf("/")) : void 0;
     if (parent) {
@@ -5241,18 +5245,181 @@ async function prepareWorkspace(ctx) {
         );
       }
     }
-    const result = await ctx.sandbox.run({
+    const cloneUrl = `https://github.com/${owner}/${name}.git`;
+    const worktree = await ctx.sandbox.run({
+      cmd: "git",
+      args: ["-C", path, "rev-parse", "--is-inside-work-tree"],
+      cwd: ctx.sandbox.root,
+      env: gitEnv
+    });
+    const branch = worktree.exitCode === 0 ? await ctx.sandbox.run({
+      cmd: "git",
+      args: ["-C", path, "symbolic-ref", "--quiet", "--short", "HEAD"],
+      cwd: ctx.sandbox.root,
+      env: gitEnv
+    }) : void 0;
+    const branchName = branch?.stdout.trim();
+    const detachedHead = worktree.exitCode === 0 && !branchName ? await ctx.sandbox.run({
+      cmd: "git",
+      args: ["-C", path, "rev-parse", "--verify", "HEAD^{commit}"],
+      cwd: ctx.sandbox.root,
+      env: gitEnv
+    }) : void 0;
+    const detachedSha = detachedHead?.stdout.trim();
+    const validDetachedSha = detachedHead?.exitCode === 0 && detachedSha && /^[0-9a-f]{40,64}$/.test(detachedSha) ? detachedSha : void 0;
+    const upstream = branch?.exitCode === 0 && branchName ? await ctx.sandbox.run({
       cmd: "git",
       args: [
-        "clone",
-        "--quiet",
-        "--depth=1",
-        "--",
-        `https://github.com/${owner}/${name}.git`,
-        path
+        "-C",
+        path,
+        "rev-parse",
+        "--symbolic-full-name",
+        "@{upstream}"
       ],
+      cwd: ctx.sandbox.root,
+      env: gitEnv
+    }) : void 0;
+    const upstreamRef = upstream?.stdout.trim();
+    const upstreamPrefix = "refs/remotes/origin/";
+    const upstreamBranch = upstreamRef?.startsWith(upstreamPrefix) ? upstreamRef.slice(upstreamPrefix.length) : void 0;
+    if (worktree.exitCode === 0 && (branchName || validDetachedSha)) {
+      const localBranch = branchName || "workspace-detached";
+      const remoteBranch = upstreamBranch || branchName;
+      const remoteRef = remoteBranch ? `${upstreamPrefix}${remoteBranch}` : validDetachedSha;
+      const tempDir = await ctx.sandbox.run({
+        cmd: "mktemp",
+        args: ["-d", `${ctx.sandbox.juniorRoot}/workspace-refresh.XXXXXX`],
+        cwd: ctx.sandbox.root
+      });
+      const refreshGitDir = tempDir.stdout.trim();
+      if (tempDir.exitCode !== 0 || !refreshGitDir) {
+        throw new Error(
+          `GitHub workspace refresh temp directory failed for ${repo}: ${tempDir.stderr.trim() || `exit ${tempDir.exitCode}`}`
+        );
+      }
+      for (const args of [
+        [
+          "--git-dir",
+          refreshGitDir,
+          "--work-tree",
+          path,
+          "init",
+          "--quiet",
+          "--initial-branch",
+          localBranch
+        ],
+        [
+          "--git-dir",
+          refreshGitDir,
+          "--work-tree",
+          path,
+          "remote",
+          "add",
+          "origin",
+          cloneUrl
+        ],
+        [
+          "--git-dir",
+          refreshGitDir,
+          "--work-tree",
+          path,
+          "fetch",
+          "--quiet",
+          "--prune",
+          "--tags",
+          "origin",
+          "+refs/heads/*:refs/remotes/origin/*",
+          ...validDetachedSha ? [validDetachedSha] : []
+        ],
+        ...validDetachedSha ? [
+          [
+            "--git-dir",
+            refreshGitDir,
+            "--work-tree",
+            path,
+            "update-ref",
+            "--no-deref",
+            "HEAD",
+            validDetachedSha
+          ]
+        ] : [],
+        [
+          "--git-dir",
+          refreshGitDir,
+          "--work-tree",
+          path,
+          "reset",
+          "--hard",
+          remoteRef
+        ],
+        ...remoteBranch && branchName ? [
+          [
+            "--git-dir",
+            refreshGitDir,
+            "--work-tree",
+            path,
+            "branch",
+            `--set-upstream-to=origin/${remoteBranch}`,
+            branchName
+          ]
+        ] : []
+      ]) {
+        const result2 = await ctx.sandbox.run({
+          cmd: "git",
+          args,
+          cwd: ctx.sandbox.root,
+          env: gitEnv
+        });
+        if (result2.exitCode !== 0) {
+          throw new Error(
+            `GitHub workspace refresh failed for ${repo}: ${result2.stderr.trim() || `exit ${result2.exitCode}`}`
+          );
+        }
+      }
+      for (const [cmd, args] of [
+        ["rm", ["-rf", "--", `${path}/.git`]],
+        ["mv", ["--", refreshGitDir, `${path}/.git`]]
+      ]) {
+        const result2 = await ctx.sandbox.run({
+          cmd,
+          args: [...args],
+          cwd: ctx.sandbox.root
+        });
+        if (result2.exitCode !== 0) {
+          throw new Error(
+            `GitHub workspace metadata replacement failed for ${repo}: ${result2.stderr.trim() || `exit ${result2.exitCode}`}`
+          );
+        }
+      }
+      const clean = await ctx.sandbox.run({
+        cmd: "git",
+        args: ["-C", path, "clean", "-fd"],
+        cwd: ctx.sandbox.root,
+        env: gitEnv
+      });
+      if (clean.exitCode !== 0) {
+        throw new Error(
+          `GitHub workspace refresh failed for ${repo}: ${clean.stderr.trim() || `exit ${clean.exitCode}`}`
+        );
+      }
+      continue;
+    }
+    const cleanup = await ctx.sandbox.run({
+      cmd: "rm",
+      args: ["-rf", "--", path],
       cwd: ctx.sandbox.root
     });
+    if (cleanup.exitCode !== 0) {
+      throw new Error(
+        `GitHub workspace checkout cleanup failed for ${repo}: ${cleanup.stderr.trim() || `exit ${cleanup.exitCode}`}`
+      );
+    }
+    const result = await ctx.sandbox.run({
+      cmd: "git",
+      args: ["clone", "--quiet", "--", cloneUrl, path],
+      cwd: ctx.sandbox.root,
+      env: gitEnv
+    });
     if (result.exitCode !== 0) {
       throw new Error(
         `GitHub workspace clone failed for ${repo}: ${result.stderr.trim() || `exit ${result.exitCode}`}`

package/dist/workspace-prepare.d.ts

@@ -1,3 +1,3 @@
 import type { WorkspacePrepareHookContext } from "@sentry/junior-plugin-api";
-/** Clone GitHub repositories into their host-selected Workspace paths. */
+/** Clone missing GitHub repositories or refresh existing Workspace checkouts. */
 export declare function prepareWorkspace(ctx: WorkspacePrepareHookContext): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.176.2",
+  "version": "0.178.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@sinclair/typebox": "^0.34.49",
     "drizzle-orm": "^0.45.2",
     "zod": "^4.4.3",
-    "@sentry/junior-plugin-api": "0.176.2"
+    "@sentry/junior-plugin-api": "0.178.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",