[raymondk]

When the wait ended with the order unsettled, the command printed one line (Order co-12 stays payable until …) and a fixed hint naming icp cycles balance without the flags the run used, so a user on a named identity or another network pasted a command that looked at the wrong account.

Now the command says once, as the error it ends with, why the wait ended (stopped, the hour, the gateway out of reach), where the order stands (still payable until its deadline while unpaid; paid and being delivered once paid; the order carries on without the command), where its cycles land, and the balance command on a line of its own with the identity, network and environment of the run filled in. The default identity is named, since only the identity that made the order can read it. --no-wait says the same. A refund owed or an order needing review comes with the icp canister call <gateway> order_status --query … '("<order id>")' command that reads the order back, and for CyclePay's gateway a pointer to My purchases. For example, after Ctrl-C as alice on -n ic:

Error: stopped waiting for order co-12-20d30d24771ff92787f41d95b6764a61.

It stays payable until 2026-10-17T22:13:20Z. Once it is paid, its cycles land on your identity's cycles-ledger account. To see them:

    icp cycles balance --identity alice -n ic

Those commands must paste as printed, in every shell icp-cli completes for, so this PR also adds the flag builder they use, commands::args::selection_flags (PasteFlags, shell_word), which was #829 before: the short flag where there is one, --flag=value for a value starting with - (which would otherwise read as a flag), and a value bare when nothing in it is special to any of the POSIX shells, fish, elvish or PowerShell, else single-quoted, else (for a name with ') double-quoted when nothing else in it is special there. A value no quoting carries in all of them is left as <your identity>, with a line asking to fill it in; for one starting with - the placeholder keeps the --flag= form, which #829's review caught. #829 also rewrote the recovery command icp canister create --with-icp prints with this builder; that path is rare enough that it is left as it is.

Code by Josh, from #824 (commit 9cd3e1c, follow-up part, and 11a85d4, the builder): FollowUp, Unsettled, unsettled, look_later. Plain strings and paragraphs, no 80-column wrapping (not wanted). -q is unchanged: the error alone. Not included: the payment-pending state, the gateway note, the refund-under-way rewording.

Tests: an_unsettled_order_is_said_once_where_it_stands, the_follow_up_commands_carry_the_selections; words_are_quoted_only_as_every_shell_needs and selections_become_the_flags_that_select_them pin every quoted word and every flag form; integration cycles_buy_ctrl_c_stops_the_wait_not_the_order asserts the exact ending and cycles_buy_no_wait_says_where_the_cycles_will_show is new (the stand-in fixture now uses a named buyer identity so the flags are assertable).

---

Part of restacking #824 into small PRs, one fix each, stacked on main in this order: cycles-buy/06-wait-clock → 07-follow-up → 08-json-fields. Each PR targets the one below it; after the one below merges, retarget to main.

🤖 Generated with Claude Code

https://claude.ai/code/session_015aem4tPs4TYVZb8k4LMbJJ

[Copilot]

🟡 Changes recommended

Recovery commands replace valid non-ASCII order IDs with a placeholder instead of querying the actual order.

1 open issue

• Recovery command mishandles non-ASCII order IDs · New

What changed in this PR

Improves icp cycles buy follow-up messages so users can check unsettled orders with the same identity and network selections.

Changes:

• Explains why waiting ended and where the order stands.
• Prints selection-aware balance and order-status commands.
• Adds regression tests and updates documentation.

File	Description
docs/​guides/​tokens-and-cycles.md	Documents unsettled orders and recovery commands.
crates/​icp-cli/​tests/​cycles_tests.rs	Tests interruption and no-wait output with a named identity.
crates/​icp-cli/​src/​commands/​cycles/​buy.rs	Builds follow-up messages and selection-aware commands.
CHANGELOG.md	Records the improved purchase guidance.

_{Review effort: Balanced}