finch-git-branch 0.3.0 → 0.3.1

package/README.md

@@ -1,6 +1,6 @@
-## Git Branch for Finch
+## Git Source Control for Finch
 
-Git Branch is a mini tool for [Finch](https://finchwork.app/) — a desktop AI agent you can download at [finchwork.app](https://finchwork.app/). 
+Git Source Control is a mini tool for [Finch](https://finchwork.app/) — a desktop AI agent you can download at [finchwork.app](https://finchwork.app/). 
 
 ![Git Branch](https://raw.githubusercontent.com/finchtoys/finch-releases/refs/heads/main/extensions/git-branch/shot.png)
 

package/README.zh-CN.md

@@ -1,6 +1,6 @@
-## Git 分支小工具
+## Git 源码管理小工具
 
-Git 分支小工具是 [Finch](https://finchwork.app/) 的扩展。Finch 是一款桌面 AI Agent，可在 [finchwork.app](https://finchwork.app/) 下载。
+Git 源码管理小工具是 [Finch](https://finchwork.app/) 的扩展。Finch 是一款桌面 AI Agent，可在 [finchwork.app](https://finchwork.app/) 下载。
 
 ![Git Branch](https://raw.githubusercontent.com/finchtoys/finch-releases/refs/heads/main/extensions/git-branch/shot.png)
 
@@ -20,7 +20,7 @@ Git 分支小工具是 [Finch](https://finchwork.app/) 的扩展。Finch 是一
 ## 用法
 
 1. 在 Git 项目目录里打开一个 Finch 对话。
-2. 点击对话顶部工具栏的 Git 分支按钮。
+2. 点击对话顶部工具栏的 Git 源码管理按钮。
 3. 选一个分支切换过去。
 4. 如果有没保存的改动，对话框会问你先存档再切，还是取消。
 5. 点「创建并检出分支...」让 Agent 帮你输入新分支名。

package/dist/scm-panel.html

@@ -48,7 +48,7 @@
         overflow: hidden;
       }
       body {
-        font: 11px/1.45 var(--mono);
+        font: 12px/1.45 var(--mono);
         color: var(--text);
         background: var(--bg);
       }
@@ -142,7 +142,7 @@
         background: var(--hover);
         border-radius: 9px;
         padding: 0 5px;
-        font-size: 11px;
+        font-size: 12px;
       }
       .body.collapsed {
         display: none;
@@ -298,7 +298,7 @@
       .group {
         padding: 5px 10px 2px;
         color: var(--muted);
-        font-size: 11px;
+        font-size: 12px;
         background: var(--elev);
         position: sticky;
         top: 0;
@@ -350,7 +350,7 @@
         overflow: auto;
         padding: 0;
         color: var(--muted);
-        font-size: 11px;
+        font-size: 12px;
       }
       .graph-canvas {
         position: relative;
@@ -380,7 +380,7 @@
       }
       .graph-hash {
         color: var(--subtle);
-        font-size: 10px;
+        font-size: 12px;
         flex: none;
       }
       .graph-subject {
@@ -489,14 +489,14 @@
       }
       .repo,
       .repo * {
-        font-size: 11px !important;
+        font-size: 12px !important;
       }
       .repo {
         line-height: 18px;
       }
       .file,
       .file * {
-        font-size: 11px !important;
+        font-size: 12px !important;
       }
       .file {
         gap: 6px;

package/dist/scm-panel.js

@@ -144,9 +144,6 @@ async function createDiffFile(label, filePath, content) {
 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 = '';
@@ -327,25 +324,16 @@ export function activateScmPanel(ctx) {
                         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'));
+                        // 提交由人类在自己的终端手动执行，扩展只生成命令，不再自动 git commit。
+                        const escaped = text.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+                        await ctx.ui.showModalDialog({
+                            title: ctx.i18n.t('git.scm.commit.manual.title'),
+                            description: ctx.i18n.t('git.scm.commit.manual.desc'),
+                            message: `\`git add -A\`\n\`git commit -m "${escaped}"\``,
+                            actions: [
+                                { id: 'ok', label: ctx.i18n.t('git.scm.commit.manual.ok'), variant: 'primary' },
+                            ],
+                        });
                     }
                     if (message.type === 'discard') {
                         const file = allowedFile(repoPath, message.filePath);

package/i18n/en-US.json

@@ -1,13 +1,13 @@
 {
-  "name": "Git Branch",
-  "description": "Manage Git branches from the dialog box.",
+  "name": "Git Source Control",
+  "description": "Manage Git source control from the dialog box.",
   "systemPrompt": "When creating a Git branch, use create_git_branch. Pass branchName to create and check out a known branch without a form; otherwise omit it to collect the name in a form.",
   "toolMeta": {
-    "name": "Git Branch"
+    "name": "Git Source Control"
   },
   "composerActions": {
     "git-branch": {
-      "tooltip": "Git Branch Manager"
+      "tooltip": "Git Source Control"
     }
   },
   "appPanel": {
@@ -59,6 +59,9 @@
   "git.scm.commit.cancel": "Cancel",
   "git.scm.commit.success": "Committed changes",
   "git.scm.commit.empty": "No changes to commit",
+  "git.scm.commit.manual.title": "Commit Manually",
+  "git.scm.commit.manual.desc": "The commit will be made by you in your terminal. Copy and run the commands below:",
+  "git.scm.commit.manual.ok": "Done",
   "git.scm.stage.success": "Staged changes",
   "git.scm.unstage.success": "Unstaged changes",
   "git.scm.stageAll.success": "Staged all changes",

package/i18n/zh-CN.json

@@ -1,13 +1,13 @@
 {
-  "name": "Git 分支",
-  "description": "在对话框里管理 Git 分支的小工具",
+  "name": "Git 源码管理",
+  "description": "在对话框里管理 Git 源码的小工具",
   "systemPrompt": "当需要创建 Git 分支时，使用 create_git_branch 工具。已确定分支名时传入 branchName 参数以静默创建并检出；否则省略该参数以弹出表单收集分支名。",
   "toolMeta": {
-    "name": "Git 分支"
+    "name": "Git 源码管理"
   },
   "composerActions": {
     "git-branch": {
-      "tooltip": "Git 分支管理"
+      "tooltip": "Git 源码管理"
     }
   },
   "appPanel": {
@@ -59,6 +59,9 @@
   "git.scm.commit.cancel": "取消",
   "git.scm.commit.success": "已提交更改",
   "git.scm.commit.empty": "没有需要提交的更改",
+  "git.scm.commit.manual.title": "请手动提交",
+  "git.scm.commit.manual.desc": "提交将由你在终端手动执行，请复制并运行以下命令：",
+  "git.scm.commit.manual.ok": "完成",
   "git.scm.stage.success": "已暂存",
   "git.scm.unstage.success": "已取消暂存",
   "git.scm.stageAll.success": "已暂存全部更改",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "finch-git-branch",
-  "version": "0.3.0",
-  "description": "Git Branch Manager for Finch Composer toolbar.",
+  "version": "0.3.1",
+  "description": "Git Source Control for Finch Composer toolbar.",
   "author": {
     "name": "Finch Team",
     "url": "https://finchwork.app"
@@ -21,7 +21,7 @@
   "finch": {
     "manifestVersion": 1,
     "id": "git-branch",
-    "name": "Git Branch",
+    "name": "Git Source Control",
     "description": "Switch Git branches from the Composer toolbar with change previews.",
     "systemPrompt": "When creating a Git branch, use create_git_branch. Pass branchName to create and check out a known branch without a form; otherwise omit it to collect the name in a form.",
     "main": "dist/index.js",
@@ -40,7 +40,7 @@
         {
           "id": "git-branch",
           "icon": "git-branch",
-          "tooltip": "Git 分支管理"
+          "tooltip": "Git 源码管理"
         }
       ],
       "iconPacks": [