finch-git-branch 0.2.11 → 0.3.0

package/dist/scm-panel.js

@@ -0,0 +1,393 @@
+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 { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+function repoSignature(repos) {
+    return JSON.stringify(repos.map((repo) => ({
+        path: repo.path, branch: repo.branch, dirty: repo.dirty, ahead: repo.ahead, behind: repo.behind,
+        staged: repo.staged, unstaged: repo.unstaged, untracked: repo.untracked,
+        files: repo.files.map(({ path, status, staged, add, del }) => ({ path, status, staged, add, del })),
+        graph: repo.graph.map(({ hash, parents, subject, author, date }) => ({ hash, parents, subject, author, date })),
+    })));
+}
+function panelUi(ctx) {
+    return ctx.ui;
+}
+async function runGit(cwd, args, timeout = 15_000, trimOutput = true) {
+    const { stdout } = await execFileAsync('git', ['-C', cwd, ...args], { timeout, maxBuffer: 10 * 1024 * 1024 });
+    return trimOutput ? stdout.trim() : stdout;
+}
+async function isRepository(path) {
+    try {
+        return (await runGit(path, ['rev-parse', '--is-inside-work-tree'])) === 'true';
+    }
+    catch {
+        return false;
+    }
+}
+function parseStatus(output) {
+    const files = [];
+    const records = output.split('\0');
+    for (let i = 0; i < records.length; i += 1) {
+        const record = records[i];
+        if (!record)
+            continue;
+        const index = record[0] ?? ' ';
+        const worktree = record[1] ?? ' ';
+        const path = record.slice(3);
+        // In porcelain -z rename/copy records, the next NUL item is the old path.
+        if (index === 'R' || index === 'C')
+            i += 1;
+        files.push({
+            path, basename: basename(path), dirname: dirname(path) === '.' ? '' : dirname(path),
+            status: index === '?' ? '?' : (index !== ' ' ? index : worktree),
+            staged: index !== ' ' && index !== '?', add: 0, del: 0,
+        });
+    }
+    return files;
+}
+function parseGraph(output) {
+    return output.split('\x1e').filter(Boolean).map((record) => {
+        // `format:` inserts a newline between records; remove it before matching hashes to parents.
+        const [hash = '', parents = '', shortHash = '', subject = '', author = '', date = ''] = record.trimStart().split('\x1f');
+        return { hash, parents: parents ? parents.split(' ') : [], shortHash, subject, author, date };
+    }).filter((commit) => Boolean(commit.hash));
+}
+async function inspectRepo(path) {
+    const [branch, statusRaw, upstream, graph] = await Promise.all([
+        runGit(path, ['branch', '--show-current']).catch(() => 'HEAD'),
+        // Porcelain records begin with meaningful spaces; never trim this output.
+        runGit(path, ['status', '--porcelain=v1', '-z'], 15_000, false).catch(() => ''),
+        runGit(path, ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}']).catch(() => ''),
+        runGit(path, ['log', '--topo-order', '--date=short', '--pretty=format:%H%x1f%P%x1f%h%x1f%s%x1f%an%x1f%ad%x1e', '-n', '120'], 15_000, false).catch(() => ''),
+    ]);
+    const files = parseStatus(statusRaw);
+    const stats = await runGit(path, ['diff', '--numstat', 'HEAD']).catch(() => '');
+    for (const line of stats.split('\n').filter(Boolean)) {
+        const [add, del, file] = line.split('\t');
+        const item = files.find((entry) => entry.path === file);
+        if (item) {
+            item.add = Number(add) || 0;
+            item.del = Number(del) || 0;
+        }
+    }
+    await Promise.all(files.map(async (file) => {
+        const absolute = resolve(path, file.path);
+        const rightPath = existsSync(absolute) ? realpathSync(absolute) : await createDiffFile('worktree', file.path, '');
+        const compareIndex = file.staged;
+        file.diffLeftPath = await createDiffFile('base', file.path, file.status === '?' ? '' : await fileAtRevision(path, compareIndex ? 'HEAD' : '', file.path));
+        file.diffRightPath = compareIndex
+            ? await createDiffFile('index', file.path, await fileAtRevision(path, '', file.path))
+            : rightPath;
+    }));
+    let ahead = 0;
+    let behind = 0;
+    if (upstream) {
+        const counts = await runGit(path, ['rev-list', '--left-right', '--count', `HEAD...${upstream}`]).catch(() => '0\t0');
+        [ahead, behind] = counts.split('\t').map((value) => Number(value) || 0);
+    }
+    return {
+        path, name: basename(path), branch: branch || 'HEAD', dirty: files.length > 0, ahead, behind,
+        staged: files.filter((file) => file.staged).length,
+        unstaged: files.filter((file) => !file.staged && file.status !== '?').length,
+        untracked: files.filter((file) => file.status === '?').length,
+        files, graph: parseGraph(graph),
+    };
+}
+async function discoverRepos(cwd) {
+    if (!await isRepository(cwd))
+        return [];
+    const root = await runGit(cwd, ['rev-parse', '--show-toplevel']);
+    const paths = [root];
+    const submodules = await runGit(root, ['config', '--file', '.gitmodules', '--get-regexp', 'path']).catch(() => '');
+    for (const line of submodules.split('\n').filter(Boolean)) {
+        const submodulePath = line.replace(/^\S+\s+/, '').trim();
+        const absolute = resolve(root, submodulePath);
+        if (existsSync(absolute) && await isRepository(absolute))
+            paths.push(absolute);
+    }
+    return Promise.all(paths.map(inspectRepo));
+}
+function toolbarTitle(path) {
+    if (!path)
+        return 'Source Control';
+    const home = homedir();
+    const fromHome = relative(home, path);
+    if (!fromHome)
+        return '~';
+    if (!fromHome.startsWith('..') && !isAbsolute(fromHome))
+        return `~/${fromHome.replace(/\\/g, '/')}`;
+    const normalized = path.replace(/\\/g, '/').replace(/\/+$/, '');
+    const parts = normalized.split('/').filter(Boolean);
+    return parts.length > 6 ? `…/${parts.slice(-6).join('/')}` : normalized;
+}
+function allowedRepo(repos, repoPath) {
+    if (typeof repoPath !== 'string')
+        return undefined;
+    return repos.find((repo) => repo.path === repoPath)?.path;
+}
+function allowedFile(repoPath, filePath) {
+    if (typeof filePath !== 'string')
+        return undefined;
+    const absolute = resolve(repoPath, filePath);
+    return relative(repoPath, absolute).startsWith('..') ? undefined : absolute;
+}
+async function createDiffFile(label, filePath, content) {
+    const directory = await mkdtemp(join(tmpdir(), 'finch-git-diff-'));
+    const output = join(directory, `${label}-${basename(filePath)}`);
+    await writeFile(output, content, 'utf8');
+    return output;
+}
+async function fileAtRevision(repoPath, revision, filePath) {
+    return runGit(repoPath, ['show', `${revision}:${filePath}`], 15_000, false).catch(() => '');
+}
+async function hasStagedChanges(repoPath) {
+    return Boolean(await runGit(repoPath, ['diff', '--cached', '--name-only']));
+}
+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;
+        const post = async (message) => {
+            if (!active())
+                return false;
+            try {
+                await panel.postMessage(message);
+                return true;
+            }
+            catch {
+                // The Session may have dropped its viewer between the visibility check and send.
+                unavailable = true;
+                return false;
+            }
+        };
+        const updateToolbar = async (label, icon) => {
+            if (!active())
+                return;
+            try {
+                await panel.updateToolbarItem('scm-title', { label, icon });
+            }
+            catch {
+                unavailable = true;
+            }
+        };
+        const sendConfig = async () => {
+            const { assistantName } = await ctx.app.getInfo();
+            await post({ type: 'config', assistantName });
+        };
+        // Also push config immediately: an already-live Webview may not emit finch:env again
+        // after the mini tool backend is reloaded.
+        void sendConfig().catch(() => undefined);
+        const setScope = async (message, useCurrentWorkspace = false) => {
+            const webviewCwd = typeof message.cwd === 'string' ? message.cwd : '';
+            // Session switches can retain a live Webview without replaying finch:env.
+            // The backend workspace follows the active session and is authoritative for heartbeat refreshes.
+            const activeCwd = ctx.workspace.directoryPath ?? ctx.workspace.projectPath ?? '';
+            const nextCwd = useCurrentWorkspace && activeCwd ? activeCwd : webviewCwd;
+            const nextScopeKey = typeof message.scopeKey === 'string' ? message.scopeKey : (scopeKey || nextCwd);
+            if (nextScopeKey === scopeKey && nextCwd === cwd)
+                return false;
+            generation += 1;
+            scopeKey = nextScopeKey;
+            cwd = nextCwd;
+            repos = [];
+            await post({ type: 'status', repos: [], scopeKey });
+            return true;
+        };
+        const refresh = async (showLoading = true) => {
+            const requestGeneration = generation;
+            const requestScope = scopeKey;
+            const requestCwd = cwd;
+            const previousSignature = repoSignature(repos);
+            if (!active())
+                return;
+            if (!requestCwd) {
+                if (repos.length === 0)
+                    return;
+                await updateToolbar('Source Control', 'ext:git-branch/git-branch');
+                await post({ type: 'status', repos: [], scopeKey: requestScope, cwd: requestCwd });
+                return;
+            }
+            if (showLoading)
+                await post({ type: 'loading', loading: true, scopeKey: requestScope });
+            try {
+                const nextRepos = await discoverRepos(requestCwd);
+                // A newer finch:env/init won while Git was running; never paint stale results.
+                if (!active() || requestGeneration !== generation || requestScope !== scopeKey || requestCwd !== cwd)
+                    return;
+                if (repoSignature(nextRepos) === previousSignature)
+                    return;
+                repos = nextRepos;
+                await updateToolbar(toolbarTitle(repos[0]?.path), 'ext:git-branch/git-branch');
+                await post({ type: 'status', repos, scopeKey: requestScope, cwd: requestCwd });
+            }
+            finally {
+                if (showLoading && active() && requestGeneration === generation && requestScope === scopeKey) {
+                    await post({ type: 'loading', loading: false, scopeKey: requestScope });
+                }
+            }
+        };
+        const toast = async (title, variant = 'success') => {
+            if (!active())
+                return;
+            try {
+                await ctx.ui.showToast({ title, variant, position: 'TC' });
+            }
+            catch {
+                unavailable = true;
+            }
+        };
+        ctx.subscriptions.push(panel.onDidChangeVisibility((visible) => {
+            if (!visible)
+                return;
+            unavailable = false;
+            void sendConfig().then(() => refresh()).catch(() => undefined);
+        }));
+        ctx.subscriptions.push(panel.onDidDispose(() => {
+            unavailable = true;
+            generation += 1;
+            repos = [];
+        }));
+        ctx.subscriptions.push(panel.onDidReceiveMessage((raw) => {
+            void (async () => {
+                if (!active())
+                    return;
+                const message = raw;
+                try {
+                    if (message.type === 'init') {
+                        await setScope(message);
+                        await sendConfig();
+                        await refresh();
+                        return;
+                    }
+                    if (message.type === 'refresh') {
+                        await setScope(message, true);
+                        await refresh(message.silent !== true);
+                        return;
+                    }
+                    if (message.type === 'syncWorkspace') {
+                        const changed = await setScope(message, true);
+                        await sendConfig();
+                        if (changed || repos.length === 0)
+                            await refresh();
+                        return;
+                    }
+                    const repoPath = allowedRepo(repos, message.repoPath);
+                    if (!repoPath)
+                        return;
+                    if (message.type === 'stage') {
+                        await runGit(repoPath, ['add', '--', String(message.filePath)]);
+                        await toast(ctx.i18n.t('git.scm.stage.success'));
+                    }
+                    if (message.type === 'unstage') {
+                        await runGit(repoPath, ['restore', '--staged', '--', String(message.filePath)]);
+                        await toast(ctx.i18n.t('git.scm.unstage.success'));
+                    }
+                    if (message.type === 'stageAll') {
+                        await runGit(repoPath, ['add', '-A']);
+                        await toast(ctx.i18n.t('git.scm.stageAll.success'));
+                    }
+                    if (message.type === 'unstageAll') {
+                        await runGit(repoPath, ['restore', '--staged', '.']);
+                        await toast(ctx.i18n.t('git.scm.unstageAll.success'));
+                    }
+                    if (message.type === 'pull') {
+                        await runGit(repoPath, ['pull', '--ff-only'], 60_000);
+                        await toast(ctx.i18n.t('git.scm.pull.success'));
+                    }
+                    if (message.type === 'push') {
+                        await runGit(repoPath, ['push'], 60_000);
+                        await toast(ctx.i18n.t('git.scm.push.success'));
+                    }
+                    if (message.type === 'fetch') {
+                        await runGit(repoPath, ['fetch', '--prune'], 60_000);
+                        await toast(ctx.i18n.t('git.scm.fetch.success'));
+                    }
+                    if (message.type === 'requestCommit') {
+                        const result = await ctx.ui.showModalDialog({
+                            title: ctx.i18n.t('git.scm.commit.title'),
+                            actions: [
+                                { id: 'cancel', label: ctx.i18n.t('git.scm.commit.cancel'), variant: 'secondary' },
+                                { id: 'commit', label: ctx.i18n.t('git.scm.commit.submit'), variant: 'primary' },
+                            ],
+                            fields: [{
+                                    key: 'message', label: ctx.i18n.t('git.scm.commit.field'), type: 'textarea', required: true,
+                                    placeholder: ctx.i18n.t('git.scm.commit.placeholder'),
+                                }],
+                        });
+                        if (result.action !== 'commit')
+                            return;
+                        const text = String(result.values?.message ?? '').trim();
+                        if (!text)
+                            return;
+                        await runGit(repoPath, ['add', '-A']);
+                        if (!await hasStagedChanges(repoPath)) {
+                            await toast(ctx.i18n.t('git.scm.commit.empty'), 'info');
+                            return;
+                        }
+                        await runGit(repoPath, ['commit', '-m', text, '-m', 'Co-authored-by: 帕亚 <noreply@finchwork.app>']);
+                        await toast(ctx.i18n.t('git.scm.commit.success'));
+                    }
+                    if (message.type === 'commit') {
+                        const text = typeof message.message === 'string' ? message.message.trim() : '';
+                        if (!text)
+                            throw new Error('Commit message is required');
+                        await runGit(repoPath, ['add', '-A']);
+                        if (!await hasStagedChanges(repoPath)) {
+                            await toast(ctx.i18n.t('git.scm.commit.empty'), 'info');
+                            return;
+                        }
+                        await runGit(repoPath, ['commit', '-m', text, '-m', 'Co-authored-by: 帕亚 <noreply@finchwork.app>']);
+                        await toast(ctx.i18n.t('git.scm.commit.success'));
+                    }
+                    if (message.type === 'discard') {
+                        const file = allowedFile(repoPath, message.filePath);
+                        if (!file)
+                            throw new Error('Invalid file path');
+                        if (message.status === '?')
+                            await runGit(repoPath, ['clean', '-f', '--', String(message.filePath)]);
+                        else
+                            await runGit(repoPath, ['restore', '--source=HEAD', '--staged', '--worktree', '--', String(message.filePath)]);
+                        await toast(ctx.i18n.t('git.scm.discard.success'));
+                    }
+                    if (message.type === 'openFile') {
+                        const file = allowedFile(repoPath, message.filePath);
+                        if (file && existsSync(file))
+                            await panelUi(ctx).openFilePreview(realpathSync(file));
+                        return;
+                    }
+                    if (message.type === 'prepareFileDiff') {
+                        const file = allowedFile(repoPath, message.filePath);
+                        const relativePath = file ? relative(repoPath, file).replace(/\\/g, '/') : '';
+                        const entry = repos.find((repo) => repo.path === repoPath)?.files.find((item) => item.path === relativePath);
+                        if (!file || !entry || !relativePath)
+                            throw new Error('Invalid file path');
+                        const rightPath = existsSync(file)
+                            ? realpathSync(file)
+                            : await createDiffFile('worktree', relativePath, '');
+                        const compareIndex = entry.staged;
+                        const leftPath = await createDiffFile('base', relativePath, entry.status === '?' ? '' : await fileAtRevision(repoPath, compareIndex ? 'HEAD' : '', relativePath));
+                        const resolvedRightPath = compareIndex
+                            ? await createDiffFile('index', relativePath, await fileAtRevision(repoPath, '', relativePath))
+                            : rightPath;
+                        await post({ type: 'fileDiff', leftPath, rightPath: resolvedRightPath });
+                        return;
+                    }
+                    await refresh();
+                }
+                catch (error) {
+                    await toast(error instanceof Error ? error.message : 'Git operation failed', 'error');
+                    if (active())
+                        await refresh();
+                }
+            })().catch((error) => ctx.logger.error('SCM panel message failed', error));
+        }));
+    }));
+}

package/i18n/en-US.json

@@ -10,6 +10,15 @@
       "tooltip": "Git Branch Manager"
     }
   },
+  "appPanel": {
+    "title": "Source Control",
+    "toolbar": [
+      { "label": "Source Control" },
+      {},
+      { "tooltip": "Refresh repository status" },
+      { "items": [{ "label": "Fetch" }, { "label": "Pull" }, { "label": "Push" }] }
+    ]
+  },
 
   "git.branch.coauthor.label": "Include {finchName} as code co-author",
   "git.branch.coauthor.on": "On",
@@ -43,6 +52,21 @@
   "git.branch.create.nocwd": "No working directory",
   "git.branch.create.success": "✅ Created and switched to branch `{name}`",
   "git.branch.create.checkpoint": "\n\nUncommitted changes were auto-committed as a checkpoint.",
+  "git.scm.commit.title": "Commit Changes",
+  "git.scm.commit.field": "Commit Message",
+  "git.scm.commit.placeholder": "For example: feat: add source control panel",
+  "git.scm.commit.submit": "Commit",
+  "git.scm.commit.cancel": "Cancel",
+  "git.scm.commit.success": "Committed changes",
+  "git.scm.commit.empty": "No changes to commit",
+  "git.scm.stage.success": "Staged changes",
+  "git.scm.unstage.success": "Unstaged changes",
+  "git.scm.stageAll.success": "Staged all changes",
+  "git.scm.unstageAll.success": "Unstaged all changes",
+  "git.scm.discard.success": "Discarded changes",
+  "git.scm.pull.success": "Pulled latest changes",
+  "git.scm.push.success": "Pushed to remote",
+  "git.scm.fetch.success": "Fetched remote updates",
   "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

@@ -10,6 +10,15 @@
       "tooltip": "Git 分支管理"
     }
   },
+  "appPanel": {
+    "title": "源代码管理",
+    "toolbar": [
+      { "label": "源代码管理" },
+      {},
+      { "tooltip": "刷新存储库状态" },
+      { "items": [{ "label": "获取" }, { "label": "拉取" }, { "label": "推送" }] }
+    ]
+  },
 
   "git.branch.coauthor.label": "包含 {finchName} 作为代码协作者",
   "git.branch.coauthor.on": "已开启",
@@ -43,6 +52,21 @@
   "git.branch.create.nocwd": "没有工作目录",
   "git.branch.create.success": "✅ 已创建并切换到分支 `{name}`",
   "git.branch.create.checkpoint": "\n\n已自动提交当前工作区的更改作为 checkpoint。",
+  "git.scm.commit.title": "提交更改",
+  "git.scm.commit.field": "提交信息",
+  "git.scm.commit.placeholder": "例如：feat: 添加源代码管理面板",
+  "git.scm.commit.submit": "提交",
+  "git.scm.commit.cancel": "取消",
+  "git.scm.commit.success": "已提交更改",
+  "git.scm.commit.empty": "没有需要提交的更改",
+  "git.scm.stage.success": "已暂存",
+  "git.scm.unstage.success": "已取消暂存",
+  "git.scm.stageAll.success": "已暂存全部更改",
+  "git.scm.unstageAll.success": "已取消暂存全部更改",
+  "git.scm.discard.success": "已放弃更改",
+  "git.scm.pull.success": "已拉取最新更改",
+  "git.scm.push.success": "已推送到远程",
+  "git.scm.fetch.success": "已获取远程更新",
   "tool.create.title": "Create Git Branch",
   "tool.create.desc": "创建并检出 Git 分支。已确定分支名时传入 branchName 参数，以静默创建；否则省略该参数以打开表单收集分支名。"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "finch-git-branch",
-  "version": "0.2.11",
+  "version": "0.3.0",
   "description": "Git Branch Manager for Finch Composer toolbar.",
   "author": {
     "name": "Finch Team",
@@ -16,7 +16,7 @@
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc -p tsconfig.json"
+    "build": "tsc -p tsconfig.json && cp src/scm-panel.html dist/scm-panel.html && cp node_modules/@fontsource/jetbrains-mono/files/jetbrains-mono-latin-400-normal.woff2 dist/jetbrains-mono-latin.woff2 && mkdir -p dist/jetbrains-icons && cp -R src/jetbrains-icons/. dist/jetbrains-icons/"
   },
   "finch": {
     "manifestVersion": 1,
@@ -49,6 +49,52 @@
           "label": "Git Branch Icons"
         }
       ],
+      "appPanel": {
+        "title": "Source Control",
+        "icon": "ext:git-branch/git-branch",
+        "viewType": "finch.git-source-control",
+        "instanceMode": "single",
+        "showInLauncher": true,
+        "source": {
+          "type": "local",
+          "path": "dist/scm-panel.html"
+        },
+        "toolbar": [
+          {
+            "type": "title",
+            "id": "scm-title",
+            "icon": "ext:git-branch/git-branch",
+            "label": "Source Control"
+          },
+          {
+            "type": "spacer"
+          },
+          {
+            "id": "refresh",
+            "icon": "ext:git-branch/refresh-cw",
+            "tooltip": "Refresh repository status"
+          },
+          {
+            "type": "menu",
+            "id": "sync",
+            "icon": "ext:git-branch/ellipsis",
+            "items": [
+              {
+                "id": "fetch",
+                "label": "Fetch"
+              },
+              {
+                "id": "pull",
+                "label": "Pull"
+              },
+              {
+                "id": "push",
+                "label": "Push"
+              }
+            ]
+          }
+        ]
+      },
       "skills": false
     },
     "permissions": {
@@ -58,7 +104,7 @@
     }
   },
   "devDependencies": {
-    "@finchtoys/minitool-api": "^0.1.16",
+    "@finchtoys/minitool-api": "^0.2.14",
     "@types/node": "^26.1.0",
     "typescript": "^6.0.3"
   },
@@ -69,5 +115,8 @@
     "icon.png",
     "README.md",
     "README.zh-CN.md"
-  ]
+  ],
+  "dependencies": {
+    "@fontsource/jetbrains-mono": "^5.3.0"
+  }
 }