@alexkroman1/aai-cli 5.13.2 → 6.1.0

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

@@ -1,7 +1,8 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { findItem, getState, isError, 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 " +
@@ -10,11 +11,9 @@ 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(getState(ctx), args.item_id);
-    if (isError(found)) return found;
+  execute: (args, state) => {
+    const found = findItem(state, args.item_id);
+    if (isToolFailure(found)) return found;
     return {
       item_id: found.variant.item_id,
       product_id: found.product.product_id,
@@ -25,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,8 +1,9 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
-import { getState, isError, 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 " +
@@ -14,12 +15,9 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const order = resolveOrder(state, args.order_id);
-    if (isError(order)) return order;
+    if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
     return {
       order_id: order.order_id,
@@ -37,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,7 +1,8 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { findProduct, getState, isError, 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 " +
@@ -10,12 +11,9 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const product = findProduct(state, args.product_id);
-    if (isError(product)) return product;
+    if (isToolFailure(product)) return product;
     setFocus(state, { productId: product.product_id });
     return {
       name: product.name,
@@ -29,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,7 +1,8 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
-import { authenticatedUser, getState, isError, 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 " +
@@ -9,12 +10,9 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
-    if (isError(user)) return user;
+    if (isToolFailure(user)) return user;
     if (user.user_id !== args.user_id) {
       return {
         error: `${args.user_id} is not the customer on this call. You can help only one customer per conversation.`,
@@ -40,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 { getState, 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 = getState(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

@@ -1,9 +1,10 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { AddressFields, formatAddress, toAddress } from "../address.ts";
 import { resolveOrder } from "../resolve.ts";
-import { getState, isError, 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 " +
@@ -15,14 +16,9 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const order = resolveOrder(state, args.order_id);
-    if (isError(order)) return order;
+    if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
 
     // Any pending variant is fine here — unlike cancel and modify-items, which
@@ -42,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,
-  getState,
-  isError,
-  isGiftCard,
-  money,
-  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,17 +30,12 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
-    if (isError(user)) return user;
+    if (isToolFailure(user)) return user;
 
     const order = resolveOrder(state, args.order_id);
-    if (isError(order)) return order;
+    if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
 
     // Exactly 'pending'. A 'pending (item modified)' order has already used its
@@ -61,7 +49,7 @@ export const modifyPendingOrderItems = retailTool({
     const plan = planItemSwap(state, order, args.item_ids, args.new_item_ids, {
       requireDifferent: true,
     });
-    if (isError(plan)) return plan;
+    if (isToolFailure(plan)) return plan;
 
     const blocked = assertCanCoverDiff(user, args.payment_method_id, plan.diff);
     if (blocked) return blocked;
@@ -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

@@ -1,17 +1,16 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
 import {
   authenticatedUser,
   findPaymentMethod,
-  getState,
-  isError,
   isGiftCard,
   money,
   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,17 +26,12 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
-    if (isError(user)) return user;
+    if (isToolFailure(user)) return user;
 
     const order = resolveOrder(state, args.order_id);
-    if (isError(order)) return order;
+    if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
 
     if (!order.status.startsWith("pending")) {
@@ -47,7 +41,7 @@ export const modifyPendingOrderPayment = retailTool({
     }
 
     const newMethod = findPaymentMethod(user, args.payment_method_id);
-    if (isError(newMethod)) return newMethod;
+    if (isToolFailure(newMethod)) return newMethod;
 
     const original = order.payment_history[0];
     if (order.payment_history.length !== 1 || original?.transaction_type !== "payment") {
@@ -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,8 +1,9 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { AddressFields, formatAddress, toAddress } from "../address.ts";
-import { authenticatedUser, getState, isError, 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 " +
@@ -12,14 +13,9 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
-    if (isError(user)) return user;
+    if (isToolFailure(user)) return user;
     if (user.user_id !== args.user_id) {
       return {
         error: `${args.user_id} is not the customer on this call. You can help only one customer per conversation.`,
@@ -34,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

@@ -1,16 +1,15 @@
+import { isToolFailure } from "@alexkroman1/aai";
 import { z } from "zod";
 import { resolveOrder } from "../resolve.ts";
 import {
   authenticatedUser,
   findPaymentMethod,
-  getState,
-  isError,
   isGiftCard,
   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,17 +31,12 @@ 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 = getState(ctx);
+  execute: (args, state) => {
     const user = authenticatedUser(state);
-    if (isError(user)) return user;
+    if (isToolFailure(user)) return user;
 
     const order = resolveOrder(state, args.order_id);
-    if (isError(order)) return order;
+    if (isToolFailure(order)) return order;
     setFocus(state, { orderId: order.order_id });
 
     if (order.status !== "delivered") {
@@ -52,7 +46,7 @@ export const returnDeliveredOrderItems = retailTool({
     }
 
     const method = findPaymentMethod(user, args.payment_method_id);
-    if (isError(method)) return method;
+    if (isToolFailure(method)) return method;
 
     const originalMethodId = order.payment_history[0]?.payment_method_id;
     if (!isGiftCard(method) && args.payment_method_id !== originalMethodId) {
@@ -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, " +