@nextclaw/server 0.10.31 → 0.10.33

package/dist/index.d.ts

@@ -500,6 +500,31 @@ type ProviderAuthImportResult = {
     source: "cli";
     expiresAt?: string;
 };
+type ChannelAuthStartRequest = {
+    accountId?: string;
+    baseUrl?: string;
+};
+type ChannelAuthStartResult = {
+    channel: string;
+    kind: "qr_code";
+    sessionId: string;
+    qrCode: string;
+    qrCodeUrl: string;
+    expiresAt: string;
+    intervalMs: number;
+    note?: string;
+};
+type ChannelAuthPollRequest = {
+    sessionId: string;
+};
+type ChannelAuthPollResult = {
+    channel: string;
+    status: "pending" | "scanned" | "authorized" | "expired" | "error";
+    message?: string;
+    nextPollMs?: number;
+    accountId?: string | null;
+    notes?: string[];
+};
 type AuthStatusView = {
     enabled: boolean;
     configured: boolean;
@@ -1189,4 +1214,4 @@ declare function getUiBridgeSecretPath(): string;
 declare function readUiBridgeSecret(): string | null;
 declare function ensureUiBridgeSecret(): string;
 
-export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type AuthEnabledUpdateRequest, type AuthLoginRequest, type AuthPasswordUpdateRequest, type AuthSetupRequest, type AuthStatusView, type BindingPeerView, type BochaFreshnessValue, type ChannelSpecView, type ChatCapabilitiesView, type ChatCommandOptionView, type ChatCommandView, type ChatCommandsView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, 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, DEFAULT_SESSION_TYPE, 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 MarketplaceMcpContentView, type MarketplaceMcpDoctorResult, type MarketplaceMcpInstallKind, type MarketplaceMcpInstallRequest, type MarketplaceMcpInstallResult, type MarketplaceMcpInstallSpec, type MarketplaceMcpManageAction, type MarketplaceMcpManageRequest, type MarketplaceMcpManageResult, type MarketplaceMcpTemplateInput, 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 RemoteAccessView, type RemoteAccountView, type RemoteBrowserAuthPollRequest, type RemoteBrowserAuthPollResult, type RemoteBrowserAuthStartRequest, type RemoteBrowserAuthStartResult, type RemoteDoctorCheckView, type RemoteDoctorView, type RemoteLoginRequest, type RemoteRuntimeView, type RemoteServiceAction, type RemoteServiceActionResult, type RemoteServiceView, type RemoteSettingsUpdateRequest, type RemoteSettingsView, type RuntimeConfigUpdate, type SearchConfigUpdate, type SearchConfigView, type SearchProviderConfigView, type SearchProviderName, type SearchProviderSpecView, 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, SessionPatchValidationError, type SessionsListView, type UiChatRuntime, type UiNcpAgent, type UiNcpSessionListView, type UiNcpSessionMessagesView, type UiRemoteAccessHost, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, ensureUiBridgeSecret, executeConfigAction, getSessionHistory, getUiBridgeSecretPath, listSessions, loadConfigOrDefault, patchSession, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };
+export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type AuthEnabledUpdateRequest, type AuthLoginRequest, type AuthPasswordUpdateRequest, type AuthSetupRequest, type AuthStatusView, type BindingPeerView, type BochaFreshnessValue, type ChannelAuthPollRequest, type ChannelAuthPollResult, type ChannelAuthStartRequest, type ChannelAuthStartResult, type ChannelSpecView, type ChatCapabilitiesView, type ChatCommandOptionView, type ChatCommandView, type ChatCommandsView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, 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, DEFAULT_SESSION_TYPE, 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 MarketplaceMcpContentView, type MarketplaceMcpDoctorResult, type MarketplaceMcpInstallKind, type MarketplaceMcpInstallRequest, type MarketplaceMcpInstallResult, type MarketplaceMcpInstallSpec, type MarketplaceMcpManageAction, type MarketplaceMcpManageRequest, type MarketplaceMcpManageResult, type MarketplaceMcpTemplateInput, 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 RemoteAccessView, type RemoteAccountView, type RemoteBrowserAuthPollRequest, type RemoteBrowserAuthPollResult, type RemoteBrowserAuthStartRequest, type RemoteBrowserAuthStartResult, type RemoteDoctorCheckView, type RemoteDoctorView, type RemoteLoginRequest, type RemoteRuntimeView, type RemoteServiceAction, type RemoteServiceActionResult, type RemoteServiceView, type RemoteSettingsUpdateRequest, type RemoteSettingsView, type RuntimeConfigUpdate, type SearchConfigUpdate, type SearchConfigView, type SearchProviderConfigView, type SearchProviderName, type SearchProviderSpecView, 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, SessionPatchValidationError, type SessionsListView, type UiChatRuntime, type UiNcpAgent, type UiNcpSessionListView, type UiNcpSessionMessagesView, type UiRemoteAccessHost, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, ensureUiBridgeSecret, executeConfigAction, getSessionHistory, getUiBridgeSecretPath, listSessions, loadConfigOrDefault, patchSession, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };

package/dist/index.js

@@ -2606,6 +2606,96 @@ var ChatRoutesController = class {
   };
 };
 
+// src/ui/channel-auth.ts
+import { saveConfig as saveConfig3 } from "@nextclaw/core";
+import {
+  enablePluginInConfig
+} from "@nextclaw/openclaw-compat";
+function clonePluginConfig(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  return JSON.parse(JSON.stringify(value));
+}
+function findPluginChannelBinding(bindings, channelId) {
+  const normalizedChannelId = channelId.trim().toLowerCase();
+  return bindings.find((binding) => binding.channelId.trim().toLowerCase() === normalizedChannelId) ?? null;
+}
+function toPublicChannelAuthPollResult(result) {
+  return {
+    channel: result.channel,
+    status: result.status,
+    message: result.message,
+    nextPollMs: result.nextPollMs,
+    accountId: result.accountId,
+    notes: result.notes
+  };
+}
+function applyAuthorizedChannelAuthResult(params) {
+  if (params.result.status !== "authorized" || !params.result.pluginConfig) {
+    return;
+  }
+  const currentConfig = loadConfigOrDefault(params.configPath);
+  const nextConfig = enablePluginInConfig(
+    {
+      ...currentConfig,
+      plugins: {
+        ...currentConfig.plugins,
+        entries: {
+          ...currentConfig.plugins.entries ?? {},
+          [params.binding.pluginId]: {
+            ...currentConfig.plugins.entries?.[params.binding.pluginId] ?? {},
+            config: params.result.pluginConfig
+          }
+        }
+      }
+    },
+    params.binding.pluginId
+  );
+  saveConfig3(nextConfig, params.configPath);
+}
+async function startChannelAuth(params) {
+  const binding = findPluginChannelBinding(params.bindings, params.channelId);
+  const start = binding?.channel.auth?.start;
+  if (!binding || !start) {
+    return null;
+  }
+  const config = loadConfigOrDefault(params.configPath);
+  const result = await start({
+    cfg: config,
+    pluginId: binding.pluginId,
+    channelId: binding.channelId,
+    pluginConfig: clonePluginConfig(config.plugins.entries?.[binding.pluginId]?.config),
+    accountId: params.request.accountId?.trim() || null,
+    baseUrl: params.request.baseUrl?.trim() || null
+  });
+  return result;
+}
+async function pollChannelAuth(params) {
+  const binding = findPluginChannelBinding(params.bindings, params.channelId);
+  const poll = binding?.channel.auth?.poll;
+  if (!binding || !poll) {
+    return null;
+  }
+  const config = loadConfigOrDefault(params.configPath);
+  const result = await poll({
+    cfg: config,
+    pluginId: binding.pluginId,
+    channelId: binding.channelId,
+    pluginConfig: clonePluginConfig(config.plugins.entries?.[binding.pluginId]?.config),
+    sessionId: params.sessionId
+  });
+  if (!result) {
+    return null;
+  }
+  applyAuthorizedChannelAuthResult({
+    configPath: params.configPath,
+    binding,
+    result
+  });
+  return toPublicChannelAuthPollResult(result);
+}
+
 // src/ui/provider-auth.ts
 import { createHash, randomBytes as randomBytes3, randomUUID as randomUUID2 } from "crypto";
 import { readFile } from "fs/promises";
@@ -2614,7 +2704,7 @@ import { isAbsolute, resolve } from "path";
 import {
   ConfigSchema as ConfigSchema3,
   loadConfig as loadConfig3,
-  saveConfig as saveConfig3
+  saveConfig as saveConfig4
 } from "@nextclaw/core";
 var authSessions = /* @__PURE__ */ new Map();
 var DEFAULT_AUTH_INTERVAL_MS = 2e3;
@@ -2819,7 +2909,7 @@ function setProviderApiKey(params) {
     target.apiBase = params.defaultApiBase;
   }
   const next = ConfigSchema3.parse(config);
-  saveConfig3(next, params.configPath);
+  saveConfig4(next, params.configPath);
 }
 async function startProviderAuth(configPath, providerName, options) {
   cleanupExpiredAuthSessions();
@@ -3326,6 +3416,60 @@ var ConfigRoutesController = class {
     this.options.publish({ type: "config.updated", payload: { path: `channels.${channel}` } });
     return c.json(ok(result));
   };
+  startChannelAuth = async (c) => {
+    const channel = c.req.param("channel");
+    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);
+      }
+    }
+    try {
+      const result = await startChannelAuth({
+        configPath: this.options.configPath,
+        channelId: channel,
+        request: {
+          accountId: typeof payload.accountId === "string" ? payload.accountId : void 0,
+          baseUrl: typeof payload.baseUrl === "string" ? payload.baseUrl : void 0
+        },
+        bindings: this.options.getPluginChannelBindings?.() ?? []
+      });
+      if (!result) {
+        return c.json(err("NOT_SUPPORTED", `channel auth is not supported: ${channel}`), 404);
+      }
+      return c.json(ok(result));
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return c.json(err("AUTH_START_FAILED", message), 400);
+    }
+  };
+  pollChannelAuth = async (c) => {
+    const channel = c.req.param("channel");
+    const body = await readJson(c.req.raw);
+    if (!body.ok) {
+      return c.json(err("INVALID_BODY", "invalid json body"), 400);
+    }
+    const sessionId = typeof body.data.sessionId === "string" ? body.data.sessionId.trim() : "";
+    if (!sessionId) {
+      return c.json(err("INVALID_BODY", "sessionId is required"), 400);
+    }
+    const result = await pollChannelAuth({
+      configPath: this.options.configPath,
+      channelId: channel,
+      sessionId,
+      bindings: this.options.getPluginChannelBindings?.() ?? []
+    });
+    if (!result) {
+      return c.json(err("NOT_FOUND", "channel auth session not found"), 404);
+    }
+    if (result.status === "authorized") {
+      this.options.publish({ type: "config.updated", payload: { path: `channels.${channel}` } });
+    }
+    return c.json(ok(result));
+  };
   updateSecrets = async (c) => {
     const body = await readJson(c.req.raw);
     if (!body.ok) {
@@ -5163,6 +5307,8 @@ function registerConfigRoutes(app, configController) {
   app.post("/api/config/providers/:provider/auth/poll", configController.pollProviderAuth);
   app.post("/api/config/providers/:provider/auth/import-cli", configController.importProviderAuthFromCli);
   app.put("/api/config/channels/:channel", configController.updateChannel);
+  app.post("/api/config/channels/:channel/auth/start", configController.startChannelAuth);
+  app.post("/api/config/channels/:channel/auth/poll", configController.pollChannelAuth);
   app.put("/api/config/secrets", configController.updateSecrets);
   app.put("/api/config/runtime", configController.updateRuntime);
   app.post("/api/config/actions/:actionId/execute", configController.executeAction);
@@ -5396,7 +5542,7 @@ function startUiServer(options) {
     );
     app.get("*", (c) => {
       const path = c.req.path;
-      if (path.startsWith("/api") || path.startsWith("/ws")) {
+      if (path.startsWith("/api") || path.startsWith("/ws") || path.startsWith("/_remote")) {
         return c.notFound();
       }
       return c.html(indexHtml);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.10.31",
+  "version": "0.10.33",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -20,10 +20,10 @@
     "ws": "^8.18.0",
     "@nextclaw/mcp": "0.1.29",
     "@nextclaw/ncp": "0.3.1",
+    "@nextclaw/openclaw-compat": "0.3.16",
     "@nextclaw/ncp-http-agent-server": "0.3.1",
-    "@nextclaw/runtime": "0.2.8",
-    "@nextclaw/core": "0.9.11",
-    "@nextclaw/openclaw-compat": "0.3.15"
+    "@nextclaw/runtime": "0.2.11",
+    "@nextclaw/core": "0.9.11"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",