@visa/cli 5.0.0-rc.363 → 5.0.0-rc.365

package/dist/skills/pair-visa-agent/RUNTIMES.md

@@ -21,27 +21,23 @@ Markdown skill, CLI, and MCP protocol instead.
 
 ## One ceremony, two surfaces
 
-Both supported surfaces share the same local pending record and the same server-owned
-setup operation:
+Both supported surfaces run the same protected enrollment and share the same local
+pending record:
 
-1. Visa MCP server: `setup_start`, then `setup_status` until it reports done
-   (`setup_resume` / `setup_cancel` for the interrupted and abandoned cases).
-2. Raw CLI: `visa setup start "<name>" --rails card,wallet --format json`, then
-   `visa setup status --format json`.
+1. Visa MCP server: `agent_enroll`, then `agent_enroll` with `wait: true` once the
+   owner has the page open.
+2. Terminal: `visa connect` (add `--format json` for machine output).
 
-The start operation returns a review URL for the human. The browser receives only that
-URL. The runtime retains its private Ed25519 key and local claim material. Polling both
-resumes the same pending identity after an interruption and performs the runtime's own
-steps — a setup nothing polls is a setup that never finishes.
+Each returns one link and a short code for the human. The browser receives only that
+link. The agent's keys are generated on this device and never leave it, and the
+approval page certifies only the keys this device named in the link. Calling it again
+resumes the same pending enrollment after an interruption.
 
 Use `agentId` as the stable identity. `identityKeyJkt` identifies the currently bound
-Ed25519 public key and can change after key rotation. Only the rails named in the
-operation are configured; email, `.visa` names, and tap bindings remain separate
-follow-up configuration.
+Ed25519 public key and can change after key rotation.
 
-The older `pair_agent_start` / `pair_agent_poll` and `enroll_agent` surfaces still exist
-for published clients, but they pair identity ALONE and cost the owner one further
-approval per rail. Do not use them to connect a new agent.
+The older plugin pairing tools and MCP enrollment tools are gone: they drove CLI
+commands that no longer exist. `agent_enroll` (MCP) and `visa connect` are the one door.
 
 ## Install and mount
 
@@ -98,22 +94,20 @@ For example, with `HOME=/opt/data/home` and no `VISA_CLI_HOME`, identity lives
 under `/opt/data/home/.visa-cli` and checkout contact under
 `/opt/data/home/.visa-mcp`. A profile at `/opt/data/.visa-mcp` belongs to a
 different state namespace. Do not scan, copy, or auto-adopt it: contact files
-contain owner PII. Save the profile explicitly through `checkout_profile` in
-the running MCP process, or run the CLI command with the exact same environment.
-`visa agent preflight --format json` reports the non-secret path and source it
-checked.
+contain owner PII. The host passes checkout details to `purchase_create` itself;
+no Visa tool writes the profile.
 
 ## Runtime setup map
 
-| Runtime       | Setup surface                                                                                                                                                                                                                                                                                                         |
-| ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| OpenClaw      | Install `@visa/cli@rc` (`npm install -g @visa/cli@rc`) and run `visa agent skill --runtime openclaw` (or `visa-cli connect openclaw`). It plants the skill under `~/.openclaw/skills/` and mounts the Visa MCP server into `~/.openclaw/openclaw.json`. (The `@visa/visa-cli-openclaw` plugin package is prerelease). |
-| Hermes        | Run `visa-cli connect hermes`, install the skill with `visa agent skill --runtime hermes` (it resolves the per-profile dir), and use `setup_start`. `hermes claw migrate` can import an existing OpenClaw setup.                                                                                                      |
-| Codex         | Run `visa agent skill --runtime codex`. It plants the skill under `~/.codex/skills/` and mounts the Visa MCP server into `~/.codex/config.toml` in the same step.                                                                                                                                                     |
-| Other runtime | Put `visa` on `PATH`, mount the same MCP server if supported, or use the raw `visa setup start` and `visa setup status` commands as the universal fallback.                                                                                                                                                           |
+| Runtime       | Setup surface                                                                                                                                                                                                                                                          |
+| ------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| OpenClaw      | Install `@visa/cli@rc` (`npm install -g @visa/cli@rc`) and run `visa connect openclaw`. It plants the skill under `~/.openclaw/skills/` and mounts the Visa MCP server into `~/.openclaw/openclaw.json`. (The `@visa/visa-cli-openclaw` plugin package is prerelease). |
+| Hermes        | Run `visa connect hermes`. It resolves the per-profile skills directory and refuses to guess when several profiles exist — set `HERMES_PROFILE` to choose one. `hermes claw migrate` can import an existing OpenClaw setup.                                            |
+| Codex         | Run `visa connect codex`. It plants the skill under `~/.codex/skills/` and mounts the Visa MCP server into `~/.codex/config.toml` in the same step.                                                                                                                    |
+| Other runtime | Put `visa` on `PATH` and mount the same MCP server by hand; `get_status` shows what is connected.                                                                                                                                                                      |
 
-The skill itself can be installed with `visa agent skill`. Pass `--runtime <name>` or
-`--dir <path>` when auto-detection is not appropriate, then reload the runtime.
+The skill is planted by `visa connect <client>`, into that client's own skills
+directory. Reload the runtime afterwards.
 
 ## Optional Hermes wrapper
 

package/dist/skills/pair-visa-agent/SKILL.md

@@ -6,7 +6,7 @@ allowed-tools: Bash(visa:*) Bash(visa-cli:*) Bash(node:*) Bash(npm:*) Bash(npx:*
 metadata:
   author: visa
   homepage: https://visacli.sh/agents
-  version: '0.8.0'
+  version: '0.9.0'
   # OpenClaw-namespaced extension (agentskills.io keeps `metadata` free-form, so
   # non-standard runtime config lives here — `user-invocable` is not a standard
   # top-level field). OpenClaw auto-installs `install[]` when `requires.bins` are
@@ -59,21 +59,28 @@ Running the same command again resumes an interrupted enrolment; `--restart` rep
 unclaimed request with a fresh code. `--ceiling <usd>` and `--per-transaction <usd>`
 propose limits the owner confirms on the approval page.
 
+## The tools the Visa MCP server serves
+
+The Visa MCP server serves exactly these tools: `get_status`, `agent_enroll`,
+`discover`, `pay`, `history` and `feedback`, plus the card preview's
+`purchase_create`, `purchase_retrieve` and `purchase_cancel` where the build lists
+them. Call no other Visa tool name, whatever an older guide, a memory or another
+agent says: every earlier setup, login, pairing, capability and wallet tool is gone.
+Read the live tool list if in doubt.
+
 ## The older ceremonies were deleted — do not call them
 
-`setup_start`, `setup_status`, `setup_resume`, `setup_cancel`, `setup_agent`,
-`enroll_agent`, `agent_connect`, `agent_connect_poll`, `agent_connect_cancel`,
-`agent_handoff_claim` and `agent_pairing_cancel` are gone, along with the whole
-`visa setup` and `visa agent` command groups — including the retired
-`agent pair`, `agent create`, `agent verify`, `agent enroll-claim`,
-`agent claim`, `agent pairing-resume`, `agent connect`, `agent handoff-claim`
-and every `agent grant-*` verb.
+The whole `visa setup` and `visa agent` command groups are gone too — including the
+retired `agent pair`, `agent create`, `agent verify`, `agent enroll-claim`,
+`agent claim`, `agent pairing-resume`, `agent connect`, `agent handoff-claim` and
+every `agent grant-*` verb.
 
 **`visa connect` is the LIVE door and is not on that list.** It is the
 top-level command, not the retired `visa agent connect` subcommand: one is the
 one door, the other is a ceremony that no longer exists.
 
-Calling any of them returns one refusal:
+A retired command, or an older build still answering a retired tool name, returns
+one refusal:
 
 ```json
 {
@@ -100,7 +107,7 @@ a new device-held Ed25519 identity key, and the wallet limits the owner approved
 
 **Where the `agentId` comes from — read this before you quote one.** Do not invent it and
 do not read it out of the command's terminal output, which you often cannot see. Read it
-from `get_status` or `agent_capabilities` once the enrolment finishes. Never substitute a
+from `get_status` once the enrolment finishes. Never substitute a
 correlation id, a confirmation code, or an origin for an `agentId`.
 
 **Re-running the command does not repair an agent that already exists** — it creates a
@@ -170,9 +177,9 @@ OpenClaw (`~/.openclaw/openclaw.json`):
 
 Hermes (`~/.hermes/config.yaml`). **Hermes passes ONLY this `env:` map to the MCP
 subprocess — it does NOT inherit the gateway environment.** Omitting a required variable
-(an RC access code, the right `HOME`, `PATH`) makes the server exit on every start while
-`agent_capabilities` — which reads on-disk grant state, not live tool registration — can
-still report rails as available. Always set the map explicitly:
+(an RC access code, the right `HOME`, `PATH`) makes the server exit on every start, so no
+Visa tool registers at all, while the terminal — which reads on-disk state with the
+gateway's own environment — can still look healthy. Always set the map explicitly:
 
 ```yaml
 mcp_servers:
@@ -205,26 +212,28 @@ existing OpenClaw installation. See `RUNTIMES.md` for the complete runtime map.
 ## Sign in first — the wallet is owner-bound
 
 The USDC wallet is delegated out of the owner's own wallet, so this runtime needs a live
-owner session. Establish it **before** the enrolment command runs:
+owner session. The one door takes care of the order: `agent_enroll` (and `visa connect`)
+signs the owner in first whenever the session is missing or has lapsed, and only then
+starts the enrolment.
 
-- [ ] Call `agent_login` (MCP, default action `"start"`) or run
-      `visa connect --format json` (CLI). The result carries a sign-in `browserUrl`
-      and a short 6-character `confirmCode`.
+- [ ] Call `agent_enroll` (MCP) or run `visa connect --format json` (CLI). When a sign-in
+      is owed, the result carries a sign-in `browserUrl` and a short 6-character
+      `confirmCode`.
 - [ ] Relay **both** to the human in your reply — the bare URL on its own line, and the
       code. You are very often not in a terminal they can see; the chat message is the
       only place these values reach them.
 - [ ] The human opens the link, signs in (Google or email), and **types the confirmation
       code into the sign-in page** — into the browser, never back to you in chat.
-- [ ] Claim the session: `agent_login {"action":"claim"}` (the CLI command polls on its
-      own). Once claimed, the session token is stored locally.
+- [ ] Call `agent_enroll` again once they have (the CLI command polls on its own). It
+      picks up the approved sign-in on this device and moves on to the enrolment link.
 
-`agent_login` establishes the OWNER's session on this device. It creates no agent and
-grants no spending authority — those come from the enrolment command and the approval the
-owner gives in their browser.
+Signing in establishes the OWNER's session on this device. It creates no agent and grants
+no spending authority — those come from the enrolment and the approval the owner gives in
+their browser.
 
 If something reports `{"code":"session_required"}` or "Not logged in", that is this
-ordering rule, not a fault: run `agent_login`, drive the sign-in above to a claimed
-session, then continue.
+ordering rule, not a fault: call `agent_enroll` (or run `visa connect`), drive the sign-in
+above, then continue.
 
 The account that signs in is the owner the enrolment binds to, and the same account must
 be signed in on the approval page. A different account there fails closed.
@@ -244,7 +253,7 @@ be signed in on the approval page. A different account there fails closed.
 - [ ] **Tell them what they are approving**: this device, and the spending limits. One
       approval covers all of it.
 - [ ] **Confirm from a tool, not from their word.** Poll `get_status` until
-      `pairing.paired` is `true`, then read `agent_capabilities` for what is actually live.
+      `pairing.paired` is `true`; the same `get_status` says what is actually live.
 
 ### Relaying values, and what you must never accept
 
@@ -277,7 +286,7 @@ On success, report the agent and what is actually live:
 
 > Your Visa agent is set up. &lt;Report only the capabilities the live map confirms.&gt;
 
-Read the rails from `agent_capabilities`, never from what was requested.
+Read the rails from `get_status`, never from what was requested.
 
 ## Interruption and resume
 
@@ -323,15 +332,12 @@ _second, separate_ agent. Do this instead:
    from `get_status`. Start another enrolment only if they
    explicitly want a second agent.
 2. **Report status honestly — "set up" is several separate things.** Never imply the agent
-   can spend just because it exists. Read it live from tools rather than guessing from
-   prose: `agent_capabilities` returns the DERIVED capability map, `get_status` reports
-   pairing / account / version, `get_status` answers "can it spend, and
-   what is missing", and `agent_login` establishes or confirms the account session.
+   can spend just because it exists. Read it live from `get_status` rather than guessing
+   from prose: it reports pairing, account and version, and answers "can it spend, and
+   what is missing".
    - **Identity** — bound to _this user's_ account, on _this device_.
    - **Spending** — the limits the owner approved in the browser. You **cannot** self-grant
-     either rail, and never self-mint a wallet with `wallet_init` on mainnet — it throws
-     `WalletCredentialRequiredError` until the owner's delegation lands.
-   - **Mesh (`.visa` messaging)** — separate; `visa register <name>` joins it.
+     either rail or self-mint a wallet: the wallet arrives only by the owner's delegation.
    - **Trusted (TAP)** — follows spend/provisioning; don't promise it before then.
 3. **Scope everything to the user.** The identity is bound to the account they signed in
    with; the wallet and limits are theirs. Speak in terms of "your agent / your account /
@@ -340,8 +346,8 @@ _second, separate_ agent. Do this instead:
 ## An existing agent is missing a capability
 
 There is no rail-add ceremony any more: `visa agent grant-card` / `grant-wallet` /
-`grant-activate` / `grant-claim` and the `agent_connect` tools were deleted, and calling
-one returns `legacy_door_removed`.
+`grant-activate` / `grant-claim` were deleted, and calling one returns
+`legacy_door_removed`.
 
 What to do instead:
 
@@ -362,17 +368,13 @@ yourself.
 
 ## Spending, once a rail is live
 
-Wallet: set the policy with `wallet_policy_set` (per-transaction / daily / session USD
-caps plus optional network and merchant allow/deny lists that refuse an x402 payment
-BEFORE it is signed), then `wallet_pay`. The served wallet tools are `wallet_discover`
-(search the public x402 Bazaar), `wallet_probe` (read a challenge without paying),
-`wallet_pay` / `wallet_directory_pay` (pay, policy-enforced), `wallet_history` /
-`wallet_reconcile` (local ledger + resolve `reconciling` holds), `wallet_fund` (funding
-address + faucet), and `wallet_export` (export key material — dangerous). All spending is
-gated by the owner-approved local policy caps.
+Wallet: `discover` finds what to buy (a query, or a listing id to read one without
+paying), `pay` pays it with a mandatory `max` ceiling, and `history` reads this agent's
+payments. The limits are the ones the owner approved; the owner changes them in the Visa
+Console, never you. Funding is the owner's, in the Console.
 
 Card: Visa-operated browser checkout is retired; another enrollment will not repair it.
-`start_card_mandate` and `pay_merchant` refuse with `card_browser_checkout_removed`.
+The retired browser-checkout tools refuse with `card_browser_checkout_removed`.
 On local builds that list `purchase_create`,
 `purchase_retrieve` and `purchase_cancel`, the protected card preview uses the
 host's checkout tools and the existing eligible card and agent identity. Follow
@@ -396,32 +398,14 @@ messaging authority. Do not attempt mesh registration or improvise another trans
 
 ## Optional agent mailbox (separate from setup)
 
-Connecting an agent does not provision an email address or inbox. If the agent needs a
-mailbox — e.g. to receive a merchant's account-signup or one-time-code email —
-connect one explicitly, from the connected runtime, with the MCP tool:
-
-```
-agent_mail_connect { "agentId": "<agentId>" }
-```
-
-There is no terminal command for this. It requires an
-already-connected stable-agent identity on this runtime — it reads the local agent
-record and proves the Ed25519 identity to the service. It issues the stable
-agent mailbox if one does not exist, then stores an inbox-scoped credential in an
-owner-only `0600` runtime file so this runtime can read that one inbox.
-
-Be honest about scope. A mailbox grants an email address and the ability to read
-that inbox — nothing more. It is **not** identity, a wallet, spend authority, a
-card, or a `.visa` name, and it never authorizes a payment. Do not claim setup
-set up mail. Once connected, the MCP `wallet_mail_status`, `wallet_mail_read`,
-and `wallet_mail_await_otp` tools read the inbox (e.g. to await a sender-checked
-one-time code); without the scoped credential those reads fail closed. Keep the
-org-wide AgentMail key off the runtime — provisioning happens only through
-`mail-connect` under operator control.
+Connecting an agent does not provision an email address or inbox, and no Visa tool
+connects or reads one. There is no terminal command for this either. Do not claim setup
+set up mail, and do not improvise a mailbox. A mailbox would grant an email address and
+nothing more: it never authorizes a payment.
 
 ## Optional checkout profile (separate from setup)
 
-Do not collect a checkout profile to repair `pay_merchant`: Visa browser checkout
+Do not collect a checkout profile to revive Visa browser checkout: it
 is retired. On local builds that list `purchase_create`, `purchase_retrieve` and
 `purchase_cancel`, the protected card preview reuses this identity and verified
 card. The host supplies checkout and billing details, owns browser submission,
@@ -433,12 +417,11 @@ chat, bypass eligibility, or retry an uncertain merchant submission. Existing
 `~/.visa-mcp/contact.json` files use the format below; preserve them with mode `0600`.
 Never infer or invent identity or address data.
 
-Create and inspect this profile through the `checkout_profile` MCP tool whenever the
-payment flow runs through MCP. Do not shell a terminal command as a substitute unless the
-shell has the exact same `HOME` and `VISA_CLI_HOME` as the MCP subprocess. A profile
-found under another root is owner PII, not a migration candidate: never scan, copy, or
-auto-adopt it. If the roots drifted, keep the root holding the paired identity and have the
-owner save the profile again through `checkout_profile` in that runtime.
+No Visa tool writes this profile; the host passes checkout and billing details to
+`purchase_create` itself. Any shell that reads an existing profile must have the exact
+same `HOME` and `VISA_CLI_HOME` as the MCP subprocess. A profile found under another root
+is owner PII, not a migration candidate: never scan, copy, or auto-adopt it. If the roots
+drifted, keep the root holding the paired identity.
 
 ```jsonc
 {

package/dist/skills/pair-visa-agent/scripts/__tests__/setup.test.mjs

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-import { mkdirSync, writeFileSync, rmSync } from 'node:fs'
-import { join } from 'node:path'
+import { mkdirSync, readFileSync, writeFileSync, rmSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { tmpdir } from 'node:os'
 import { randomUUID } from 'node:crypto'
 
@@ -55,7 +56,7 @@ describe('setup.mjs portable provisioner', () => {
 
     it('accepts exact matching or newer RC versions', () => {
       expect(isSemverCompatible('4.1.0-rc.159', '4.1.0-rc.159')).toBe(true)
-      expect(isSemverCompatible('4.1.0-rc.166', '4.1.0-rc.159')).toBe(true)
+      expect(isSemverCompatible('5.0.0-rc.360', '4.1.0-rc.159')).toBe(true)
       expect(isSemverCompatible('4.1.0-rc.200', '4.1.0-rc.159')).toBe(true)
     })
 
@@ -66,10 +67,18 @@ describe('setup.mjs portable provisioner', () => {
     })
   })
 
+  describe('default floor', () => {
+    it('refuses a 4.x CLI that still served the retired pairing tools', () => {
+      expect(isSemverCompatible('4.1.0-rc.166')).toBe(false)
+      expect(isSemverCompatible('5.0.0-rc.334')).toBe(false)
+      expect(isSemverCompatible('5.0.0-rc.335')).toBe(true)
+    })
+  })
+
   describe('findCliBinary', () => {
     it('returns visa when visa --version succeeds', () => {
       const mockExec = vi.fn((cmd) => {
-        if (cmd === 'visa') return 'visa 4.1.0-rc.166'
+        if (cmd === 'visa') return 'visa 5.0.0-rc.360'
         throw new Error('command not found')
       })
       expect(findCliBinary(mockExec)).toBe('visa')
@@ -77,7 +86,7 @@ describe('setup.mjs portable provisioner', () => {
 
     it('returns visa-cli when only visa-cli succeeds', () => {
       const mockExec = vi.fn((cmd) => {
-        if (cmd === 'visa-cli') return 'visa-cli 4.1.0-rc.166'
+        if (cmd === 'visa-cli') return 'visa-cli 5.0.0-rc.360'
         throw new Error('command not found')
       })
       expect(findCliBinary(mockExec)).toBe('visa-cli')
@@ -96,21 +105,21 @@ describe('setup.mjs portable provisioner', () => {
       const mockExec = vi.fn((cmd, args) => {
         if (args.includes('capabilities')) {
           return JSON.stringify({
-            data: { build: { version: '4.1.0-rc.166' } },
+            data: { build: { version: '5.0.0-rc.360' } },
           })
         }
-        return '4.1.0-rc.166'
+        return '5.0.0-rc.360'
       })
-      expect(detectCliVersion('visa', mockExec)).toBe('4.1.0-rc.166')
+      expect(detectCliVersion('visa', mockExec)).toBe('5.0.0-rc.360')
     })
 
     it('falls back to --version when capabilities fails', () => {
       const mockExec = vi.fn((cmd, args) => {
         if (args.includes('capabilities')) throw new Error('unknown command')
-        if (args.includes('--version')) return 'v4.1.0-rc.166\n'
+        if (args.includes('--version')) return 'v5.0.0-rc.360\n'
         throw new Error('unknown')
       })
-      expect(detectCliVersion('visa', mockExec)).toBe('4.1.0-rc.166')
+      expect(detectCliVersion('visa', mockExec)).toBe('5.0.0-rc.360')
     })
   })
 
@@ -120,7 +129,7 @@ describe('setup.mjs portable provisioner', () => {
       writeFileSync(
         bundlePath,
         `
-        const tools = ['agent_handoff_claim', 'agent_connect', 'agent_connect_poll', 'setup_start'];
+        const tools = ['get_status', 'agent_enroll', 'discover', 'pay', 'history', 'feedback'];
         `
       )
       const probe = probeMcpTools(bundlePath, REQUIRED_MCP_TOOLS)
@@ -128,7 +137,7 @@ describe('setup.mjs portable provisioner', () => {
       expect(probe.missingTools).toEqual([])
     })
 
-    it('returns missing tools when bundle lacks handoff tools (e.g. 4.0.1 bundle)', () => {
+    it('returns missing tools when the bundle predates the six served tools (e.g. 4.0.1)', () => {
       const bundlePath = join(tempDir, 'index.js')
       writeFileSync(
         bundlePath,
@@ -138,11 +147,7 @@ describe('setup.mjs portable provisioner', () => {
       )
       const probe = probeMcpTools(bundlePath, REQUIRED_MCP_TOOLS)
       expect(probe.ok).toBe(false)
-      expect(probe.missingTools).toEqual([
-        'agent_handoff_claim',
-        'agent_connect',
-        'agent_connect_poll',
-      ])
+      expect(probe.missingTools).toEqual(['get_status', 'agent_enroll'])
     })
 
     it('returns false when bundle file is missing', () => {
@@ -151,13 +156,27 @@ describe('setup.mjs portable provisioner', () => {
       expect(probe.missingTools).toEqual([...REQUIRED_MCP_TOOLS])
     })
 
-    it('does not treat agent_connect_poll as a match for agent_connect', () => {
+    it('does not treat a longer tool name as a match for agent_enroll', () => {
       const bundlePath = join(tempDir, 'index.js')
-      writeFileSync(bundlePath, `const tools = ['agent_handoff_claim', 'agent_connect_poll'];`)
+      writeFileSync(bundlePath, `const tools = ['get_status', 'agent_enroll_claim'];`)
       const probe = probeMcpTools(bundlePath, REQUIRED_MCP_TOOLS)
       expect(probe.ok).toBe(false)
-      expect(probe.missingTools).toContain('agent_connect')
-      expect(probe.missingTools).not.toContain('agent_connect_poll')
+      expect(probe.missingTools).toEqual(['agent_enroll'])
+    })
+
+    it('requires only served tools: every required tool is one of the six', () => {
+      const served = readFileSync(
+        join(
+          dirname(fileURLToPath(import.meta.url)),
+          '../../../../../cli/src/mcp-server/six-tools.ts'
+        ),
+        'utf8'
+      )
+      const block = served.match(/SIX_TOOL_NAMES = \[([^\]]*)\]/)
+      expect(block).not.toBeNull()
+      const six = [...block[1].matchAll(/'([a-z_]+)'/g)].map((m) => m[1])
+      expect(six).toHaveLength(6)
+      for (const tool of REQUIRED_MCP_TOOLS) expect(six).toContain(tool)
     })
   })
 
@@ -189,18 +208,18 @@ describe('setup.mjs portable provisioner', () => {
       expect(result.version).toBe('4.0.1')
     })
 
-    it('reports ready when version is >= 4.1.0-rc.159 and required tools exist', () => {
+    it('reports ready when version is >= 5.0.0-rc.335 and required tools exist', () => {
       const bundleDir = join(tempDir, '@visa', 'cli', 'dist', 'mcp-server')
       mkdirSync(bundleDir, { recursive: true })
       writeFileSync(
         join(bundleDir, 'index.js'),
-        `const tools = ['agent_handoff_claim', 'agent_connect', 'agent_connect_poll'];`
+        `const tools = ['get_status', 'agent_enroll', 'discover', 'pay', 'history', 'feedback'];`
       )
 
       const mockExec = vi.fn((cmd, args) => {
-        if (args.includes('--version')) return '4.1.0-rc.166'
+        if (args.includes('--version')) return '5.0.0-rc.360'
         if (args.includes('capabilities')) {
-          return JSON.stringify({ data: { build: { version: '4.1.0-rc.166' } } })
+          return JSON.stringify({ data: { build: { version: '5.0.0-rc.360' } } })
         }
         throw new Error('unknown')
       })
@@ -208,15 +227,15 @@ describe('setup.mjs portable provisioner', () => {
 
       const result = verifyCliReadiness(mockExec, mockNpmRoot)
       expect(result.ready).toBe(true)
-      expect(result.version).toBe('4.1.0-rc.166')
+      expect(result.version).toBe('5.0.0-rc.360')
       expect(result.missingTools).toEqual([])
     })
 
     it('reports stale_or_incomplete when version is compatible but the MCP bundle is missing', () => {
       const mockExec = vi.fn((cmd, args) => {
-        if (args.includes('--version')) return '4.1.0-rc.166'
+        if (args.includes('--version')) return '5.0.0-rc.360'
         if (args.includes('capabilities')) {
-          return JSON.stringify({ data: { build: { version: '4.1.0-rc.166' } } })
+          return JSON.stringify({ data: { build: { version: '5.0.0-rc.360' } } })
         }
         throw new Error('unknown')
       })
@@ -225,7 +244,7 @@ describe('setup.mjs portable provisioner', () => {
       const result = verifyCliReadiness(mockExec, mockNpmRoot, () => null)
       expect(result.ready).toBe(false)
       expect(result.reason).toBe('stale_or_incomplete')
-      expect(result.version).toBe('4.1.0-rc.166')
+      expect(result.version).toBe('5.0.0-rc.360')
       expect(result.missingTools).toEqual([...REQUIRED_MCP_TOOLS])
     })
   })
@@ -241,15 +260,15 @@ describe('setup.mjs portable provisioner', () => {
           mkdirSync(bundleDir, { recursive: true })
           writeFileSync(
             join(bundleDir, 'index.js'),
-            `const tools = ['agent_handoff_claim', 'agent_connect', 'agent_connect_poll'];`
+            `const tools = ['get_status', 'agent_enroll', 'discover', 'pay', 'history', 'feedback'];`
           )
           return ''
         }
         if (cmd === 'visa') {
           if (!installed) throw new Error('command not found')
-          if (args.includes('--version')) return '4.1.0-rc.166'
+          if (args.includes('--version')) return '5.0.0-rc.360'
           if (args.includes('capabilities')) {
-            return JSON.stringify({ data: { build: { version: '4.1.0-rc.166' } } })
+            return JSON.stringify({ data: { build: { version: '5.0.0-rc.360' } } })
           }
         }
         throw new Error(`unknown command ${cmd}`)
@@ -269,7 +288,7 @@ describe('setup.mjs portable provisioner', () => {
         expect.any(Object)
       )
       expect(result.status).toBe('installed')
-      expect(result.version).toBe('4.1.0-rc.166')
+      expect(result.version).toBe('5.0.0-rc.360')
     })
 
     it('scenario 2: stale CLI installed (4.0.1) -> upgrades to @visa/cli@rc and succeeds', async () => {
@@ -283,12 +302,12 @@ describe('setup.mjs portable provisioner', () => {
           upgraded = true
           writeFileSync(
             join(bundleDir, 'index.js'),
-            `const tools = ['agent_handoff_claim', 'agent_connect', 'agent_connect_poll'];`
+            `const tools = ['get_status', 'agent_enroll', 'discover', 'pay', 'history', 'feedback'];`
           )
           return ''
         }
         if (cmd === 'visa') {
-          const version = upgraded ? '4.1.0-rc.166' : '4.0.1'
+          const version = upgraded ? '5.0.0-rc.360' : '4.0.1'
           if (args.includes('--version')) return version
           if (args.includes('capabilities')) {
             return JSON.stringify({ data: { build: { version } } })
@@ -311,7 +330,7 @@ describe('setup.mjs portable provisioner', () => {
         expect.any(Object)
       )
       expect(result.status).toBe('upgraded')
-      expect(result.version).toBe('4.1.0-rc.166')
+      expect(result.version).toBe('5.0.0-rc.360')
     })
 
     it('scenario 3: current CLI installed -> idempotent no-op', async () => {
@@ -319,14 +338,14 @@ describe('setup.mjs portable provisioner', () => {
       mkdirSync(bundleDir, { recursive: true })
       writeFileSync(
         join(bundleDir, 'index.js'),
-        `const tools = ['agent_handoff_claim', 'agent_connect', 'agent_connect_poll'];`
+        `const tools = ['get_status', 'agent_enroll', 'discover', 'pay', 'history', 'feedback'];`
       )
 
       const mockExec = vi.fn((cmd, args) => {
         if (cmd === 'visa') {
-          if (args.includes('--version')) return '4.1.0-rc.166'
+          if (args.includes('--version')) return '5.0.0-rc.360'
           if (args.includes('capabilities')) {
-            return JSON.stringify({ data: { build: { version: '4.1.0-rc.166' } } })
+            return JSON.stringify({ data: { build: { version: '5.0.0-rc.360' } } })
           }
         }
         throw new Error(`unexpected execution ${cmd}`)
@@ -342,7 +361,7 @@ describe('setup.mjs portable provisioner', () => {
 
       expect(mockExec).not.toHaveBeenCalledWith('npm', expect.anything(), expect.anything())
       expect(result.status).toBe('already_ready')
-      expect(result.version).toBe('4.1.0-rc.166')
+      expect(result.version).toBe('5.0.0-rc.360')
     })
 
     it('scenario 4: install failure reports one explicit upgrade action and exits 1', async () => {
@@ -375,9 +394,9 @@ describe('setup.mjs portable provisioner', () => {
       const mockExec = vi.fn((cmd, args) => {
         if (cmd === 'npm') return ''
         if (cmd === 'visa') {
-          if (args.includes('--version')) return '4.1.0-rc.166'
+          if (args.includes('--version')) return '5.0.0-rc.360'
           if (args.includes('capabilities')) {
-            return JSON.stringify({ data: { build: { version: '4.1.0-rc.166' } } })
+            return JSON.stringify({ data: { build: { version: '5.0.0-rc.360' } } })
           }
         }
         throw new Error(`unknown command ${cmd}`)
@@ -395,7 +414,7 @@ describe('setup.mjs portable provisioner', () => {
 
       expect(errorSpy).toHaveBeenCalledWith(
         expect.stringContaining(
-          'Readiness check failed: installed CLI v4.1.0-rc.166 is missing required tools'
+          'Readiness check failed: installed CLI v5.0.0-rc.360 is missing required tools'
         )
       )
       expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('npm install -g @visa/cli@rc'))