finch-git-branch 0.2.9 → 0.2.11

package/dist/index.js

@@ -4,12 +4,17 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
 const CURRENT_BRANCH_KEY = 'currentBranch';
-const FINCH_CODE_CO_AUTHOR = 'Co-authored-by: finch-code <noreply@finchwork.app>';
+const CO_AUTHOR_ENABLED_KEY = 'coAuthorEnabled';
+const FINCH_CODE_EMAIL = 'noreply@finchwork.app';
 // Tracks the most-recently-seen cwd so the background poller can use it.
 let activeCwd;
 function readIconSvg(name) {
     return readFileSync(new URL(`../icons/${name}.svg`, import.meta.url), 'utf-8');
 }
+async function getCoAuthorTrailer(ctx) {
+    const { assistantName } = await ctx.app.getInfo();
+    return `Co-authored-by: ${assistantName} <${FINCH_CODE_EMAIL}>`;
+}
 // ── Git helpers ──────────────────────────────────────────────────────────────
 async function git(cwd, args, timeout = 5000) {
     const { stdout } = await execFileAsync('git', ['-C', cwd, ...args], {
@@ -123,6 +128,7 @@ export function activate(ctx) {
     ctx.subscriptions.push(ctx.icons.register('git-branch', {
         plus: { svg: readIconSvg('plus'), description: 'Create branch' },
         'plus-circle': { svg: readIconSvg('plus-circle'), description: 'Create branch' },
+        handshake: { svg: readIconSvg('handshake'), description: 'Include Finch Code co-author' },
     }));
     const composerAction = ctx.composerActions.register('git-branch', {
         async getBadge({ cwd }) {
@@ -139,6 +145,12 @@ export function activate(ctx) {
             }
             return await ctx.storage.get(CURRENT_BRANCH_KEY);
         },
+        async getReminder({ cwd, surface }) {
+            if (surface === 'home' || !cwd || !isGitRepo(cwd) || (await ctx.storage.get(CO_AUTHOR_ENABLED_KEY)) !== true) {
+                return undefined;
+            }
+            return `When creating any Git commit, append a blank line followed by the exact trailer: ${await getCoAuthorTrailer(ctx)}`;
+        },
         async getMenu({ cwd }) {
             if (!cwd)
                 return [];
@@ -165,7 +177,19 @@ export function activate(ctx) {
                     if (desc)
                         pinnedDiffs.set(b, desc);
                 }));
-                const items = [];
+                const coAuthorEnabled = await ctx.storage.get(CO_AUTHOR_ENABLED_KEY) === true;
+                const { assistantName } = await ctx.app.getInfo();
+                const items = [{
+                        id: '__toggle_co_author__',
+                        label: ctx.i18n.t('git.branch.coauthor.label', { finchName: assistantName }),
+                        description: ctx.i18n.t(coAuthorEnabled ? 'git.branch.coauthor.on' : 'git.branch.coauthor.off'),
+                        current: coAuthorEnabled,
+                        iconName: 'ext:git-branch/handshake',
+                    }, {
+                        id: '__coauthor_sep__',
+                        label: '',
+                        separator: true,
+                    }];
                 items.push({
                     id: currentBranch,
                     label: currentBranch,
@@ -223,6 +247,18 @@ export function activate(ctx) {
         async execute({ cwd }, itemId, actions) {
             if (!cwd || !itemId)
                 return;
+            if (itemId === '__toggle_co_author__') {
+                const enabled = await ctx.storage.get(CO_AUTHOR_ENABLED_KEY) === true;
+                const next = !enabled;
+                await ctx.storage.set(CO_AUTHOR_ENABLED_KEY, next);
+                await ctx.ui.showToast({
+                    title: ctx.i18n.t(next ? 'git.branch.coauthor.tip.on' : 'git.branch.coauthor.tip.off'),
+                    variant: next ? 'success' : 'info',
+                    position: 'TC',
+                });
+                composerAction.notifyUpdate();
+                return;
+            }
             // ── Create branch: 直接填入 Prompt ────────────────────────────
             if (itemId === '__create_branch__') {
                 await actions.fillComposer(ctx.i18n.t('git.branch.create.prompt'));
@@ -253,8 +289,9 @@ export function activate(ctx) {
                     await git(cwd, [
                         'commit', '-m',
                         ctx.i18n.t('git.branch.switch.commit.msg', { branch: itemId }),
-                        '-m',
-                        FINCH_CODE_CO_AUTHOR,
+                        ...(await ctx.storage.get(CO_AUTHOR_ENABLED_KEY) === true
+                            ? ['-m', await getCoAuthorTrailer(ctx)]
+                            : []),
                     ]);
                     checkpointCommit = await git(cwd, ['rev-parse', '--short', 'HEAD']).catch(() => undefined);
                 }
@@ -341,8 +378,9 @@ export function activate(ctx) {
                 await git(cwd, [
                     'commit', '-m',
                     `checkpoint: before creating branch ${branchName}`,
-                    '-m',
-                    FINCH_CODE_CO_AUTHOR,
+                    ...(await ctx.storage.get(CO_AUTHOR_ENABLED_KEY) === true
+                        ? ['-m', await getCoAuthorTrailer(ctx)]
+                        : []),
                 ]);
             }
             await git(cwd, ['checkout', '-b', branchName], 10_000);

package/i18n/en-US.json

@@ -1,7 +1,7 @@
 {
   "name": "Git Branch",
   "description": "Manage Git branches 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. When you create any Git commit, always append a blank line followed by the exact trailer: Co-authored-by: finch-code <noreply@finchwork.app>.",
+  "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"
   },
@@ -11,6 +11,11 @@
     }
   },
 
+  "git.branch.coauthor.label": "Include {finchName} as code co-author",
+  "git.branch.coauthor.on": "On",
+  "git.branch.coauthor.off": "Off",
+  "git.branch.coauthor.tip.on": "Code Co-authored enabled, takes effect in a new session",
+  "git.branch.coauthor.tip.off": "Code Co-authored disabled, takes effect in a new session",
   "git.branch.changes": "{count} changes",
   "git.branch.more": "More branches",
   "git.branch.more.group": "Branches",

package/i18n/zh-CN.json

@@ -1,7 +1,7 @@
 {
   "name": "Git 分支",
   "description": "在对话框里管理 Git 分支的小工具",
-  "systemPrompt": "当需要创建 Git 分支时，使用 create_git_branch 工具。已确定分支名时传入 branchName 参数以静默创建并检出；否则省略该参数以弹出表单收集分支名。创建任何 Git 提交时，必须在提交信息末尾空一行，并追加完全一致的 trailer：Co-authored-by: finch-code <noreply@finchwork.app>。",
+  "systemPrompt": "当需要创建 Git 分支时，使用 create_git_branch 工具。已确定分支名时传入 branchName 参数以静默创建并检出；否则省略该参数以弹出表单收集分支名。",
   "toolMeta": {
     "name": "Git 分支"
   },
@@ -11,6 +11,11 @@
     }
   },
 
+  "git.branch.coauthor.label": "包含 {finchName} 作为代码协作者",
+  "git.branch.coauthor.on": "已开启",
+  "git.branch.coauthor.off": "已关闭",
+  "git.branch.coauthor.tip.on": "Code Co-authored 已开启，开启新会话生效",
+  "git.branch.coauthor.tip.off": "Code Co-authored 已关闭，开启新会话生效",
   "git.branch.changes": "{count} 个改动",
   "git.branch.more": "更多分支",
   "git.branch.more.group": "分支",

package/icons/handshake.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-handshake-icon lucide-handshake"><path d="m11 17 2 2a1 1 0 1 0 3-3"/><path d="m14 14 2.5 2.5a1 1 0 1 0 3-3l-3.88-3.88a3 3 0 0 0-4.24 0l-.88.88a1 1 0 1 1-3-3l2.81-2.81a5.79 5.79 0 0 1 7.06-.87l.47.28a2 2 0 0 0 1.42.25L21 4"/><path d="m21 3 1 11h-2"/><path d="M3 3 2 14l6.5 6.5a1 1 0 1 0 3-3"/><path d="M3 4h8"/></svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "finch-git-branch",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Git Branch Manager for Finch Composer toolbar.",
   "author": {
     "name": "Finch Team",
@@ -23,7 +23,7 @@
     "id": "git-branch",
     "name": "Git Branch",
     "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. When you create any Git commit, always append a blank line followed by the exact trailer: Co-authored-by: finch-code <noreply@finchwork.app>.",
+    "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",
     "activationEvents": [
       "onStartup"