@nextclaw/server 0.12.16 → 0.12.18

package/dist/index.d.ts

@@ -277,6 +277,15 @@ type MarketplaceRecommendationView = {
   total: number;
   items: MarketplaceItemSummary[];
 };
+type MarketplaceSceneView = {
+  scene: string;
+  title: string;
+  description?: string;
+  count?: number;
+};
+type MarketplaceScenesView = {
+  scenes: MarketplaceSceneView[];
+};
 type MarketplaceInstalledRecord = {
   type: MarketplaceItemType;
   id?: string;
@@ -669,6 +678,7 @@ type ProviderAuthImportResult = {
 type ChannelAuthStartRequest = {
   accountId?: string;
   baseUrl?: string;
+  domain?: string;
 };
 type ChannelAuthStartResult = {
   channel: string;
@@ -2487,4 +2497,4 @@ declare function updateChannel(configPath: string, channelName: string, patch: R
 declare function updateRuntime(configPath: string, patch: RuntimeConfigUpdate): Pick<ConfigView, "companion" | "agents" | "bindings" | "session">;
 declare function updateSecrets(configPath: string, patch: SecretsConfigUpdate): SecretsView;
 //#endregion
-export { AgentBindingView, AgentCreateRequest, AgentDeleteResult, AgentProfileView, AgentUpdateRequest, ApiError, ApiResponse, AppMetaView, AuthEnabledUpdateRequest, AuthLoginRequest, AuthPasswordUpdateRequest, AuthSetupRequest, AuthStatusView, BindingPeerView, BochaFreshnessValue, BootstrapPhase, BootstrapRemoteState, BootstrapStageState, BootstrapStatusView, ChannelAuthPollRequest, ChannelAuthPollResult, ChannelAuthStartRequest, ChannelAuthStartResult, ChannelSpecView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, ConfigActionExecuteRequest, ConfigActionExecuteResult, ConfigActionManifest, ConfigActionType, ConfigMetaView, ConfigRoutesController, ConfigSchemaResponse, ConfigUiHint, ConfigUiHints, ConfigView, CronActionResult, CronCreateRequest, CronCreateResult, CronEnableRequest, CronJobStateView, CronJobView, CronListView, CronPayloadView, CronRunRequest, CronScheduleView, MarketplaceApiConfig, MarketplaceInstallKind, MarketplaceInstallRequest, MarketplaceInstallResult, MarketplaceInstallSkillParams, MarketplaceInstallSpec, MarketplaceInstalledRecord, MarketplaceInstalledView, MarketplaceInstaller, MarketplaceItemSummary, MarketplaceItemType, MarketplaceItemView, MarketplaceListView, MarketplaceLocalizedTextMap, MarketplaceManageAction, MarketplaceManageRequest, MarketplaceManageResult, MarketplaceMcpContentView, MarketplaceMcpDoctorResult, MarketplaceMcpInstallKind, MarketplaceMcpInstallRequest, MarketplaceMcpInstallResult, MarketplaceMcpInstallSpec, MarketplaceMcpManageAction, MarketplaceMcpManageRequest, MarketplaceMcpManageResult, MarketplaceMcpTemplateInput, MarketplacePluginContentView, MarketplacePluginInstallKind, MarketplacePluginInstallRequest, MarketplacePluginInstallResult, MarketplacePluginManageAction, MarketplacePluginManageRequest, MarketplacePluginManageResult, MarketplaceRecommendationView, MarketplaceSkillContentView, MarketplaceSkillInstallKind, MarketplaceSkillInstallRequest, MarketplaceSkillInstallResult, MarketplaceSkillManageAction, MarketplaceSkillManageRequest, MarketplaceSkillManageResult, MarketplaceSort, NcpAssetRoutesController, NcpSessionSkillsView, ProviderAuthImportResult, ProviderAuthPollRequest, ProviderAuthPollResult, ProviderAuthStartRequest, ProviderAuthStartResult, ProviderConfigUpdate, ProviderConfigView, ProviderConnectionTestRequest, ProviderConnectionTestResult, ProviderCreateRequest, ProviderCreateResult, ProviderDeleteResult, ProviderSpecView, RemoteAccessView, RemoteAccountProfileUpdateRequest, RemoteAccountView, RemoteBrowserAuthPollRequest, RemoteBrowserAuthPollResult, RemoteBrowserAuthStartRequest, RemoteBrowserAuthStartResult, RemoteDoctorCheckView, RemoteDoctorView, RemoteLoginRequest, RemoteRuntimeView, RemoteServiceAction, RemoteServiceActionResult, RemoteServiceView, RemoteSettingsUpdateRequest, RemoteSettingsView, RuntimeActionCapability, RuntimeActionImpact, RuntimeConfigUpdate, RuntimeControlAction, RuntimeControlActionResult, RuntimeControlEnvironment, RuntimeControlRoutesController, RuntimeControlView, RuntimeEntryView, RuntimeLifecycleState, RuntimePendingRestart, RuntimeServiceState, SearchConfigUpdate, SearchConfigView, SearchProviderConfigView, SearchProviderName, SearchProviderSpecView, SecretProviderEnvView, SecretProviderExecView, SecretProviderFileView, SecretProviderView, SecretRefView, SecretSourceView, SecretsConfigUpdate, SecretsView, ServerPathBreadcrumbView, ServerPathBrowseView, ServerPathEntryView, ServerPathReadView, SessionConfigView, SessionEntryView, SessionEventView, SessionHistoryView, SessionMessageView, SessionPatchUpdate, SessionSkillEntryView, SessionTypeDescribeParams, SessionsListView, TavilySearchDepthValue, UiNcpAgent, UiNcpAssetPutView, UiNcpAssetView, UiNcpSessionListView, UiNcpSessionMessagesView, UiNcpSessionService, UiNcpStoredAssetRecord, type UiRemoteAccessHost, type UiRouterOptions, type UiRuntimeControlHost, type UiRuntimeUpdateHost, UiServerEvent, UiServerHandle, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };
+export { AgentBindingView, AgentCreateRequest, AgentDeleteResult, AgentProfileView, AgentUpdateRequest, ApiError, ApiResponse, AppMetaView, AuthEnabledUpdateRequest, AuthLoginRequest, AuthPasswordUpdateRequest, AuthSetupRequest, AuthStatusView, BindingPeerView, BochaFreshnessValue, BootstrapPhase, BootstrapRemoteState, BootstrapStageState, BootstrapStatusView, ChannelAuthPollRequest, ChannelAuthPollResult, ChannelAuthStartRequest, ChannelAuthStartResult, ChannelSpecView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, ConfigActionExecuteRequest, ConfigActionExecuteResult, ConfigActionManifest, ConfigActionType, ConfigMetaView, ConfigRoutesController, ConfigSchemaResponse, ConfigUiHint, ConfigUiHints, ConfigView, CronActionResult, CronCreateRequest, CronCreateResult, CronEnableRequest, CronJobStateView, CronJobView, CronListView, CronPayloadView, CronRunRequest, CronScheduleView, MarketplaceApiConfig, MarketplaceInstallKind, MarketplaceInstallRequest, MarketplaceInstallResult, MarketplaceInstallSkillParams, MarketplaceInstallSpec, MarketplaceInstalledRecord, MarketplaceInstalledView, MarketplaceInstaller, MarketplaceItemSummary, MarketplaceItemType, MarketplaceItemView, MarketplaceListView, MarketplaceLocalizedTextMap, MarketplaceManageAction, MarketplaceManageRequest, MarketplaceManageResult, MarketplaceMcpContentView, MarketplaceMcpDoctorResult, MarketplaceMcpInstallKind, MarketplaceMcpInstallRequest, MarketplaceMcpInstallResult, MarketplaceMcpInstallSpec, MarketplaceMcpManageAction, MarketplaceMcpManageRequest, MarketplaceMcpManageResult, MarketplaceMcpTemplateInput, MarketplacePluginContentView, MarketplacePluginInstallKind, MarketplacePluginInstallRequest, MarketplacePluginInstallResult, MarketplacePluginManageAction, MarketplacePluginManageRequest, MarketplacePluginManageResult, MarketplaceRecommendationView, MarketplaceSceneView, MarketplaceScenesView, MarketplaceSkillContentView, MarketplaceSkillInstallKind, MarketplaceSkillInstallRequest, MarketplaceSkillInstallResult, MarketplaceSkillManageAction, MarketplaceSkillManageRequest, MarketplaceSkillManageResult, MarketplaceSort, NcpAssetRoutesController, NcpSessionSkillsView, ProviderAuthImportResult, ProviderAuthPollRequest, ProviderAuthPollResult, ProviderAuthStartRequest, ProviderAuthStartResult, ProviderConfigUpdate, ProviderConfigView, ProviderConnectionTestRequest, ProviderConnectionTestResult, ProviderCreateRequest, ProviderCreateResult, ProviderDeleteResult, ProviderSpecView, RemoteAccessView, RemoteAccountProfileUpdateRequest, RemoteAccountView, RemoteBrowserAuthPollRequest, RemoteBrowserAuthPollResult, RemoteBrowserAuthStartRequest, RemoteBrowserAuthStartResult, RemoteDoctorCheckView, RemoteDoctorView, RemoteLoginRequest, RemoteRuntimeView, RemoteServiceAction, RemoteServiceActionResult, RemoteServiceView, RemoteSettingsUpdateRequest, RemoteSettingsView, RuntimeActionCapability, RuntimeActionImpact, RuntimeConfigUpdate, RuntimeControlAction, RuntimeControlActionResult, RuntimeControlEnvironment, RuntimeControlRoutesController, RuntimeControlView, RuntimeEntryView, RuntimeLifecycleState, RuntimePendingRestart, RuntimeServiceState, SearchConfigUpdate, SearchConfigView, SearchProviderConfigView, SearchProviderName, SearchProviderSpecView, SecretProviderEnvView, SecretProviderExecView, SecretProviderFileView, SecretProviderView, SecretRefView, SecretSourceView, SecretsConfigUpdate, SecretsView, ServerPathBreadcrumbView, ServerPathBrowseView, ServerPathEntryView, ServerPathReadView, SessionConfigView, SessionEntryView, SessionEventView, SessionHistoryView, SessionMessageView, SessionPatchUpdate, SessionSkillEntryView, SessionTypeDescribeParams, SessionsListView, TavilySearchDepthValue, UiNcpAgent, UiNcpAssetPutView, UiNcpAssetView, UiNcpSessionListView, UiNcpSessionMessagesView, UiNcpSessionService, UiNcpStoredAssetRecord, type UiRemoteAccessHost, type UiRouterOptions, type UiRuntimeControlHost, type UiRuntimeUpdateHost, UiServerEvent, UiServerHandle, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };

package/dist/index.js

@@ -793,7 +793,8 @@ async function startChannelAuth(params) {
 		channelId: binding.channelId,
 		pluginConfig: clonePluginConfig(configView.channels?.[binding.channelId]),
 		accountId: request.accountId?.trim() || null,
-		baseUrl: request.baseUrl?.trim() || null
+		baseUrl: request.baseUrl?.trim() || null,
+		domain: request.domain?.trim() || null
 	});
 }
 async function pollChannelAuth(params) {
@@ -819,7 +820,7 @@ async function pollChannelAuth(params) {
 }
 //#endregion
 //#region src/features/config/utils/default-provider-config.utils.ts
-function createDefaultProviderConfig(defaultWireApi = "auto") {
+function createDefaultProviderConfig(defaultWireApi = "auto", defaultModels = []) {
 	return {
 		enabled: true,
 		displayName: "",
@@ -827,10 +828,13 @@ function createDefaultProviderConfig(defaultWireApi = "auto") {
 		apiBase: null,
 		extraHeaders: null,
 		wireApi: defaultWireApi,
-		models: [],
+		models: [...defaultModels],
 		modelThinking: {}
 	};
 }
+function createDefaultProviderConfigFromSpec(spec) {
+	return createDefaultProviderConfig(spec?.defaultWireApi ?? "auto", spec?.defaultModels ?? []);
+}
 //#endregion
 //#region src/features/config/providers/server-builtin-provider.provider.ts
 const SERVER_BUILTIN_PROVIDER_OVERRIDES = [{
@@ -1051,7 +1055,7 @@ function readFieldAsString(source, fieldName) {
 function setProviderApiKey({ configPath, provider, accessToken, defaultApiBase }) {
 	const config = loadConfig(configPath);
 	const providers = config.providers;
-	if (!providers[provider]) providers[provider] = createDefaultProviderConfig();
+	if (!providers[provider]) providers[provider] = createDefaultProviderConfigFromSpec(findServerBuiltinProviderByName(provider));
 	const target = providers[provider];
 	target.apiKey = accessToken;
 	if (!target.apiBase && defaultApiBase) target.apiBase = defaultApiBase;
@@ -1524,7 +1528,8 @@ var ConfigRoutesController = class {
 				channelId: channel,
 				request: {
 					accountId: typeof payload.accountId === "string" ? payload.accountId : void 0,
-					baseUrl: typeof payload.baseUrl === "string" ? payload.baseUrl : void 0
+					baseUrl: typeof payload.baseUrl === "string" ? payload.baseUrl : void 0,
+					domain: typeof payload.domain === "string" ? payload.domain : void 0
 				},
 				bindings: this.options.plugins?.getChannelBindings() ?? []
 			});
@@ -1873,7 +1878,7 @@ function ensureProviderConfig(config, providerName) {
 	if (isCustomProviderName(providerName)) return null;
 	const spec = findServerBuiltinProviderByName(providerName);
 	if (!spec) return null;
-	const created = createDefaultProviderConfig(spec.defaultWireApi ?? "auto");
+	const created = createDefaultProviderConfigFromSpec(spec);
 	providers[providerName] = created;
 	return created;
 }
@@ -2964,6 +2969,7 @@ async function runWithMarketplaceNetworkRetry(action) {
 }
 //#endregion
 //#region src/features/marketplace/utils/marketplace-catalog.utils.ts
+const MARKETPLACE_FETCH_TIMEOUT_MS = 12e3;
 function normalizeMarketplaceBaseUrl(options) {
 	const configured = options.marketplace?.apiBaseUrl?.trim();
 	if (!configured) return DEFAULT_MARKETPLACE_API_BASE;
@@ -2980,7 +2986,8 @@ async function fetchMarketplaceData(params) {
 	try {
 		response = await runWithMarketplaceNetworkRetry(() => fetch(endpoint, {
 			method: "GET",
-			headers: { Accept: "application/json" }
+			headers: { Accept: "application/json" },
+			signal: AbortSignal.timeout(MARKETPLACE_FETCH_TIMEOUT_MS)
 		}));
 	} catch (error) {
 		return {
@@ -3107,13 +3114,6 @@ async function fetchAllMarketplaceItems(params) {
 		}
 	};
 }
-async function fetchAllSkillMarketplaceItems(params) {
-	return fetchAllMarketplaceItems({
-		baseUrl: params.baseUrl,
-		path: "/api/v1/skills/items",
-		query: params.query
-	});
-}
 async function fetchAllMcpMarketplaceItems(params) {
 	return fetchAllMarketplaceItems({
 		baseUrl: params.baseUrl,
@@ -3887,37 +3887,56 @@ var SkillMarketplaceController = class {
 	getInstalled = (c) => {
 		return c.json(ok(collectSkillMarketplaceInstalledView(this.options)));
 	};
-	listItems = async (c) => {
-		const query = c.req.query();
-		const result = await fetchAllSkillMarketplaceItems({
-			baseUrl: this.marketplaceBaseUrl,
-			query: {
-				q: query.q,
-				tag: query.tag,
-				sort: query.sort,
-				page: query.page,
-				pageSize: query.pageSize
+	normalizeSupportedListData = (data) => {
+		const normalizedItems = sanitizeMarketplaceListItems(data.items).map((item) => normalizeMarketplaceItemForUi(item));
+		const unsupportedKind = findUnsupportedSkillInstallKind(normalizedItems);
+		if (unsupportedKind) return {
+			ok: false,
+			code: "MARKETPLACE_CONTRACT_MISMATCH",
+			status: 502,
+			message: `unsupported skill install kind from marketplace api: ${unsupportedKind}`
+		};
+		const knownSkillNames = collectKnownSkillNames(this.options);
+		return {
+			ok: true,
+			data: {
+				...data,
+				items: normalizedItems.filter((item) => isSupportedMarketplaceSkillItem(item, knownSkillNames))
 			}
+		};
+	};
+	loadSupportedListPage = async (query) => {
+		const result = await fetchMarketplaceData({
+			baseUrl: this.marketplaceBaseUrl,
+			path: "/api/v1/skills/items",
+			query
+		});
+		if (!result.ok) return {
+			...result,
+			code: "MARKETPLACE_UNAVAILABLE"
+		};
+		return this.normalizeSupportedListData(result.data);
+	};
+	listScenes = async (c) => {
+		const result = await fetchMarketplaceData({
+			baseUrl: this.marketplaceBaseUrl,
+			path: "/api/v1/skills/scenes"
 		});
 		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-		const normalizedItems = sanitizeMarketplaceListItems(result.data.items).map((item) => normalizeMarketplaceItemForUi(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(this.options);
-		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);
-		const currentPage = totalPages === 0 ? 1 : Math.min(requestedPage, totalPages);
-		return c.json(ok({
-			total: filteredItems.length,
-			page: currentPage,
-			pageSize,
-			totalPages,
-			sort: result.data.sort,
-			query: result.data.query,
-			items: filteredItems.slice((currentPage - 1) * pageSize, currentPage * pageSize)
-		}));
+		return c.json(ok(result.data));
+	};
+	listItems = async (c) => {
+		const query = c.req.query();
+		const result = await this.loadSupportedListPage({
+			q: query.q,
+			scene: query.scene,
+			tag: query.tag,
+			sort: query.sort,
+			page: query.page,
+			pageSize: query.pageSize
+		});
+		if (!result.ok) return c.json(err(result.code, result.message), result.status);
+		return c.json(ok(result.data));
 	};
 	getItem = async (c) => {
 		const slug = encodeURIComponent(c.req.param("slug"));
@@ -4017,6 +4036,7 @@ function mountMarketplaceRoutes(app, controllers) {
 	app.post("/api/marketplace/plugins/manage", controllers.plugin.manage);
 	app.get("/api/marketplace/plugins/recommendations", controllers.plugin.getRecommendations);
 	app.get("/api/marketplace/skills/installed", controllers.skill.getInstalled);
+	app.get("/api/marketplace/skills/scenes", controllers.skill.listScenes);
 	app.get("/api/marketplace/skills/items", controllers.skill.listItems);
 	app.get("/api/marketplace/skills/items/:slug", controllers.skill.getItem);
 	app.get("/api/marketplace/skills/items/:slug/content", controllers.skill.getItemContent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.12.16",
+  "version": "0.12.18",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -18,13 +18,13 @@
     "@hono/node-server": "^1.13.3",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "0.12.16",
-    "@nextclaw/kernel": "0.1.5",
-    "@nextclaw/mcp": "0.1.81",
-    "@nextclaw/ncp": "0.5.9",
-    "@nextclaw/openclaw-compat": "1.0.16",
-    "@nextclaw/runtime": "0.2.48",
-    "@nextclaw/ncp-http-agent-server": "0.3.21"
+    "@nextclaw/core": "0.12.18",
+    "@nextclaw/kernel": "0.1.7",
+    "@nextclaw/ncp-http-agent-server": "0.3.23",
+    "@nextclaw/runtime": "0.2.50",
+    "@nextclaw/mcp": "0.1.83",
+    "@nextclaw/ncp": "0.5.11",
+    "@nextclaw/openclaw-compat": "1.0.18"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",