@gajae-code/coding-agent 0.15.6 → 0.16.1

package/src/tools/ask-contract.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, test } from "bun:test";
+import { validRecommendedIndex } from "./ask";
+import { askSchema, ordinaryAskSchema } from "./ask-contract";
+
+const baseQuestion = {
+	id: "q",
+	question: "Choose one.",
+	options: [{ label: "Keep current behavior" }, { label: "Use repository default" }],
+};
+
+describe("ask option contract", () => {
+	test("rejects custom-input pseudo-options", () => {
+		for (const label of [
+			"Other (type your own)",
+			"Type your own",
+			"custom input",
+			"직접 입력",
+			"1. 직접 입력",
+			"직접 입력으로 추가",
+			"  OTHER（SPECIFY）  ",
+			"other…",
+			"write your own",
+			"enter manually",
+			"기타",
+			"기타 입력",
+		]) {
+			const result = ordinaryAskSchema.safeParse({
+				questions: [{ ...baseQuestion, options: [{ label }, { label: "Cancel" }], recommended: 0 }],
+			});
+			expect(result.success, label).toBe(false);
+		}
+	});
+
+	test("accepts a genuine Other domain value", () => {
+		const result = ordinaryAskSchema.safeParse({
+			questions: [{ ...baseQuestion, options: [{ label: "Other" }, { label: "Cancel" }] }],
+		});
+		expect(result.success).toBe(true);
+	});
+
+	test("accepts descriptive labels that merely contain custom-input words", () => {
+		const result = ordinaryAskSchema.safeParse({
+			questions: [{ ...baseQuestion, options: [{ label: "Deploy Other (type your own)" }, { label: "Cancel" }] }],
+		});
+		expect(result.success).toBe(true);
+	});
+
+	test("accepts ordinary recommended options", () => {
+		const result = ordinaryAskSchema.safeParse({ questions: [{ ...baseQuestion, recommended: 0 }] });
+		expect(result.success).toBe(true);
+	});
+
+	test("applies pseudo-option rejection to deep-interview ask schema", () => {
+		const result = askSchema.safeParse({
+			questions: [{ ...baseQuestion, options: [{ label: "직접 입력으로 추가" }, { label: "취소" }] }],
+		});
+		expect(result.success).toBe(false);
+	});
+
+	test("does not recommend single-option questions", () => {
+		expect(validRecommendedIndex(0, 1)).toBeUndefined();
+		expect(validRecommendedIndex(0, 2)).toBe(0);
+	});
+});

package/src/tools/ask-contract.ts

@@ -26,8 +26,43 @@ function deepInterviewBoundedString(maximum: number) {
 	});
 }
 
+function isReservedCustomInputOptionLabel(label: string): boolean {
+	const withoutNumbering = label
+		.normalize("NFKC")
+		.toLowerCase()
+		.trim()
+		.replace(/^\d+[.)]\s+/u, "");
+	if (/^other[\p{P}\p{S}\s]*$/u.test(withoutNumbering) && withoutNumbering !== "other") return true;
+	const wordsOnly = withoutNumbering
+		.replace(/[\p{P}\p{S}]+/gu, " ")
+		.replace(/\s+/g, " ")
+		.trim();
+	const englishPseudoOptions = new Set([
+		"other type your own",
+		"other specify",
+		"other please specify",
+		"type your own",
+		"write your own",
+		"enter manually",
+		"custom input",
+	]);
+	if (englishPseudoOptions.has(wordsOnly)) return true;
+	const compact = wordsOnly.replace(/\s+/g, "");
+	return ["직접입력", "직접입력으로추가", "기타", "기타입력"].includes(compact);
+}
+
 const OptionItem = z.object({
-	label: z.string().describe("display label"),
+	label: z
+		.string()
+		.describe("display label")
+		.superRefine((value, context) => {
+			if (isReservedCustomInputOptionLabel(value))
+				context.addIssue({
+					code: "custom",
+					message:
+						"ask option labels must not imitate the reserved custom-input control; omit the pseudo-option and let the Ask UI add Other (type your own)",
+				});
+		}),
 });
 
 const DEEP_INTERVIEW_INTENT_ID_PATTERN = /^(artifact|surface|integration|constraint):[a-z0-9][a-z0-9._/-]{0,127}$/;

package/src/tools/ask.ts

@@ -158,7 +158,8 @@ function getDoneOptionLabel(): string {
 	return success ? `${success} Done selecting` : "Done selecting";
 }
 
-function validRecommendedIndex(recommended: number | undefined, optionCount: number): number | undefined {
+export function validRecommendedIndex(recommended: number | undefined, optionCount: number): number | undefined {
+	if (optionCount <= 1) return undefined;
 	return typeof recommended === "number" &&
 		Number.isFinite(recommended) &&
 		Number.isInteger(recommended) &&
@@ -350,7 +351,7 @@ async function askSingleQuestion(
 	options: AskSingleQuestionOptions = {},
 ): Promise<SelectionResult> {
 	const {
-		recommended,
+		recommended: requestedRecommended,
 		timeout,
 		signal,
 		initialSelection,
@@ -358,6 +359,7 @@ async function askSingleQuestion(
 		scrollTitleRows,
 		autoSelectOnTimeout = true,
 	} = options;
+	const recommended = validRecommendedIndex(requestedRecommended, optionLabels.length);
 	const doneLabel = getDoneOptionLabel();
 	const otherOptionLabel = options.otherOptionLabel ?? OTHER_OPTION;
 	const clarificationOptionLabel = options.clarificationOptionLabel;
@@ -1118,6 +1120,7 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 			},
 		) => {
 			const rawOptionLabels = q.options.map(o => o.label);
+			const recommended = validRecommendedIndex(q.recommended, rawOptionLabels.length);
 			const questionIndex = params.questions.indexOf(q);
 			const emptyCustomAttempt = options?.emptyCustomAttempt ?? 0;
 			// Route headless asks through the SDK workflow-gate emitter; a connected
@@ -1128,7 +1131,7 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 					question: q.question,
 					options: q.options,
 					multi: q.multi,
-					recommended: q.recommended,
+					recommended,
 					deepInterview: q.deepInterview,
 					workflowGate: q.workflowGate,
 					allowEmpty: q.multi === true && params.questions.length > 1,
@@ -1177,12 +1180,11 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 								}),
 							}
 						: options?.previous;
-				const recommendedIndex = validRecommendedIndex(q.recommended, rawOptionLabels.length);
 				activeRemoteRequest = {
 					question: displayQuestion,
 					options: remoteSelectorOptions,
 					interaction: "selector",
-					...(recommendedIndex === undefined ? {} : { recommendedIndex }),
+					...(recommended === undefined ? {} : { recommendedIndex: recommended }),
 					...(timeout === undefined || timeout === null ? {} : { timeoutMs: timeout }),
 					...(clarificationOptionLabel ? { transitionCount: 2 } : { transitionCount: 1 }),
 					multi: q.multi === true,
@@ -1204,7 +1206,7 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 					cancelled,
 					timedOut,
 				} = await askSingleQuestion(ui, displayQuestion, optionLabels, q.multi ?? false, {
-					recommended: q.recommended,
+					recommended,
 					timeout: timeout ?? undefined,
 					signal,
 					initialSelection,
@@ -1221,8 +1223,8 @@ export class AskTool implements AgentTool<AskParametersSchema, AskToolDetails> {
 							question: displayQuestion,
 							options: state.interaction === "selector" ? remoteSelectorOptions : [],
 							interaction: state.interaction,
-							...(state.interaction === "selector" && recommendedIndex !== undefined
-								? { recommendedIndex }
+							...(state.interaction === "selector" && recommended !== undefined
+								? { recommendedIndex: recommended }
 								: {}),
 							...(state.interaction === "selector" && timeout !== undefined && timeout !== null
 								? { timeoutMs: timeout }

package/src/tools/bash-interactive.ts

@@ -377,6 +377,7 @@ export async function runInteractiveBashPty(
 	let observer: BashInteractiveOverlayComponent | undefined;
 	let settleForeground: ((result: BashInteractiveResult) => void) | undefined;
 	let settled = false;
+	let inputAttached = true;
 	const foreground = Promise.withResolvers<BashInteractiveResult>();
 	const terminal = Promise.withResolvers<BashInteractiveResult>();
 
@@ -449,6 +450,10 @@ export async function runInteractiveBashPty(
 			options.signal?.removeEventListener("abort", forwardForegroundAbort);
 		},
 		detachObserver: (foldResult: BashInteractiveResult) => {
+			// Stop accepting bytes synchronously at the ownership-transfer boundary.
+			// Overlay teardown may be deferred by the host, so disposal alone is not
+			// a sufficient input fence for a folded, output-only PTY.
+			inputAttached = false;
 			const outcome = settle(foldResult);
 			if (outcome === "resolved") observer = undefined;
 			return outcome;
@@ -476,15 +481,19 @@ export async function runInteractiveBashPty(
 					// Escape explicitly force-kills, while disposal never kills the work.
 					component.setHandlers(
 						data => {
+							if (!inputAttached) return;
 							try {
 								session.write(data);
 							} catch {
 								// ignore writes after the command exits
 							}
 						},
-						options.onDismiss ?? (() => session.kill()),
+						() => {
+							if (!inputAttached) return;
+							(options.onDismiss ?? (() => session.kill()))();
+						},
 						() => {},
-						options.onFoldKey ?? (() => false),
+						() => inputAttached && (options.onFoldKey?.() ?? false),
 					);
 					observer = component;
 					return component;