@zhushanwen/pi-base-tool-enhance 0.7.1 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-base-tool-enhance",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Base tool enhancement - override builtin bash tool: foreground delegates to pi official factory, incremental background mode (design decisions documented in source comments)",
   "type": "module",
   "main": "src/index.ts",
@@ -28,11 +28,11 @@
     "skills/"
   ],
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.16.0",
+    "@zhushanwen/extension-protocol": "0.17.0",
     "@zhushanwen/pi-ext-guards": "0.4.2",
     "@zhushanwen/pi-extension-logger": "0.6.1",
     "@zhushanwen/pi-file-lock": "0.4.1",
-    "@zhushanwen/pi-llm-shared": "0.10.1"
+    "@zhushanwen/pi-llm-shared": "0.11.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.9",
@@ -41,7 +41,7 @@
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.4",
     "typebox": "*",
-    "@zhushanwen/pi-pending-notifications": "0.8.0"
+    "@zhushanwen/pi-pending-notifications": "0.8.1"
   },
   "peerDependenciesMeta": {
     "@zhushanwen/pi-pending-notifications": {

package/src/__tests__/command-display.test.ts

@@ -0,0 +1,27 @@
+// src/__tests__/command-display.test.ts
+//
+// truncateCommand 单源实现的输出等价锚（plan-mode-audit-remediation 批次 3
+// 活路径去重组：原 spawn-background.ts / notify.ts 两份同构定义去重留一份）。
+// 断言即两份旧副本共同产出的输出形态：
+//  - ≤80 字符（含恰好 80）原样返回
+//  - >80 取前 80 字符 + 单个省略号（总长 81，与 notify.test.ts 的 emit 路径断言一致）
+import { describe, expect, it } from "vitest";
+
+import { COMMAND_DISPLAY_LIMIT, truncateCommand } from "../background/command-display";
+
+describe("truncateCommand（单源，原双份定义的输出等价锚）", () => {
+	it("short command returned as-is", () => {
+		expect(truncateCommand("pnpm test")).toBe("pnpm test");
+	});
+
+	it(`command of exactly ${COMMAND_DISPLAY_LIMIT} chars not truncated (boundary: length > limit)`, () => {
+		const exact = "c".repeat(COMMAND_DISPLAY_LIMIT);
+		expect(truncateCommand(exact)).toBe(exact);
+	});
+
+	it("long command truncated to first 80 chars + single ellipsis (total 81)", () => {
+		const long = `echo ${"x".repeat(200)}`;
+		expect(truncateCommand(long)).toBe(`${long.slice(0, COMMAND_DISPLAY_LIMIT)}…`);
+		expect(truncateCommand(long).length).toBe(COMMAND_DISPLAY_LIMIT + 1);
+	});
+});

package/src/background/command-display.ts

@@ -0,0 +1,18 @@
+/**
+ * 命令文案在错误消息 / 通知中的展示截断（单份实现）。
+ *
+ * 为什么独立成叶子模块：truncateCommand 曾在 spawn-background.ts 与 notify.ts 各留
+ * 一份同构定义——notify 被 spawn-background import（emitPendingRegister），反向 import
+ * 会成环，两份只能靠数值对齐隐式同步。抽到双方共同依赖的叶子模块后环消失，截断
+ * 口径（80 字符 + 省略号）单源。
+ */
+
+/** 命令在错误文案中的展示长度上限。 */
+export const COMMAND_DISPLAY_LIMIT = 80;
+
+/** 超上限取前 80 字符 + 省略号；等长/短命令原样返回。 */
+export function truncateCommand(command: string): string {
+	return command.length > COMMAND_DISPLAY_LIMIT
+		? `${command.slice(0, COMMAND_DISPLAY_LIMIT)}…`
+		: command;
+}

package/src/background/notify.ts

@@ -30,6 +30,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 import { getLogger } from "@zhushanwen/pi-extension-logger";
 
+import { truncateCommand } from "./command-display.ts";
 import type { BackgroundTask, BackgroundTaskEndReason } from "./types.ts";
 
 const logger = getLogger("base-tool-enhance");
@@ -40,24 +41,6 @@ const logger = getLogger("base-tool-enhance");
  */
 export const BACKGROUND_BASH_CUSTOM_TYPE = "background-bash";
 
-/**
- * pending register 的 name 截断长度（§3.5 数据流 ⑤「command 前 80 字符」）。
- * 与 spawn-background COMMAND_DISPLAY_LIMIT 同值但刻意不共享 import——notify 被
- * spawn-background import，反向 import 会造成 spawn ↔ notify 循环依赖；两处语义
- * （pending 列表展示 / 错误文案展示）各自独立演化，仅数值对齐。
- */
-const PENDING_NAME_LIMIT = 80;
-
-/**
- * 命令文案截断（pending register 的 name 与完成通知 head 行共用同一口径）：
- * 超 PENDING_NAME_LIMIT 取前 80 字符 + 省略号。
- */
-function truncateCommand(command: string): string {
-	return command.length > PENDING_NAME_LIMIT
-		? `${command.slice(0, PENDING_NAME_LIMIT)}…`
-		: command;
-}
-
 /** 模块级「当前 pi 引用」（D17 核心可变状态，见文件头）。 */
 let currentPi: ExtensionAPI | undefined;
 
@@ -249,7 +232,7 @@ export interface BackgroundBashDetails {
  * 完成通知 details（D1）：终态字段与 buildNotificationContent 同源——durationMs
  * 同用 `?? 0` 归一（终态条目必已物化，缺省仅防御）。
  *
- * command 取原始终态值不截断：截断（PENDING_NAME_LIMIT）是 content 行宽约束，结构化
+ * command 取原始终态值不截断：截断（COMMAND_DISPLAY_LIMIT）是 content 行宽约束，结构化
  * 消费方的行宽由渲染层自己决定（旧数据无 details 时仍走 content 原文兜底）。
  */
 export function buildNotifyDetails(task: NotificationTaskLike): BackgroundBashDetails {

package/src/background/spawn-background.ts

@@ -21,6 +21,7 @@ import { getProcessStartTimeSec, killProcessTree, pidStartMatchesRegistered } fr
 import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 import { getLogger } from "@zhushanwen/pi-extension-logger";
 
+import { truncateCommand } from "./command-display.ts";
 import { emitPendingRegister } from "./notify.ts";
 import { ensurePollerRunning } from "./poller.ts";
 import { getRegistryPath, taskToRegistryEntry, writeRegistryEntry } from "./registry.ts";
@@ -50,9 +51,6 @@ const TASK_ID_RAND_LENGTH = 6;
 const TASK_ID_RADIX = 36;
 const TASK_ID_RAND_SPACE = TASK_ID_RADIX ** TASK_ID_RAND_LENGTH;
 
-/** 命令在错误文案中的展示长度上限。 */
-const COMMAND_DISPLAY_LIMIT = 80;
-
 /**
  * task_id 生成：`bt-<ts>-<rand>`（前缀 bt- 刻意区别于 subagent-workflow 的
  * bg-/run-，§2.3）。**禁止进程内自增序列**——pi 重启后撞旧 id 会破坏 pending
@@ -290,9 +288,3 @@ function accessOrThrow(cwd: string): void {
 	// 独立小函数：保持与内置 fsAccess(constants.F_OK) 语义一致的同步版本
 	accessSync(cwd, constants.F_OK);
 }
-
-export function truncateCommand(command: string): string {
-	return command.length > COMMAND_DISPLAY_LIMIT
-		? `${command.slice(0, COMMAND_DISPLAY_LIMIT)}…`
-		: command;
-}

package/src/bash-output-tool.ts

@@ -17,9 +17,9 @@ import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { readOutputTail } from "@zhushanwen/extension-protocol/background-task";
 import { Type } from "typebox";
 
+import { truncateCommand } from "./background/command-display.ts";
 import { TAIL_MAX_BYTES, TAIL_MAX_LINES } from "./background/output-tail.ts";
 import { getRegistryPath, readRegistry } from "./background/registry.ts";
-import { truncateCommand } from "./background/spawn-background.ts";
 import { getAllTasks } from "./background/task-store.ts";
 import { isTerminalState, type BackgroundTask, type RegistryEntry } from "./background/types.ts";
 

package/src/bash-tool.ts

@@ -19,11 +19,8 @@ import type { AgentToolUpdateCallback, BashToolDetails, ExtensionContext } from
 import { createBashToolDefinition, getAgentDir } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import {
-	resolveBackgroundTimeoutSec,
-	spawnBackgroundTask,
-	truncateCommand,
-} from "./background/spawn-background.ts";
+import { truncateCommand } from "./background/command-display.ts";
+import { resolveBackgroundTimeoutSec, spawnBackgroundTask } from "./background/spawn-background.ts";
 import { isSubagentProcess } from "./background/subagent-guard.ts";
 import { loadBaseToolEnhanceConfig, type BaseToolEnhanceConfig } from "./config.ts";
 import { compileForcePatterns, describeForceMatch, matchForceBackground } from "./force-patterns.ts";