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

package/README.md

@@ -7,13 +7,14 @@ Co-Authored-By: <model> <noreply@pi.dev>
 Generated-By: pi <version>
 ```
 
-实现：session 级临时 `core.hooksPath` + `prepare-commit-msg`；结束时清理。
+实现：识别 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;
 }
 
@@ -20,7 +21,10 @@ export function removeCommitHookDirectory(hooksDir: string | undefined): void {
 	rmSync(hooksDir, { recursive: true, force: true });
 }
 
-/** Add process-local Git hook configuration and trailer metadata to a bash command. */
+/**
+ * 用外部 runner 包裹 git commit：其他改写器只能看到不可拆的 wrapper 调用，
+ * 不会二次解析内部 shell；元数据经环境变量传入，命令作为单个引号参数。
+ */
 export function wrapBashWithCommitHook(
 	cmd: string,
 	hooksDir: string,
@@ -29,33 +33,142 @@ export function wrapBashWithCommitHook(
 ): string {
 	const coAuthor = `${CO_AUTHOR_NAME}: ${modelName} <noreply@pi.dev>`;
 	const generatedBy = `${GENERATED_BY_NAME}: pi ${piVersion}`;
+	const runPath = join(hooksDir, "run");
 
-	return `${buildEnvironmentPrefix(hooksDir, coAuthor, generatedBy)}\n${cmd}`;
+	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 {
-	return `__pi_co_authored_by_git_config_index="\${GIT_CONFIG_COUNT:-0}"
-export PI_CO_AUTHORED_BY_GIT_CONFIG_INDEX="$__pi_co_authored_by_git_config_index"
-export PI_CO_AUTHORED_BY_CO_AUTHOR=${shellQuote(coAuthor)}
-export PI_CO_AUTHORED_BY_GENERATED_BY=${shellQuote(generatedBy)}
-export "GIT_CONFIG_KEY_\${__pi_co_authored_by_git_config_index}=core.hooksPath"
-export "GIT_CONFIG_VALUE_\${__pi_co_authored_by_git_config_index}=${escapeDoubleQuotedAssignmentValue(hooksDir)}"
-export GIT_CONFIG_COUNT="$((__pi_co_authored_by_git_config_index + 1))"
-unset __pi_co_authored_by_git_config_index`;
+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=""
+
+__pi_co_authored_by_resolve_hooks_dir() {
+  local configured hooks_dir toplevel
+  configured="$(command git config --get core.hooksPath 2>/dev/null || true)"
+  if [ -n "$configured" ]; then
+    case "$configured" in
+      /*) hooks_dir="$configured" ;;
+      *)
+        toplevel="$(command git rev-parse --show-toplevel 2>/dev/null)" || return 1
+        hooks_dir="$toplevel/$configured"
+        ;;
+    esac
+  else
+    hooks_dir="$(command git rev-parse --git-path hooks 2>/dev/null)" || return 1
+  fi
+  # 绝对路径，避免 cwd 变化后 cleanup 找不到
+  case "$hooks_dir" in
+    /*) ;;
+    *) hooks_dir="$(CDPATH= cd -- "$hooks_dir" 2>/dev/null && pwd)" || return 1 ;;
+  esac
+  printf '%s' "$hooks_dir"
+}
+
+# 清掉已死进程的 ref，避免 SIGKILL 后永远占坑
+__pi_co_authored_by_prune_refs() {
+  local refs_dir="$1" f pid
+  [ -d "$refs_dir" ] || return 0
+  for f in "$refs_dir"/*; do
+    [ -e "$f" ] || continue
+    pid="\${f##*/}"
+    case "$pid" in
+      ''|*[!0-9]*) rm -f "$f" ;;
+      *) kill -0 "$pid" 2>/dev/null || rm -f "$f" ;;
+    esac
+  done
+}
+
+# 登记本 shell 对 hooks_dir 的引用（见 marker 也要登记，否则 sticky dirty）
+__pi_co_authored_by_register() {
+  local hooks_dir="$1" refs_dir
+  refs_dir="$hooks_dir/.pi-co-authored-by-refs"
+  mkdir -p "$refs_dir" 2>/dev/null || return 0
+  __pi_co_authored_by_prune_refs "$refs_dir"
+  : > "$refs_dir/$$" 2>/dev/null || return 0
+  case "
+$__pi_co_authored_by_installed_hooks
+" in
+    *"
+$hooks_dir
+"*) ;;
+    *)
+      __pi_co_authored_by_installed_hooks="$__pi_co_authored_by_installed_hooks
+$hooks_dir"
+      ;;
+  esac
+}
+
+__pi_co_authored_by_ensure_hook() {
+  local hooks_dir hook
+  hooks_dir="$(__pi_co_authored_by_resolve_hooks_dir)" || return 0
+  hook="$hooks_dir/prepare-commit-msg"
+  mkdir -p "$hooks_dir" 2>/dev/null || return 0
+
+  if [ -f "$hook" ] && grep -q 'PI_CO_AUTHORED_BY_HOOK_MARKER' "$hook" 2>/dev/null; then
+    __pi_co_authored_by_register "$hooks_dir"
+    return 0
+  fi
+
+  if [ -e "$hook" ] && [ ! -e "$hooks_dir/prepare-commit-msg.pi-user" ]; then
+    mv "$hook" "$hooks_dir/prepare-commit-msg.pi-user"
+  fi
+
+  cp "$PI_CO_AUTHORED_BY_HOOK_SRC" "$hook"
+  chmod +x "$hook"
+  __pi_co_authored_by_register "$hooks_dir"
+}
+
+__pi_co_authored_by_cleanup() {
+  local hooks_dir hook refs_dir
+  printf '%s\n' "$__pi_co_authored_by_installed_hooks" | while IFS= read -r hooks_dir; do
+    [ -n "$hooks_dir" ] || continue
+    refs_dir="$hooks_dir/.pi-co-authored-by-refs"
+    rm -f "$refs_dir/$$" 2>/dev/null || true
+    __pi_co_authored_by_prune_refs "$refs_dir"
+    # 仍有活进程占用：只退自己的 ref，不卸 hook
+    if [ -n "$(ls -A "$refs_dir" 2>/dev/null)" ]; then
+      continue
+    fi
+    rmdir "$refs_dir" 2>/dev/null || true
+    hook="$hooks_dir/prepare-commit-msg"
+    if [ -f "$hook" ] && grep -q 'PI_CO_AUTHORED_BY_HOOK_MARKER' "$hook" 2>/dev/null; then
+      rm -f "$hook"
+      if [ -e "$hooks_dir/prepare-commit-msg.pi-user" ]; then
+        mv "$hooks_dir/prepare-commit-msg.pi-user" "$hook"
+      fi
+    fi
+  done
+}
+
+trap '__pi_co_authored_by_cleanup' EXIT
+__pi_co_authored_by_ensure_hook
+
+git() {
+  __pi_co_authored_by_ensure_hook
+  command git "$@"
+}
+
+eval "$1"
+`;
 }
 
 function buildPrepareCommitMsgHook(): string {
 	return `#!/bin/sh
+# PI_CO_AUTHORED_BY_HOOK_MARKER
 set -u
 
 message_file="$1"
 
 if [ -n "\${PI_CO_AUTHORED_BY_CO_AUTHOR:-}" ] && [ -n "\${PI_CO_AUTHORED_BY_GENERATED_BY:-}" ]; then
-  git \
+  command git \
     -c trailer.co-authored-by.ifExists=addIfDifferent \
     -c trailer.generated-by.ifExists=replace \
     interpret-trailers \
@@ -65,25 +178,10 @@ if [ -n "\${PI_CO_AUTHORED_BY_CO_AUTHOR:-}" ] && [ -n "\${PI_CO_AUTHORED_BY_GENE
     "$message_file"
 fi
 
-if [ -n "\${PI_CO_AUTHORED_BY_GIT_CONFIG_INDEX:-}" ]; then
-  __pi_config_index="$PI_CO_AUTHORED_BY_GIT_CONFIG_INDEX"
-  unset "GIT_CONFIG_KEY_$__pi_config_index"
-  unset "GIT_CONFIG_VALUE_$__pi_config_index"
-  export GIT_CONFIG_COUNT="$__pi_config_index"
-fi
-
-original_hooks_path="$(git config --get core.hooksPath || true)"
-if [ -n "$original_hooks_path" ]; then
-  case "$original_hooks_path" in
-    /*) original_hook="$original_hooks_path/prepare-commit-msg" ;;
-    *) original_hook="$(git rev-parse --show-toplevel)/$original_hooks_path/prepare-commit-msg" ;;
-  esac
-else
-  original_hook="$(git rev-parse --git-path hooks/prepare-commit-msg)"
-fi
-
-if [ -x "$original_hook" ] && [ "$original_hook" != "$0" ]; then
-  "$original_hook" "$@"
+hooks_dir="$(dirname "$0")"
+user_hook="$hooks_dir/prepare-commit-msg.pi-user"
+if [ -x "$user_hook" ]; then
+  "$user_hook" "$@"
 fi
 `;
 }
@@ -91,7 +189,3 @@ fi
 function shellQuote(value: string): string {
 	return `'${value.replace(/'/g, `'\\''`)}'`;
 }
-
-function escapeDoubleQuotedAssignmentValue(value: string): string {
-	return value.replace(/[\\"$`]/g, "\\$&");
-}

package/package.json

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