nextclaw 0.16.1 → 0.16.3

package/dist/cli/index.js

@@ -7,23 +7,23 @@ import { registerRemoteCommands } from "@nextclaw/remote";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig19,
+  loadConfig as loadConfig21,
   saveConfig as saveConfig11,
   getConfigPath as getConfigPath11,
   getDataDir as getDataDir10,
-  getWorkspacePath as getWorkspacePath12,
+  getWorkspacePath as getWorkspacePath13,
   expandHome as expandHome2,
   MessageBus as MessageBus3,
   AgentLoop,
   ProviderManager as ProviderManager2,
-  resolveConfigSecrets as resolveConfigSecrets5,
+  resolveConfigSecrets as resolveConfigSecrets7,
   APP_NAME as APP_NAME5,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
 import { RemoteRuntimeActions } from "@nextclaw/remote";
 import {
-  getPluginChannelBindings as getPluginChannelBindings5,
+  getPluginChannelBindings as getPluginChannelBindings6,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints3,
   setPluginRuntimeBridge as setPluginRuntimeBridge3
 } from "@nextclaw/openclaw-compat";
@@ -3985,12 +3985,10 @@ var DiagnosticsCommands = class {
 };
 
 // src/cli/commands/service.ts
-import * as NextclawCore2 from "@nextclaw/core";
+import * as NextclawCore3 from "@nextclaw/core";
 import {
-  getPluginUiMetadataFromRegistry,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
   setPluginRuntimeBridge as setPluginRuntimeBridge2,
-  startPluginChannelGateways as startPluginChannelGateways2,
   stopPluginChannelGateways as stopPluginChannelGateways2
 } from "@nextclaw/openclaw-compat";
 import { appendFileSync, closeSync as closeSync2, cpSync as cpSync2, existsSync as existsSync11, mkdirSync as mkdirSync5, openSync as openSync2 } from "fs";
@@ -4254,221 +4252,6 @@ var ServiceMarketplaceInstaller = class {
   }
 };
 
-// src/cli/commands/service-plugin-runtime-bridge.ts
-import { loadConfig as loadConfig14, resolveConfigSecrets as resolveConfigSecrets2, saveConfig as saveConfig9 } from "@nextclaw/core";
-import { setPluginRuntimeBridge } from "@nextclaw/openclaw-compat";
-function installPluginRuntimeBridge(params) {
-  const { runtimePool, runtimeConfigPath, pluginChannelBindings } = params;
-  setPluginRuntimeBridge({
-    loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }), pluginChannelBindings),
-    writeConfigFile: async (nextConfigView) => {
-      if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
-        throw new Error("plugin runtime writeConfigFile expects an object config");
-      }
-      const current = loadConfig14();
-      const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-      saveConfig9(next);
-    },
-    dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
-      const request = resolvePluginRuntimeRequest(ctx);
-      if (!request) {
-        return;
-      }
-      try {
-        await dispatcherOptions.onReplyStart?.();
-        const response = await runtimePool.processDirect(request);
-        const replyText = typeof response === "string" ? response : String(response ?? "");
-        if (replyText.trim()) {
-          await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
-        }
-      } catch (error) {
-        dispatcherOptions.onError?.(error);
-        throw error;
-      }
-    }
-  });
-}
-function resolvePluginRuntimeRequest(ctx) {
-  const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
-  const body = typeof ctx.Body === "string" ? ctx.Body : "";
-  const content = (bodyForAgent || body).trim();
-  const attachments = resolvePluginRuntimeAttachments(ctx);
-  if (!content && attachments.length === 0) {
-    return null;
-  }
-  const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : void 0;
-  const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
-  const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
-  const agentId = typeof ctx.AgentId === "string" ? ctx.AgentId : void 0;
-  const modelOverride = resolveModelOverride(ctx);
-  const accountId = typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? ctx.AccountId : void 0;
-  return {
-    content,
-    sessionKey,
-    channel,
-    chatId,
-    agentId,
-    attachments,
-    metadata: {
-      ...accountId ? { account_id: accountId } : {},
-      ...modelOverride ? { model: modelOverride } : {}
-    }
-  };
-}
-function resolveModelOverride(ctx) {
-  if (typeof ctx.Model === "string" && ctx.Model.trim().length > 0) {
-    return ctx.Model.trim();
-  }
-  if (typeof ctx.AgentModel === "string" && ctx.AgentModel.trim().length > 0) {
-    return ctx.AgentModel.trim();
-  }
-  return void 0;
-}
-function readStringList(value) {
-  if (!Array.isArray(value)) {
-    return [];
-  }
-  return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
-}
-function readOptionalString(value) {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const trimmed = value.trim();
-  return trimmed || void 0;
-}
-function resolvePluginRuntimeAttachments(ctx) {
-  const mediaPaths = readStringList(ctx.MediaPaths);
-  const mediaUrls = readStringList(ctx.MediaUrls);
-  const fallbackPath = readOptionalString(ctx.MediaPath);
-  const fallbackUrl = readOptionalString(ctx.MediaUrl);
-  const mediaTypes = readStringList(ctx.MediaTypes);
-  const fallbackType = readOptionalString(ctx.MediaType);
-  const entryCount = Math.max(
-    mediaPaths.length,
-    mediaUrls.length,
-    fallbackPath ? 1 : 0,
-    fallbackUrl ? 1 : 0
-  );
-  const attachments = [];
-  for (let index = 0; index < entryCount; index += 1) {
-    const path2 = mediaPaths[index] ?? (index === 0 ? fallbackPath : void 0);
-    const rawUrl = mediaUrls[index] ?? (index === 0 ? fallbackUrl : void 0);
-    const url = rawUrl && rawUrl !== path2 ? rawUrl : void 0;
-    const mimeType = mediaTypes[index] ?? fallbackType;
-    if (!path2 && !url) {
-      continue;
-    }
-    attachments.push({
-      path: path2,
-      url,
-      mimeType,
-      source: "plugin-runtime",
-      status: path2 ? "ready" : "remote-only"
-    });
-  }
-  return attachments;
-}
-
-// src/cli/commands/service-plugin-reload.ts
-import { getWorkspacePath as getWorkspacePath7 } from "@nextclaw/core";
-import {
-  getPluginChannelBindings as getPluginChannelBindings3,
-  startPluginChannelGateways,
-  stopPluginChannelGateways
-} from "@nextclaw/openclaw-compat";
-
-// src/cli/commands/plugin-reload.ts
-function buildPluginChannelBindingSignature(binding) {
-  return `${binding.pluginId}:${binding.channelId}`;
-}
-function buildSortedBindingSignatures(bindings) {
-  return bindings.map(buildPluginChannelBindingSignature).sort();
-}
-function buildSortedExtensionChannelIds(channels2) {
-  return channels2.map((registration) => registration.channel.id).filter((id) => typeof id === "string" && id.trim().length > 0).sort();
-}
-function areSortedStringListsEqual(left, right) {
-  if (left.length !== right.length) {
-    return false;
-  }
-  for (let index = 0; index < left.length; index += 1) {
-    if (left[index] !== right[index]) {
-      return false;
-    }
-  }
-  return true;
-}
-function readPluginIdFromPluginsEntryPath(path2) {
-  const prefix = "plugins.entries.";
-  if (!path2.startsWith(prefix)) {
-    return null;
-  }
-  const suffix = path2.slice(prefix.length);
-  const [pluginId] = suffix.split(".");
-  return pluginId?.trim() ? pluginId.trim() : null;
-}
-function shouldRestartChannelsForPluginReload(params) {
-  const currentBindingSignatures = buildSortedBindingSignatures(params.currentPluginChannelBindings);
-  const nextBindingSignatures = buildSortedBindingSignatures(params.nextPluginChannelBindings);
-  if (!areSortedStringListsEqual(currentBindingSignatures, nextBindingSignatures)) {
-    return true;
-  }
-  const currentExtensionChannelIds = buildSortedExtensionChannelIds(params.currentExtensionChannels);
-  const nextExtensionChannelIds = buildSortedExtensionChannelIds(params.nextExtensionChannels);
-  if (!areSortedStringListsEqual(currentExtensionChannelIds, nextExtensionChannelIds)) {
-    return true;
-  }
-  const channelPluginIds = /* @__PURE__ */ new Set();
-  for (const binding of params.currentPluginChannelBindings) {
-    channelPluginIds.add(binding.pluginId);
-  }
-  for (const binding of params.nextPluginChannelBindings) {
-    channelPluginIds.add(binding.pluginId);
-  }
-  for (const path2 of params.changedPaths) {
-    const pluginId = readPluginIdFromPluginsEntryPath(path2);
-    if (pluginId && channelPluginIds.has(pluginId)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// src/cli/commands/service-plugin-reload.ts
-async function reloadServicePlugins(params) {
-  const nextWorkspace = getWorkspacePath7(params.nextConfig.agents.defaults.workspace);
-  const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
-  const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
-  const nextPluginChannelBindings = getPluginChannelBindings3(nextPluginRegistry);
-  const shouldRestartChannels = shouldRestartChannelsForPluginReload({
-    changedPaths: params.changedPaths,
-    currentPluginChannelBindings: params.pluginChannelBindings,
-    nextPluginChannelBindings,
-    currentExtensionChannels: params.extensionRegistry.channels,
-    nextExtensionChannels: nextExtensionRegistry.channels
-  });
-  logPluginDiagnostics(nextPluginRegistry);
-  let pluginGatewayHandles = params.pluginGatewayHandles;
-  if (shouldRestartChannels) {
-    await stopPluginChannelGateways(pluginGatewayHandles);
-    const startedPluginGateways = await startPluginChannelGateways({
-      registry: nextPluginRegistry,
-      config: params.nextConfig,
-      logger: params.pluginGatewayLogger
-    });
-    pluginGatewayHandles = startedPluginGateways.handles;
-    params.logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
-  }
-  return {
-    pluginRegistry: nextPluginRegistry,
-    extensionRegistry: nextExtensionRegistry,
-    pluginChannelBindings: nextPluginChannelBindings,
-    pluginGatewayHandles,
-    restartChannels: shouldRestartChannels
-  };
-}
-
 // src/cli/commands/service-startup-support.ts
 var pluginGatewayLogger = {
   info: (message) => console.log(`[plugins] ${message}`),
@@ -4626,7 +4409,7 @@ function tryClaimRemoteOwnershipLock(params) {
 function claimManagedRemoteRuntimeOwnership(params) {
   const lockPath = params.lockPath ?? resolveRemoteOwnershipLockPath();
   const currentPid = params.currentPid ?? process.pid;
-  const now = params.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const now3 = params.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
   const isProcessRunningFn = params.isProcessRunningFn ?? isProcessRunning;
   const readServiceStateFn = params.readServiceStateFn ?? readServiceState;
   const managedConflict = detectManagedRemoteOwnershipConflict({
@@ -4646,7 +4429,7 @@ function claimManagedRemoteRuntimeOwnership(params) {
     claim: {
       pid: currentPid,
       localOrigin: params.localOrigin,
-      claimedAt: now()
+      claimedAt: now3()
     },
     currentPid,
     isProcessRunningFn
@@ -4714,11 +4497,11 @@ function writeReadyManagedServiceState(params) {
 }
 
 // src/cli/commands/remote-access-host.ts
-import { getConfigPath as getConfigPath8, loadConfig as loadConfig16 } from "@nextclaw/core";
+import { getConfigPath as getConfigPath8, loadConfig as loadConfig15 } from "@nextclaw/core";
 import { readPlatformSessionTokenState as readPlatformSessionTokenState2 } from "@nextclaw/remote";
 
 // src/cli/commands/remote-access-service-control.ts
-import { getConfigPath as getConfigPath7, loadConfig as loadConfig15 } from "@nextclaw/core";
+import { getConfigPath as getConfigPath7, loadConfig as loadConfig14 } from "@nextclaw/core";
 import { spawn as spawn2 } from "child_process";
 var FORCED_PUBLIC_UI_HOST = "0.0.0.0";
 function resolveRemoteServiceView(currentUi) {
@@ -4807,7 +4590,7 @@ async function controlManagedService(action, deps) {
   return { accepted: true, action, message: "Managed service restarted." };
 }
 function resolveManagedUiOverrides() {
-  const config2 = loadConfig15(getConfigPath7());
+  const config2 = loadConfig14(getConfigPath7());
   const resolved = resolveUiConfig(config2, {
     enabled: true,
     host: FORCED_PUBLIC_UI_HOST,
@@ -4907,7 +4690,7 @@ var RemoteAccessHost = class {
     this.deps = deps;
   }
   getStatus() {
-    const config2 = loadConfig16(getConfigPath8());
+    const config2 = loadConfig15(getConfigPath8());
     const status = this.deps.remoteCommands.getStatusView();
     const account = this.readAccountView({
       token: normalizeOptionalString4(config2.providers.nextclaw?.apiKey),
@@ -4944,7 +4727,7 @@ var RemoteAccessHost = class {
     };
   }
   async pollBrowserAuth(input) {
-    const config2 = loadConfig16(getConfigPath8());
+    const config2 = loadConfig15(getConfigPath8());
     const result = await this.deps.platformAuthCommands.pollBrowserAuth({
       apiBase: normalizeOptionalString4(input.apiBase) ?? normalizeOptionalString4(config2.remote.platformApiBase) ?? normalizeOptionalString4(config2.providers.nextclaw?.apiBase) ?? void 0,
       sessionId: input.sessionId
@@ -5064,7 +4847,7 @@ import { resolve as resolve11 } from "path";
 import {
   buildAssetContentPath
 } from "@nextclaw/ncp-agent-runtime";
-function readOptionalString2(value) {
+function readOptionalString(value) {
   if (typeof value !== "string") {
     return null;
   }
@@ -5072,7 +4855,7 @@ function readOptionalString2(value) {
   return trimmed.length > 0 ? trimmed : null;
 }
 function readOptionalBase64Bytes(value) {
-  const base64 = readOptionalString2(value);
+  const base64 = readOptionalString(value);
   if (!base64) {
     return null;
   }
@@ -5124,9 +4907,9 @@ var AssetPutTool = class {
     }
   };
   async execute(args) {
-    const path2 = readOptionalString2(args?.path);
-    const fileName = readOptionalString2(args?.fileName);
-    const mimeType = readOptionalString2(args?.mimeType);
+    const path2 = readOptionalString(args?.path);
+    const fileName = readOptionalString(args?.fileName);
+    const mimeType = readOptionalString(args?.mimeType);
     const bytes = readOptionalBase64Bytes(args?.bytesBase64);
     let record;
     if (path2) {
@@ -5171,8 +4954,8 @@ var AssetExportTool = class {
     required: ["assetUri", "targetPath"]
   };
   async execute(args) {
-    const assetUri = readOptionalString2(args?.assetUri);
-    const targetPath = readOptionalString2(args?.targetPath);
+    const assetUri = readOptionalString(args?.assetUri);
+    const targetPath = readOptionalString(args?.targetPath);
     if (!assetUri || !targetPath) {
       throw new Error("asset_export requires assetUri and targetPath.");
     }
@@ -5202,7 +4985,7 @@ var AssetStatTool = class {
     required: ["assetUri"]
   };
   async execute(args) {
-    const assetUri = readOptionalString2(args?.assetUri);
+    const assetUri = readOptionalString(args?.assetUri);
     if (!assetUri) {
       throw new Error("asset_stat requires assetUri.");
     }
@@ -5236,7 +5019,7 @@ import {
   buildToolCatalogEntries,
   ContextBuilder,
   InputBudgetPruner,
-  getWorkspacePath as getWorkspacePath8,
+  getWorkspacePath as getWorkspacePath7,
   parseThinkingLevel as parseThinkingLevel2,
   resolveThinkingLevel
 } from "@nextclaw/core";
@@ -5895,7 +5678,7 @@ function resolvePrimaryAgentProfile(config2) {
   const profile = config2.agents.list.find((entry) => entry.id.trim() === configuredDefaultAgentId);
   return {
     agentId: configuredDefaultAgentId,
-    workspace: getWorkspacePath8(profile?.workspace ?? config2.agents.defaults.workspace),
+    workspace: getWorkspacePath7(profile?.workspace ?? config2.agents.defaults.workspace),
     model: profile?.model ?? config2.agents.defaults.model,
     maxIterations: profile?.maxToolIterations ?? config2.agents.defaults.maxToolIterations,
     contextTokens: profile?.contextTokens ?? config2.agents.defaults.contextTokens,
@@ -6749,7 +6532,6 @@ function createUiNcpAgentHandle(params) {
     basePath: "/api/ncp/agent",
     agentClientEndpoint: createAgentClientFromServer(params.backend),
     streamProvider: params.backend,
-    sessionApi: params.backend,
     listSessionTypes: (describeParams) => {
       params.refreshPluginRuntimeRegistrations();
       return params.runtimeRegistry.listSessionTypes(describeParams);
@@ -6807,9 +6589,96 @@ async function createUiNcpAgent(params) {
   });
 }
 
+// src/cli/commands/ncp/ui-session-service.ts
+function applyLimit(items, limit) {
+  if (!Number.isFinite(limit) || typeof limit !== "number" || limit <= 0) {
+    return items;
+  }
+  return items.slice(0, Math.trunc(limit));
+}
+function now() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function toSessionSummary(params) {
+  return {
+    sessionId: params.sessionId,
+    messageCount: params.messages.length,
+    updatedAt: params.updatedAt,
+    status: "idle",
+    ...params.metadata ? { metadata: structuredClone(params.metadata) } : {}
+  };
+}
+function buildUpdatedMetadata(params) {
+  if (params.patch.metadata === null) {
+    return {};
+  }
+  if (params.patch.metadata) {
+    return structuredClone(params.patch.metadata);
+  }
+  return structuredClone(params.existingMetadata ?? {});
+}
+var UiSessionService = class {
+  sessionStore;
+  constructor(sessionManager) {
+    this.sessionStore = new NextclawAgentSessionStore(sessionManager);
+  }
+  async listSessions(options) {
+    const sessions = await this.sessionStore.listSessions();
+    return applyLimit(
+      sessions.map(
+        (session) => toSessionSummary({
+          sessionId: session.sessionId,
+          messages: session.messages,
+          updatedAt: session.updatedAt,
+          metadata: session.metadata
+        })
+      ),
+      options?.limit
+    );
+  }
+  async listSessionMessages(sessionId, options) {
+    const session = await this.sessionStore.getSession(sessionId);
+    if (!session) {
+      return [];
+    }
+    return applyLimit(session.messages.map((message) => structuredClone(message)), options?.limit);
+  }
+  async getSession(sessionId) {
+    const session = await this.sessionStore.getSession(sessionId);
+    if (!session) {
+      return null;
+    }
+    return toSessionSummary({
+      sessionId,
+      messages: session.messages,
+      updatedAt: session.updatedAt,
+      metadata: session.metadata
+    });
+  }
+  async updateSession(sessionId, patch) {
+    const session = await this.sessionStore.getSession(sessionId);
+    if (!session) {
+      return null;
+    }
+    await this.sessionStore.saveSession({
+      sessionId,
+      messages: session.messages.map((message) => structuredClone(message)),
+      updatedAt: now(),
+      metadata: buildUpdatedMetadata({
+        existingMetadata: session.metadata,
+        patch
+      })
+    });
+    return await this.getSession(sessionId);
+  }
+  async deleteSession(sessionId) {
+    await this.sessionStore.deleteSession(sessionId);
+  }
+};
+
 // src/cli/commands/service-gateway-context.ts
 import * as NextclawCore from "@nextclaw/core";
-import { getPluginChannelBindings as getPluginChannelBindings4, resolvePluginChannelMessageToolHints } from "@nextclaw/openclaw-compat";
+import { getPluginChannelBindings as getPluginChannelBindings3, resolvePluginChannelMessageToolHints } from "@nextclaw/openclaw-compat";
 import { join as join6 } from "path";
 
 // src/cli/gateway/controller.ts
@@ -7157,7 +7026,7 @@ var ConfigReloader = class {
       console.log("Config reload: MCP servers reloaded.");
     }
     if (plan.restartChannels || reloadPluginsResult?.restartChannels) {
-      await this.reloadChannels(nextConfig);
+      await this.reloadChannels(nextConfig, { start: true });
       console.log("Config reload: channels restarted.");
     }
     if (plan.reloadProviders) {
@@ -7207,7 +7076,10 @@ var ConfigReloader = class {
     await this.runReload(reason ?? "gateway tool");
     return "Config reload triggered";
   }
-  async reloadChannels(nextConfig) {
+  async rebuildChannels(nextConfig, options = {}) {
+    await this.reloadChannels(nextConfig, { start: options.start ?? true });
+  }
+  async reloadChannels(nextConfig, options) {
     if (this.reloadTask) {
       await this.reloadTask;
       return;
@@ -7221,7 +7093,9 @@ var ConfigReloader = class {
         this.options.sessionManager,
         this.options.getExtensionChannels?.() ?? []
       );
-      await this.channels.startAll();
+      if (options.start) {
+        await this.channels.startAll();
+      }
     })();
     try {
       await this.reloadTask;
@@ -7273,7 +7147,7 @@ import {
   createAssistantStreamDeltaControlMessage,
   createAssistantStreamResetControlMessage,
   AgentRouteResolver,
-  getWorkspacePath as getWorkspacePath9,
+  getWorkspacePath as getWorkspacePath8,
   parseAgentScopedSessionKey
 } from "@nextclaw/core";
 function normalizeAgentId(value) {
@@ -7318,7 +7192,7 @@ function resolveAgentProfiles(config2) {
   }
   return Array.from(unique.values()).map((entry) => ({
     id: entry.id,
-    workspace: getWorkspacePath9(entry.workspace ?? defaults.workspace),
+    workspace: getWorkspacePath8(entry.workspace ?? defaults.workspace),
     model: entry.model ?? defaults.model,
     engine: normalizeEngineKind(entry.engine ?? defaults.engine),
     engineConfig: entry.engineConfig ?? toRecord(defaults.engineConfig),
@@ -7586,7 +7460,7 @@ var GatewayAgentRuntimePool = class {
     const normalizedAgentId = normalizeAgentId(agentId);
     return this.resolvedProfiles.find((profile) => profile.id === normalizedAgentId) ?? this.resolvedProfiles.find((profile) => profile.id === this.defaultAgentId) ?? this.resolvedProfiles[0] ?? {
       id: this.defaultAgentId,
-      workspace: getWorkspacePath9(this.options.config.agents.defaults.workspace),
+      workspace: getWorkspacePath8(this.options.config.agents.defaults.workspace),
       model: this.options.config.agents.defaults.model,
       maxIterations: this.options.config.agents.defaults.maxToolIterations,
       contextTokens: this.options.config.agents.defaults.contextTokens,
@@ -7808,31 +7682,36 @@ var {
   CronService: CronService2,
   getConfigPath: getConfigPath9,
   getDataDir: getDataDir8,
-  getWorkspacePath: getWorkspacePath10,
+  getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
-  loadConfig: loadConfig17,
+  loadConfig: loadConfig16,
   MessageBus,
   ProviderManager,
-  resolveConfigSecrets: resolveConfigSecrets3,
-  saveConfig: saveConfig10,
+  resolveConfigSecrets: resolveConfigSecrets2,
+  saveConfig: saveConfig9,
   SessionManager
 } = NextclawCore;
 function createGatewayShellContext(params) {
   const runtimeConfigPath = getConfigPath9();
-  const config2 = resolveConfigSecrets3(loadConfig17(), { configPath: runtimeConfigPath });
-  const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
+  const config2 = resolveConfigSecrets2(loadConfig16(), { configPath: runtimeConfigPath });
+  const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
   const cronStorePath = join6(getDataDir8(), "cron", "jobs.json");
+  const sessionManager = measureStartupSync(
+    "service.gateway_shell_context.session_manager",
+    () => new SessionManager(workspace)
+  );
   const cron2 = new CronService2(cronStorePath);
   const uiConfig = resolveUiConfig(config2, params.uiOverrides);
   const uiStaticDir = params.uiStaticDir === void 0 ? resolveUiStaticDir() : params.uiStaticDir;
   const remoteModule = createManagedRemoteModuleForUi({
-    loadConfig: () => resolveConfigSecrets3(loadConfig17(), { configPath: runtimeConfigPath }),
+    loadConfig: () => resolveConfigSecrets2(loadConfig16(), { configPath: runtimeConfigPath }),
     uiConfig
   });
   return {
     runtimeConfigPath,
     config: config2,
     workspace,
+    sessionManager,
     cron: cron2,
     uiConfig,
     uiStaticDir,
@@ -7848,17 +7727,18 @@ function createGatewayStartupContext(params) {
   state.runtimeConfigPath = shellContext.runtimeConfigPath;
   state.config = shellContext.config;
   state.workspace = shellContext.workspace;
+  state.sessionManager = shellContext.sessionManager;
   state.cron = shellContext.cron;
   state.uiConfig = shellContext.uiConfig;
   state.uiStaticDir = shellContext.uiStaticDir;
   state.remoteModule = shellContext.remoteModule;
-  state.pluginRegistry = measureStartupSync(
+  state.pluginRegistry = params.initialPluginRegistry ?? measureStartupSync(
     "service.gateway_context.load_plugin_registry",
     () => loadPluginRegistry(state.config, state.workspace)
   );
   state.pluginChannelBindings = measureStartupSync(
     "service.gateway_context.get_plugin_channel_bindings",
-    () => getPluginChannelBindings4(state.pluginRegistry)
+    () => getPluginChannelBindings3(state.pluginRegistry)
   );
   state.extensionRegistry = measureStartupSync(
     "service.gateway_context.to_extension_registry",
@@ -7874,10 +7754,6 @@ function createGatewayStartupContext(params) {
       config: state.config
     })
   );
-  state.sessionManager = measureStartupSync(
-    "service.gateway_context.session_manager",
-    () => new SessionManager(state.workspace)
-  );
   if (!provider) {
     console.warn(
       "Warning: No API key configured. The gateway is running, but agent replies are disabled until provider config is set."
@@ -7898,7 +7774,7 @@ function createGatewayStartupContext(params) {
       sessionManager: state.sessionManager,
       providerManager: state.providerManager,
       makeProvider: (nextConfig) => params.makeProvider(nextConfig, { allowMissing: true }) ?? params.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets3(loadConfig17(), { configPath: state.runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig16(), { configPath: state.runtimeConfigPath }),
       resolveChannelConfig: (nextConfig) => resolveChannelConfigView(nextConfig, state.pluginChannelBindings),
       getExtensionChannels: () => state.extensionRegistry.channels,
       onRestartRequired: (paths) => {
@@ -7911,7 +7787,7 @@ function createGatewayStartupContext(params) {
     })
   );
   state.applyLiveConfigReload = async () => {
-    await state.reloader.applyReloadPlan(resolveConfigSecrets3(loadConfig17(), { configPath: state.runtimeConfigPath }));
+    await state.reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig16(), { configPath: state.runtimeConfigPath }));
   };
   state.gatewayController = measureStartupSync(
     "service.gateway_context.gateway_controller",
@@ -7920,7 +7796,7 @@ function createGatewayStartupContext(params) {
       cron: state.cron,
       sessionManager: state.sessionManager,
       getConfigPath: getConfigPath9,
-      saveConfig: saveConfig10,
+      saveConfig: saveConfig9,
       requestRestart: async (options) => {
         await params.requestRestart({
           reason: options?.reason ?? "gateway tool restart",
@@ -7949,7 +7825,7 @@ function createGatewayStartupContext(params) {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: state.pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets3(loadConfig17(), { configPath: state.runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig16(), { configPath: state.runtimeConfigPath }),
         accountId
       })
     })
@@ -7969,7 +7845,9 @@ function createGatewayStartupContext(params) {
 }
 
 // src/cli/commands/service-gateway-startup.ts
-import { startUiServer } from "@nextclaw/server";
+import {
+  startUiServer
+} from "@nextclaw/server";
 
 // src/cli/commands/service-deferred-ncp-agent.ts
 var DEFAULT_BASE_PATH = "/api/ncp/agent";
@@ -8039,7 +7917,6 @@ function createDeferredUiNcpAgent(basePath = DEFAULT_BASE_PATH) {
     activeAgent = null;
     agent.basePath = basePath;
     agent.streamProvider = void 0;
-    agent.sessionApi = void 0;
     agent.listSessionTypes = void 0;
     agent.assetApi = void 0;
   };
@@ -8049,7 +7926,6 @@ function createDeferredUiNcpAgent(basePath = DEFAULT_BASE_PATH) {
       activeAgent = nextAgent;
       agent.basePath = nextAgent.basePath ?? basePath;
       agent.streamProvider = nextAgent.streamProvider;
-      agent.sessionApi = nextAgent.sessionApi;
       agent.listSessionTypes = nextAgent.listSessionTypes;
       agent.assetApi = nextAgent.assetApi;
     },
@@ -8083,8 +7959,10 @@ async function startUiShell(params) {
     cronService: params.cronService,
     marketplace: params.marketplace,
     remoteAccess: params.remoteAccess,
+    getBootstrapStatus: params.getBootstrapStatus,
     getPluginChannelBindings: params.getPluginChannelBindings,
     getPluginUiMetadata: params.getPluginUiMetadata,
+    ncpSessionService: params.ncpSessionService,
     ncpAgent: deferredNcpAgent.agent
   });
   publishUiEvent = uiServer.publish;
@@ -8131,6 +8009,9 @@ async function startDeferredGatewayStartup(params) {
       console.error(`UI NCP agent startup failed: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
+  if (params.hydrateCapabilities) {
+    await measureStartupAsync("service.deferred_startup.hydrate_capabilities", params.hydrateCapabilities);
+  }
   await measureStartupAsync("service.deferred_startup.start_plugin_gateways", params.startPluginGateways);
   await measureStartupAsync("service.deferred_startup.start_channels", params.startChannels);
   await measureStartupAsync("service.deferred_startup.wake_restart_sentinel", params.wakeFromRestartSentinel);
@@ -8152,18 +8033,570 @@ async function runGatewayRuntimeLoop(params) {
   }
 }
 
-// src/cli/commands/service-ui-shell-grace.ts
-import { setTimeout as delay } from "timers/promises";
-var DEFAULT_UI_SHELL_GRACE_MS = 3e3;
-async function waitForUiShellGraceWindow(uiStartup) {
-  if (!uiStartup) {
-    return;
-  }
+// src/cli/commands/plugin-registry-loader.ts
+import {
+  discoverPluginStatusReport,
+  loadOpenClawPluginsProgressively
+} from "@nextclaw/openclaw-compat";
+function createPluginLogger() {
+  return {
+    info: (message) => console.log(message),
+    warn: (message) => console.warn(message),
+    error: (message) => console.error(message),
+    debug: (message) => console.debug(message)
+  };
+}
+function withDevFirstPartyPluginPaths(config2) {
+  const workspaceExtensionsDir = resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR);
+  return {
+    workspaceExtensionsDir,
+    configWithDevPluginPaths: applyDevFirstPartyPluginLoadPaths(config2, workspaceExtensionsDir)
+  };
+}
+async function loadPluginRegistryProgressively(config2, workspaceDir, options = {}) {
+  const { workspaceExtensionsDir, configWithDevPluginPaths } = withDevFirstPartyPluginPaths(config2);
+  const excludedRoots = resolveDevFirstPartyPluginInstallRoots(config2, workspaceExtensionsDir);
+  return await loadOpenClawPluginsProgressively({
+    config: configWithDevPluginPaths,
+    workspaceDir,
+    excludeRoots: excludedRoots,
+    ...buildReservedPluginLoadOptions(),
+    onPluginProcessed: options.onPluginProcessed,
+    logger: createPluginLogger()
+  });
+}
+function discoverPluginRegistryStatus(config2, workspaceDir) {
+  const { configWithDevPluginPaths } = withDevFirstPartyPluginPaths(config2);
+  return discoverPluginStatusReport({
+    config: configWithDevPluginPaths,
+    workspaceDir
+  });
+}
+function createEmptyPluginRegistry() {
+  return {
+    plugins: [],
+    tools: [],
+    channels: [],
+    providers: [],
+    engines: [],
+    ncpAgentRuntimes: [],
+    diagnostics: [],
+    resolvedTools: []
+  };
+}
+
+// src/cli/commands/service-gateway-bootstrap.ts
+import * as NextclawCore2 from "@nextclaw/core";
+import {
+  getPluginUiMetadataFromRegistry as getPluginUiMetadataFromRegistry2,
+  startPluginChannelGateways as startPluginChannelGateways2
+} from "@nextclaw/openclaw-compat";
+
+// src/cli/commands/service-bootstrap-status.ts
+function now2() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+var ServiceBootstrapStatusStore = class {
+  state = {
+    phase: "kernel-starting",
+    pluginHydration: {
+      state: "pending",
+      loadedPluginCount: 0,
+      totalPluginCount: 0
+    },
+    channels: {
+      state: "pending",
+      enabled: []
+    },
+    remote: {
+      state: "pending"
+    }
+  };
+  getStatus() {
+    return {
+      ...this.state,
+      pluginHydration: { ...this.state.pluginHydration },
+      channels: {
+        ...this.state.channels,
+        enabled: [...this.state.channels.enabled]
+      },
+      remote: { ...this.state.remote }
+    };
+  }
+  markShellReady() {
+    this.state.phase = "shell-ready";
+    this.state.shellReadyAt = this.state.shellReadyAt ?? now2();
+  }
+  markPluginHydrationPending() {
+    this.state.pluginHydration = {
+      ...this.state.pluginHydration,
+      state: "pending",
+      loadedPluginCount: 0,
+      totalPluginCount: 0
+    };
+  }
+  markPluginHydrationRunning(params) {
+    this.state.phase = "hydrating-capabilities";
+    this.state.pluginHydration = {
+      ...this.state.pluginHydration,
+      state: "running",
+      loadedPluginCount: 0,
+      totalPluginCount: params.totalPluginCount,
+      startedAt: this.state.pluginHydration.startedAt ?? now2(),
+      completedAt: void 0,
+      error: void 0
+    };
+  }
+  markPluginHydrationProgress(params) {
+    this.state.pluginHydration = {
+      ...this.state.pluginHydration,
+      state: "running",
+      loadedPluginCount: params.loadedPluginCount,
+      totalPluginCount: params.totalPluginCount ?? this.state.pluginHydration.totalPluginCount
+    };
+  }
+  markPluginHydrationReady(params) {
+    this.state.pluginHydration = {
+      ...this.state.pluginHydration,
+      state: "ready",
+      loadedPluginCount: params.loadedPluginCount,
+      totalPluginCount: params.totalPluginCount,
+      completedAt: now2(),
+      error: void 0
+    };
+  }
+  markPluginHydrationError(error) {
+    this.state.phase = "error";
+    this.state.lastError = error;
+    this.state.pluginHydration = {
+      ...this.state.pluginHydration,
+      state: "error",
+      completedAt: now2(),
+      error
+    };
+  }
+  markChannelsPending() {
+    this.state.channels = {
+      state: "pending",
+      enabled: []
+    };
+  }
+  markChannelsReady(enabled) {
+    this.state.channels = {
+      state: "ready",
+      enabled: [...enabled]
+    };
+    if (this.state.pluginHydration.state === "ready") {
+      this.state.phase = "ready";
+      this.state.lastError = void 0;
+    }
+  }
+  markChannelsError(error) {
+    this.state.phase = "error";
+    this.state.lastError = error;
+    this.state.channels = {
+      state: "error",
+      enabled: [...this.state.channels.enabled],
+      error
+    };
+  }
+  setRemoteState(state, message) {
+    this.state.remote = {
+      state,
+      ...message ? { message } : {}
+    };
+  }
+  markReady() {
+    this.state.phase = "ready";
+    this.state.lastError = void 0;
+  }
+  markError(error) {
+    this.state.phase = "error";
+    this.state.lastError = error;
+  }
+};
+
+// src/cli/commands/service-capability-hydration.ts
+import { getWorkspacePath as getWorkspacePath10, loadConfig as loadConfig17, resolveConfigSecrets as resolveConfigSecrets3 } from "@nextclaw/core";
+import {
+  getPluginChannelBindings as getPluginChannelBindings4,
+  getPluginUiMetadataFromRegistry
+} from "@nextclaw/openclaw-compat";
+
+// src/cli/commands/plugin-reload.ts
+function buildPluginChannelBindingSignature(binding) {
+  return `${binding.pluginId}:${binding.channelId}`;
+}
+function buildSortedBindingSignatures(bindings) {
+  return bindings.map(buildPluginChannelBindingSignature).sort();
+}
+function buildSortedExtensionChannelIds(channels2) {
+  return channels2.map((registration) => registration.channel.id).filter((id) => typeof id === "string" && id.trim().length > 0).sort();
+}
+function areSortedStringListsEqual(left, right) {
+  if (left.length !== right.length) {
+    return false;
+  }
+  for (let index = 0; index < left.length; index += 1) {
+    if (left[index] !== right[index]) {
+      return false;
+    }
+  }
+  return true;
+}
+function readPluginIdFromPluginsEntryPath(path2) {
+  const prefix = "plugins.entries.";
+  if (!path2.startsWith(prefix)) {
+    return null;
+  }
+  const suffix = path2.slice(prefix.length);
+  const [pluginId] = suffix.split(".");
+  return pluginId?.trim() ? pluginId.trim() : null;
+}
+function shouldRestartChannelsForPluginReload(params) {
+  const currentBindingSignatures = buildSortedBindingSignatures(params.currentPluginChannelBindings);
+  const nextBindingSignatures = buildSortedBindingSignatures(params.nextPluginChannelBindings);
+  if (!areSortedStringListsEqual(currentBindingSignatures, nextBindingSignatures)) {
+    return true;
+  }
+  const currentExtensionChannelIds = buildSortedExtensionChannelIds(params.currentExtensionChannels);
+  const nextExtensionChannelIds = buildSortedExtensionChannelIds(params.nextExtensionChannels);
+  if (!areSortedStringListsEqual(currentExtensionChannelIds, nextExtensionChannelIds)) {
+    return true;
+  }
+  const channelPluginIds = /* @__PURE__ */ new Set();
+  for (const binding of params.currentPluginChannelBindings) {
+    channelPluginIds.add(binding.pluginId);
+  }
+  for (const binding of params.nextPluginChannelBindings) {
+    channelPluginIds.add(binding.pluginId);
+  }
+  for (const path2 of params.changedPaths) {
+    const pluginId = readPluginIdFromPluginsEntryPath(path2);
+    if (pluginId && channelPluginIds.has(pluginId)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// src/cli/commands/service-ui-shell-grace.ts
+import { setTimeout as delay } from "timers/promises";
+var DEFAULT_UI_SHELL_GRACE_MS = 3e3;
+async function waitForUiShellGraceWindow(uiStartup) {
+  if (!uiStartup) {
+    return;
+  }
   await measureStartupAsync("service.ui_shell_grace_window", async () => {
     await delay(DEFAULT_UI_SHELL_GRACE_MS);
   });
 }
 
+// src/cli/commands/service-capability-hydration.ts
+function countEnabledPlugins(config2, workspaceDir) {
+  return discoverPluginRegistryStatus(config2, workspaceDir).plugins.filter((plugin) => plugin.enabled).length;
+}
+async function hydrateServiceCapabilities(params) {
+  await waitForUiShellGraceWindow(params.uiStartup);
+  const nextConfig = resolveConfigSecrets3(loadConfig17(), { configPath: params.gateway.runtimeConfigPath });
+  const nextWorkspace = getWorkspacePath10(nextConfig.agents.defaults.workspace);
+  const totalPluginCount = countEnabledPlugins(nextConfig, nextWorkspace);
+  let loadedPluginCount = 0;
+  params.bootstrapStatus.markPluginHydrationRunning({
+    totalPluginCount
+  });
+  params.bootstrapStatus.markChannelsPending();
+  try {
+    const nextPluginRegistry = await loadPluginRegistryProgressively(nextConfig, nextWorkspace, {
+      onPluginProcessed: ({ loadedPluginCount: nextCount }) => {
+        loadedPluginCount = nextCount;
+        params.bootstrapStatus.markPluginHydrationProgress({
+          loadedPluginCount: nextCount,
+          totalPluginCount
+        });
+      }
+    });
+    logPluginDiagnostics(nextPluginRegistry);
+    const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
+    const nextPluginChannelBindings = getPluginChannelBindings4(nextPluginRegistry);
+    const nextPluginUiMetadata = getPluginUiMetadataFromRegistry(nextPluginRegistry);
+    const shouldRebuildChannels = shouldRestartChannelsForPluginReload({
+      changedPaths: [],
+      currentPluginChannelBindings: params.state.pluginChannelBindings,
+      nextPluginChannelBindings,
+      currentExtensionChannels: params.state.extensionRegistry.channels,
+      nextExtensionChannels: nextExtensionRegistry.channels
+    });
+    params.state.pluginRegistry = nextPluginRegistry;
+    params.state.extensionRegistry = nextExtensionRegistry;
+    params.state.pluginChannelBindings = nextPluginChannelBindings;
+    params.state.pluginUiMetadata = nextPluginUiMetadata;
+    params.gateway.runtimePool.applyExtensionRegistry(nextExtensionRegistry);
+    params.gateway.runtimePool.applyRuntimeConfig(nextConfig);
+    params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(nextExtensionRegistry);
+    if (shouldRebuildChannels) {
+      await params.gateway.reloader.rebuildChannels(nextConfig, { start: false });
+    }
+    params.uiStartup?.publish({ type: "config.updated", payload: { path: "channels" } });
+    params.uiStartup?.publish({ type: "config.updated", payload: { path: "plugins" } });
+    params.bootstrapStatus.markPluginHydrationReady({
+      loadedPluginCount: loadedPluginCount || totalPluginCount,
+      totalPluginCount
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    params.bootstrapStatus.markPluginHydrationError(message);
+    throw error;
+  }
+}
+
+// src/cli/commands/service-plugin-runtime-bridge.ts
+import { loadConfig as loadConfig18, resolveConfigSecrets as resolveConfigSecrets4, saveConfig as saveConfig10 } from "@nextclaw/core";
+import { setPluginRuntimeBridge } from "@nextclaw/openclaw-compat";
+function installPluginRuntimeBridge(params) {
+  const { runtimePool, runtimeConfigPath, getPluginChannelBindings: getPluginChannelBindings7 } = params;
+  setPluginRuntimeBridge({
+    loadConfig: () => toPluginConfigView(resolveConfigSecrets4(loadConfig18(), { configPath: runtimeConfigPath }), getPluginChannelBindings7()),
+    writeConfigFile: async (nextConfigView) => {
+      if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
+        throw new Error("plugin runtime writeConfigFile expects an object config");
+      }
+      const current = loadConfig18();
+      const next = mergePluginConfigView(current, nextConfigView, getPluginChannelBindings7());
+      saveConfig10(next);
+    },
+    dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
+      const request = resolvePluginRuntimeRequest(ctx);
+      if (!request) {
+        return;
+      }
+      try {
+        await dispatcherOptions.onReplyStart?.();
+        const response = await runtimePool.processDirect(request);
+        const replyText = typeof response === "string" ? response : String(response ?? "");
+        if (replyText.trim()) {
+          await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
+        }
+      } catch (error) {
+        dispatcherOptions.onError?.(error);
+        throw error;
+      }
+    }
+  });
+}
+function resolvePluginRuntimeRequest(ctx) {
+  const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
+  const body = typeof ctx.Body === "string" ? ctx.Body : "";
+  const content = (bodyForAgent || body).trim();
+  const attachments = resolvePluginRuntimeAttachments(ctx);
+  if (!content && attachments.length === 0) {
+    return null;
+  }
+  const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : void 0;
+  const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
+  const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
+  const agentId = typeof ctx.AgentId === "string" ? ctx.AgentId : void 0;
+  const modelOverride = resolveModelOverride(ctx);
+  const accountId = typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? ctx.AccountId : void 0;
+  return {
+    content,
+    sessionKey,
+    channel,
+    chatId,
+    agentId,
+    attachments,
+    metadata: {
+      ...accountId ? { account_id: accountId } : {},
+      ...modelOverride ? { model: modelOverride } : {}
+    }
+  };
+}
+function resolveModelOverride(ctx) {
+  if (typeof ctx.Model === "string" && ctx.Model.trim().length > 0) {
+    return ctx.Model.trim();
+  }
+  if (typeof ctx.AgentModel === "string" && ctx.AgentModel.trim().length > 0) {
+    return ctx.AgentModel.trim();
+  }
+  return void 0;
+}
+function readStringList(value) {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
+}
+function readOptionalString2(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed || void 0;
+}
+function resolvePluginRuntimeAttachments(ctx) {
+  const mediaPaths = readStringList(ctx.MediaPaths);
+  const mediaUrls = readStringList(ctx.MediaUrls);
+  const fallbackPath = readOptionalString2(ctx.MediaPath);
+  const fallbackUrl = readOptionalString2(ctx.MediaUrl);
+  const mediaTypes = readStringList(ctx.MediaTypes);
+  const fallbackType = readOptionalString2(ctx.MediaType);
+  const entryCount = Math.max(
+    mediaPaths.length,
+    mediaUrls.length,
+    fallbackPath ? 1 : 0,
+    fallbackUrl ? 1 : 0
+  );
+  const attachments = [];
+  for (let index = 0; index < entryCount; index += 1) {
+    const path2 = mediaPaths[index] ?? (index === 0 ? fallbackPath : void 0);
+    const rawUrl = mediaUrls[index] ?? (index === 0 ? fallbackUrl : void 0);
+    const url = rawUrl && rawUrl !== path2 ? rawUrl : void 0;
+    const mimeType = mediaTypes[index] ?? fallbackType;
+    if (!path2 && !url) {
+      continue;
+    }
+    attachments.push({
+      path: path2,
+      url,
+      mimeType,
+      source: "plugin-runtime",
+      status: path2 ? "ready" : "remote-only"
+    });
+  }
+  return attachments;
+}
+
+// src/cli/commands/service-plugin-reload.ts
+import { getWorkspacePath as getWorkspacePath11 } from "@nextclaw/core";
+import {
+  getPluginChannelBindings as getPluginChannelBindings5,
+  startPluginChannelGateways,
+  stopPluginChannelGateways
+} from "@nextclaw/openclaw-compat";
+async function reloadServicePlugins(params) {
+  const nextWorkspace = getWorkspacePath11(params.nextConfig.agents.defaults.workspace);
+  const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
+  const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
+  const nextPluginChannelBindings = getPluginChannelBindings5(nextPluginRegistry);
+  const shouldRestartChannels = shouldRestartChannelsForPluginReload({
+    changedPaths: params.changedPaths,
+    currentPluginChannelBindings: params.pluginChannelBindings,
+    nextPluginChannelBindings,
+    currentExtensionChannels: params.extensionRegistry.channels,
+    nextExtensionChannels: nextExtensionRegistry.channels
+  });
+  logPluginDiagnostics(nextPluginRegistry);
+  let pluginGatewayHandles = params.pluginGatewayHandles;
+  if (shouldRestartChannels) {
+    await stopPluginChannelGateways(pluginGatewayHandles);
+    const startedPluginGateways = await startPluginChannelGateways({
+      registry: nextPluginRegistry,
+      config: params.nextConfig,
+      logger: params.pluginGatewayLogger
+    });
+    pluginGatewayHandles = startedPluginGateways.handles;
+    params.logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
+  }
+  return {
+    pluginRegistry: nextPluginRegistry,
+    extensionRegistry: nextExtensionRegistry,
+    pluginChannelBindings: nextPluginChannelBindings,
+    pluginGatewayHandles,
+    restartChannels: shouldRestartChannels
+  };
+}
+
+// src/cli/commands/service-gateway-bootstrap.ts
+var { loadConfig: loadConfig19, resolveConfigSecrets: resolveConfigSecrets5 } = NextclawCore2;
+function createBootstrapStatus(remoteEnabled) {
+  const bootstrapStatus = new ServiceBootstrapStatusStore();
+  bootstrapStatus.markPluginHydrationPending();
+  bootstrapStatus.markChannelsPending();
+  bootstrapStatus.setRemoteState(remoteEnabled ? "pending" : "disabled");
+  return bootstrapStatus;
+}
+function createGatewayRuntimeState(gateway) {
+  return {
+    pluginRegistry: gateway.pluginRegistry,
+    extensionRegistry: gateway.extensionRegistry,
+    pluginChannelBindings: gateway.pluginChannelBindings,
+    pluginUiMetadata: getPluginUiMetadataFromRegistry2(gateway.pluginRegistry),
+    pluginGatewayHandles: []
+  };
+}
+function configureGatewayPluginRuntime(params) {
+  params.gateway.reloader.setApplyAgentRuntimeConfig((nextConfig) => params.gateway.runtimePool.applyRuntimeConfig(nextConfig));
+  params.gateway.reloader.setReloadPlugins(async ({ config: nextConfig, changedPaths }) => {
+    const result = await reloadServicePlugins({
+      nextConfig,
+      changedPaths,
+      pluginRegistry: params.state.pluginRegistry,
+      extensionRegistry: params.state.extensionRegistry,
+      pluginChannelBindings: params.state.pluginChannelBindings,
+      pluginGatewayHandles: params.state.pluginGatewayHandles,
+      pluginGatewayLogger,
+      logPluginGatewayDiagnostics
+    });
+    params.state.pluginRegistry = result.pluginRegistry;
+    params.state.extensionRegistry = result.extensionRegistry;
+    params.state.pluginChannelBindings = result.pluginChannelBindings;
+    params.state.pluginUiMetadata = getPluginUiMetadataFromRegistry2(result.pluginRegistry);
+    params.state.pluginGatewayHandles = result.pluginGatewayHandles;
+    params.gateway.runtimePool.applyExtensionRegistry(result.extensionRegistry);
+    params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(result.extensionRegistry);
+    params.gateway.runtimePool.applyRuntimeConfig(nextConfig);
+    if (result.restartChannels) {
+      console.log("Config reload: plugin channel gateways restarted.");
+    }
+    return { restartChannels: result.restartChannels };
+  });
+  params.gateway.reloader.setReloadMcp(async ({ config: nextConfig }) => {
+    await params.getLiveUiNcpAgent()?.applyMcpConfig?.(nextConfig);
+  });
+  installPluginRuntimeBridge({
+    runtimePool: params.gateway.runtimePool,
+    runtimeConfigPath: params.gateway.runtimeConfigPath,
+    getPluginChannelBindings: () => params.state.pluginChannelBindings
+  });
+}
+function createDeferredGatewayStartupHooks(params) {
+  return {
+    hydrateCapabilities: async () => {
+      await hydrateServiceCapabilities({
+        uiStartup: params.uiStartup,
+        gateway: params.gateway,
+        state: params.state,
+        bootstrapStatus: params.bootstrapStatus,
+        getLiveUiNcpAgent: params.getLiveUiNcpAgent
+      });
+    },
+    startPluginGateways: async () => {
+      const startedPluginGateways = await startPluginChannelGateways2({
+        registry: params.state.pluginRegistry,
+        config: resolveConfigSecrets5(loadConfig19(), { configPath: params.gateway.runtimeConfigPath }),
+        logger: pluginGatewayLogger
+      });
+      params.state.pluginGatewayHandles = startedPluginGateways.handles;
+      logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
+    },
+    startChannels: async () => {
+      await params.gateway.reloader.getChannels().startAll();
+      const enabledChannels = params.gateway.reloader.getChannels().enabledChannels;
+      if (enabledChannels.length > 0) {
+        console.log(`\u2713 Channels enabled: ${enabledChannels.join(", ")}`);
+      } else {
+        console.log("Warning: No channels enabled");
+      }
+      params.bootstrapStatus.markChannelsReady(enabledChannels);
+      params.bootstrapStatus.markReady();
+    },
+    wakeFromRestartSentinel: params.wakeFromRestartSentinel,
+    onNcpAgentReady: (ncpAgent) => {
+      params.setLiveUiNcpAgent(ncpAgent);
+    }
+  };
+}
+
 // src/cli/commands/service.ts
 var {
   APP_NAME: APP_NAME3,
@@ -8171,16 +8604,16 @@ var {
   getConfigPath: getConfigPath10,
   getProvider,
   getProviderName,
-  getWorkspacePath: getWorkspacePath11,
+  getWorkspacePath: getWorkspacePath12,
   LiteLLMProvider,
-  loadConfig: loadConfig18,
+  loadConfig: loadConfig20,
   MessageBus: MessageBus2,
-  resolveConfigSecrets: resolveConfigSecrets4,
+  resolveConfigSecrets: resolveConfigSecrets6,
   SessionManager: SessionManager2,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey2
-} = NextclawCore2;
+} = NextclawCore3;
 function createSkillsLoader(workspace) {
-  const ctor = NextclawCore2.SkillsLoader;
+  const ctor = NextclawCore3.SkillsLoader;
   if (!ctor) {
     return null;
   }
@@ -8203,9 +8636,9 @@ var ServiceCommands = class {
     const applyLiveConfigReload = async () => {
       await this.applyLiveConfigReload?.();
     };
-    let pluginChannelBindings = [];
-    let pluginUiMetadata = [];
-    let pluginGatewayHandles = [];
+    let runtimeState = null;
+    const bootstrapStatus = createBootstrapStatus(shellContext.config.remote.enabled);
+    const ncpSessionService = new UiSessionService(shellContext.sessionManager);
     const marketplaceInstaller = new ServiceMarketplaceInstaller({
       applyLiveConfigReload,
       runCliSubcommand: (args) => this.runCliSubcommand(args),
@@ -8223,18 +8656,20 @@ var ServiceCommands = class {
         uiConfig: shellContext.uiConfig,
         uiStaticDir: shellContext.uiStaticDir,
         cronService: shellContext.cron,
-        getConfig: () => resolveConfigSecrets4(loadConfig18(), { configPath: shellContext.runtimeConfigPath }),
+        getConfig: () => resolveConfigSecrets6(loadConfig20(), { configPath: shellContext.runtimeConfigPath }),
         configPath: getConfigPath10(),
         productVersion: getPackageVersion(),
-        getPluginChannelBindings: () => pluginChannelBindings,
-        getPluginUiMetadata: () => pluginUiMetadata,
+        getPluginChannelBindings: () => runtimeState?.pluginChannelBindings ?? [],
+        getPluginUiMetadata: () => runtimeState?.pluginUiMetadata ?? [],
         marketplace: { apiBaseUrl: process.env.NEXTCLAW_MARKETPLACE_API_BASE, installer: marketplaceInstaller },
         remoteAccess,
+        getBootstrapStatus: () => bootstrapStatus.getStatus(),
         openBrowserWindow: shellContext.uiConfig.open,
-        applyLiveConfigReload
+        applyLiveConfigReload,
+        ncpSessionService
       })
     );
-    await waitForUiShellGraceWindow(uiStartup);
+    bootstrapStatus.markShellReady();
     await waitForNextTick();
     const gateway = measureStartupSync(
       "service.create_gateway_startup_context",
@@ -8243,51 +8678,23 @@ var ServiceCommands = class {
         uiOverrides: options.uiOverrides,
         allowMissingProvider: options.allowMissingProvider,
         uiStaticDir: options.uiStaticDir,
+        initialPluginRegistry: createEmptyPluginRegistry(),
         makeProvider: (config2, providerOptions) => providerOptions?.allowMissing === true ? this.makeProvider(config2, { allowMissing: true }) : this.makeProvider(config2),
         makeMissingProvider: (config2) => this.makeMissingProvider(config2),
         requestRestart: (params) => this.deps.requestRestart(params)
       })
     );
     this.applyLiveConfigReload = gateway.applyLiveConfigReload;
-    let { pluginRegistry, extensionRegistry } = gateway;
-    pluginChannelBindings = gateway.pluginChannelBindings;
-    pluginUiMetadata = getPluginUiMetadataFromRegistry(pluginRegistry);
+    const gatewayRuntimeState = createGatewayRuntimeState(gateway);
+    runtimeState = gatewayRuntimeState;
     uiStartup?.publish({ type: "config.updated", payload: { path: "channels" } });
     uiStartup?.publish({ type: "config.updated", payload: { path: "plugins" } });
-    gateway.reloader.setApplyAgentRuntimeConfig((nextConfig) => gateway.runtimePool.applyRuntimeConfig(nextConfig));
-    gateway.reloader.setReloadPlugins(async ({ config: nextConfig, changedPaths }) => {
-      const result = await reloadServicePlugins({
-        nextConfig,
-        changedPaths,
-        pluginRegistry,
-        extensionRegistry,
-        pluginChannelBindings,
-        pluginGatewayHandles,
-        pluginGatewayLogger,
-        logPluginGatewayDiagnostics
-      });
-      pluginRegistry = result.pluginRegistry;
-      extensionRegistry = result.extensionRegistry;
-      pluginChannelBindings = result.pluginChannelBindings;
-      pluginGatewayHandles = result.pluginGatewayHandles;
-      gateway.runtimePool.applyExtensionRegistry(result.extensionRegistry);
-      this.liveUiNcpAgent?.applyExtensionRegistry?.(result.extensionRegistry);
-      gateway.runtimePool.applyRuntimeConfig(nextConfig);
-      if (result.restartChannels) {
-        console.log("Config reload: plugin channel gateways restarted.");
-      }
-      return { restartChannels: result.restartChannels };
-    });
-    gateway.reloader.setReloadMcp(async ({ config: nextConfig }) => {
-      await this.liveUiNcpAgent?.applyMcpConfig?.(nextConfig);
-    });
-    installPluginRuntimeBridge({
-      runtimePool: gateway.runtimePool,
-      runtimeConfigPath: gateway.runtimeConfigPath,
-      pluginChannelBindings
+    configureGatewayPluginRuntime({
+      gateway,
+      state: gatewayRuntimeState,
+      getLiveUiNcpAgent: () => this.liveUiNcpAgent
     });
-    if (gateway.reloader.getChannels().enabledChannels.length) console.log(`\u2713 Channels enabled: ${gateway.reloader.getChannels().enabledChannels.join(", ")}`);
-    else console.log("Warning: No channels enabled");
+    console.log("\u2713 Capability hydration: scheduled in background");
     await measureStartupAsync(
       "service.start_gateway_support_services",
       async () => await startGatewaySupportServices({
@@ -8298,6 +8705,19 @@ var ServiceCommands = class {
         startHeartbeat: () => gateway.heartbeat.start()
       })
     );
+    const deferredGatewayStartupHooks = createDeferredGatewayStartupHooks({
+      uiStartup,
+      gateway,
+      state: gatewayRuntimeState,
+      bootstrapStatus,
+      getLiveUiNcpAgent: () => this.liveUiNcpAgent,
+      setLiveUiNcpAgent: (ncpAgent) => {
+        this.liveUiNcpAgent = ncpAgent;
+      },
+      wakeFromRestartSentinel: async () => {
+        await this.wakeFromRestartSentinel({ bus: gateway.bus, sessionManager: gateway.sessionManager });
+      }
+    });
     logStartupTrace("service.start_gateway.runtime_loop_begin");
     await runGatewayRuntimeLoop({
       runtimePool: gateway.runtimePool,
@@ -8308,34 +8728,26 @@ var ServiceCommands = class {
         providerManager: gateway.providerManager,
         cronService: gateway.cron,
         gatewayController: gateway.gatewayController,
-        getConfig: () => resolveConfigSecrets4(loadConfig18(), { configPath: gateway.runtimeConfigPath }),
-        getExtensionRegistry: () => extensionRegistry,
+        getConfig: () => resolveConfigSecrets6(loadConfig20(), { configPath: gateway.runtimeConfigPath }),
+        getExtensionRegistry: () => gatewayRuntimeState.extensionRegistry,
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
-          registry: pluginRegistry,
+          registry: gatewayRuntimeState.pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets4(loadConfig18(), { configPath: gateway.runtimeConfigPath }),
+          cfg: resolveConfigSecrets6(loadConfig20(), { configPath: gateway.runtimeConfigPath }),
           accountId
         }),
-        startPluginGateways: async () => {
-          const startedPluginGateways = await startPluginChannelGateways2({
-            registry: pluginRegistry,
-            config: gateway.config,
-            logger: pluginGatewayLogger
-          });
-          pluginGatewayHandles = startedPluginGateways.handles;
-          logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
-        },
-        startChannels: async () => {
-          await gateway.reloader.getChannels().startAll();
-        },
-        wakeFromRestartSentinel: async () => {
-          await this.wakeFromRestartSentinel({ bus: gateway.bus, sessionManager: gateway.sessionManager });
-        },
-        onNcpAgentReady: (ncpAgent) => {
-          this.liveUiNcpAgent = ncpAgent;
-        }
+        hydrateCapabilities: deferredGatewayStartupHooks.hydrateCapabilities,
+        startPluginGateways: deferredGatewayStartupHooks.startPluginGateways,
+        startChannels: deferredGatewayStartupHooks.startChannels,
+        wakeFromRestartSentinel: deferredGatewayStartupHooks.wakeFromRestartSentinel,
+        onNcpAgentReady: deferredGatewayStartupHooks.onNcpAgentReady
       }),
       onDeferredStartupError: (error) => {
+        const message = error instanceof Error ? error.message : String(error);
+        bootstrapStatus.markError(message);
+        if (bootstrapStatus.getStatus().pluginHydration.state === "running") {
+          bootstrapStatus.markPluginHydrationError(message);
+        }
         console.error(`Deferred startup failed: ${error instanceof Error ? error.message : String(error)}`);
       },
       cleanup: async () => {
@@ -8343,7 +8755,7 @@ var ServiceCommands = class {
         this.liveUiNcpAgent = null;
         await uiStartup?.deferredNcpAgent.close();
         await gateway.remoteModule?.stop();
-        await stopPluginChannelGateways2(pluginGatewayHandles);
+        await stopPluginChannelGateways2(runtimeState?.pluginGatewayHandles ?? []);
         setPluginRuntimeBridge2(null);
       }
     });
@@ -8478,7 +8890,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig18();
+    const config2 = loadConfig20();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -8491,7 +8903,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig18();
+    const config2 = loadConfig20();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -8940,7 +9352,7 @@ var ServiceCommands = class {
     console.log(`  - If you need to stop the service, run: ${APP_NAME3} stop`);
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath11(loadConfig18().agents.defaults.workspace);
+    const workspace = getWorkspacePath12(loadConfig20().agents.defaults.workspace);
     const destination = join7(workspace, "skills", slug);
     const destinationSkillFile = join7(destination, "SKILL.md");
     if (existsSync11(destinationSkillFile) && !force) {
@@ -9204,7 +9616,7 @@ function resolveSkillsInstallWorkdir(params) {
   if (params.explicitWorkdir) {
     return expandHome2(params.explicitWorkdir);
   }
-  return getWorkspacePath12(params.configuredWorkspace);
+  return getWorkspacePath13(params.configuredWorkspace);
 }
 var CliRuntime = class {
   logo;
@@ -9449,7 +9861,7 @@ var CliRuntime = class {
     const force = Boolean(options.force);
     const configPath = getConfigPath11();
     const createdConfig = initializeConfigIfMissing(configPath);
-    const config2 = loadConfig19();
+    const config2 = loadConfig21();
     const workspaceSetting = config2.agents.defaults.workspace;
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join9(getDataDir10(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
     const workspaceExisted = existsSync13(workspacePath);
@@ -9576,15 +9988,15 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
   }
   async agent(opts) {
     const configPath = getConfigPath11();
-    const config2 = resolveConfigSecrets5(loadConfig19(), { configPath });
-    const workspace = getWorkspacePath12(config2.agents.defaults.workspace);
+    const config2 = resolveConfigSecrets7(loadConfig21(), { configPath });
+    const workspace = getWorkspacePath13(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
-    const pluginChannelBindings = getPluginChannelBindings5(pluginRegistry);
+    const pluginChannelBindings = getPluginChannelBindings6(pluginRegistry);
     setPluginRuntimeBridge3({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets5(loadConfig19(), { configPath }),
+        resolveConfigSecrets7(loadConfig21(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -9593,7 +10005,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig19();
+        const current = loadConfig21();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
@@ -9625,7 +10037,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints3({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets5(loadConfig19(), { configPath }),
+          cfg: resolveConfigSecrets7(loadConfig21(), { configPath }),
           accountId
         })
       });
@@ -9820,7 +10232,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig19();
+    const config2 = loadConfig21();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace