@alexkroman1/aai-cli 5.14.0 → 6.1.0

package/dist/templates/retail/tools/cancel_pending_order.ts

@@ -2,12 +2,12 @@ import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { creditRefund, REFUND_DELAY_NOTE, REFUND_IMMEDIATE_NOTE } from "../refund.ts";
 import { resolveOrder } from "../resolve.ts";
-import { authenticatedUser, retailSlot, retailTool, setFocus } from "../store.ts";
+import { authenticatedUser, retailTool, setFocus } from "../store.ts";
 
 /** tau2 accepts exactly these two. Anything else is refused. */
 const CANCEL_REASONS = ["no longer needed", "ordered by mistake"] as const;
 
-export const cancelPendingOrder = retailTool({
+export default retailTool({
   name: "cancel_pending_order",
   description:
     "Cancel a pending order. Only an order whose status is exactly 'pending' can be cancelled — " +
@@ -23,12 +23,7 @@ export const cancelPendingOrder = retailTool({
       .enum(CANCEL_REASONS)
       .describe("Either 'no longer needed' or 'ordered by mistake' — no other reason is accepted"),
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
 
@@ -79,5 +74,5 @@ export const cancelPendingOrder = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "cancel failed" : `cancelled ${result.order_id}`,
+    isToolFailure(result) ? "cancel failed" : `cancelled ${result.order_id}`,
 });

package/dist/templates/retail/tools/exchange_delivered_order_items.ts

@@ -1,10 +1,10 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
-import { authenticatedUser, retailSlot, retailTool, setFocus } from "../store.ts";
+import { authenticatedUser, money, retailTool, setFocus } from "../store.ts";
 import { assertCanCoverDiff, planItemSwap } from "../swap.ts";
 
-export const exchangeDeliveredOrderItems = retailTool({
+export default retailTool({
   name: "exchange_delivered_order_items",
   description:
     "Request an exchange of items in a delivered order for different options of the SAME products. " +
@@ -30,12 +30,7 @@ export const exchangeDeliveredOrderItems = retailTool({
       .max(80)
       .describe("Method to charge or refund the price difference"),
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
 
@@ -62,6 +57,18 @@ export const exchangeDeliveredOrderItems = retailTool({
     // No balance moves and no items change: this records a REQUEST. The money
     // and the item swap settle when the originals come back.
     order.status = "exchange requested";
+    // SORTED INDEPENDENTLY, verbatim from tau2 (`order.exchange_items =
+    // sorted(item_ids)` / `sorted(new_item_ids)`, the same shape
+    // `return_delivered_order_items` uses one list of) — kept because
+    // `seed.json` is tau2's data and these fields are what a tau2 task's
+    // expected end state is compared against. They are therefore two SETS of
+    // ids, not a pairing: sorting each list separately permutes the second
+    // against the first whenever the caller named more than one item.
+    //
+    // Which is why the ANSWER carries `exchanges` instead. `planItemSwap`
+    // priced this positionally, so returning the two sorted lists as if they
+    // lined up told the caller a pairing the quote was not for — the one thing
+    // this result must not do, since the model reads it back down a phone.
     order.exchange_items = [...args.item_ids].sort();
     order.exchange_new_items = [...args.new_item_ids].sort();
     order.exchange_payment_method_id = args.payment_method_id;
@@ -71,8 +78,12 @@ export const exchangeDeliveredOrderItems = retailTool({
       order_id: order.order_id,
       status: order.status,
       price_difference: plan.diff,
-      exchange_items: order.exchange_items,
-      exchange_new_items: order.exchange_new_items,
+      // The pairing AS PRICED, per line, in the order the caller gave it.
+      exchanges: plan.pairs.map((pair) => ({
+        item_id: pair.item.item_id,
+        new_item_id: pair.newVariant.item_id,
+        price_difference: money(pair.newVariant.price - pair.item.price),
+      })),
       message:
         plan.diff > 0
           ? `Exchange requested on ${order.order_id}. $${plan.diff.toFixed(2)} will be charged to ${args.payment_method_id}. An email with return instructions is on its way.`
@@ -80,5 +91,5 @@ export const exchangeDeliveredOrderItems = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "exchange failed" : `exchange requested on ${result.order_id}`,
+    isToolFailure(result) ? "exchange failed" : `exchange requested on ${result.order_id}`,
 });

package/dist/templates/retail/tools/find_user_id_by_email.ts

@@ -1,8 +1,9 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { authenticateAs } from "../authenticate.ts";
-import { retailSlot, retailTool } from "../store.ts";
+import { retailTool } from "../store.ts";
 
-export const findUserIdByEmail = retailTool({
+export default retailTool({
   name: "find_user_id_by_email",
   description:
     "Find a customer's user id by their email address. This is how you authenticate the caller — " +
@@ -12,12 +13,7 @@ export const findUserIdByEmail = retailTool({
     email: z.string().max(200).describe("The customer's email, e.g. 'something@example.com'"),
   }),
   requiresAuth: false,
-  // `execute` must come before `summary` in this object literal: TS infers the
-  // wrapper's generic `R` from `execute`'s return type, and processes object
-  // literal properties in source order — with `summary` first, `result` in its
-  // signature can't be inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const target = args.email.trim().toLowerCase();
     const match = Object.values(state.store.users).find(
       (user) => user.email.toLowerCase() === target,
@@ -28,5 +24,5 @@ export const findUserIdByEmail = retailTool({
     return authenticateAs(state, match);
   },
   summary: (_args, result) =>
-    "error" in result ? "lookup failed" : `identified ${result.user_id}`,
+    isToolFailure(result) ? "lookup failed" : `identified ${result.user_id}`,
 });

package/dist/templates/retail/tools/find_user_id_by_name_zip.ts

@@ -1,8 +1,9 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { authenticateAs } from "../authenticate.ts";
-import { retailSlot, retailTool } from "../store.ts";
+import { retailTool } from "../store.ts";
 
-export const findUserIdByNameZip = retailTool({
+export default retailTool({
   name: "find_user_id_by_name_zip",
   description:
     "Find a customer's user id by first name, last name and zip code. Use this only when the " +
@@ -13,10 +14,7 @@ export const findUserIdByNameZip = retailTool({
     zip: z.string().max(20).describe("Zip code, e.g. '12345'"),
   }),
   requiresAuth: false,
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const first = args.first_name.trim().toLowerCase();
     const last = args.last_name.trim().toLowerCase();
     const zip = args.zip.replace(/\D/g, "");
@@ -34,5 +32,5 @@ export const findUserIdByNameZip = retailTool({
     return authenticateAs(state, match);
   },
   summary: (_args, result) =>
-    "error" in result ? "lookup failed" : `identified ${result.user_id}`,
+    isToolFailure(result) ? "lookup failed" : `identified ${result.user_id}`,
 });

package/dist/templates/retail/tools/get_item_details.ts

@@ -1,8 +1,8 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { findItem, retailSlot, retailTool } from "../store.ts";
+import { findItem, retailTool } from "../store.ts";
 
-export const getItemDetails = retailTool({
+export default retailTool({
   name: "get_item_details",
   description:
     "Get one specific item's options, price and availability. Takes an ITEM id, which is not the " +
@@ -11,10 +11,8 @@ export const getItemDetails = retailTool({
     item_id: z.string().max(60).describe("The item id, e.g. '1008292230'"),
   }),
   requiresAuth: false,
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (args, ctx) => {
-    const found = findItem(retailSlot.get(ctx), args.item_id);
+  execute: (args, state) => {
+    const found = findItem(state, args.item_id);
     if (isToolFailure(found)) return found;
     return {
       item_id: found.variant.item_id,
@@ -26,5 +24,5 @@ export const getItemDetails = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "item read failed" : `read item ${result.item_id}`,
+    isToolFailure(result) ? "item read failed" : `read item ${result.item_id}`,
 });

package/dist/templates/retail/tools/get_order_details.ts

@@ -1,9 +1,9 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
-import { retailSlot, retailTool, setFocus } from "../store.ts";
+import { retailTool, setFocus } from "../store.ts";
 
-export const getOrderDetails = retailTool({
+export default retailTool({
   name: "get_order_details",
   description:
     "Get the status and full details of one of the authenticated customer's orders. Accepts the " +
@@ -15,10 +15,7 @@ export const getOrderDetails = retailTool({
       .max(120)
       .describe("Order id such as '#W0000000', or a spoken reference to one of their orders"),
   }),
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const order = resolveOrder(state, args.order_id);
     if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
@@ -38,5 +35,6 @@ export const getOrderDetails = retailTool({
       ...(order.cancel_reason ? { cancel_reason: order.cancel_reason } : {}),
     };
   },
-  summary: (_args, result) => ("error" in result ? "order read failed" : `read ${result.order_id}`),
+  summary: (_args, result) =>
+    isToolFailure(result) ? "order read failed" : `read ${result.order_id}`,
 });

package/dist/templates/retail/tools/get_product_details.ts

@@ -1,8 +1,8 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { findProduct, retailSlot, retailTool, setFocus } from "../store.ts";
+import { findProduct, retailTool, setFocus } from "../store.ts";
 
-export const getProductDetails = retailTool({
+export default retailTool({
   name: "get_product_details",
   description:
     "Get a product's variants — each with its item id, options, price and availability. Takes a " +
@@ -11,10 +11,7 @@ export const getProductDetails = retailTool({
     product_id: z.string().max(60).describe("The product id, e.g. '6086499569'"),
   }),
   requiresAuth: false,
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const product = findProduct(state, args.product_id);
     if (isToolFailure(product)) return product;
     setFocus(state, { productId: product.product_id });
@@ -30,5 +27,5 @@ export const getProductDetails = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "product read failed" : `read product ${result.name}`,
+    isToolFailure(result) ? "product read failed" : `read product ${result.name}`,
 });

package/dist/templates/retail/tools/get_user_details.ts

@@ -1,8 +1,8 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { authenticatedUser, retailSlot, retailTool } from "../store.ts";
+import { authenticatedUser, retailTool } from "../store.ts";
 
-export const getUserDetails = retailTool({
+export default retailTool({
   name: "get_user_details",
   description:
     "Get the authenticated customer's profile: name, email, default address, payment methods " +
@@ -10,10 +10,7 @@ export const getUserDetails = retailTool({
   inputSchema: z.object({
     user_id: z.string().max(100).describe("The user id, e.g. 'sara_doe_496'"),
   }),
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
     if (user.user_id !== args.user_id) {
@@ -41,5 +38,5 @@ export const getUserDetails = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "profile read failed" : `read profile ${result.user_id}`,
+    isToolFailure(result) ? "profile read failed" : `read profile ${result.user_id}`,
 });

package/dist/templates/retail/tools/list_all_product_types.ts

@@ -1,7 +1,8 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { retailSlot, retailTool } from "../store.ts";
+import { retailTool } from "../store.ts";
 
-export const listAllProductTypes = retailTool({
+export default retailTool({
   name: "list_all_product_types",
   description:
     "List every product type the store carries, as a name-to-product-id map. Each product type " +
@@ -10,15 +11,12 @@ export const listAllProductTypes = retailTool({
   // that is where the per-call UI-update invariant lives.
   inputSchema: z.object({}),
   requiresAuth: false,
-  // `execute` before `summary`: see find_user_id_by_email.ts for why the order
-  // is load-bearing for the generic `result` type in `summary`.
-  execute: (_args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (_args, state) => {
     const entries = Object.values(state.store.products)
       .map((product) => [product.name, product.product_id] as const)
       .sort(([a], [b]) => a.localeCompare(b));
     return { count: entries.length, products: Object.fromEntries(entries) };
   },
   summary: (_args, result) =>
-    "error" in result ? "catalog read failed" : `listed ${result.count} product types`,
+    isToolFailure(result) ? "catalog read failed" : `listed ${result.count} product types`,
 });

package/dist/templates/retail/tools/modify_pending_order_address.ts

@@ -2,9 +2,9 @@ import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { AddressFields, formatAddress, toAddress } from "../address.ts";
 import { resolveOrder } from "../resolve.ts";
-import { retailSlot, retailTool, setFocus } from "../store.ts";
+import { retailTool, setFocus } from "../store.ts";
 
-export const modifyPendingOrderAddress = retailTool({
+export default retailTool({
   name: "modify_pending_order_address",
   description:
     "Change the shipping address of a pending order. Read the new address back to the caller and " +
@@ -16,12 +16,7 @@ export const modifyPendingOrderAddress = retailTool({
       .describe("Order id such as '#W0000000', or a spoken reference to one of their orders"),
     ...AddressFields,
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const order = resolveOrder(state, args.order_id);
     if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
@@ -43,5 +38,5 @@ export const modifyPendingOrderAddress = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "address change failed" : `re-addressed ${result.order_id}`,
+    isToolFailure(result) ? "address change failed" : `re-addressed ${result.order_id}`,
 });

package/dist/templates/retail/tools/modify_pending_order_items.ts

@@ -1,17 +1,10 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
-import {
-  authenticatedUser,
-  isGiftCard,
-  money,
-  retailSlot,
-  retailTool,
-  setFocus,
-} from "../store.ts";
+import { authenticatedUser, isGiftCard, money, retailTool, setFocus } from "../store.ts";
 import { applySwap, assertCanCoverDiff, planItemSwap } from "../swap.ts";
 
-export const modifyPendingOrderItems = retailTool({
+export default retailTool({
   name: "modify_pending_order_items",
   description:
     "Change items in a pending order to different options of the SAME products. This can be done " +
@@ -37,12 +30,7 @@ export const modifyPendingOrderItems = retailTool({
       .max(80)
       .describe("Method to charge or refund the price difference, e.g. 'gift_card_0000000'"),
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
 
@@ -96,7 +84,7 @@ export const modifyPendingOrderItems = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result
+    isToolFailure(result)
       ? "item change failed"
       : `modified ${result.order_id} (${result.price_difference >= 0 ? "+" : ""}${result.price_difference})`,
 });

package/dist/templates/retail/tools/modify_pending_order_payment.ts

@@ -6,12 +6,11 @@ import {
   findPaymentMethod,
   isGiftCard,
   money,
-  retailSlot,
   retailTool,
   setFocus,
 } from "../store.ts";
 
-export const modifyPendingOrderPayment = retailTool({
+export default retailTool({
   name: "modify_pending_order_payment",
   description:
     "Change which payment method a pending order is charged to. The new method must be different " +
@@ -27,12 +26,7 @@ export const modifyPendingOrderPayment = retailTool({
       .max(80)
       .describe("The new payment method id, e.g. 'gift_card_0000000'"),
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
 
@@ -99,5 +93,5 @@ export const modifyPendingOrderPayment = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "payment change failed" : `re-paid ${result.order_id}`,
+    isToolFailure(result) ? "payment change failed" : `re-paid ${result.order_id}`,
 });

package/dist/templates/retail/tools/modify_user_address.ts

@@ -1,9 +1,9 @@
 import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { AddressFields, formatAddress, toAddress } from "../address.ts";
-import { authenticatedUser, retailSlot, retailTool } from "../store.ts";
+import { authenticatedUser, retailTool } from "../store.ts";
 
-export const modifyUserAddress = retailTool({
+export default retailTool({
   name: "modify_user_address",
   description:
     "Change the customer's default address, used for future orders. Read the new address back and " +
@@ -13,12 +13,7 @@ export const modifyUserAddress = retailTool({
     user_id: z.string().max(100).describe("The user id, e.g. 'sara_doe_496'"),
     ...AddressFields,
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
     if (user.user_id !== args.user_id) {
@@ -35,5 +30,5 @@ export const modifyUserAddress = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "profile address change failed" : `re-addressed ${result.user_id}`,
+    isToolFailure(result) ? "profile address change failed" : `re-addressed ${result.user_id}`,
 });

package/dist/templates/retail/tools/return_delivered_order_items.ts

@@ -5,12 +5,11 @@ import {
   authenticatedUser,
   findPaymentMethod,
   isGiftCard,
-  retailSlot,
   retailTool,
   setFocus,
 } from "../store.ts";
 
-export const returnDeliveredOrderItems = retailTool({
+export default retailTool({
   name: "return_delivered_order_items",
   description:
     "Request a return of items from a delivered order. Only a 'delivered' order can be returned, " +
@@ -32,12 +31,7 @@ export const returnDeliveredOrderItems = retailTool({
       .max(80)
       .describe("Where the refund goes — the original method, or one of their gift cards"),
   }),
-  // `execute` before `summary`: TS infers the wrapper's generic `R` from
-  // `execute`'s return type, and processes object literal properties in
-  // source order — with `summary` first, `result` in its signature can't be
-  // inferred and silently falls back to `unknown`.
-  execute: (args, ctx) => {
-    const state = retailSlot.get(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
     if (isToolFailure(user)) return user;
 
@@ -97,5 +91,5 @@ export const returnDeliveredOrderItems = retailTool({
     };
   },
   summary: (_args, result) =>
-    "error" in result ? "return failed" : `return requested on ${result.order_id}`,
+    isToolFailure(result) ? "return failed" : `return requested on ${result.order_id}`,
 });

package/dist/templates/retail/tools/transfer_to_human_agents.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { retailTool } from "../store.ts";
 
-export const transferToHumanAgents = retailTool({
+export default retailTool({
   name: "transfer_to_human_agents",
   description:
     "Hand the caller to a human agent. Use this ONLY when the caller explicitly asks for a human, " +