@kubohiroya/turbowarp-plus-editor-git 0.16.1 → 0.17.0

package/README.ja.md

@@ -41,6 +41,20 @@ receive-pack の POST ごとに UUID v4 を発行し、`Git-Push-Id` に設定
 
 Editor のホストが接続設定を渡すと、ローカル Git パネルで、現在のブランチと既存の GitHub HTTPS リモート `origin` に対して fetch、fast-forward pull、push ができます。push には接続時の明示許可が必要です。fetch は Git のメタデータを更新します。pull は作品を停止し、作業ツリーがクリーンで通常の実行権限なしファイルだけを扱える場合に使えます。変更を一時領域に組み立て、ローカルの状態を再確認してから適用します。pull 後はパネルから作品を再読込できます。
 
+### 接続を使って PR を読む
+
+GitHub 接続が接続済みのとき、PR レビューは PR の中身を GitHub API ではなく同じ Git Smart HTTP の経路で読みます。非公開リポジトリの PR も読め、中身の取得には API の利用上限を使いません。`repository.fetchPullRequest(number, getSession, guard, signal)` は GitHub の `refs/pull/<番号>/head` を、すべてのブランチと一緒に fetch します（広告と pack の 2 件）。フォークからの PR も base のリポジトリのこの ref で取れます。ブランチは fetch と同じく `refs/remotes/origin/*` を更新します。`repository.readPullRequest(head, {sha, branch})` は、手元の Git オブジェクトから、ベースとの merge base と head を比べます。変更されたパス（内容が同じ移動は名前の変更として対にします）、`project.source.json` ごとのブロック差分、同じコミットから読むサムネイルを返します。プロキシの経路と GitHub App の権限は変えません。
+
+取得した head は `refs/pull/origin/<番号>/head` に置き、同じ PR を取得するたびに置き換えます（head は force-push されることがあるため）。`refs/heads`・`refs/remotes`・`refs/tags` の外にあるので、Git CLI では `git for-each-ref refs/pull` と `git log --all` に出て、`git branch -a` と `git tag` には出ません。`refs/remotes/origin/` の下に置くと GitHub のブランチに見え、`git fetch --prune` で消えます。ref を作らずに取得すると、オブジェクトがどこからも参照されず `git gc` で消えます。要らなくなった ref は `git update-ref -d refs/pull/origin/<番号>/head` で消せます。取得で書くのはオブジェクトと ref だけで、fetch・pull と同じ一時領域とロック（`tw-plus-git-mutation`）を通します。作業ツリー、インデックス、HEAD、`.git/config` は書きません。
+
+一覧と、公開リポジトリの題名・本文・ベースは、引き続き公開 API から読みます（PR ごとに 1 件）。API のベースのコミットが取得で手元に来ていればそれと比べ、なければベースのブランチと比べます。非公開リポジトリではベースのブランチが API でしかわからないため、GitHub の既定のブランチと比べ、別のブランチを選べるようにします。失敗したときは、未接続またはセッション切れ、接続にリポジトリを読む権限がない、その番号の PR がない、ネットワーク、のどれかを示します。接続しているときに中身を公開 API から読むことはありません。接続していないときは、従来どおり公開 API を読みます。選んだブランチにすでにマージされた PR は、API がベースのコミットを返さない限り、変更なしと表示されます。
+
+#### PR の版を手元で動かす
+
+`localWrite` があるとき、接続で読んだ PR に「pr/&lt;番号&gt; として手元で開く」が出ます。取得した head にローカルブランチ `pr/<番号>` を作り（`pullRequestBranch(number)`。`refs/pull/origin/<番号>/head` はそのまま残します）、ブランチ一覧と同じ確認付きの経路で切り替え、選んでいる作品フォルダをそのブランチから開き直します。これで PR の版を Editor で実行できます。作品の実行中、Editor に保存していない編集があるとき、作業ツリーに変更（ステージ済み・未ステージ・未追跡）があるときは行わず、何も書きません。開いている作品フォルダが PR にないときは、先に確かめます。`pr/<番号>` がすでに同じコミットにあるときは、それに切り替えます。別のコミットを指しているとき（そのブランチで記録した、または PR が更新された）は、ブランチを動かさずに断ります。「ローカルの変更」でそのブランチに切り替えるか、Git で名前を変えるか消して（`git branch -m pr/<番号> <名前>`、`git branch -D pr/<番号>`）、もう一度開いてください。公開 API で読んだ PR は Git のオブジェクトが手元にないため、ボタンを出しません。`localWrite` がないときも出しません。
+
+元のブランチはそのまま残ります。戻るときは「ローカルの変更」でそのブランチに切り替えます（開いた後に、パネルがブランチ名を示します）。`pr/<番号>` は追跡の設定を持たない通常のローカルブランチです。パネルは消さず、pull と push もほかのブランチと同じに扱うので、意図しない限り push しないでください。要らなくなったら `git branch -D pr/<番号>` で消せます。
+
 ## 作品ソースのブロック差分
 
 `@kubohiroya/turbowarp-plus-editor-git/project-source-diff` の `createProjectSourceDiff` に、変更前後の `project.source.json` の文字列を渡します。戻り値を `project.diff` として保存できます。生成した unified diff には全行の文脈が入るので、ビューへ渡すときは `.diff` だけで変更前後を復元できます。既存のコンパクトな Git 差分を使う場合は、`beforeSource` に対応する変更前の JSON も渡します。

package/README.md

@@ -41,6 +41,20 @@ Each receive-pack POST carries a new UUID v4 in `Git-Push-Id`. A browser replay
 
 When the Editor host supplies connection settings, the Local Git panel offers fetch, fast-forward pull and push for the current branch and its existing GitHub HTTPS `origin`. Authorize push when connecting to enable the explicit push action. Fetch updates Git metadata. Pull requires a stopped project, a clean worktree, and regular non-executable files. Pull stages the changes, rechecks the local state, and then applies them. Reopen the project from the panel after a successful pull.
 
+### Pull requests over the connection
+
+While the connection is connected, the pull request review reads a pull request's contents over the same Git Smart HTTP route instead of the GitHub API, so private repositories work and the API rate limit is not used for contents. `repository.fetchPullRequest(number, getSession, guard, signal)` fetches GitHub's `refs/pull/<number>/head`, which the base repository also exposes for pull requests from forks, together with every branch (two requests: one advertisement and one pack). The branches update `refs/remotes/origin/*` as fetch does. `repository.readPullRequest(head, {sha, branch})` then compares the head with its merge base against the base, from local Git objects: the changed paths (with exact renames paired), each `project.source.json` as a block diff, and thumbnails from the same commits. The proxy routes and the GitHub App permissions are unchanged.
+
+The fetched head is kept at `refs/pull/origin/<number>/head`, replaced on each fetch of that pull request (heads can be force-pushed). Outside `refs/heads`, `refs/remotes` and `refs/tags`, Git CLI shows it in `git for-each-ref refs/pull` and `git log --all` but not in `git branch -a` or `git tag`; `git fetch --prune` does not remove it, unlike a ref under `refs/remotes/origin/`, which would also read as a branch on GitHub; and `git gc` keeps its objects, which a fetch without a ref would leave unreachable. Remove the refs with `git update-ref -d refs/pull/origin/<number>/head` when they are no longer needed. The fetch writes only objects and refs through the same staging and lock (`tw-plus-git-mutation`) as fetch and pull, never the work tree, the index, HEAD or `.git/config`.
+
+The public API still provides the list, and the title, description and base of public repositories (one request per pull request). Its base commit is compared when the fetch brought it, else the base branch. For a private repository the panel compares with GitHub's default branch and lets the person choose another branch, since the base branch is only known to the API. Failures name the cause: no connection or an expired session, a connection without access to the repository, a number with no pull request, or the network. The contents are never read from the public API while the connection is connected; without a connection, the review reads the public API as before. A pull request already merged into the chosen branch shows no changes unless the API gave its base commit.
+
+#### Running a pull request locally
+
+With `localWrite`, a pull request read over the connection offers **Open here as pr/&lt;number&gt;**. It creates the local branch `pr/<number>` at the fetched head (`pullRequestBranch(number)`; `refs/pull/origin/<number>/head` stays as it is), switches to it through the same checked path as the branch list, and opens the selected project folder again from it, so the pull request's version can be run in the Editor. It is refused, and nothing is written, while the project runs, while the Editor has unsaved edits, or while the work tree has changes (staged, unstaged or untracked). It asks first when the open project folder is not in the pull request. If `pr/<number>` already exists at the same commit, the panel switches to it; if it points at another commit (you recorded on it, or the pull request moved), the panel refuses and leaves the branch unchanged. Switch to it from **Local changes**, or rename or delete it with Git (`git branch -m pr/<number> <name>`, `git branch -D pr/<number>`), and open the pull request again. The button is not shown for pull requests read from the public API, which brings no Git objects, nor without `localWrite`.
+
+The branch you were on stays as it was. To go back, switch to it under **Local changes** (the panel names it after opening). `pr/<number>` is an ordinary local branch without tracking settings: the panel does not delete it, and pull and push treat it like any other branch, so do not push it unless you mean to. Delete it with `git branch -D pr/<number>` when it is no longer needed.
+
 ## Comparing before choosing
 
 `openProjectComparison(document, options)` lays several titled comparisons of `project.source.json` texts in one modal and asks the user to choose an action. Each of `sections` takes the same `before` and `after` as `ProjectSourceComparison`. The promise resolves with the chosen action's `id`, or with `null` when the dialog is closed or Escape is pressed. The first action receives focus, so list the one that loses the least first. The project folder uses it to show "Your unsaved edits" next to "Changes in the folder" before replacing unsaved edits.

package/dist/filesystem.d.ts

@@ -1,6 +1,6 @@
 export declare class GitPanelError extends Error {
-    code: 'invalid' | 'changed' | 'large' | 'unsupported' | 'pullUnsafe' | 'diverged' | 'session' | 'pushUnknown' | 'pushRefresh' | 'rollbackFailed' | 'remoteFailed' | 'saveFirst' | 'author' | 'nothingStaged' | 'commitMessage' | 'switchUnsafe' | 'branchExists' | 'branchName' | 'locked';
-    constructor(code: 'invalid' | 'changed' | 'large' | 'unsupported' | 'pullUnsafe' | 'diverged' | 'session' | 'pushUnknown' | 'pushRefresh' | 'rollbackFailed' | 'remoteFailed' | 'saveFirst' | 'author' | 'nothingStaged' | 'commitMessage' | 'switchUnsafe' | 'branchExists' | 'branchName' | 'locked', message?: string);
+    code: 'invalid' | 'changed' | 'large' | 'unsupported' | 'pullUnsafe' | 'diverged' | 'session' | 'pushUnknown' | 'pushRefresh' | 'rollbackFailed' | 'remoteFailed' | 'saveFirst' | 'author' | 'nothingStaged' | 'commitMessage' | 'switchUnsafe' | 'branchExists' | 'branchConflict' | 'pullRequestBranch' | 'branchName' | 'locked' | 'pullRequestNotFound' | 'forbidden' | 'network' | 'baseMissing';
+    constructor(code: 'invalid' | 'changed' | 'large' | 'unsupported' | 'pullUnsafe' | 'diverged' | 'session' | 'pushUnknown' | 'pushRefresh' | 'rollbackFailed' | 'remoteFailed' | 'saveFirst' | 'author' | 'nothingStaged' | 'commitMessage' | 'switchUnsafe' | 'branchExists' | 'branchConflict' | 'pullRequestBranch' | 'branchName' | 'locked' | 'pullRequestNotFound' | 'forbidden' | 'network' | 'baseMissing', message?: string);
 }
 export declare const fileError: (code: string, path: string) => Error & {
     code: string;

package/dist/github-pull-requests.d.ts

@@ -6,6 +6,26 @@ export declare class PullRequestError extends Error {
 }
 export declare function gitHubRepositoryFromOrigin(origin: string | undefined): string | null;
 export declare function createGitHubPullRequests(repository: string, send?: typeof fetch): {
+    /** Reads one pull request's title, description, state and both revisions, without its files (one request). */
+    metadata(number: number, signal: AbortSignal): Promise<{
+        url: string;
+        author: string | undefined;
+        description: string;
+        base: {
+            sha: string;
+            ref: string;
+            repository: string | null;
+        };
+        head: {
+            sha: string;
+            ref: string;
+            repository: string | null;
+        };
+        state: "open" | "closed" | "merged" | "draft";
+        changedFiles: number;
+        number: number;
+        title: string;
+    }>;
     list(page: number, signal: AbortSignal): Promise<{
         items: {
             number: number;

package/dist/index.d.ts

@@ -6,17 +6,18 @@ export { createScratchBlocksDiffLocator } from './block-diff-location.js';
 export { createEditorBlockLocator } from './editor-block-locator.js';
 export { createScratchBlocksDiffRenderer } from './scratch-block-diff-renderer.js';
 export type { ScratchBlockDiffRendererOptions, ScratchBlocksPort } from './scratch-block-diff-renderer.js';
-export { openRepository, createReadOnlyFs, GitPanelError } from './repository.js';
+export { openRepository, createReadOnlyFs, GitPanelError, pullRequestRef } from './repository.js';
 export { openProjectComparison } from './project-comparison.js';
 export { openProjectSourceTabs } from './project-source-tabs.js';
 export type { ProjectSourceTabsFile, ProjectSourceTabsOptions } from './project-source-tabs.js';
 export type { ProjectComparisonAction, ProjectComparisonOptions, ProjectComparisonSection } from './project-comparison.js';
-export type { Repository, Snapshot, FileChange, FileDiff, HistoryCommit, HistoryCursor, HistoryPage, HistoryRef } from './repository.js';
+export type { PullRequestBase, PullRequestFetch, PullRequestFiles, Repository, Snapshot, FileChange, FileDiff, HistoryCommit, HistoryCursor, HistoryPage, HistoryRef } from './repository.js';
 export { HistoryGraph, laneColors } from './history-graph-view.js';
 export type { HistoryActionResult, HistoryGraphProps } from './history-graph-view.js';
 export { layoutHistory } from './history-graph.js';
 export type { GraphCommit, GraphLayout, GraphRow, GraphSegment } from './history-graph.js';
 export type { GitAuthor, LocalOperation } from './local-operations.js';
+export { pullRequestBranch } from './local-operations.js';
 export interface GitHost {
     connectionSettings?: GitConnectionSettings;
     renderReviewBlock?: ProjectBlockRenderer;

package/dist/index.js

@@ -1,6 +1,7 @@
-import { C as parseProjectSource, T as CloseButton, a as openProjectSourceTabs, b as useCostumeImage, c as gitHubRepositoryFromOrigin, f as organizeProjectChanges, i as createScratchBlocksDiffLocator, l as ProjectSourceComparison, n as openProjectComparison, o as PullRequestError, p as projectPropertyLabel, r as createScratchBlocksDiffRenderer, s as createGitHubPullRequests, u as ProjectSourceReview, w as readProjectSourceDiff, y as useAssetImage } from "./project-comparison-1rggIJse.js";
+import { a as openProjectSourceTabs, b as useCostumeImage, c as gitHubRepositoryFromOrigin, f as organizeProjectChanges, i as createScratchBlocksDiffLocator, l as ProjectSourceComparison, n as openProjectComparison, o as PullRequestError, p as projectPropertyLabel, r as createScratchBlocksDiffRenderer, s as createGitHubPullRequests, u as ProjectSourceReview, x as CloseButton, y as useAssetImage } from "./project-comparison-DjMlwyp8.js";
 import { n as init_objectSpread2, r as __commonJSMin, t as _objectSpread2$1 } from "./objectSpread2-Dkd68nJH.js";
-import { a as createReadOnlyFs, i as GitPanelError, n as openRepository } from "./repository-BYno-5f8.js";
+import { l as parseProjectSource, u as readProjectSourceDiff } from "./project-asset-paths-nL5sV35A.js";
+import { a as pullRequestRef, i as pullRequestBranch, n as openRepository, o as GitPanelError, s as createReadOnlyFs } from "./repository-xIv0iZkj.js";
 import * as m from "react";
 import React, { createContext, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { createPortal, render, unmountComponentAtNode } from "react-dom";
@@ -3150,6 +3151,10 @@ var messages = {
 		commitMessage: "Write a message for this record.",
 		switchUnsafe: "Stop the project, and save or record (or undo) every change, before switching branches.",
 		branchExists: "A branch with this name already exists.",
+		branchConflict: "This name clashes with an existing branch: Git cannot keep both a branch and another branch under its name followed by /, such as pr and pr/7. Rename or delete the other branch with Git, or choose another name.",
+		pullRequestBranch: "The branch pr/<number> already exists with other records, so this version was not opened. The branch is left unchanged. Switch to it in Local changes, or rename or delete it with Git, then open the pull request here again.",
+		openedPullRequest: "Opened pull request #{number} on the local branch {branch}. To go back, switch to {previous} in Local changes.",
+		openedPullRequestDetached: "Opened pull request #{number} on the local branch {branch}. To go back, switch to another branch in Local changes.",
 		locked: "Another Git tool is working on this repository (a lock file, or a merge, cherry-pick, revert or rebase in progress). Try again after it finishes.",
 		branchName: "Git cannot use this name for a branch.",
 		pullUnsafe: "Stop the project, and save or undo unsaved edits and unrecorded changes, before getting changes from GitHub (pull).",
@@ -3258,6 +3263,10 @@ var messages = {
 		commitMessage: "この記録の説明を書いてください。",
 		switchUnsafe: "ブランチを切り替える前に、実行を止め、すべての変更を保存して記録（または取り消し）してください。",
 		branchExists: "同じ名前のブランチがすでにあります。",
+		branchConflict: "この名前は既存のブランチとぶつかります。Git では、pr と pr/7 のように、あるブランチと、その名前に / を続けたブランチを両方は持てません。Git でもう一方の名前を変えるか消すか、別の名前にしてください。",
+		pullRequestBranch: "ブランチ pr/<番号> が、別の記録を指してすでにあるため、この版を開きませんでした。ブランチはそのままです。「ローカルの変更」で切り替えるか、Git で名前を変えるか消してから、もう一度ここで開いてください。",
+		openedPullRequest: "プルリクエスト #{number} を、ローカルブランチ {branch} で開きました。戻るときは「ローカルの変更」で {previous} に切り替えてください。",
+		openedPullRequestDetached: "プルリクエスト #{number} を、ローカルブランチ {branch} で開きました。戻るときは「ローカルの変更」で別のブランチに切り替えてください。",
 		locked: "ほかの Git の操作が、このリポジトリを使っています（ロックファイル、またはマージ・cherry-pick・revert・rebase の途中）。終わってから、もう一度試してください。",
 		branchName: "この名前は Git のブランチ名に使えません。",
 		pullUnsafe: "GitHub から取り込む前に、実行を止め、保存していない編集とまだ記録していない変更をなくしてください。",
@@ -3812,7 +3821,20 @@ var en = {
 	failed: "Could not read GitHub. Try again.",
 	changed: "The pull request changed while it was being read. Open it again.",
 	tooManyFiles: "GitHub only returns the first 3,000 changed files. This pull request exceeds that limit.",
-	openTabs: "Open as tabs"
+	openTabs: "Open as tabs",
+	session: "Connect to GitHub again (GitHub connection) to read this pull request.",
+	forbidden: "The GitHub connection is not allowed to read this repository.",
+	pullRequestNotFound: "This repository has no pull request with this number.",
+	network: "Could not reach GitHub through the connection. Check the network and try again.",
+	remoteFailed: "Could not read the pull request through the GitHub connection. Try again.",
+	baseMissing: "The base branch is not on GitHub. Choose another base branch.",
+	viaConnection: "Read through the GitHub connection.",
+	listPrivate: "The list uses the public GitHub API. Enter a pull request number to read it through the connection.",
+	noMetadata: "The title and base branch are not available without the public GitHub API. Choose the base branch to compare with.",
+	base: "Base branch",
+	pullRequest: "Pull request",
+	openLocally: "Open here as {branch}",
+	openLocallyHint: "Creates the local branch {branch} at this version, switches to it and opens the project, so it can be run. Unsaved edits and unrecorded changes stop it. Switch back in Local changes."
 };
 var ja = {
 	title: "プルリクエスト",
@@ -3834,12 +3856,40 @@ var ja = {
 	failed: "GitHub から取得できませんでした。再試行してください。",
 	changed: "取得中にプルリクエストが更新されました。もう一度開いてください。",
 	tooManyFiles: "変更ファイルが GitHub API の取得上限である 3,000 件を超えています。",
-	openTabs: "タブで開く"
+	openTabs: "タブで開く",
+	session: "この PR を読むには、GitHub 接続でもう一度接続してください。",
+	forbidden: "GitHub 接続に、このリポジトリを読む権限がありません。",
+	pullRequestNotFound: "このリポジトリに、この番号のプルリクエストはありません。",
+	network: "GitHub 接続で GitHub に届きませんでした。ネットワークを確認して、もう一度試してください。",
+	remoteFailed: "GitHub 接続でプルリクエストを読めませんでした。もう一度試してください。",
+	baseMissing: "ベースのブランチが GitHub にありません。別のベースを選んでください。",
+	viaConnection: "GitHub 接続で取得しました。",
+	listPrivate: "一覧は公開 GitHub API を使います。番号を入れると、GitHub 接続で読みます。",
+	noMetadata: "公開 GitHub API を使えないため、題名とベースのブランチがわかりません。比べるベースのブランチを選んでください。",
+	base: "ベースのブランチ",
+	pullRequest: "プルリクエスト",
+	openLocally: "{branch} として手元で開く",
+	openLocallyHint: "この版にローカルブランチ {branch} を作って切り替え、作品を開き直して実行できるようにします。保存していない編集や記録していない変更があるときは行いません。元に戻すときは「ローカルの変更」で切り替えてください。"
 };
+var gitErrors = [
+	"session",
+	"forbidden",
+	"pullRequestNotFound",
+	"network",
+	"remoteFailed",
+	"baseMissing",
+	"changed"
+];
 function errorMessage(error, labels) {
-	return error instanceof PullRequestError ? labels[error.code] : labels.failed;
+	if (error instanceof PullRequestError) return labels[error.code];
+	if (error instanceof GitPanelError) {
+		const code = gitErrors.find((code) => code === error.code);
+		return code ? labels[code] : labels.failed;
+	}
+	return labels.failed;
 }
-function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }) {
+function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs, repository, connection, openLocally }) {
+	var _pr$base$ref, _pr$git, _pr$base$ref2;
 	const client = useMemo(() => createGitHubPullRequests(name), [name]);
 	const [page, setPage] = useState(1);
 	const [listing, setListing] = useState();
@@ -3847,10 +3897,12 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 	const [selection, setSelection] = useState();
 	const [loaded, setLoaded] = useState();
 	const list = (listing === null || listing === void 0 ? void 0 : listing.page) === page ? listing.result : void 0;
+	const [listConnected, setListConnected] = useState(false);
 	const detail = (loaded === null || loaded === void 0 ? void 0 : loaded.selection) === selection ? loaded === null || loaded === void 0 ? void 0 : loaded.result : void 0;
 	useEffect(() => {
 		const controller = new AbortController();
 		setListing(void 0);
+		setListConnected(!!(connection === null || connection === void 0 ? void 0 : connection.connected()));
 		client.list(page, controller.signal).then((data) => {
 			if (!controller.signal.aborted) setListing({
 				page,
@@ -3871,7 +3923,8 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 	useEffect(() => {
 		if (!selection) return;
 		const controller = new AbortController();
-		client.load(selection.number, controller.signal).then((data) => {
+		const load = () => (connection === null || connection === void 0 ? void 0 : connection.connected()) ? loadThroughConnection(selection.number, selection.base, controller.signal) : client.load(selection.number, controller.signal);
+		load().then((data) => {
 			if (!controller.signal.aborted) setLoaded({
 				selection,
 				result: { data }
@@ -3888,6 +3941,56 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 		selection,
 		labels
 	]);
+	const fetched = useRef();
+	/**
+	* Fetches `refs/pull/<number>/head` and the branches over Git Smart HTTP and compares them from local objects. The
+	* public API only adds the title, description and base when it can read the repository; the contents never come
+	* from it, so a private repository is read only through the connection.
+	*/
+	const loadThroughConnection = async (number, chosenBase, signal) => {
+		var _fetched$current, _ref, _ref2, _metadata$title, _metadata$description, _metadata$head$ref;
+		const guard = () => {
+			if (signal.aborted) throw new GitPanelError("changed");
+		};
+		let head, branches, defaultBranch, metadata = null;
+		if (chosenBase !== void 0 && ((_fetched$current = fetched.current) === null || _fetched$current === void 0 ? void 0 : _fetched$current.number) === number) ({head, branches, defaultBranch} = fetched.current);
+		else {
+			metadata = await client.metadata(number, signal).catch((error) => {
+				if (signal.aborted) throw error;
+				return null;
+			});
+			const result = await repository.fetchPullRequest(number, connection.getSession, guard, signal);
+			if (metadata && metadata.head.sha !== result.head) throw new PullRequestError("changed");
+			({head, branches, defaultBranch} = result);
+			fetched.current = {
+				number,
+				head,
+				branches,
+				defaultBranch
+			};
+		}
+		const branch = (_ref = (_ref2 = chosenBase !== null && chosenBase !== void 0 ? chosenBase : metadata === null || metadata === void 0 ? void 0 : metadata.base.ref) !== null && _ref2 !== void 0 ? _ref2 : defaultBranch) !== null && _ref !== void 0 ? _ref : branches[0];
+		const read = await repository.readPullRequest(head, {
+			sha: metadata === null || metadata === void 0 ? void 0 : metadata.base.sha,
+			branch
+		});
+		guard();
+		return {
+			number,
+			title: (_metadata$title = metadata === null || metadata === void 0 ? void 0 : metadata.title) !== null && _metadata$title !== void 0 ? _metadata$title : `${labels.pullRequest} #${number}`,
+			description: (_metadata$description = metadata === null || metadata === void 0 ? void 0 : metadata.description) !== null && _metadata$description !== void 0 ? _metadata$description : "",
+			author: metadata === null || metadata === void 0 ? void 0 : metadata.author,
+			state: metadata === null || metadata === void 0 ? void 0 : metadata.state,
+			head: {
+				sha: head,
+				ref: (_metadata$head$ref = metadata === null || metadata === void 0 ? void 0 : metadata.head.ref) !== null && _metadata$head$ref !== void 0 ? _metadata$head$ref : `pull/${number}/head`
+			},
+			base: read.base,
+			files: read.files,
+			url: "https://github.com/" + name + "/pull/" + number,
+			git: { branches: metadata ? null : branches }
+		};
+	};
 	const choose = (number) => {
 		if (!Number.isSafeInteger(number) || number < 1) return;
 		setSelection({ number });
@@ -3907,7 +4010,7 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 		max: Number.MAX_SAFE_INTEGER,
 		value: input,
 		onChange: (event) => setInput(event.currentTarget.value)
-	})), /* @__PURE__ */ React.createElement("button", { type: "submit" }, labels.openNumber)), !list && /* @__PURE__ */ React.createElement("p", { role: "status" }, labels.loading), (list === null || list === void 0 ? void 0 : list.error) && /* @__PURE__ */ React.createElement("p", { role: "alert" }, list.error), (list === null || list === void 0 ? void 0 : list.data) && /* @__PURE__ */ React.createElement(React.Fragment, null, !list.data.items.length && /* @__PURE__ */ React.createElement("p", null, labels.empty), /* @__PURE__ */ React.createElement("ul", null, list.data.items.map((item) => /* @__PURE__ */ React.createElement("li", { key: item.number }, /* @__PURE__ */ React.createElement("button", {
+	})), /* @__PURE__ */ React.createElement("button", { type: "submit" }, labels.openNumber)), !list && /* @__PURE__ */ React.createElement("p", { role: "status" }, labels.loading), (list === null || list === void 0 ? void 0 : list.error) && (listConnected && list.error === labels.unavailable ? /* @__PURE__ */ React.createElement("p", { role: "status" }, labels.listPrivate) : /* @__PURE__ */ React.createElement("p", { role: "alert" }, list.error)), (list === null || list === void 0 ? void 0 : list.data) && /* @__PURE__ */ React.createElement(React.Fragment, null, !list.data.items.length && /* @__PURE__ */ React.createElement("p", null, labels.empty), /* @__PURE__ */ React.createElement("ul", null, list.data.items.map((item) => /* @__PURE__ */ React.createElement("li", { key: item.number }, /* @__PURE__ */ React.createElement("button", {
 		className: "twgit-file",
 		type: "button",
 		"aria-pressed": (selection === null || selection === void 0 ? void 0 : selection.number) === item.number,
@@ -3920,7 +4023,17 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 		type: "button",
 		disabled: !list.data.more,
 		onClick: () => setPage(page + 1)
-	}, labels.next)))), /* @__PURE__ */ React.createElement("main", { className: "twgit-diff" }, !selection && /* @__PURE__ */ React.createElement("p", null, labels.select), selection && !detail && /* @__PURE__ */ React.createElement("p", { role: "status" }, labels.loading), (detail === null || detail === void 0 ? void 0 : detail.error) && /* @__PURE__ */ React.createElement("p", { role: "alert" }, detail.error), pr && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("p", { className: "twgit-pr-revision" }, /* @__PURE__ */ React.createElement("strong", null, "#", pr.number, " · ", labels[pr.state]), pr.author && /* @__PURE__ */ React.createElement("span", null, pr.author), /* @__PURE__ */ React.createElement("code", { title: pr.head.sha }, pr.head.ref, " → ", pr.base.ref), /* @__PURE__ */ React.createElement("a", {
+	}, labels.next)))), /* @__PURE__ */ React.createElement("main", { className: "twgit-diff" }, !selection && /* @__PURE__ */ React.createElement("p", null, labels.select), selection && !detail && /* @__PURE__ */ React.createElement("p", { role: "status" }, labels.loading), (detail === null || detail === void 0 ? void 0 : detail.error) && /* @__PURE__ */ React.createElement("p", { role: "alert" }, detail.error), pr && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("p", { className: "twgit-pr-revision" }, /* @__PURE__ */ React.createElement("strong", null, "#", pr.number, pr.state && /* @__PURE__ */ React.createElement(React.Fragment, null, " · ", labels[pr.state])), pr.author && /* @__PURE__ */ React.createElement("span", null, pr.author), /* @__PURE__ */ React.createElement("code", { title: pr.head.sha }, pr.head.ref, " → ", (_pr$base$ref = pr.base.ref) !== null && _pr$base$ref !== void 0 ? _pr$base$ref : pr.base.sha.slice(0, 12)), ((_pr$git = pr.git) === null || _pr$git === void 0 ? void 0 : _pr$git.branches) && /* @__PURE__ */ React.createElement("label", null, labels.base, " ", /* @__PURE__ */ React.createElement("select", {
+		"data-git-pr-base": "",
+		value: (_pr$base$ref2 = pr.base.ref) !== null && _pr$base$ref2 !== void 0 ? _pr$base$ref2 : "",
+		onChange: (event) => setSelection({
+			number: pr.number,
+			base: event.currentTarget.value
+		})
+	}, pr.git.branches.map((branch) => /* @__PURE__ */ React.createElement("option", {
+		key: branch,
+		value: branch
+	}, branch)))), /* @__PURE__ */ React.createElement("a", {
 		href: pr.url,
 		target: "_blank",
 		rel: "noreferrer"
@@ -3943,7 +4056,16 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 				locateBlock: locateFor === null || locateFor === void 0 ? void 0 : locateFor(file.path, pr.head.sha)
 			}] : [];
 		}), `${name}#${pr.number}`)
-	}, labels.openTabs)), /* @__PURE__ */ React.createElement(ProjectSourceReview, {
+	}, labels.openTabs), pr.git && openLocally && /* @__PURE__ */ React.createElement("button", {
+		type: "button",
+		"data-git-open-pr-locally": "",
+		disabled: openLocally.busy,
+		title: labels.openLocallyHint.replace("{branch}", pullRequestBranch(pr.number)),
+		onClick: () => void openLocally.open(pr.number, pr.head.sha)
+	}, labels.openLocally.replace("{branch}", pullRequestBranch(pr.number)))), pr.git && /* @__PURE__ */ React.createElement("p", {
+		className: "twgit-context",
+		role: "status"
+	}, labels.viaConnection, pr.git.branches && /* @__PURE__ */ React.createElement(React.Fragment, null, " ", labels.noMetadata)), /* @__PURE__ */ React.createElement(ProjectSourceReview, {
 		title: pr.title,
 		description: pr.description,
 		files: locateFor ? pr.files.map((file) => "patch" in file ? _objectSpread2$1(_objectSpread2$1({}, file), {}, { locateBlock: locateFor(file.path, pr.head.sha) }) : file) : pr.files,
@@ -3952,7 +4074,7 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor, openTabs }
 		rememberAs: `${name}#${pr.number}`
 	}))));
 }
-function PullRequestReviewPanel({ repository, locale, renderBlock, locateFor, openTabs }) {
+function PullRequestReviewPanel({ repository, locale, renderBlock, locateFor, openTabs, connection, openLocally }) {
 	const labels = locale.startsWith("ja") ? ja : en;
 	const [origin, setOrigin] = useState();
 	useEffect(() => {
@@ -3988,7 +4110,10 @@ function PullRequestReviewPanel({ repository, locale, renderBlock, locateFor, op
 		locale,
 		renderBlock,
 		locateFor,
-		openTabs
+		openTabs,
+		repository,
+		connection,
+		openLocally
 	});
 }
 // src/editor-block-locator.ts
@@ -4394,6 +4519,14 @@ function GitPanel({ vm, document, host, controller }) {
 			};
 		});
 	};
+	const pullRequestConnection = useMemo(() => {
+		const settings = host.connectionSettings;
+		const getSession = settings === null || settings === void 0 ? void 0 : settings.getSession;
+		return getSession ? {
+			getSession,
+			connected: () => settings.getView().state.status === "connected"
+		} : void 0;
+	}, [host]);
 	const [message, setMessage] = useState("");
 	const localOperation = (operation, notice) => {
 		const repository = current.current.repository;
@@ -4433,6 +4566,31 @@ function GitPanel({ vm, document, host, controller }) {
 		if (operation.kind === "createBranch" && !operation.fromRemote && !at) setNewBranch("");
 		return result;
 	};
+	/**
+	* Opens a pull request version fetched over the connection: creates `pr/<number>` at its head (or reuses that
+	* branch when it already points there), switches to it with the same refusals as any switch, and opens the project
+	* folder again from it. The branch the person was on stays, so switching back is an ordinary switch.
+	*/
+	const openPullRequest = async (number, head) => {
+		var _current$current$snap, _current$current$snap2;
+		const repository = current.current.repository;
+		if (!repository) return { done: false };
+		const original = (_current$current$snap = (_current$current$snap2 = current.current.snapshot) === null || _current$current$snap2 === void 0 ? void 0 : _current$current$snap2.branch) !== null && _current$current$snap !== void 0 ? _current$current$snap : null;
+		const name = pullRequestBranch(number);
+		const result = await changeBranch({
+			kind: "createBranch",
+			name,
+			at: head,
+			checkout: true,
+			reuse: true
+		});
+		if (!result.done) return result;
+		const project = current.current.project;
+		if (project !== null && await repository.hasFolder(name, project)) await openProject(project);
+		const notice = (original && original !== name ? labels.openedPullRequest : labels.openedPullRequestDetached).replace("{number}", String(number)).replace("{branch}", name).replace("{previous}", original !== null && original !== void 0 ? original : "");
+		if (alive.current) setState((previous) => previous.error ? previous : _objectSpread2$1(_objectSpread2$1({}, previous), {}, { notice }));
+		return result;
+	};
 	const [history, setHistory] = useState({
 		commits: [],
 		cursor: null,
@@ -4595,7 +4753,12 @@ function GitPanel({ vm, document, host, controller }) {
 		locale,
 		renderBlock: host.renderReviewBlock,
 		locateFor: reviewLocator,
-		openTabs
+		openTabs,
+		connection: pullRequestConnection,
+		openLocally: branching ? {
+			open: openPullRequest,
+			busy: state.busy
+		} : void 0
 	}), !review && state.repository && /* @__PURE__ */ React.createElement("div", { className: "twgit-content" }, /* @__PURE__ */ React.createElement("aside", null, state.browser && /* @__PURE__ */ React.createElement("details", null, /* @__PURE__ */ React.createElement("summary", null, labels.browse), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("code", null, state.browser.path || "/")), /* @__PURE__ */ React.createElement("button", {
 		disabled: state.busy || !state.browser.path,
 		onClick: () => void browse(state.browser.path.split("/").slice(0, -1).join("/"))
@@ -4814,4 +4977,4 @@ function renderGitMenu(createElement, { vm, locale = "en", MenuItem, MenuSection
 		}
 	}, labelsFor(locale).menu));
 }
-export { GitPanelError, HistoryGraph, createEditorBlockLocator, createReadOnlyFs, createScratchBlocksDiffLocator, createScratchBlocksDiffRenderer, laneColors, layoutHistory, mountGitPanel, openProjectComparison, openProjectSourceTabs, openRepository, renderGitMenu };
+export { GitPanelError, HistoryGraph, createEditorBlockLocator, createReadOnlyFs, createScratchBlocksDiffLocator, createScratchBlocksDiffRenderer, laneColors, layoutHistory, mountGitPanel, openProjectComparison, openProjectSourceTabs, openRepository, pullRequestBranch, pullRequestRef, renderGitMenu };

package/dist/local-operations.d.ts

@@ -16,7 +16,8 @@ export type LocalOperation = {
 }
 /**
  * Creates `name` at HEAD, at the commit `at`, or at `origin/<name>` with `fromRemote`, and switches to it with
- * `checkout`.
+ * `checkout`. With `reuse` (only with `at`), a branch `name` that already points at `at` is switched to instead of
+ * failing, and one that points elsewhere fails with `pullRequestBranch` and is never moved.
  */
  | {
     kind: 'createBranch';
@@ -24,10 +25,16 @@ export type LocalOperation = {
     fromRemote?: boolean;
     at?: string;
     checkout: boolean;
+    reuse?: boolean;
 } | {
     kind: 'switchBranch';
     name: string;
 };
+/**
+ * The local branch a pull request is opened on: `pr/<number>`, a name `git check-ref-format --branch` accepts. It is
+ * created at the fetched head (`pullRequestRef(number)`) and is an ordinary branch afterwards.
+ */
+export declare const pullRequestBranch: (number: number) => string;
 /**
  * Stages, unstages or commits in the granted repository. Like pull, Git's writes are collected first and applied
  * after the files they replace are checked again; a failure part way puts back what was applied. Only `.git/index`,

package/dist/messages.d.ts

@@ -44,6 +44,10 @@ export declare const messages: {
         commitMessage: string;
         switchUnsafe: string;
         branchExists: string;
+        branchConflict: string;
+        pullRequestBranch: string;
+        openedPullRequest: string;
+        openedPullRequestDetached: string;
         locked: string;
         branchName: string;
         pullUnsafe: string;
@@ -152,6 +156,10 @@ export declare const messages: {
         commitMessage: string;
         switchUnsafe: string;
         branchExists: string;
+        branchConflict: string;
+        pullRequestBranch: string;
+        openedPullRequest: string;
+        openedPullRequestDetached: string;
         locked: string;
         branchName: string;
         pullUnsafe: string;