@elizaos/agent 2.0.0-alpha.98 → 2.0.0-beta.2

package/packages/agent/src/api/agent-admin-routes.d.ts

@@ -1,9 +1,7 @@
-import type { AgentRuntime, UUID } from "@elizaos/core";
-import type { RouteHelpers, RouteRequestMeta } from "./route-helpers";
+import type { AgentRuntime, RouteRequestMeta, UUID } from "@elizaos/core";
+import type { RouteHelpers } from "@elizaos/shared";
+import type { AutonomousConfigLike } from "../types/config-like.ts";
 type AgentStateStatus = "not_started" | "starting" | "running" | "paused" | "stopped" | "restarting" | "error";
-interface AutonomousConfigLike {
-    [key: string]: unknown;
-}
 export interface AgentAdminRouteState {
     runtime: AgentRuntime | null;
     config: AutonomousConfigLike;
@@ -20,6 +18,9 @@ export interface AgentAdminRouteState {
     } | null;
     chatConnectionPromise: Promise<void> | null;
     pendingRestartReasons: string[];
+    conversations?: Map<string, unknown>;
+    activeConversationId?: string | null;
+    conversationRestorePromise?: Promise<void> | null;
 }
 export interface AgentAdminRouteContext extends RouteRequestMeta, Pick<RouteHelpers, "json" | "error"> {
     state: AgentAdminRouteState;

package/packages/agent/src/api/agent-admin-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-admin-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-admin-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEtE,KAAK,gBAAgB,GACjB,aAAa,GACb,UAAU,GACV,SAAS,GACT,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,OAAO,CAAC;AAEZ,UAAU,oBAAoB;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,mBAAmB,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC1E,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC5C,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,sBACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,KAAK,EAAE,oBAAoB,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,mBAAmB,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzE,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,sBAAsB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAiIlB"}
+{"version":3,"file":"agent-admin-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-admin-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAOpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAIpE,KAAK,gBAAgB,GACjB,aAAa,GACb,UAAU,GACV,SAAS,GACT,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,OAAO,CAAC;AAiCZ,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,mBAAmB,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC1E,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC5C,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,0BAA0B,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,sBACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,KAAK,EAAE,oBAAoB,CAAC;IAC5B,SAAS,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACvC,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,mBAAmB,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzE,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAqBD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,sBAAsB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAqMlB"}

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

@@ -1,4 +1,37 @@
-import { detectRuntimeModel } from "./agent-model";
+import path from "node:path";
+import { getDefaultStylePreset, normalizeCharacterLanguage, } from "@elizaos/shared";
+import { loadElizaConfig, saveElizaConfig } from "../config/config.js";
+import { resolveUserPath } from "../config/paths.js";
+import { detectRuntimeModel } from "./agent-model.js";
+import { clearPersistedOnboardingConfig } from "./provider-switch-config.js";
+async function importAppCoreRuntime() {
+    // String-literal dynamic import — see comment in
+    // ../runtime/eliza.ts#importAppCoreRuntime for the AOSP bundle issue
+    // that requires Bun.build to statically follow this specifier.
+    return import(
+    /* webpackIgnore: true */ "@elizaos/app-core");
+}
+function resolveDefaultAgentName(config) {
+    const ui = config.ui;
+    const agents = config.agents;
+    const configuredName = ui?.assistant?.name?.trim() ?? agents?.list?.[0]?.name?.trim();
+    if (configuredName) {
+        return configuredName;
+    }
+    return getDefaultStylePreset(normalizeCharacterLanguage(ui?.language)).name;
+}
+function resolveResetPgliteDataDir(config, stateDir) {
+    const explicitDataDir = process.env.PGLITE_DATA_DIR?.trim();
+    if (explicitDataDir) {
+        return resolveUserPath(explicitDataDir);
+    }
+    const configuredDataDir = config.database?.pglite?.dataDir?.trim();
+    if (configuredDataDir) {
+        return resolveUserPath(configuredDataDir);
+    }
+    const workspaceDir = config.agents?.defaults?.workspace ?? `${stateDir}/workspace`;
+    return path.join(resolveUserPath(workspaceDir), ".eliza", ".elizadb");
+}
 export async function handleAgentAdminRoutes(ctx) {
     const { res, method, pathname, state, onRestart, onRuntimeSwapped, json, error, resolveStateDir, resolvePath, getHomeDir, isSafeResetStateDir, stateDirExists, removeStateDir, logWarn, } = ctx;
     if (method === "POST" && pathname === "/api/agent/restart") {
@@ -19,7 +52,8 @@ export async function handleAgentAdminRoutes(ctx) {
                 state.chatConnectionReady = null;
                 state.chatConnectionPromise = null;
                 state.agentState = "running";
-                state.agentName = newRuntime.character.name ?? "Eliza";
+                state.agentName =
+                    newRuntime.character.name ?? resolveDefaultAgentName(state.config);
                 state.model = detectRuntimeModel(newRuntime);
                 state.startedAt = Date.now();
                 state.pendingRestartReasons = [];
@@ -50,13 +84,73 @@ export async function handleAgentAdminRoutes(ctx) {
     if (method === "POST" && pathname === "/api/agent/reset") {
         try {
             if (state.runtime) {
-                try {
-                    await state.runtime.stop();
-                }
-                catch (stopErr) {
-                    const message = stopErr instanceof Error ? stopErr.message : String(stopErr);
-                    logWarn(`[eliza-api] Error stopping runtime during reset: ${message}`);
+                await state.runtime.stop();
+                state.runtime = null;
+            }
+            const stateDir = resolveStateDir();
+            const config = loadElizaConfig();
+            const dataDir = resolveResetPgliteDataDir(config, stateDir);
+            if (path.basename(dataDir) !== ".elizadb") {
+                logWarn(`[eliza-api] Refusing to delete unexpected PGlite dir during reset: "${dataDir}"`);
+            }
+            else if (stateDirExists(dataDir)) {
+                removeStateDir(dataDir);
+            }
+            clearPersistedOnboardingConfig(config);
+            saveElizaConfig(config);
+            // Wipe cloud-related vault entries so the next boot doesn't re-hydrate
+            // the user back into a "signed in to Eliza Cloud" state. Without this,
+            // /api/agent/reset clears the renderer UI but the vault still holds
+            // ELIZAOS_CLOUD_API_KEY → vault-bootstrap rehydrates env on next start
+            // → useCloudState reports cloud connected → user sees themselves still
+            // logged in even though they just hit "Reset".
+            try {
+                const { sharedVault } = await importAppCoreRuntime();
+                const vault = sharedVault();
+                const cloudKeys = [
+                    "ELIZAOS_CLOUD_API_KEY",
+                    "ELIZAOS_CLOUD_BASE_URL",
+                    "ELIZAOS_CLOUD_ENABLED",
+                ];
+                for (const key of cloudKeys) {
+                    try {
+                        await vault.remove(key);
+                    }
+                    catch {
+                        // Entry may not exist — fine.
+                    }
                 }
+                // (No marker file to remove — vault-bootstrap is now keyed off
+                // per-key vault.has() checks and re-evaluates cleanly on every boot.)
+            }
+            catch (vaultErr) {
+                logWarn(`[eliza-api] Reset: failed to wipe cloud vault entries: ${vaultErr instanceof Error ? vaultErr.message : String(vaultErr)}`);
+            }
+            state.agentState = "stopped";
+            state.agentName = resolveDefaultAgentName(config);
+            state.model = undefined;
+            state.startedAt = undefined;
+            state.config = config;
+            state.chatRoomId = null;
+            state.chatUserId = null;
+            state.chatConnectionReady = null;
+            state.chatConnectionPromise = null;
+            state.pendingRestartReasons = [];
+            state.conversations?.clear();
+            state.activeConversationId = null;
+            state.conversationRestorePromise = null;
+            json(res, { ok: true });
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            error(res, `Reset failed: ${message}`, 500);
+        }
+        return true;
+    }
+    if (method === "POST" && pathname === "/api@elizaos/agent/reset") {
+        try {
+            if (state.runtime) {
+                await state.runtime.stop();
                 state.runtime = null;
             }
             const stateDir = resolveStateDir();
@@ -72,7 +166,7 @@ export async function handleAgentAdminRoutes(ctx) {
                 removeStateDir(resolvedState);
             }
             state.agentState = "stopped";
-            state.agentName = "Eliza";
+            state.agentName = getDefaultStylePreset().name;
             state.model = undefined;
             state.startedAt = undefined;
             state.config = {};
@@ -81,6 +175,9 @@ export async function handleAgentAdminRoutes(ctx) {
             state.chatConnectionReady = null;
             state.chatConnectionPromise = null;
             state.pendingRestartReasons = [];
+            state.conversations?.clear();
+            state.activeConversationId = null;
+            state.conversationRestorePromise = null;
             json(res, { ok: true });
         }
         catch (err) {

package/packages/agent/src/api/agent-lifecycle-routes.d.ts

@@ -1,5 +1,5 @@
-import type { AgentRuntime } from "@elizaos/core";
-import type { RouteHelpers, RouteRequestMeta } from "./route-helpers";
+import type { AgentRuntime, RouteRequestMeta } from "@elizaos/core";
+import type { RouteHelpers } from "@elizaos/shared";
 type AgentStateStatus = "not_started" | "starting" | "running" | "paused" | "stopped" | "restarting" | "error";
 export interface AgentLifecycleRouteState {
     runtime: AgentRuntime | null;

package/packages/agent/src/api/agent-lifecycle-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-lifecycle-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-lifecycle-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEtE,KAAK,gBAAgB,GACjB,aAAa,GACb,UAAU,GACV,SAAS,GACT,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AAED,MAAM,WAAW,0BACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,GAAG,cAAc,CAAC;IACvD,KAAK,EAAE,wBAAwB,CAAC;CACjC;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,0BAA0B,GAC9B,OAAO,CAAC,OAAO,CAAC,CA0FlB"}
+{"version":3,"file":"agent-lifecycle-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-lifecycle-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,KAAK,gBAAgB,GACjB,aAAa,GACb,UAAU,GACV,SAAS,GACT,QAAQ,GACR,SAAS,GACT,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AAED,MAAM,WAAW,0BACf,SAAQ,gBAAgB,EACtB,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,GAAG,cAAc,CAAC;IACvD,KAAK,EAAE,wBAAwB,CAAC;CACjC;AAoBD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,0BAA0B,GAC9B,OAAO,CAAC,OAAO,CAAC,CAuGlB"}

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

@@ -1,4 +1,12 @@
-import { detectRuntimeModel } from "./agent-model";
+import { detectRuntimeModel } from "./agent-model.js";
+function isAutonomyToggleService(service) {
+    return (typeof service === "object" &&
+        service !== null &&
+        typeof service.enableAutonomy ===
+            "function" &&
+        typeof service.disableAutonomy ===
+            "function");
+}
 export async function handleAgentLifecycleRoutes(ctx) {
     const { req, res, method, pathname, state, error, json, readJsonBody } = ctx;
     const runtime = state.runtime;
@@ -72,6 +80,19 @@ export async function handleAgentLifecycleRoutes(ctx) {
             error(res, "Agent runtime is not available", 503);
             return true;
         }
+        // Set the property AND call the service method so the batcher
+        // section is actually registered/unregistered.
+        const autonomySvc = runtime.getService?.("AUTONOMY") ?? runtime.getService?.("autonomy");
+        if (isAutonomyToggleService(autonomySvc)) {
+            if (body.enabled) {
+                await autonomySvc.enableAutonomy();
+            }
+            else {
+                await autonomySvc.disableAutonomy();
+            }
+        }
+        // Always sync the property — enableAutonomy()/disableAutonomy() set it
+        // internally, but if the service path wasn't taken, set it directly.
         runtime.enableAutonomy = body.enabled;
         json(res, { enabled: runtime.enableAutonomy === true });
         return true;

package/packages/agent/src/api/agent-model.d.ts

@@ -1,12 +1,5 @@
 import type { AgentRuntime } from "@elizaos/core";
-export declare function detectRuntimeModel(runtime: AgentRuntime | null, config?: {
-    agents?: {
-        defaults?: {
-            model?: {
-                primary?: string;
-            };
-        };
-    };
-}): string | undefined;
+import type { ElizaConfig } from "../config/config.ts";
+export declare function detectRuntimeModel(runtime: AgentRuntime | null, config?: Pick<ElizaConfig, "deploymentTarget" | "serviceRouting" | "agents">): string | undefined;
 export declare function resolveProviderFromModel(model: string): string | null;
 //# sourceMappingURL=agent-model.d.ts.map

package/packages/agent/src/api/agent-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-model.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAwElD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,GAAG,IAAI,EAC5B,MAAM,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE;gBAAE,OAAO,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,GACpE,MAAM,GAAG,SAAS,CAiCpB;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgCrE"}
+{"version":3,"file":"agent-model.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AA+FvD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,GAAG,IAAI,EAC5B,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,kBAAkB,GAAG,gBAAgB,GAAG,QAAQ,CAAC,GAC3E,MAAM,GAAG,SAAS,CAqEpB;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA+BrE"}

package/packages/agent/src/api/agent-model.js

@@ -1,8 +1,17 @@
+import { normalizeOnboardingProviderId, resolveDeploymentTargetInConfig, resolveServiceRoutingInConfig, } from "@elizaos/shared";
 const MODEL_PLACEHOLDERS = new Set(["", "n/a", "na", "unknown", "provided"]);
 const PROVIDER_HINTS = [
     "openai-codex",
     "openai-subscription",
     "anthropic-subscription",
+    "gemini-subscription",
+    "gemini-cli",
+    "zai-coding-subscription",
+    "zai-coding",
+    "kimi-coding-subscription",
+    "kimi-coding",
+    "deepseek-coding-subscription",
+    "deepseek-coding",
     "openrouter",
     "moonshot",
     "kimi",
@@ -12,9 +21,12 @@ const PROVIDER_HINTS = [
     "groq",
     "gemini",
     "google",
+    "grok",
     "xai",
     "ollama",
-    "pi-ai",
+    "mistral",
+    "together",
+    "zai",
 ];
 const ENV_PROVIDER_SIGNALS = [
     { envVar: "ANTHROPIC_API_KEY", label: "anthropic" },
@@ -22,8 +34,20 @@ const ENV_PROVIDER_SIGNALS = [
     { envVar: "OPENROUTER_API_KEY", label: "openrouter" },
     { envVar: "GROQ_API_KEY", label: "groq" },
     { envVar: "GOOGLE_GENERATIVE_AI_API_KEY", label: "gemini" },
-    { envVar: "XAI_API_KEY", label: "xai" },
+    { envVar: "XAI_API_KEY", label: "grok" },
     { envVar: "DEEPSEEK_API_KEY", label: "deepseek" },
+    { envVar: "MISTRAL_API_KEY", label: "mistral" },
+    { envVar: "TOGETHER_API_KEY", label: "together" },
+    { envVar: "ZAI_API_KEY", label: "zai" },
+    { envVar: "MOONSHOT_API_KEY", label: "moonshot" },
+    { envVar: "OLLAMA_BASE_URL", label: "ollama" },
+    // The aosp-local-inference plugin sets ELIZA_LOCAL_LLAMA=1 when it
+    // registers the bundled llama.cpp model handlers at agent boot.
+    // Without this signal `detectRuntimeModel` returns undefined on AOSP
+    // installs, the API surface reports no `model` field, and the React
+    // shell's chat composer locks behind "Setup Provider To Chat" even
+    // though llama is loaded and ready.
+    { envVar: "ELIZA_LOCAL_LLAMA", label: "aosp-local-llama" },
 ];
 function normalizeModelSpec(value) {
     if (typeof value !== "string")
@@ -63,6 +87,30 @@ export function detectRuntimeModel(runtime, config) {
     const configured = readCharacterModel(runtime);
     if (configured)
         return configured;
+    const routing = resolveServiceRoutingInConfig((config ?? null));
+    const deploymentTarget = resolveDeploymentTargetInConfig((config ?? null));
+    const llmText = routing?.llmText;
+    const backend = normalizeOnboardingProviderId(llmText?.backend);
+    if (llmText?.transport === "direct") {
+        const provider = backend && backend !== "elizacloud" ? backend : undefined;
+        return llmText.primaryModel ?? provider;
+    }
+    if (llmText?.transport === "remote") {
+        const provider = backend && backend !== "elizacloud" ? backend : undefined;
+        return (llmText.primaryModel ??
+            provider ??
+            llmText.remoteApiBase ??
+            deploymentTarget.remoteApiBase);
+    }
+    if (llmText?.transport === "cloud-proxy" && backend === "elizacloud") {
+        return (llmText.responseModel ??
+            llmText.largeModel ??
+            llmText.megaModel ??
+            llmText.mediumModel ??
+            llmText.smallModel ??
+            llmText.nanoModel ??
+            backend);
+    }
     const configModel = normalizeModelSpec(config?.agents?.defaults?.model?.primary);
     if (configModel)
         return configModel;
@@ -105,7 +153,6 @@ export function resolveProviderFromModel(model) {
         { match: "mistral", label: "Mistral" },
         { match: "together", label: "Together AI" },
         { match: "cohere", label: "Cohere" },
-        { match: "pi-ai", label: "Pi AI" },
         { match: "moonshot", label: "Moonshot" },
         { match: "kimi", label: "Kimi" },
     ];

package/packages/agent/src/api/agent-status-routes.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Agent self-status and ERC-8004 registry inline routes.
+ *
+ * Extracted from server.ts to reduce file size.
+ */
+import type http from "node:http";
+import type { ReadJsonBodyOptions } from "@elizaos/core";
+import type { ElizaConfig } from "../config/config.ts";
+interface RegistryServiceStatic {
+    defaultCapabilitiesHash: () => string;
+}
+interface AwarenessRegistryLike {
+    composeSummary: (runtime: unknown) => Promise<string>;
+}
+export interface AgentStatusRouteDeps {
+    getWalletAddresses: () => {
+        evmAddress: string | null;
+        solanaAddress: string | null;
+    };
+    resolveWalletCapabilityStatus: (state: unknown) => {
+        walletSource: string;
+        hasWallet: boolean;
+        hasEvm: boolean;
+        evmAddress: string | null;
+        localSignerAvailable: boolean;
+        rpcReady: boolean;
+        pluginEvmLoaded: boolean;
+        pluginEvmRequired: boolean;
+        executionReady: boolean;
+        executionBlockedReason: string | null;
+        automationMode: string;
+    };
+    resolveWalletRpcReadiness: (config: ElizaConfig) => {
+        managedBscRpcReady: boolean;
+    };
+    resolveTradePermissionMode: (config: ElizaConfig) => string;
+    canUseLocalTradeExecution: (mode: string, isAgentRequest: boolean, unused?: undefined, opts?: {
+        consumeAgentQuota: boolean;
+    }) => boolean;
+    detectRuntimeModel: (runtime: unknown, config: ElizaConfig) => string | undefined;
+    resolveProviderFromModel: (model: string) => string | null;
+    getGlobalAwarenessRegistry: () => AwarenessRegistryLike | null;
+    RegistryService: RegistryServiceStatic;
+}
+export interface AgentStatusRouteState {
+    config: ElizaConfig;
+    runtime: {
+        plugins: Array<{
+            name: string;
+        }>;
+        character: {
+            name?: string;
+        };
+    } | null;
+    agentState: string;
+    agentName: string;
+    model?: string;
+    startedAt?: number;
+    shellEnabled?: boolean;
+}
+export interface AgentStatusRouteContext {
+    req: http.IncomingMessage;
+    res: http.ServerResponse;
+    method: string;
+    pathname: string;
+    url: URL;
+    state: AgentStatusRouteState;
+    json: (res: http.ServerResponse, data: unknown, status?: number) => void;
+    error: (res: http.ServerResponse, message: string, status?: number) => void;
+    readJsonBody: <T extends object>(req: http.IncomingMessage, res: http.ServerResponse, options?: ReadJsonBodyOptions) => Promise<T | null>;
+    deps: AgentStatusRouteDeps;
+}
+export declare function handleAgentStatusRoutes(ctx: AgentStatusRouteContext): Promise<boolean>;
+export {};
+//# sourceMappingURL=agent-status-routes.d.ts.map

package/packages/agent/src/api/agent-status-routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-status-routes.d.ts","sourceRoot":"","sources":["../../../../../src/api/agent-status-routes.ts"],"names":[],"mappings":"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"}