@trim21/personal-pi-extensions 0.1.451 → 0.1.452

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.451",
+  "version": "0.1.452",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/aft/bridge.ts

@@ -17,11 +17,13 @@ import {
   readConfigTiers,
   resolveCortexKitConfigPaths,
   resolveCortexKitStorageRoot,
+  setActiveLogger,
   timeoutForCommand,
 } from "@cortexkit/aft-bridge";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import type { SemanticRemote } from "./config.js";
+import { bridgeLogger } from "./logger.js";
 
 /** Pi 会话 ID：Rust 侧用它做 session 作用域（undo/checkpoint），感知工具可留空。 */
 export function resolveSessionId(extCtx: ExtensionContext): string | undefined {
@@ -78,6 +80,9 @@ export const SEMANTIC_API_KEY_ENV = "AFT_SEMANTIC_API_KEY";
  * 两者都缺省时不注入任何凭据（无鉴权端点直接可用）。
  */
 export async function createAftPool(cwd: string, semantic?: SemanticRemote): Promise<AftPool> {
+  // 必须在任何 bridge 代码运行前注册：不设 logger 时 aft-bridge 会把 child
+  // stderr / 生命周期日志 fallback 到 console.error，raw 输出打进 pi 的 stderr 破坏 TUI。
+  setActiveLogger(bridgeLogger);
   const binaryPath = await resolveAftBinary();
   const paths = resolveCortexKitConfigPaths(cwd);
   const childEnv: Record<string, string> = {
@@ -109,7 +114,7 @@ export async function createAftPool(cwd: string, semantic?: SemanticRemote): Pro
   const pool = await createAftTransportPool({
     harness: "pi",
     binaryPath,
-    poolOptions: { childEnv },
+    poolOptions: { childEnv, logger: bridgeLogger },
     configOverrides: {
       storage_dir: resolveCortexKitStorageRoot(),
       cortexkit_user_config_path: paths.userConfigPath,

package/src/aft/logger.ts

@@ -0,0 +1,117 @@
+/**
+ * AFT 扩展日志：落盘到 agent dir 的 tmp/（<agentDir>/tmp/aft-plugin.log）。
+ *
+ * aft-bridge 会把 aft 子进程的 stderr 逐行转发给 logger；不设置 logger 时它
+ * fallback 到 console.error，raw 文本直接打进 pi 进程的 stderr，破坏 TUI。
+ * 这里用 RotatingLogSink（带轮转的异步追加写）承接，日志只进文件不进终端。
+ */
+
+import { join } from "node:path";
+
+import { RotatingLogSink } from "@cortexkit/aft-bridge";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+
+const TAG = "[aft-pi]";
+const FLUSH_INTERVAL_MS = 500;
+const BUFFER_SIZE_LIMIT = 50;
+
+function logFilePath(): string {
+  return join(getAgentDir(), "tmp", "aft-plugin.log");
+}
+
+function createLogger() {
+  let sink: RotatingLogSink | null = null;
+  let buffer: string[] = [];
+  let flushTimer: ReturnType<typeof setTimeout> | null = null;
+
+  // sink 懒创建：getAgentDir() 读 PI_CODING_AGENT_DIR，测试里先改 env 再触发写入。
+  function getSink(): RotatingLogSink {
+    sink ??= new RotatingLogSink(logFilePath());
+    return sink;
+  }
+
+  function flush(): void {
+    if (buffer.length === 0) return;
+    const data = buffer.join("");
+    buffer = [];
+    try {
+      getSink().append(data);
+    } catch {
+      // 日志绝不抛错
+    }
+  }
+
+  function scheduleFlush(): void {
+    if (flushTimer) return;
+    flushTimer = setTimeout(() => {
+      flushTimer = null;
+      flush();
+    }, FLUSH_INTERVAL_MS);
+    if (typeof flushTimer === "object" && "unref" in flushTimer) {
+      flushTimer.unref();
+    }
+  }
+
+  function write(level: string, message: string, sessionId?: string): void {
+    try {
+      const timestamp = new Date().toISOString();
+      const sessionPrefix = sessionId ? ` [${sessionId}]` : "";
+      buffer.push(`[${timestamp}] ${level} ${TAG}${sessionPrefix} ${message}\n`);
+      if (buffer.length >= BUFFER_SIZE_LIMIT) {
+        flush();
+      } else {
+        scheduleFlush();
+      }
+    } catch {
+      // 日志绝不抛错
+    }
+  }
+
+  return {
+    log: (message: string, sessionId?: string): void => write("INFO", message, sessionId),
+    warn: (message: string, sessionId?: string): void => write("WARN", message, sessionId),
+    error: (message: string, sessionId?: string): void => write("ERROR", message, sessionId),
+    getLogFilePath: logFilePath,
+    drain: async (): Promise<void> => {
+      flush();
+      if (sink) await sink.drain();
+    },
+  };
+}
+
+const logger = createLogger();
+
+export function log(message: string): void {
+  logger.log(message);
+}
+
+export function warn(message: string): void {
+  logger.warn(message);
+}
+
+export function error(message: string): void {
+  logger.error(message);
+}
+
+export function getLogFilePath(): string {
+  return logger.getLogFilePath();
+}
+
+/** aft-bridge 的 Logger 适配：child stderr / bridge 生命周期日志都走这里。 */
+export const bridgeLogger = {
+  log(message: string, meta?: { sessionId?: string }): void {
+    logger.log(message, meta?.sessionId);
+  },
+  warn(message: string, meta?: { sessionId?: string }): void {
+    logger.warn(message, meta?.sessionId);
+  },
+  error(message: string, meta?: { sessionId?: string }): void {
+    logger.error(message, meta?.sessionId);
+  },
+  getLogFilePath: (): string => logger.getLogFilePath(),
+};
+
+/** 立即落盘，供测试与关闭路径使用。 */
+export async function drainLogger(): Promise<void> {
+  await logger.drain();
+}