@gojinko/cli 2.23.0 → 2.24.0

package/README.md

@@ -63,7 +63,7 @@ Prod and sandbox keys are stored separately in `~/.jinko/config.yaml`. Resolutio
 
 | Command | Description |
 |---|---|
-| `flight-search` | Direct search by route + dates OR price-check an `offer_token`. Returns bookable `trip_item_token`. |
+| `flight-search` | Direct search by route + dates OR price-check an `offer_token`. Returns bookable `trip_item_token`. Carries the full shop filter set (stops, time windows, layovers, fare attributes, alternate airports) and reports which filters the results honor. |
 | `price-monitoring` | Cache-only price snapshot for a fixed OD + dates — intended for scheduled polling. Semantically distinct from `flight-search` (one-shot live shopping). |
 | `hotel-search` | Live hotel search by city / query / geo / hotel-ids. Returns hotels with rooms, rates, `htl_*` offer tokens. |
 | `hotel-details` | Lazy lookup for a specific hotel — images, amenities, location detail. Pairs with `hotel-search` when the user wants the full picture before booking. |
@@ -80,10 +80,10 @@ Prod and sandbox keys are stored separately in `~/.jinko/config.yaml`. Resolutio
 | Command | Description |
 |---|---|
 | `checkout` | Finalize a trip → returns `checkout_url` (human pays in a browser) + `agent_spt_params` (agent pays programmatically) + items + total. (`book` is a deprecated alias.) |
-| `agent-pay submit` | Pay programmatically with a Shared Payment Token: present `--trip-id` + `--token`; the BFF schedules the agent fulfillment and redeems the SPT. Falls back to `checkout_url` on a 3DS step-up. |
+| `agent-pay submit` | Pay programmatically with a Shared Payment Token: present `--trip-id` + `--token`; the BFF schedules the agent fulfillment and redeems the SPT. Returns the Jinko `booking_ref` (`JNK-…`) once authorized. Falls back to `checkout_url` on a 3DS step-up. |
 | `get-ancillaries` | List a trip's purchasable ancillaries (bags / seats / meals) without generating a checkout URL |
 | `select-ancillaries` | Optional: preselect bags / seats / meals before handoff |
-| `trip-status` | Full lifecycle state: cart, quote, fulfillment, bookings |
+| `trip-status` | Full lifecycle state: cart, quote, fulfillment, bookings — plus the Jinko `booking_ref` once fulfillment has been scheduled (it can be present before payment completes — read `fulfillment.status` for paid), the value `get-booking` / `hotel-cancel` / `refund` / `exchange` take as `--booking-ref` |
 
 ### Post-booking
 
@@ -121,6 +121,14 @@ Quote is automatic — `checkout` handles it internally. A human pays on the ret
 # Live flight search by route + dates (returns trip_item_token directly)
 jinko flight-search --origin PAR --destination NYC --departure-date 2026-06-15
 
+# Filtered search — non-stop, morning departure, checked bag in the fare
+jinko flight-search --origin JFK --destination CDG --departure-date 2026-09-01 \
+  --max-stops 0 --departure-time-range 06:00-11:00 --checked-bag-included
+
+# Widen the search to more departure airports (the anchor still decides ranking)
+jinko flight-search --origin JFK --destination CDG --departure-date 2026-09-01 \
+  --origin-alternate-airports EWR LGA
+
 # Or price-check an offer_token from flight-calendar
 jinko flight-search --offer-token <offer_token>
 
@@ -163,11 +171,44 @@ jinko refund check  --booking-ref <ref> --pnr <pnr>
 jinko refund commit --booking-ref <ref> --pnr <pnr> --reason "schedule change"
 
 # Hotel cancellations (idempotent — safe to retry)
-jinko hotel-cancel --ref <booking_ref> --last-name <name>
+jinko hotel-cancel --booking-ref <booking_ref> --last-name <name>
 # Or via the authenticated shortcut:
 jinko hotel-cancel --provider-booking-id <id> --provider nuitee
 ```
 
+## Flight search filters
+
+`flight-search` exposes every filter the `POST /v1/flight_search` contract
+accepts, one option per field — run `jinko flight-search --help` for the list.
+Two things are worth knowing before you use them:
+
+**The response says which filters were honored.** Every search comes back with
+`applied_filters` (the ones these results DO honor) and `unapplied_filters`
+(the ones they do not, each with a reason). A filter the platform could not
+enforce is a reported outcome, not an error: the call still returns 200 with
+offers. Post-filter them yourself, or tell the user the constraint could not be
+met. `--format table` prints the report under the results; JSON output carries
+both lists as response fields.
+
+**Alternate airports widen an airport anchor.** `--origin-alternate-airports`
+and `--destination-alternate-airports` add departure/arrival airports beside
+`--origin` / `--destination` — widening only, so they can add results but never
+remove any. The anchor decides ranking and truncation, which makes the two
+airports NOT interchangeable: put the airport that matters most in `--origin`.
+Against a city anchor (`--origin-type city`, or a code the platform resolves to
+a city) the list is ignored — a city already searches its whole metro area —
+and comes back in `unapplied_filters` under the name `origin` or `destination`,
+never under the option name it was sent with.
+
+```bash
+jinko flight-search --origin PAR --destination NYC --departure-date 2026-06-15 \
+  --origin-alternate-airports ORY --format table
+# ...offers...
+#
+# Unapplied filters:
+#   origin — <the reason the platform gives for not enforcing it>
+```
+
 ## Output Formats
 
 ```bash

package/SKILL.md

@@ -28,17 +28,20 @@ export JINKO_API_KEY=jnk_...
 
 ### Pricing (live)
 - `flight-search` — direct search by route + dates OR price-check an `offer_token`. Returns `trip_item_token`.
+  Carries the full shop filter set (`--max-stops`, `--departure-time-range`, `--refundable-only`,
+  `--checked-bag-included`, `--via-airports`, `--origin-alternate-airports`, …) — run
+  `jinko flight-search --help` for the list.
 
 ### Trip building
 - `trip` — create/update a trip (add items, set travelers + contact). Returns `trip_id`.
 
 ### Checkout
 - `checkout` — finalize a trip; returns BOTH `checkout_url` (a human opens it to pay) AND `agent_spt_params` (an agent uses them to pay programmatically), plus items + ancillaries + total. (`book` is a deprecated alias.)
-- `agent-pay submit --trip-id <id> --token <spt>` — pay programmatically: mint a Shared Payment Token scoped to `checkout`'s `agent_spt_params`, then submit it; the BFF schedules the agent fulfillment and redeems the token. A 3DS step-up / decline falls back to a `checkout_url`.
+- `agent-pay submit --trip-id <id> --token <spt>` — pay programmatically: mint a Shared Payment Token scoped to `checkout`'s `agent_spt_params`, then submit it; the BFF schedules the agent fulfillment and redeems the token. Returns the Jinko `booking_ref` (`JNK-…`) once authorized. A 3DS step-up / decline falls back to a `checkout_url`.
 - `select-ancillaries` — (optional) preselect bags/seats/meals before checkout.
 
 ### Status
-- `trip-status` — full lifecycle state: cart, quote, fulfillment, bookings (PNRs).
+- `trip-status` — full lifecycle state: cart, quote, fulfillment, bookings (PNRs). Once fulfillment has been scheduled it also carries the Jinko `booking_ref` — the value `get-booking` / `hotel-cancel` / `refund` / `exchange` take as `--booking-ref`. It can be present before payment completes (a hosted checkout still in progress, or an `agent-pay submit` that fell back to `checkout_url`), so presence does not mean paid — read `fulfillment.status`. `bookings[].booking_reference` is the supplier's confirmation, not that handle.
 
 ### Post-booking
 - `refund check` / `refund commit`
@@ -49,7 +52,7 @@ export JINKO_API_KEY=jnk_...
 ## Canonical Flow
 
 ```
-1. jinko flight-search --from PAR --to NYC --date 2026-05-01
+1. jinko flight-search --origin PAR --destination NYC --departure-date 2026-05-01
    → each fare has a trip_item_token (live pricing already applied)
 
 2. jinko trip \
@@ -67,10 +70,11 @@ export JINKO_API_KEY=jnk_...
 5a. Human path: send the user to checkout_url — they complete payment on the Jinko web page.
 5b. Agent path: mint a Shared Payment Token scoped to agent_spt_params, then
     jinko agent-pay submit --trip-id <trip_id> --token <spt>
-    → { status: "processing", payment_verified: true }  (or a checkout_url fallback on 3DS)
+    → { status: "processing", payment_verified: true, booking_ref: "JNK-…" }  (or a checkout_url fallback on 3DS)
 
 6. jinko trip-status --trip-id <trip_id>
    → poll until status = "fulfilled" (or "partially_fulfilled") to get PNRs.
+   → booking_ref is the Jinko reference for get-booking / hotel-cancel / refund / exchange (--booking-ref).
 ```
 
 ## Important Notes
@@ -82,4 +86,14 @@ export JINKO_API_KEY=jnk_...
 - Dates: YYYY-MM-DD.
 - Gender: MALE | FEMALE (uppercase).
 - Passenger types: ADULT | CHILD | INFANT.
-- Cabin classes: economy | premium_economy | business | first.
+- Cabin classes: economy | premium_economy | business | first. Cabin is ADVISORY —
+  providers may still return other cabins, so read each fare's own `cabin_class`.
+- `flight-search` reports what it enforced: `applied_filters` lists the requested
+  filters the results honor, `unapplied_filters` the ones they do not, each with a
+  reason. An unapplied filter is not an error — the call still returns 200. Either
+  post-filter the offers yourself or tell the user the constraint could not be met.
+- `--origin-alternate-airports` / `--destination-alternate-airports` WIDEN an airport
+  anchor: they add airports beside `--origin` / `--destination`, never remove results.
+  The anchor decides ranking, so put the airport that matters most in `--origin`.
+  Against a city anchor the list is ignored and reported back under `origin` /
+  `destination` in `unapplied_filters`.

package/dist/commands/checkout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkout.d.ts","sourceRoot":"","sources":["../../src/commands/checkout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyB9D"}
+{"version":3,"file":"checkout.d.ts","sourceRoot":"","sources":["../../src/commands/checkout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6B9D"}

package/dist/commands/checkout.js

@@ -1,4 +1,5 @@
 import { withClient, output, userIntentOption } from './shared.js';
+import { printPriceChangeNotices } from '../output/price-change.js';
 export function registerCheckoutCommand(program) {
     program
         .command('checkout')
@@ -9,6 +10,9 @@ export function registerCheckoutCommand(program) {
         .action(withClient(async (client, globals, opts) => {
         const response = await client.checkout(opts.tripId);
         output(response, { format: globals.format });
+        // Last thing the user reads before they open checkout_url: the price
+        // they are about to pay is not the one they were shown in search.
+        printPriceChangeNotices(response);
     }));
     // DEPRECATED alias — `book` was renamed to `checkout` (JIN-1131). Kept so
     // existing scripts keep working; mcp-apps still exposes `book`.
@@ -20,6 +24,7 @@ export function registerCheckoutCommand(program) {
         .action(withClient(async (client, globals, opts) => {
         const response = await client.book(opts.tripId);
         output(response, { format: globals.format });
+        printPriceChangeNotices(response);
     }));
 }
 //# sourceMappingURL=checkout.js.map

package/dist/commands/checkout.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/commands/checkout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,OAAO,CAAC,2FAA2F,CAAC;SACpG,WAAW,CACV,ubAAub,CACxb;SACA,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,SAAS,CAAC,gBAAgB,EAAE,CAAC;SAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACjD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC,CAAC;IAEN,0EAA0E;IAC1E,gEAAgE;IAChE,OAAO;SACJ,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACjC,OAAO,CAAC,yEAAyE,CAAC;SAClF,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,SAAS,CAAC,gBAAgB,EAAE,CAAC;SAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACjD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/commands/checkout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,OAAO,CAAC,2FAA2F,CAAC;SACpG,WAAW,CACV,ubAAub,CACxb;SACA,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,SAAS,CAAC,gBAAgB,EAAE,CAAC;SAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACjD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7C,qEAAqE;QACrE,kEAAkE;QAClE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC,CAAC;IAEN,0EAA0E;IAC1E,gEAAgE;IAChE,OAAO;SACJ,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACjC,OAAO,CAAC,yEAAyE,CAAC;SAClF,cAAc,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;SAC1E,SAAS,CAAC,gBAAgB,EAAE,CAAC;SAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACjD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7C,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/commands/flight-search.d.ts

@@ -1,3 +1,109 @@
 import { Command } from 'commander';
+import type { FlightSearchRequest, FlightSearchResponse, TimeRange } from '@gojinko/api-client';
+/**
+ * Canonical (post-deprecated-alias-resolution) inputs for the request body.
+ * Values arrive as commander strings; numbers and time windows are coerced
+ * here. Every field maps to one leaf of the jinko-api flight_search contract.
+ */
+export interface FlightSearchBodyOpts {
+    origin: string;
+    destination: string;
+    departureDate: string;
+    returnDate?: string;
+    originType?: string;
+    destinationType?: string;
+    tripType?: string;
+    adults?: string;
+    children?: string;
+    infants?: string;
+    cabinClass?: string;
+    directOnly?: boolean;
+    maxStops?: string;
+    multiFare?: boolean;
+    maxPrice?: string;
+    includeCarriers?: string[];
+    excludeCarriers?: string[];
+    departureTimeRange?: string;
+    arrivalTimeRange?: string;
+    returnDepartureTimeRange?: string;
+    returnArrivalTimeRange?: string;
+    connectionTimeMinMinutes?: string;
+    connectionTimeMaxMinutes?: string;
+    maxTotalDurationMinutes?: string;
+    singleCarrierOnly?: boolean;
+    viaAirports?: string[];
+    excludeViaAirports?: string[];
+    aircraftTypes?: string[];
+    sameConnectionAirportOnly?: boolean;
+    sameOriginAirportOnly?: boolean;
+    sameTurnaroundAirportOnly?: boolean;
+    originAlternateAirports?: string[];
+    destinationAlternateAirports?: string[];
+    nearbyAirports?: boolean;
+    refundableOnly?: boolean;
+    changeableOnly?: boolean;
+    checkedBagIncluded?: boolean;
+    limit?: string;
+    currency?: string;
+    locale?: string;
+}
+/** Price-check inputs: the contract's non-search-only fields plus the token. */
+export interface OfferCheckBodyOpts {
+    offerToken: string;
+    adults?: string;
+    children?: string;
+    infants?: string;
+    currency?: string;
+    locale?: string;
+}
+/**
+ * Parse a `HH:MM-HH:MM` window into the contract's TimeRange object. Either
+ * bound may be omitted — `08:00-` is "at or after 08:00", `-12:00` is "at or
+ * before 12:00" — which is exactly what TimeRange means when one key is absent.
+ * Exported for tests.
+ */
+export declare function parseTimeRange(value: string | undefined, flag: string): TimeRange | undefined;
+/**
+ * Map canonical CLI options onto the jinko-api flight_search search-mode body.
+ * Pure — exported for tests. Only fields the caller actually set are attached:
+ * the platform reads an absent field as "not asked for", and an empty list or
+ * a `false` flag would mean the same thing while cluttering the request.
+ */
+export declare function buildFlightSearchBody(o: FlightSearchBodyOpts): FlightSearchRequest;
+/**
+ * Map canonical CLI options onto the price-check body. Every search-mode field
+ * is a contradiction beside `offer_token` (the platform rejects the pair), so
+ * only the fields that describe the re-price itself travel.
+ */
+export declare function buildOfferCheckBody(o: OfferCheckBodyOpts): FlightSearchRequest;
+/**
+ * Search-mode flags the caller set, in flag spelling. Reads "set" the way the
+ * platform does: `false` and an empty list are not a request. `multi_fare` is
+ * the exception — the platform asks whether the field was sent at all, so an
+ * explicit `--no-multi-fare` counts. Exported for tests.
+ */
+export declare function searchOnlyFlagsPresent(o: Partial<FlightSearchBodyOpts>): string[];
+/**
+ * The filter report every flight_search response carries, with both lists
+ * optional so an older response (or a fixture) without them renders as "no
+ * report" instead of throwing.
+ */
+export type FilterReport = Partial<Pick<FlightSearchResponse, 'applied_filters' | 'unapplied_filters'>>;
+/**
+ * Human lines for the applied/unapplied filter report. Empty when the request
+ * carried no filters (both lists empty), so an unfiltered search prints
+ * nothing extra. An unapplied entry is not an error — the results simply do
+ * not honor that filter, and the reason says why. The alternate-airport lists
+ * are reported per side as `origin` / `destination`, never under the field
+ * name they were sent with. Pure — exported for tests.
+ */
+export declare function filterReportLines(report: FilterReport): string[];
+/**
+ * Print the response, then the filter report under the results table. JSON
+ * output gets the report for free — `applied_filters` / `unapplied_filters` are
+ * response fields and travel through `output` untouched — so only the human
+ * format needs the extra block. Exported for tests.
+ */
+export declare function renderFlightSearchResponse(response: FlightSearchResponse, format: 'json' | 'table'): void;
 export declare function registerFlightSearchCommand(program: Command): void;
 //# sourceMappingURL=flight-search.d.ts.map

package/dist/commands/flight-search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flight-search.d.ts","sourceRoot":"","sources":["../../src/commands/flight-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgFlE"}
+{"version":3,"file":"flight-search.d.ts","sourceRoot":"","sources":["../../src/commands/flight-search.ts"],"names":[],"mappings":"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"}