finch-git-branch 0.3.1 → 0.3.3

package/dist/scm-panel.html

@@ -699,7 +699,7 @@
           changes: "Changes",
           graph: "Graph",
           message: "Message (⌘Enter to commit)",
-          commit: "Commit",
+          commit: "Commit Manually",
           aiCommit: "Ask {finchName} to commit",
           aiCommitAnnotationTitle: "{finchName} will commit",
           aiCommitNote: "Commit the current Git changes.",
@@ -734,7 +734,7 @@
           changes: "更改",
           graph: "图表",
           message: "消息（⌘Enter 提交）",
-          commit: "提交",
+          commit: "由人类提交",
           aiCommit: "让{finchName}提交",
           aiCommitAnnotationTitle: "{finchName}来提交",
           aiCommitNote: "提交当前 Git 改动。",

package/dist/scm-panel.js

@@ -144,6 +144,9 @@ 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 = '';
@@ -182,12 +185,12 @@ export function activateScmPanel(ctx) {
         // 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 setScope = async (message) => {
+            // A Panel belongs to the Session that opened it. Its bridged finch:env cwd
+            // remains the only reliable scope after switching other Spaces/Sessions;
+            // ctx.workspace describes the globally active workspace and can belong to
+            // a different Session by the time this callback runs.
+            const nextCwd = typeof message.cwd === 'string' ? message.cwd : '';
             const nextScopeKey = typeof message.scopeKey === 'string' ? message.scopeKey : (scopeKey || nextCwd);
             if (nextScopeKey === scopeKey && nextCwd === cwd)
                 return false;
@@ -265,12 +268,12 @@ export function activateScmPanel(ctx) {
                         return;
                     }
                     if (message.type === 'refresh') {
-                        await setScope(message, true);
+                        await setScope(message);
                         await refresh(message.silent !== true);
                         return;
                     }
                     if (message.type === 'syncWorkspace') {
-                        const changed = await setScope(message, true);
+                        const changed = await setScope(message);
                         await sendConfig();
                         if (changed || repos.length === 0)
                             await refresh();
@@ -324,16 +327,13 @@ export function activateScmPanel(ctx) {
                         const text = String(result.values?.message ?? '').trim();
                         if (!text)
                             return;
-                        // 提交由人类在自己的终端手动执行，扩展只生成命令，不再自动 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' },
-                            ],
-                        });
+                        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);

package/i18n/en-US.json

@@ -59,9 +59,6 @@
   "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

@@ -59,9 +59,6 @@
   "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,6 +1,6 @@
 {
   "name": "finch-git-branch",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Git Source Control for Finch Composer toolbar.",
   "author": {
     "name": "Finch Team",