nextclaw 0.6.22 → 0.6.23

package/dist/cli/index.js

@@ -11,7 +11,7 @@ import {
   getConfigPath as getConfigPath3,
   getDataDir as getDataDir7,
   ConfigSchema as ConfigSchema2,
-  getWorkspacePath as getWorkspacePath5,
+  getWorkspacePath as getWorkspacePath6,
   expandHome as expandHome2,
   MessageBus as MessageBus2,
   AgentLoop as AgentLoop2,
@@ -1850,7 +1850,6 @@ var DiagnosticsCommands = class {
 // src/cli/commands/service.ts
 import {
   APP_NAME as APP_NAME2,
-  AgentLoop,
   ChannelManager as ChannelManager2,
   CronService as CronService2,
   getApiBase,
@@ -1858,14 +1857,15 @@ import {
   getDataDir as getDataDir5,
   getProvider,
   getProviderName,
-  getWorkspacePath as getWorkspacePath4,
+  getWorkspacePath as getWorkspacePath5,
   HeartbeatService,
   LiteLLMProvider,
   loadConfig as loadConfig5,
   MessageBus,
   ProviderManager,
   saveConfig as saveConfig4,
-  SessionManager
+  SessionManager,
+  parseAgentScopedSessionKey as parseAgentScopedSessionKey2
 } from "@nextclaw/core";
 import {
   getPluginChannelBindings as getPluginChannelBindings2,
@@ -1951,14 +1951,15 @@ var GatewayControllerImpl = class {
   resolveDeliveryContext(sessionKey) {
     const normalizedSessionKey = this.normalizeOptionalString(sessionKey);
     const keyTarget = parseSessionKey(normalizedSessionKey);
+    const keyRoute = keyTarget && keyTarget.channel !== "agent" ? keyTarget : null;
     const session = normalizedSessionKey ? this.deps.sessionManager?.getIfExists(normalizedSessionKey) : null;
     const metadata = session?.metadata ?? {};
     const rawContext = metadata.last_delivery_context;
     const cachedContext = rawContext && typeof rawContext === "object" && !Array.isArray(rawContext) ? rawContext : null;
     const cachedMetadataRaw = cachedContext?.metadata;
     const cachedMetadata = cachedMetadataRaw && typeof cachedMetadataRaw === "object" && !Array.isArray(cachedMetadataRaw) ? { ...cachedMetadataRaw } : {};
-    const channel = this.normalizeOptionalString(cachedContext?.channel) ?? keyTarget?.channel;
-    const chatId = this.normalizeOptionalString(cachedContext?.chatId) ?? this.normalizeOptionalString(metadata.last_to) ?? keyTarget?.chatId;
+    const channel = this.normalizeOptionalString(cachedContext?.channel) ?? keyRoute?.channel;
+    const chatId = this.normalizeOptionalString(cachedContext?.chatId) ?? this.normalizeOptionalString(metadata.last_to) ?? keyRoute?.chatId;
     const replyTo = this.normalizeOptionalString(cachedContext?.replyTo) ?? this.normalizeOptionalString(metadata.last_message_id);
     const accountId = this.normalizeOptionalString(cachedContext?.accountId) ?? this.normalizeOptionalString(metadata.last_account_id);
     if (!channel || !chatId) {
@@ -2300,6 +2301,175 @@ var MissingProvider = class extends LLMProvider {
   }
 };
 
+// src/cli/commands/agent-runtime-pool.ts
+import {
+  AgentLoop,
+  AgentRouteResolver,
+  getWorkspacePath as getWorkspacePath4,
+  parseAgentScopedSessionKey
+} from "@nextclaw/core";
+function normalizeAgentId(value) {
+  const text = (value ?? "").trim().toLowerCase();
+  return text || "main";
+}
+function resolveAgentProfiles(config2) {
+  const defaults = config2.agents.defaults;
+  const listed = Array.isArray(config2.agents.list) ? config2.agents.list.map((entry) => ({
+    id: normalizeAgentId(entry.id),
+    default: entry.default,
+    workspace: entry.workspace,
+    model: entry.model,
+    maxToolIterations: entry.maxToolIterations,
+    maxTokens: entry.maxTokens
+  })).filter((entry) => Boolean(entry.id)) : [];
+  const defaultAgentId = listed.find((entry) => entry.default)?.id ?? listed[0]?.id ?? "main";
+  const seed = listed.length > 0 ? listed : [{ id: defaultAgentId }];
+  const unique = /* @__PURE__ */ new Map();
+  for (const entry of seed) {
+    if (!unique.has(entry.id)) {
+      unique.set(entry.id, entry);
+    }
+  }
+  if (!unique.has(defaultAgentId)) {
+    unique.set(defaultAgentId, { id: defaultAgentId });
+  }
+  return Array.from(unique.values()).map((entry) => ({
+    id: entry.id,
+    workspace: getWorkspacePath4(entry.workspace ?? defaults.workspace),
+    model: entry.model ?? defaults.model,
+    maxIterations: entry.maxToolIterations ?? defaults.maxToolIterations,
+    maxTokens: entry.maxTokens ?? defaults.maxTokens
+  }));
+}
+var GatewayAgentRuntimePool = class {
+  constructor(options) {
+    this.options = options;
+    this.routeResolver = new AgentRouteResolver(options.config);
+    this.rebuild(options.config);
+  }
+  routeResolver;
+  runtimes = /* @__PURE__ */ new Map();
+  running = false;
+  defaultAgentId = "main";
+  get primaryAgentId() {
+    return this.defaultAgentId;
+  }
+  applyRuntimeConfig(config2) {
+    this.options.config = config2;
+    this.options.contextConfig = config2.agents.context;
+    this.options.execConfig = config2.tools.exec;
+    this.options.restrictToWorkspace = config2.tools.restrictToWorkspace;
+    this.options.braveApiKey = config2.tools.web.search.apiKey || void 0;
+    this.routeResolver.updateConfig(config2);
+    this.rebuild(config2);
+  }
+  async processDirect(params) {
+    const message = {
+      channel: params.channel ?? "cli",
+      senderId: "user",
+      chatId: params.chatId ?? "direct",
+      content: params.content,
+      timestamp: /* @__PURE__ */ new Date(),
+      attachments: [],
+      metadata: params.metadata ?? {}
+    };
+    const forcedAgentId = this.readString(params.agentId) ?? parseAgentScopedSessionKey(params.sessionKey)?.agentId ?? void 0;
+    const route = this.routeResolver.resolveInbound({
+      message,
+      forcedAgentId,
+      sessionKeyOverride: params.sessionKey
+    });
+    const runtime2 = this.resolveRuntime(route.agentId);
+    return runtime2.loop.processDirect({
+      content: params.content,
+      sessionKey: route.sessionKey,
+      channel: message.channel,
+      chatId: message.chatId,
+      metadata: message.metadata
+    });
+  }
+  async run() {
+    this.running = true;
+    while (this.running) {
+      const message = await this.options.bus.consumeInbound();
+      try {
+        const explicitSessionKey = this.readString(message.metadata.session_key_override);
+        const forcedAgentId = this.readString(message.metadata.target_agent_id);
+        const route = this.routeResolver.resolveInbound({
+          message,
+          forcedAgentId,
+          sessionKeyOverride: explicitSessionKey
+        });
+        const runtime2 = this.resolveRuntime(route.agentId);
+        await runtime2.loop.handleInbound({
+          message,
+          sessionKey: route.sessionKey,
+          publishResponse: true
+        });
+      } catch (error) {
+        await this.options.bus.publishOutbound({
+          channel: message.channel,
+          chatId: message.chatId,
+          content: `Sorry, I encountered an error: ${String(error)}`,
+          media: [],
+          metadata: {}
+        });
+      }
+    }
+  }
+  readString(value) {
+    if (typeof value !== "string") {
+      return void 0;
+    }
+    const trimmed = value.trim();
+    return trimmed || void 0;
+  }
+  resolveRuntime(agentId) {
+    const normalized = normalizeAgentId(agentId);
+    const runtime2 = this.runtimes.get(normalized);
+    if (runtime2) {
+      return runtime2;
+    }
+    const fallback = this.runtimes.get(this.defaultAgentId);
+    if (fallback) {
+      return fallback;
+    }
+    throw new Error("No agent runtime available");
+  }
+  rebuild(config2) {
+    const profiles = resolveAgentProfiles(config2);
+    const configuredDefault = this.readString(config2.agents.list.find((entry) => entry.default)?.id);
+    this.defaultAgentId = configuredDefault ?? profiles[0]?.id ?? "main";
+    const nextRuntimes = /* @__PURE__ */ new Map();
+    for (const profile of profiles) {
+      const loop = new AgentLoop({
+        bus: this.options.bus,
+        providerManager: this.options.providerManager,
+        workspace: profile.workspace,
+        model: profile.model,
+        maxIterations: profile.maxIterations,
+        maxTokens: profile.maxTokens,
+        braveApiKey: this.options.braveApiKey,
+        execConfig: this.options.execConfig,
+        cronService: this.options.cronService,
+        restrictToWorkspace: this.options.restrictToWorkspace,
+        sessionManager: this.options.sessionManager,
+        contextConfig: this.options.contextConfig,
+        gatewayController: this.options.gatewayController,
+        config: config2,
+        extensionRegistry: this.options.extensionRegistry,
+        resolveMessageToolHints: this.options.resolveMessageToolHints,
+        agentId: profile.id
+      });
+      nextRuntimes.set(profile.id, {
+        id: profile.id,
+        loop
+      });
+    }
+    this.runtimes = nextRuntimes;
+  }
+};
+
 // src/cli/commands/service.ts
 var ServiceCommands = class {
   constructor(deps) {
@@ -2307,7 +2477,7 @@ var ServiceCommands = class {
   }
   async startGateway(options = {}) {
     const config2 = loadConfig5();
-    const workspace = getWorkspacePath4(config2.agents.defaults.workspace);
+    const workspace = getWorkspacePath5(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
@@ -2359,21 +2529,17 @@ var ServiceCommands = class {
         });
       }
     });
-    const agent = new AgentLoop({
+    const runtimePool = new GatewayAgentRuntimePool({
       bus,
       providerManager,
-      workspace,
-      model: config2.agents.defaults.model,
-      maxIterations: config2.agents.defaults.maxToolIterations,
-      maxTokens: config2.agents.defaults.maxTokens,
-      braveApiKey: config2.tools.web.search.apiKey || void 0,
-      execConfig: config2.tools.exec,
+      sessionManager,
+      config: config2,
       cronService: cron2,
       restrictToWorkspace: config2.tools.restrictToWorkspace,
-      sessionManager,
+      braveApiKey: config2.tools.web.search.apiKey || void 0,
+      execConfig: config2.tools.exec,
       contextConfig: config2.agents.context,
       gatewayController,
-      config: config2,
       extensionRegistry,
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
@@ -2382,7 +2548,7 @@ var ServiceCommands = class {
         accountId
       })
     });
-    reloader.setApplyAgentRuntimeConfig((nextConfig) => agent.applyRuntimeConfig(nextConfig));
+    reloader.setApplyAgentRuntimeConfig((nextConfig) => runtimePool.applyRuntimeConfig(nextConfig));
     const pluginChannelBindings = getPluginChannelBindings2(pluginRegistry);
     setPluginRuntimeBridge({
       loadConfig: () => toPluginConfigView(loadConfig5(), pluginChannelBindings),
@@ -2401,16 +2567,17 @@ var ServiceCommands = class {
         if (!content) {
           return;
         }
-        const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : `plugin:${typeof ctx.OriginatingChannel === "string" ? ctx.OriginatingChannel : "channel"}:${typeof ctx.SenderId === "string" ? ctx.SenderId : "unknown"}`;
+        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 modelOverride = typeof ctx.Model === "string" && ctx.Model?.trim().length ? ctx.Model.trim() : typeof ctx.AgentModel === "string" && ctx.AgentModel?.trim().length ? ctx.AgentModel.trim() : void 0;
         try {
-          const response = await agent.processDirect({
+          const response = await runtimePool.processDirect({
             content,
             sessionKey,
             channel,
             chatId,
+            agentId: typeof ctx.AgentId === "string" ? ctx.AgentId : void 0,
             metadata: {
               ...typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? { account_id: ctx.AccountId } : {},
               ...modelOverride ? { model: modelOverride } : {}
@@ -2427,11 +2594,12 @@ var ServiceCommands = class {
       }
     });
     cron2.onJob = async (job) => {
-      const response = await agent.processDirect({
+      const response = await runtimePool.processDirect({
         content: job.payload.message,
         sessionKey: `cron:${job.id}`,
         channel: job.payload.channel ?? "cli",
-        chatId: job.payload.to ?? "direct"
+        chatId: job.payload.to ?? "direct",
+        agentId: runtimePool.primaryAgentId
       });
       if (job.payload.deliver && job.payload.to) {
         await bus.publishOutbound({
@@ -2446,7 +2614,7 @@ var ServiceCommands = class {
     };
     const heartbeat = new HeartbeatService(
       workspace,
-      async (promptText) => agent.processDirect({ content: promptText, sessionKey: "heartbeat" }),
+      async (promptText) => runtimePool.processDirect({ content: promptText, sessionKey: "heartbeat", agentId: runtimePool.primaryAgentId }),
       30 * 60,
       true
     );
@@ -2494,7 +2662,7 @@ var ServiceCommands = class {
       }
       await reloader.getChannels().startAll();
       await this.wakeFromRestartSentinel({ bus, sessionManager });
-      await agent.run();
+      await runtimePool.run();
     } finally {
       await stopPluginChannelGateways(pluginGatewayHandles);
       setPluginRuntimeBridge(null);
@@ -2570,9 +2738,11 @@ var ServiceCommands = class {
     }
     const sessionKey = sentinelSessionKey ?? fallbackSessionKey ?? "cli:default";
     const parsedSession = parseSessionKey(sessionKey);
+    const parsedAgentSession = parseAgentScopedSessionKey2(sessionKey);
+    const parsedSessionRoute = parsedSession && parsedSession.channel !== "agent" ? parsedSession : null;
     const context = payload.deliveryContext;
-    const channel = this.normalizeOptionalString(context?.channel) ?? parsedSession?.channel ?? this.normalizeOptionalString((params.sessionManager.getIfExists(sessionKey)?.metadata ?? {}).last_channel);
-    const chatId = this.normalizeOptionalString(context?.chatId) ?? parsedSession?.chatId ?? this.normalizeOptionalString((params.sessionManager.getIfExists(sessionKey)?.metadata ?? {}).last_to);
+    const channel = this.normalizeOptionalString(context?.channel) ?? parsedSessionRoute?.channel ?? this.normalizeOptionalString((params.sessionManager.getIfExists(sessionKey)?.metadata ?? {}).last_channel);
+    const chatId = this.normalizeOptionalString(context?.chatId) ?? parsedSessionRoute?.chatId ?? this.normalizeOptionalString((params.sessionManager.getIfExists(sessionKey)?.metadata ?? {}).last_to);
     const replyTo = this.normalizeOptionalString(context?.replyTo);
     const accountId = this.normalizeOptionalString(context?.accountId);
     if (!channel || !chatId) {
@@ -2588,7 +2758,9 @@ var ServiceCommands = class {
     const metadata = {
       source: "restart-sentinel",
       restart_summary: summary,
+      session_key_override: sessionKey,
       ...replyTo ? { reply_to: replyTo } : {},
+      ...parsedAgentSession ? { target_agent_id: parsedAgentSession.agentId } : {},
       ...accountId ? { account_id: accountId, accountId } : {}
     };
     await params.bus.publishInbound({
@@ -3350,7 +3522,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   }
   async agent(opts) {
     const config2 = loadConfig6();
-    const workspace = getWorkspacePath5(config2.agents.defaults.workspace);
+    const workspace = getWorkspacePath6(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
@@ -3519,7 +3691,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const workdir = options.workdir ? expandHome2(options.workdir) : getWorkspacePath5();
+    const workdir = options.workdir ? expandHome2(options.workdir) : getWorkspacePath6();
     const result = await installClawHubSkill({
       slug: options.slug,
       version: options.version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.6.22",
+  "version": "0.6.23",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,9 +38,9 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "@nextclaw/core": "^0.6.21",
-    "@nextclaw/server": "^0.4.6",
-    "@nextclaw/openclaw-compat": "^0.1.14"
+    "@nextclaw/core": "^0.6.22",
+    "@nextclaw/server": "^0.4.7",
+    "@nextclaw/openclaw-compat": "^0.1.15"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",