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

package/README.ja.md

@@ -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({

package/README.md

@@ -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

@@ -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",

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.13.1",
   "description": "Read-only local Git panel for TurboWarp Plus Editor",
   "type": "module",
   "license": "MPL-2.0",
@@ -49,10 +49,17 @@
     "prepack": "npm run build"
   },
   "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",
     "@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/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 {