@ai-setting/roy-agent-cli 1.5.103 → 1.5.104

package/dist/bin/roy-agent.js

@@ -7427,7 +7427,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.103",
+    version: "1.5.104",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9084,13 +9084,23 @@ class QueryExecutor {
       this.output.info(`执行: ${message}`);
     }
     const contextHandler = new ContextHandlerService(this.env, this.sessionComponent, { maxRetries: 1, autoCompact: true });
-    const { systemPrompt: agentContextSystemPrompt, ...restAgentContext } = agentContext ?? {};
+    const {
+      systemPrompt: agentContextSystemPrompt,
+      eventSourceSystemPrompt: agentContextPreloadedPrompts,
+      ...restAgentContext
+    } = agentContext ?? {};
+    let eventSourceFinalPrompt;
+    if (typeof agentContextSystemPrompt === "string" && agentContextSystemPrompt.length > 0) {
+      eventSourceFinalPrompt = agentContextSystemPrompt;
+    } else if (typeof agentContextPreloadedPrompts === "string" && agentContextPreloadedPrompts.length > 0) {
+      eventSourceFinalPrompt = agentContextPreloadedPrompts;
+    }
     const context = {
       sessionId,
       metadata: {
         originalQuery: message,
         traceId,
-        systemPrompt: agentContextSystemPrompt
+        systemPrompt: eventSourceFinalPrompt
       },
       ...restAgentContext
     };
@@ -9668,6 +9678,41 @@ async function startSingleEventSourceImpl(eventSourceComponent, output, eventSou
   }
 }
 
+// src/commands/collect-event-source-system-prompts.ts
+import { resolveBountyIMSystemPrompt } from "@ai-setting/roy-agent-core";
+function resolveSystemPromptForSource(config) {
+  if (config.type === "bounty-im") {
+    const imServerUrl = config.imServerUrl || config.options && config.options.imServerUrl;
+    const address = config.address || config.options && config.options.address || "unknown";
+    return resolveBountyIMSystemPrompt({
+      configSystemPrompt: config.systemPrompt,
+      currentAddress: address,
+      imServerUrl
+    });
+  }
+  return config.systemPrompt;
+}
+function collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent) {
+  const result = [];
+  for (const id of eventSourceIds) {
+    const config = eventSourceComponent.get(id);
+    if (!config)
+      continue;
+    const prompt = resolveSystemPromptForSource(config);
+    if (!prompt)
+      continue;
+    result.push({ id, type: config.type, prompt });
+  }
+  return result;
+}
+function joinResolvedSystemPrompts(prompts) {
+  return prompts.map((p) => p.prompt).join(`
+
+---
+
+`);
+}
+
 // src/commands/shared/ask-user-handler.ts
 import * as readline from "readline";
 import chalk3 from "chalk";
@@ -10145,6 +10190,7 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   currentAgentContext = undefined;
+  eventSourceSystemPrompts = [];
   isIdle() {
     return !this.isExecuting;
   }
@@ -10589,10 +10635,13 @@ function createInteractiveCommand(externalEnvService) {
           sessionTitle,
           onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const preloadedPrompts = this.eventSourceSystemPrompts;
+            const eventSourceSystemPrompt = preloadedPrompts.length > 0 ? joinResolvedSystemPrompts(preloadedPrompts) : undefined;
             const mergedContext = {
               ...currentAgentContext,
               model: args.model,
-              ...agentContext
+              ...agentContext,
+              eventSourceSystemPrompt
             };
             const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
             const result = await queryExecutor.execute(message, effectiveSessionId, {
@@ -10673,6 +10722,10 @@ function createInteractiveCommand(externalEnvService) {
             process.exit(1);
           }
           const summary = await startEventSources(eventSourceIds, eventSourceComponent, output);
+          this.eventSourceSystemPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+          if (this.eventSourceSystemPrompts.length > 0) {
+            output.info(`\uD83D\uDCE6 Preloaded ${this.eventSourceSystemPrompts.length} event-source systemPrompt(s)`);
+          }
           if (eventSourceIds.length === 1 && summary.failedCount > 0) {
             process.exit(1);
           }

package/dist/index.js

@@ -7426,7 +7426,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.103",
+    version: "1.5.104",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9083,13 +9083,23 @@ class QueryExecutor {
       this.output.info(`执行: ${message}`);
     }
     const contextHandler = new ContextHandlerService(this.env, this.sessionComponent, { maxRetries: 1, autoCompact: true });
-    const { systemPrompt: agentContextSystemPrompt, ...restAgentContext } = agentContext ?? {};
+    const {
+      systemPrompt: agentContextSystemPrompt,
+      eventSourceSystemPrompt: agentContextPreloadedPrompts,
+      ...restAgentContext
+    } = agentContext ?? {};
+    let eventSourceFinalPrompt;
+    if (typeof agentContextSystemPrompt === "string" && agentContextSystemPrompt.length > 0) {
+      eventSourceFinalPrompt = agentContextSystemPrompt;
+    } else if (typeof agentContextPreloadedPrompts === "string" && agentContextPreloadedPrompts.length > 0) {
+      eventSourceFinalPrompt = agentContextPreloadedPrompts;
+    }
     const context = {
       sessionId,
       metadata: {
         originalQuery: message,
         traceId,
-        systemPrompt: agentContextSystemPrompt
+        systemPrompt: eventSourceFinalPrompt
       },
       ...restAgentContext
     };
@@ -9667,6 +9677,41 @@ async function startSingleEventSourceImpl(eventSourceComponent, output, eventSou
   }
 }
 
+// src/commands/collect-event-source-system-prompts.ts
+import { resolveBountyIMSystemPrompt } from "@ai-setting/roy-agent-core";
+function resolveSystemPromptForSource(config) {
+  if (config.type === "bounty-im") {
+    const imServerUrl = config.imServerUrl || config.options && config.options.imServerUrl;
+    const address = config.address || config.options && config.options.address || "unknown";
+    return resolveBountyIMSystemPrompt({
+      configSystemPrompt: config.systemPrompt,
+      currentAddress: address,
+      imServerUrl
+    });
+  }
+  return config.systemPrompt;
+}
+function collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent) {
+  const result = [];
+  for (const id of eventSourceIds) {
+    const config = eventSourceComponent.get(id);
+    if (!config)
+      continue;
+    const prompt = resolveSystemPromptForSource(config);
+    if (!prompt)
+      continue;
+    result.push({ id, type: config.type, prompt });
+  }
+  return result;
+}
+function joinResolvedSystemPrompts(prompts) {
+  return prompts.map((p) => p.prompt).join(`
+
+---
+
+`);
+}
+
 // src/commands/shared/ask-user-handler.ts
 import * as readline from "readline";
 import chalk3 from "chalk";
@@ -10144,6 +10189,7 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   currentAgentContext = undefined;
+  eventSourceSystemPrompts = [];
   isIdle() {
     return !this.isExecuting;
   }
@@ -10588,10 +10634,13 @@ function createInteractiveCommand(externalEnvService) {
           sessionTitle,
           onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const preloadedPrompts = this.eventSourceSystemPrompts;
+            const eventSourceSystemPrompt = preloadedPrompts.length > 0 ? joinResolvedSystemPrompts(preloadedPrompts) : undefined;
             const mergedContext = {
               ...currentAgentContext,
               model: args.model,
-              ...agentContext
+              ...agentContext,
+              eventSourceSystemPrompt
             };
             const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
             const result = await queryExecutor.execute(message, effectiveSessionId, {
@@ -10672,6 +10721,10 @@ function createInteractiveCommand(externalEnvService) {
             process.exit(1);
           }
           const summary = await startEventSources(eventSourceIds, eventSourceComponent, output);
+          this.eventSourceSystemPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+          if (this.eventSourceSystemPrompts.length > 0) {
+            output.info(`\uD83D\uDCE6 Preloaded ${this.eventSourceSystemPrompts.length} event-source systemPrompt(s)`);
+          }
           if (eventSourceIds.length === 1 && summary.failedCount > 0) {
             process.exit(1);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.103",
+  "version": "1.5.104",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",