@jmfederico/pi-web 1.202609.0 → 1.202609.1

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

@@ -70,7 +70,7 @@ class GitUiController {
         this.requestRender(this.stateFor(context));
     }
     poll(context) {
-        void this.refresh(context);
+        void this.refresh(context, true);
     }
     invalidate(context) {
         if (!this.isOwnedWorkspace(context.workspace))
@@ -80,12 +80,24 @@ class GitUiController {
         this.requestRender(state);
         return this.refresh(context);
     }
-    refresh(context) {
+    refresh(context, background = false) {
         const state = this.stateFor(context);
-        if (state.statusRequest !== undefined)
+        if (state.statusRequest !== undefined) {
+            if (!background && !state.statusLoading) {
+                state.statusLoading = true;
+                this.requestRender(state);
+            }
             return state.statusRequest;
-        state.statusLoading = true;
-        this.requestRender(state);
+        }
+        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);
+        }
         const request = requestGitBackend(context, GIT_STATUS_OPERATION, null)
             .then(parseGitStatusResponse)
             .then(async (status) => {
@@ -93,14 +105,17 @@ class GitUiController {
                 return;
             state.status = state.status?.hash === status.hash ? state.status : status;
             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)) {
+                // Let the diff result resolve errors without briefly clearing a persistent failure.
+                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)
@@ -110,8 +125,11 @@ class GitUiController {
             if (state.statusRequest !== request)
                 return;
             state.statusRequest = undefined;
+            const wasLoading = state.statusLoading;
             state.statusLoading = false;
-            this.requestRender(state);
+            if (wasLoading || previousStatus !== state.status || previousError !== state.error
+                || previousStale !== state.stale || previousPath !== state.selectedDiffPath)
+                this.requestRender(state);
         });
         state.statusRequest = request;
         return request;
@@ -248,11 +266,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),
@@ -271,8 +295,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);
             }
         }
     }
@@ -291,7 +318,7 @@ function createGitActions(panelId, controller) {
             shortcutAliases: ["core:view.git"],
             group: "Navigation",
             enabled: hasGitWorkspace,
-            run: (context) => { context.selectMainView(panelId); },
+            run: (context) => { context.selectWorkspaceTool(panelId); },
         },
         {
             id: "workspace.refresh-git",
@@ -326,10 +353,10 @@ function createGitPanel(html, svg, controller) {
     };
 }
 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 workspace backend is unavailable. Update and restart PI WEB on this machine, then reload the browser."));
     }
-    return context.backend.request(operation, input);
+    return context.peer.request(operation, input);
 }
 function renderGitPanel(html, controller, context) {
     const state = controller.state(context);
@@ -551,10 +578,13 @@ 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 };
+    // The hash covers diff text, not the metadata displayed beside it.
+    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,7 +1,7 @@
 // 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, html, svg),

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

@@ -15,15 +15,15 @@ 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. */
+/** 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));
+        return statusPeerResponse(await gitStatusWithRunner(runGit, request.workspace.path));
     }
     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}`);
 }
@@ -351,7 +351,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,
@@ -370,7 +370,7 @@ function statusProviderResponse(status) {
         submodules: status.submodules,
     };
 }
-function diffProviderResponse(diff) {
+function diffPeerResponse(diff) {
     return {
         ...(diff.path === undefined ? {} : { path: diff.path }),
         staged: diff.staged,

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

@@ -12,10 +12,13 @@ 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;
@@ -80,7 +83,6 @@ export function createGitWorkspaceProvider(context) {
                 };
             });
         },
-        request: (request) => requestGitBackend(context, request),
         async prepareRemove({ project, workspace, signal }) {
             const privatePath = gitPrivateWorktreePath(workspace);
             if (resolve(privatePath) !== workspace.path) {

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: "Info Plugin",
     activate: ({ html, svg }) => ({
         contributions: {