@sideboard-ai/core 0.1.320 → 0.1.321

package/dist/{chunk-B7UL36WH.js → chunk-45UB2J47.js}

@@ -6,7 +6,7 @@ import {
 import {
   formatOptionalServicesDirectiveForTurn,
   formatOptionalServicesReminderForTurn
-} from "./chunk-OAFBHCSM.js";
+} from "./chunk-UX6EDDGR.js";
 import {
   extractPresentedPlan,
   isPresentPlanToolName,
@@ -27,7 +27,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-ZYZBCLJR.js";
+} from "./chunk-XDQSHSL6.js";
 import {
   applyWorktreePkgCacheEnv,
   askBlockStillWaiting,
@@ -65,7 +65,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-P74GXA5V.js";
+} from "./chunk-RGUZPMTF.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -117,20 +117,23 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-5S3YP5KH.js";
+} from "./chunk-SPMIZSKH.js";
 import {
   addPrStackLayer,
   allocateTeamSlug,
   canonicalizeRepoPath,
   ciChecksFailed,
+  clampGithubPrBody,
   commitAll,
   connectedPrSelectors,
   createExistingBranchWorktree,
-  createOrUpdatePr,
+  createOrUpdateCursorPr,
   createThreadWorktree,
   currentBranch,
   detectGhStack,
   enqueueByKey,
+  ensureGhPreferOrigin,
+  entireUsesTrails,
   fastForwardMainCheckoutIfSafe,
   fetchOriginForWorktree,
   fetchPrHead,
@@ -142,8 +145,11 @@ import {
   getPrForHeadBranch,
   getPrMeta,
   getPrStack,
+  ghHeadRef,
+  ghRepoSelectArgs,
   initPrStack,
   isDirty,
+  isGhRateLimitError,
   isSideboardScratchPath,
   listWorktrees,
   markPrReady,
@@ -155,18 +161,20 @@ import {
   resolveDefaultBranch,
   resolveDiffBaseRef,
   resolveGithubRepoSlug,
+  resolveOriginRemote,
   resolvePrSelector,
   resolveRepoRoot,
   switchWorktreeBranch,
   withRepoGitLock
-} from "./chunk-PNLGWAYE.js";
+} from "./chunk-YWBLQBSN.js";
 import {
   clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
   ensureAgentPath,
+  gh,
   git,
   resolveGitDirsForLockRecovery
-} from "./chunk-2UG25RMK.js";
+} from "./chunk-YBTSZ2SW.js";
 import {
   HISTORY_CLEANUP_INTERVAL_HOURS_DEFAULT,
   applyTurnUsage,
@@ -242,7 +250,7 @@ import {
   worktreeNameFromPath,
   worktreeSlugForTicket,
   writeThread
-} from "./chunk-XMHMVEIY.js";
+} from "./chunk-B4CDSSRN.js";
 import {
   normalizeThinkingEffort
 } from "./chunk-KGZBYWZ3.js";
@@ -510,9 +518,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-5A4H34AF.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-743TPQNF.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-M75TAN43.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-TU24TQ4I.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -728,7 +736,9 @@ function resolveSidebarGitPrompt(action, opts) {
 }
 var RESOLVE_CONFLICTS_RE = /^Merge the remote branch(?: \(([^)]+)\))? into your branch and resolve conflicts\. Then, commit and push your changes\.$/;
 var MERGE_INTO_RE = /^Merge PR into (.+)\.$/;
-function gitActionExpansion(action, base) {
+function gitActionExpansion(action, base, forge) {
+  if (forge === "cursor") return cursorGitActionExpansion(action, base);
+  if (forge === "entire") return entireGitActionExpansion(action, base);
   switch (action) {
     case "commit-push":
       return "Commit any uncommitted work with a purpose-stating message, then push to origin (`git push -u origin HEAD`; this updates an existing PR when one is linked). Do not start a checks loop unless a goal was given.";
@@ -753,7 +763,57 @@ function gitActionExpansion(action, base) {
       return "This phrase is the explicit ask to merge this thread's open pull request on GitHub. If `gh stack view` shows a stack, use `gh stack merge`; otherwise `gh pr merge` (respect repo defaults / squash vs merge). Do not force-push main/master or merge locally into the main checkout.";
   }
 }
-function expandCanonicalGitRequest(prompt) {
+function cursorGitActionExpansion(action, base) {
+  switch (action) {
+    case "commit-push":
+      return "Commit any uncommitted work with a purpose-stating message, then push to origin (`git push -u origin HEAD`; this updates an existing PR when one is linked). Use `origin`, not `gh`. Do not start a checks loop unless a goal was given.";
+    case "create-draft":
+      return "Commit, push, then create a draft PR with `origin pr create --draft --push -R <origin-owner/name> --body-file <short.md>` (title/body from the change purpose). Take the URL from `--json url`. Update the existing PR with `origin pr edit` if one is linked. Do not use `gh`.";
+    case "create-web":
+      return "Commit, push, then `origin pr create --push -R <origin-owner/name>` and open the URL from `--json url`. Origin has no `--web` form. Add `--draft` when they asked for a draft. Do not use `gh`.";
+    case "resolve-conflicts":
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this PR's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the PR base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push until the PR is mergeable.`;
+      }
+      return "Look up this PR's base with `origin pr view --json baseRefName` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push until the PR is mergeable. Do not use `gh`.";
+    case "ready-for-review":
+      return "This phrase is the explicit ask to mark this thread's draft pull request ready for review on Cursor (`origin pr ready -R <origin-owner/name>`). Update title/body if the purpose drifted. Do not merge. Do not use `gh`.";
+    case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's open pull request into \`${base}\` on Cursor with \`origin pr merge\`. This PR targets \`${base}\`, not main \u2014 do not use \`origin stack merge\` and do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout. Do not use \`gh\`.`;
+      }
+      return "This phrase is the explicit ask to merge this thread's open pull request on Cursor. If `origin stack view` shows a stack, use `origin stack merge`; otherwise `origin pr merge`. Do not force-push main/master or merge locally into the main checkout. Do not use `gh`.";
+  }
+}
+function entireGitActionExpansion(action, base) {
+  switch (action) {
+    case "commit-push":
+      return "Commit any uncommitted work with a purpose-stating message, then push to origin (`git push -u origin HEAD`). Use `entire`, not `gh` or `origin`. Do not start a checks loop unless a goal was given.";
+    case "create-draft":
+      return 'Commit, push, then open a Trail with `entire trail create --title "<title>" --body "<short>"` (title/body from the change purpose). Take the URL from `--json`. If this branch already has a trail, `entire trail update` instead of creating another. Trails have no draft flag. Do not use `gh` or `origin`.';
+    case "create-web":
+      return 'Commit, push, then `entire trail create --title "<title>" --body "<short>"` and open the URL from `--json`. Entire has no `--web` form. Do not use `gh` or `origin`.';
+    case "resolve-conflicts":
+      if (base && !isMainishPrBase(base)) {
+        return `Fetch \`origin/${base}\` (this Trail's base \u2014 not main/master), merge it into this branch, resolve conflicts carefully, then commit and push. Do not merge origin/main.`;
+      }
+      if (base) {
+        return `Fetch the Trail base (\`${base}\`), merge it into this branch, resolve conflicts carefully, then commit and push.`;
+      }
+      return "Look up this Trail's base with `entire trail show --json` and merge that remote branch into this branch (do not assume main). Resolve conflicts carefully, then commit and push. Do not use `gh`.";
+    case "ready-for-review":
+      return "This phrase means the Trail should be ready for a person to review. Trails have no draft flag and start open. Update title or body with `entire trail update` if the purpose drifted. Do not approve the trail and do not merge. Do not use `gh`.";
+    case "merge":
+      if (base && !isMainishPrBase(base)) {
+        return `This phrase is the explicit ask to merge this thread's Trail change into \`${base}\` with \`entire trail merge\`. This change targets \`${base}\`, not main \u2014 do not retarget or merge into main/master. Do not force-push main/master or merge locally into the main checkout. Do not use \`gh\`.`;
+      }
+      return "This phrase is the explicit ask to merge this thread's Trail change with `entire trail merge`. Do not force-push main/master or merge locally into the main checkout. Do not use `gh`.";
+  }
+}
+function expandCanonicalGitRequest(prompt, opts) {
   const trimmed = prompt.trim();
   let action = null;
   let base = null;
@@ -778,11 +838,12 @@ function expandCanonicalGitRequest(prompt) {
       base = m[1]?.trim() || null;
     }
   }
-  let expansion = action ? gitActionExpansion(action, base) : null;
+  const forge = opts?.forge ?? null;
+  let expansion = action ? gitActionExpansion(action, base, forge) : null;
   if (!expansion && trimmed === "Address review comments.") {
-    expansion = "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
+    expansion = forge === "cursor" ? "Read the PR review feedback (`origin pr view --comments`, `origin pr thread list`), make the requested changes, commit, and push. Do not use `gh`." : forge === "entire" ? "Read open findings (`entire trail finding list`), make the requested changes, commit, and push. Do not use `gh` or `entire trail comment` (agent sessions cannot post trail comments)." : "Read the PR review feedback (`gh pr view --comments`, `gh api` review comments), make the requested changes, commit, and push.";
   } else if (!expansion && FIX_CI_RE.test(trimmed)) {
-    expansion = "Investigate that failing check (`gh pr checks`, `gh run view --log-failed`), fix it, commit, and push. Loop only if a goal to keep going until it passes was given.";
+    expansion = forge === "cursor" ? "Investigate that failing check (`origin pr checks`, `origin pr watch`), fix it, commit, and push. Loop only if a goal to keep going until it passes was given. Do not use `gh run`." : forge === "entire" ? "Investigate the blocking gate (`entire trail merge --dry-run`, `entire trail finding list`, `entire trail watch`), fix it, commit, and push. Loop only if a goal to keep going until it passes was given. Do not use `gh run`." : "Investigate that failing check (`gh pr checks`, `gh run view --log-failed`), fix it, commit, and push. Loop only if a goal to keep going until it passes was given.";
   }
   if (!expansion) return prompt;
   return `${trimmed}
@@ -3626,7 +3687,7 @@ async function adoptThread(input) {
     throw new Error(`Worktree not found: ${input.worktreePath}`);
   }
   const repoPath = await resolveRepoRoot(input.worktreePath);
-  const { stdout: branch } = await import("./run-TB7RBII2.js").then(
+  const { stdout: branch } = await import("./run-UPNCCRCN.js").then(
     ({ git: git2 }) => git2(["rev-parse", "--abbrev-ref", "HEAD"], input.worktreePath)
   );
   const thread = createEmptyThread({
@@ -3641,9 +3702,9 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { addWorkspace: addWorkspace2 } = await import("./workspaces-5QA3YM4L.js");
+  const { addWorkspace: addWorkspace2 } = await import("./workspaces-75FD4QUR.js");
   await addWorkspace2(repoPath);
-  const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-5N2KTYIT.js");
+  const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-P5NJODWP.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
   return thread;
 }
@@ -4122,9 +4183,177 @@ async function createPrStack(input, onSetupLine) {
   return { stack, threads, createdThreadIds };
 }
 
+// src/git/pr-write.ts
+import { randomBytes } from "crypto";
+import { unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "fs";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join8 } from "path";
+async function lookupGithubGraphqlReset(cwd) {
+  const result = await gh(["api", "rate_limit"], cwd, { reject: false });
+  if (result.exitCode !== 0 || !result.stdout.trim()) return void 0;
+  try {
+    const data = JSON.parse(result.stdout);
+    const reset = data.resources?.graphql?.reset;
+    return typeof reset === "number" ? reset : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function formatPrCreateFailure(raw, cwd, ctx) {
+  if (!isGhRateLimitError(raw)) {
+    return formatGhLandError(raw, {
+      targetedRepo: ctx?.slug,
+      headRef: ctx?.head
+    });
+  }
+  const resetAt = await lookupGithubGraphqlReset(cwd);
+  return formatGhLandError(raw, {
+    resetAt,
+    targetedRepo: ctx?.slug,
+    headRef: ctx?.head
+  });
+}
+async function createCursorPullRequest(worktreePath, slug, opts) {
+  const bodyText = (opts.body ?? opts.title).trim() || opts.title;
+  const bodyFile = join8(
+    tmpdir2(),
+    `sideboard-pr-body-${process.pid}-${randomBytes(6).toString("hex")}.md`
+  );
+  writeFileSync5(bodyFile, bodyText.endsWith("\n") ? bodyText : `${bodyText}
+`, "utf8");
+  try {
+    return await createOrUpdateCursorPr(worktreePath, slug, {
+      title: opts.title,
+      bodyFile,
+      base: opts.base,
+      head: opts.head,
+      draft: opts.draft
+    });
+  } finally {
+    try {
+      unlinkSync3(bodyFile);
+    } catch {
+    }
+  }
+}
+function ghPrCreateAssigneeArgs(assignee) {
+  const raw = assignee?.trim();
+  if (raw && /^(none|unassigned)$/i.test(raw)) return [];
+  return ["--assignee", raw || "@me"];
+}
+async function createOrUpdatePr(worktreePath, opts) {
+  const origin = await resolveOriginRemote(worktreePath);
+  if (origin?.forge === "entire") throw entireUsesTrails();
+  const cursorSlug = origin?.forge === "cursor" ? origin.slug : null;
+  if (cursorSlug) return createCursorPullRequest(worktreePath, cursorSlug, 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 bodyText = clampGithubPrBody(opts.body ?? opts.title);
+  const bodyFile = join8(
+    tmpdir2(),
+    `sideboard-pr-body-${process.pid}-${randomBytes(6).toString("hex")}.md`
+  );
+  writeFileSync5(bodyFile, bodyText.endsWith("\n") ? bodyText : `${bodyText}
+`, "utf8");
+  const bodyArgs = ["--body-file", bodyFile];
+  try {
+    return await createOrUpdatePrWithBodyFile(worktreePath, {
+      ...opts,
+      slug,
+      repoArgs,
+      headRef,
+      branchOnly,
+      bodyArgs
+    });
+  } finally {
+    try {
+      unlinkSync3(bodyFile);
+    } catch {
+    }
+  }
+}
+async function createOrUpdatePrWithBodyFile(worktreePath, opts) {
+  const { slug, repoArgs, headRef, branchOnly, bodyArgs } = opts;
+  const existing = await gh(
+    [...repoArgs, "pr", "view", branchOnly, "--json", "url", "--jq", ".url"],
+    worktreePath,
+    { reject: false }
+  );
+  if (existing.exitCode === 0 && existing.stdout.trim() && !opts.web) {
+    const url2 = existing.stdout.trim();
+    await gh(
+      [
+        ...repoArgs,
+        "pr",
+        "edit",
+        branchOnly,
+        "--title",
+        opts.title,
+        ...bodyArgs
+      ],
+      worktreePath,
+      { reject: false }
+    );
+    return url2;
+  }
+  if (opts.web) {
+    const args2 = [
+      ...repoArgs,
+      "pr",
+      "create",
+      "--web",
+      "--title",
+      opts.title,
+      ...bodyArgs,
+      "--base",
+      opts.base,
+      "--head",
+      headRef
+    ];
+    if (opts.draft) args2.push("--draft");
+    args2.push(...ghPrCreateAssigneeArgs(opts.assignee));
+    await gh(args2, worktreePath, { reject: false });
+    const again = await gh(
+      [...repoArgs, "pr", "view", branchOnly, "--json", "url", "--jq", ".url"],
+      worktreePath,
+      { reject: false }
+    );
+    return again.stdout.trim() || "";
+  }
+  const args = [
+    ...repoArgs,
+    "pr",
+    "create",
+    "--title",
+    opts.title,
+    ...bodyArgs,
+    "--base",
+    opts.base,
+    "--head",
+    headRef
+  ];
+  if (opts.draft) args.push("--draft");
+  args.push(...ghPrCreateAssigneeArgs(opts.assignee));
+  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, { slug, head: headRef }));
+  }
+  const url = created.stdout.trim().split("\n").find((l) => l.startsWith("http")) ?? created.stdout.trim();
+  return url;
+}
+
 // src/diff/diff.ts
-import { existsSync as existsSync9, mkdirSync, readFileSync as readFileSync6, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname2, join as join8 } from "path";
+import { existsSync as existsSync9, mkdirSync, readFileSync as readFileSync6, statSync as statSync2, writeFileSync as writeFileSync6 } from "fs";
+import { dirname as dirname2, join as join9 } from "path";
 async function inspectGitWorktree(worktreePath) {
   if (!worktreePath || !existsSync9(worktreePath)) return "missing_worktree";
   const check = await git(["rev-parse", "--is-inside-work-tree"], worktreePath, {
@@ -4270,7 +4499,7 @@ new file mode 100644
   };
 }
 async function untrackedPatch(worktreePath, path, maxHunk) {
-  const abs = join8(worktreePath, path);
+  const abs = join9(worktreePath, path);
   try {
     const st = statSync2(abs);
     if (st.isFile() && st.size > maxHunk) {
@@ -4742,7 +4971,7 @@ async function getDiff(worktreePath, repoPath, opts) {
 }
 function statWorktreePath(worktreePath, relativePath) {
   assertSafeRelativePath(relativePath);
-  const abs = join8(worktreePath, relativePath);
+  const abs = join9(worktreePath, relativePath);
   if (!existsSync9(abs)) return "missing";
   const st = statSync2(abs);
   if (st.isDirectory()) return "dir";
@@ -4784,7 +5013,7 @@ var DEFAULT_UPLOAD_MAX_BYTES = 5e7;
 function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? DEFAULT_UPLOAD_MAX_BYTES;
-  const abs = join8(worktreePath, relativePath);
+  const abs = join9(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -4804,7 +5033,7 @@ function readWorktreeFileForUpload(worktreePath, relativePath, opts) {
 function readWorktreeFile(worktreePath, relativePath, opts) {
   assertSafeRelativePath(relativePath);
   const maxBytes = opts?.maxBytes ?? 2e5;
-  const abs = join8(worktreePath, relativePath);
+  const abs = join9(worktreePath, relativePath);
   const st = statSync2(abs);
   if (!st.isFile()) {
     throw new Error(`Not a file: ${relativePath}`);
@@ -4852,9 +5081,9 @@ function assertSafeRelativePath(relativePath) {
 }
 function writeWorktreeFile(worktreePath, relativePath, content) {
   assertSafeRelativePath(relativePath);
-  const abs = join8(worktreePath, relativePath);
+  const abs = join9(worktreePath, relativePath);
   mkdirSync(dirname2(abs), { recursive: true });
-  writeFileSync5(abs, content, "utf8");
+  writeFileSync6(abs, content, "utf8");
   return { path: relativePath };
 }
 async function getWorktreeDirtyStat(worktreePath) {
@@ -5046,7 +5275,7 @@ async function confirmLand(thread, opts) {
   if (preview.dirty) {
     committed = await commitAll(thread.worktreePath, meta.commitMessage);
   }
-  const { git: git2 } = await import("./run-TB7RBII2.js");
+  const { git: git2 } = await import("./run-UPNCCRCN.js");
   const { stdout: headOut } = await git2(
     ["rev-parse", "--abbrev-ref", "HEAD"],
     thread.worktreePath,
@@ -5077,13 +5306,13 @@ async function confirmLand(thread, opts) {
 
 // src/diff/read-worktree-tail.ts
 import { closeSync, fstatSync, openSync, readSync } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 var WORKTREE_TAIL_BYTES = 2e5;
 function readWorktreeFileTail(worktreePath, relativePath, maxBytes = WORKTREE_TAIL_BYTES) {
   if (!relativePath || relativePath.includes("..") || relativePath.startsWith("/")) {
     throw new Error("Invalid path");
   }
-  const abs = join9(worktreePath, relativePath);
+  const abs = join10(worktreePath, relativePath);
   const fd = openSync(abs, "r");
   try {
     const st = fstatSync(fd);
@@ -5117,7 +5346,7 @@ function readWorktreeFileTail(worktreePath, relativePath, maxBytes = WORKTREE_TA
 // src/skills/discover.ts
 import { existsSync as existsSync10, readdirSync as readdirSync3, readFileSync as readFileSync7, statSync as statSync3 } from "fs";
 import { homedir } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // src/skills/bundled/long-running.ts
 var LONG_RUNNING_SKILL_COMMAND = "long-running";
@@ -5286,7 +5515,7 @@ function scanSkillsDir(dir, source, out) {
   }
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const skillMd = join10(dir, entry, "SKILL.md");
+    const skillMd = join11(dir, entry, "SKILL.md");
     if (!existsSync10(skillMd)) continue;
     try {
       if (!statSync3(skillMd).isFile()) continue;
@@ -5308,12 +5537,12 @@ function scanClaudePluginSkills(pluginsRoot, out) {
       return;
     }
     if (lookingForSkillsDir && entries.includes("SKILL.md")) {
-      const skill = readSkill(join10(dir, "SKILL.md"), "cli");
+      const skill = readSkill(join11(dir, "SKILL.md"), "cli");
       if (skill) out.push(skill);
     }
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git") continue;
-      const full = join10(dir, entry);
+      const full = join11(dir, entry);
       try {
         if (!statSync3(full).isDirectory()) continue;
       } catch {
@@ -5333,17 +5562,17 @@ function discoverSkills(worktreePath) {
   const home = homedir();
   const collected = [];
   for (const rel of [".claude/skills", ".cursor/skills", ".sideboard/skills", ".brightsy/skills", "skills"]) {
-    scanSkillsDir(join10(worktreePath, rel), "workspace", collected);
+    scanSkillsDir(join11(worktreePath, rel), "workspace", collected);
   }
   for (const abs of [
-    join10(home, ".claude/skills"),
-    join10(home, ".cursor/skills"),
-    join10(home, ".sideboard/skills"),
-    join10(home, ".brightsy/skills")
+    join11(home, ".claude/skills"),
+    join11(home, ".cursor/skills"),
+    join11(home, ".sideboard/skills"),
+    join11(home, ".brightsy/skills")
   ]) {
     scanSkillsDir(abs, "user", collected);
   }
-  scanClaudePluginSkills(join10(home, ".claude/plugins"), collected);
+  scanClaudePluginSkills(join11(home, ".claude/plugins"), collected);
   collected.push(...bundledSkills());
   const rank = {
     workspace: 0,
@@ -5571,7 +5800,7 @@ function promptForJoinedSteer(input) {
   rewriteTrailingUserPrompt(input.threadId, input.promptText, input.latestPrompt);
   const { agentPrompt: expandedLatest } = expandComposerPrompt(
     input.worktreePath,
-    expandCanonicalGitRequest(input.latestPrompt),
+    expandCanonicalGitRequest(input.latestPrompt, { forge: input.gitForge }),
     { attachments: input.attachments }
   );
   return input.expandedPrompt && input.agentPrompt.endsWith(input.expandedPrompt) ? input.agentPrompt.slice(0, -input.expandedPrompt.length) + expandedLatest : `${input.agentPrompt}
@@ -5667,11 +5896,33 @@ async function enqueueThreadSend(host, threadRef, prompt, opts) {
 
 // src/agents/instructions.ts
 import { existsSync as existsSync12 } from "fs";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
+
+// src/agents/forge-git-directives.ts
+function formatCursorGitDirective(slug) {
+  const repo = slug?.trim() || "<origin-owner/name>";
+  return [
+    `Git host (Settings \u2192 Git \u2192 Cursor): this checkout is on Cursor (\`origin.cursor.com\`, \`${repo}\`).`,
+    "- Use the `origin` CLI, not `gh`. Where commands overlap, flags follow `gh` (`origin <command> --help`).",
+    "- `origin` already authenticates from `CURSOR_AUTH_TOKEN`, then `CURSOR_API_KEY`, then the login stored in Settings \u2192 Git \u2192 Cursor. Do not read those values, set them, or run `origin auth login` from this turn.",
+    "- Push with `git push -u origin HEAD`. If git asks for credentials, tell the user to open Settings \u2192 Git \u2192 Cursor and choose Configure git (`origin auth setup-git`). Do not wait for a Keychain dialog.",
+    "- Origin has no issue tracker. Tickets for this repo come from Linear or AbleTime via `list_issues`. Do not use `gh issue`."
+  ].join("\n");
+}
+function formatEntireGitDirective(slug) {
+  const repo = slug?.trim() || "<origin-owner/name>";
+  return [
+    `Git host (Settings \u2192 Git \u2192 Entire): this checkout is on Entire (\`${repo}\`).`,
+    "- Use the `entire` CLI, not `gh` or `origin`. Trails replace pull requests and GitHub issues.",
+    "- `entire` uses the login from Settings \u2192 Git \u2192 Entire. Do not read tokens, set `ENTIRE_TOKEN`, or run `entire login` from this turn.",
+    "- Push with `git push -u origin HEAD`. If git asks for credentials, tell the user to open Settings \u2192 Git \u2192 Entire and log in. Do not wait for a Keychain dialog.",
+    "- Tickets for this repo are Trails (`entire trail list` / `entire trail show`). Do not use `gh issue`."
+  ].join("\n");
+}
 
 // src/skills/detached-job-path.ts
 import { existsSync as existsSync11 } from "fs";
-import { dirname as dirname3, join as join11 } from "path";
+import { dirname as dirname3, join as join12 } from "path";
 import { fileURLToPath } from "url";
 var DETACHED_JOB_FILENAMES = ["detached-job.cjs", "detached-job.js"];
 function compiledModuleDir() {
@@ -5688,7 +5939,7 @@ function compiledModuleDir() {
 }
 function detachedJobScriptIn(dir) {
   for (const name of DETACHED_JOB_FILENAMES) {
-    const script = join11(dir, "scripts", name);
+    const script = join12(dir, "scripts", name);
     if (existsSync11(script)) return script;
   }
   return null;
@@ -5798,17 +6049,35 @@ function formatWorktreeDirective(thread, opts) {
   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(formatGitAuthModeDirective(opts?.gitAuthMode ?? "auto"));
+  const cursorRepo = opts?.originForge === "cursor";
+  const entireRepo = opts?.originForge === "entire";
+  if (cursorRepo) {
+    lines.push(formatCursorGitDirective(opts?.originSlug));
+  } else if (entireRepo) {
+    lines.push(formatEntireGitDirective(opts?.originSlug));
+  } else {
+    lines.push(formatGitAuthModeDirective(opts?.gitAuthMode ?? "auto"));
+  }
   lines.push(
     "- PR title/body and commit messages state what the change does and why (inspect the diff/commits and the user request) \u2014 never the worktree nickname or placeholder branch. Concise imperative title (Conventional Commits when it fits: feat:/fix:/chore:/docs:); body = intent, key changes, test notes."
   );
   lines.push(
-    "- Stay on this workspace branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
+    cursorRepo ? "- Stay on this workspace branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via Origin from this worktree (`origin pr merge` / `origin stack merge`)." : entireRepo ? "- Stay on this workspace branch. Never push to main/master or merge locally into the main checkout. Merge only when this turn is a Merge PR request or the user explicitly asked \u2014 via Entire from this worktree (`entire trail merge`)." : "- Stay on this workspace branch. Never push to main/master or merge locally into the main checkout. Merge the PR only when this turn is a Merge PR request or the user explicitly asked \u2014 via GitHub from this worktree (`gh pr merge` / `gh stack merge`)."
   );
   if (thread.prUrl) {
     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 (entireRepo) {
+    lines.push(
+      '- Prefer a Trail: `entire trail create --title "<title>" --body "<short>"`. Take the URL from `--json`. If this branch already has a trail, `entire trail update` instead of creating another. Trails have no draft state. Do not use `gh` or `origin`.'
+    );
+  } else if (cursorRepo) {
+    const slug = opts?.originSlug?.trim() || "<origin-owner/name>";
+    const resolve = opts?.originSlug?.trim() ? "" : " Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree.";
+    lines.push(
+      `- Prefer a draft PR first: \`origin pr create --draft --push -R ${slug}\` (update via \`origin pr edit -R ${slug}\`). Take the URL from \`--json url\` \u2014 do not build it. Do not use \`gh\`.${resolve} Mark ready only when asked (\`origin pr ready\`). If the body is too long, retry with a short \`--body-file\`.`
+    );
   } else {
     const slug = opts?.githubSlug ?? "<origin-owner/name>";
     const resolve = opts?.githubSlug ? "" : " Resolve `<origin-owner/name>` with `git remote get-url origin` in this worktree.";
@@ -5929,9 +6198,9 @@ function formatPrGateDirective() {
 }
 function formatProcessGuideDirective(opts) {
   const worktree = opts?.worktreePath?.trim();
-  const hasGraphSkill = !!worktree && existsSync12(join12(worktree, ".claude/skills/graph-engineering/SKILL.md"));
-  const hasReviewSkill = !!worktree && existsSync12(join12(worktree, ".claude/skills/review/SKILL.md"));
-  const hasInstallSkill = !!worktree && existsSync12(join12(worktree, ".claude/skills/worktree-install/SKILL.md"));
+  const hasGraphSkill = !!worktree && existsSync12(join13(worktree, ".claude/skills/graph-engineering/SKILL.md"));
+  const hasReviewSkill = !!worktree && existsSync12(join13(worktree, ".claude/skills/review/SKILL.md"));
+  const hasInstallSkill = !!worktree && existsSync12(join13(worktree, ".claude/skills/worktree-install/SKILL.md"));
   return [
     "Process guides (recurring work only):",
     hasGraphSkill ? "- Migrations, ports, batch fixes, and other fan-out: follow `.claude/skills/graph-engineering/SKILL.md` (`/graph-engineering`). Judge first; state on disk; grow the rulebook; do not patch around it." : null,
@@ -6085,6 +6354,7 @@ function compactIssueRow(issue, opts) {
 function formatMcpIssueList(input) {
   const truncated = input.truncated || Boolean(input.commentsTruncated);
   const comments = input.comments ?? [];
+  const pageHint = input.unavailableReason ? input.unavailableReason : truncated ? input.since ? "More issues or comments match. Pass a higher limit (max 250) or a tighter query." : "More issues match. Pass a higher limit (max 250) or a tighter query." : void 0;
   return {
     ...input.source ? { source: input.source } : {},
     ...input.viewer ? { viewer: input.viewer } : {},
@@ -6092,9 +6362,8 @@ function formatMcpIssueList(input) {
     returned: input.issues.length,
     truncated,
     ...input.since ? { since: input.since } : {},
-    ...truncated ? {
-      hint: input.since ? "More issues or comments match. Pass a higher limit (max 250) or a tighter query." : "More issues match. Pass a higher limit (max 250) or a tighter query."
-    } : {},
+    ...input.unavailableReason ? { unavailableReason: input.unavailableReason } : {},
+    ...pageHint ? { hint: pageHint } : {},
     issues: input.issues.map((issue) => compactIssueRow(issue, { since: input.since })),
     ...input.since || comments.length > 0 ? { comments } : {}
   };
@@ -6111,7 +6380,8 @@ function formatListedIssuesForMcp(result, page) {
     truncated: windowed.truncated,
     since: result.since,
     comments: commentWindow.items,
-    commentsTruncated: commentWindow.truncated
+    commentsTruncated: commentWindow.truncated,
+    unavailableReason: result.unavailableReason
   });
 }
 function mcpJson(payload, isError = false) {
@@ -6439,7 +6709,7 @@ async function syncThreadBranchFromGit(threadId) {
 // src/store/schedules.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync13, readFileSync as readFileSync8 } from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 import { Cron } from "croner";
 var DURATION_RE = /^(\d+)(s|m|h|d)$/i;
 var UNIT_MS = {
@@ -6449,7 +6719,7 @@ var UNIT_MS = {
   d: 864e5
 };
 function schedulesPath() {
-  return join13(appDataDir(), "schedules.json");
+  return join14(appDataDir(), "schedules.json");
 }
 function parseDurationMs(every) {
   const m = every.trim().match(DURATION_RE);
@@ -6741,7 +7011,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-7BDZ5GWD.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-VQ4HRYVB.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7794,7 +8064,8 @@ var Orchestrator = class {
         return;
       }
       thread = this.requireThread(threadId);
-      const gitPrompt = expandCanonicalGitRequest(promptText);
+      const turnOrigin = thread.worktreePath?.trim() ? await resolveOriginRemote(thread.worktreePath).catch(() => null) : null;
+      const gitPrompt = expandCanonicalGitRequest(promptText, { forge: turnOrigin?.forge });
       const { agentPrompt: expandedPrompt } = expandComposerPrompt(
         thread.worktreePath,
         gitPrompt,
@@ -7881,11 +8152,9 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-KMPVI2B7.js");
       const gitAuthMode = getGithubGitAuthMode();
       const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
-        githubSlug: await withTimeout(
-          resolveGithubRepoSlug(fresh.worktreePath),
-          8e3,
-          "resolveGithubRepoSlug"
-        ).catch(() => null),
+        githubSlug: turnOrigin?.forge === "github" ? turnOrigin.slug : await withTimeout(resolveGithubRepoSlug(fresh.worktreePath), 8e3, "resolveGithubRepoSlug").catch(() => null),
+        originForge: turnOrigin?.forge ?? null,
+        originSlug: turnOrigin?.slug ?? null,
         gitAuthMode,
         activeRuns: annotateDevAccessRuns(
           mergeWorktreeActiveRuns(
@@ -7978,7 +8247,8 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
         agentPrompt,
         expandedPrompt,
         worktreePath: fresh.worktreePath,
-        attachments: autoContinue ? [] : sentAttachments ?? []
+        attachments: autoContinue ? [] : sentAttachments ?? [],
+        gitForge: turnOrigin?.forge
       });
       const handle = await spawnAgentTurn(
         fresh,
@@ -9562,7 +9832,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       await withRepoGitLock(thread.repoPath, async () => {
         await git(["worktree", "add", dest, thread.branchName], thread.repoPath);
       });
-      const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-5N2KTYIT.js");
+      const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-P5NJODWP.js");
       await ensureWorktreeSideboardIgnored(dest);
     }
     const restorePatch = {};
@@ -9668,7 +9938,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-O6BANO2I.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-G3E6WP66.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9678,7 +9948,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-JWHVXLDX.js");
+  const { updateThread: upd } = await import("./thread-store-3F7GR64A.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal