@yinan_chen/pi-claude-code-ui 0.9.1 → 0.9.2

package/README.md

@@ -29,7 +29,7 @@ pi -e npm:@yinan_chen/pi-claude-code-ui
 - **Claude-style views** — conversation transcript adapter, with Pi native fallback
 - **Sticky message bubble** — pins the user message currently being answered at the top while scrolling; click to jump back (built in since v0.2.0; formerly the sticky-first-message extension)
 - **Skill recollapse** — expanded skill invocations automatically fold back to `/skill:name args`, covering four blind spots such as /tree and /fork backfill (built in since v0.2.0; formerly the skill-block-recollapse extension)
-- **Full third-party renderer takeover** — cards from any extension (including future unmatched ones) render automatically in a unified `● card` style, covering tools / messages / entries at all three layers, zero config and zero adaptation; dispatch-layer interception is unaffected by load order (v0.7.0)
+- **Generic fallback for foreign cards** — messages no renderer claims (no extension registered the customType) are taken over automatically as a unified `● card`, zero config and zero adaptation; extensions that register their own renderer keep it (dispatch-layer interception, unaffected by load order; v0.7.0)
 - **Rich diff rendering** — syntax-highlighted diffs for edit/write tools (vendored, MIT)
 - **Subagent panel** — background agent status at a glance
 - **Working-state hints** — working message / running effect
@@ -103,7 +103,7 @@ You can also edit `~/.pi/agent/lean-tidy.json` directly (when the file doesn't e
 | `resultPrefixGap` | `1` | Spaces between the prefix symbol and content, 0–4. |
 | `normalizeForeignRenderers` | `true` | Rewrite the leading ⎿ of third-party extension output to resultPrefix (unifies the style of any unmatched extension's rendering; turn it off to see the third-party original). |
 | `workflowRendering` ⟳ | `"claude"` | Workflow completion card style: claude = ● Workflow(name) (default); native = keep the bundled card. Dispatch-layer interception, unaffected by package load order. |
-| `foreignCardStyle` | `"generic"` | Cards for unmatched customTypes: generic = take over as a unified `● card` (zero config); symbols = unify symbols only, keep layout. |
+| `foreignCardStyle` | `"generic"` | Cards without their own renderer: generic = take over renderer-less customTypes automatically as a unified `● card` (zero config); symbols = unify symbols only, keep layout. |
 | `foreignCardSkip` | `[]` | customType blocklist never taken over (skip by type when an interactive third-party card misbehaves). |
 | `diff.diffViewMode` | `"auto"` | Diff display mode: auto / split / unified. |
 | `diff.diffIndicatorMode` | `"bars"` | Diff change indicator: bars / classic / none. |

package/README.zh-CN.md

@@ -29,7 +29,7 @@ pi -e npm:@yinan_chen/pi-claude-code-ui
 - **Claude 式视图** — 对话转录适配器，Pi 原生回退
 - **吸附消息泡（sticky）** — 滚动时顶部吸附显示当前正在回答的用户消息原文，点击回位（v0.2.0 内置，原 sticky-first-message 扩展）
 - **Skill 折叠（recollapse）** — 展开的 skill 全文自动折回 `/skill:名 参数`，覆盖 /tree、/fork 回填等四处盲区（v0.2.0 内置，原 skill-block-recollapse 扩展）
-- **第三方渲染全接管** — 任何扩展的卡片（含未来未适配的）自动渲染为统一的 `● 卡片` 风格，工具/消息/条目三层全覆盖，零配置零适配；分发层拦截不受加载顺序影响（v0.7.0）
+- **第三方卡片兜底接管** — 无自带渲染方的消息（无任何扩展注册该 customType）自动接管为统一的 `● 卡片`，零配置零适配；扩展自己注册的渲染器原样保留，分发层拦截不受加载顺序影响（v0.7.0）
 - **富 diff 渲染** — edit/write 工具的语法高亮 diff（vendored, MIT）
 - **子代理面板** — 后台 agent 状态一目了然
 - **工作状态提示** — working message / running effect
@@ -103,7 +103,7 @@ pi -e npm:@yinan_chen/pi-claude-code-ui
 | `resultPrefixGap` | `1` | 前缀符号与内容之间的空格数（0–4） |
 | `normalizeForeignRenderers` | `true` | 第三方扩展卡片输出里行首 `⎿` 自动规范化为 `resultPrefix`（任何未适配扩展的渲染都能统一风格；关闭可看第三方原版） |
 | `workflowRendering` ⟳ | `"claude"` | workflow 完成卡片样式：`● Workflow(name)` 风格 / `native` 保留包内卡片。分发层拦截实现，不受包加载顺序影响 |
-| `foreignCardStyle` | `"generic"` | 未适配扩展的卡片：自动接管为通用 `● 卡片`（零配置）；`symbols` = 仅统一符号不接管布局 |
+| `foreignCardStyle` | `"generic"` | 无自带渲染方的卡片：自动接管为通用 `● 卡片`（零配置）；`symbols` = 仅统一符号不接管布局 |
 | `foreignCardSkip` | `[]` | 不接管的 customType 黑名单（交互型第三方卡片异常时按类型跳过） |
 | `diff.diffViewMode` | `"auto"` | diff 视图：`auto`/`split`/`unified` |
 | `diff.diffIndicatorMode` | `"bars"` | 变更指示条：`bars`/`classic`/`none` |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yinan_chen/pi-claude-code-ui",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"description": "Claude Code-style UI for Pi: transcript view, rich diffs, subagent panels and working-message status.",
 	"type": "module",
 	"license": "MIT",

package/src/foreign-normalizer.ts

@@ -39,7 +39,13 @@ export function normalizeForeignLines(lines: readonly string[]): string[] {
 
 /**
  * patch 渲染分发器（ExtensionRunner：同时有 getMessageRenderer + getEntryRenderer 原型方法）。
- * 分发层拦截：不受包加载顺序影响，__leanTidyImpl.rendererOverride(customType) 命中即改道。
+ * 两层接管语义（v0.9.2）：
+ *   1. 替换层（impl.rendererOverride：skip 名单 > subagent/workflow 内置替换）先行，
+ *      无视原查表——替换型的优先级不受包加载顺序影响；
+ *   2. 未命中替换层时先走原查表拿「有主」判定：查到已注册渲染器（有主）就让路返回它；
+ *   3. 查不到（无主）才问 impl.genericFallback（generic 兜底，仅 message 侧——原生对无
+ *      renderer 的 entry 完全不显示，entry 侧挖出数据型条目只是噪音），兜底不接则回落原生。
+ * trampoline：wrapper 每次调用现读 globalThis.__leanTidyImpl，/reload 后新配置立即生效。
  */
 export function patchRendererDispatch(cls: any): boolean {
 	const proto = cls?.prototype;
@@ -47,15 +53,20 @@ export function patchRendererDispatch(cls: any): boolean {
 	proto[FLAG] = true;
 	for (const method of ["getMessageRenderer", "getEntryRenderer"]) {
 		const orig = proto[method];
-		// kind（"getMessageRenderer"/"getEntryRenderer"）随转发传给 impl：generic 兜底只挂 message 侧——
-		// 原生对无 renderer 的 entry 完全不显示（addCustomEntryToChat 直接 return），entry 侧挖出数据型条目只是噪音。
+		// kind（"getMessageRenderer"/"getEntryRenderer"）随转发传给 impl 两层。
 		proto[method] = function (customType: string) {
 			const impl = (globalThis as any).__leanTidyImpl;
 			try {
 				const override = impl?.rendererOverride?.(customType, method);
 				if (override) return override;
 			} catch {}
-			return orig.call(this, customType);
+			const native = orig.call(this, customType);
+			if (native) return native;
+			try {
+				const fallback = impl?.genericFallback?.(customType, method);
+				if (fallback) return fallback;
+			} catch {}
+			return native;
 		};
 	}
 	return true;

package/src/generic-card.ts

@@ -1,7 +1,7 @@
 /**
- * generic-card — 未适配 customType 的通用 Claude 风格卡片（v0.7.0）。
+ * generic-card — 无主 customType（无任何渲染方认领）的通用 Claude 风格卡片（v0.7.0）。
  *
- * foreignCardStyle="generic"（默认）时，任何没有内置适配的 custom 消息 /
+ * foreignCardStyle="generic"（默认）时，原查表落空的无主 custom 消息 /
  * 会话条目都自动渲染为：
  *
  *    ● Label

package/src/index.ts

@@ -93,7 +93,7 @@ interface Config {
 	normalizeForeignRenderers: boolean;
 	/** workflow 完成卡片（subagents:workflow entry）样式：claude = ● Workflow(name) 风格（默认）；native = 保留包内卡片。 */
 	workflowRendering: "claude" | "native";
-	/** 未适配 customType 的卡片：generic = 自动接管为通用 ● 卡片（默认）；symbols = 仅统一符号不接管布局。 */
+	/** 无主 customType（无自带渲染方）的卡片：generic = 自动接管为通用 ● 卡片（默认）；symbols = 仅统一符号不接管布局。 */
 	foreignCardStyle: "generic" | "symbols";
 	/** 不接管的 customType 黑名单（保留第三方/原生渲染）。 */
 	foreignCardSkip: string[];
@@ -402,6 +402,8 @@ export default async function leanTidy(pi: ExtensionAPI): Promise<void> {
 	if (DEBUG) {
 		try { writeFileSync(LOG, `=== lean-tidy load #${loadCounter} ${new Date().toISOString()} ===\n`); } catch {}
 	}
+	// generic 兜底接管计数（每次加载重置，与日志头对齐）：同名去重、聚合计数，仅诊断通道可见。
+	const takeoverCounts = new Map<string, number>();
 	let noticeContext: any;
 	let lastWarning: string | undefined;
 	(globalThis as any).__leanTidyClaude?.dispose?.();
@@ -432,13 +434,21 @@ export default async function leanTidy(pi: ExtensionAPI): Promise<void> {
 			claude && chat ? claude.renderChat(container, width) : Container.prototype.render.call(container, width),
 		normalizeForeign: (lines: readonly string[]): string[] =>
 			config.normalizeForeignRenderers ? normalizeForeignLines(lines) : (lines as string[]),
-		/** 分发层拦截：内置适配表优先，其余 generic 自动接管，黑名单跳过；不受包加载顺序影响。 */
-		rendererOverride: (customType: string, via?: "getMessageRenderer" | "getEntryRenderer"): any => {
+		/** 分发层拦截·替换层：skip 名单 > subagent/workflow 内置替换，先行于原查表；generic 兜底已拆至 genericFallback。 */
+		rendererOverride: (customType: string, _via?: "getMessageRenderer" | "getEntryRenderer"): any => {
 			if (config.foreignCardSkip.includes(customType)) return undefined;
 			if (customType === "subagent-notification") return config.subagentRendering === "claude" ? subagentRenderer : undefined;
 			if (customType === "subagents:workflow") return config.workflowRendering === "claude" ? workflowRenderer : undefined;
-			// generic 兜底仅限 message 分发：entry 侧原生对无 renderer 完全不显示（数据型条目是噪音），回落原生。
-			return via !== "getEntryRenderer" && config.foreignCardStyle === "generic" ? genericCardRenderer : undefined;
+			return undefined;
+		},
+		/** 分发层拦截·兜底层：仅原查表落空（无主）且 message 侧才接管为 generic 卡片——不偷任何已注册渲染器。 */
+		genericFallback: (customType: string, via?: "getMessageRenderer" | "getEntryRenderer"): any => {
+			// skip 判断在这里是必要的而非防御：替换层对名单返回 undefined 让路，wrapper 仍会继续问兜底层。
+			if (via === "getEntryRenderer" || config.foreignCardStyle !== "generic" || config.foreignCardSkip.includes(customType)) return undefined;
+			const count = (takeoverCounts.get(customType) ?? 0) + 1;
+			takeoverCounts.set(customType, count);
+			diag("generic takeover:", customType, `x${count}`);
+			return genericCardRenderer;
 		},
 	} as RuntimeImpl;
 	for (const method of IMPL_METHODS) {

package/src/settings.ts

@@ -113,7 +113,7 @@ export const SETTING_DEFS: readonly SettingDef[] = [
 	},
 	{
 		id: "foreignCardStyle", label: "Foreign card style", type: "enum", values: ["generic", "symbols"], defaultValue: "generic", reloadRequired: false,
-		description: "Cards for unmatched customTypes: generic = take over as a generic card (default); symbols = unify symbols only, keep layout.",
+		description: "Cards without their own renderer: generic = take over as a generic card (default); symbols = unify symbols only, keep layout.",
 	},
 	{
 		id: "foreignCardSkip", label: "Card takeover blocklist", type: "readonly-array", defaultValue: [], reloadRequired: false,