@kubohiroya/turbowarp-plus-editor-git 0.13.0 → 0.14.0

package/README.ja.md

@@ -10,7 +10,7 @@ TurboWarp Plus Editor のファイルメニューに、読み取り専用の「
 
 File System Access に対応する Chromium 系ブラウザーが必要です。初版は通常の `.git` ディレクトリとファイル内容の変更を扱います。linked worktree、サブモジュール、シンボリックリンクは対象外です。作業ツリーの実行権限の変更はブラウザーから検出できません。Git に記録済みのファイルモードは表示します。バイナリアセットはサイズを示し、テキスト差分の生成には上限があります。
 
-Node.js 26 で `npm ci` と `npm test` を実行します。Vite でライブラリとスタイルシート、TypeScript で型宣言を生成します。`npm pack` で Editor 用の配布物を作成します。Editor では既定で有効です。起動 URL に `twPlusLocalGit=0` を指定するとパネルの接続を解除できます。
+Node.js 26 で `npm ci` と `npm test` を実行します。Vite でライブラリとスタイルシート、TypeScript で型宣言を生成します。`npm pack` で Editor 用の配布物を作成します。`npm run test:browser` は、最小 editor runtime（`@kubohiroya/turbowarp-plus-editor-test-runtime`）の上で、比較ダイアログのブロックの描画を Chromium で試します。Editor が固定する VM と Scratch Blocks を使い、Editor のビルドは要りません。Editor では既定で有効です。起動 URL に `twPlusLocalGit=0` を指定するとパネルの接続を解除できます。
 
 パネルの構成とローカル Git の扱いは [duff](https://github.com/chigichan24/duff) を参考にしました。実装には [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git) と [react-diff-view](https://github.com/otakustay/react-diff-view) を使用し、同梱依存のライセンスはビルド時の第三者ライセンス一覧に収録します。
 
@@ -18,7 +18,7 @@ Node.js 26 で `npm ci` と `npm test` を実行します。Vite でライブラ
 
 `test/smart-http-fixture.js` は、`git-http-backend` を IPv4 のループバックで動かす検証用のフィクスチャです。Node.js の標準モジュールだけを使い、利用側のブラウザーテストが同じ版を使えるよう配布物に含めます。
 
-`@kubohiroya/turbowarp-plus-editor-git/smart-http` の `createGitSmartHttp` に、Git 設定から選んだ GitHub の HTTPS リモート、信頼済みの接続先（`mode` と `proxyOrigin`）、現在のプロキシセッションか `null` を返す関数を渡します。auth パッケージの `GitAuthProvider` を使えます。Git パッケージは必要なセッションの型だけを構造的に参照するため、読み取り専用パネルとアダプターは auth パッケージと独立してインストールできます。
+`@kubohiroya/turbowarp-plus-editor-git/smart-http` の `createGitSmartHttp` に、Git 設定から選んだ GitHub の HTTPS リモート、信頼済みの接続先（`mode` と `proxyOrigin`）、現在のプロキシセッションか `null` を返す関数を渡します。auth パッケージの `GitAuthProvider` を使えます。Git パッケージはこれらの型を auth パッケージから取り込みます。auth は省略可能な peer で、型を使う TypeScript の利用者だけがインストールすれば足ります。読み取り専用パネルとアダプターは auth パッケージが無くても動きます。
 
 ```ts
 const transport = createGitSmartHttp({
@@ -101,7 +101,7 @@ const diffFile = new Blob([patch], {type: 'text/x-diff'});
 
 `loadAsset` は `({version, md5ext, signal}) => Promise<Blob | null>` の形で、`version`（`before`／`after`）の作品フォルダの素材を読みます。渡すと、ステージ・スプライトの見出しにその版の現在のコスチューム（ステージは背景）のサムネイルを添えます。変更前後でコスチュームが違えば「変更前 → 変更後」と並べます。関数がないとき、または画像を読めないときは名前だけを示します。`createGitHubPullRequests` が返す作品ファイルには、変更前（マージベース）と変更後（head）の素材を raw.githubusercontent.com から読む `loadAsset` が付きます。この読み込みは GitHub API の利用上限を消費せず、1 ファイル 10 MiB までです。
 
-確認済みの印は表示中の比較データに紐づくローカル状態です。PR 本文・ファイル差分の取得と GitHub へのレビュー送信は、呼び出し側が担当します。
+確認済みの印は、`rememberAs`（`owner/repo#42` など）を渡すと、ブラウザーのストレージにコードの内容と組で保存します。パネルを閉じても Editor を再読み込みしても残り、PR の head が変わると、内容が変わったコードの印だけが外れます。作品ファイルと Git には書きません。`rememberAs` がないときは、表示中のレビューだけの状態です。ローカル Git パネルの PR 一覧は、リポジトリ名と PR 番号を渡します。PR 本文・ファイル差分の取得と GitHub へのレビュー送信は、呼び出し側が担当します。
 
 ### 2 つの版を直接比べる
 

package/README.md

@@ -4,13 +4,13 @@
 
 Local Git adds a read-only panel to the TurboWarp Plus Editor File menu. Select the repository root once, then browse to an sb3-toolchain v1 project folder inside it. Project editing and saving are supplied by the Editor's project-folder integration.
 
-The panel separates staged, unstaged, and untracked changes. It shows the current branch, HEAD, local branches, and the latest 50 commits. Select a file to inspect its text diff or binary size. When the host supplies a block renderer, project data (`project.source.json`) is compared as blocks by stage, sprite and code, and **Text** switches to the line diff. Each stage and sprite heading shows a thumbnail of its current costume (the backdrop for the stage) in each version. Assets are read from the compared versions: HEAD and the index for staged changes, the index and the working tree for unstaged changes, the working tree for untracked files, and the first parent and the commit for history. The assets folder is the `assetsDirectory` of that version's `sb3-source.json` (`assets` by default). When an asset cannot be read, only the name is shown. Pull request reviews read the same thumbnails from raw.githubusercontent.com at the merge base and head, without using the GitHub API rate limit. Select a commit to compare its files with its first parent. The selected project limits the file list and diffs to that folder.
+The panel separates staged, unstaged, and untracked changes. It shows the current branch, HEAD, local branches, and the latest 50 commits. Select a file to inspect its text diff or binary size. When the host supplies a block renderer, project data (`project.source.json`) is compared as blocks by stage, sprite and code, and **Text** switches to the line diff. Each stage and sprite heading shows a thumbnail of its current costume (the backdrop for the stage) in each version. Assets are read from the compared versions: HEAD and the index for staged changes, the index and the working tree for unstaged changes, the working tree for untracked files, and the first parent and the commit for history. The assets folder is the `assetsDirectory` of that version's `sb3-source.json` (`assets` by default). When an asset cannot be read, only the name is shown. Pull request reviews read the same thumbnails from raw.githubusercontent.com at the merge base and head, without using the GitHub API rate limit. A review's **Reviewed** marks are kept in browser storage per repository and pull request, together with each script's content: they survive closing the panel and reloading the Editor, and only the marks of scripts whose content changed are cleared when the pull request head moves. They are never written to project files or Git. Select a commit to compare its files with its first parent. The selected project limits the file list and diffs to that folder.
 
 While the panel is open, it checks the repository every two seconds, when the window regains focus, and on `FileSystemObserver` notifications where available. It compares the sizes and modification times of HEAD, the index, `packed-refs`, `config`, the current branch ref, and the files in the selected project folder (the whole work tree when no project is selected, up to 5,000 files). When something changed and no diff or commit is open, the panel reads the repository again. While a diff, a commit or a pull request review is open, it keeps the view and asks you to **Refresh** instead. Checks wait while Git holds a lock on its metadata. **Reload Project** opens the selected project again using the Editor's unsaved-edit confirmation. Git inspection uses a read-only adapter and isomorphic-git with index refresh disabled. If the repository changes during a read, refresh after the other operation completes.
 
 A Chromium-based browser with File System Access support is required. The first version supports ordinary `.git` directories and content changes. Linked worktrees, submodules, and symbolic links are outside this scope. The browser cannot detect working-tree executable-bit changes. Recorded index and tree modes remain visible. Binary assets show sizes, and text diff generation is bounded.
 
-Use Node.js 26, run `npm ci`, then `npm test`. Vite builds the library and stylesheet, and TypeScript emits declarations. `npm pack` prepares the artifact used by the Editor build. The Editor enables the panel by default. Start it with `twPlusLocalGit=0` in its URL to disable the integration.
+Use Node.js 26, run `npm ci`, then `npm test`. Vite builds the library and stylesheet, and TypeScript emits declarations. `npm pack` prepares the artifact used by the Editor build. `npm run test:browser` runs the comparison dialog's block drawing in Chromium on the minimal editor runtime (`@kubohiroya/turbowarp-plus-editor-test-runtime`), with the Editor's pinned VM and Scratch Blocks and without building the Editor. The Editor enables the panel by default. Start it with `twPlusLocalGit=0` in its URL to disable the integration.
 
 The panel structure and local Git approach were informed by [duff](https://github.com/chigichan24/duff). The implementation uses [isomorphic-git](https://github.com/isomorphic-git/isomorphic-git) and [react-diff-view](https://github.com/otakustay/react-diff-view). Bundled licenses are listed in the build's third-party notices.
 
@@ -18,7 +18,7 @@ The panel structure and local Git approach were informed by [duff](https://githu
 
 `test/smart-http-fixture.js` runs `git-http-backend` on the IPv4 loopback for tests. It uses only Node.js built-in modules and ships in the package so browser tests of a host use the fixture of the same version.
 
-Import `createGitSmartHttp` from `@kubohiroya/turbowarp-plus-editor-git/smart-http`. Pass the selected GitHub HTTPS remote from Git config, a trusted connection (`mode` and `proxyOrigin`), and a function that returns the current proxy session or `null`. A `GitAuthProvider` from the auth package satisfies this contract. The Git package uses the session fields structurally, so the read-only panel and the adapter can be installed independently of the auth package.
+Import `createGitSmartHttp` from `@kubohiroya/turbowarp-plus-editor-git/smart-http`. Pass the selected GitHub HTTPS remote from Git config, a trusted connection (`mode` and `proxyOrigin`), and a function that returns the current proxy session or `null`. A `GitAuthProvider` from the auth package satisfies this contract. The Git package takes these types from the auth package, which is an optional peer: only TypeScript users need it installed, and the read-only panel and the adapter run without it.
 
 ```ts
 const transport = createGitSmartHttp({

package/dist/connection-settings.d.ts

@@ -1,18 +1,11 @@
 import React from 'react';
+import type { GitAuthState, GitConnectionMode as Mode } from '@kubohiroya/turbowarp-plus-editor-auth';
 import type { GetRemoteSession, RemoteOperation } from './remote-operations.js';
-type Mode = 'desktop' | 'cloudflare';
-type Status = 'disconnected' | 'connecting' | 'connected' | 'reauth-required';
 export interface GitConnectionSettings {
     modes: readonly Mode[];
     getView(): {
         mode: Mode | null;
-        state: {
-            status: Status;
-            account?: {
-                login: string;
-            };
-            expiresAt?: number;
-        };
+        state: GitAuthState;
         proxyOrigin?: string;
         write?: boolean;
         authorization?: {
@@ -32,4 +25,3 @@ export declare function ConnectionSettings({ settings, locale, readOrigin, runOp
     readOrigin?: () => Promise<string | undefined>;
     runOperation?: (operation: RemoteOperation) => Promise<void>;
 }): React.JSX.Element;
-export {};

package/dist/index.js

@@ -1,4 +1,4 @@
-import { S as parseProjectSource, a as PullRequestError, c as ProjectSourceComparison, d as organizeProjectChanges, f as projectPropertyLabel, i as createScratchBlocksDiffLocator, l as ProjectSourceReview, n as openProjectComparison, o as createGitHubPullRequests, r as createScratchBlocksDiffRenderer, s as gitHubRepositoryFromOrigin, v as useAssetImage, y as useCostumeImage } from "./project-comparison-D1rHzlCw.js";
+import { S as parseProjectSource, a as PullRequestError, c as ProjectSourceComparison, d as organizeProjectChanges, f as projectPropertyLabel, i as createScratchBlocksDiffLocator, l as ProjectSourceReview, n as openProjectComparison, o as createGitHubPullRequests, r as createScratchBlocksDiffRenderer, s as gitHubRepositoryFromOrigin, v as useAssetImage, y as useCostumeImage } from "./project-comparison-LAyP_beL.js";
 import { n as init_objectSpread2, r as __commonJSMin, t as _objectSpread2$1 } from "./objectSpread2-Dkd68nJH.js";
 import { i as createReadOnlyFs, r as GitPanelError, t as openRepository } from "./repository-CtvWYPQ8.js";
 import * as m from "react";
@@ -3277,7 +3277,7 @@ function ConnectionSettings({ settings, locale, readOrigin, runOperation }) {
 	}, labels[choice])))), /* @__PURE__ */ React.createElement("p", null, labels.changed), /* @__PURE__ */ React.createElement("p", {
 		"data-git-connection-state": "",
 		role: "status"
-	}, labels[state.status]), proxyOrigin && /* @__PURE__ */ React.createElement("p", null, labels.proxy, " · ", /* @__PURE__ */ React.createElement("code", null, proxyOrigin)), state.account && /* @__PURE__ */ React.createElement("p", null, labels.account, " · ", state.account.login), !readOrigin && /* @__PURE__ */ React.createElement("p", null, labels.noRemote), mode && /* @__PURE__ */ React.createElement(React.Fragment, null, runOperation && /* @__PURE__ */ React.createElement("label", null, /* @__PURE__ */ React.createElement("input", {
+	}, labels[state.status]), proxyOrigin && /* @__PURE__ */ React.createElement("p", null, labels.proxy, " · ", /* @__PURE__ */ React.createElement("code", null, proxyOrigin)), state.status === "connected" && /* @__PURE__ */ React.createElement("p", null, labels.account, " · ", state.account.login), !readOrigin && /* @__PURE__ */ React.createElement("p", null, labels.noRemote), mode && /* @__PURE__ */ React.createElement(React.Fragment, null, runOperation && /* @__PURE__ */ React.createElement("label", null, /* @__PURE__ */ React.createElement("input", {
 		type: "checkbox",
 		checked: allowPush,
 		disabled: busy || state.status === "connecting" || state.status === "connected",
@@ -3437,7 +3437,8 @@ function PullRequests({ name, labels, locale, renderBlock, locateFor }) {
 		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,
 		renderBlock,
-		locale
+		locale,
+		rememberAs: `${name}#${pr.number}`
 	}))));
 }
 function PullRequestReviewPanel({ repository, locale, renderBlock, locateFor }) {

package/dist/{project-comparison-D1rHzlCw.js → project-comparison-LAyP_beL.js}

@@ -1652,12 +1652,7 @@ function ComparisonTargets({ comparison, labels, renderBlock, loadAsset, locateB
 		labels,
 		loadAsset
 	}), target.isStage ? labels.stage : target.name, target.scripts.length > 0 && /* @__PURE__ */ React.createElement("small", null, labels.scriptCount(target.scripts.length))), target.status !== "updated" && /* @__PURE__ */ React.createElement("p", { className: "twgit-review-target-status" }, (target.status === "added" ? labels.targetAdded : labels.targetRemoved)(target.name, target.isStage)), target.status === "updated" && target.properties.length > 0 && /* @__PURE__ */ React.createElement("p", null, labels.properties, " · ", propertyNames(target.properties, labels)), target.scripts.map((script) => {
-		const key = JSON.stringify([
-			review === null || review === void 0 ? void 0 : review.file,
-			target.isStage,
-			target.name,
-			script.id
-		]);
+		const key = reviewKey(review === null || review === void 0 ? void 0 : review.file, target, script);
 		return /* @__PURE__ */ React.createElement(ScriptComparison, {
 			key,
 			script,
@@ -1755,7 +1750,54 @@ function ProjectSourceComparison({ before, after, renderBlock, locale = "en", fa
 		locateBlock
 	}));
 }
-function ProjectSourceReview({ title, description, verification, files, renderBlock, locale = "en" }) {
+var reviewKey = (file, target, script) => JSON.stringify([
+	file,
+	target.isStage,
+	target.name,
+	script.id
+]);
+var fingerprint = (value) => {
+	let hash = 2166136261;
+	for (const char of JSON.stringify(value)) hash = Math.imul(hash ^ char.charCodeAt(0), 16777619);
+	return (hash >>> 0).toString(36);
+};
+var scriptBlocks = ({ target, id }) => {
+	const blocks = target.blocks;
+	const rootOf = (start) => {
+		let current = start;
+		for (let guard = 0; guard < 1e4; guard++) {
+			var _blocks$current;
+			const parent = (_blocks$current = blocks[current]) === null || _blocks$current === void 0 ? void 0 : _blocks$current.parent;
+			if (typeof parent !== "string" || !blocks[parent]) return current;
+			current = parent;
+		}
+		return current;
+	};
+	return Object.keys(blocks).filter((key) => rootOf(key) === id).sort().map((key) => [key, blocks[key]]);
+};
+var scriptPrint = (script) => fingerprint([
+	script.kind,
+	script.before.map(scriptBlocks),
+	script.after.map(scriptBlocks)
+]);
+var storageKey = (name) => `turbowarp-plus-git:reviewed:${name}`;
+var readMarks = (name) => {
+	try {
+		var _globalThis$localStor, _globalThis$localStor2;
+		const value = JSON.parse((_globalThis$localStor = (_globalThis$localStor2 = globalThis.localStorage) === null || _globalThis$localStor2 === void 0 ? void 0 : _globalThis$localStor2.getItem(storageKey(name))) !== null && _globalThis$localStor !== void 0 ? _globalThis$localStor : "{}");
+		return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+	} catch (_unused3) {
+		return {};
+	}
+};
+var writeMarks = (name, marks) => {
+	try {
+		var _globalThis$localStor3, _globalThis$localStor4;
+		if (Object.keys(marks).length) (_globalThis$localStor3 = globalThis.localStorage) === null || _globalThis$localStor3 === void 0 || _globalThis$localStor3.setItem(storageKey(name), JSON.stringify(marks));
+		else (_globalThis$localStor4 = globalThis.localStorage) === null || _globalThis$localStor4 === void 0 || _globalThis$localStor4.removeItem(storageKey(name));
+	} catch (_unused4) {}
+};
+function ProjectSourceReview({ title, description, verification, files, renderBlock, locale = "en", rememberAs }) {
 	const labels = locale.startsWith("ja") ? ja : en;
 	const entries = useMemo(() => files.map((file) => {
 		if (!("patch" in file)) return { file };
@@ -1768,22 +1810,34 @@ function ProjectSourceReview({ title, description, verification, files, renderBl
 					properties: []
 				}
 			};
-		} catch (_unused3) {
+		} catch (_unused5) {
 			return {
 				file,
 				invalid: true
 			};
 		}
 	}), [files]);
+	const scriptPrints = useMemo(() => {
+		const prints = /* @__PURE__ */ new Map();
+		for (const { file, comparison } of entries) {
+			var _comparison$targets;
+			for (const target of (_comparison$targets = comparison === null || comparison === void 0 ? void 0 : comparison.targets) !== null && _comparison$targets !== void 0 ? _comparison$targets : []) for (const script of target.scripts) prints.set(reviewKey(file.path, target, script), scriptPrint(script));
+		}
+		return prints;
+	}, [entries]);
 	const [checked, setChecked] = useState();
-	const reviewed = (checked === null || checked === void 0 ? void 0 : checked.entries) === entries ? checked.keys : /* @__PURE__ */ new Set();
+	const marks = (checked === null || checked === void 0 ? void 0 : checked.entries) === entries ? checked.marks : rememberAs ? readMarks(rememberAs) : {};
+	const reviewed = new Set([...scriptPrints].filter(([key, print]) => marks[key] === print).map(([key]) => key));
 	const setReviewed = (key, value) => setChecked((previous) => {
-		const keys = new Set((previous === null || previous === void 0 ? void 0 : previous.entries) === entries ? previous.keys : []);
-		if (value) keys.add(key);
-		else keys.delete(key);
+		const current = (previous === null || previous === void 0 ? void 0 : previous.entries) === entries ? previous.marks : rememberAs ? readMarks(rememberAs) : {};
+		const next = {};
+		for (const [name, print] of scriptPrints) if (current[name] === print) next[name] = print;
+		if (value) next[key] = scriptPrints.get(key);
+		else delete next[key];
+		if (rememberAs) writeMarks(rememberAs, next);
 		return {
 			entries,
-			keys
+			marks: next
 		};
 	});
 	const targets = entries.reduce((total, entry) => {

package/dist/project-source-diff.js

@@ -1,4 +1,4 @@
-import { C as readProjectSourceDiff, _ as currentCostume, b as compareProjectBlocks, c as ProjectSourceComparison, d as organizeProjectChanges, f as projectPropertyLabel, g as usePreviewSync, h as createPreviewSync, i as createScratchBlocksDiffLocator, l as ProjectSourceReview, m as BlockPreview, n as openProjectComparison, o as createGitHubPullRequests, p as compareProjectForReview, r as createScratchBlocksDiffRenderer, s as gitHubRepositoryFromOrigin, t as ProjectComparisonDialog, u as assetFileName, x as createProjectSourceDiff } from "./project-comparison-D1rHzlCw.js";
+import { C as readProjectSourceDiff, _ as currentCostume, b as compareProjectBlocks, c as ProjectSourceComparison, d as organizeProjectChanges, f as projectPropertyLabel, g as usePreviewSync, h as createPreviewSync, i as createScratchBlocksDiffLocator, l as ProjectSourceReview, m as BlockPreview, n as openProjectComparison, o as createGitHubPullRequests, p as compareProjectForReview, r as createScratchBlocksDiffRenderer, s as gitHubRepositoryFromOrigin, t as ProjectComparisonDialog, u as assetFileName, x as createProjectSourceDiff } from "./project-comparison-LAyP_beL.js";
 import { n as init_objectSpread2, t as _objectSpread2 } from "./objectSpread2-Dkd68nJH.js";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 // src/project-source-diff.tsx

package/dist/project-source-review.d.ts

@@ -23,6 +23,11 @@ export interface ProjectSourceReviewProps {
     files: readonly ProjectSourceReviewFile[];
     renderBlock: ProjectBlockRenderer;
     locale?: string;
+    /**
+     * Where the reviewed marks are kept between reviews, such as `owner/repo#42`. Marks are stored in the browser with
+     * the content of each script, so a mark stays until that script changes. Without it, marks last while the review is open.
+     */
+    rememberAs?: string;
 }
 export interface ProjectSourceComparisonProps {
     /** The earlier project.source.json, or `null` when the file did not exist yet. */
@@ -45,4 +50,4 @@ export interface ProjectSourceComparisonProps {
 }
 /** Compares two versions of a project.source.json by stage, sprite and code, as the pull request review does. */
 export declare function ProjectSourceComparison({ before, after, renderBlock, locale, fallback, loadAsset, locateBlock, target }: ProjectSourceComparisonProps): React.JSX.Element;
-export declare function ProjectSourceReview({ title, description, verification, files, renderBlock, locale }: ProjectSourceReviewProps): React.JSX.Element;
+export declare function ProjectSourceReview({ title, description, verification, files, renderBlock, locale, rememberAs }: ProjectSourceReviewProps): React.JSX.Element;

package/dist/smart-http.d.ts

@@ -1,17 +1,9 @@
+import type { GitProxyConnection, GitProxySession } from '@kubohiroya/turbowarp-plus-editor-auth';
 export declare const MAX_GIT_REQUEST_BYTES: number;
-type Connection = Readonly<{
-    mode: 'desktop' | 'cloudflare';
-    proxyOrigin: string;
-}>;
-type Session = Readonly<{
-    connection: Connection;
-    bearer: string;
-    expiresAt: number;
-}>;
 export interface GitSmartHttpOptions {
     readonly remote: string;
-    readonly connection: Connection;
-    readonly getSession: () => Promise<Session | null>;
+    readonly connection: GitProxyConnection;
+    readonly getSession: () => Promise<GitProxySession | null>;
     readonly maxRequestBytes?: number;
     readonly signal?: AbortSignal;
     readonly fetch?: typeof fetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubohiroya/turbowarp-plus-editor-git",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Read-only local Git panel for TurboWarp Plus Editor",
   "type": "module",
   "license": "MPL-2.0",
@@ -46,13 +46,23 @@
   "scripts": {
     "build": "vite build && tsc -p tsconfig.json",
     "test": "npm run build && node --test test/*.test.js",
-    "prepack": "npm run build"
+    "prepack": "npm run build",
+    "test:browser": "npm run build && node --test test/*.browser.js"
   },
   "peerDependencies": {
+    "@kubohiroya/turbowarp-plus-editor-auth": ">=0.3.0 <0.4.0",
     "react": ">=16.14 <19",
     "react-dom": ">=16.14 <19"
   },
+  "peerDependenciesMeta": {
+    "@kubohiroya/turbowarp-plus-editor-auth": {
+      "optional": true
+    }
+  },
   "devDependencies": {
+    "@kubohiroya/turbowarp-plus-editor-auth": "0.3.0",
+    "@kubohiroya/turbowarp-plus-editor-test-runtime": "0.1.0",
+    "@playwright/test": "1.64.1",
     "@types/node": "24.19.2",
     "@types/react": "16.14.70",
     "@types/react-dom": "16.9.25",

package/src/connection-settings.tsx

@@ -1,13 +1,12 @@
 import React, {useEffect, useRef, useState} from 'react';
+import type {GitAuthState, GitConnectionMode as Mode} from '@kubohiroya/turbowarp-plus-editor-auth';
 import type {GetRemoteSession, RemoteOperation} from './remote-operations.js';
 
-type Mode = 'desktop' | 'cloudflare';
-type Status = 'disconnected' | 'connecting' | 'connected' | 'reauth-required';
 export interface GitConnectionSettings {
     modes: readonly Mode[];
     getView(): {
         mode: Mode | null;
-        state: {status: Status; account?: {login: string}; expiresAt?: number};
+        state: GitAuthState;
         proxyOrigin?: string;
         write?: boolean;
         authorization?: {url: string; userCode?: string};
@@ -87,7 +86,7 @@ export function ConnectionSettings({settings, locale, readOrigin, runOperation}:
             <p>{labels.changed}</p>
             <p data-git-connection-state="" role="status">{labels[state.status]}</p>
             {proxyOrigin && <p>{labels.proxy} · <code>{proxyOrigin}</code></p>}
-            {state.account && <p>{labels.account} · {state.account.login}</p>}
+            {state.status === 'connected' && <p>{labels.account} · {state.account.login}</p>}
             {!readOrigin && <p>{labels.noRemote}</p>}
             {mode && <>
                 {runOperation && <label><input type="checkbox" checked={allowPush}

package/src/project-source-review.tsx

@@ -30,6 +30,11 @@ export interface ProjectSourceReviewProps {
     files: readonly ProjectSourceReviewFile[];
     renderBlock: ProjectBlockRenderer;
     locale?: string;
+    /**
+     * Where the reviewed marks are kept between reviews, such as `owner/repo#42`. Marks are stored in the browser with
+     * the content of each script, so a mark stays until that script changes. Without it, marks last while the review is open.
+     */
+    rememberAs?: string;
 }
 
 // Like the Editor's Code tab, a connected group of blocks is called code, and each item is named by its hat block.
@@ -208,7 +213,7 @@ function ComparisonTargets({comparison, labels, renderBlock, loadAsset, locateBl
                 {(target.status === 'added' ? labels.targetAdded : labels.targetRemoved)(target.name, target.isStage)}</p>}
             {target.status === 'updated' && target.properties.length > 0 && <p>{labels.properties} · {propertyNames(target.properties, labels)}</p>}
             {target.scripts.map(script => {
-                const key = JSON.stringify([review?.file, target.isStage, target.name, script.id]);
+                const key = reviewKey(review?.file, target, script);
                 return <ScriptComparison key={key} script={script} labels={labels} renderBlock={renderBlock} loadAsset={loadAsset}
                     location={location} reviewed={review?.keys.has(key)} setReviewed={review && (value => review.set(key, value))}/>;
             })}
@@ -310,7 +315,49 @@ export function ProjectSourceComparison({before, after, renderBlock, locale = 'e
     </section>;
 }
 
-export function ProjectSourceReview({title, description, verification, files, renderBlock, locale = 'en'}: ProjectSourceReviewProps) {
+const reviewKey = (file: string | undefined, target: TargetReview, script: ScriptReview) =>
+    JSON.stringify([file, target.isStage, target.name, script.id]);
+// A short fingerprint of what a script shows, so a stored mark is dropped once the script changes.
+const fingerprint = (value: unknown) => {
+    let hash = 0x811c9dc5;
+    for (const char of JSON.stringify(value)) hash = Math.imul(hash ^ char.charCodeAt(0), 0x01000193);
+    return (hash >>> 0).toString(36);
+};
+// A side carries its whole stage or sprite; only the blocks of its own script decide whether a mark still holds.
+const scriptBlocks = ({target, id}: ScriptReview['before'][number]) => {
+    const blocks = target.blocks as Record<string, {parent?: unknown} | undefined>;
+    const rootOf = (start: string) => {
+        let current = start;
+        for (let guard = 0; guard < 10000; guard++) {
+            const parent = blocks[current]?.parent;
+            if (typeof parent !== 'string' || !blocks[parent]) return current;
+            current = parent;
+        }
+        return current;
+    };
+    return Object.keys(blocks).filter(key => rootOf(key) === id).sort().map(key => [key, blocks[key]]);
+};
+const scriptPrint = (script: ScriptReview) => fingerprint([script.kind, script.before.map(scriptBlocks), script.after.map(scriptBlocks)]);
+const storageKey = (name: string) => `turbowarp-plus-git:reviewed:${name}`;
+// Browser storage can be missing or refuse access; the marks then last while the review is open.
+const readMarks = (name: string): Record<string, string> => {
+    try {
+        const value = JSON.parse(globalThis.localStorage?.getItem(storageKey(name)) ?? '{}');
+        return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    } catch {
+        return {};
+    }
+};
+const writeMarks = (name: string, marks: Record<string, string>) => {
+    try {
+        if (Object.keys(marks).length) globalThis.localStorage?.setItem(storageKey(name), JSON.stringify(marks));
+        else globalThis.localStorage?.removeItem(storageKey(name));
+    } catch {
+        // Not kept; the marks still work for this review.
+    }
+};
+
+export function ProjectSourceReview({title, description, verification, files, renderBlock, locale = 'en', rememberAs}: ProjectSourceReviewProps) {
     const labels = locale.startsWith('ja') ? ja : en;
     const entries = useMemo(() => files.map(file => {
         if (!('patch' in file)) return {file};
@@ -321,13 +368,28 @@ export function ProjectSourceReview({title, description, verification, files, re
             return {file, invalid: true};
         }
     }), [files]);
-    const [checked, setChecked] = useState<{entries: typeof entries; keys: Set<string>}>();
-    const reviewed = checked?.entries === entries ? checked.keys : new Set<string>();
+    // Each script of this review by its mark key, with what it shows now.
+    const scriptPrints = useMemo(() => {
+        const prints = new Map<string, string>();
+        for (const {file, comparison} of entries) {
+            for (const target of comparison?.targets ?? []) {
+                for (const script of target.scripts) prints.set(reviewKey(file.path, target, script), scriptPrint(script));
+            }
+        }
+        return prints;
+    }, [entries]);
+    const [checked, setChecked] = useState<{entries: typeof entries; marks: Record<string, string>}>();
+    const marks = checked?.entries === entries ? checked.marks : rememberAs ? readMarks(rememberAs) : {};
+    const reviewed = new Set([...scriptPrints].filter(([key, print]) => marks[key] === print).map(([key]) => key));
     const setReviewed = (key: string, value: boolean) => setChecked(previous => {
-        const keys = new Set(previous?.entries === entries ? previous.keys : []);
-        if (value) keys.add(key);
-        else keys.delete(key);
-        return {entries, keys};
+        const current = previous?.entries === entries ? previous.marks : rememberAs ? readMarks(rememberAs) : {};
+        // Keep only marks that still match a script of this review.
+        const next: Record<string, string> = {};
+        for (const [name, print] of scriptPrints) if (current[name] === print) next[name] = print;
+        if (value) next[key] = scriptPrints.get(key)!;
+        else delete next[key];
+        if (rememberAs) writeMarks(rememberAs, next);
+        return {entries, marks: next};
     });
     const targets = entries.reduce((total, entry) => total + (entry.comparison?.targets.length ?? 0), 0);
     const scripts = entries.reduce((total, entry) => total + (entry.comparison ? countScripts(entry.comparison) : 0), 0);

package/src/pull-request-panel.tsx

@@ -111,7 +111,7 @@ function PullRequests({name, labels, locale, renderBlock, locateFor}: {
                     <a href={pr.url} target="_blank" rel="noreferrer">{labels.onGitHub}</a>
                 </p>
                 <ProjectSourceReview title={pr.title} description={pr.description} files={locateFor ? pr.files.map(file => 'patch' in file ? {...file, locateBlock: locateFor(file.path, pr.head.sha)} : file) : pr.files}
-                    renderBlock={renderBlock} locale={locale}/>
+                    renderBlock={renderBlock} locale={locale} rememberAs={`${name}#${pr.number}`}/>
             </>}
         </main>
     </div>;

package/src/smart-http.ts

@@ -1,14 +1,12 @@
+import type {GitProxyConnection, GitProxySession} from '@kubohiroya/turbowarp-plus-editor-auth';
 import type {HttpClient} from 'isomorphic-git';
 
 export const MAX_GIT_REQUEST_BYTES = 32 * 1024 * 1024;
 
-type Connection = Readonly<{mode: 'desktop' | 'cloudflare'; proxyOrigin: string}>;
-type Session = Readonly<{connection: Connection; bearer: string; expiresAt: number}>;
-
 export interface GitSmartHttpOptions {
     readonly remote: string;
-    readonly connection: Connection;
-    readonly getSession: () => Promise<Session | null>;
+    readonly connection: GitProxyConnection;
+    readonly getSession: () => Promise<GitProxySession | null>;
     readonly maxRequestBytes?: number;
     readonly signal?: AbortSignal;
     readonly fetch?: typeof fetch;
@@ -54,7 +52,7 @@ function remoteUrl(remote: string) {
     return `https://github.com/${match[1]}/${match[2]}.git`;
 }
 
-function checkConnection({mode, proxyOrigin}: Connection) {
+function checkConnection({mode, proxyOrigin}: GitProxyConnection) {
     const url = URL.parse(proxyOrigin);
     if (!url || url.origin !== proxyOrigin ||
         (mode === 'desktop' ? !/^http:\/\/127\.0\.0\.1:[1-9][0-9]{0,4}$/u.test(proxyOrigin) :
@@ -142,7 +140,7 @@ export function createGitSmartHttp(options: GitSmartHttpOptions) {
         checkAbort(abort);
         const payload = body ? await boundedBody(body, maxRequestBytes, abort) : undefined;
         checkAbort(abort);
-        let session: Session | null;
+        let session: GitProxySession | null;
         try {
             session = await getSession();
         } catch {