@tokenoftrust/cli 2.0.19 → 2.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Token of Trust developer CLI — clone a tenant store, run it locally with save→reload, and submit it for preview. Installs the `tot` command.",
   "license": "Apache-2.0",
   "author": "Token of Trust",

package/src/commands/clone.mjs

@@ -287,21 +287,26 @@ export async function run(argv, ctx) {
  *   cloned: boolean, dir: string|null, head: string|null }>}
  */
 export async function checkoutTenant(client, { tenant, tag = "main", cloneDir = null, redact = (s) => s }) {
-  // The switch is LOAD-BEARING, so its refusal is the error the developer must see. When
-  // the tenant is not one of this session's clients the server refuses here with the real
-  // cause (no grant / a grant issued to a client this identity is not bound to / a grant
-  // issued after sign-in that needs a re-auth) — far more specific than the tenant_checkout
-  // refusal that follows it. Surfacing the switch's own words, with the server's nextAction,
-  // stops a genuinely-unentitled tenant from being reported as a scope-selection slip.
+  // The switch CARRIES the best diagnosis but is NOT a precondition, and the difference
+  // matters in both directions:
+  //
+  //   - Discarding its refusal (the original behaviour) meant a genuinely unentitled tenant
+  //     surfaced later as tenant_checkout complaining about your PRIOR active tenant, which
+  //     reads as a scope-selection slip rather than a missing grant.
+  //   - Treating it as fatal breaks the STAFF-PREVIEW path, where the refusal is expected:
+  //     a staff human checking out a merchant tenant under an authorization holds no client
+  //     grant on it, so client_switch MUST fail while tenant_checkout legitimately succeeds
+  //     (it takes the tenant as an argument and resolves the app from the authorization).
+  //     `tot git-credential` mints through this same function, so a fatal switch also breaks
+  //     every fetch and push in such a checkout, not just the initial clone.
+  //
+  // So: remember it, proceed, and surface it only if the checkout ALSO fails — at which
+  // point it is the more specific of the two errors.
+  let switchRefusal = null;
   try {
     await client.callTool("client_switch", { tenant });
   } catch (e) {
-    throw new CliError(redact(String(e?.message || e)), {
-      next:
-        "confirm you're entitled to this store — `tot grants` lists what your session can " +
-        "act on, and `tot login` refreshes a grant issued after you signed in",
-      cause: e,
-    });
+    switchRefusal = e;
   }
   // vc-app-binding safety-net (08-18, §5): ensure THIS developer is bound to the
   // storefront version-control app BEFORE checkout, so tenant_checkout can resolve
@@ -319,13 +324,37 @@ export async function checkoutTenant(client, { tenant, tag = "main", cloneDir =
   } catch {
     /* fail-open — see above */
   }
-  const checkout = await client.callTool("tenant_checkout", { tenant, tag });
+  let checkout;
+  try {
+    checkout = await client.callTool("tenant_checkout", { tenant, tag });
+  } catch (e) {
+    // Both failed: the switch's refusal names the cause more precisely than a thrown
+    // checkout, so lead with it.
+    if (switchRefusal) {
+      throw new CliError(redact(String(switchRefusal?.message || switchRefusal)), {
+        next:
+          "confirm you're entitled to this store — `tot grants` lists what your session can " +
+          "act on, and `tot login` refreshes a grant issued after you signed in",
+        cause: switchRefusal,
+      });
+    }
+    throw e;
+  }
 
   // A non-checkout result (not provisioned / not entitled / failed) must surface
   // the MCP's human message + a concrete next step, NEVER a raw JSON.stringify
   // dump (James's 2026-07-19 first-experience failure).
   const err = checkoutError(checkout);
   if (err) {
+    // Same precedence: an unentitled tenant is better explained by the switch.
+    if (switchRefusal) {
+      throw new CliError(redact(String(switchRefusal?.message || switchRefusal)), {
+        next:
+          "confirm you're entitled to this store — `tot grants` lists what your session can " +
+          "act on, and `tot login` refreshes a grant issued after you signed in",
+        cause: switchRefusal,
+      });
+    }
     throw new CliError(redact(err.message), { next: err.next });
   }
   const gitRemote = checkout.gitRemote;