Skip to content

Commit f03db4f

Browse files
fix(pi): blank extension dialog titles no longer fail the turn (#35271)
Co-authored-by: Julius Marminge <[email protected]>
1 parent a5bd0ba commit f03db4f

2 files changed

Lines changed: 70 additions & 61 deletions

File tree

‎packages/provider-pi/src/server/adapter.test.ts‎

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4115,32 +4115,35 @@ describe("PiAdapterV2", () => {
41154115
}).pipe(Effect.scoped, Effect.provide(layerTest)),
41164116
);
41174117

4118-
it.effect("keeps an input dialog's title as the header above its placeholder", () =>
4119-
Effect.gen(function* () {
4120-
const fake = yield* makeFakePi;
4121-
const { runtime, takeEvent } = yield* openRuntime(fake);
4122-
yield* runtime.ensureThread({
4123-
threadId: THREAD_ID,
4124-
modelSelection: modelSelection("default"),
4125-
runtimePolicy,
4126-
});
4127-
yield* fake.emit({
4128-
type: "extension_ui_request",
4129-
id: "ui-input-placeholder",
4130-
method: "input",
4131-
title: "Name",
4132-
placeholder: "Your name",
4133-
});
4134-
const event = yield* takeEvent(
4135-
(event) =>
4136-
event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
4137-
);
4138-
if (event.type !== "turn_item.updated" || event.turnItem.type !== "user_input_request") {
4139-
return assert.fail("expected a user input request");
4140-
}
4141-
assert.equal(event.turnItem.questions[0]?.header, "Name");
4142-
assert.equal(event.turnItem.questions[0]?.question, "Your name");
4143-
}).pipe(Effect.scoped, Effect.provide(layerTest)),
4118+
it.effect.each(["Name", " "])(
4119+
"keeps input placeholder text answerable with title '%s'",
4120+
(title) =>
4121+
Effect.gen(function* () {
4122+
const fake = yield* makeFakePi;
4123+
const { runtime, takeEvent } = yield* openRuntime(fake);
4124+
yield* runtime.ensureThread({
4125+
threadId: THREAD_ID,
4126+
modelSelection: modelSelection("default"),
4127+
runtimePolicy,
4128+
});
4129+
yield* fake.emit({
4130+
type: "extension_ui_request",
4131+
id: "ui-input-placeholder",
4132+
method: "input",
4133+
title,
4134+
placeholder: "Your name",
4135+
});
4136+
const event = yield* takeEvent(
4137+
(event) =>
4138+
event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
4139+
);
4140+
if (event.type !== "turn_item.updated" || event.turnItem.type !== "user_input_request") {
4141+
return assert.fail("expected a user input request");
4142+
}
4143+
const question = decodeUserInputQuestions(event.turnItem.questions)[0]!;
4144+
assert.equal(question.header, title.trim() ? title : "Question");
4145+
assert.equal(question.question, "Your name");
4146+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
41444147
);
41454148

41464149
it.effect("emits a valid empty select option and returns its original value", () =>
@@ -4186,39 +4189,44 @@ describe("PiAdapterV2", () => {
41864189
}).pipe(Effect.scoped, Effect.provide(layerTest)),
41874190
);
41884191

4189-
it.effect("asks an input dialog's title when its placeholder is blank", () =>
4190-
Effect.gen(function* () {
4191-
const fake = yield* makeFakePi;
4192-
const { runtime, takeEvent } = yield* openRuntime(fake);
4193-
yield* runtime.ensureThread({
4194-
threadId: THREAD_ID,
4195-
modelSelection: modelSelection("default"),
4196-
runtimePolicy,
4197-
});
4198-
const title = "Which database?\n1. Postgres\n2. Type something.\nType your answer:";
4199-
yield* fake.emit({
4200-
type: "extension_ui_request",
4201-
id: "ui-input",
4202-
method: "input",
4203-
title,
4204-
placeholder: "",
4205-
});
4206-
const event = yield* takeEvent(
4207-
(event) =>
4208-
event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
4209-
);
4210-
if (event.type !== "turn_item.updated" || event.turnItem.type !== "user_input_request") {
4211-
return assert.fail("expected a user input request");
4212-
}
4213-
assert.equal(decodeUserInputQuestions(event.turnItem.questions)[0]?.header, "Question");
4214-
assert.equal(decodeUserInputQuestions(event.turnItem.questions)[0]?.question, title);
4215-
yield* runtime.respondToRuntimeRequest({
4216-
requestId: event.turnItem.requestId,
4217-
answers: { "ui-input": "SQLite" },
4218-
});
4219-
const response = yield* fake.takeRequest("extension_ui_response");
4220-
assert.equal(response["value"], "SQLite");
4221-
}).pipe(Effect.scoped, Effect.provide(layerTest)),
4192+
it.effect.each(["Which database?\n1. Postgres\n2. Type something.\nType your answer:", " "])(
4193+
"asks an input dialog's title when its placeholder is blank, with title '%s'",
4194+
(title) =>
4195+
Effect.gen(function* () {
4196+
const fake = yield* makeFakePi;
4197+
const { runtime, takeEvent } = yield* openRuntime(fake);
4198+
const providerThread = yield* runtime.ensureThread({
4199+
threadId: THREAD_ID,
4200+
modelSelection: modelSelection("default"),
4201+
runtimePolicy,
4202+
});
4203+
yield* startTurn(runtime, providerThread);
4204+
yield* fake.takeRequest("prompt");
4205+
yield* fake.emit({
4206+
type: "extension_ui_request",
4207+
id: "ui-input",
4208+
method: "input",
4209+
title,
4210+
placeholder: "",
4211+
});
4212+
const event = yield* takeEvent(
4213+
(event) =>
4214+
event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
4215+
);
4216+
if (event.type !== "turn_item.updated" || event.turnItem.type !== "user_input_request") {
4217+
return assert.fail("expected a user input request");
4218+
}
4219+
const question = decodeUserInputQuestions(event.turnItem.questions)[0]!;
4220+
assert.equal(question.header, "Question");
4221+
assert.equal(question.question, title.trim() ? title : "Question");
4222+
yield* runtime.respondToRuntimeRequest({
4223+
requestId: event.turnItem.requestId,
4224+
answers: { "ui-input": "SQLite" },
4225+
});
4226+
const response = yield* fake.takeRequest("extension_ui_response");
4227+
assert.equal(response["value"], "SQLite");
4228+
assert.isUndefined(response["cancelled"]);
4229+
}).pipe(Effect.scoped, Effect.provide(layerTest)),
42224230
);
42234231

42244232
it.effect("keeps the complete editor prefill editable and returns exact edited text", () =>

‎packages/provider-pi/src/server/adapter.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3682,10 +3682,11 @@ function piQuestion(
36823682
const detail = [recordString(event, "message"), recordString(event, "placeholder")].find(
36833683
(text) => text !== undefined && text.trim().length > 0,
36843684
);
3685+
const questionTitle = title.trim() ? title : "Question";
36853686
return {
36863687
id: questionId,
3687-
header: detail === undefined ? "Question" : title,
3688-
question: detail ?? title,
3688+
header: detail === undefined ? "Question" : questionTitle,
3689+
question: detail ?? questionTitle,
36893690
...(method === "editor" ? { initialAnswer: recordString(event, "prefill") ?? "" } : {}),
36903691
options,
36913692
};

0 commit comments

Comments
 (0)