@elizaos/app-core 2.0.0-alpha.416 → 2.0.0-alpha.418

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/app-core",
-  "version": "2.0.0-alpha.416",
+  "version": "2.0.0-alpha.418",
   "description": "Shared application core for elizaOS white-label agent apps.",
   "type": "module",
   "license": "MIT",
@@ -464,7 +464,7 @@
     "@capacitor/preferences": "^8.0.1",
     "@capacitor/push-notifications": "^8.0.0",
     "@clack/prompts": "^1.0.0",
-    "@elizaos/agent": "^2.0.0-alpha.416",
+    "@elizaos/agent": "^2.0.0-alpha.418",
     "@elizaos/app-companion": "^0.0.0",
     "@elizaos/app-elizamaker": "^0.0.0",
     "@elizaos/app-lifeops": "^0.0.0",
@@ -473,12 +473,12 @@
     "@elizaos/app-task-coordinator": "^0.0.0",
     "@elizaos/app-training": "^0.0.1",
     "@elizaos/app-vincent": "^0.0.0",
-    "@elizaos/core": "^2.0.0-alpha.416",
+    "@elizaos/core": "^2.0.0-alpha.418",
     "@elizaos/plugin-browser-bridge": "^0.1.0",
     "@elizaos/plugin-sql": "^2.0.0-alpha.19",
     "@elizaos/plugin-wechat": "^0.1.0",
-    "@elizaos/shared": "^2.0.0-alpha.416",
-    "@elizaos/ui": "^2.0.0-alpha.416",
+    "@elizaos/shared": "^2.0.0-alpha.418",
+    "@elizaos/ui": "^2.0.0-alpha.418",
     "@node-rs/argon2": "^2.0.2",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-dialog": "^1.1.15",

package/packages/agent/src/api/accounts-routes.js

@@ -466,20 +466,16 @@ async function handleOAuthRoutes(ctx, providerId, rest) {
             writeLinkedAccount(ctx.state.config, linkedConfig);
             ctx.saveConfig(ctx.state.config);
         };
+        const startFlow = subscription === "anthropic-subscription"
+            ? startAnthropicOAuthFlow
+            : startCodexOAuthFlow;
         let handle;
         try {
-            handle =
-                subscription === "anthropic-subscription"
-                    ? await startAnthropicOAuthFlow({
-                        label: parsed.data.label,
-                        accountId,
-                        onAccountSaved,
-                    })
-                    : await startCodexOAuthFlow({
-                        label: parsed.data.label,
-                        accountId,
-                        onAccountSaved,
-                    });
+            handle = await startFlow({
+                label: parsed.data.label,
+                accountId,
+                onAccountSaved,
+            });
         }
         catch (err) {
             logger.error(`[accounts] Failed to start ${providerId} OAuth flow: ${String(err)}`);

package/packages/app-core/src/components/apps/helpers.d.ts

@@ -3,7 +3,7 @@ export declare const DEFAULT_VIEWER_SANDBOX = "allow-scripts allow-same-origin a
 export declare const CATEGORY_LABELS: Record<string, string>;
 export type AppCatalogSectionKey = "featured" | "favorites" | "games" | "developerUtilities" | "finance" | "other";
 export declare const APP_CATALOG_SECTION_LABELS: Record<AppCatalogSectionKey, string>;
-export declare const APPS_VIEW_HIDDEN_APP_NAMES: readonly ["@elizaos/app", "@elizaos/app-browser", "@elizaos/app-form", "@elizaos/app-knowledge", "@elizaos/app-screenshare", "@elizaos/app-task-coordinator"];
+export declare const APPS_VIEW_HIDDEN_APP_NAMES: readonly ["@elizaos/app", "app-counter", "@elizaos/app-browser", "@elizaos/app-form", "@elizaos/app-knowledge", "@elizaos/app-screenshare", "@elizaos/app-task-coordinator"];
 export interface AppCatalogSection {
     key: AppCatalogSectionKey;
     label: string;

package/packages/app-core/src/components/apps/helpers.d.ts.map

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

package/packages/app-core/src/components/apps/helpers.js

@@ -19,6 +19,7 @@ export const APP_CATALOG_SECTION_LABELS = {
 };
 export const APPS_VIEW_HIDDEN_APP_NAMES = [
     "@elizaos/app",
+    "app-counter",
     "@elizaos/app-browser",
     "@elizaos/app-form",
     "@elizaos/app-knowledge",

package/packages/app-core/src/services/account-pool.d.ts

@@ -56,6 +56,7 @@ export declare class AccountPool {
     }): Promise<void>;
     refreshUsage(accountId: string, accessToken: string, opts?: {
         codexAccountId?: string;
+        fetch?: typeof fetch;
     }): Promise<void>;
     markRateLimited(accountId: string, untilMs: number, detail?: string): Promise<void>;
     markNeedsReauth(accountId: string, detail?: string): Promise<void>;

package/packages/app-core/src/services/account-pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-pool.d.ts","sourceRoot":"","sources":["../../../../../src/services/account-pool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAiBH,OAAO,KAAK,EACV,mBAAmB,EAGnB,uBAAuB,EAEvB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,aAAa,GACb,YAAY,GACZ,aAAa,CAAC;AAElB,MAAM,MAAM,cAAc,GACtB,uBAAuB,GACvB,eAAe,GACf,YAAY,CAAC;AAEjB,MAAM,WAAW,eAAe;IAC9B,sDAAsD;IACtD,YAAY,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACxD,iDAAiD;IACjD,YAAY,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAWD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;gBAE1D,IAAI,EAAE,eAAe;IAM3B,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IA+BrE,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,aAAa;IAiCf,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,EAAE,EAAE,OAAO,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,IAAI,CAAC;IAWV,YAAY,CAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,GACjC,OAAO,CAAC,IAAI,CAAC;IA2BV,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAkBV,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnD;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAc1C;AA4ND;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,IAAI,WAAW,CAWnD;AA0ED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,WAAW,CAEtD;AAED;;GAEG;AACH,wBAAgB,iCAAiC,IAAI,IAAI,CAExD;AAED,YAAY,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"account-pool.d.ts","sourceRoot":"","sources":["../../../../../src/services/account-pool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAiBH,OAAO,KAAK,EACV,mBAAmB,EAGnB,uBAAuB,EAEvB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,aAAa,GACb,YAAY,GACZ,aAAa,CAAC;AAElB,MAAM,MAAM,cAAc,GACtB,uBAAuB,GACvB,eAAe,GACf,YAAY,CAAC;AAEjB,MAAM,WAAW,eAAe;IAC9B,sDAAsD;IACtD,YAAY,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACxD,iDAAiD;IACjD,YAAY,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAWD,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;gBAE1D,IAAI,EAAE,eAAe;IAM3B,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IA+BrE,OAAO,CAAC,cAAc;IA6BtB,OAAO,CAAC,aAAa;IAiCf,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,EAAE,EAAE,OAAO,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,IAAI,CAAC;IAWV,YAAY,CAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;KAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IA2BV,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAkBV,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnD;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAc1C;AAuND;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,IAAI,WAAW,CAWnD;AAyED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,WAAW,CAEtD;AAED;;GAEG;AACH,wBAAgB,iCAAiC,IAAI,IAAI,CAExD;AAED,YAAY,EAAE,oBAAoB,EAAE,CAAC"}

package/packages/app-core/src/services/account-pool.js

@@ -132,14 +132,14 @@ export class AccountPool {
             return;
         let usage;
         if (account.providerId === "anthropic-subscription") {
-            usage = await pollAnthropicUsage(accessToken);
+            usage = await pollAnthropicUsage(accessToken, opts?.fetch);
         }
         else if (account.providerId === "openai-codex") {
             const codexAccountId = opts?.codexAccountId ?? account.organizationId;
             if (!codexAccountId) {
                 throw new Error(`[AccountPool] Codex usage probe needs the OpenAI account_id (account ${accountId} has no organizationId).`);
             }
-            usage = await pollCodexUsage(accessToken, codexAccountId);
+            usage = await pollCodexUsage(accessToken, codexAccountId, opts?.fetch);
         }
         else {
             // No probe defined for direct API providers.
@@ -300,9 +300,7 @@ function recordToLinked(record, meta, providerId, defaultPriority) {
             : {}),
         ...(meta?.healthDetail ? { healthDetail: meta.healthDetail } : {}),
         ...(meta?.usage ? { usage: meta.usage } : {}),
-        ...(record.organizationId
-            ? { organizationId: record.organizationId }
-            : {}),
+        ...(record.organizationId ? { organizationId: record.organizationId } : {}),
         ...(record.userId ? { userId: record.userId } : {}),
         ...(record.email ? { email: record.email } : {}),
     };
@@ -449,7 +447,8 @@ function installSubscriptionSelectorShim(pool) {
             return account?.id ?? null;
         },
     };
-    globalThis[SUBSCRIPTION_SELECTOR_SHIM_SYMBOL] = shim;
+    globalThis[SUBSCRIPTION_SELECTOR_SHIM_SYMBOL] =
+        shim;
 }
 /**
  * @deprecated kept for compatibility with the WS2 spec naming. Use

package/packages/app-core/src/services/account-usage.d.ts

@@ -29,6 +29,7 @@ export interface UsageEntry {
     model?: string;
     errorCode?: string;
 }
+type FetchLike = typeof fetch;
 /**
  * Probe Anthropic's OAuth usage endpoint.
  *
@@ -41,7 +42,7 @@ export interface UsageEntry {
  * (`five_hour: { utilization }`) response shapes. Throws on any HTTP
  * error with the status code included in the message.
  */
-export declare function pollAnthropicUsage(accessToken: string): Promise<UsageSnapshot>;
+export declare function pollAnthropicUsage(accessToken: string, fetchImpl?: FetchLike): Promise<UsageSnapshot>;
 /**
  * Probe Codex / ChatGPT's usage endpoint.
  *
@@ -53,7 +54,7 @@ export declare function pollAnthropicUsage(accessToken: string): Promise<UsageSn
  * `used_percent` is already on the 0..100 scale. `reset_at` is epoch
  * seconds. Codex has no weekly equivalent, so `weeklyPct` stays undefined.
  */
-export declare function pollCodexUsage(accessToken: string, accountId: string): Promise<UsageSnapshot>;
+export declare function pollCodexUsage(accessToken: string, accountId: string, fetchImpl?: FetchLike): Promise<UsageSnapshot>;
 /**
  * Append a usage entry for the given `(providerId, accountId)` pair.
  * One line per call, written synchronously with mode 0o600. The day
@@ -70,4 +71,5 @@ export interface DailyCounters {
  * fail to parse are skipped silently (best-effort).
  */
 export declare function readTodayCounters(providerId: string, accountId: string): DailyCounters;
+export {};
 //# sourceMappingURL=account-usage.d.ts.map

package/packages/app-core/src/services/account-usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-usage.d.ts","sourceRoot":"","sources":["../../../../../src/services/account-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACvD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsCD;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,aAAa,CAAC,CAiCxB;AAaD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CA6BxB;AA8BD;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAC5B,IAAI,CAYN;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,aAAa,CA0Bf"}
+{"version":3,"file":"account-usage.d.ts","sourceRoot":"","sources":["../../../../../src/services/account-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACvD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,KAAK,SAAS,GAAG,OAAO,KAAK,CAAC;AAmC9B;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,SAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAiCxB;AAaD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,SAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CA6BxB;AA8BD;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAC5B,IAAI,CAYN;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,aAAa,CA0Bf"}

package/packages/app-core/src/services/account-usage.js

@@ -47,8 +47,8 @@ function normalizeResetTimestamp(value) {
  * (`five_hour: { utilization }`) response shapes. Throws on any HTTP
  * error with the status code included in the message.
  */
-export async function pollAnthropicUsage(accessToken) {
-    const res = await fetch(ANTHROPIC_USAGE_URL, {
+export async function pollAnthropicUsage(accessToken, fetchImpl = fetch) {
+    const res = await fetchImpl(ANTHROPIC_USAGE_URL, {
         method: "GET",
         headers: {
             Authorization: `Bearer ${accessToken}`,
@@ -86,8 +86,8 @@ export async function pollAnthropicUsage(accessToken) {
  * `used_percent` is already on the 0..100 scale. `reset_at` is epoch
  * seconds. Codex has no weekly equivalent, so `weeklyPct` stays undefined.
  */
-export async function pollCodexUsage(accessToken, accountId) {
-    const res = await fetch(CODEX_USAGE_URL, {
+export async function pollCodexUsage(accessToken, accountId, fetchImpl = fetch) {
+    const res = await fetchImpl(CODEX_USAGE_URL, {
         method: "GET",
         headers: {
             Authorization: `Bearer ${accessToken}`,