Skip to content
TypeScript

fix(pi): extension errors name folder extensions instead of "index" (#29768)

Alex Southwelld7ee7b31f4dd
diff --git a/packages/provider-pi/src/server/adapter.test.ts b/packages/provider-pi/src/server/adapter.test.ts
index dc994f90cac..e52505ce249 100644
--- a/packages/provider-pi/src/server/adapter.test.ts
+++ b/packages/provider-pi/src/server/adapter.test.ts
@@ -1533,7 +1533,10 @@ describe("PiAdapterV2", () => {
it.effect("gives notify and extension-error items distinct ids in each thread", () =>
Effect.gen(function* () {
const itemIds = new Set<string>();
- for (const threadId of [THREAD_ID, ThreadId.make("thread-pi-test-2")]) {
+ for (const [threadId, extensionPath] of [
+ [THREAD_ID, "/ext/a.ts"],
+ [ThreadId.make("thread-pi-test-2"), "/ext/a/index.ts"],
+ ] as const) {
const fake = yield* makeFakePi;
const { runtime, takeEvent } = yield* openRuntime(fake, "default", threadId);
const providerThread = yield* runtime.ensureThread({
@@ -1558,7 +1561,7 @@ describe("PiAdapterV2", () => {
method: "notify",
message: "note",
});
- yield* fake.emit({ type: "extension_error", extensionPath: "/ext/a.ts", error: "boom" });
+ yield* fake.emit({ type: "extension_error", extensionPath, error: "boom" });
for (const prefix of ["notify:", "extension-error:"]) {
const item = yield* takeEvent(
(event) =>
@@ -1566,6 +1569,9 @@ describe("PiAdapterV2", () => {
event.turnItem.nativeItemRef?.nativeId?.startsWith(prefix) === true,
);
if (item.type === "turn_item.updated") itemIds.add(item.turnItem.id);
+ if (item.type === "turn_item.updated" && prefix === "extension-error:") {
+ assert.equal(item.turnItem.title, "a");
+ }
}
}
assert.equal(itemIds.size, 4);
diff --git a/packages/provider-pi/src/server/adapter.ts b/packages/provider-pi/src/server/adapter.ts
index a8e140f02b7..4f3a6175aa3 100644
--- a/packages/provider-pi/src/server/adapter.ts
+++ b/packages/provider-pi/src/server/adapter.ts
@@ -3376,8 +3376,10 @@ function piSubagentOutput(result: unknown): string {
function piExtensionDisplayName(extensionPath: string | undefined): string {
if (extensionPath === undefined) return "Pi extension";
- const normalized = extensionPath.replace(/\\/g, "/").replace(/\/+$/, "");
- const name = normalized.slice(normalized.lastIndexOf("/") + 1).replace(/\.[^.]+$/, "");
+ const segments = extensionPath.replace(/\\/g, "/").split("/").filter(Boolean);
+ const fileName = segments.at(-1)?.replace(/\.[^.]+$/, "") ?? "";
+ // Pi loads a directory extension from its index file; the folder names it.
+ const name = fileName === "index" ? (segments.at(-2) ?? fileName) : fileName;
return name.length === 0 ? "Pi extension" : name;
}