fix(acp): preserve enum values with distinct option labels

Adapt the enum labeling from pingdotgg#31081 to the typed form parser. Keep empty and padded values exact and disambiguate trimmed labels, including collisions with literal quoted values.

Co-authored-by: Honey Paptan <hpaptan@gmail.com>

Author: Yash-Singh1

packages/provider-acp/src/server/elicitationForm.test.ts

@@ -0,0 +1,47 @@
+import { assert, describe, it } from "@effect/vitest";
+
+import { parseElicitationForm } from "./elicitationForm.ts";
+
+describe("parseElicitationForm", () => {
+  for (const type of ["string", "array"] as const) {
+    it.each([
+      { values: [" padded ", "", "plain"], labels: ["padded", '""', "plain"] },
+      { values: [" a", "a", "b"], labels: ['" a"', '"a"', "b"] },
+      { values: [" a", "a", '"a"'], labels: ['" a"', '"a"', '"\\"a\\""'] },
+    ])(
+      `preserves ${type} enum values with distinct readable labels: $values`,
+      ({ values, labels }) => {
+        const form = parseElicitationForm(
+          {
+            type: "object",
+            properties: {
+              answer:
+                type === "array"
+                  ? { type, items: { type: "string", enum: values } }
+                  : { type, enum: values },
+            },
+            required: ["answer"],
+          },
+          "Choose",
+        );
+        assert(form !== undefined);
+        const question = form.questions[0];
+        assert(question !== undefined);
+        assert.deepStrictEqual(
+          question.options.map((option) => option.label),
+          labels,
+        );
+        assert.deepStrictEqual(
+          question.options.map((option) => option.value),
+          values,
+        );
+        assert.strictEqual(question.allowCustomAnswer, false);
+        assert.strictEqual(question.multiSelect, type === "array" ? true : undefined);
+        for (const value of values) {
+          const answer = type === "array" ? [value] : value;
+          assert.deepStrictEqual(form.content({ answer }), { answer });
+        }
+      },
+    );
+  }
+});

packages/provider-acp/src/server/elicitationForm.ts

@@ -46,12 +46,27 @@ function choiceOptions(
   return options.every((option) => option !== undefined) ? options : undefined;
 }
 
-/** `enum` values label themselves. */
-function enumOption(value: unknown): Option | undefined {
-  const label = text(value);
-  return typeof value === "string" && label !== undefined
-    ? { label, description: label, value }
-    : undefined;
+function enumOptions(entries: unknown): Option[] | undefined {
+  if (
+    !Array.isArray(entries) ||
+    entries.length === 0 ||
+    !entries.every((value): value is string => typeof value === "string")
+  )
+    return undefined;
+  const counts = new Map<string, number>();
+  for (const value of entries) counts.set(value.trim(), (counts.get(value.trim()) ?? 0) + 1);
+  const options = entries.map((value) => {
+    const plain = value.trim();
+    const label = plain !== "" && counts.get(plain) === 1 ? plain : JSON.stringify(value);
+    return { label, description: label, value };
+  });
+  // A quoted fallback can collide with a literal label; quote every value in that case.
+  return new Set(options.map((option) => option.label)).size === options.length
+    ? options
+    : options.map((option) => {
+        const label = JSON.stringify(option.value);
+        return { ...option, label, description: label };
+      });
 }
 
 /** Titled entries (`oneOf` on strings, `anyOf` on array items) carry a title for their `const`. */
@@ -74,7 +89,7 @@ function parseField(
       }
       const options = Array.isArray(property.oneOf)
         ? choiceOptions(property.oneOf, titledOption)
-        : choiceOptions(property.enum, enumOption);
+        : enumOptions(property.enum);
       return options === undefined
         ? undefined
         : {
@@ -87,7 +102,7 @@ function parseField(
       const items = unknownRecord(property.items);
       const options =
         items?.type === "string"
-          ? choiceOptions(items.enum, enumOption)
+          ? enumOptions(items.enum)
           : items !== undefined && items.type === undefined
             ? choiceOptions(items.anyOf, titledOption)
             : undefined;