@dotobokuri/fleet-console 1.59.0 → 1.60.0

package/dist/fleet-plugins/quota/routes.mjs

@@ -19160,10 +19160,12 @@ function parseClaudeCredentialJson(raw, method) {
     const oauth = credentialRecord(parsed.claudeAiOauth);
     const accessToken = optionalString(oauth?.accessToken ?? parsed.accessToken);
     if (!accessToken) return null;
+    const rateLimitTier = optionalString(oauth?.rateLimitTier ?? parsed.rateLimitTier);
     return {
       accessToken,
       expiresAt: optionalEpoch(oauth?.expiresAt ?? parsed.expiresAt),
       subscriptionType: optionalString(oauth?.subscriptionType ?? parsed.subscriptionType),
+      ...rateLimitTier === void 0 ? {} : { rateLimitTier },
       method
     };
   } catch {
@@ -19192,6 +19194,13 @@ async function resolveClaudeCredentials(deps) {
   }
 }
 var CLAUDE_SESSION_MS = 5 * HOUR_MS;
+function formatClaudePlan(subscriptionType, rateLimitTier) {
+  const base = titleCase(subscriptionType);
+  if (!base) return void 0;
+  if (base.toLowerCase() !== "max" || typeof rateLimitTier !== "string") return base;
+  const match = /\d+x/i.exec(rateLimitTier.trim());
+  return match ? titleCase(`${base} ${match[0].toLowerCase()}`) : base;
+}
 function firstClaudePercent(row) {
   for (const key of ["percent", "used_percentage", "utilization"]) {
     const value = row[key];
@@ -19275,7 +19284,7 @@ async function fetchClaudeUsage(deps = {}) {
     return {
       status: "ok",
       method: credentials.method,
-      plan: titleCase(credentials.subscriptionType),
+      plan: formatClaudePlan(credentials.subscriptionType, credentials.rateLimitTier),
       windows: parsed.windows,
       fetchedAt: (deps.now ?? Date.now)()
     };
@@ -19320,6 +19329,17 @@ function codexWindow(source, fallbackId) {
     ...period ? { period } : {}
   };
 }
+function formatCodexPlan(value) {
+  if (typeof value !== "string") return titleCase(value);
+  switch (value.trim().toLowerCase()) {
+    case "prolite":
+      return "Pro 5x";
+    case "pro":
+      return "Pro 20x";
+    default:
+      return titleCase(value);
+  }
+}
 function parseCodexUsage(payload) {
   const root = object2(payload) ?? {};
   const rateLimit = object2(root.rate_limit) ?? {};
@@ -19328,7 +19348,7 @@ function parseCodexUsage(payload) {
       codexWindow(rateLimit.primary_window, "session"),
       codexWindow(rateLimit.secondary_window, "weekly")
     ].filter((row) => row !== null),
-    plan: titleCase(root.plan_type)
+    plan: formatCodexPlan(root.plan_type)
   };
 }
 function parseResetCredits(payload) {
@@ -19788,6 +19808,7 @@ async function resolveXaiCliAuth(deps, options = {}) {
   }
 }
 var XAI_CLI_CREDITS_URL = "https://cli-chat-proxy.grok.com/v1/billing?format=credits";
+var XAI_CLI_SETTINGS_URL = "https://cli-chat-proxy.grok.com/v1/settings";
 var WEEKLY_PERIOD = "USAGE_PERIOD_TYPE_WEEKLY";
 function parseXaiCredits(payload) {
   const root = object2(payload);
@@ -19821,6 +19842,9 @@ function parseXaiCredits(payload) {
     }
   };
 }
+function parseXaiPlan(payload) {
+  return titleCase(object2(payload)?.subscription_tier_display);
+}
 function creditsHeaders(credentials) {
   const headers = {
     Accept: "application/json",
@@ -19865,8 +19889,15 @@ async function fetchXaiUsage(deps = {}) {
     }
     const parsed = parseXaiCredits(payload);
     if (!parsed) throw new Error("Grok returned an unsupported quota response");
+    let plan;
+    try {
+      plan = parseXaiPlan(await getJson(fetchImpl, XAI_CLI_SETTINGS_URL, creditsHeaders(credentials)));
+    } catch {
+      plan = void 0;
+    }
     return {
       status: "ok",
+      ...plan ? { plan } : {},
       windows: parsed.status === "weekly" ? [parsed.window] : [],
       fetchedAt: now()
     };

package/dist/fleet-plugins/scuttlebutt/routes.mjs

@@ -20177,7 +20177,7 @@ fact interesting without decorating it.`,
 function buildAdmiralSystemPrompt(name, species, bearing, voice) {
   return `# Role
 
-You are Admiral ${name}, ${species} of the Fleet Console \u2014 a small uniformed bird
+You are Aide ${name}, ${species} of the Fleet Console \u2014 a small uniformed bird
 who keeps station at the scuttlebutt, where the crew stops for water and quick
 talk. You are a quick-answer companion, not a coding agent: no project of your
 own, no repository checked out, no engineering assignment. You are who the crew
@@ -20186,9 +20186,9 @@ asks when they want an answer without leaving what they were doing.
 # Who you are talking to
 
 The person writing to you is the Admiral of the Navy \u2014 your commanding officer,
-several ranks above you. Take their questions as orders and answer promptly,
-with the respect the rank is due. Writing in Korean, call them \uB300\uC6D0\uC218 \u2014 never
-\uC81C\uB3C5, which is your own rank and would put them at your level.
+far above you. Take their questions as orders and answer promptly, with the
+respect the rank is due. Writing in Korean, call them \uB300\uC6D0\uC218 \u2014 never
+\uBD80\uAD00, which is your own rank and would put them at your level.
 
 Respect means telling them the truth: if they are working from a wrong premise,
 say so and give them the right one. Never flatter, and never claim to have
@@ -20221,7 +20221,7 @@ ${bearing}
   is not reading this machine; the ban above is about local files and shell,
   nothing else.
 - Never describe yourself as a coding assistant or list software-engineering
-  capabilities. If asked what you are, answer as Admiral ${name} in a sentence or two.
+  capabilities. If asked what you are, answer as Aide ${name} in a sentence or two.
 - Never disclose file paths, directory names, session identifiers, or details of
   the machine you run on.
 - Answer in the language the user wrote in.