@chainingintention/pi-web-cn 1.202610.0 → 1.202610.2

package/dist/pi-web-plugins/files/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@pi-web/files-plugin",
+  "private": true,
+  "type": "module",
+  "piWeb": {
+    "plugins": [
+      {
+        "id": "files",
+        "browserRoot": "browser",
+        "module": "browser/pi-web-plugin.js",
+        "machineSpecific": false
+      }
+    ]
+  }
+}

package/dist/pi-web-plugins/git/browser/git-panel.js

@@ -54,8 +54,8 @@ class GitUiController {
         this.synchronizeRoute(state, changedWorkspace);
         if (state.status === undefined && state.statusRequest === undefined)
             void this.refresh(context);
-        else if (state.selectedDiffPath !== undefined && (state.selectedDiff === undefined || state.selectedStagedDiff === undefined) && !state.diffLoading) {
-            if (state.status?.files.some((file) => file.path === state.selectedDiffPath) === true)
+        else if (state.status !== undefined && state.selectedDiffPath !== undefined && (state.selectedDiff === undefined || state.selectedStagedDiff === undefined) && !state.diffLoading) {
+            if (state.status.files.some((file) => file.path === state.selectedDiffPath))
                 void this.refreshDiff(state, state.selectedDiffPath, context);
             else
                 this.clearSelection(state, true);
@@ -91,13 +91,24 @@ class GitUiController {
     }
     refresh(context, force = true) {
         const state = this.stateFor(context);
+        const background = !force;
         if (state.statusRequest !== undefined) {
-            state.statusRefreshPending ||= force;
+            if (!background && !state.statusLoading) {
+                state.statusLoading = true;
+                this.requestRender(state);
+            }
             return state.statusRequest;
         }
-        state.statusLoading = true;
+        const previousStatus = state.status;
+        const previousError = state.error;
+        const previousStale = state.stale;
+        const previousPath = state.selectedDiffPath;
+        const showLoading = !background || state.status === undefined;
+        if (showLoading) {
+            state.statusLoading = true;
+            this.requestRender(state);
+        }
         state.lastStatusRefreshAt = Date.now();
-        this.requestRender(state);
         const request = requestGitBackend(context, GIT_STATUS_OPERATION, force ? { refresh: true } : null)
             .then(parseGitStatusResponse)
             .then(async (status) => {
@@ -105,18 +116,20 @@ class GitUiController {
                 return;
             if (state.status?.hash !== status.hash) {
                 state.status = status;
-                state.visibleFileLimit = Math.min(GIT_FILE_RENDER_BATCH, status.files.length);
+                state.visibleFileLimit = GIT_FILE_RENDER_BATCH;
                 revealSelectedFile(state, this.view);
             }
             state.stale = false;
-            state.error = undefined;
             const path = state.selectedDiffPath;
-            if (path === undefined)
-                return;
-            if (!status.files.some((file) => file.path === path))
-                this.clearSelection(state, true);
-            else if (this.connectedWorkspaceKey === workspaceContextKey(context))
-                await this.refreshDiff(state, path, context);
+            if (path !== undefined && status.files.some((file) => file.path === path)
+                && this.connectedWorkspaceKey === workspaceContextKey(context)) {
+                await this.refreshDiff(state, path, context, background);
+            }
+            else {
+                state.error = undefined;
+                if (path !== undefined && !status.files.some((file) => file.path === path))
+                    this.clearSelection(state, true);
+            }
         })
             .catch((error) => {
             if (state.retained)
@@ -126,13 +139,11 @@ class GitUiController {
             if (state.statusRequest !== request)
                 return;
             state.statusRequest = undefined;
+            const wasLoading = state.statusLoading;
             state.statusLoading = false;
-            this.requestRender(state);
-            if (state.statusRefreshPending && state.retained && this.connectedWorkspaceKey === workspaceContextKey(context)) {
-                state.statusRefreshPending = false;
-                return this.refresh(context);
-            }
-            return undefined;
+            if (wasLoading || previousStatus !== state.status || previousError !== state.error
+                || previousStale !== state.stale || previousPath !== state.selectedDiffPath)
+                this.requestRender(state);
         });
         state.statusRequest = request;
         return request;
@@ -217,7 +228,6 @@ class GitUiController {
             error: undefined,
             expandedDirectories: new Set(),
             statusRequest: undefined,
-            statusRefreshPending: false,
             diffRequestSequence: 0,
             viewStateCache: undefined,
             visibleFileLimit: GIT_FILE_RENDER_BATCH,
@@ -270,6 +280,7 @@ class GitUiController {
         if (state.selectedDiffPath === path)
             return;
         state.selectedDiffPath = path;
+        revealSelectedFile(state, this.view);
         state.selectedDiff = undefined;
         state.selectedStagedDiff = undefined;
         state.diffLoading = false;
@@ -281,11 +292,17 @@ class GitUiController {
             this.route.write(undefined, { replace: true });
         }
     }
-    async refreshDiff(state, path, context) {
+    async refreshDiff(state, path, context, background = false) {
         const sequence = state.diffRequestSequence + 1;
         state.diffRequestSequence = sequence;
-        state.diffLoading = true;
-        this.requestRender(state);
+        const previousDiff = state.selectedDiff;
+        const previousStagedDiff = state.selectedStagedDiff;
+        const previousError = state.error;
+        const showLoading = !background || previousDiff === undefined || previousStagedDiff === undefined;
+        if (showLoading) {
+            state.diffLoading = true;
+            this.requestRender(state);
+        }
         try {
             const [selectedDiff, selectedStagedDiff] = await Promise.all([
                 requestGitBackend(context, GIT_DIFF_OPERATION, { path }).then(parseGitDiffResponse),
@@ -304,8 +321,11 @@ class GitUiController {
         }
         finally {
             if (state.retained && state.diffRequestSequence === sequence && state.selectedDiffPath === path) {
+                const wasLoading = state.diffLoading;
                 state.diffLoading = false;
-                this.requestRender(state);
+                if (wasLoading || previousDiff !== state.selectedDiff || previousStagedDiff !== state.selectedStagedDiff
+                    || previousError !== state.error)
+                    this.requestRender(state);
             }
         }
     }
@@ -324,7 +344,7 @@ function createGitActions(panelId, controller) {
             shortcutAliases: ["core:view.git"],
             group: "导航",
             enabled: hasGitWorkspace,
-            run: (context) => { context.selectMainView(panelId); },
+            run: (context) => { context.selectWorkspaceTool(panelId); },
         },
         {
             id: "workspace.refresh-git",
@@ -333,7 +353,7 @@ function createGitActions(panelId, controller) {
             shortcutAliases: ["core:workspace.refresh-git"],
             group: "工作区",
             enabled: hasGitWorkspace,
-            run: (context) => context.refreshWorkspacePanels?.(panelId),
+            run: (context) => context.refreshWorkspacePanels(panelId),
         },
     ];
 }
@@ -353,16 +373,17 @@ function createGitPanel(html, svg, controller) {
     `,
         order: 20,
         routeAliases: ["git", "core:workspace.git"],
+        navigationAliases: ["core:workspace.git"],
         visible: (context) => controller.isOwnedWorkspace(context.workspace),
         onInvalidate: (context) => controller.invalidate(context),
         render: (context) => renderGitPanel(html, controller, context),
     };
 }
 function requestGitBackend(context, operation, input) {
-    if (context.backend === undefined || context.workspace.provider?.capabilities.request === false) {
+    if (context.peer?.request === undefined) {
         return Promise.reject(new Error("Git 工作区后端不可用。请更新并重启此机器上的 PI WEB，然后重新加载浏览器。"));
     }
-    return context.backend.request(operation, input);
+    return context.peer.request(operation, input);
 }
 function renderGitPanel(html, controller, context) {
     const state = controller.state(context);
@@ -639,10 +660,12 @@ function formatLineNumber(lineNumber) {
     return lineNumber === undefined ? "" : String(lineNumber);
 }
 function createDiffView(response, previous) {
-    return {
-        response,
-        lines: previous?.response.hash === response.hash ? previous.lines : undefined,
-    };
+    if (previous?.response.hash !== response.hash)
+        return { response, lines: undefined };
+    if (previous.response.path === response.path && previous.response.staged === response.staged
+        && previous.response.truncated === response.truncated)
+        return previous;
+    return { response, lines: previous.lines };
 }
 function workspaceContextKey(context) {
     return JSON.stringify([context.machine.id, context.workspace.projectId, context.workspace.id]);

package/dist/pi-web-plugins/git/browser/pi-web-plugin.js

@@ -1,10 +1,10 @@
 // Generated from pi-web-plugins/git/browser/pi-web-plugin.ts. Do not edit directly.
 import { createGitBrowserContributions } from "./git-panel.js";
 const plugin = {
-    apiVersion: 2,
+    apiVersion: 4,
     name: "Git",
     activate: ({ pluginId, runtimePluginId, html, svg }) => ({
-        contributions: createGitBrowserContributions(pluginId, runtimePluginId ?? pluginId, html, svg),
+        contributions: createGitBrowserContributions(pluginId, runtimePluginId, html, svg),
     }),
 };
 export default plugin;

package/dist/pi-web-plugins/git/git-backend.js

@@ -1,10 +1,12 @@
 // Generated from pi-web-plugins/git/git-backend.ts. Do not edit directly.
 import { createHash } from "node:crypto";
 import { realpath } from "node:fs/promises";
+import { GitStatusCache } from "./gitStatusCache.js";
 import { isAbsolute, join, relative, sep } from "node:path";
 import { GIT_DIFF_OPERATION, GIT_STATUS_OPERATION, } from "./browser/git-contract.js";
 export { GIT_DIFF_OPERATION, GIT_STATUS_OPERATION } from "./browser/git-contract.js";
 const GIT_COMMAND_TIMEOUT_MS = 10_000;
+const statusCaches = new WeakMap();
 const GIT_LOCAL_ENV_VARS = Object.freeze([
     "GIT_ALTERNATE_OBJECT_DIRECTORIES",
     "GIT_COMMON_DIR",
@@ -15,39 +17,27 @@ const GIT_LOCAL_ENV_VARS = Object.freeze([
     "GIT_QUARANTINE_PATH",
     "GIT_WORK_TREE",
 ]);
-/** Dispatch the Git-owned status/diff schema through the provider's public request seam. */
-export function createGitBackend(activationContext) {
-    const statuses = new Map();
-    return (request) => {
-        if (request.operation !== GIT_STATUS_OPERATION)
-            return requestGitBackend(activationContext, request);
-        requireStatusInput(request.input);
-        const key = JSON.stringify([request.project.id, request.project.path, request.workspace.key, request.workspace.path]);
-        const cached = statuses.get(key);
-        if (cached !== undefined && (cached.expires === Infinity || (request.input === null && cached.expires > Date.now())))
-            return cached.promise;
-        const entry = { expires: Infinity, promise: requestGitBackend(activationContext, { ...request, signal: new AbortController().signal }).then((result) => {
-                entry.expires = Date.now() + 2000;
-                for (const [oldKey, old] of statuses)
-                    if (old.expires <= Date.now())
-                        statuses.delete(oldKey);
-                return result;
-            }, (error) => { statuses.delete(key); throw error; }) };
-        statuses.set(key, entry);
-        return entry.promise;
-    };
-}
+/** Dispatch the Git status/diff schema through the package peer request seam. */
 export async function requestGitBackend(activationContext, request) {
     const runGit = createGitRunner(activationContext, request.signal);
     if (request.operation === GIT_STATUS_OPERATION) {
         requireStatusInput(request.input);
-        return statusProviderResponse(await gitStatusWithRunner(runGit, request.workspace.path));
+        let cache = statusCaches.get(activationContext);
+        if (cache === undefined) {
+            cache = new GitStatusCache((cwd, signal) => gitStatus(activationContext, cwd, signal));
+            statusCaches.set(activationContext, cache);
+        }
+        const key = JSON.stringify([request.project.id, request.project.path, request.workspace.id, request.workspace.path, request.workspace.provider]);
+        return statusPeerResponse(await cache.get(key, request.workspace.path, request.signal, request.input !== null));
     }
     if (request.operation === GIT_DIFF_OPERATION) {
-        return diffProviderResponse(await gitDiffWithRunner(runGit, request.workspace.path, parseDiffInput(request.input)));
+        return diffPeerResponse(await gitDiffWithRunner(runGit, request.workspace.path, parseDiffInput(request.input)));
     }
     throw new Error(`Unsupported Git workspace backend operation: ${request.operation}`);
 }
+export async function gitStatus(context, cwd, signal) {
+    return gitStatusWithRunner(createGitRunner(context, signal), cwd);
+}
 async function gitStatusWithRunner(runGit, cwd) {
     const result = await runGit(cwd, ["status", "--porcelain=v2", "--branch", "--untracked-files=all", "-z"]);
     if (result.code !== 0)
@@ -137,6 +127,9 @@ async function resolveSubmoduleToCommit(runGit, cwd, sub) {
     const resolved = head.stdout.trim();
     return head.code === 0 && resolved !== "" ? resolved : sub.indexOid;
 }
+export async function gitDiff(context, cwd, options, signal) {
+    return gitDiffWithRunner(createGitRunner(context, signal), cwd, options);
+}
 async function gitDiffWithRunner(runGit, cwd, options) {
     const staged = options.staged === true;
     let path;
@@ -371,7 +364,7 @@ function displayFromCommit(headOid) {
 function hash(value) {
     return createHash("sha1").update(value).digest("hex");
 }
-function statusProviderResponse(status) {
+function statusPeerResponse(status) {
     return {
         isGitRepo: status.isGitRepo,
         hash: status.hash,
@@ -391,7 +384,7 @@ function statusProviderResponse(status) {
         ...(status.truncated === true ? { truncated: true } : {}),
     };
 }
-function diffProviderResponse(diff) {
+function diffPeerResponse(diff) {
     return {
         ...(diff.path === undefined ? {} : { path: diff.path }),
         staged: diff.staged,

package/dist/pi-web-plugins/git/gitStatusCache.js

@@ -0,0 +1,48 @@
+// Generated from pi-web-plugins/git/gitStatusCache.ts. Do not edit directly.
+/** Completed snapshots are shared; cancellable scans belong to their exact invocation signal. */
+export class GitStatusCache {
+    scan;
+    now;
+    entries = new Map();
+    constructor(scan, now = Date.now) {
+        this.scan = scan;
+        this.now = now;
+    }
+    get(key, cwd, signal, force = false) {
+        signal.throwIfAborted();
+        const entry = this.entries.get(key) ?? { expires: 0, generation: 0, pending: new Map() };
+        const pending = entry.pending.get(signal);
+        if (pending !== undefined)
+            return pending;
+        if (!force && entry.value !== undefined && entry.expires > this.now())
+            return Promise.resolve(entry.value);
+        this.entries.set(key, entry);
+        if (force)
+            delete entry.value;
+        const generation = ++entry.generation;
+        const request = Promise.resolve().then(() => this.scan(cwd, signal)).then((status) => {
+            signal.throwIfAborted();
+            if (entry.generation === generation) {
+                if (status.isGitRepo) {
+                    entry.value = status;
+                    entry.expires = this.now() + 2000;
+                }
+                else
+                    delete entry.value;
+            }
+            return status;
+        }).catch((error) => {
+            if (entry.generation === generation)
+                delete entry.value;
+            throw error;
+        }).finally(() => {
+            entry.pending.delete(signal);
+            for (const [oldKey, old] of this.entries) {
+                if (old.pending.size === 0 && (old.value === undefined || old.expires <= this.now()))
+                    this.entries.delete(oldKey);
+            }
+        });
+        entry.pending.set(signal, request);
+        return request;
+    }
+}

package/dist/pi-web-plugins/git/package.json

@@ -6,6 +6,7 @@
     "plugins": [
       {
         "id": "git",
+        "browserRoot": "browser",
         "module": "browser/pi-web-plugin.js",
         "serverModule": "server-plugin.js",
         "machineSpecific": true

package/dist/pi-web-plugins/git/server-plugin.js

@@ -1,6 +1,6 @@
 // Generated from pi-web-plugins/git/server-plugin.ts. Do not edit directly.
 import { basename, resolve } from "node:path";
-import { createGitBackend } from "./git-backend.js";
+import { requestGitBackend } from "./git-backend.js";
 const GIT_LOCAL_ENV_VARS = Object.freeze([
     "GIT_ALTERNATE_OBJECT_DIRECTORIES",
     "GIT_COMMON_DIR",
@@ -12,21 +12,23 @@ const GIT_LOCAL_ENV_VARS = Object.freeze([
     "GIT_WORK_TREE",
 ]);
 const plugin = {
-    apiVersion: 1,
+    apiVersion: 3,
     name: "Git",
     activate(context) {
-        return { workspaceProvider: createGitWorkspaceProvider(context) };
+        return {
+            workspaceProvider: createGitWorkspaceProvider(context),
+            peer: { request: (request) => requestGitBackend(context, request) },
+        };
     },
 };
 export default plugin;
 export function createGitWorkspaceProvider(context) {
-    const requestBackend = createGitBackend(context);
     return Object.freeze({
         fallback: true,
         async probe(project, signal) {
             const result = await runGit(context, project.path, ["rev-parse", "--is-inside-work-tree"], signal);
             if (result.signal !== null)
-                throw new Error(`git repository probe ended from signal ${result.signal}`);
+                throw new Error(`Git 仓库探测因信号 ${result.signal} 结束`);
             if (result.exitCode !== 0)
                 return "pass";
             return result.stdout.trim() === "true" ? "claim" : "pass";
@@ -37,7 +39,7 @@ export function createGitWorkspaceProvider(context) {
             if (mainRootOutput === "")
                 throw new Error("Git 返回了空的工作树根目录");
             const mainRoot = resolve(mainRootOutput);
-            const commonDirectoryResult = await requireGit(runGit(context, project.path, ["rev-parse", "--git-common-dir"], signal), "resolve the Git common directory");
+            const commonDirectoryResult = await requireGit(runGit(context, project.path, ["rev-parse", "--git-common-dir"], signal), "解析 Git 公共目录");
             const commonDirectoryOutput = commonDirectoryResult.stdout.trim();
             if (commonDirectoryOutput === "")
                 throw new Error("Git 返回了空的公共目录");
@@ -81,7 +83,6 @@ export function createGitWorkspaceProvider(context) {
                 };
             });
         },
-        request: (request) => requestBackend(request),
         async prepareRemove({ project, workspace, signal }) {
             const privatePath = gitPrivateWorktreePath(workspace);
             if (resolve(privatePath) !== workspace.path) {
@@ -163,7 +164,7 @@ async function runGit(context, cwd, args, signal) {
         signal,
     });
     if (result.stdoutTruncated || result.stderrTruncated) {
-        throw new Error(`git ${args.join(" ")} exceeded the host output limit`);
+        throw new Error(`git ${args.join(" ")} 超出宿主输出限制`);
     }
     return result;
 }
@@ -172,6 +173,6 @@ async function requireGit(resultPromise, action) {
     if (result.signal === null && result.exitCode === 0)
         return result;
     const detail = result.stderr.trim();
-    const outcome = result.signal === null ? `exit ${String(result.exitCode)}` : `signal ${result.signal}`;
-    throw new Error(`Unable to ${action} (${outcome})${detail === "" ? "" : `: ${detail}`}`);
+    const outcome = result.signal === null ? `退出码 ${String(result.exitCode)}` : `信号 ${result.signal}`;
+    throw new Error(`无法${action}（${outcome}）${detail === "" ? "" : `：${detail}`}`);
 }

package/dist/pi-web-plugins/info/infoInternals.js

@@ -84,8 +84,11 @@ export function piVersionDriftNote(web, sessiond) {
 }
 export function workspaceFlags(workspace) {
     return [
+        workspace.provider === undefined
+            ? workspace.isGitRepo === undefined && workspace.isGitWorktree !== true ? "文件夹工作区" : undefined
+            : `提供器 ${workspace.provider.pluginId}`,
         workspace.branch === undefined || workspace.branch === "" ? undefined : `分支 ${workspace.branch}`,
-        workspace.isGitWorktree === true ? "Git 工作树" : workspace.isGitRepo === true ? "Git 仓库" : "非 Git 仓库",
+        workspace.isGitWorktree === true ? "Git 工作树" : workspace.isGitRepo === true ? "Git 仓库" : workspace.isGitRepo === false ? "非 Git 仓库" : undefined,
         workspace.isMain ? "主工作区" : undefined,
     ].filter((flag) => flag !== undefined);
 }

package/dist/pi-web-plugins/info/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "piWeb": {
     "plugins": [
-      { "id": "info", "module": "pi-web-plugin.js" }
+      { "id": "info", "browserRoot": ".", "module": "pi-web-plugin.js" }
     ]
   }
 }

package/dist/pi-web-plugins/info/pi-web-plugin.js

@@ -7,7 +7,7 @@
 // the internals for your own.
 import { copyDiagnostics, renderInfoPanel } from "./infoInternals.js";
 const plugin = {
-    apiVersion: 2,
+    apiVersion: 4,
     name: "信息插件",
     activate: ({ html, svg }) => ({
         contributions: {
@@ -24,19 +24,19 @@ const plugin = {
                 {
                     id: "workspace.kind-label",
                     order: 100,
-                    items: (context) => [{ type: "text", text: context.workspace.isGitRepo === true ? "Git" : "文件夹", title: context.workspace.path }],
+                    items: (context) => [{ type: "text", text: context.workspace.provider?.pluginId ?? (context.workspace.isGitRepo === true ? "Git" : "文件夹"), title: context.workspace.path }],
                 },
             ],
             workspacePanels: [
                 {
                     id: "workspace.info",
                     title: "信息",
-                    icon: svg `
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-              <circle cx="12" cy="12" r="9"></circle>
-              <path d="M12 11v5"></path>
-              <path d="M12 8h.01"></path>
-            </svg>
+                    icon: svg `
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+              <circle cx="12" cy="12" r="9"></circle>
+              <path d="M12 11v5"></path>
+              <path d="M12 8h.01"></path>
+            </svg>
           `,
                     order: 1000,
                     render: (context) => renderInfoPanel(html, context),