@sentry/junior-github 0.167.0 → 0.169.0

package/dist/index.js

@@ -751,12 +751,14 @@ var inputSchema = z.object({
     }
   ).describe(
     "Optional destination directory under the sandbox root. Defaults to repos/{name}."
-  ).optional()
+  ).optional(),
+  allowAdHoc: z.boolean().optional().describe(
+    "Set true to keep an intentional ad-hoc checkout when matching Workspaces exist. Prefer switchWorkspace; the checkout is already present after a successful switch."
+  )
 }).strict();
 var cloneSchema = z.object({
   path: z.string(),
-  repo: z.string(),
-  workspaces: z.array(z.string())
+  repo: z.string()
 });
 var outputSchema = pluginToolOutputSchema.extend({
   target: z.literal("cloneRepository"),
@@ -769,6 +771,17 @@ function parseRepo(value) {
   }
   return { owner: parts[0], name: parts[1] };
 }
+function workspaceRequiredError(repoId, workspaces) {
+  const names = workspaces.map((name) => `"${name}"`).join(", ");
+  if (workspaces.length === 1) {
+    return new PluginToolInputError(
+      `Repository ${repoId} is part of Workspace ${names}. Call switchWorkspace with that name; the checkout is already present after the switch. Pass allowAdHoc=true only for an intentional ad-hoc checkout.`
+    );
+  }
+  return new PluginToolInputError(
+    `Repository ${repoId} is part of Workspaces ${names}. Call switchWorkspace with one of those names; the checkout is already present after the switch. Pass allowAdHoc=true only for an intentional ad-hoc checkout.`
+  );
+}
 function defaultDirectory(repoName) {
   return `repos/${repoName}`;
 }
@@ -808,16 +821,33 @@ function createGitHubCloneRepositoryTool(ctx) {
       openWorldHint: true,
       readOnlyHint: true
     },
-    description: "Clone a GitHub repository into the sandbox workspace. The destination must not already exist.",
+    description: "Clone a GitHub repository into the sandbox as an ad-hoc checkout. The destination must not already exist. When matching Workspaces exist this is a tool input error: call switchWorkspace instead, or pass allowAdHoc=true for an intentional ad-hoc checkout.",
     describeProposal(input) {
       const directory = typeof input.directory === "string" && input.directory.length > 0 ? input.directory : void 0;
-      return directory ? `Shallow-clone ${input.repo} into the local sandbox at ${directory} for inspection (no GitHub mutation).` : `Shallow-clone ${input.repo} into the local sandbox for inspection (no GitHub mutation).`;
+      const adHoc = input.allowAdHoc === true ? " as an intentional ad-hoc checkout" : "";
+      return directory ? `Shallow-clone ${input.repo} into the local sandbox at ${directory}${adHoc} for inspection (no GitHub mutation).` : `Shallow-clone ${input.repo} into the local sandbox${adHoc} for inspection (no GitHub mutation).`;
     },
     executionMode: "sequential",
     inputSchema,
     outputSchema,
     async execute(input, options) {
       const repo = parseRepo(input.repo);
+      const repoId = `${repo.owner}/${repo.name}`;
+      let workspaces = [];
+      try {
+        workspaces = await ctx.workspaces.findByRepository({
+          provider: "github",
+          repo: repoId
+        });
+      } catch (error) {
+        ctx.log.error("github.clone.workspaces_lookup.failed", {
+          repo: repoId,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+      if (workspaces.length > 0 && input.allowAdHoc !== true) {
+        throw workspaceRequiredError(repoId, workspaces);
+      }
       const directory = input.directory ?? defaultDirectory(repo.name);
       const rootSegment = directory.split("/")[0] ?? directory;
       if (isReservedSandboxDirectory(rootSegment)) {
@@ -874,21 +904,7 @@ function createGitHubCloneRepositoryTool(ctx) {
           `GitHub repository clone failed: ${clone.stderr.trim() || `exit ${clone.exitCode}`}`
         );
       }
-      const repoId = `${repo.owner}/${repo.name}`;
-      let workspaces = [];
-      try {
-        workspaces = await ctx.workspaces.findByRepository({
-          provider: "github",
-          repo: repoId
-        });
-      } catch (error) {
-        ctx.log.error("github.clone.workspaces_lookup.failed", {
-          repo: repoId,
-          error: error instanceof Error ? error.message : String(error)
-        });
-      }
-      const data = { repo: repoId, path, workspaces };
-      return { target: "cloneRepository", ...data };
+      return { target: "cloneRepository", repo: repoId, path };
     }
   });
 }

package/dist/tools/clone-repository.d.ts

@@ -1,13 +1,13 @@
 import { type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
-/** Clone one GitHub repository into the sandbox workspace. */
+/** Clone one GitHub repository into the sandbox as an ad-hoc checkout. */
 export declare function createGitHubCloneRepositoryTool(ctx: ToolRegistrationHookContext): import("@sentry/junior-plugin-api").PluginToolDefinition<{
     repo: string;
     directory?: string | undefined;
+    allowAdHoc?: boolean | undefined;
 }, {
     [x: string]: unknown;
     path: string;
     repo: string;
-    workspaces: string[];
     target: "cloneRepository";
     truncated?: boolean | undefined;
     continuation?: {
@@ -18,7 +18,6 @@ export declare function createGitHubCloneRepositoryTool(ctx: ToolRegistrationHoo
     [x: string]: unknown;
     path: string;
     repo: string;
-    workspaces: string[];
     target: "cloneRepository";
     truncated?: boolean | undefined;
     continuation?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.167.0",
+  "version": "0.169.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.167.0"
+    "@sentry/junior-plugin-api": "0.169.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",

package/skills/github-code/SKILL.md

@@ -23,7 +23,7 @@ Use `git` and `gh` for repository work. Use `github_createPullRequest`, not `gh
 - Base conclusions on repository evidence. Do not claim a check ran unless it did.
 - For Junior-owned pull requests, push the branch before creating the PR. The runtime supplies repository-scoped GitHub App credentials for both; try the operations before requesting remediation and never ask for a user token.
 - Use `github_cloneRepository` instead of shelling out to `git clone` when a repository is not already available in the sandbox.
-- When a tool result shows a Workspace exists for the repo, prefer it via `switchWorkspace` over an ad-hoc checkout.
+- If `github_cloneRepository` returns a tool input error about matching Workspaces, call `switchWorkspace`. The checkout is already present after a successful switch. Pass `allowAdHoc=true` only for an intentional ad-hoc checkout.
 - A tool-routing denial requires the named tool; only an upstream denial justifies permission remediation.
 - Stop for ambiguous targets, missing access, destructive operations, or unresolved upstream permission failures.
 
@@ -31,7 +31,7 @@ Use `git` and `gh` for repository work. Use `github_createPullRequest`, not `gh
 
 ### 1. Resolve and inspect
 
-Identify the repo, checkout, default/current branches, worktree state, repo instructions, package manager, and relevant checks. Prefer an existing checkout; otherwise clone shallowly.
+Identify the repo, checkout, default/current branches, worktree state, repo instructions, package manager, and relevant checks. Prefer an existing checkout or matching Workspace; otherwise clone shallowly. If clone returns a Workspace tool input error, switch Workspace instead of cloning again, or pass `allowAdHoc=true`.
 
 A shallow clone is for fast inspection, not history rewriting. Before rebasing, merge-base analysis, blame/history work, or comparing against a base absent locally, fetch the needed refs and deepen incrementally. Use `--unshallow` only when bounded deepening is insufficient. Never use a force push to compensate for incomplete history.