@nextclaw/server 0.6.4 → 0.6.6

package/dist/index.d.ts

@@ -57,6 +57,7 @@ type ProviderConnectionTestResult = {
 type ProviderAuthStartResult = {
     provider: string;
     kind: "device_code";
+    methodId?: string;
     sessionId: string;
     verificationUri: string;
     userCode: string;
@@ -64,6 +65,9 @@ type ProviderAuthStartResult = {
     intervalMs: number;
     note?: string;
 };
+type ProviderAuthStartRequest = {
+    methodId?: string;
+};
 type ProviderAuthPollRequest = {
     sessionId: string;
 };
@@ -296,6 +300,21 @@ type ChatCapabilitiesView = {
     stopSupported: boolean;
     stopReason?: string;
 };
+type ChatCommandOptionView = {
+    name: string;
+    description: string;
+    type: "string" | "boolean" | "number";
+    required?: boolean;
+};
+type ChatCommandView = {
+    name: string;
+    description: string;
+    options?: ChatCommandOptionView[];
+};
+type ChatCommandsView = {
+    commands: ChatCommandView[];
+    total: number;
+};
 type ChatTurnStopRequest = {
     runId: string;
     sessionKey?: string;
@@ -402,6 +421,18 @@ type ProviderSpecView = {
             en?: string;
             zh?: string;
         };
+        methods?: Array<{
+            id: string;
+            label?: {
+                en?: string;
+                zh?: string;
+            };
+            hint?: {
+                en?: string;
+                zh?: string;
+            };
+        }>;
+        defaultMethodId?: string;
         supportsCliImport?: boolean;
     };
     defaultModels?: string[];
@@ -491,7 +522,9 @@ type ConfigActionExecuteResult = {
 };
 type MarketplaceItemType = "plugin" | "skill";
 type MarketplaceSort = "relevance" | "updated";
-type MarketplaceInstallKind = "npm" | "clawhub" | "git" | "builtin";
+type MarketplacePluginInstallKind = "npm";
+type MarketplaceSkillInstallKind = "builtin" | "marketplace";
+type MarketplaceInstallKind = MarketplacePluginInstallKind | MarketplaceSkillInstallKind;
 type MarketplaceInstallSpec = {
     kind: MarketplaceInstallKind;
     spec: string;
@@ -522,7 +555,7 @@ type MarketplaceSkillContentView = {
     slug: string;
     name: string;
     install: MarketplaceInstallSpec;
-    source: "workspace" | "builtin" | "git" | "remote";
+    source: "builtin" | "marketplace" | "remote";
     raw: string;
     metadataRaw?: string;
     bodyRaw: string;
@@ -578,11 +611,9 @@ type MarketplaceInstalledView = {
 };
 type MarketplaceInstallSkillParams = {
     slug: string;
-    kind?: MarketplaceInstallKind;
+    kind?: MarketplaceSkillInstallKind;
     skill?: string;
     installPath?: string;
-    version?: string;
-    registry?: string;
     force?: boolean;
 };
 type MarketplacePluginInstallRequest = {
@@ -592,11 +623,9 @@ type MarketplacePluginInstallRequest = {
 type MarketplaceSkillInstallRequest = {
     type?: "skill";
     spec: string;
-    kind?: MarketplaceInstallKind;
+    kind?: MarketplaceSkillInstallKind;
     skill?: string;
     installPath?: string;
-    version?: string;
-    registry?: string;
     force?: boolean;
 };
 type MarketplacePluginInstallResult = {
@@ -679,6 +708,11 @@ type UiServerEvent = {
     payload: {
         run: ChatRunView;
     };
+} | {
+    type: "session.updated";
+    payload: {
+        sessionKey: string;
+    };
 } | {
     type: "config.reload.started";
     payload?: Record<string, unknown>;
@@ -758,4 +792,4 @@ declare function deleteSession(configPath: string, key: string): boolean;
 declare function updateRuntime(configPath: string, patch: RuntimeConfigUpdate): Pick<ConfigView, "agents" | "bindings" | "session">;
 declare function updateSecrets(configPath: string, patch: SecretsConfigUpdate): SecretsView;
 
-export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type BindingPeerView, type ChannelSpecView, type ChatCapabilitiesView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatTurnRequest, type ChatTurnResult, type ChatTurnStopRequest, type ChatTurnStopResult, type ChatTurnStreamEvent, type ChatTurnView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type CronActionResult, type CronEnableRequest, type CronJobStateView, type CronJobView, type CronListView, type CronPayloadView, type CronRunRequest, type CronScheduleView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceLocalizedTextMap, type MarketplacePluginContentView, type MarketplacePluginInstallRequest, type MarketplacePluginInstallResult, type MarketplacePluginManageAction, type MarketplacePluginManageRequest, type MarketplacePluginManageResult, type MarketplaceRecommendationView, type MarketplaceSkillContentView, type MarketplaceSkillInstallRequest, type MarketplaceSkillInstallResult, type MarketplaceSkillManageAction, type MarketplaceSkillManageRequest, type MarketplaceSkillManageResult, type MarketplaceSort, type ProviderAuthImportResult, type ProviderAuthPollRequest, type ProviderAuthPollResult, type ProviderAuthStartResult, type ProviderConfigUpdate, type ProviderConfigView, type ProviderConnectionTestRequest, type ProviderConnectionTestResult, type ProviderCreateRequest, type ProviderCreateResult, type ProviderDeleteResult, type ProviderSpecView, type RuntimeConfigUpdate, type SecretProviderEnvView, type SecretProviderExecView, type SecretProviderFileView, type SecretProviderView, type SecretRefView, type SecretSourceView, type SecretsConfigUpdate, type SecretsView, type SessionConfigView, type SessionEntryView, type SessionEventView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiChatRuntime, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSecrets };
+export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type BindingPeerView, type ChannelSpecView, type ChatCapabilitiesView, type ChatCommandOptionView, type ChatCommandView, type ChatCommandsView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatTurnRequest, type ChatTurnResult, type ChatTurnStopRequest, type ChatTurnStopResult, type ChatTurnStreamEvent, type ChatTurnView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type CronActionResult, type CronEnableRequest, type CronJobStateView, type CronJobView, type CronListView, type CronPayloadView, type CronRunRequest, type CronScheduleView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceLocalizedTextMap, type MarketplacePluginContentView, type MarketplacePluginInstallKind, type MarketplacePluginInstallRequest, type MarketplacePluginInstallResult, type MarketplacePluginManageAction, type MarketplacePluginManageRequest, type MarketplacePluginManageResult, type MarketplaceRecommendationView, type MarketplaceSkillContentView, type MarketplaceSkillInstallKind, type MarketplaceSkillInstallRequest, type MarketplaceSkillInstallResult, type MarketplaceSkillManageAction, type MarketplaceSkillManageRequest, type MarketplaceSkillManageResult, type MarketplaceSort, type ProviderAuthImportResult, type ProviderAuthPollRequest, type ProviderAuthPollResult, type ProviderAuthStartRequest, type ProviderAuthStartResult, type ProviderConfigUpdate, type ProviderConfigView, type ProviderConnectionTestRequest, type ProviderConnectionTestResult, type ProviderCreateRequest, type ProviderCreateResult, type ProviderDeleteResult, type ProviderSpecView, type RuntimeConfigUpdate, type SecretProviderEnvView, type SecretProviderExecView, type SecretProviderFileView, type SecretProviderView, type SecretRefView, type SecretSourceView, type SecretsConfigUpdate, type SecretsView, type SessionConfigView, type SessionEntryView, type SessionEventView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiChatRuntime, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSecrets };

package/dist/index.js

@@ -5,12 +5,11 @@ import { cors } from "hono/cors";
 import { serve } from "@hono/node-server";
 import { WebSocketServer, WebSocket } from "ws";
 import { existsSync, readFileSync } from "fs";
-import { readFile as readFile3, stat } from "fs/promises";
+import { readFile as readFile2, stat } from "fs/promises";
 import { join } from "path";
 
 // src/ui/router.ts
 import { Hono } from "hono";
-import { readFile as readFile2 } from "fs/promises";
 import * as NextclawCore from "@nextclaw/core";
 import { buildPluginStatusReport } from "@nextclaw/openclaw-compat";
 
@@ -29,7 +28,96 @@ import {
   SessionManager,
   getWorkspacePathFromConfig
 } from "@nextclaw/core";
+
+// src/ui/provider-overrides.ts
 import { findBuiltinProviderByName, listBuiltinProviders } from "@nextclaw/runtime";
+var MINIMAX_PORTAL_PROVIDER_SPEC = {
+  name: "minimax-portal",
+  keywords: ["minimax-portal", "minimax"],
+  envKey: "MINIMAX_PORTAL_TOKEN",
+  displayName: "MiniMax Portal",
+  modelPrefix: "minimax-portal",
+  litellmPrefix: "minimax-portal",
+  skipPrefixes: ["minimax-portal/"],
+  envExtras: [],
+  isGateway: false,
+  isLocal: false,
+  detectByKeyPrefix: "",
+  detectByBaseKeyword: "",
+  defaultApiBase: "https://api.minimax.io/v1",
+  defaultModels: ["minimax-portal/MiniMax-M2.5", "minimax-portal/MiniMax-M2.5-highspeed"],
+  stripModelPrefix: false,
+  modelOverrides: [],
+  logo: "minimax.svg",
+  apiBaseHelp: {
+    zh: "OAuth Global \u9ED8\u8BA4\u4F7F\u7528 https://api.minimax.io/v1\uFF1BOAuth \u4E2D\u56FD\u533A\u9ED8\u8BA4\u4F7F\u7528 https://api.minimaxi.com/v1\u3002",
+    en: "OAuth Global uses https://api.minimax.io/v1 by default; OAuth CN uses https://api.minimaxi.com/v1."
+  },
+  auth: {
+    kind: "device_code",
+    protocol: "minimax_user_code",
+    displayName: "MiniMax OAuth",
+    baseUrl: "https://api.minimax.io",
+    deviceCodePath: "/oauth/code",
+    tokenPath: "/oauth/token",
+    clientId: "78257093-7e40-4613-99e0-527b14b39113",
+    scope: "group_id profile model.completion",
+    grantType: "urn:ietf:params:oauth:grant-type:user_code",
+    usePkce: true,
+    defaultMethodId: "cn",
+    methods: [
+      {
+        id: "global",
+        label: {
+          zh: "Global\uFF08\u6D77\u5916\uFF09",
+          en: "Global"
+        },
+        hint: {
+          zh: "\u9002\u7528\u4E8E\u6D77\u5916\u7528\u6237\uFF0C\u9ED8\u8BA4 API Base \u4E3A https://api.minimax.io/v1\u3002",
+          en: "For international users. Default API base: https://api.minimax.io/v1."
+        },
+        baseUrl: "https://api.minimax.io",
+        defaultApiBase: "https://api.minimax.io/v1"
+      },
+      {
+        id: "cn",
+        label: {
+          zh: "\u4E2D\u56FD\u533A\uFF08CN\uFF09",
+          en: "China Mainland (CN)"
+        },
+        hint: {
+          zh: "\u9002\u7528\u4E8E\u4E2D\u56FD\u533A\u7528\u6237\uFF0C\u9ED8\u8BA4 API Base \u4E3A https://api.minimaxi.com/v1\u3002",
+          en: "For Mainland China users. Default API base: https://api.minimaxi.com/v1."
+        },
+        baseUrl: "https://api.minimaxi.com",
+        defaultApiBase: "https://api.minimaxi.com/v1"
+      }
+    ],
+    note: {
+      zh: "\u901A\u8FC7\u6D4F\u89C8\u5668\u5B8C\u6210 MiniMax OAuth \u6388\u6743\u540E\u5373\u53EF\u4F7F\u7528\uFF0C\u65E0\u9700\u624B\u52A8\u586B\u5199 API Key\u3002",
+      en: "Complete MiniMax OAuth in browser to use this provider without manually entering an API key."
+    }
+  }
+};
+var SERVER_BUILTIN_PROVIDER_OVERRIDES = [MINIMAX_PORTAL_PROVIDER_SPEC];
+var SERVER_BUILTIN_PROVIDER_OVERRIDE_MAP = new Map(
+  SERVER_BUILTIN_PROVIDER_OVERRIDES.map((provider) => [provider.name, provider])
+);
+function listServerBuiltinProviders() {
+  const merged = /* @__PURE__ */ new Map();
+  for (const provider of listBuiltinProviders()) {
+    merged.set(provider.name, provider);
+  }
+  for (const provider of SERVER_BUILTIN_PROVIDER_OVERRIDES) {
+    merged.set(provider.name, provider);
+  }
+  return Array.from(merged.values());
+}
+function findServerBuiltinProviderByName(name) {
+  return SERVER_BUILTIN_PROVIDER_OVERRIDE_MAP.get(name) ?? findBuiltinProviderByName(name);
+}
+
+// src/ui/config.ts
 var MASK_MIN_LENGTH = 8;
 var EXTRA_SENSITIVE_PATH_PATTERNS = [/authorization/i, /cookie/i, /session/i, /bearer/i];
 var PREFERRED_PROVIDER_ORDER = [
@@ -47,7 +135,7 @@ var PREFERRED_PROVIDER_ORDER = [
 var PREFERRED_PROVIDER_ORDER_INDEX = new Map(
   PREFERRED_PROVIDER_ORDER.map((name, index) => [name, index])
 );
-var BUILTIN_PROVIDERS = listBuiltinProviders();
+var BUILTIN_PROVIDERS = listServerBuiltinProviders();
 var BUILTIN_PROVIDER_NAMES = new Set(BUILTIN_PROVIDERS.map((spec) => spec.name));
 var CUSTOM_PROVIDER_WIRE_API_OPTIONS = ["auto", "chat", "responses"];
 var CUSTOM_PROVIDER_PREFIX = "custom-";
@@ -108,7 +196,7 @@ function ensureProviderConfig(config, providerName) {
   if (isCustomProviderName(providerName)) {
     return null;
   }
-  const spec = findBuiltinProviderByName(providerName);
+  const spec = findServerBuiltinProviderByName(providerName);
   if (!spec) {
     return null;
   }
@@ -376,7 +464,7 @@ function buildConfigView(config) {
   const uiHints = buildUiHints(config);
   const providers = {};
   for (const [name, provider] of Object.entries(config.providers)) {
-    const spec = findBuiltinProviderByName(name);
+    const spec = findServerBuiltinProviderByName(name);
     providers[name] = toProviderView(config, provider, name, uiHints, spec);
   }
   return {
@@ -425,6 +513,12 @@ function buildConfigMeta(config) {
         kind: spec.auth.kind,
         displayName: spec.auth.displayName,
         note: spec.auth.note,
+        methods: spec.auth.methods?.map((method) => ({
+          id: method.id,
+          label: method.label,
+          hint: method.hint
+        })),
+        defaultMethodId: spec.auth.defaultMethodId,
         supportsCliImport: Boolean(spec.auth.cliCredential)
       } : void 0,
       defaultModels: normalizeModelList(spec.defaultModels ?? []),
@@ -555,7 +649,7 @@ function updateProvider(configPath, providerName, patch) {
   if (!provider) {
     return null;
   }
-  const spec = findBuiltinProviderByName(providerName);
+  const spec = findServerBuiltinProviderByName(providerName);
   const isCustom = isCustomProviderName(providerName);
   if (Object.prototype.hasOwnProperty.call(patch, "displayName") && isCustom) {
     provider.displayName = normalizeOptionalDisplayName(patch.displayName) ?? "";
@@ -690,7 +784,7 @@ async function testProviderConnection(configPath, providerName, patch) {
   if (!provider) {
     return null;
   }
-  const spec = findBuiltinProviderByName(providerName);
+  const spec = findServerBuiltinProviderByName(providerName);
   const hasApiKeyPatch = Object.prototype.hasOwnProperty.call(patch, "apiKey");
   const providedApiKey = normalizeOptionalString(patch.apiKey);
   const currentApiKey = normalizeOptionalString(provider.apiKey);
@@ -1038,7 +1132,6 @@ import {
   loadConfig as loadConfig2,
   saveConfig as saveConfig2
 } from "@nextclaw/core";
-import { findBuiltinProviderByName as findBuiltinProviderByName2 } from "@nextclaw/runtime";
 var authSessions = /* @__PURE__ */ new Map();
 var DEFAULT_AUTH_INTERVAL_MS = 2e3;
 var MAX_AUTH_INTERVAL_MS = 1e4;
@@ -1048,6 +1141,12 @@ function normalizePositiveInt(value, fallback) {
   }
   return Math.floor(value);
 }
+function normalizePositiveFloat(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
+    return null;
+  }
+  return value;
+}
 function toBase64Url(buffer) {
   return buffer.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
@@ -1074,6 +1173,113 @@ function resolveDeviceCodeEndpoints(baseUrl, deviceCodePath, tokenPath) {
 function resolveAuthNote(params) {
   return params.zh ?? params.en;
 }
+function resolveLocalizedMethodLabel(method, fallbackId) {
+  return method.label?.zh ?? method.label?.en ?? fallbackId;
+}
+function resolveLocalizedMethodHint(method) {
+  return method.hint?.zh ?? method.hint?.en;
+}
+function normalizeMethodId(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function resolveAuthMethod(auth, requestedMethodId) {
+  const protocol = auth.protocol ?? "rfc8628";
+  const methods = (auth.methods ?? []).filter((entry) => normalizeMethodId(entry.id));
+  const cleanRequestedMethodId = normalizeMethodId(requestedMethodId);
+  if (methods.length === 0) {
+    if (cleanRequestedMethodId) {
+      throw new Error(`provider auth method is not supported: ${cleanRequestedMethodId}`);
+    }
+    return {
+      protocol,
+      baseUrl: auth.baseUrl,
+      deviceCodePath: auth.deviceCodePath,
+      tokenPath: auth.tokenPath,
+      clientId: auth.clientId,
+      scope: auth.scope,
+      grantType: auth.grantType,
+      usePkce: Boolean(auth.usePkce)
+    };
+  }
+  let selectedMethod = methods.find((entry) => normalizeMethodId(entry.id) === cleanRequestedMethodId);
+  if (!selectedMethod) {
+    const fallbackMethodId = normalizeMethodId(auth.defaultMethodId) ?? normalizeMethodId(methods[0]?.id);
+    selectedMethod = methods.find((entry) => normalizeMethodId(entry.id) === fallbackMethodId) ?? methods[0];
+  }
+  const methodId = normalizeMethodId(selectedMethod?.id);
+  if (!selectedMethod || !methodId) {
+    throw new Error("provider auth method is not configured");
+  }
+  if (cleanRequestedMethodId && methodId !== cleanRequestedMethodId) {
+    throw new Error(`provider auth method is not supported: ${cleanRequestedMethodId}`);
+  }
+  return {
+    id: methodId,
+    protocol,
+    baseUrl: selectedMethod.baseUrl ?? auth.baseUrl,
+    deviceCodePath: selectedMethod.deviceCodePath ?? auth.deviceCodePath,
+    tokenPath: selectedMethod.tokenPath ?? auth.tokenPath,
+    clientId: selectedMethod.clientId ?? auth.clientId,
+    scope: selectedMethod.scope ?? auth.scope,
+    grantType: selectedMethod.grantType ?? auth.grantType,
+    usePkce: selectedMethod.usePkce ?? Boolean(auth.usePkce),
+    defaultApiBase: selectedMethod.defaultApiBase
+  };
+}
+function parseExpiresAtMs(value, fallbackFromNowMs) {
+  const normalized = normalizePositiveFloat(value);
+  if (normalized === null) {
+    return Date.now() + fallbackFromNowMs;
+  }
+  if (normalized >= 1e12) {
+    return Math.floor(normalized);
+  }
+  if (normalized >= 1e9) {
+    return Math.floor(normalized * 1e3);
+  }
+  return Date.now() + Math.floor(normalized * 1e3);
+}
+function parsePollIntervalMs(value, fallbackMs) {
+  const normalized = normalizePositiveFloat(value);
+  if (normalized === null) {
+    return fallbackMs;
+  }
+  if (normalized <= 30) {
+    return Math.floor(normalized * 1e3);
+  }
+  return Math.floor(normalized);
+}
+function buildMinimaxErrorMessage(payload, fallback) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return fallback;
+  }
+  const record = payload;
+  if (typeof record.error_description === "string" && record.error_description.trim()) {
+    return record.error_description.trim();
+  }
+  if (typeof record.error === "string" && record.error.trim()) {
+    return record.error.trim();
+  }
+  const baseMessage = record.base_resp?.status_msg;
+  if (typeof baseMessage === "string" && baseMessage.trim()) {
+    return baseMessage.trim();
+  }
+  return fallback;
+}
+function classifyMiniMaxErrorStatus(message) {
+  const normalized = message.toLowerCase();
+  if (normalized.includes("deny") || normalized.includes("rejected")) {
+    return "denied";
+  }
+  if (normalized.includes("expired") || normalized.includes("timeout") || normalized.includes("timed out")) {
+    return "expired";
+  }
+  return "error";
+}
 function resolveHomePath(inputPath) {
   const trimmed = inputPath.trim();
   if (!trimmed) {
@@ -1138,70 +1344,125 @@ function setProviderApiKey(params) {
   const next = ConfigSchema2.parse(config);
   saveConfig2(next, params.configPath);
 }
-async function startProviderAuth(configPath, providerName) {
+async function startProviderAuth(configPath, providerName, options) {
   cleanupExpiredAuthSessions();
-  const spec = findBuiltinProviderByName2(providerName);
+  const spec = findServerBuiltinProviderByName(providerName);
   if (!spec?.auth || spec.auth.kind !== "device_code") {
     return null;
   }
+  const resolvedMethod = resolveAuthMethod(spec.auth, options?.methodId);
   const { deviceCodeEndpoint, tokenEndpoint } = resolveDeviceCodeEndpoints(
-    spec.auth.baseUrl,
-    spec.auth.deviceCodePath,
-    spec.auth.tokenPath
+    resolvedMethod.baseUrl,
+    resolvedMethod.deviceCodePath,
+    resolvedMethod.tokenPath
   );
-  const pkce = spec.auth.usePkce ? buildPkce() : null;
-  const body = new URLSearchParams({
-    client_id: spec.auth.clientId,
-    scope: spec.auth.scope
-  });
-  if (pkce) {
-    body.set("code_challenge", pkce.challenge);
-    body.set("code_challenge_method", "S256");
+  const pkce = resolvedMethod.usePkce ? buildPkce() : null;
+  let authorizationCode = "";
+  let tokenCodeField = "device_code";
+  let userCode = "";
+  let verificationUri = "";
+  let intervalMs = DEFAULT_AUTH_INTERVAL_MS;
+  let expiresAtMs = Date.now() + 6e5;
+  if (resolvedMethod.protocol === "minimax_user_code") {
+    if (!pkce) {
+      throw new Error("MiniMax OAuth requires PKCE");
+    }
+    const state = toBase64Url(randomBytes(16));
+    const body = new URLSearchParams({
+      response_type: "code",
+      client_id: resolvedMethod.clientId,
+      scope: resolvedMethod.scope,
+      code_challenge: pkce.challenge,
+      code_challenge_method: "S256",
+      state
+    });
+    const response = await fetch(deviceCodeEndpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
+        "x-request-id": randomUUID()
+      },
+      body
+    });
+    const payload = await response.json().catch(() => ({}));
+    if (!response.ok) {
+      throw new Error(buildMinimaxErrorMessage(payload, response.statusText || "MiniMax OAuth start failed"));
+    }
+    if (payload.state && payload.state !== state) {
+      throw new Error("MiniMax OAuth state mismatch");
+    }
+    authorizationCode = payload.user_code?.trim() ?? "";
+    userCode = authorizationCode;
+    verificationUri = payload.verification_uri?.trim() ?? "";
+    if (!authorizationCode || !verificationUri) {
+      throw new Error("provider auth payload is incomplete");
+    }
+    tokenCodeField = "user_code";
+    intervalMs = Math.min(parsePollIntervalMs(payload.interval, DEFAULT_AUTH_INTERVAL_MS), MAX_AUTH_INTERVAL_MS);
+    expiresAtMs = parseExpiresAtMs(payload.expired_in, 6e5);
+  } else {
+    const body = new URLSearchParams({
+      client_id: resolvedMethod.clientId,
+      scope: resolvedMethod.scope
+    });
+    if (pkce) {
+      body.set("code_challenge", pkce.challenge);
+      body.set("code_challenge_method", "S256");
+    }
+    const response = await fetch(deviceCodeEndpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json"
+      },
+      body
+    });
+    const payload = await response.json().catch(() => ({}));
+    if (!response.ok) {
+      const message = payload.error_description || payload.error || response.statusText || "device code auth failed";
+      throw new Error(message);
+    }
+    authorizationCode = payload.device_code?.trim() ?? "";
+    userCode = payload.user_code?.trim() ?? "";
+    verificationUri = payload.verification_uri_complete?.trim() || payload.verification_uri?.trim() || "";
+    if (!authorizationCode || !userCode || !verificationUri) {
+      throw new Error("provider auth payload is incomplete");
+    }
+    intervalMs = normalizePositiveInt(payload.interval, DEFAULT_AUTH_INTERVAL_MS / 1e3) * 1e3;
+    const expiresInSec = normalizePositiveInt(payload.expires_in, 600);
+    expiresAtMs = Date.now() + expiresInSec * 1e3;
   }
-  const response = await fetch(deviceCodeEndpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      Accept: "application/json"
-    },
-    body
-  });
-  const payload = await response.json().catch(() => ({}));
-  if (!response.ok) {
-    const message = payload.error_description || payload.error || response.statusText || "device code auth failed";
-    throw new Error(message);
-  }
-  const deviceCode = payload.device_code?.trim() ?? "";
-  const userCode = payload.user_code?.trim() ?? "";
-  const verificationUri = payload.verification_uri_complete?.trim() || payload.verification_uri?.trim() || "";
-  if (!deviceCode || !userCode || !verificationUri) {
-    throw new Error("provider auth payload is incomplete");
-  }
-  const intervalMs = normalizePositiveInt(payload.interval, DEFAULT_AUTH_INTERVAL_MS / 1e3) * 1e3;
-  const expiresInSec = normalizePositiveInt(payload.expires_in, 600);
-  const expiresAtMs = Date.now() + expiresInSec * 1e3;
   const sessionId = randomUUID();
   authSessions.set(sessionId, {
     sessionId,
     provider: providerName,
     configPath,
-    deviceCode,
+    authorizationCode,
+    tokenCodeField,
+    protocol: resolvedMethod.protocol,
+    methodId: resolvedMethod.id,
     codeVerifier: pkce?.verifier,
     tokenEndpoint,
-    clientId: spec.auth.clientId,
-    grantType: spec.auth.grantType,
+    clientId: resolvedMethod.clientId,
+    grantType: resolvedMethod.grantType,
+    defaultApiBase: resolvedMethod.defaultApiBase ?? spec.defaultApiBase,
     expiresAtMs,
     intervalMs
   });
+  const methodConfig = (spec.auth.methods ?? []).find((entry) => normalizeMethodId(entry.id) === resolvedMethod.id);
+  const methodLabel = methodConfig ? resolveLocalizedMethodLabel(methodConfig, resolvedMethod.id ?? "") : void 0;
+  const methodHint = methodConfig ? resolveLocalizedMethodHint(methodConfig) : void 0;
   return {
     provider: providerName,
     kind: "device_code",
+    methodId: resolvedMethod.id,
     sessionId,
     verificationUri,
     userCode,
     expiresAt: new Date(expiresAtMs).toISOString(),
     intervalMs,
-    note: resolveAuthNote(spec.auth.note ?? {})
+    note: methodHint ?? methodLabel ?? resolveAuthNote(spec.auth.note ?? {})
   };
 }
 async function pollProviderAuth(params) {
@@ -1220,9 +1481,9 @@ async function pollProviderAuth(params) {
   }
   const body = new URLSearchParams({
     grant_type: session.grantType,
-    client_id: session.clientId,
-    device_code: session.deviceCode
+    client_id: session.clientId
   });
+  body.set(session.tokenCodeField, session.authorizationCode);
   if (session.codeVerifier) {
     body.set("code_verifier", session.codeVerifier);
   }
@@ -1234,17 +1495,47 @@ async function pollProviderAuth(params) {
     },
     body
   });
-  const payload = await response.json().catch(() => ({}));
-  if (!response.ok) {
-    const errorCode = payload.error?.trim().toLowerCase();
-    if (errorCode === "authorization_pending") {
+  let accessToken = "";
+  if (session.protocol === "minimax_user_code") {
+    const raw = await response.text();
+    let payload = {};
+    if (raw) {
+      try {
+        payload = JSON.parse(raw);
+      } catch {
+        payload = {};
+      }
+    }
+    if (!response.ok) {
+      const message = buildMinimaxErrorMessage(payload, raw || response.statusText || "authorization failed");
       return {
         provider: params.providerName,
-        status: "pending",
-        nextPollMs: session.intervalMs
+        status: "error",
+        message
       };
     }
-    if (errorCode === "slow_down") {
+    const status = payload.status?.trim().toLowerCase();
+    if (status === "success") {
+      accessToken = payload.access_token?.trim() ?? "";
+      if (!accessToken) {
+        return {
+          provider: params.providerName,
+          status: "error",
+          message: "provider token response missing access token"
+        };
+      }
+    } else if (status === "error") {
+      const message = buildMinimaxErrorMessage(payload, "authorization failed");
+      const classified = classifyMiniMaxErrorStatus(message);
+      if (classified === "denied" || classified === "expired") {
+        authSessions.delete(params.sessionId);
+      }
+      return {
+        provider: params.providerName,
+        status: classified,
+        message
+      };
+    } else {
       const nextPollMs = Math.min(Math.floor(session.intervalMs * 1.5), MAX_AUTH_INTERVAL_MS);
       session.intervalMs = nextPollMs;
       authSessions.set(params.sessionId, session);
@@ -1254,42 +1545,63 @@ async function pollProviderAuth(params) {
         nextPollMs
       };
     }
-    if (errorCode === "access_denied") {
-      authSessions.delete(params.sessionId);
+  } else {
+    const payload = await response.json().catch(() => ({}));
+    if (!response.ok) {
+      const errorCode = payload.error?.trim().toLowerCase();
+      if (errorCode === "authorization_pending") {
+        return {
+          provider: params.providerName,
+          status: "pending",
+          nextPollMs: session.intervalMs
+        };
+      }
+      if (errorCode === "slow_down") {
+        const nextPollMs = Math.min(Math.floor(session.intervalMs * 1.5), MAX_AUTH_INTERVAL_MS);
+        session.intervalMs = nextPollMs;
+        authSessions.set(params.sessionId, session);
+        return {
+          provider: params.providerName,
+          status: "pending",
+          nextPollMs
+        };
+      }
+      if (errorCode === "access_denied") {
+        authSessions.delete(params.sessionId);
+        return {
+          provider: params.providerName,
+          status: "denied",
+          message: payload.error_description || "authorization denied"
+        };
+      }
+      if (errorCode === "expired_token") {
+        authSessions.delete(params.sessionId);
+        return {
+          provider: params.providerName,
+          status: "expired",
+          message: payload.error_description || "authorization session expired"
+        };
+      }
       return {
         provider: params.providerName,
-        status: "denied",
-        message: payload.error_description || "authorization denied"
+        status: "error",
+        message: payload.error_description || payload.error || response.statusText || "authorization failed"
       };
     }
-    if (errorCode === "expired_token") {
-      authSessions.delete(params.sessionId);
+    accessToken = payload.access_token?.trim() ?? "";
+    if (!accessToken) {
       return {
         provider: params.providerName,
-        status: "expired",
-        message: payload.error_description || "authorization session expired"
+        status: "error",
+        message: "provider token response missing access token"
       };
     }
-    return {
-      provider: params.providerName,
-      status: "error",
-      message: payload.error_description || payload.error || response.statusText || "authorization failed"
-    };
-  }
-  const accessToken = payload.access_token?.trim();
-  if (!accessToken) {
-    return {
-      provider: params.providerName,
-      status: "error",
-      message: "provider token response missing access token"
-    };
   }
-  const spec = findBuiltinProviderByName2(params.providerName);
   setProviderApiKey({
     configPath: params.configPath,
     provider: params.providerName,
     accessToken,
-    defaultApiBase: spec?.defaultApiBase
+    defaultApiBase: session.defaultApiBase
   });
   authSessions.delete(params.sessionId);
   return {
@@ -1298,7 +1610,7 @@ async function pollProviderAuth(params) {
   };
 }
 async function importProviderAuthFromCli(configPath, providerName) {
-  const spec = findBuiltinProviderByName2(providerName);
+  const spec = findServerBuiltinProviderByName(providerName);
   if (!spec?.auth || spec.auth.kind !== "device_code" || !spec.auth.cliCredential) {
     return null;
   }
@@ -1999,98 +2311,23 @@ function isSupportedMarketplaceSkillItem(item, knownSkillNames) {
   if (item.type !== "skill") {
     return false;
   }
-  if (item.install.kind === "git") {
+  if (item.install.kind === "marketplace") {
     return true;
   }
   return item.install.kind === "builtin" && knownSkillNames.has(item.install.spec);
 }
-function splitMarkdownFrontmatter(raw) {
-  const normalized = raw.replace(/\r\n/g, "\n");
-  const match = normalized.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
-  if (!match) {
-    return { bodyRaw: normalized };
-  }
-  return {
-    metadataRaw: match[1]?.trim() || void 0,
-    bodyRaw: match[2] ?? ""
-  };
-}
-async function loadLocalSkillMarkdown(options, skillName) {
-  const config = loadConfigOrDefault(options.configPath);
-  const loader = createSkillsLoader(getWorkspacePathFromConfig3(config));
-  if (!loader) {
-    return null;
-  }
-  const skillInfo = loader.listSkills(false).find((skill) => skill.name === skillName);
-  if (!skillInfo) {
-    return null;
-  }
-  try {
-    const raw = await readFile2(skillInfo.path, "utf-8");
-    return {
-      raw,
-      source: skillInfo.source
-    };
-  } catch {
-    return null;
-  }
-}
-function parseGitSkillSpec(rawSpec) {
-  const spec = rawSpec.trim();
-  if (!spec) {
-    return null;
-  }
-  const segments = spec.split("/").filter(Boolean);
-  if (segments.length < 3) {
-    return null;
-  }
-  return {
-    owner: segments[0] ?? "",
-    repo: segments[1] ?? "",
-    skillPath: segments.slice(2).join("/")
-  };
-}
-async function fetchTextWithFallback(urls) {
-  for (const url of urls) {
-    try {
-      const response = await fetch(url, {
-        method: "GET",
-        headers: {
-          Accept: "text/plain, text/markdown, application/json"
-        }
-      });
-      if (!response.ok) {
-        continue;
-      }
-      const text = await response.text();
-      if (text.trim().length === 0) {
-        continue;
-      }
-      return { text, url };
-    } catch {
+function findUnsupportedSkillInstallKind(items) {
+  for (const item of items) {
+    if (item.type !== "skill") {
       continue;
     }
+    const kind = item.install.kind;
+    if (kind !== "builtin" && kind !== "marketplace") {
+      return kind;
+    }
   }
   return null;
 }
-async function loadGitSkillMarkdownFromSpec(rawSpec) {
-  const parsed = parseGitSkillSpec(rawSpec);
-  if (!parsed) {
-    return null;
-  }
-  const candidates = [
-    `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/main/${parsed.skillPath}/SKILL.md`,
-    `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/master/${parsed.skillPath}/SKILL.md`
-  ];
-  const result = await fetchTextWithFallback(candidates);
-  if (!result) {
-    return null;
-  }
-  return {
-    raw: result.text,
-    sourceUrl: result.url
-  };
-}
 async function loadPluginReadmeFromNpm(spec) {
   const encodedSpec = encodeURIComponent(spec);
   const registryUrl = `https://registry.npmjs.org/${encodedSpec}`;
@@ -2124,40 +2361,6 @@ async function loadPluginReadmeFromNpm(spec) {
     return null;
   }
 }
-async function buildSkillContentView(options, item) {
-  const local = await loadLocalSkillMarkdown(options, item.install.spec);
-  if (local) {
-    const split = splitMarkdownFrontmatter(local.raw);
-    return {
-      type: "skill",
-      slug: item.slug,
-      name: item.name,
-      install: item.install,
-      source: local.source,
-      raw: local.raw,
-      metadataRaw: split.metadataRaw,
-      bodyRaw: split.bodyRaw
-    };
-  }
-  if (item.install.kind === "git") {
-    const remote = await loadGitSkillMarkdownFromSpec(item.install.spec);
-    if (remote) {
-      const split = splitMarkdownFrontmatter(remote.raw);
-      return {
-        type: "skill",
-        slug: item.slug,
-        name: item.name,
-        install: item.install,
-        source: "git",
-        raw: remote.raw,
-        metadataRaw: split.metadataRaw,
-        bodyRaw: split.bodyRaw,
-        sourceUrl: remote.sourceUrl
-      };
-    }
-  }
-  return null;
-}
 async function buildPluginContentView(item) {
   if (item.install.kind === "npm") {
     const npm = await loadPluginReadmeFromNpm(item.install.spec);
@@ -2276,8 +2479,6 @@ async function installMarketplaceSkill(params) {
     kind: params.body.kind,
     skill: params.body.skill,
     installPath: params.body.installPath,
-    version: params.body.version,
-    registry: params.body.registry,
     force: params.body.force
   });
   params.options.publish({ type: "config.updated", payload: { path: "skills" } });
@@ -2504,8 +2705,16 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
+    const normalizedItems = result.data.items.map((item) => normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(item)));
+    const unsupportedKind = findUnsupportedSkillInstallKind(normalizedItems);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     const knownSkillNames = collectKnownSkillNames(options);
-    const filteredItems = result.data.items.map((item) => normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(item))).filter((item) => isSupportedMarketplaceSkillItem(item, knownSkillNames));
+    const filteredItems = normalizedItems.filter((item) => isSupportedMarketplaceSkillItem(item, knownSkillNames));
     const pageSize = Math.min(100, toPositiveInt(query.pageSize, 20));
     const requestedPage = toPositiveInt(query.page, 1);
     const totalPages = filteredItems.length === 0 ? 0 : Math.ceil(filteredItems.length / pageSize);
@@ -2531,6 +2740,13 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     }
     const knownSkillNames = collectKnownSkillNames(options);
     const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(result.data));
+    const unsupportedKind = findUnsupportedSkillInstallKind([sanitized]);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     if (!isSupportedMarketplaceSkillItem(sanitized, knownSkillNames)) {
       return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
     }
@@ -2547,14 +2763,24 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     }
     const knownSkillNames = collectKnownSkillNames(options);
     const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(result.data));
+    const unsupportedKind = findUnsupportedSkillInstallKind([sanitized]);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     if (!isSupportedMarketplaceSkillItem(sanitized, knownSkillNames)) {
       return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
     }
-    const content = await buildSkillContentView(options, sanitized);
-    if (!content) {
-      return c.json(err("NOT_FOUND", "skill markdown content not found"), 404);
+    const contentResult = await fetchMarketplaceData({
+      baseUrl: marketplaceBaseUrl,
+      path: `/api/v1/skills/items/${slug}/content`
+    });
+    if (!contentResult.ok) {
+      return c.json(err("MARKETPLACE_UNAVAILABLE", contentResult.message), contentResult.status);
     }
-    return c.json(ok(content));
+    return c.json(ok(contentResult.data));
   });
   app.post("/api/marketplace/skills/install", async (c) => {
     const body = await readJson(c.req.raw);
@@ -2727,8 +2953,20 @@ function createUiRouter(options) {
   });
   app.post("/api/config/providers/:provider/auth/start", async (c) => {
     const provider = c.req.param("provider");
+    let payload = {};
+    const rawBody = await c.req.raw.text();
+    if (rawBody.trim().length > 0) {
+      try {
+        payload = JSON.parse(rawBody);
+      } catch {
+        return c.json(err("INVALID_BODY", "invalid json body"), 400);
+      }
+    }
+    const methodId = typeof payload.methodId === "string" ? payload.methodId.trim() : void 0;
     try {
-      const result = await startProviderAuth(options.configPath, provider);
+      const result = await startProviderAuth(options.configPath, provider, {
+        methodId
+      });
       if (!result) {
         return c.json(err("NOT_SUPPORTED", `provider auth is not supported: ${provider}`), 404);
       }
@@ -2814,6 +3052,31 @@ function createUiRouter(options) {
       return c.json(err("CHAT_RUNTIME_FAILED", String(error)), 500);
     }
   });
+  app.get("/api/chat/commands", async (c) => {
+    try {
+      const config = loadConfigOrDefault(options.configPath);
+      const registry = new NextclawCore.CommandRegistry(config);
+      const commands = registry.listSlashCommands().map((command) => ({
+        name: command.name,
+        description: command.description,
+        ...Array.isArray(command.options) && command.options.length > 0 ? {
+          options: command.options.map((option) => ({
+            name: option.name,
+            description: option.description,
+            type: option.type,
+            ...option.required === true ? { required: true } : {}
+          }))
+        } : {}
+      }));
+      const payload = {
+        commands,
+        total: commands.length
+      };
+      return c.json(ok(payload));
+    } catch (error) {
+      return c.json(err("CHAT_COMMANDS_FAILED", String(error)), 500);
+    }
+  });
   app.post("/api/chat/turn", async (c) => {
     if (!options.chatRuntime) {
       return c.json(err("NOT_AVAILABLE", "chat runtime unavailable"), 503);
@@ -3419,7 +3682,7 @@ function startUiServer(options) {
         join,
         getContent: async (path) => {
           try {
-            return await readFile3(path);
+            return await readFile2(path);
           } catch {
             return null;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -15,11 +15,11 @@
   ],
   "dependencies": {
     "@hono/node-server": "^1.13.3",
-    "@nextclaw/openclaw-compat": "^0.2.0",
-    "@nextclaw/runtime": "^0.1.1",
+    "@nextclaw/runtime": "^0.1.2",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "^0.7.1"
+    "@nextclaw/core": "^0.7.3",
+    "@nextclaw/openclaw-compat": "0.2.1"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",