@shelken/pi-co-authored-by 0.2.12 → 0.2.13

package/package.json

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

package/src/commit.ts

@@ -30,9 +30,15 @@ export function wrapBashWithCommitHook(
 	hooksDir: string,
 	modelName: string,
 	piVersion: string,
+	options?: {
+		generatorName?: string;
+		coAuthorEmail?: string;
+	},
 ): string {
-	const coAuthor = `${CO_AUTHOR_NAME}: ${modelName} <noreply@pi.dev>`;
-	const generatedBy = `${GENERATED_BY_NAME}: pi ${piVersion}`;
+	const generatorName = options?.generatorName || "pi";
+	const email = options?.coAuthorEmail || "noreply@pi.dev";
+	const coAuthor = `${CO_AUTHOR_NAME}: ${modelName} <${email}>`;
+	const generatedBy = `${GENERATED_BY_NAME}: ${generatorName} ${piVersion}`;
 	const runPath = join(hooksDir, "run");
 
 	return [

package/src/config.ts

@@ -0,0 +1,54 @@
+import { execFileSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
+export const DEFAULT_CO_AUTHOR_EMAIL = "noreply@pi.dev";
+
+export function resolveGeneratorName(configDirName?: string | null): "omp" | "pi" {
+	return configDirName === ".omp" ? "omp" : "pi";
+}
+
+/**
+ * 从宿主 agent 目录读取配置邮箱。
+ * agentDir 由宿主 API（getAgentDir()）注入，绝不自行拼接硬编码宿主路径。
+ * 任何缺失或解析失败均平滑回退默认邮箱，不抛错。
+ */
+export function resolveCoAuthorEmail(
+	configDirName: string | null | undefined,
+	agentDir: string,
+): string {
+	const envEmail = process.env.PI_CO_AUTHORED_BY_EMAIL || process.env.CO_AUTHORED_BY_EMAIL;
+	if (envEmail?.trim()) return envEmail.trim();
+
+	const filename =
+		configDirName === ".omp" ? "config.yml" : configDirName === ".pi" ? "settings.json" : null;
+	if (!filename) return DEFAULT_CO_AUTHOR_EMAIL;
+
+	try {
+		const text = readFileSync(join(agentDir, filename), "utf8");
+		const match = text.match(/coAuthor[\s\S]*?email["':\s]+([^\s"',}]+)/);
+		return match?.[1]?.trim() || DEFAULT_CO_AUTHOR_EMAIL;
+	} catch {
+		return DEFAULT_CO_AUTHOR_EMAIL;
+	}
+}
+
+export function resolveHostVersion(
+	generatorName: "omp" | "pi",
+	fallbackVersion: string,
+	execFn?: (cmd: string) => string,
+): string {
+	try {
+		const raw = execFn
+			? execFn(generatorName)
+			: execFileSync(generatorName, ["--version"], {
+					encoding: "utf8",
+					timeout: 1500,
+					stdio: ["ignore", "pipe", "ignore"],
+				});
+		const match = raw.match(/([0-9]+\.[0-9]+(?:\.[0-9]+[^\s]*)?)/);
+		return match?.[1] || fallbackVersion;
+	} catch {
+		return fallbackVersion;
+	}
+}

package/src/index.ts

@@ -1,14 +1,16 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { isToolCallEventType, VERSION } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME, getAgentDir, isToolCallEventType, VERSION } from "@earendil-works/pi-coding-agent";
 import {
 	createCommitHookDirectory,
 	removeCommitHookDirectory,
 	wrapBashWithCommitHook,
 } from "./commit.ts";
+import { resolveCoAuthorEmail, resolveGeneratorName, resolveHostVersion } from "./config.ts";
 import { isGitCommitCommand } from "./git-commit.ts";
 
 export default function (pi: ExtensionAPI) {
 	let hooksDir: string | undefined;
+	let cachedHostVersion: string | undefined;
 
 	function ensureHooksDir(): string {
 		hooksDir ??= createCommitHookDirectory();
@@ -21,6 +23,7 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_shutdown", async () => {
 		removeCommitHookDirectory(hooksDir);
+		cachedHostVersion = undefined;
 		hooksDir = undefined;
 	});
 
@@ -32,11 +35,19 @@ export default function (pi: ExtensionAPI) {
 		const model = ctx.model;
 		const modelName = model ? (model.name || `${model.provider}/${model.id}`) : "unknown";
 
+		const generatorName = resolveGeneratorName(CONFIG_DIR_NAME);
+		const coAuthorEmail = resolveCoAuthorEmail(CONFIG_DIR_NAME, getAgentDir());
+		cachedHostVersion ??= resolveHostVersion(generatorName, VERSION);
+
 		event.input.command = wrapBashWithCommitHook(
 			event.input.command,
 			ensureHooksDir(),
 			modelName,
-			VERSION,
+			cachedHostVersion,
+			{
+				generatorName,
+				coAuthorEmail,
+			},
 		);
 	});
 }