@shelken/pi-co-authored-by 0.2.9 → 0.2.10

package/README.md

@@ -7,13 +7,14 @@ Co-Authored-By: <model> <noreply@pi.dev>
 Generated-By: pi <version>
 ```
 
-实现：bash 期间在真实 hooks 目录临时安装 `prepare-commit-msg`（不改 `core.hooksPath`）；pid 引用计数，shell 退出时最后一个引用卸装并恢复原 hook。
+实现：识别 bash 命令中直接执行的 `git commit`（支持常见前缀与组合，脚本内间接 commit 不算），将命令交给外部 runner 在真实 hooks 目录临时安装 `prepare-commit-msg`（不改 `core.hooksPath`）；pid 引用计数，shell 退出时最后一个引用卸装并恢复原 hook。非 commit 命令原样放行，不影响其他扩展。
 
 初始 fork 自 [bruno-garcia/pi-co-authored-by](https://github.com/bruno-garcia/pi-co-authored-by)。
 
 ## 功能
 
 - 只挂钩 `bash` 工具调用
+- 只处理直接执行的 `git commit`；`printf`、`git status`、脚本内 commit 等一律不改
 - 模型名取当前 session；没有则 `unknown`
 - 与仓库已有 hook 兼容（先跑临时 hook，再链式原 hook）
 

package/index.ts

@@ -5,6 +5,7 @@ import {
 	removeCommitHookDirectory,
 	wrapBashWithCommitHook,
 } from "./lib/commit.ts";
+import { isGitCommitCommand } from "./lib/git-commit.ts";
 
 export default function (pi: ExtensionAPI) {
 	let hooksDir: string | undefined;
@@ -25,6 +26,8 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("tool_call", async (event, ctx) => {
 		if (!isToolCallEventType("bash", event)) return;
+		// 只包装直接执行的 git commit；其他命令原样放行，避免影响其他扩展
+		if (!isGitCommitCommand(event.input.command)) return;
 
 		const model = ctx.model;
 		const modelName = model ? (model.name || `${model.provider}/${model.id}`) : "unknown";

package/lib/commit.ts

@@ -1,4 +1,4 @@
-import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
@@ -8,9 +8,10 @@ export const GENERATED_BY_NAME = "Generated-By";
 /** Create a session-scoped Git hooks directory for commit trailer injection. */
 export function createCommitHookDirectory(): string {
 	const hooksDir = mkdtempSync(join(tmpdir(), "pi-co-authored-by-hooks-"));
-	const hookPath = join(hooksDir, "prepare-commit-msg");
-	writeFileSync(hookPath, buildPrepareCommitMsgHook(), { mode: 0o755 });
-	chmodSync(hookPath, 0o755);
+	writeFileSync(join(hooksDir, "prepare-commit-msg"), buildPrepareCommitMsgHook(), {
+		mode: 0o755,
+	});
+	writeFileSync(join(hooksDir, "run"), buildRunnerScript(), { mode: 0o755 });
 	return hooksDir;
 }
 
@@ -21,8 +22,8 @@ export function removeCommitHookDirectory(hooksDir: string | undefined): void {
 }
 
 /**
- * 注入 trailer 元数据，并在当前仓库临时安装 prepare-commit-msg。
- * 不设置 core.hooksPath，避免污染 git config；shell 退出时恢复原 hook。
+ * 用外部 runner 包裹 git commit：其他改写器只能看到不可拆的 wrapper 调用，
+ * 不会二次解析内部 shell；元数据经环境变量传入，命令作为单个引号参数。
  */
 export function wrapBashWithCommitHook(
 	cmd: string,
@@ -32,19 +33,20 @@ export function wrapBashWithCommitHook(
 ): string {
 	const coAuthor = `${CO_AUTHOR_NAME}: ${modelName} <noreply@pi.dev>`;
 	const generatedBy = `${GENERATED_BY_NAME}: pi ${piVersion}`;
-
-	return `${buildEnvironmentPrefix(hooksDir, coAuthor, generatedBy)}\n${cmd}`;
+	const runPath = join(hooksDir, "run");
+
+	return [
+		`PI_CO_AUTHORED_BY_CO_AUTHOR=${shellQuote(coAuthor)}`,
+		`PI_CO_AUTHORED_BY_GENERATED_BY=${shellQuote(generatedBy)}`,
+		shellQuote(runPath),
+		shellQuote(cmd),
+	].join(" ");
 }
 
-function buildEnvironmentPrefix(
-	hooksDir: string,
-	coAuthor: string,
-	generatedBy: string,
-): string {
-	const hookSrc = join(hooksDir, "prepare-commit-msg");
-	return `export PI_CO_AUTHORED_BY_CO_AUTHOR=${shellQuote(coAuthor)}
-export PI_CO_AUTHORED_BY_GENERATED_BY=${shellQuote(generatedBy)}
-export PI_CO_AUTHORED_BY_HOOK_SRC=${shellQuote(hookSrc)}
+function buildRunnerScript(): string {
+	return `#!/bin/bash
+# PI_CO_AUTHORED_BY_RUNNER
+export PI_CO_AUTHORED_BY_HOOK_SRC="$(dirname "$0")/prepare-commit-msg"
 
 __pi_co_authored_by_installed_hooks=""
 
@@ -152,7 +154,10 @@ __pi_co_authored_by_ensure_hook
 git() {
   __pi_co_authored_by_ensure_hook
   command git "$@"
-}`;
+}
+
+eval "$1"
+`;
 }
 
 function buildPrepareCommitMsgHook(): string {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelken/pi-co-authored-by",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "agent 执行 git commit 时自动追加 Co-Authored-By / Generated-By trailer",
   "type": "module",
   "license": "MIT",