aweshare 0.3.6 → 0.3.8

package/apps/hub/dist/table.d.ts

@@ -4,18 +4,65 @@ export declare function formatTable(headers: string[], rows: string[][]): string
 export declare function fmtTime(iso: string | null | undefined): string;
 export interface InviteListRow {
     id: number;
+    role: 'producer' | 'consumer';
     name: string | null;
     created_at: string;
     expires_at: string | null;
     revoked_at: string | null;
     redeemed_at: string | null;
     producer_id: number | null;
-    /** Suspension state of the producer this invite redeemed (NULL while pending). */
+    consumer_id: number | null;
+    /** Suspension state of the identity this invite redeemed (NULL while pending). */
     producer_revoked_at?: string | null;
-    /** The producer token this invite minted (NULL while pending) — shown with --token. */
+    consumer_revoked_at?: string | null;
+    /** The token this invite minted (NULL while pending) — shown with --token. */
     producer_name?: string | null;
     producer_last_seen_at?: string | null;
+    consumer_name?: string | null;
+    consumer_last_seen_at?: string | null;
     /** Present only with --reveal — codes stay recoverable, tokens never were. */
     code?: string | null;
 }
 export declare function renderInvites(invites: InviteListRow[], reveal?: boolean, tokens?: boolean): string;
+/** Rows of GET /admin/v1/tokens (hash-only view of the identity tables). */
+export interface ProducerListRow {
+    id: number;
+    name: string;
+    email: string | null;
+    created_at: string;
+    revoked_at: string | null;
+    last_seen_at: string | null;
+}
+export interface ConsumerListRow {
+    id: number;
+    name: string;
+    created_at: string;
+    revoked_at: string | null;
+    last_seen_at: string | null;
+}
+export declare function renderProducers(rows: ProducerListRow[]): string;
+export declare function renderConsumers(rows: ConsumerListRow[]): string;
+/** Rows of GET /admin/v1/usage (one per proxied request; zero content stored). */
+export interface UsageRow {
+    id: number;
+    at: string;
+    consumer_id: number;
+    producer_id: number;
+    alias: string;
+    upstream_model: string;
+    protocol: string;
+    streaming: number;
+    status: number | null;
+    error_code: string | null;
+    duration_ms: number;
+    bytes_in: number;
+    bytes_out: number;
+    prompt_tokens: number | null;
+    completion_tokens: number | null;
+}
+/**
+ * Newest-first usage log; the CLI maps consumer ids to names via the roster
+ * (fallback '#id'). Token counts are best-effort — NULL (Ollama streams)
+ * renders as '-'.
+ */
+export declare function renderUsage(rows: UsageRow[], consumerName: (id: number) => string): string;

package/apps/hub/dist/table.js

@@ -13,12 +13,14 @@ export function fmtTime(iso) {
     return iso ? `${iso.slice(0, 16).replace('T', ' ')}Z` : '-';
 }
 /**
- * Lifecycle derived from timestamps: a redeemed code mirrors its producer's
+ * Lifecycle derived from timestamps: a redeemed code mirrors its identity's
  * suspension (used > suspended), then revoked, then expired, else pending.
  */
 function inviteStatus(inv, now) {
-    if (inv.redeemed_at)
-        return inv.producer_revoked_at ? 'suspended' : 'used';
+    if (inv.redeemed_at) {
+        const suspended = inv.producer_revoked_at ?? inv.consumer_revoked_at;
+        return suspended ? 'suspended' : 'used';
+    }
     if (inv.revoked_at)
         return 'revoked';
     if (inv.expires_at && Date.parse(inv.expires_at) <= now)
@@ -31,6 +33,7 @@ export function renderInvites(invites, reveal = false, tokens = false) {
     const now = Date.now();
     return formatTable([
         'ID',
+        'ROLE',
         'BOUND TO',
         'CREATED',
         'EXPIRES',
@@ -39,17 +42,65 @@ export function renderInvites(invites, reveal = false, tokens = false) {
         ...(reveal ? ['CODE'] : []),
     ], invites.map((i) => [
         String(i.id),
+        i.role,
         i.name ?? '-',
         fmtTime(i.created_at),
         fmtTime(i.expires_at),
         inviteStatus(i, now),
         ...(tokens
             ? [
-                i.producer_id !== null ? `#${i.producer_id} ${i.producer_name ?? '-'}` : '-',
-                fmtTime(i.producer_last_seen_at),
+                i.producer_id !== null
+                    ? `#${i.producer_id} ${i.producer_name ?? '-'}`
+                    : i.consumer_id !== null
+                        ? `#${i.consumer_id} ${i.consumer_name ?? '-'}`
+                        : '-',
+                fmtTime(i.producer_last_seen_at ?? i.consumer_last_seen_at),
             ]
             : []),
         ...(reveal ? [i.code ?? '-'] : []),
     ]));
 }
+export function renderProducers(rows) {
+    if (rows.length === 0)
+        return 'no producers — mint invites with: aweshare hub invite --name NAME';
+    return formatTable(['ID', 'NAME', 'EMAIL', 'STATUS', 'LAST SEEN', 'CREATED'], rows.map((p) => [
+        String(p.id),
+        p.name,
+        p.email ?? '-',
+        p.revoked_at ? 'suspended' : 'active',
+        fmtTime(p.last_seen_at),
+        fmtTime(p.created_at),
+    ]));
+}
+export function renderConsumers(rows) {
+    if (rows.length === 0)
+        return 'no consumers — invite one with: aweshare hub invite --role consumer --name NAME';
+    return formatTable(['ID', 'NAME', 'STATUS', 'LAST SEEN', 'CREATED'], rows.map((c) => [
+        String(c.id),
+        c.name,
+        c.revoked_at ? 'suspended' : 'active',
+        fmtTime(c.last_seen_at),
+        fmtTime(c.created_at),
+    ]));
+}
+/**
+ * Newest-first usage log; the CLI maps consumer ids to names via the roster
+ * (fallback '#id'). Token counts are best-effort — NULL (Ollama streams)
+ * renders as '-'.
+ */
+export function renderUsage(rows, consumerName) {
+    if (rows.length === 0)
+        return 'no usage yet — rows appear after the first consumer request';
+    return formatTable(['TIME', 'CONSUMER', 'ALIAS', 'MODEL', 'STATUS', 'TOOK', 'TOKENS'], rows.map((r) => [
+        fmtTime(r.at),
+        consumerName(r.consumer_id),
+        r.alias,
+        r.upstream_model,
+        r.error_code ? `${r.status ?? '-'} ${r.error_code}` : String(r.status ?? '-'),
+        `${r.duration_ms}ms`,
+        r.prompt_tokens === null && r.completion_tokens === null
+            ? '-'
+            : `${r.prompt_tokens ?? 0}+${r.completion_tokens ?? 0}`,
+    ]));
+}
 //# sourceMappingURL=table.js.map

package/apps/hub/dist/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.js","sourceRoot":"","sources":["../src/table.ts"],"names":[],"mappings":"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"}

package/bin/aweshare.mjs

@@ -27,7 +27,7 @@ Options:
   -h, --help        Show this message and exit.
 
 Commands:
-  hub <command>     Run the hub: init, serve, invite, list, revoke, restore.
+  hub <command>     Run the hub: init, serve, invite, list, limits, usage, revoke, restore.
   agent <command>   Run the producer agent: init, join, config, doctor, start, grant, revoke, list.
   self-update       Update the aweshare CLI itself.`)
     return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aweshare",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "type": "module",
   "description": "Open-source, local-first AI capability relay",
   "license": "UNLICENSED",