setup-agent 0.0.2 → 0.0.4

package/src/host.ts

@@ -34,10 +34,10 @@ const useCheckoutHost = (restored: unknown) => {
 
   const requireOpen = () => {
     if (state.createdAt === null) {
-      throw reject("not-created", "the checkout has not been created yet");
+      throw reject("not-created", "the setup has not been created yet");
     }
     if (isClosed(state)) {
-      throw reject("closed", `the checkout is ${state.status}`);
+      throw reject("closed", `the setup is ${state.status}`);
     }
   };
 
@@ -90,7 +90,7 @@ const useCheckoutHost = (restored: unknown) => {
       if (state.products.some((product) => product.slug === seed.product)) {
         throw reject(
           "invalid-input",
-          `"${seed.product}" is already part of this checkout`,
+          `"${seed.product}" is already part of this setup`,
         );
       }
     } else if (kind !== "text" && !seed.options?.length) {
@@ -98,13 +98,36 @@ const useCheckoutHost = (restored: unknown) => {
     }
     if (
       seed.multiple &&
-      (kind !== "choice" || seed.options?.some((option) => option.variants))
+      (kind !== "choice" ||
+        seed.options?.some((option) => option.variants?.length))
     ) {
       throw reject(
         "invalid-input",
         "only a choice whose options have no variants accepts several answers",
       );
     }
+    const unique = (ids: readonly string[]) => new Set(ids).size === ids.length;
+    if (
+      !unique(seed.options?.map((option) => option.id) ?? []) ||
+      seed.options?.some(
+        (option) =>
+          !unique(option.variants?.map((variant) => variant.id) ?? []),
+      )
+    ) {
+      throw reject("invalid-input", "option and variant ids must be unique");
+    }
+    if (
+      seed.options?.some(
+        (option) =>
+          option.id.includes(":") ||
+          option.variants?.some((variant) => variant.id.includes(":")),
+      )
+    ) {
+      throw reject(
+        "invalid-input",
+        'option and variant ids cannot contain ":", which separates them in an answer',
+      );
+    }
     if (
       seed.default !== undefined &&
       !seed.options?.some((option) => option.id === seed.default)
@@ -177,7 +200,7 @@ const useCheckoutHost = (restored: unknown) => {
   const commands = useStatewireCommands<Checkout.Commands>({
     "checkout/create": ({ id, products, instructions }) => {
       if (state.id === id) {
-        throw reject("already-created", "the checkout already exists");
+        throw reject("already-created", "the setup already exists");
       }
       const fresh = initialCheckoutState();
       if (!isAgentPresent(state)) state.agent = fresh.agent;
@@ -306,7 +329,7 @@ const useCheckoutHost = (restored: unknown) => {
       plan.feedback = params.feedback.trim();
     },
     "checkout/cancel": () => {
-      if (state.status === "cancelled") return;
+      if (state.createdAt === null || isClosed(state)) return;
       state.status = "cancelled";
       dismissOpenInputs();
     },
@@ -428,7 +451,7 @@ const useCheckoutHost = (restored: unknown) => {
   };
 };
 
-/** The checkout statewire host; pass the durable object's restored snapshot. */
+/** The setup statewire host; pass the durable object's restored snapshot. */
 export const CheckoutHost = (restored?: unknown) =>
   resource(useCheckoutHost)(restored);
 

package/src/presets.ts

@@ -10,7 +10,7 @@ export type PresetId = "framework" | "llm-provider" | "project";
 export type PresetOverrides = {
   /** Restrict the options to these ids, in this order; one id locks the choice in. */
   only?: readonly string[];
-  /** Options the agent found itself, listed before the preset's own. */
+  /** Options the agent found itself, listed before the preset's own; `only` leaves them out. */
   found?: readonly { id: string; description?: string }[];
   default?: string;
   optional?: boolean;
@@ -139,7 +139,8 @@ export const INPUT_PRESETS: Record<PresetId, Preset> = {
   },
 };
 
-export const isPresetId = (id: string): id is PresetId => id in INPUT_PRESETS;
+export const isPresetId = (id: string): id is PresetId =>
+  Object.hasOwn(INPUT_PRESETS, id);
 
 /** Build the seed for a standard input, throwing on an unknown preset, option or default. */
 export const presetInput = (
@@ -164,7 +165,7 @@ export const presetInput = (
     }
     return { ...option, label: option.id };
   });
-  const options = [...found, ...listed];
+  const options = overrides.only ? listed : [...found, ...listed];
   const fallback = options.some((o) => o.id === preset.default)
     ? preset.default
     : undefined;

package/src/protocol.ts

@@ -282,12 +282,17 @@ export const isClosed = (state: Checkout.State) =>
 export const finishProposed = (state: Checkout.State) =>
   !isClosed(state) && state.completion !== undefined;
 
-/** True when the user messaged the agent after it last proposed to close. */
+/** True while a message the user sent after the agent proposed to close still waits for the agent. */
 export const followedUpSinceProposal = (state: Checkout.State) => {
   const proposedAt = state.completion?.proposedAt;
   return (
     proposedAt !== undefined &&
-    state.log.some((entry) => entry.role === "user" && entry.at > proposedAt)
+    state.log.some(
+      (entry) =>
+        entry.role === "user" &&
+        entry.at > proposedAt &&
+        entry.acknowledgedAt === undefined,
+    )
   );
 };
 
@@ -376,7 +381,9 @@ export const isOptionIcon = (value: string): value is OptionIcon =>
   (OPTION_ICONS as readonly string[]).includes(value);
 
 export const parseChoiceAnswer = (answer: string) => {
-  const [option = "", variant] = answer.split(":", 2);
+  const parts = answer.split(":");
+  if (parts.length > 2) return { option: answer };
+  const [option = "", variant] = parts;
   return { option, ...(variant !== undefined && { variant }) };
 };