feat: show wallet credits in auth status

Author: ElgoogUdiab

README.md

@@ -63,7 +63,8 @@ file mode 0600 on POSIX); they are not encrypted. On Windows, storage inherits
 the user's directory ACLs. `HYPER3D_CONFIG_DIR` can change that directory.
 `auth status` (alias `auth info`) verifies credentials by calling the existing
 `POST /api/user/get_info` HTTP API. It displays the username, user UUID, and the
-balance/frozen credits of the authorized billing workspace. For team grants it
+separate regular, subscription and frozen credit balances of an authorized personal
+workspace. Team workspaces display their separate regular and frozen balances. For team grants it
 also calls `POST /api/group/group_info` with the group UUID returned by the server.
 It does not call MCP tools or query wallet usage. Expired stored access tokens
 are refreshed once; environment tokens are used as supplied. Without credentials

packages/cli/README.md

@@ -35,8 +35,9 @@ The backend redirects to `https://hyper3d.ai/workspace/oauth/device?interaction=
 the CLI always opens the verification URL returned by the server.
 Client identity is managed internally; no client configuration or localhost
 listener is required. `hyper3d auth status` (alias `hyper3d auth info`) displays
-your username, user UUID and the authorized personal/team wallet's balance and
-frozen credits using the existing HTTP APIs. No MCP tool or usage query is needed.
+your username, user UUID and the authorized wallet's separate credit balances.
+Personal wallets show subscription, regular and frozen credits; team wallets show
+regular and frozen credits. No MCP tool or usage query is needed.
 Account lookup requires backend `account:read` support and the updated official
 client metadata. Run `hyper3d auth login` again to authorize it for an older login.
 Stored credentials refresh automatically after access-token expiry; network and

packages/cli/src/account.js

@@ -1,6 +1,8 @@
 import {auth} from '@modelcontextprotocol/sdk/client/auth.js';
 import {loadCredentials, createProvider, secureUrl} from './auth.js';
 
+const WALLET_UNITS_PER_CREDIT = 10;
+
 export async function accountInfo(endpoint, {token = process.env.HYPER3D_ACCESS_TOKEN, fetchFn = fetch} = {}) {
   const base = secureUrl(endpoint);
   if (!base.pathname.replace(/\/$/, '').endsWith('/mcp'))
@@ -44,7 +46,16 @@ export async function accountInfo(endpoint, {token = process.env.HYPER3D_ACCESS_
     throw new Error('Invalid user information returned by server.');
   let wallet;
   if (workspace?.type === 'personal') {
-    wallet = {type: 'personal', balance: meta.balance, frozen: meta.frozen};
+    const activeSubscriptions = meta.subscriptions?.active_subscriptions;
+    if (!Array.isArray(activeSubscriptions))
+      throw new Error('Server did not return valid subscription balances for the authorized wallet.');
+    const subscriptionBalance = activeSubscriptions.reduce((total, subscription) => {
+      if (!Number.isFinite(subscription?.wallet_balance))
+        throw new Error('Server did not return valid subscription balances for the authorized wallet.');
+      return total + subscription.wallet_balance;
+    }, 0);
+    wallet = {type: 'personal', balance: meta.balance,
+      subscription_balance: subscriptionBalance, frozen: meta.frozen};
   } else if (workspace?.type === 'group' && typeof workspace.group_uuid === 'string' && workspace.group_uuid) {
     const result = await post('group/group_info', {group_uuid: workspace.group_uuid});
     if (result.group_meta?.uuid !== workspace.group_uuid)
@@ -56,5 +67,13 @@ export async function accountInfo(endpoint, {token = process.env.HYPER3D_ACCESS_
   }
   if (!Number.isFinite(wallet.balance) || !Number.isFinite(wallet.frozen))
     throw new Error('Server did not return a valid balance for the authorized wallet.');
-  return {authenticated: true, user: {uuid: meta.user_uuid, username: meta.username}, wallet};
+  const displayedWallet = {
+    ...wallet,
+    balance: wallet.balance / WALLET_UNITS_PER_CREDIT,
+    frozen: wallet.frozen / WALLET_UNITS_PER_CREDIT,
+    ...(wallet.type === 'personal' ? {
+      subscription_balance: wallet.subscription_balance / WALLET_UNITS_PER_CREDIT,
+    } : {}),
+  };
+  return {authenticated: true, user: {uuid: meta.user_uuid, username: meta.username}, wallet: displayedWallet};
 }

packages/cli/src/index.js

@@ -28,7 +28,7 @@ authentication.command('login')
   .option('--no-browser', 'Print the verification link and code without opening a browser')
   .action(async options => { await login(cli.opts().endpoint, {browser: options.browser}); print({authenticated: true}); });
 authentication.command('logout').action(async () => { await logout(cli.opts().endpoint); print({localCredentialsRemoved: true}); });
-authentication.command('status').alias('info').description('Show your account and authorized wallet balance')
+authentication.command('status').alias('info').description('Show your account and authorized wallet credit balances')
   .action(async () => print(await accountInfo(cli.opts().endpoint)));
 const operation = action => {
   const contract = selectedContract();

test/account.test.js

@@ -11,7 +11,8 @@ import {accountInfo} from '../packages/cli/src/account.js';
 import {createProvider, loadCredentials, CLI_CLIENT_ID} from '../packages/cli/src/auth.js';
 
 const endpoint = 'https://api.example.com/api/mcp';
-const user = {user_uuid: 'user-1', username: 'fixture', balance: 125, frozen: 5};
+const user = {user_uuid: 'user-1', username: 'fixture', balance: 125, frozen: 5,
+  subscriptions: {active_subscriptions: [{wallet_balance: 40}, {wallet_balance: 60}]}};
 const json = (body, status = 200) => new Response(JSON.stringify(body), {
   status, headers: {'Content-Type': 'application/json'},
 });
@@ -44,7 +45,7 @@ test('personal account status uses the account HTTP API and its authorized walle
   }});
   assert.deepEqual(calls, ['https://api.example.com/api/user/get_info']);
   assert.deepEqual(result, {authenticated: true, user: {uuid: 'user-1', username: 'fixture'},
-    wallet: {type: 'personal', balance: 125, frozen: 5}});
+    wallet: {type: 'personal', balance: 12.5, subscription_balance: 10, frozen: 0.5}});
 });
 
 test('team account status requests only the team bound to the grant', async () => {
@@ -56,7 +57,7 @@ test('team account status requests only the team bound to the grant', async () =
       : json({group_meta: {uuid: 'team-1', name: 'Fixture team', frozen: 9}, balance: 800});
   }});
   assert.deepEqual(calls, [['/api/user/get_info', {}], ['/api/group/group_info', {group_uuid: 'team-1'}]]);
-  assert.deepEqual(result.wallet, {type: 'group', group_uuid: 'team-1', name: 'Fixture team', balance: 800, frozen: 9});
+  assert.deepEqual(result.wallet, {type: 'group', group_uuid: 'team-1', name: 'Fixture team', balance: 80, frozen: 0.9});
 });
 
 test('account status reports HTTP, server and network errors without treating them as logout', async () => {
@@ -74,6 +75,8 @@ test('account status rejects missing workspace, invalid identity and invalid wal
     [{meta: user}, /authorized billing workspace/],
     [{meta: {...user, user_uuid: ''}, billing_workspace: {type: 'personal'}}, /Invalid user information/],
     [{meta: {...user, balance: '125'}, billing_workspace: {type: 'personal'}}, /valid balance/],
+    [{meta: {...user, subscriptions: null}, billing_workspace: {type: 'personal'}}, /valid subscription balances/],
+    [{meta: {...user, subscriptions: {active_subscriptions: [{wallet_balance: null}]}}, billing_workspace: {type: 'personal'}}, /valid subscription balances/],
     [{meta: {...user, frozen: null}, billing_workspace: {type: 'personal'}}, /valid balance/],
   ]) await assert.rejects(accountInfo(endpoint, {token: 'fixture-token', fetchFn: async () => json(body)}), message);
   let calls = 0;
@@ -127,7 +130,8 @@ test('auth status and info alias return JSON over real HTTP; authorization error
   try {
     for (const command of ['status', 'info']) {
       const result = await run(command, 'fixture-token');
-      assert.equal(JSON.parse(result.stdout).wallet.balance, 125);
+      assert.deepEqual(JSON.parse(result.stdout).wallet, {
+        type: 'personal', balance: 12.5, subscription_balance: 10, frozen: 0.5});
       assert.equal(result.stderr, '');
     }
     assert.equal(JSON.parse((await run('status', '')).stdout).authenticated, false);