Skip to content

fix(coding-agent): return to ask options after custom escape #3270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
can1357 merged 1 commit into from
Jun 23, 2026
+77 −51
Merged

fix(coding-agent): return to ask options after custom escape #3270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/coding-agent/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Fixed

- Fixed `ask` returning `(cancelled)` or aborting the tool when Escape dismissed `Other (type your own)` custom input; it now returns to the option selector so the user can pick a listed answer instead. ([#3269](https://github.com/can1357/oh-my-pi/issues/3269))

## [16.1.15] - 2026-06-22

### Added
Expand Down
82 changes: 44 additions & 38 deletions packages/coding-agent/src/tools/ask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ async function askSingleQuestion(
}
const customResult = await promptForCustomInput();
if (customResult.input === undefined) {
break;
continue;
}
customInput = customResult.input;
break;
Expand All @@ -332,51 +332,57 @@ async function askSingleQuestion(
}
selectedOptions = Array.from(selected);
} else {
const displayOptions = addRecommendedSuffix(questionOptions, recommended);
const optionsWithNavigation: ExtensionUISelectItem[] = [...displayOptions, OTHER_OPTION];

let initialIndex = recommended;
const previouslySelected = selectedOptions[0];
if (previouslySelected) {
const selectedIndex = questionOptions.findIndex(option => option.label === previouslySelected);
if (selectedIndex >= 0) initialIndex = selectedIndex;
} else if (customInput !== undefined) {
initialIndex = displayOptions.length;
}
if (initialIndex !== undefined) {
const maxIndex = Math.max(optionsWithNavigation.length - 1, 0);
initialIndex = Math.max(0, Math.min(initialIndex, maxIndex));
}
while (true) {
const displayOptions = addRecommendedSuffix(questionOptions, recommended);
const optionsWithNavigation: ExtensionUISelectItem[] = [...displayOptions, OTHER_OPTION];

let initialIndex = recommended;
const previouslySelected = selectedOptions[0];
if (previouslySelected) {
const selectedIndex = questionOptions.findIndex(option => option.label === previouslySelected);
if (selectedIndex >= 0) initialIndex = selectedIndex;
} else if (customInput !== undefined) {
initialIndex = displayOptions.length;
}
if (initialIndex !== undefined) {
const maxIndex = Math.max(optionsWithNavigation.length - 1, 0);
initialIndex = Math.max(0, Math.min(initialIndex, maxIndex));
}

const {
choice,
timedOut: selectTimedOut,
navigation: arrowNavigation,
} = await selectOption(promptWithProgress, optionsWithNavigation, initialIndex, {
selectionMarker: "radio",
markableCount: displayOptions.length,
});
timedOut = selectTimedOut;
const {
choice,
timedOut: selectTimedOut,
navigation: arrowNavigation,
} = await selectOption(promptWithProgress, optionsWithNavigation, initialIndex, {
selectionMarker: "radio",
markableCount: displayOptions.length,
});
timedOut = selectTimedOut;

if (arrowNavigation) {
return { selectedOptions, customInput, timedOut, navigation: arrowNavigation };
}
if (choice === undefined) {
if (!timedOut) {
return { selectedOptions, customInput, timedOut, cancelled: true };
if (arrowNavigation) {
return { selectedOptions, customInput, timedOut, navigation: arrowNavigation };
}
if (choice === undefined) {
if (!timedOut) {
return { selectedOptions, customInput, timedOut, cancelled: true };
}
break;
}
} else if (choice === OTHER_OPTION) {
if (!selectTimedOut) {
if (choice === OTHER_OPTION) {
if (selectTimedOut) {
break;
}
const customResult = await promptForCustomInput();
if (customResult.input !== undefined) {
customInput = customResult.input;
selectedOptions = [];
if (customResult.input === undefined) {
continue;
}
// If editor was dismissed (undefined), keep prior selectedOptions/customInput intact
customInput = customResult.input;
selectedOptions = [];
break;
}
} else {
selectedOptions = [stripRecommendedSuffix(choice)];
customInput = undefined;
break;
}
if (navigation?.allowForward) {
return { selectedOptions, customInput, timedOut, navigation: "forward" };
Expand Down
42 changes: 29 additions & 13 deletions packages/coding-agent/test/tools/ask.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ describe("AskTool option descriptions", () => {
step += 1;
return selectItemLabel(options.find(o => selectItemLabel(o)?.endsWith("beta")));
}
return "Other (type your own)";
return selectItemLabel(options.find(o => selectItemLabel(o)?.includes("Done selecting")));
},
editor,
});
Expand Down Expand Up @@ -564,10 +564,11 @@ describe("AskTool custom input", () => {
expect(abort).not.toHaveBeenCalled();
});

it("aborts when editor is cancelled in single-question flow", async () => {
it("returns to the option selector when custom input is dismissed in single-question flow", async () => {
const tool = new AskTool(createSession());
const abort = vi.fn();
const editor = vi.fn(async () => undefined);
let selectCalls = 0;
const questions = [
{
id: "details",
Expand All @@ -576,22 +577,27 @@ describe("AskTool custom input", () => {
},
];
const context = createContext({
select: async () => "Other (type your own)",
select: async () => {
selectCalls += 1;
return selectCalls === 1 ? "Other (type your own)" : "yes";
},
editor,
abort,
});

await expect(
tool.execute("call-editor-cancel", { questions }, undefined, undefined, context),
).rejects.toBeInstanceOf(ToolAbortError);
const result = await tool.execute("call-editor-cancel", { questions }, undefined, undefined, context);
expect(result.details?.selectedOptions).toEqual(["yes"]);
expect(result.details?.customInput).toBeUndefined();
expect(selectCalls).toBe(2);
expect(editor).toHaveBeenCalledTimes(1);
expect(abort).toHaveBeenCalledTimes(1);
expect(abort).not.toHaveBeenCalled();
});

it("continues multi-question flow when editor is dismissed on a fresh question", async () => {
it("returns to the option selector when custom input is dismissed in multi-question flow", async () => {
const tool = new AskTool(createSession());
const abort = vi.fn();
const editor = vi.fn(async () => undefined);
let detailsVisits = 0;
const questions = [
{
id: "first",
Expand All @@ -607,7 +613,10 @@ describe("AskTool custom input", () => {
const context = createContext({
select: async prompt => {
if (prompt.includes("First?")) return "one";
if (prompt.includes("Details?")) return "Other (type your own)";
if (prompt.includes("Details?")) {
detailsVisits += 1;
return detailsVisits === 1 ? "Other (type your own)" : "short";
}
return undefined;
},
editor,
Expand All @@ -616,10 +625,10 @@ describe("AskTool custom input", () => {

const result = await tool.execute("call-editor-multi-dismiss", { questions }, undefined, undefined, context);

// Editor dismissed on "Details?" — flow continues with empty answer, not abort
expect(result.details?.results?.[0]?.selectedOptions).toEqual(["one"]);
expect(result.details?.results?.[1]?.selectedOptions).toEqual([]);
expect(result.details?.results?.[1]?.selectedOptions).toEqual(["short"]);
expect(result.details?.results?.[1]?.customInput).toBeUndefined();
expect(detailsVisits).toBe(2);
expect(editor).toHaveBeenCalledTimes(1);
expect(abort).not.toHaveBeenCalled();
});
Expand Down Expand Up @@ -745,7 +754,7 @@ describe("AskTool custom input", () => {
expect(renderedText).toContain("custom detail");
});

it("preserves prior multi-select answers when custom editor is dismissed", async () => {
it("returns to the option selector when multi-select custom input is dismissed", async () => {
const tool = new AskTool(createSession());
let step = 0;
const editor = vi.fn(async () => undefined);
Expand All @@ -757,7 +766,13 @@ describe("AskTool custom input", () => {
if (!alphaOption) throw new Error("Missing alpha option");
return selectItemLabel(alphaOption);
}
return "Other (type your own)";
if (step === 1) {
step += 1;
return "Other (type your own)";
}
const doneOption = options.find(option => selectItemLabel(option)?.includes("Done selecting"));
if (!doneOption) throw new Error("Missing done option");
return selectItemLabel(doneOption);
},
editor,
});
Expand Down Expand Up @@ -786,6 +801,7 @@ describe("AskTool custom input", () => {
throw new Error("Expected text result");
}
expect(result.content[0].text).toContain("User selected: alpha");
expect(step).toBe(2);
expect(editor).toHaveBeenCalledTimes(1);
});
});
Expand Down
Loading