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

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.105",
     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";
@@ -10435,6 +10480,7 @@ function createInteractiveCommand(externalEnvService) {
       const output = new OutputService2;
       const shouldDisposeEnvService = !externalEnvService;
       const envService = externalEnvService ?? new EnvironmentService(output);
+      let eventSourceSystemPrompts = [];
       const CODER_HARNESS_PLUGINS = new Set([
         "lsp",
         "code-check",
@@ -10589,10 +10635,13 @@ function createInteractiveCommand(externalEnvService) {
           sessionTitle,
           onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const preloadedPrompts = 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);
+          eventSourceSystemPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+          if (eventSourceSystemPrompts.length > 0) {
+            output.info(`\uD83D\uDCE6 Preloaded ${eventSourceSystemPrompts.length} event-source systemPrompt(s)`);
+          }
           if (eventSourceIds.length === 1 && summary.failedCount > 0) {
             process.exit(1);
           }
@@ -13836,6 +13889,11 @@ var ListCommand4 = {
         process.exit(1);
       }
       let agents;
+      const builtInSubAgentNames = new Set([
+        "general",
+        "explore",
+        "roy"
+      ]);
       if (args.type && args.type !== "all") {
         agents = registry.listAgentsByType(args.type);
       } else {
@@ -13847,6 +13905,7 @@ var ListCommand4 = {
           agents: agents.map((a) => ({
             name: a.name,
             type: a.type,
+            source: builtInSubAgentNames.has(a.name) ? "built-in" : "user",
             description: a.description,
             workflow: a.workflow,
             model: a.model,
@@ -13860,6 +13919,7 @@ var ListCommand4 = {
         const header = [
           chalk31.bold("Name"),
           chalk31.bold("Type"),
+          chalk31.bold("Source"),
           chalk31.bold("Model"),
           chalk31.bold("Workflow"),
           chalk31.bold("Description")
@@ -13875,9 +13935,11 @@ var ListCommand4 = {
           const desc2 = (a.description || "").length > 40 ? (a.description || "").slice(0, 37) + "..." : a.description || "-";
           const workflowDisplay = a.type === "workflow" && a.workflow ? chalk31.cyan(a.workflow.length > 30 ? a.workflow.slice(0, 27) + "..." : a.workflow) : chalk31.gray("-");
           const modelDisplay = a.model ? chalk31.yellow(a.model.length > 20 ? a.model.slice(0, 17) + "..." : a.model) : chalk31.gray("-");
+          const sourceDisplay = builtInSubAgentNames.has(a.name) ? chalk31.green("built-in") : chalk31.gray("user");
           return [
             chalk31.cyan(a.name),
             typeColor(a.type)(a.type),
+            sourceDisplay,
             modelDisplay,
             workflowDisplay,
             desc2

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.105",
     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";
@@ -10434,6 +10479,7 @@ function createInteractiveCommand(externalEnvService) {
       const output = new OutputService2;
       const shouldDisposeEnvService = !externalEnvService;
       const envService = externalEnvService ?? new EnvironmentService(output);
+      let eventSourceSystemPrompts = [];
       const CODER_HARNESS_PLUGINS = new Set([
         "lsp",
         "code-check",
@@ -10588,10 +10634,13 @@ function createInteractiveCommand(externalEnvService) {
           sessionTitle,
           onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const preloadedPrompts = 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);
+          eventSourceSystemPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+          if (eventSourceSystemPrompts.length > 0) {
+            output.info(`\uD83D\uDCE6 Preloaded ${eventSourceSystemPrompts.length} event-source systemPrompt(s)`);
+          }
           if (eventSourceIds.length === 1 && summary.failedCount > 0) {
             process.exit(1);
           }
@@ -13835,6 +13888,11 @@ var ListCommand4 = {
         process.exit(1);
       }
       let agents;
+      const builtInSubAgentNames = new Set([
+        "general",
+        "explore",
+        "roy"
+      ]);
       if (args.type && args.type !== "all") {
         agents = registry.listAgentsByType(args.type);
       } else {
@@ -13846,6 +13904,7 @@ var ListCommand4 = {
           agents: agents.map((a) => ({
             name: a.name,
             type: a.type,
+            source: builtInSubAgentNames.has(a.name) ? "built-in" : "user",
             description: a.description,
             workflow: a.workflow,
             model: a.model,
@@ -13859,6 +13918,7 @@ var ListCommand4 = {
         const header = [
           chalk31.bold("Name"),
           chalk31.bold("Type"),
+          chalk31.bold("Source"),
           chalk31.bold("Model"),
           chalk31.bold("Workflow"),
           chalk31.bold("Description")
@@ -13874,9 +13934,11 @@ var ListCommand4 = {
           const desc2 = (a.description || "").length > 40 ? (a.description || "").slice(0, 37) + "..." : a.description || "-";
           const workflowDisplay = a.type === "workflow" && a.workflow ? chalk31.cyan(a.workflow.length > 30 ? a.workflow.slice(0, 27) + "..." : a.workflow) : chalk31.gray("-");
           const modelDisplay = a.model ? chalk31.yellow(a.model.length > 20 ? a.model.slice(0, 17) + "..." : a.model) : chalk31.gray("-");
+          const sourceDisplay = builtInSubAgentNames.has(a.name) ? chalk31.green("built-in") : chalk31.gray("user");
           return [
             chalk31.cyan(a.name),
             typeColor(a.type)(a.type),
+            sourceDisplay,
             modelDisplay,
             workflowDisplay,
             desc2

package/package.json

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