@sideboard-ai/core 0.1.15 → 0.1.19

package/dist/index.cjs

@@ -1390,6 +1390,16 @@ function formatGhLandError(raw, opts) {
     return trimmed;
   }
   const detail = extractGhErrorDetail(raw);
+  if (/Head ref must be a branch|No commits between|Head sha can't be blank/i.test(
+    raw
+  ) || /Head ref must be a branch|No commits between|Head sha can't be blank/i.test(
+    detail
+  )) {
+    const target = opts?.targetedRepo ? ` Targeted ${opts.targetedRepo}` : "";
+    const head = opts?.headRef ? ` with head ${opts.headRef}` : "";
+    const hint = opts?.targetedRepo ? ` Branch was pushed to origin \u2014 confirm it exists on GitHub and differs from the base branch.${target}${head}.` : " Often `gh` targeted upstream instead of origin. Branch was pushed \u2014 retry in the latest Sideboard, or run: gh pr create -R <owner/name> --base main --head <branch>.";
+    return `Could not create the pull request.${hint}`;
+  }
   if (isGhRateLimitError(raw) || isGhRateLimitError(detail)) {
     const when = opts?.resetAt ? ` Try again ${formatRateLimitResetHint(opts.resetAt, opts.nowMs)}.` : " Wait a few minutes and try again.";
     const pushNote = opts?.pushed === false ? "" : " Your branch was already pushed.";
@@ -1600,11 +1610,14 @@ __export(worktree_exports, {
   createThreadWorktree: () => createThreadWorktree,
   currentBranch: () => currentBranch,
   detectLocalMergeConflicts: () => detectLocalMergeConflicts,
+  ensureGhPreferOrigin: () => ensureGhPreferOrigin,
   fetchPrHead: () => fetchPrHead,
   getPr: () => getPr,
   getPrChecks: () => getPrChecks,
   getPrDetails: () => getPrDetails,
   getPrMeta: () => getPrMeta,
+  ghHeadRef: () => ghHeadRef,
+  ghRepoSelectArgs: () => ghRepoSelectArgs,
   isDirty: () => isDirty,
   isPlaceholderBranch: () => isPlaceholderBranch,
   listBranches: () => listBranches,
@@ -1612,6 +1625,7 @@ __export(worktree_exports, {
   listWorktrees: () => listWorktrees,
   mergePr: () => mergePr,
   normalizeWorktreePath: () => normalizeWorktreePath,
+  originGhRepoEnv: () => originGhRepoEnv,
   parseGithubSlugFromRemoteUrl: () => parseGithubSlugFromRemoteUrl,
   pushBranch: () => pushBranch,
   removeWorktree: () => removeWorktree,
@@ -1639,12 +1653,19 @@ async function lookupGithubGraphqlReset(cwd) {
     return void 0;
   }
 }
-async function formatPrCreateFailure(raw, cwd) {
+async function formatPrCreateFailure(raw, cwd, ctx) {
   if (!isGhRateLimitError(raw)) {
-    return formatGhLandError(raw);
+    return formatGhLandError(raw, {
+      targetedRepo: ctx?.slug,
+      headRef: ctx?.head
+    });
   }
   const resetAt = await lookupGithubGraphqlReset(cwd);
-  return formatGhLandError(raw, { resetAt });
+  return formatGhLandError(raw, {
+    resetAt,
+    targetedRepo: ctx?.slug,
+    headRef: ctx?.head
+  });
 }
 function slugify(input) {
   return input.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
@@ -1654,10 +1675,13 @@ async function resolveRepoRoot(cwd) {
   return stdout.trim();
 }
 function parseGithubSlugFromRemoteUrl(url) {
-  const trimmed = url.trim();
-  const match = trimmed.match(/github\.com[:/]([^/]+)\/([^/.]+?)(?:\.git)?$/i) ?? trimmed.match(/github\.com[:/]([^/]+)\/([^/.]+)/i);
-  if (!match?.[1] || !match[2]) return null;
-  return `${match[1]}/${match[2]}`;
+  const trimmed = url.trim().replace(/\.git$/i, "");
+  if (!trimmed) return null;
+  const github = trimmed.match(/github\.com[:/]([^/]+)\/([^/]+)$/i);
+  if (github?.[1] && github[2]) return `${github[1]}/${github[2]}`;
+  const sshAlias = trimmed.match(/^git@[^:]+:([^/]+)\/([^/]+)$/i);
+  if (sshAlias?.[1] && sshAlias[2]) return `${sshAlias[1]}/${sshAlias[2]}`;
+  return null;
 }
 async function slugFromGitRemote(repoPath, remote) {
   const result = await git(["remote", "get-url", remote], repoPath, {
@@ -1669,13 +1693,16 @@ async function slugFromGitRemote(repoPath, remote) {
 async function resolveGithubRepoSlug(repoPath) {
   const fromOrigin = await slugFromGitRemote(repoPath, "origin");
   if (fromOrigin) return fromOrigin;
-  const viaGh = await gh(
-    ["repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"],
-    repoPath,
-    { reject: false }
-  );
-  if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
-    return viaGh.stdout.trim();
+  const hasAlt = Boolean(await slugFromGitRemote(repoPath, "upstream")) || Boolean(await slugFromGitRemote(repoPath, "github"));
+  if (!hasAlt) {
+    const viaGh = await gh(
+      ["repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"],
+      repoPath,
+      { reject: false }
+    );
+    if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
+      return viaGh.stdout.trim();
+    }
   }
   for (const remote of ["upstream", "github"]) {
     const slug = await slugFromGitRemote(repoPath, remote);
@@ -1683,15 +1710,35 @@ async function resolveGithubRepoSlug(repoPath) {
   }
   return null;
 }
+function ghRepoSelectArgs(slug) {
+  return ["-R", slug];
+}
+function ghHeadRef(slug, branch) {
+  const owner = slug.split("/")[0];
+  const head = branch.trim().replace(/^refs\/heads\//, "");
+  if (!owner || !head) return head || branch;
+  if (head.includes(":")) return head;
+  return `${owner}:${head}`;
+}
+async function ensureGhPreferOrigin(cwd) {
+  const originSlug = await slugFromGitRemote(cwd, "origin");
+  if (!originSlug) return;
+  const hasAlt = Boolean(await slugFromGitRemote(cwd, "upstream")) || Boolean(await slugFromGitRemote(cwd, "github"));
+  if (!hasAlt) return;
+  const view = await gh(["repo", "set-default", "--view"], cwd, {
+    reject: false
+  });
+  const current = `${view.stdout}
+${view.stderr}`;
+  if (view.exitCode === 0 && current.includes(originSlug)) return;
+  await gh(["repo", "set-default", "origin"], cwd, { reject: false });
+}
+async function originGhRepoEnv(cwd) {
+  await ensureGhPreferOrigin(cwd);
+  const slug = await resolveGithubRepoSlug(cwd);
+  return slug ? { GH_REPO: slug } : {};
+}
 async function resolveDefaultBranch(repoPath) {
-  const viaGh = await gh(
-    ["repo", "view", "--json", "defaultBranchRef", "--jq", ".defaultBranchRef.name"],
-    repoPath,
-    { reject: false }
-  );
-  if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
-    return viaGh.stdout.trim();
-  }
   const viaOrigin = await git(
     ["symbolic-ref", "refs/remotes/origin/HEAD"],
     repoPath,
@@ -1700,6 +1747,31 @@ async function resolveDefaultBranch(repoPath) {
   if (viaOrigin.exitCode === 0 && viaOrigin.stdout.trim()) {
     return viaOrigin.stdout.trim().replace(/^refs\/remotes\/origin\//, "");
   }
+  const slug = await resolveGithubRepoSlug(repoPath);
+  const viaGh = await gh(
+    [
+      "repo",
+      "view",
+      ...slug ? ["--repo", slug] : [],
+      "--json",
+      "defaultBranchRef",
+      "--jq",
+      ".defaultBranchRef.name"
+    ],
+    repoPath,
+    { reject: false }
+  );
+  if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
+    return viaGh.stdout.trim();
+  }
+  for (const candidate of ["main", "master"]) {
+    const check = await git(
+      ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${candidate}`],
+      repoPath,
+      { reject: false }
+    );
+    if (check.exitCode === 0) return candidate;
+  }
   for (const candidate of ["main", "master"]) {
     const check = await git(
       ["show-ref", "--verify", "--quiet", `refs/heads/${candidate}`],
@@ -2105,6 +2177,7 @@ async function createThreadWorktree(opts) {
   if ((0, import_node_fs5.existsSync)(worktreePath)) {
     throw new Error(`Worktree already exists at ${worktreePath}`);
   }
+  await ensureGhPreferOrigin(opts.repoPath);
   await git(["fetch", "origin", "--prune"], opts.repoPath, { reject: false });
   if (!opts.sourceRef.startsWith("origin/") && !opts.sourceRef.startsWith("refs/")) {
     await git(["fetch", "origin", opts.sourceRef], opts.repoPath, {
@@ -2133,6 +2206,7 @@ ${add.stdout}`;
         );
         if (retry.exitCode === 0) {
           branchName = alt;
+          await ensureGhPreferOrigin(worktreePath);
           return { branchName, worktreePath };
         }
       }
@@ -2141,6 +2215,7 @@ ${add.stdout}`;
       `Failed to create worktree: ${add.stderr.trim() || add.stdout.trim() || `exit ${add.exitCode}`}`
     );
   }
+  await ensureGhPreferOrigin(worktreePath);
   return { branchName, worktreePath };
 }
 async function removeWorktree(repoPath, worktreePath, opts) {
@@ -2241,8 +2316,18 @@ async function mergePr(cwd, selector, opts) {
   return { url, state: "MERGED" };
 }
 async function createOrUpdatePr(worktreePath, opts) {
+  await ensureGhPreferOrigin(worktreePath);
+  const slug = await resolveGithubRepoSlug(worktreePath);
+  if (!slug) {
+    throw new Error(
+      "Could not resolve the origin GitHub repo (owner/name) for this worktree. Check that `git remote get-url origin` points at github.com."
+    );
+  }
+  const repoArgs = ghRepoSelectArgs(slug);
+  const headRef = ghHeadRef(slug, opts.head);
+  const branchOnly = opts.head.trim().replace(/^refs\/heads\//, "");
   const existing = await gh(
-    ["pr", "view", opts.head, "--json", "url", "--jq", ".url"],
+    [...repoArgs, "pr", "view", branchOnly, "--json", "url", "--jq", ".url"],
     worktreePath,
     { reject: false }
   );
@@ -2250,9 +2335,10 @@ async function createOrUpdatePr(worktreePath, opts) {
     const url2 = existing.stdout.trim();
     await gh(
       [
+        ...repoArgs,
         "pr",
         "edit",
-        opts.head,
+        branchOnly,
         "--title",
         opts.title,
         "--body",
@@ -2265,6 +2351,7 @@ async function createOrUpdatePr(worktreePath, opts) {
   }
   if (opts.web) {
     const args2 = [
+      ...repoArgs,
       "pr",
       "create",
       "--web",
@@ -2275,18 +2362,19 @@ async function createOrUpdatePr(worktreePath, opts) {
       "--base",
       opts.base,
       "--head",
-      opts.head
+      headRef
     ];
     if (opts.draft) args2.push("--draft");
     await gh(args2, worktreePath, { reject: false });
     const again = await gh(
-      ["pr", "view", opts.head, "--json", "url", "--jq", ".url"],
+      [...repoArgs, "pr", "view", branchOnly, "--json", "url", "--jq", ".url"],
       worktreePath,
       { reject: false }
     );
     return again.stdout.trim() || "";
   }
   const args = [
+    ...repoArgs,
     "pr",
     "create",
     "--title",
@@ -2296,13 +2384,13 @@ async function createOrUpdatePr(worktreePath, opts) {
     "--base",
     opts.base,
     "--head",
-    opts.head
+    headRef
   ];
   if (opts.draft) args.push("--draft");
   const created = await gh(args, worktreePath, { reject: false });
   if (created.exitCode !== 0) {
     const raw = created.stderr.trim() || created.stdout.trim() || "gh pr create failed";
-    throw new Error(await formatPrCreateFailure(raw, worktreePath));
+    throw new Error(await formatPrCreateFailure(raw, worktreePath, { slug, head: headRef }));
   }
   const url = created.stdout.trim().split("\n").find((l) => l.startsWith("http")) ?? created.stdout.trim();
   return url;
@@ -2406,7 +2494,8 @@ function coordinatorGreenfieldPlaybook(reposDir) {
     "- Examples:",
     `  - Clone: \`git clone <url> ${reposDir}/<name>\``,
     `  - New GitHub repo: \`gh repo create <owner>/<name> --private --clone -- ${reposDir}/<name>\` (or mkdir + git init + gh repo create + remote add + push)`,
-    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 send_to_thread (`gh pr create --draft`) or create_draft_pr.",
+    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 send_to_thread (`gh pr create --draft -R <origin-owner/name>`) or create_draft_pr.",
+    "- Always target the child worktree's **origin** (`github:` slug from list_workspaces / `git remote get-url origin` in that worktree). Never open PRs against `upstream`.",
     "- Do coding work in the child worktree thread, not by editing files in this home cwd."
   ].join("\n");
 }
@@ -2471,7 +2560,7 @@ function coordinatorSystemPrompt(opts) {
     COORDINATOR_TOOL_PLAYBOOK,
     coordinatorGreenfieldPlaybook(reposDir),
     "When creating threads, pass the correct repoPath for the target workspace and parentThreadId for children.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft`) \u2192 wait_for_turn. Use create_draft_pr only if the child cannot open the PR.",
+    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft -R <origin-owner/name>` using the workspace github slug) \u2192 wait_for_turn. Use create_draft_pr only if the child cannot open the PR. Never target upstream.",
     "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR.",
     `Goal: ${opts.goal}`,
     `Parent thread id (pass as parentThreadId when creating children): ${opts.parentId}`,
@@ -2508,8 +2597,8 @@ var init_coordinator_prompt = __esm({
       "Inspect / PRs:",
       "- get_diff \u2014 compact diff summary",
       "- preview_land \u2014 preview push+PR (does not push)",
-      "- Prefer asking the worktree agent via send_to_thread to open a draft PR (`gh pr create --draft`) so it owns title/body from the diff.",
-      "- create_draft_pr \u2014 fallback: commit (if dirty), push, open/update a DRAFT PR from the orchestrator",
+      "- Prefer asking the worktree agent via send_to_thread to open a draft PR with `gh pr create --draft -R <origin-owner/name>` (use the workspace `github:` slug / that worktree's origin \u2014 never upstream) so it owns title/body from the diff.",
+      "- create_draft_pr \u2014 fallback: commit (if dirty), push to origin, open/update a DRAFT PR from the orchestrator (always against origin)",
       "Human-only (do not attempt): ready-for-review confirm_land, purge_thread.",
       "Thread links in replies: when mentioning a chat/thread for the user, include a markdown link `[Title](sideboard://thread/<id>)` using the full id (or the link field from create_thread / list_threads). Sideboard renders these as clickable opens.",
       "Bash / Read / etc: allowed for (1) inspecting target worktrees / registered repo paths from MCP, and (2) greenfield setup under ~/sideboard/repos (git clone, gh repo create, git init+remote). Never git init/clone *inside* this synthetic home cwd \u2014 emptiness here is expected, not a bug."
@@ -2729,7 +2818,9 @@ function forgetRemoved(repoPath) {
 }
 function listWorkspaces() {
   const all = readAll();
-  const valid = all.filter((w) => Boolean(w.path) && w.path !== "/" && w.path !== ".");
+  const valid = all.filter(
+    (w) => Boolean(w.path) && w.path !== "/" && w.path !== "." && !isGlobalRepoPath(w.path)
+  );
   if (valid.length !== all.length) writeAll(valid);
   return valid.sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -2738,6 +2829,7 @@ async function addWorkspace(repoPath) {
   if (!root || root === "/") throw new Error(`Invalid repo path: ${repoPath}`);
   if (!(0, import_node_fs7.existsSync)(root)) throw new Error(`Repo not found: ${root}`);
   forgetRemoved(root);
+  await ensureGhPreferOrigin(root);
   const current = readAll();
   const existing = current.find((w) => w.path === root);
   if (existing) return existing;
@@ -4809,6 +4901,7 @@ __export(index_exports, {
   enrichWorkspacesWithGithub: () => enrichWorkspacesWithGithub,
   ensureAgentPath: () => ensureAgentPath,
   ensureCloudCoordinator: () => ensureCloudCoordinator,
+  ensureGhPreferOrigin: () => ensureGhPreferOrigin,
   ensureGlobalCoordinatorCwd: () => ensureGlobalCoordinatorCwd,
   ensureWorkspace: () => ensureWorkspace,
   estimateMessageChars: () => estimateMessageChars,
@@ -4852,6 +4945,8 @@ __export(index_exports, {
   getRunMode: () => getRunMode,
   getRunScript: () => getRunScript,
   gh: () => gh,
+  ghHeadRef: () => ghHeadRef,
+  ghRepoSelectArgs: () => ghRepoSelectArgs,
   git: () => git,
   globalAgentCwd: () => globalAgentCwd,
   harnessEnvKey: () => harnessEnvKey,
@@ -4911,6 +5006,7 @@ __export(index_exports, {
   opencodeAdapter: () => opencodeAdapter,
   orchestrationTitleNeedsSoccerNickname: () => orchestrationTitleNeedsSoccerNickname,
   orchestratorSessionPoisonedByBuiltins: () => orchestratorSessionPoisonedByBuiltins,
+  originGhRepoEnv: () => originGhRepoEnv,
   parseCursorRunnerLine: () => parseCursorRunnerLine,
   parseForceStopMessage: () => parseForceStopMessage,
   parseGithubSlugFromRemoteUrl: () => parseGithubSlugFromRemoteUrl,
@@ -5186,7 +5282,9 @@ init_agents();
 // src/agents/spawn.ts
 var import_node_readline = require("readline");
 var import_execa2 = require("execa");
+init_worktree();
 init_app_settings();
+init_global_workspace();
 init_brightsy();
 init_agents();
 
@@ -5420,9 +5518,14 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Agent cwd must be the thread worktree (got ${cmd.cwd}, expected ${thread.worktreePath})`
     );
   }
+  const env = childEnvWithAppSettings(cmd.env);
+  if (!isOrchestratorThread(thread)) {
+    const originEnv = await originGhRepoEnv(thread.worktreePath).catch(() => ({}));
+    Object.assign(env, originEnv);
+  }
   const child = (0, import_execa2.execa)(cmd.file, cmd.args, {
     cwd: cmd.cwd,
-    env: childEnvWithAppSettings(cmd.env),
+    env,
     reject: false,
     stdout: "pipe",
     stderr: "pipe",
@@ -5529,7 +5632,7 @@ function formatRenameBranchDirective(thread, opts) {
   }
   return lines.join("\n");
 }
-function formatWorktreeDirective(thread) {
+function formatWorktreeDirective(thread, opts) {
   const worktree = normPath2(thread.worktreePath);
   const repo = normPath2(thread.repoPath);
   const dir = worktreeNameFromPath(thread.worktreePath);
@@ -5550,7 +5653,13 @@ function formatWorktreeDirective(thread) {
     );
   }
   lines.push("");
-  lines.push("Pull requests (when the work is ready to share):");
+  lines.push("Git remotes + pull requests (when the work is ready to share):");
+  lines.push(
+    "- Always use this worktree's `origin` remote (`git remote get-url origin` from this cwd). Never push to or open PRs against `upstream` (template remotes)."
+  );
+  lines.push(
+    "- Push with `git push -u origin HEAD` (or the current branch name). Do not `git push upstream`."
+  );
   lines.push(
     "- Derive the PR title and body from what the changes actually do and why \u2014 inspect the diff/commits and the user request. Do not use the soccer-team worktree nickname or placeholder branch as the PR title."
   );
@@ -5564,9 +5673,13 @@ function formatWorktreeDirective(thread) {
     lines.push(
       `- A PR already exists (${thread.prUrl}). Update it (push + edit title/body if the purpose drifted) instead of opening a duplicate.`
     );
+  } else if (opts?.githubSlug) {
+    lines.push(
+      `- Prefer a draft PR first: \`gh pr create --draft -R ${opts.githubSlug}\` (or update via \`gh pr edit -R ${opts.githubSlug}\`) once the change set is coherent. Always pass \`-R ${opts.githubSlug}\` (this worktree's origin). Bare \`gh pr create\` may target upstream instead of origin on dual-remote checkouts. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name.`
+    );
   } else {
     lines.push(
-      "- Prefer a draft PR first: `gh pr create --draft` (or update via `gh pr edit`) once the change set is coherent. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name."
+      "- Prefer a draft PR first: `gh pr create --draft -R <origin-owner/name>` (or update via `gh pr edit -R \u2026`) once the change set is coherent. Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree \u2014 never from `upstream`. Mark ready for review only when asked. Title/body must reflect the change purpose, not the worktree name."
     );
   }
   return lines.join("\n");
@@ -8212,7 +8325,11 @@ var Orchestrator = class {
     }
     const isBrightsy = fresh.agent === "brightsy";
     const isOrchestration = isOrchestratorThread(fresh);
-    const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh);
+    const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
+      githubSlug: await resolveGithubRepoSlug(fresh.worktreePath).catch(
+        () => null
+      )
+    });
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
     const { autoRenameBranchEnabled: autoRenameBranchEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled2() ? formatRenameBranchDirective(fresh, {
@@ -9393,7 +9510,7 @@ async function startMcpServer() {
   );
   server.tool(
     "create_draft_pr",
-    "Commit dirty changes if needed, push the thread branch, and create/update a DRAFT GitHub PR. Ready-for-review / non-draft land stays human-only (CLI/app confirm_land). Prefer this when the orchestrator should open a PR itself; alternatively send_to_thread asking the worktree agent to run `gh pr create --draft`.",
+    "Commit dirty changes if needed, push the thread branch to origin, and create/update a DRAFT GitHub PR against that worktree's origin (never upstream). Ready-for-review / non-draft land stays human-only (CLI/app confirm_land). Prefer this when the orchestrator should open a PR itself; alternatively send_to_thread asking the worktree agent to run `gh pr create --draft -R <origin-owner/name>`.",
     { ref: import_zod.z.string() },
     async ({ ref }) => {
       try {
@@ -9919,6 +10036,7 @@ init_injected_mcp();
   enrichWorkspacesWithGithub,
   ensureAgentPath,
   ensureCloudCoordinator,
+  ensureGhPreferOrigin,
   ensureGlobalCoordinatorCwd,
   ensureWorkspace,
   estimateMessageChars,
@@ -9962,6 +10080,8 @@ init_injected_mcp();
   getRunMode,
   getRunScript,
   gh,
+  ghHeadRef,
+  ghRepoSelectArgs,
   git,
   globalAgentCwd,
   harnessEnvKey,
@@ -10021,6 +10141,7 @@ init_injected_mcp();
   opencodeAdapter,
   orchestrationTitleNeedsSoccerNickname,
   orchestratorSessionPoisonedByBuiltins,
+  originGhRepoEnv,
   parseCursorRunnerLine,
   parseForceStopMessage,
   parseGithubSlugFromRemoteUrl,

package/dist/index.d.cts

@@ -695,6 +695,10 @@ type FormatGhLandErrorOptions = {
     /** Land push already succeeded before PR create failed. Default true for PR-create path. */
     pushed?: boolean;
     nowMs?: number;
+    /** Repo Sideboard passed to `gh -R` (origin), when known. */
+    targetedRepo?: string;
+    /** Head ref passed to `gh pr create` (often `owner:branch`). */
+    headRef?: string;
 };
 /**
  * Turn noisy `gh pr create` / Execa failures into a short notice for UI/CLI.
@@ -757,7 +761,7 @@ declare function worktreeDisplayLabelForGroup(threads: {
 declare function slugify(input: string): string;
 declare function resolveRepoRoot(cwd: string): Promise<string>;
 /**
- * Parse `owner/name` from a git remote URL (SSH or HTTPS).
+ * Parse `owner/name` from a git remote URL (SSH, HTTPS, or SSH host aliases).
  */
 declare function parseGithubSlugFromRemoteUrl(url: string): string | null;
 /**
@@ -770,6 +774,21 @@ declare function parseGithubSlugFromRemoteUrl(url: string): string | null;
  * resolves to upstream — which lists the wrong open PRs in the create modal.
  */
 declare function resolveGithubRepoSlug(repoPath: string): Promise<string | null>;
+/** Global `-R owner/repo` args so gh never targets upstream by accident. */
+declare function ghRepoSelectArgs(slug: string): string[];
+/** Same-repo head ref as `owner:branch` (required for reliable `-R` creates). */
+declare function ghHeadRef(slug: string, branch: string): string;
+/**
+ * On Makerkit-style checkouts (`origin` product + `upstream` template), `gh`
+ * prefers `upstream` → so bare `gh pr create` hits the wrong GitHub repo.
+ * Pin the CLI default to `origin` once per repo (shared by all worktrees).
+ */
+declare function ensureGhPreferOrigin(cwd: string): Promise<void>;
+/**
+ * Env pin so bare `gh` (and agents) target this checkout's **origin**, not
+ * Makerkit-style `upstream`. `GH_REPO` is the CLI's documented override.
+ */
+declare function originGhRepoEnv(cwd: string): Promise<Record<string, string>>;
 declare function resolveDefaultBranch(repoPath: string): Promise<string>;
 /**
  * Prefer `origin/<branch>` for diff/merge-base so Changes / Land don't inflate
@@ -1189,7 +1208,9 @@ declare function formatRenameBranchDirective(thread: Pick<Thread, 'worktreePath'
  * Mandatory Sideboard isolation + landing guidance — agents must edit the thread
  * worktree and open PRs whose titles/bodies describe the *purpose of the changes*.
  */
-declare function formatWorktreeDirective(thread: Pick<Thread, 'worktreePath' | 'repoPath' | 'branchName'> & Partial<Pick<Thread, 'title' | 'prUrl'>>): string;
+declare function formatWorktreeDirective(thread: Pick<Thread, 'worktreePath' | 'repoPath' | 'branchName'> & Partial<Pick<Thread, 'title' | 'prUrl'>>, opts?: {
+    githubSlug?: string | null;
+}): string;
 interface AgentInstructionFile {
     relativePath: string;
     content: string;
@@ -2348,4 +2369,4 @@ declare function writeInjectedMcpConfig(opts: {
     includeBrightsy?: boolean;
 }): Promise<string | null>;
 
-export { type ActiveRun, type AdoptInput, type AdvancedAppSettings, type AgentAdapter, type AgentEvent, type AgentInstructionFile, type AgentKind, type AgentStatus, type AgentTurnInput, type AnthropicCacheControl, type AppSettings, type ApplyIntoMainResult, type AttachCommand, type Autonomy, BRIGHTSY_MCP_ALLOWED_TOOLS, type BranchInfo, type BrightsyAccount, type BrightsyChatTarget, type BrightsyChatTargets, type BrightsyCloudConnectAgent, type BrightsyHarnessSettings, type BrightsySession, BrightsySideboardApi, type BrightsyTeamTargets, CLOUD_COORDINATOR_BUSY_REPLY, CLOUD_COORDINATOR_STOPPED_REPLY, CLOUD_COORDINATOR_TIMEOUT_REPLY, CLOUD_ORCHESTRATOR_GOAL, CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, COORDINATOR_TOOL_PLAYBOOK, type ClaudeHarnessSettings, type CleanupOrphansResult, type CloudConnectAgent, type CloudConnectOptions, type CloudConnectStatus, type CompactResult, type CompactThresholds, type ConductorSettings, type ConductorWorkspace, type ConnectedBrightsyTeamInfo, type CreateChatTabInput, type CreateGlobalChatOpts, type CreateThreadInput, type CreateWorktreeResult, type CursorSdkStreamMessage, type CursorTurnRequest, type CursorWorktreesConfig, type DevServerHandle, type DiffCommit, type DiffFile, type DiffResult, type DiffScope, type DiffScopeStat, type ExpandResult, FAMOUS_SOCCER_TEAMS, type ForkChatTabInput, type ForkThreadWorktreeInput, type FormatGhLandErrorOptions, GLOBAL_WORKSPACE_ID, type GetDiffOptions, type GitHubStatus, type GitWorktreeStatus, HARNESS_ENV_KEYS, type HarnessId, type IntegrationsSettings, type IpcApi, type IssueInfo, type IssueSource, type LandPreview, type LandResult, type ListIssuesResult, MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS, type McpServerStatus, type MessagePart, Orchestrator, type OrchestratorEvent, type OrchestratorRuntime, type OrphanWorktree, PLAN_MODE_INSTRUCTION, type PrActor, type PrCheckRun, type PrCommentInfo, type PrCommitInfo, type PrDetails, type PrInfo, type PrMeta, type PrReviewInfo, type RepoSettings, type RepoSetupInfo, type RunMode, type RunScript, SIDEBOARD_FORCE_STOP, SIDEBOARD_MCP_ALLOWED_TOOLS, type ScriptHandle, type SkillInfo, type SourceType, type SpawnTurnHandle, type SummarizeResult, type TeamName, type Thread, type ThreadAttachment, type ThreadMessage, type ThreadOptionsPatch, type ThreadStatus, type TokenUsage, type TranscriptToolDetail, type TurnCommand, type Workspace, type WorkspaceInventoryEntry, type WorkspaceScriptEnvOpts, addWorkspace, adoptThread, allAdapters, allocatePort, allocatePortRange, allocateTeamName, allocateTeamSlug, appDataDir, appSettingsPath, appendMessage, applyAgentEvent, applyAppEnvironment, applyCompaction, applyThreadIntoMain, autoCleanupOrphansEnabled, autoRenameBranchEnabled, autoRunAfterSetupEnabled, branchDisplayLabel, brightsyAdapter, brightsyCloudConnectAgent, brightsyCloudConnectEnabled, brightsyConfigPath, brightsyMcpAllowedTools, brightsyMcpServerName, buildCachedUserContent, buildClaudeStreamJsonUserMessage, buildForkTranscriptAttachment, buildSessionSeed, buildWorkspaceScriptEnv, caffeinateWhileCloudConnectEnabled, caffeinateWhileRunningEnabled, captureLoginEnv, captureTurnBaseline, childEnvWithAppSettings, claudeAdapter, claudeChromeEnabled, claudeUserSettingsPath, cleanupOrphanWorktrees, cloneRepoIntoSideboard, codexAdapter, collectTakenTeamSlugs, commitAll, conductorDbPath, confirmLand, connectBrightsyTeam, coordinatorSystemPrompt, coordinatorTurnReminder, copyConfiguredFiles, countCacheControlBlocks, createChatTab, createEmptyThread, createGlobalChat, createOrUpdatePr, createThread, createThreadWorktree, currentBranch, cursorAdapter, cursorSdkMessageToEvents, decodeBrightsyTarget, deleteBranchOnPurgeEnabled, deleteThreadRecord, detectAgents, detectLocalMergeConflicts, disconnectBrightsyTeam, discoverSkills, encodeBrightsyTarget, enrichWorkspacesWithGithub, ensureAgentPath, ensureCloudCoordinator, ensureGlobalCoordinatorCwd, ensureWorkspace, estimateMessageChars, estimateThreadChars, expandComposerPrompt, extractGhErrorDetail, extractiveSummary, fetchPrHead, finalizeParts, findInvalidCacheControlTtlOrder, findOrphanWorktrees, findThreadByRef, flattenTurnInput, forkChatTab, forkMessageSlice, forkThreadWorktree, formatAgentInstructions, formatBrightsyFetchError, formatGhLandError, formatIpcInvokeError, formatMessagesAsTranscript, formatRateLimitResetHint, formatRenameBranchDirective, formatTranscriptMarkdown, formatWorkspaceInventory, formatWorktreeDirective, getAdapter, getBrightsySession, getDefaultRunScript, getDiff, getDiffSummary, getGitHubStatus, getIssueSource, getLinearApiKey, getOrchestrator, getPr, getPrChecks, getPrDetails, getPrMeta, getRepoSetupInfo, getRunMode, getRunScript, gh, git, globalAgentCwd, harnessEnvKey, hasConductorHook, hasCursorWorktreeSetup, hasRepoHook, hasWorkspaceHook, healOrchestrationSoccerTitles, importConductorWorkspace, importConductorWorkspaceAsync, initializeGitRepository, inspectGitWorktree, isBrightsyConnected, isBrightsyNdjsonLine, isCloudCoordinatorThread, isDirty, isGhRateLimitError, isGlobalRepoPath, isGlobalThread, isLinearConnected, isOrchestratorThread, isPlaceholderBranch, listBranchCommits, listBranches, listBrightsyAccounts, listBrightsyChatTargets, listConductorWorkspaces, listConnectedBrightsyTeams, listGitHubIssues, listGlobalThreads, listIssues, listLinearIssues, listLinearIssuesDirect, listPrs, listRunScripts, listThreads, listWorkspaces, listWorktreeFiles, listWorktrees, loadAgentInstructions, loadAppSettings, loadBrightsyConfig, loadConductorSettings, loadRepoSettings, loadWorkspaceSettings, locksDir, maxConcurrentAgents, maybeCompactContext, mcpAllowTools, mcpAuthWarnings, mergePr, mergeUsage, normalizeParseResult, normalizeThread, normalizeTurnInput, normalizeWorktreePath, opencodeAdapter, orchestrationTitleNeedsSoccerNickname, orchestratorSessionPoisonedByBuiltins, parseCursorRunnerLine, parseForceStopMessage, parseGithubSlugFromRemoteUrl, parseMcpList, partsToAssistantText, permissionMode, previewLand, pushBranch, readSkillBody, readThread, readWorktreeFile, readWorktreeInclude, refreshGitHubAuth, removeWorkspace, removeWorktree, repoSlug, requireAgent, resolveClaudeExecutable, resolveConductorCursorAgentId, resolveDefaultBranch, resolveDiffBaseRef, resolveEffectiveIssueSource, resolveFilesToCopy, resolveGithubRepoSlug, resolvePrSelector, resolveRepoRoot, resolveWorktreeStartPoint, run, runArchiveScript, runCloudConnect, runCursorWorktreeSetup, runSetupScript, sameWorktreePath, sanitizeMcpServerName, saveAppSettings, setStatus, settingsSourceLabel, shouldCompactContext, shouldRunWorktreeCleanup, sideboardHomeDir, sideboardReposDir, sideboardWorkspacesDir, slugify, spawnAgentTurn, splitForCompaction, startDevServer, startMcpServer, startOrchestration, stripBrightsyNdjsonNoise, suggestSlug, summarizeConversation, switchBrightsyAccount, syncWorkspacesFromThreads, takenTeamSlugsForChatTab, takenTeamSlugsForOrchestration, taskMessageText, threadDisplayLabel, threadFilePath, threadLockPath, threadsDir, threadsSharingWorktree, toolDescription, toolDetail, toolFilePath, totalTokens, updateAdvancedSettings, updateAppEnvironment, updateBrightsySettings, updateClaudeSettings, updateIntegrationsSettings, updateThread, validateLinearApiKey, withAgentInstructions, withThreadLock, workspaceSettingsSourceLabel, worktreeCleanupSettings, worktreeDisplayLabel, worktreeDisplayLabelForGroup, worktreeNameFromPath, worktreesRoot, writeInjectedMcpConfig, writeThread, writeWorktreeFile };
+export { type ActiveRun, type AdoptInput, type AdvancedAppSettings, type AgentAdapter, type AgentEvent, type AgentInstructionFile, type AgentKind, type AgentStatus, type AgentTurnInput, type AnthropicCacheControl, type AppSettings, type ApplyIntoMainResult, type AttachCommand, type Autonomy, BRIGHTSY_MCP_ALLOWED_TOOLS, type BranchInfo, type BrightsyAccount, type BrightsyChatTarget, type BrightsyChatTargets, type BrightsyCloudConnectAgent, type BrightsyHarnessSettings, type BrightsySession, BrightsySideboardApi, type BrightsyTeamTargets, CLOUD_COORDINATOR_BUSY_REPLY, CLOUD_COORDINATOR_STOPPED_REPLY, CLOUD_COORDINATOR_TIMEOUT_REPLY, CLOUD_ORCHESTRATOR_GOAL, CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, COORDINATOR_TOOL_PLAYBOOK, type ClaudeHarnessSettings, type CleanupOrphansResult, type CloudConnectAgent, type CloudConnectOptions, type CloudConnectStatus, type CompactResult, type CompactThresholds, type ConductorSettings, type ConductorWorkspace, type ConnectedBrightsyTeamInfo, type CreateChatTabInput, type CreateGlobalChatOpts, type CreateThreadInput, type CreateWorktreeResult, type CursorSdkStreamMessage, type CursorTurnRequest, type CursorWorktreesConfig, type DevServerHandle, type DiffCommit, type DiffFile, type DiffResult, type DiffScope, type DiffScopeStat, type ExpandResult, FAMOUS_SOCCER_TEAMS, type ForkChatTabInput, type ForkThreadWorktreeInput, type FormatGhLandErrorOptions, GLOBAL_WORKSPACE_ID, type GetDiffOptions, type GitHubStatus, type GitWorktreeStatus, HARNESS_ENV_KEYS, type HarnessId, type IntegrationsSettings, type IpcApi, type IssueInfo, type IssueSource, type LandPreview, type LandResult, type ListIssuesResult, MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS, type McpServerStatus, type MessagePart, Orchestrator, type OrchestratorEvent, type OrchestratorRuntime, type OrphanWorktree, PLAN_MODE_INSTRUCTION, type PrActor, type PrCheckRun, type PrCommentInfo, type PrCommitInfo, type PrDetails, type PrInfo, type PrMeta, type PrReviewInfo, type RepoSettings, type RepoSetupInfo, type RunMode, type RunScript, SIDEBOARD_FORCE_STOP, SIDEBOARD_MCP_ALLOWED_TOOLS, type ScriptHandle, type SkillInfo, type SourceType, type SpawnTurnHandle, type SummarizeResult, type TeamName, type Thread, type ThreadAttachment, type ThreadMessage, type ThreadOptionsPatch, type ThreadStatus, type TokenUsage, type TranscriptToolDetail, type TurnCommand, type Workspace, type WorkspaceInventoryEntry, type WorkspaceScriptEnvOpts, addWorkspace, adoptThread, allAdapters, allocatePort, allocatePortRange, allocateTeamName, allocateTeamSlug, appDataDir, appSettingsPath, appendMessage, applyAgentEvent, applyAppEnvironment, applyCompaction, applyThreadIntoMain, autoCleanupOrphansEnabled, autoRenameBranchEnabled, autoRunAfterSetupEnabled, branchDisplayLabel, brightsyAdapter, brightsyCloudConnectAgent, brightsyCloudConnectEnabled, brightsyConfigPath, brightsyMcpAllowedTools, brightsyMcpServerName, buildCachedUserContent, buildClaudeStreamJsonUserMessage, buildForkTranscriptAttachment, buildSessionSeed, buildWorkspaceScriptEnv, caffeinateWhileCloudConnectEnabled, caffeinateWhileRunningEnabled, captureLoginEnv, captureTurnBaseline, childEnvWithAppSettings, claudeAdapter, claudeChromeEnabled, claudeUserSettingsPath, cleanupOrphanWorktrees, cloneRepoIntoSideboard, codexAdapter, collectTakenTeamSlugs, commitAll, conductorDbPath, confirmLand, connectBrightsyTeam, coordinatorSystemPrompt, coordinatorTurnReminder, copyConfiguredFiles, countCacheControlBlocks, createChatTab, createEmptyThread, createGlobalChat, createOrUpdatePr, createThread, createThreadWorktree, currentBranch, cursorAdapter, cursorSdkMessageToEvents, decodeBrightsyTarget, deleteBranchOnPurgeEnabled, deleteThreadRecord, detectAgents, detectLocalMergeConflicts, disconnectBrightsyTeam, discoverSkills, encodeBrightsyTarget, enrichWorkspacesWithGithub, ensureAgentPath, ensureCloudCoordinator, ensureGhPreferOrigin, ensureGlobalCoordinatorCwd, ensureWorkspace, estimateMessageChars, estimateThreadChars, expandComposerPrompt, extractGhErrorDetail, extractiveSummary, fetchPrHead, finalizeParts, findInvalidCacheControlTtlOrder, findOrphanWorktrees, findThreadByRef, flattenTurnInput, forkChatTab, forkMessageSlice, forkThreadWorktree, formatAgentInstructions, formatBrightsyFetchError, formatGhLandError, formatIpcInvokeError, formatMessagesAsTranscript, formatRateLimitResetHint, formatRenameBranchDirective, formatTranscriptMarkdown, formatWorkspaceInventory, formatWorktreeDirective, getAdapter, getBrightsySession, getDefaultRunScript, getDiff, getDiffSummary, getGitHubStatus, getIssueSource, getLinearApiKey, getOrchestrator, getPr, getPrChecks, getPrDetails, getPrMeta, getRepoSetupInfo, getRunMode, getRunScript, gh, ghHeadRef, ghRepoSelectArgs, git, globalAgentCwd, harnessEnvKey, hasConductorHook, hasCursorWorktreeSetup, hasRepoHook, hasWorkspaceHook, healOrchestrationSoccerTitles, importConductorWorkspace, importConductorWorkspaceAsync, initializeGitRepository, inspectGitWorktree, isBrightsyConnected, isBrightsyNdjsonLine, isCloudCoordinatorThread, isDirty, isGhRateLimitError, isGlobalRepoPath, isGlobalThread, isLinearConnected, isOrchestratorThread, isPlaceholderBranch, listBranchCommits, listBranches, listBrightsyAccounts, listBrightsyChatTargets, listConductorWorkspaces, listConnectedBrightsyTeams, listGitHubIssues, listGlobalThreads, listIssues, listLinearIssues, listLinearIssuesDirect, listPrs, listRunScripts, listThreads, listWorkspaces, listWorktreeFiles, listWorktrees, loadAgentInstructions, loadAppSettings, loadBrightsyConfig, loadConductorSettings, loadRepoSettings, loadWorkspaceSettings, locksDir, maxConcurrentAgents, maybeCompactContext, mcpAllowTools, mcpAuthWarnings, mergePr, mergeUsage, normalizeParseResult, normalizeThread, normalizeTurnInput, normalizeWorktreePath, opencodeAdapter, orchestrationTitleNeedsSoccerNickname, orchestratorSessionPoisonedByBuiltins, originGhRepoEnv, parseCursorRunnerLine, parseForceStopMessage, parseGithubSlugFromRemoteUrl, parseMcpList, partsToAssistantText, permissionMode, previewLand, pushBranch, readSkillBody, readThread, readWorktreeFile, readWorktreeInclude, refreshGitHubAuth, removeWorkspace, removeWorktree, repoSlug, requireAgent, resolveClaudeExecutable, resolveConductorCursorAgentId, resolveDefaultBranch, resolveDiffBaseRef, resolveEffectiveIssueSource, resolveFilesToCopy, resolveGithubRepoSlug, resolvePrSelector, resolveRepoRoot, resolveWorktreeStartPoint, run, runArchiveScript, runCloudConnect, runCursorWorktreeSetup, runSetupScript, sameWorktreePath, sanitizeMcpServerName, saveAppSettings, setStatus, settingsSourceLabel, shouldCompactContext, shouldRunWorktreeCleanup, sideboardHomeDir, sideboardReposDir, sideboardWorkspacesDir, slugify, spawnAgentTurn, splitForCompaction, startDevServer, startMcpServer, startOrchestration, stripBrightsyNdjsonNoise, suggestSlug, summarizeConversation, switchBrightsyAccount, syncWorkspacesFromThreads, takenTeamSlugsForChatTab, takenTeamSlugsForOrchestration, taskMessageText, threadDisplayLabel, threadFilePath, threadLockPath, threadsDir, threadsSharingWorktree, toolDescription, toolDetail, toolFilePath, totalTokens, updateAdvancedSettings, updateAppEnvironment, updateBrightsySettings, updateClaudeSettings, updateIntegrationsSettings, updateThread, validateLinearApiKey, withAgentInstructions, withThreadLock, workspaceSettingsSourceLabel, worktreeCleanupSettings, worktreeDisplayLabel, worktreeDisplayLabelForGroup, worktreeNameFromPath, worktreesRoot, writeInjectedMcpConfig, writeThread, writeWorktreeFile };

package/dist/index.d.ts

@@ -695,6 +695,10 @@ type FormatGhLandErrorOptions = {
     /** Land push already succeeded before PR create failed. Default true for PR-create path. */
     pushed?: boolean;
     nowMs?: number;
+    /** Repo Sideboard passed to `gh -R` (origin), when known. */
+    targetedRepo?: string;
+    /** Head ref passed to `gh pr create` (often `owner:branch`). */
+    headRef?: string;
 };
 /**
  * Turn noisy `gh pr create` / Execa failures into a short notice for UI/CLI.
@@ -757,7 +761,7 @@ declare function worktreeDisplayLabelForGroup(threads: {
 declare function slugify(input: string): string;
 declare function resolveRepoRoot(cwd: string): Promise<string>;
 /**
- * Parse `owner/name` from a git remote URL (SSH or HTTPS).
+ * Parse `owner/name` from a git remote URL (SSH, HTTPS, or SSH host aliases).
  */
 declare function parseGithubSlugFromRemoteUrl(url: string): string | null;
 /**
@@ -770,6 +774,21 @@ declare function parseGithubSlugFromRemoteUrl(url: string): string | null;
  * resolves to upstream — which lists the wrong open PRs in the create modal.
  */
 declare function resolveGithubRepoSlug(repoPath: string): Promise<string | null>;
+/** Global `-R owner/repo` args so gh never targets upstream by accident. */
+declare function ghRepoSelectArgs(slug: string): string[];
+/** Same-repo head ref as `owner:branch` (required for reliable `-R` creates). */
+declare function ghHeadRef(slug: string, branch: string): string;
+/**
+ * On Makerkit-style checkouts (`origin` product + `upstream` template), `gh`
+ * prefers `upstream` → so bare `gh pr create` hits the wrong GitHub repo.
+ * Pin the CLI default to `origin` once per repo (shared by all worktrees).
+ */
+declare function ensureGhPreferOrigin(cwd: string): Promise<void>;
+/**
+ * Env pin so bare `gh` (and agents) target this checkout's **origin**, not
+ * Makerkit-style `upstream`. `GH_REPO` is the CLI's documented override.
+ */
+declare function originGhRepoEnv(cwd: string): Promise<Record<string, string>>;
 declare function resolveDefaultBranch(repoPath: string): Promise<string>;
 /**
  * Prefer `origin/<branch>` for diff/merge-base so Changes / Land don't inflate
@@ -1189,7 +1208,9 @@ declare function formatRenameBranchDirective(thread: Pick<Thread, 'worktreePath'
  * Mandatory Sideboard isolation + landing guidance — agents must edit the thread
  * worktree and open PRs whose titles/bodies describe the *purpose of the changes*.
  */
-declare function formatWorktreeDirective(thread: Pick<Thread, 'worktreePath' | 'repoPath' | 'branchName'> & Partial<Pick<Thread, 'title' | 'prUrl'>>): string;
+declare function formatWorktreeDirective(thread: Pick<Thread, 'worktreePath' | 'repoPath' | 'branchName'> & Partial<Pick<Thread, 'title' | 'prUrl'>>, opts?: {
+    githubSlug?: string | null;
+}): string;
 interface AgentInstructionFile {
     relativePath: string;
     content: string;
@@ -2348,4 +2369,4 @@ declare function writeInjectedMcpConfig(opts: {
     includeBrightsy?: boolean;
 }): Promise<string | null>;
 
-export { type ActiveRun, type AdoptInput, type AdvancedAppSettings, type AgentAdapter, type AgentEvent, type AgentInstructionFile, type AgentKind, type AgentStatus, type AgentTurnInput, type AnthropicCacheControl, type AppSettings, type ApplyIntoMainResult, type AttachCommand, type Autonomy, BRIGHTSY_MCP_ALLOWED_TOOLS, type BranchInfo, type BrightsyAccount, type BrightsyChatTarget, type BrightsyChatTargets, type BrightsyCloudConnectAgent, type BrightsyHarnessSettings, type BrightsySession, BrightsySideboardApi, type BrightsyTeamTargets, CLOUD_COORDINATOR_BUSY_REPLY, CLOUD_COORDINATOR_STOPPED_REPLY, CLOUD_COORDINATOR_TIMEOUT_REPLY, CLOUD_ORCHESTRATOR_GOAL, CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, COORDINATOR_TOOL_PLAYBOOK, type ClaudeHarnessSettings, type CleanupOrphansResult, type CloudConnectAgent, type CloudConnectOptions, type CloudConnectStatus, type CompactResult, type CompactThresholds, type ConductorSettings, type ConductorWorkspace, type ConnectedBrightsyTeamInfo, type CreateChatTabInput, type CreateGlobalChatOpts, type CreateThreadInput, type CreateWorktreeResult, type CursorSdkStreamMessage, type CursorTurnRequest, type CursorWorktreesConfig, type DevServerHandle, type DiffCommit, type DiffFile, type DiffResult, type DiffScope, type DiffScopeStat, type ExpandResult, FAMOUS_SOCCER_TEAMS, type ForkChatTabInput, type ForkThreadWorktreeInput, type FormatGhLandErrorOptions, GLOBAL_WORKSPACE_ID, type GetDiffOptions, type GitHubStatus, type GitWorktreeStatus, HARNESS_ENV_KEYS, type HarnessId, type IntegrationsSettings, type IpcApi, type IssueInfo, type IssueSource, type LandPreview, type LandResult, type ListIssuesResult, MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS, type McpServerStatus, type MessagePart, Orchestrator, type OrchestratorEvent, type OrchestratorRuntime, type OrphanWorktree, PLAN_MODE_INSTRUCTION, type PrActor, type PrCheckRun, type PrCommentInfo, type PrCommitInfo, type PrDetails, type PrInfo, type PrMeta, type PrReviewInfo, type RepoSettings, type RepoSetupInfo, type RunMode, type RunScript, SIDEBOARD_FORCE_STOP, SIDEBOARD_MCP_ALLOWED_TOOLS, type ScriptHandle, type SkillInfo, type SourceType, type SpawnTurnHandle, type SummarizeResult, type TeamName, type Thread, type ThreadAttachment, type ThreadMessage, type ThreadOptionsPatch, type ThreadStatus, type TokenUsage, type TranscriptToolDetail, type TurnCommand, type Workspace, type WorkspaceInventoryEntry, type WorkspaceScriptEnvOpts, addWorkspace, adoptThread, allAdapters, allocatePort, allocatePortRange, allocateTeamName, allocateTeamSlug, appDataDir, appSettingsPath, appendMessage, applyAgentEvent, applyAppEnvironment, applyCompaction, applyThreadIntoMain, autoCleanupOrphansEnabled, autoRenameBranchEnabled, autoRunAfterSetupEnabled, branchDisplayLabel, brightsyAdapter, brightsyCloudConnectAgent, brightsyCloudConnectEnabled, brightsyConfigPath, brightsyMcpAllowedTools, brightsyMcpServerName, buildCachedUserContent, buildClaudeStreamJsonUserMessage, buildForkTranscriptAttachment, buildSessionSeed, buildWorkspaceScriptEnv, caffeinateWhileCloudConnectEnabled, caffeinateWhileRunningEnabled, captureLoginEnv, captureTurnBaseline, childEnvWithAppSettings, claudeAdapter, claudeChromeEnabled, claudeUserSettingsPath, cleanupOrphanWorktrees, cloneRepoIntoSideboard, codexAdapter, collectTakenTeamSlugs, commitAll, conductorDbPath, confirmLand, connectBrightsyTeam, coordinatorSystemPrompt, coordinatorTurnReminder, copyConfiguredFiles, countCacheControlBlocks, createChatTab, createEmptyThread, createGlobalChat, createOrUpdatePr, createThread, createThreadWorktree, currentBranch, cursorAdapter, cursorSdkMessageToEvents, decodeBrightsyTarget, deleteBranchOnPurgeEnabled, deleteThreadRecord, detectAgents, detectLocalMergeConflicts, disconnectBrightsyTeam, discoverSkills, encodeBrightsyTarget, enrichWorkspacesWithGithub, ensureAgentPath, ensureCloudCoordinator, ensureGlobalCoordinatorCwd, ensureWorkspace, estimateMessageChars, estimateThreadChars, expandComposerPrompt, extractGhErrorDetail, extractiveSummary, fetchPrHead, finalizeParts, findInvalidCacheControlTtlOrder, findOrphanWorktrees, findThreadByRef, flattenTurnInput, forkChatTab, forkMessageSlice, forkThreadWorktree, formatAgentInstructions, formatBrightsyFetchError, formatGhLandError, formatIpcInvokeError, formatMessagesAsTranscript, formatRateLimitResetHint, formatRenameBranchDirective, formatTranscriptMarkdown, formatWorkspaceInventory, formatWorktreeDirective, getAdapter, getBrightsySession, getDefaultRunScript, getDiff, getDiffSummary, getGitHubStatus, getIssueSource, getLinearApiKey, getOrchestrator, getPr, getPrChecks, getPrDetails, getPrMeta, getRepoSetupInfo, getRunMode, getRunScript, gh, git, globalAgentCwd, harnessEnvKey, hasConductorHook, hasCursorWorktreeSetup, hasRepoHook, hasWorkspaceHook, healOrchestrationSoccerTitles, importConductorWorkspace, importConductorWorkspaceAsync, initializeGitRepository, inspectGitWorktree, isBrightsyConnected, isBrightsyNdjsonLine, isCloudCoordinatorThread, isDirty, isGhRateLimitError, isGlobalRepoPath, isGlobalThread, isLinearConnected, isOrchestratorThread, isPlaceholderBranch, listBranchCommits, listBranches, listBrightsyAccounts, listBrightsyChatTargets, listConductorWorkspaces, listConnectedBrightsyTeams, listGitHubIssues, listGlobalThreads, listIssues, listLinearIssues, listLinearIssuesDirect, listPrs, listRunScripts, listThreads, listWorkspaces, listWorktreeFiles, listWorktrees, loadAgentInstructions, loadAppSettings, loadBrightsyConfig, loadConductorSettings, loadRepoSettings, loadWorkspaceSettings, locksDir, maxConcurrentAgents, maybeCompactContext, mcpAllowTools, mcpAuthWarnings, mergePr, mergeUsage, normalizeParseResult, normalizeThread, normalizeTurnInput, normalizeWorktreePath, opencodeAdapter, orchestrationTitleNeedsSoccerNickname, orchestratorSessionPoisonedByBuiltins, parseCursorRunnerLine, parseForceStopMessage, parseGithubSlugFromRemoteUrl, parseMcpList, partsToAssistantText, permissionMode, previewLand, pushBranch, readSkillBody, readThread, readWorktreeFile, readWorktreeInclude, refreshGitHubAuth, removeWorkspace, removeWorktree, repoSlug, requireAgent, resolveClaudeExecutable, resolveConductorCursorAgentId, resolveDefaultBranch, resolveDiffBaseRef, resolveEffectiveIssueSource, resolveFilesToCopy, resolveGithubRepoSlug, resolvePrSelector, resolveRepoRoot, resolveWorktreeStartPoint, run, runArchiveScript, runCloudConnect, runCursorWorktreeSetup, runSetupScript, sameWorktreePath, sanitizeMcpServerName, saveAppSettings, setStatus, settingsSourceLabel, shouldCompactContext, shouldRunWorktreeCleanup, sideboardHomeDir, sideboardReposDir, sideboardWorkspacesDir, slugify, spawnAgentTurn, splitForCompaction, startDevServer, startMcpServer, startOrchestration, stripBrightsyNdjsonNoise, suggestSlug, summarizeConversation, switchBrightsyAccount, syncWorkspacesFromThreads, takenTeamSlugsForChatTab, takenTeamSlugsForOrchestration, taskMessageText, threadDisplayLabel, threadFilePath, threadLockPath, threadsDir, threadsSharingWorktree, toolDescription, toolDetail, toolFilePath, totalTokens, updateAdvancedSettings, updateAppEnvironment, updateBrightsySettings, updateClaudeSettings, updateIntegrationsSettings, updateThread, validateLinearApiKey, withAgentInstructions, withThreadLock, workspaceSettingsSourceLabel, worktreeCleanupSettings, worktreeDisplayLabel, worktreeDisplayLabelForGroup, worktreeNameFromPath, worktreesRoot, writeInjectedMcpConfig, writeThread, writeWorktreeFile };
+export { type ActiveRun, type AdoptInput, type AdvancedAppSettings, type AgentAdapter, type AgentEvent, type AgentInstructionFile, type AgentKind, type AgentStatus, type AgentTurnInput, type AnthropicCacheControl, type AppSettings, type ApplyIntoMainResult, type AttachCommand, type Autonomy, BRIGHTSY_MCP_ALLOWED_TOOLS, type BranchInfo, type BrightsyAccount, type BrightsyChatTarget, type BrightsyChatTargets, type BrightsyCloudConnectAgent, type BrightsyHarnessSettings, type BrightsySession, BrightsySideboardApi, type BrightsyTeamTargets, CLOUD_COORDINATOR_BUSY_REPLY, CLOUD_COORDINATOR_STOPPED_REPLY, CLOUD_COORDINATOR_TIMEOUT_REPLY, CLOUD_ORCHESTRATOR_GOAL, CONTEXT_COMPACT_CHARS, CONTEXT_KEEP_RECENT_CHARS, CONTEXT_KEEP_RECENT_MESSAGES, CONTEXT_MIN_MESSAGES, COORDINATOR_TOOL_PLAYBOOK, type ClaudeHarnessSettings, type CleanupOrphansResult, type CloudConnectAgent, type CloudConnectOptions, type CloudConnectStatus, type CompactResult, type CompactThresholds, type ConductorSettings, type ConductorWorkspace, type ConnectedBrightsyTeamInfo, type CreateChatTabInput, type CreateGlobalChatOpts, type CreateThreadInput, type CreateWorktreeResult, type CursorSdkStreamMessage, type CursorTurnRequest, type CursorWorktreesConfig, type DevServerHandle, type DiffCommit, type DiffFile, type DiffResult, type DiffScope, type DiffScopeStat, type ExpandResult, FAMOUS_SOCCER_TEAMS, type ForkChatTabInput, type ForkThreadWorktreeInput, type FormatGhLandErrorOptions, GLOBAL_WORKSPACE_ID, type GetDiffOptions, type GitHubStatus, type GitWorktreeStatus, HARNESS_ENV_KEYS, type HarnessId, type IntegrationsSettings, type IpcApi, type IssueInfo, type IssueSource, type LandPreview, type LandResult, type ListIssuesResult, MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS, type McpServerStatus, type MessagePart, Orchestrator, type OrchestratorEvent, type OrchestratorRuntime, type OrphanWorktree, PLAN_MODE_INSTRUCTION, type PrActor, type PrCheckRun, type PrCommentInfo, type PrCommitInfo, type PrDetails, type PrInfo, type PrMeta, type PrReviewInfo, type RepoSettings, type RepoSetupInfo, type RunMode, type RunScript, SIDEBOARD_FORCE_STOP, SIDEBOARD_MCP_ALLOWED_TOOLS, type ScriptHandle, type SkillInfo, type SourceType, type SpawnTurnHandle, type SummarizeResult, type TeamName, type Thread, type ThreadAttachment, type ThreadMessage, type ThreadOptionsPatch, type ThreadStatus, type TokenUsage, type TranscriptToolDetail, type TurnCommand, type Workspace, type WorkspaceInventoryEntry, type WorkspaceScriptEnvOpts, addWorkspace, adoptThread, allAdapters, allocatePort, allocatePortRange, allocateTeamName, allocateTeamSlug, appDataDir, appSettingsPath, appendMessage, applyAgentEvent, applyAppEnvironment, applyCompaction, applyThreadIntoMain, autoCleanupOrphansEnabled, autoRenameBranchEnabled, autoRunAfterSetupEnabled, branchDisplayLabel, brightsyAdapter, brightsyCloudConnectAgent, brightsyCloudConnectEnabled, brightsyConfigPath, brightsyMcpAllowedTools, brightsyMcpServerName, buildCachedUserContent, buildClaudeStreamJsonUserMessage, buildForkTranscriptAttachment, buildSessionSeed, buildWorkspaceScriptEnv, caffeinateWhileCloudConnectEnabled, caffeinateWhileRunningEnabled, captureLoginEnv, captureTurnBaseline, childEnvWithAppSettings, claudeAdapter, claudeChromeEnabled, claudeUserSettingsPath, cleanupOrphanWorktrees, cloneRepoIntoSideboard, codexAdapter, collectTakenTeamSlugs, commitAll, conductorDbPath, confirmLand, connectBrightsyTeam, coordinatorSystemPrompt, coordinatorTurnReminder, copyConfiguredFiles, countCacheControlBlocks, createChatTab, createEmptyThread, createGlobalChat, createOrUpdatePr, createThread, createThreadWorktree, currentBranch, cursorAdapter, cursorSdkMessageToEvents, decodeBrightsyTarget, deleteBranchOnPurgeEnabled, deleteThreadRecord, detectAgents, detectLocalMergeConflicts, disconnectBrightsyTeam, discoverSkills, encodeBrightsyTarget, enrichWorkspacesWithGithub, ensureAgentPath, ensureCloudCoordinator, ensureGhPreferOrigin, ensureGlobalCoordinatorCwd, ensureWorkspace, estimateMessageChars, estimateThreadChars, expandComposerPrompt, extractGhErrorDetail, extractiveSummary, fetchPrHead, finalizeParts, findInvalidCacheControlTtlOrder, findOrphanWorktrees, findThreadByRef, flattenTurnInput, forkChatTab, forkMessageSlice, forkThreadWorktree, formatAgentInstructions, formatBrightsyFetchError, formatGhLandError, formatIpcInvokeError, formatMessagesAsTranscript, formatRateLimitResetHint, formatRenameBranchDirective, formatTranscriptMarkdown, formatWorkspaceInventory, formatWorktreeDirective, getAdapter, getBrightsySession, getDefaultRunScript, getDiff, getDiffSummary, getGitHubStatus, getIssueSource, getLinearApiKey, getOrchestrator, getPr, getPrChecks, getPrDetails, getPrMeta, getRepoSetupInfo, getRunMode, getRunScript, gh, ghHeadRef, ghRepoSelectArgs, git, globalAgentCwd, harnessEnvKey, hasConductorHook, hasCursorWorktreeSetup, hasRepoHook, hasWorkspaceHook, healOrchestrationSoccerTitles, importConductorWorkspace, importConductorWorkspaceAsync, initializeGitRepository, inspectGitWorktree, isBrightsyConnected, isBrightsyNdjsonLine, isCloudCoordinatorThread, isDirty, isGhRateLimitError, isGlobalRepoPath, isGlobalThread, isLinearConnected, isOrchestratorThread, isPlaceholderBranch, listBranchCommits, listBranches, listBrightsyAccounts, listBrightsyChatTargets, listConductorWorkspaces, listConnectedBrightsyTeams, listGitHubIssues, listGlobalThreads, listIssues, listLinearIssues, listLinearIssuesDirect, listPrs, listRunScripts, listThreads, listWorkspaces, listWorktreeFiles, listWorktrees, loadAgentInstructions, loadAppSettings, loadBrightsyConfig, loadConductorSettings, loadRepoSettings, loadWorkspaceSettings, locksDir, maxConcurrentAgents, maybeCompactContext, mcpAllowTools, mcpAuthWarnings, mergePr, mergeUsage, normalizeParseResult, normalizeThread, normalizeTurnInput, normalizeWorktreePath, opencodeAdapter, orchestrationTitleNeedsSoccerNickname, orchestratorSessionPoisonedByBuiltins, originGhRepoEnv, parseCursorRunnerLine, parseForceStopMessage, parseGithubSlugFromRemoteUrl, parseMcpList, partsToAssistantText, permissionMode, previewLand, pushBranch, readSkillBody, readThread, readWorktreeFile, readWorktreeInclude, refreshGitHubAuth, removeWorkspace, removeWorktree, repoSlug, requireAgent, resolveClaudeExecutable, resolveConductorCursorAgentId, resolveDefaultBranch, resolveDiffBaseRef, resolveEffectiveIssueSource, resolveFilesToCopy, resolveGithubRepoSlug, resolvePrSelector, resolveRepoRoot, resolveWorktreeStartPoint, run, runArchiveScript, runCloudConnect, runCursorWorktreeSetup, runSetupScript, sameWorktreePath, sanitizeMcpServerName, saveAppSettings, setStatus, settingsSourceLabel, shouldCompactContext, shouldRunWorktreeCleanup, sideboardHomeDir, sideboardReposDir, sideboardWorkspacesDir, slugify, spawnAgentTurn, splitForCompaction, startDevServer, startMcpServer, startOrchestration, stripBrightsyNdjsonNoise, suggestSlug, summarizeConversation, switchBrightsyAccount, syncWorkspacesFromThreads, takenTeamSlugsForChatTab, takenTeamSlugsForOrchestration, taskMessageText, threadDisplayLabel, threadFilePath, threadLockPath, threadsDir, threadsSharingWorktree, toolDescription, toolDetail, toolFilePath, totalTokens, updateAdvancedSettings, updateAppEnvironment, updateBrightsySettings, updateClaudeSettings, updateIntegrationsSettings, updateThread, validateLinearApiKey, withAgentInstructions, withThreadLock, workspaceSettingsSourceLabel, worktreeCleanupSettings, worktreeDisplayLabel, worktreeDisplayLabelForGroup, worktreeNameFromPath, worktreesRoot, writeInjectedMcpConfig, writeThread, writeWorktreeFile };