@nextclaw/server 0.5.26 → 0.5.27

package/dist/index.d.ts

@@ -15,6 +15,7 @@ type ApiResponse<T> = {
     error: ApiError;
 };
 type ProviderConfigView = {
+    displayName?: string;
     apiKeySet: boolean;
     apiKeyMasked?: string;
     apiBase?: string | null;
@@ -23,6 +24,7 @@ type ProviderConfigView = {
     models?: string[];
 };
 type ProviderConfigUpdate = {
+    displayName?: string | null;
     apiKey?: string | null;
     apiBase?: string | null;
     extraHeaders?: Record<string, string> | null;
@@ -32,6 +34,15 @@ type ProviderConfigUpdate = {
 type ProviderConnectionTestRequest = ProviderConfigUpdate & {
     model?: string | null;
 };
+type ProviderCreateRequest = ProviderConfigUpdate;
+type ProviderCreateResult = {
+    name: string;
+    provider: ProviderConfigView;
+};
+type ProviderDeleteResult = {
+    deleted: boolean;
+    provider: string;
+};
 type ProviderConnectionTestResult = {
     success: boolean;
     provider: string;
@@ -288,6 +299,7 @@ type ConfigView = {
 type ProviderSpecView = {
     name: string;
     displayName?: string;
+    isCustom?: boolean;
     modelPrefix?: string;
     keywords: string[];
     envKey: string;
@@ -622,6 +634,11 @@ declare function updateModel(configPath: string, patch: {
     maxTokens?: number;
 }): ConfigView;
 declare function updateProvider(configPath: string, providerName: string, patch: ProviderConfigUpdate): ProviderConfigView | null;
+declare function createCustomProvider(configPath: string, patch?: ProviderConfigUpdate): {
+    name: string;
+    provider: ProviderConfigView;
+};
+declare function deleteCustomProvider(configPath: string, providerName: string): boolean | null;
 declare function testProviderConnection(configPath: string, providerName: string, patch: ProviderConnectionTestRequest): Promise<ProviderConnectionTestResult | null>;
 declare function updateChannel(configPath: string, channelName: string, patch: Record<string, unknown>): Record<string, unknown> | null;
 declare function listSessions(configPath: string, query?: {
@@ -635,4 +652,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 BindingPeerView, type ChannelSpecView, type ChatTurnRequest, type ChatTurnResult, 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 ProviderConfigUpdate, type ProviderConfigView, type ProviderConnectionTestRequest, type ProviderConnectionTestResult, 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, createUiRouter, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSecrets };
+export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type BindingPeerView, type ChannelSpecView, type ChatTurnRequest, type ChatTurnResult, 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 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

@@ -60,6 +60,53 @@ var PREFERRED_PROVIDER_ORDER = [
 var PREFERRED_PROVIDER_ORDER_INDEX = new Map(
   PREFERRED_PROVIDER_ORDER.map((name, index) => [name, index])
 );
+var BUILTIN_PROVIDER_NAMES = new Set(PROVIDERS.map((spec) => spec.name));
+var CUSTOM_PROVIDER_WIRE_API_OPTIONS = ["auto", "chat", "responses"];
+var CUSTOM_PROVIDER_PREFIX = "custom-";
+function normalizeOptionalDisplayName(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+function isCustomProviderName(name) {
+  return name.trim().length > 0 && !BUILTIN_PROVIDER_NAMES.has(name);
+}
+function resolveCustomProviderFallbackDisplayName(name) {
+  if (name.startsWith(CUSTOM_PROVIDER_PREFIX)) {
+    const suffix = name.slice(CUSTOM_PROVIDER_PREFIX.length);
+    if (/^\d+$/.test(suffix)) {
+      return `Custom ${suffix}`;
+    }
+  }
+  return name;
+}
+function resolveProviderDisplayName(providerName, provider, spec) {
+  const configDisplayName = normalizeOptionalDisplayName(provider?.displayName);
+  if (isCustomProviderName(providerName)) {
+    return configDisplayName ?? resolveCustomProviderFallbackDisplayName(providerName);
+  }
+  return spec?.displayName ?? configDisplayName ?? spec?.name;
+}
+function listCustomProviderNames(config) {
+  return Object.keys(config.providers).filter((name) => isCustomProviderName(name));
+}
+function findNextCustomProviderName(config) {
+  const providers = config.providers;
+  let index = 1;
+  while (providers[`${CUSTOM_PROVIDER_PREFIX}${index}`]) {
+    index += 1;
+  }
+  return `${CUSTOM_PROVIDER_PREFIX}${index}`;
+}
+function clearSecretRefsByPrefix(config, pathPrefix) {
+  for (const key of Object.keys(config.secrets.refs)) {
+    if (key === pathPrefix || key.startsWith(`${pathPrefix}.`)) {
+      delete config.secrets.refs[key];
+    }
+  }
+}
 var DOCS_BASE_URL = "https://docs.nextclaw.io";
 var CHANNEL_TUTORIAL_URLS = {
   feishu: {
@@ -296,14 +343,16 @@ function toProviderView(config, provider, providerName, uiHints, spec) {
     uiHints
   ) : null;
   const view = {
+    displayName: resolveProviderDisplayName(providerName, provider, spec),
     apiKeySet: masked.apiKeySet || apiKeyRefSet,
     apiKeyMasked: masked.apiKeyMasked ?? (apiKeyRefSet ? "****" : void 0),
     apiBase: provider.apiBase ?? null,
     extraHeaders: extraHeaders && Object.keys(extraHeaders).length > 0 ? extraHeaders : null,
     models: normalizeModelList(provider.models ?? [])
   };
-  if (spec?.supportsWireApi) {
-    view.wireApi = provider.wireApi ?? spec.defaultWireApi ?? "auto";
+  const supportsWireApi = Boolean(spec?.supportsWireApi) || isCustomProviderName(providerName);
+  if (supportsWireApi) {
+    view.wireApi = provider.wireApi ?? spec?.defaultWireApi ?? "auto";
   }
   return view;
 }
@@ -341,20 +390,25 @@ function clearSecretRef(config, path) {
   }
 }
 function buildConfigMeta(config) {
-  const providers = PROVIDERS.map((spec) => ({
-    name: spec.name,
-    displayName: spec.displayName,
-    modelPrefix: spec.modelPrefix,
-    keywords: spec.keywords,
-    envKey: spec.envKey,
-    isGateway: spec.isGateway,
-    isLocal: spec.isLocal,
-    defaultApiBase: spec.defaultApiBase,
-    defaultModels: normalizeModelList(spec.defaultModels ?? []),
-    supportsWireApi: spec.supportsWireApi,
-    wireApiOptions: spec.wireApiOptions,
-    defaultWireApi: spec.defaultWireApi
-  })).sort((left, right) => {
+  const configProviders = config.providers;
+  const builtinProviders = PROVIDERS.map((spec) => {
+    const providerConfig = configProviders[spec.name];
+    return {
+      name: spec.name,
+      displayName: resolveProviderDisplayName(spec.name, providerConfig, spec),
+      isCustom: false,
+      modelPrefix: spec.modelPrefix,
+      keywords: spec.keywords,
+      envKey: spec.envKey,
+      isGateway: spec.isGateway,
+      isLocal: spec.isLocal,
+      defaultApiBase: spec.defaultApiBase,
+      defaultModels: normalizeModelList(spec.defaultModels ?? []),
+      supportsWireApi: spec.supportsWireApi,
+      wireApiOptions: spec.wireApiOptions,
+      defaultWireApi: spec.defaultWireApi
+    };
+  }).sort((left, right) => {
     const leftRank = PREFERRED_PROVIDER_ORDER_INDEX.get(left.name);
     const rightRank = PREFERRED_PROVIDER_ORDER_INDEX.get(right.name);
     if (leftRank !== void 0 && rightRank !== void 0) {
@@ -368,6 +422,26 @@ function buildConfigMeta(config) {
     }
     return left.name.localeCompare(right.name);
   });
+  const customProviders = listCustomProviderNames(config).sort((left, right) => left.localeCompare(right, void 0, { numeric: true, sensitivity: "base" })).map((name) => {
+    const providerConfig = configProviders[name];
+    const displayName = resolveProviderDisplayName(name, providerConfig);
+    return {
+      name,
+      displayName,
+      isCustom: true,
+      modelPrefix: name,
+      keywords: normalizeModelList([name, displayName ?? ""]),
+      envKey: "OPENAI_API_KEY",
+      isGateway: false,
+      isLocal: false,
+      defaultApiBase: void 0,
+      defaultModels: [],
+      supportsWireApi: true,
+      wireApiOptions: CUSTOM_PROVIDER_WIRE_API_OPTIONS,
+      defaultWireApi: "auto"
+    };
+  });
+  const providers = [...customProviders, ...builtinProviders];
   const channels = Object.keys(config.channels).map((name) => {
     const tutorialUrls = CHANNEL_TUTORIAL_URLS[name];
     const tutorialUrl = tutorialUrls?.default ?? tutorialUrls?.en ?? tutorialUrls?.zh;
@@ -458,6 +532,10 @@ function updateProvider(configPath, providerName, patch) {
     return null;
   }
   const spec = findProviderByName(providerName);
+  const isCustom = isCustomProviderName(providerName);
+  if (Object.prototype.hasOwnProperty.call(patch, "displayName") && isCustom) {
+    provider.displayName = normalizeOptionalDisplayName(patch.displayName) ?? "";
+  }
   if (Object.prototype.hasOwnProperty.call(patch, "apiKey")) {
     provider.apiKey = patch.apiKey ?? "";
     clearSecretRef(config, `providers.${providerName}.apiKey`);
@@ -468,8 +546,8 @@ function updateProvider(configPath, providerName, patch) {
   if (Object.prototype.hasOwnProperty.call(patch, "extraHeaders")) {
     provider.extraHeaders = patch.extraHeaders ?? null;
   }
-  if (Object.prototype.hasOwnProperty.call(patch, "wireApi") && spec?.supportsWireApi) {
-    provider.wireApi = patch.wireApi ?? spec.defaultWireApi ?? "auto";
+  if (Object.prototype.hasOwnProperty.call(patch, "wireApi") && (spec?.supportsWireApi || isCustom)) {
+    provider.wireApi = patch.wireApi ?? spec?.defaultWireApi ?? "auto";
   }
   if (Object.prototype.hasOwnProperty.call(patch, "models")) {
     provider.models = normalizeModelList(patch.models ?? []);
@@ -480,6 +558,43 @@ function updateProvider(configPath, providerName, patch) {
   const updated = next.providers[providerName];
   return toProviderView(next, updated, providerName, uiHints, spec ?? void 0);
 }
+function createCustomProvider(configPath, patch = {}) {
+  const config = loadConfigOrDefault(configPath);
+  const providerName = findNextCustomProviderName(config);
+  const providers = config.providers;
+  const generatedDisplayName = resolveCustomProviderFallbackDisplayName(providerName);
+  providers[providerName] = {
+    displayName: normalizeOptionalDisplayName(patch.displayName) ?? generatedDisplayName,
+    apiKey: normalizeOptionalString(patch.apiKey) ?? "",
+    apiBase: normalizeOptionalString(patch.apiBase),
+    extraHeaders: normalizeHeaders(patch.extraHeaders ?? null),
+    wireApi: patch.wireApi ?? "auto",
+    models: normalizeModelList(patch.models ?? [])
+  };
+  const next = ConfigSchema.parse(config);
+  saveConfig(next, configPath);
+  const uiHints = buildUiHints(next);
+  const created = next.providers[providerName];
+  return {
+    name: providerName,
+    provider: toProviderView(next, created, providerName, uiHints)
+  };
+}
+function deleteCustomProvider(configPath, providerName) {
+  if (!isCustomProviderName(providerName)) {
+    return null;
+  }
+  const config = loadConfigOrDefault(configPath);
+  const providers = config.providers;
+  if (!providers[providerName]) {
+    return null;
+  }
+  delete providers[providerName];
+  clearSecretRefsByPrefix(config, `providers.${providerName}`);
+  const next = ConfigSchema.parse(config);
+  saveConfig(next, configPath);
+  return true;
+}
 function normalizeOptionalString(value) {
   if (typeof value !== "string") {
     return null;
@@ -497,10 +612,37 @@ function normalizeHeaders(input) {
   }
   return Object.fromEntries(entries);
 }
-function resolveTestModel(config, providerName, requestedModel) {
+function buildScopedProviderModel(providerName, model, spec) {
+  const trimmed = model.trim();
+  if (!trimmed) {
+    return "";
+  }
+  if (trimmed.includes("/")) {
+    return trimmed;
+  }
+  if (isCustomProviderName(providerName)) {
+    return trimmed;
+  }
+  const prefix = (spec?.modelPrefix ?? providerName).trim();
+  if (!prefix) {
+    return trimmed;
+  }
+  return `${prefix}/${trimmed}`;
+}
+function resolveTestModel(config, providerName, requestedModel, provider, spec) {
   if (requestedModel) {
+    if (isCustomProviderName(providerName)) {
+      const prefix = `${providerName}/`;
+      if (requestedModel.startsWith(prefix)) {
+        return requestedModel.slice(prefix.length) || null;
+      }
+    }
     return requestedModel;
   }
+  const providerModels = normalizeModelList(provider.models ?? []).map((modelId) => buildScopedProviderModel(providerName, modelId, spec)).filter((modelId) => modelId.length > 0);
+  if (providerModels.length > 0) {
+    return providerModels[0];
+  }
   const defaultModel = normalizeOptionalString(config.agents.defaults.model);
   if (defaultModel) {
     const routedProvider = getProviderName(config, defaultModel);
@@ -508,6 +650,9 @@ function resolveTestModel(config, providerName, requestedModel) {
       return defaultModel;
     }
   }
+  if (isCustomProviderName(providerName)) {
+    return null;
+  }
   return PROVIDER_TEST_MODEL_FALLBACKS[providerName] ?? defaultModel ?? null;
 }
 function stringifyError(error) {
@@ -531,7 +676,8 @@ async function testProviderConnection(configPath, providerName, patch) {
   const apiBase = hasApiBasePatch ? patchedApiBase ?? spec?.defaultApiBase ?? null : currentApiBase ?? spec?.defaultApiBase ?? null;
   const hasHeadersPatch = Object.prototype.hasOwnProperty.call(patch, "extraHeaders");
   const extraHeaders = hasHeadersPatch ? normalizeHeaders(patch.extraHeaders ?? null) : normalizeHeaders(provider.extraHeaders ?? null);
-  const wireApi = spec?.supportsWireApi ? patch.wireApi ?? provider.wireApi ?? spec.defaultWireApi ?? "auto" : null;
+  const isCustom = isCustomProviderName(providerName);
+  const wireApi = spec?.supportsWireApi || isCustom ? patch.wireApi ?? provider.wireApi ?? spec?.defaultWireApi ?? "auto" : null;
   if (!apiKey && !spec?.isLocal) {
     return {
       success: false,
@@ -541,13 +687,13 @@ async function testProviderConnection(configPath, providerName, patch) {
     };
   }
   const requestedModel = normalizeOptionalString(patch.model);
-  const model = resolveTestModel(config, providerName, requestedModel);
+  const model = resolveTestModel(config, providerName, requestedModel, provider, spec ?? void 0);
   if (!model) {
     return {
       success: false,
       provider: providerName,
       latencyMs: 0,
-      message: "No test model found. Set a default model first, then try again."
+      message: "No test model found. Configure provider models or set a default model for this provider, then try again."
     };
   }
   const probe = new LiteLLMProvider({
@@ -2133,6 +2279,33 @@ function createUiRouter(options) {
     options.publish({ type: "config.updated", payload: { path: `providers.${provider}` } });
     return c.json(ok(result));
   });
+  app.post("/api/config/providers", async (c) => {
+    const body = await readJson(c.req.raw);
+    if (!body.ok) {
+      return c.json(err("INVALID_BODY", "invalid json body"), 400);
+    }
+    const result = createCustomProvider(
+      options.configPath,
+      body.data
+    );
+    options.publish({ type: "config.updated", payload: { path: `providers.${result.name}` } });
+    return c.json(ok({
+      name: result.name,
+      provider: result.provider
+    }));
+  });
+  app.delete("/api/config/providers/:provider", async (c) => {
+    const provider = c.req.param("provider");
+    const result = deleteCustomProvider(options.configPath, provider);
+    if (result === null) {
+      return c.json(err("NOT_FOUND", `custom provider not found: ${provider}`), 404);
+    }
+    options.publish({ type: "config.updated", payload: { path: `providers.${provider}` } });
+    return c.json(ok({
+      deleted: true,
+      provider
+    }));
+  });
   app.post("/api/config/providers/:provider/test", async (c) => {
     const provider = c.req.param("provider");
     const body = await readJson(c.req.raw);
@@ -2561,7 +2734,9 @@ export {
   buildConfigMeta,
   buildConfigSchemaView,
   buildConfigView,
+  createCustomProvider,
   createUiRouter,
+  deleteCustomProvider,
   deleteSession,
   executeConfigAction,
   getSessionHistory,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.5.26",
+  "version": "0.5.27",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -15,10 +15,10 @@
   ],
   "dependencies": {
     "@hono/node-server": "^1.13.3",
-    "@nextclaw/openclaw-compat": "^0.1.31",
+    "@nextclaw/openclaw-compat": "^0.1.32",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "^0.6.42"
+    "@nextclaw/core": "^0.6.43"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",