finch-git-branch 0.3.3 → 0.3.6

package/README.md

@@ -32,7 +32,7 @@ The first version intentionally leaves out force-push, rebase, reset, cherry-pic
 
 ## Permissions
 
-This tool needs shell permission because it runs `git` commands locally. No network access needed.
+This tool needs shell permission to run local `git` commands and read-only filesystem permission to inspect repository metadata and changed files. No network access needed.
 
 ## Development
 

package/README.zh-CN.md

@@ -27,7 +27,7 @@ Git 源码管理小工具是 [Finch](https://finchwork.app/) 的扩展。Finch
 
 ## 权限
 
-这个工具需要在本地执行 `git` 命令，所以需要 shell 权限。不需要联网。
+这个工具需要 shell 权限来执行本地 `git` 命令，以及只读文件权限来读取仓库元数据和变更文件。不需要联网。
 
 ## 开发
 

package/dist/index.js

@@ -132,6 +132,7 @@ export function activate(ctx) {
         handshake: { svg: readIconSvg('handshake'), description: 'Include Finch Code co-author' },
         'git-branch': { svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="18" cy="18" r="3"/><circle cx="6" cy="6" r="3"/><path d="M6 21V9a9 9 0 0 0 9 9"/></svg>', description: 'Git repository' },
         'refresh-cw': { svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8"/><path d="M21 3v5h-5"/><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16"/><path d="M8 16H3v5"/></svg>', description: 'Refresh repository status' },
+        'external-link': { svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6"/><path d="M10 14 21 3"/><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/></svg>', description: 'Open remote repository' },
         ellipsis: { svg: '<svg xmlns="http://www.w3.org/2000/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="1"/><circle cx="19" cy="12" r="1"/><circle cx="5" cy="12" r="1"/></svg>', description: 'More repository actions' },
     }));
     const composerAction = ctx.composerActions.register('git-branch', {

package/dist/scm-panel.html

@@ -766,8 +766,17 @@
         },
       };
       let words = t.en;
+      // Attach the latest env-derived scope to every backend action. This is
+      // both restoration metadata and a safety boundary: if a Session/Space
+      // switch races with an action, the backend can reject stale repo state
+      // instead of executing against the previous cwd.
       const post = (type, data = {}) =>
-        window.finch?.postMessage({ type, ...data });
+        window.finch?.postMessage({
+          type,
+          cwd: state.cwd,
+          scopeKey: state.scopeKey,
+          ...data,
+        });
       const esc = (s) =>
         String(s).replace(
           /[&<>'"]/g,
@@ -884,28 +893,39 @@
         document.querySelectorAll(".file").forEach((row) => {
           const path = row.dataset.path,
             file = r.files.find((f) => f.path === path);
-          row.querySelector(".open").onclick = () =>
-            post("openFile", { repoPath: state.path, filePath: path });
-          row.querySelector(".stage").onclick = () =>
+          const bindFileAction = (selector, handler) => {
+            const button = row.querySelector(selector);
+            if (!button) return;
+            // The row itself opens Diff on pointerdown. Handle child actions in
+            // the same event phase so the parent never consumes the first tap.
+            button.onpointerdown = (event) => {
+              event.preventDefault();
+              event.stopPropagation();
+              void handler();
+            };
+          };
+          bindFileAction(".open", () =>
+            post("openFile", { repoPath: state.path, filePath: path }),
+          );
+          bindFileAction(".stage", () =>
             post(file.staged ? "unstage" : "stage", {
               repoPath: state.path,
               filePath: path,
+            }),
+          );
+          bindFileAction(".undo", async () => {
+            const ok = await window.finch.ui.confirm({
+              title: words.discard,
+              message: path,
+              variant: "danger",
             });
-          const undo = row.querySelector(".undo");
-          if (undo)
-            undo.onclick = async () => {
-              const ok = await window.finch.ui.confirm({
-                title: words.discard,
-                message: path,
-                variant: "danger",
+            if (ok.confirmed)
+              post("discard", {
+                repoPath: state.path,
+                filePath: path,
+                status: file.status,
               });
-              if (ok.confirmed)
-                post("discard", {
-                  repoPath: state.path,
-                  filePath: path,
-                  status: file.status,
-                });
-            };
+          });
           row.onpointerdown = async (event) => {
             if (event.target.closest(".file-actions")) return;
             event.preventDefault();

package/dist/scm-panel.js

@@ -2,7 +2,7 @@ import { execFile } from 'node:child_process';
 import { existsSync, realpathSync } from 'node:fs';
 import { mkdtemp, writeFile } from 'node:fs/promises';
 import { homedir, tmpdir } from 'node:os';
-import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path';
+import { basename, dirname, extname, isAbsolute, join, relative, resolve } from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
 function repoSignature(repos) {
@@ -147,14 +147,44 @@ async function fileAtRevision(repoPath, revision, filePath) {
 async function hasStagedChanges(repoPath) {
     return Boolean(await runGit(repoPath, ['diff', '--cached', '--name-only']));
 }
+function remoteToBrowserUrl(url) {
+    const trimmed = url.trim();
+    if (!trimmed)
+        return undefined;
+    // git@github.com:user/repo.git -> https://github.com/user/repo
+    const sshMatch = trimmed.match(/^git@([^:]+):(.+?)(?:\.git)?$/);
+    if (sshMatch) {
+        const [, host, path] = sshMatch;
+        return `https://${host}/${path.replace(/\.git$/i, '')}`;
+    }
+    // ssh://git@host/path/repo.git
+    const sshProtoMatch = trimmed.match(/^ssh:\/\/(?:git@)?([^/]+)\/(.+?)(?:\.git)?$/);
+    if (sshProtoMatch) {
+        const [, host, path] = sshProtoMatch;
+        return `https://${host}/${path.replace(/\.git$/i, '')}`;
+    }
+    // https://host/path/repo.git or http://...
+    if (/^https?:\/\//i.test(trimmed)) {
+        return trimmed.replace(/\.git$/i, '');
+    }
+    return undefined;
+}
+function openInBrowser(url, platform) {
+    if (platform === 'darwin')
+        execFile('open', [url]);
+    else if (platform === 'win32')
+        execFile('cmd', ['/c', 'start', '', url]);
+    else
+        execFile('xdg-open', [url]);
+}
 export function activateScmPanel(ctx) {
     ctx.subscriptions.push(panelUi(ctx).onDidOpenPanel((panel) => {
         let cwd = '';
         let scopeKey = '';
         let generation = 0;
         let repos = [];
-        let unavailable = false;
-        const active = () => !unavailable && panel.visible;
+        let disposed = false;
+        const active = () => !disposed;
         const post = async (message) => {
             if (!active())
                 return false;
@@ -162,9 +192,11 @@ export function activateScmPanel(ctx) {
                 await panel.postMessage(message);
                 return true;
             }
-            catch {
-                // The Session may have dropped its viewer between the visibility check and send.
-                unavailable = true;
+            catch (error) {
+                // Session/Space navigation can briefly leave this scope without a
+                // viewer. That is retryable: only onDidDispose permanently ends the
+                // handle, and the page's next init/refresh handshake must still work.
+                ctx.logger.debug('SCM panel post deferred until next handshake', error);
                 return false;
             }
         };
@@ -174,8 +206,8 @@ export function activateScmPanel(ctx) {
             try {
                 await panel.updateToolbarItem('scm-title', { label, icon });
             }
-            catch {
-                unavailable = true;
+            catch (error) {
+                ctx.logger.debug('SCM toolbar update deferred until next refresh', error);
             }
         };
         const sendConfig = async () => {
@@ -240,18 +272,17 @@ export function activateScmPanel(ctx) {
             try {
                 await ctx.ui.showToast({ title, variant, position: 'TC' });
             }
-            catch {
-                unavailable = true;
+            catch (error) {
+                ctx.logger.debug('SCM toast skipped during scope transition', error);
             }
         };
         ctx.subscriptions.push(panel.onDidChangeVisibility((visible) => {
-            if (!visible)
+            if (!visible || !active())
                 return;
-            unavailable = false;
             void sendConfig().then(() => refresh()).catch(() => undefined);
         }));
         ctx.subscriptions.push(panel.onDidDispose(() => {
-            unavailable = true;
+            disposed = true;
             generation += 1;
             repos = [];
         }));
@@ -279,6 +310,15 @@ export function activateScmPanel(ctx) {
                             await refresh();
                         return;
                     }
+                    // Every page action carries its current env-derived scope. If an init
+                    // message was lost during navigation, this prevents a stale repoPath
+                    // from running against the previous Space; refresh the new scope and
+                    // require a fresh user action instead.
+                    if (await setScope(message)) {
+                        await sendConfig();
+                        await refresh();
+                        return;
+                    }
                     const repoPath = allowedRepo(repos, message.repoPath);
                     if (!repoPath)
                         return;
@@ -310,6 +350,17 @@ export function activateScmPanel(ctx) {
                         await runGit(repoPath, ['fetch', '--prune'], 60_000);
                         await toast(ctx.i18n.t('git.scm.fetch.success'));
                     }
+                    if (message.type === 'openRemote') {
+                        const remoteUrl = await runGit(repoPath, ['remote', 'get-url', 'origin']).catch(() => '');
+                        const browserUrl = remoteToBrowserUrl(remoteUrl);
+                        if (!browserUrl) {
+                            await toast(ctx.i18n.t('git.scm.openRemote.none'), 'error');
+                            return;
+                        }
+                        openInBrowser(browserUrl, process.platform);
+                        await toast(ctx.i18n.t('git.scm.openRemote.success'));
+                        return;
+                    }
                     if (message.type === 'requestCommit') {
                         const result = await ctx.ui.showModalDialog({
                             title: ctx.i18n.t('git.scm.commit.title'),
@@ -347,8 +398,13 @@ export function activateScmPanel(ctx) {
                     }
                     if (message.type === 'openFile') {
                         const file = allowedFile(repoPath, message.filePath);
-                        if (file && existsSync(file))
-                            await panelUi(ctx).openFilePreview(realpathSync(file));
+                        if (file && existsSync(file)) {
+                            const previewPath = realpathSync(file);
+                            const htmlOptions = ['.html', '.htm'].includes(extname(previewPath).toLowerCase())
+                                ? { htmlPreview: 'code' }
+                                : undefined;
+                            await panelUi(ctx).openFilePreview(previewPath, htmlOptions);
+                        }
                         return;
                     }
                     if (message.type === 'prepareFileDiff') {

package/i18n/en-US.json

@@ -16,6 +16,7 @@
       { "label": "Source Control" },
       {},
       { "tooltip": "Refresh repository status" },
+      { "tooltip": "Open remote repository" },
       { "items": [{ "label": "Fetch" }, { "label": "Pull" }, { "label": "Push" }] }
     ]
   },
@@ -67,6 +68,8 @@
   "git.scm.pull.success": "Pulled latest changes",
   "git.scm.push.success": "Pushed to remote",
   "git.scm.fetch.success": "Fetched remote updates",
+  "git.scm.openRemote.success": "Opened remote repository",
+  "git.scm.openRemote.none": "No remote repository configured",
   "tool.create.title": "Create Git Branch",
   "tool.create.desc": "Create and switch to a new Git branch. Pass branchName to create it without a form when the name is known; otherwise omit it to collect the name in a form."
 }

package/i18n/zh-CN.json

@@ -16,6 +16,7 @@
       { "label": "源代码管理" },
       {},
       { "tooltip": "刷新存储库状态" },
+      { "tooltip": "打开远程存储库" },
       { "items": [{ "label": "获取" }, { "label": "拉取" }, { "label": "推送" }] }
     ]
   },
@@ -67,6 +68,8 @@
   "git.scm.pull.success": "已拉取最新更改",
   "git.scm.push.success": "已推送到远程",
   "git.scm.fetch.success": "已获取远程更新",
+  "git.scm.openRemote.success": "已打开远程存储库",
+  "git.scm.openRemote.none": "未配置远程存储库",
   "tool.create.title": "Create Git Branch",
   "tool.create.desc": "创建并检出 Git 分支。已确定分支名时传入 branchName 参数，以静默创建；否则省略该参数以打开表单收集分支名。"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "finch-git-branch",
-  "version": "0.3.3",
+  "version": "0.3.6",
   "description": "Git Source Control for Finch Composer toolbar.",
   "author": {
     "name": "Finch Team",
@@ -74,6 +74,11 @@
             "icon": "ext:git-branch/refresh-cw",
             "tooltip": "Refresh repository status"
           },
+          {
+            "id": "openRemote",
+            "icon": "ext:git-branch/external-link",
+            "tooltip": "Open remote repository"
+          },
           {
             "type": "menu",
             "id": "sync",
@@ -98,7 +103,7 @@
       "skills": false
     },
     "permissions": {
-      "filesystem": "none",
+      "filesystem": "read",
       "network": false,
       "shell": true
     }