@ai-setting/roy-agent-cli 1.6.42 → 1.7.0

package/dist/bin/roy-agent.js

@@ -9461,7 +9461,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.6.42",
+  version: "1.7.0",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -9510,7 +9510,8 @@ var package_default = {
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver": "^1.3.4",
     yargs: "^17.7.2",
-    "zod-to-json-schema": "^3.25.2"
+    "zod-to-json-schema": "^3.25.2",
+    "@earendil-works/pi-ai": "^0.74.2"
   },
   devDependencies: {
     "@types/node": "^20.10.0",
@@ -13380,6 +13381,9 @@ function createInteractiveCommand(externalEnvService) {
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
             }, traceId, mergedContext);
+            if (result && !queryExecutor.getFullText()) {
+              console.log(result);
+            }
             repl.setLastUsage(queryExecutor.getLastUsage());
             return result;
           },
@@ -13518,7 +13522,7 @@ import React6 from "react";
 import { render } from "ink";
 
 // src/RunTui.tsx
-import { useState as useState6, useCallback as useCallback4, useRef as useRef2 } from "react";
+import { useState as useState6, useCallback as useCallback4, useRef as useRef2, useEffect as useEffect5 } from "react";
 import { Box as Box6, Text as Text8, useApp as useApp2 } from "ink";
 
 // src/tui/App.tsx
@@ -13830,7 +13834,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13839,7 +13843,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13930,7 +13934,8 @@ var RunScreen = ({
   workdir,
   maxLines: initialMaxLines,
   markdownEnabled: markdownEnabled2,
-  onExit
+  onExit,
+  onRegisterHandlers
 }) => {
   const [history, setHistory] = useState6([]);
   const [errorMessage, setErrorMessage] = useState6(null);
@@ -13941,11 +13946,60 @@ var RunScreen = ({
   const { exit } = useApp2();
   const userTurnCountRef = useRef2(0);
   const assistantTurnCountRef = useRef2(0);
+  const isProcessingRef = useRef2(0);
+  const executeQueryRef = useRef2(null);
   const width = process.stdout.columns ?? 80;
   const doExit = useCallback4(() => {
     onExit?.();
     exit();
   }, [onExit, exit]);
+  const executeQuery = useCallback4(async (message) => {
+    isProcessingRef.current += 1;
+    stream.start();
+    try {
+      let responseText;
+      if (streamHandleQuery) {
+        responseText = await streamHandleQuery(message, (chunk) => stream.append(chunk));
+      } else {
+        responseText = await handleQuery(message);
+      }
+      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
+      const finalText = truncateForTerminal(rendered, maxLines);
+      stream.finish();
+      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
+      assistantTurnCountRef.current += 1;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      stream.fail(err instanceof Error ? err : new Error(msg));
+      setErrorMessage(msg);
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `❌ Error: ${msg}` }
+      ]);
+    } finally {
+      isProcessingRef.current -= 1;
+    }
+  }, [handleQuery, markdownEnabled2, maxLines, stream, streamHandleQuery, width]);
+  useEffect5(() => {
+    executeQueryRef.current = executeQuery;
+  }, [executeQuery]);
+  useEffect5(() => {
+    if (!onRegisterHandlers)
+      return;
+    const handleNotification = async (message, _envEvent) => {
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `\uD83D\uDCE2 ${message}` }
+      ]);
+      if (executeQueryRef.current) {
+        await executeQueryRef.current(message);
+      }
+    };
+    const isIdle = () => {
+      return isProcessingRef.current === 0;
+    };
+    onRegisterHandlers({ onNotification: handleNotification, isIdle });
+  }, [onRegisterHandlers]);
   const handleSubmit = useCallback4(async (raw) => {
     const trimmed = raw.trim();
     if (!trimmed)
@@ -14007,38 +14061,14 @@ var RunScreen = ({
     setHistory((h) => [...h, { role: "user", content: trimmed }]);
     setUserHistory((uh) => [trimmed, ...uh]);
     userTurnCountRef.current += 1;
-    stream.start();
-    try {
-      let responseText;
-      if (streamHandleQuery) {
-        responseText = await streamHandleQuery(trimmed, (chunk) => stream.append(chunk));
-      } else {
-        responseText = await handleQuery(trimmed);
-      }
-      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
-      const finalText = truncateForTerminal(rendered, maxLines);
-      stream.finish();
-      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
-      assistantTurnCountRef.current += 1;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      stream.fail(err instanceof Error ? err : new Error(msg));
-      setErrorMessage(msg);
-      setHistory((h) => [
-        ...h,
-        { role: "tool", content: `❌ Error: ${msg}` }
-      ]);
-    }
+    await executeQuery(trimmed);
   }, [
     doExit,
     exit,
-    handleQuery,
-    markdownEnabled2,
+    executeQuery,
     maxLines,
     model,
-    stream,
-    streamHandleQuery,
-    width
+    workdir
   ]);
   const handleCancel = useCallback4(() => {
     doExit();
@@ -14081,7 +14111,7 @@ var RunTui_default = RunScreen;
 
 // src/commands/run.ts
 init_markdown();
-async function loadHandleQuery(options) {
+async function loadHandleQuery(options, hooks) {
   const quiet = CliQuietModeService.getInstance().isQuiet();
   const output = new OutputService2;
   output.configure({ quiet });
@@ -14098,10 +14128,126 @@ async function loadHandleQuery(options) {
   if (!env) {
     throw new Error("Failed to create environment");
   }
-  return async (message) => {
-    const result = await env.handle_query(message, {
-      sessionId: "cli-run"
+  const sessionComponent = envService.getSession();
+  if (!sessionComponent) {
+    throw new Error("Failed to create session component");
+  }
+  const sessionManager = new SessionManager({
+    sessionComponent,
+    output,
+    quiet: true
+  });
+  const sessionResult = await sessionManager.init(options.session, options.continue);
+  const sessionId = sessionResult.sessionId;
+  const queryExecutor = new QueryExecutor({
+    env,
+    sessionComponent,
+    output,
+    quiet: true,
+    silent: true
+  });
+  let agentContext = undefined;
+  if (options.agent && options.agent !== "default") {
+    const agentComponent = env.getComponent("agent");
+    const validation = validateActAgent(agentComponent, options.agent);
+    if (!validation.valid) {
+      output.error(validation.message);
+      output.info("提示: roy-agent agents list");
+      process.exit(1);
+    }
+    agentContext = buildActAgentContext(options.agent);
+  }
+  let eventSourceSystemPrompt;
+  const rawEventSourceIds = options.eventSource;
+  const eventSourceIds = Array.isArray(rawEventSourceIds) ? rawEventSourceIds.filter((s) => !!s) : rawEventSourceIds ? [rawEventSourceIds] : [];
+  if (eventSourceIds.length > 0) {
+    const eventSourceComponent = env.getComponent("event-source");
+    if (!eventSourceComponent || typeof eventSourceComponent.startSource !== "function") {
+      output.error("❌ 未找到事件源组件或 startSource 方法");
+      output.info("请确保 EventSourceComponent 已正确注册");
+      process.exit(1);
+    }
+    const summary = await startEventSources(eventSourceIds, eventSourceComponent, output);
+    const preloadedPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+    eventSourceSystemPrompt = preloadedPrompts.length > 0 ? joinResolvedSystemPrompts(preloadedPrompts) : undefined;
+    if (eventSourceIds.length === 1 && summary.failedCount > 0) {
+      process.exit(1);
+    }
+  }
+  const llmComponent = envService.getLLM();
+  queryExecutor.initStreamOutput(llmComponent ?? null);
+  const handleQuery = async (message) => {
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
+    return String(result ?? "");
+  };
+  const taskEventHandler = new TaskEventHandler({
+    env,
+    enabled: true
+  });
+  const eventHandler = new EventHandler({
+    env,
+    eventTypes: ["task.background.*", "event-source.event.*"],
+    formatter: new EventMessageFormatter({ prefix: "[通知]" }),
+    isIdle: hooks?.isIdle ?? (() => true),
+    sessionComponent,
+    onEvent: async (_message) => {},
+    onEventWithEnv: async (formattedEvent) => {
+      if (hooks?.onNotification) {
+        await hooks.onNotification(formattedEvent.message, formattedEvent.envEvent);
+      }
+    }
+  });
+  return {
+    handleQuery,
+    envService,
+    env,
+    sessionId,
+    queryExecutor,
+    agentContext,
+    eventSourceSystemPrompt,
+    sessionComponent,
+    eventHandler,
+    taskEventHandler
+  };
+}
+function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
+  return async (message, onChunk) => {
+    queryExecutor.setChunkCallback((event) => {
+      if (event.type === "llm.text") {
+        if (event.delta) {
+          onChunk(event.delta);
+        } else if (event.content) {
+          onChunk(event.content);
+        }
+      }
     });
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
     return String(result ?? "");
   };
 }
@@ -14141,6 +14287,41 @@ function createRunCommand() {
     }).option("env", {
       type: "string",
       describe: "Environment name"
+    }).option("session", {
+      type: "string",
+      describe: "指定会话 ID（注: -s 已被 --system-prompt 占用）"
+    }).option("continue", {
+      alias: "c",
+      type: "boolean",
+      describe: "继续上次会话",
+      default: false
+    }).option("reasoning", {
+      alias: "r",
+      type: "boolean",
+      describe: "显示 AI 思考过程",
+      default: true
+    }).option("tool-calls", {
+      type: "boolean",
+      describe: "显示工具调用",
+      default: true
+    }).option("tool-results", {
+      type: "boolean",
+      describe: "显示工具执行结果",
+      default: false
+    }).option("event-source", {
+      alias: "es",
+      type: "array",
+      string: true,
+      describe: "启动时一并启动的事件源 ID（可多次指定，支持 --es a --es b）"
+    }).option("agent", {
+      alias: "a",
+      type: "string",
+      describe: "指定使用的 agent (如 explore, general)"
+    }).option("default-agent-name", {
+      alias: "dan",
+      type: "string",
+      describe: "Default agent 名字（默认 Roy，可被覆盖）",
+      default: "Roy"
     }),
     handler: async (argv) => {
       if (argv.markdown === false) {
@@ -14149,18 +14330,44 @@ function createRunCommand() {
         setMarkdownEnabled(true);
       }
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
-      const handleQuery = await loadHandleQuery(argv);
+      const runState = {
+        isIdle: () => true,
+        onNotification: () => {}
+      };
+      const {
+        handleQuery,
+        queryExecutor,
+        sessionId,
+        agentContext,
+        eventSourceSystemPrompt,
+        eventHandler,
+        taskEventHandler
+      } = await loadHandleQuery(argv, {
+        isIdle: () => runState.isIdle(),
+        onNotification: (msg, envEvent) => runState.onNotification(msg, envEvent)
+      });
+      const streamHandleQuery = createStreamHandleQuery(queryExecutor, sessionId, argv, agentContext, eventSourceSystemPrompt);
+      const stopEventHandler = eventHandler.start();
+      const stopTaskEventHandler = taskEventHandler.start();
       const { waitUntilExit } = render(React6.createElement(RunTui_default, {
         handleQuery,
+        streamHandleQuery,
         model: argv.model,
         workdir: argv.workdir,
         maxLines,
         markdownEnabled: argv.markdown !== false,
+        onRegisterHandlers: (handlers) => {
+          runState.onNotification = handlers.onNotification;
+          runState.isIdle = handlers.isIdle;
+        },
         onExit: () => {}
       }), { exitOnCtrlC: true });
       try {
         await waitUntilExit();
       } finally {
+        stopEventHandler();
+        stopTaskEventHandler();
+        queryExecutor.dispose();
         process.exit(0);
       }
     }
@@ -14173,7 +14380,7 @@ import React8 from "react";
 import { render as render2 } from "ink";
 
 // src/ChatTui.tsx
-import { useEffect as useEffect5, useState as useState7 } from "react";
+import { useEffect as useEffect6, useState as useState7 } from "react";
 import { Box as Box7, useApp as useApp3 } from "ink";
 init_markdown();
 import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
@@ -14192,7 +14399,7 @@ var ChatScreen = ({
   const stream = useStreamingAccumulator();
   const { exit } = useApp3();
   const width = process.stdout.columns ?? 80;
-  useEffect5(() => {
+  useEffect6(() => {
     let cancelled = false;
     stream.start();
     (async () => {

package/dist/index.js

@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.6.42",
+  version: "1.7.0",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -9509,7 +9509,8 @@ var package_default = {
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver": "^1.3.4",
     yargs: "^17.7.2",
-    "zod-to-json-schema": "^3.25.2"
+    "zod-to-json-schema": "^3.25.2",
+    "@earendil-works/pi-ai": "^0.74.2"
   },
   devDependencies: {
     "@types/node": "^20.10.0",
@@ -13379,6 +13380,9 @@ function createInteractiveCommand(externalEnvService) {
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
             }, traceId, mergedContext);
+            if (result && !queryExecutor.getFullText()) {
+              console.log(result);
+            }
             repl.setLastUsage(queryExecutor.getLastUsage());
             return result;
           },
@@ -13517,7 +13521,7 @@ import React6 from "react";
 import { render } from "ink";
 
 // src/RunTui.tsx
-import { useState as useState6, useCallback as useCallback4, useRef as useRef2 } from "react";
+import { useState as useState6, useCallback as useCallback4, useRef as useRef2, useEffect as useEffect5 } from "react";
 import { Box as Box6, Text as Text8, useApp as useApp2 } from "ink";
 
 // src/tui/App.tsx
@@ -13829,7 +13833,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13838,7 +13842,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13929,7 +13933,8 @@ var RunScreen = ({
   workdir,
   maxLines: initialMaxLines,
   markdownEnabled: markdownEnabled2,
-  onExit
+  onExit,
+  onRegisterHandlers
 }) => {
   const [history, setHistory] = useState6([]);
   const [errorMessage, setErrorMessage] = useState6(null);
@@ -13940,11 +13945,60 @@ var RunScreen = ({
   const { exit } = useApp2();
   const userTurnCountRef = useRef2(0);
   const assistantTurnCountRef = useRef2(0);
+  const isProcessingRef = useRef2(0);
+  const executeQueryRef = useRef2(null);
   const width = process.stdout.columns ?? 80;
   const doExit = useCallback4(() => {
     onExit?.();
     exit();
   }, [onExit, exit]);
+  const executeQuery = useCallback4(async (message) => {
+    isProcessingRef.current += 1;
+    stream.start();
+    try {
+      let responseText;
+      if (streamHandleQuery) {
+        responseText = await streamHandleQuery(message, (chunk) => stream.append(chunk));
+      } else {
+        responseText = await handleQuery(message);
+      }
+      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
+      const finalText = truncateForTerminal(rendered, maxLines);
+      stream.finish();
+      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
+      assistantTurnCountRef.current += 1;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      stream.fail(err instanceof Error ? err : new Error(msg));
+      setErrorMessage(msg);
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `❌ Error: ${msg}` }
+      ]);
+    } finally {
+      isProcessingRef.current -= 1;
+    }
+  }, [handleQuery, markdownEnabled2, maxLines, stream, streamHandleQuery, width]);
+  useEffect5(() => {
+    executeQueryRef.current = executeQuery;
+  }, [executeQuery]);
+  useEffect5(() => {
+    if (!onRegisterHandlers)
+      return;
+    const handleNotification = async (message, _envEvent) => {
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `\uD83D\uDCE2 ${message}` }
+      ]);
+      if (executeQueryRef.current) {
+        await executeQueryRef.current(message);
+      }
+    };
+    const isIdle = () => {
+      return isProcessingRef.current === 0;
+    };
+    onRegisterHandlers({ onNotification: handleNotification, isIdle });
+  }, [onRegisterHandlers]);
   const handleSubmit = useCallback4(async (raw) => {
     const trimmed = raw.trim();
     if (!trimmed)
@@ -14006,38 +14060,14 @@ var RunScreen = ({
     setHistory((h) => [...h, { role: "user", content: trimmed }]);
     setUserHistory((uh) => [trimmed, ...uh]);
     userTurnCountRef.current += 1;
-    stream.start();
-    try {
-      let responseText;
-      if (streamHandleQuery) {
-        responseText = await streamHandleQuery(trimmed, (chunk) => stream.append(chunk));
-      } else {
-        responseText = await handleQuery(trimmed);
-      }
-      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
-      const finalText = truncateForTerminal(rendered, maxLines);
-      stream.finish();
-      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
-      assistantTurnCountRef.current += 1;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      stream.fail(err instanceof Error ? err : new Error(msg));
-      setErrorMessage(msg);
-      setHistory((h) => [
-        ...h,
-        { role: "tool", content: `❌ Error: ${msg}` }
-      ]);
-    }
+    await executeQuery(trimmed);
   }, [
     doExit,
     exit,
-    handleQuery,
-    markdownEnabled2,
+    executeQuery,
     maxLines,
     model,
-    stream,
-    streamHandleQuery,
-    width
+    workdir
   ]);
   const handleCancel = useCallback4(() => {
     doExit();
@@ -14080,7 +14110,7 @@ var RunTui_default = RunScreen;
 
 // src/commands/run.ts
 init_markdown();
-async function loadHandleQuery(options) {
+async function loadHandleQuery(options, hooks) {
   const quiet = CliQuietModeService.getInstance().isQuiet();
   const output = new OutputService2;
   output.configure({ quiet });
@@ -14097,10 +14127,126 @@ async function loadHandleQuery(options) {
   if (!env) {
     throw new Error("Failed to create environment");
   }
-  return async (message) => {
-    const result = await env.handle_query(message, {
-      sessionId: "cli-run"
+  const sessionComponent = envService.getSession();
+  if (!sessionComponent) {
+    throw new Error("Failed to create session component");
+  }
+  const sessionManager = new SessionManager({
+    sessionComponent,
+    output,
+    quiet: true
+  });
+  const sessionResult = await sessionManager.init(options.session, options.continue);
+  const sessionId = sessionResult.sessionId;
+  const queryExecutor = new QueryExecutor({
+    env,
+    sessionComponent,
+    output,
+    quiet: true,
+    silent: true
+  });
+  let agentContext = undefined;
+  if (options.agent && options.agent !== "default") {
+    const agentComponent = env.getComponent("agent");
+    const validation = validateActAgent(agentComponent, options.agent);
+    if (!validation.valid) {
+      output.error(validation.message);
+      output.info("提示: roy-agent agents list");
+      process.exit(1);
+    }
+    agentContext = buildActAgentContext(options.agent);
+  }
+  let eventSourceSystemPrompt;
+  const rawEventSourceIds = options.eventSource;
+  const eventSourceIds = Array.isArray(rawEventSourceIds) ? rawEventSourceIds.filter((s) => !!s) : rawEventSourceIds ? [rawEventSourceIds] : [];
+  if (eventSourceIds.length > 0) {
+    const eventSourceComponent = env.getComponent("event-source");
+    if (!eventSourceComponent || typeof eventSourceComponent.startSource !== "function") {
+      output.error("❌ 未找到事件源组件或 startSource 方法");
+      output.info("请确保 EventSourceComponent 已正确注册");
+      process.exit(1);
+    }
+    const summary = await startEventSources(eventSourceIds, eventSourceComponent, output);
+    const preloadedPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+    eventSourceSystemPrompt = preloadedPrompts.length > 0 ? joinResolvedSystemPrompts(preloadedPrompts) : undefined;
+    if (eventSourceIds.length === 1 && summary.failedCount > 0) {
+      process.exit(1);
+    }
+  }
+  const llmComponent = envService.getLLM();
+  queryExecutor.initStreamOutput(llmComponent ?? null);
+  const handleQuery = async (message) => {
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
+    return String(result ?? "");
+  };
+  const taskEventHandler = new TaskEventHandler({
+    env,
+    enabled: true
+  });
+  const eventHandler = new EventHandler({
+    env,
+    eventTypes: ["task.background.*", "event-source.event.*"],
+    formatter: new EventMessageFormatter({ prefix: "[通知]" }),
+    isIdle: hooks?.isIdle ?? (() => true),
+    sessionComponent,
+    onEvent: async (_message) => {},
+    onEventWithEnv: async (formattedEvent) => {
+      if (hooks?.onNotification) {
+        await hooks.onNotification(formattedEvent.message, formattedEvent.envEvent);
+      }
+    }
+  });
+  return {
+    handleQuery,
+    envService,
+    env,
+    sessionId,
+    queryExecutor,
+    agentContext,
+    eventSourceSystemPrompt,
+    sessionComponent,
+    eventHandler,
+    taskEventHandler
+  };
+}
+function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
+  return async (message, onChunk) => {
+    queryExecutor.setChunkCallback((event) => {
+      if (event.type === "llm.text") {
+        if (event.delta) {
+          onChunk(event.delta);
+        } else if (event.content) {
+          onChunk(event.content);
+        }
+      }
     });
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
     return String(result ?? "");
   };
 }
@@ -14140,6 +14286,41 @@ function createRunCommand() {
     }).option("env", {
       type: "string",
       describe: "Environment name"
+    }).option("session", {
+      type: "string",
+      describe: "指定会话 ID（注: -s 已被 --system-prompt 占用）"
+    }).option("continue", {
+      alias: "c",
+      type: "boolean",
+      describe: "继续上次会话",
+      default: false
+    }).option("reasoning", {
+      alias: "r",
+      type: "boolean",
+      describe: "显示 AI 思考过程",
+      default: true
+    }).option("tool-calls", {
+      type: "boolean",
+      describe: "显示工具调用",
+      default: true
+    }).option("tool-results", {
+      type: "boolean",
+      describe: "显示工具执行结果",
+      default: false
+    }).option("event-source", {
+      alias: "es",
+      type: "array",
+      string: true,
+      describe: "启动时一并启动的事件源 ID（可多次指定，支持 --es a --es b）"
+    }).option("agent", {
+      alias: "a",
+      type: "string",
+      describe: "指定使用的 agent (如 explore, general)"
+    }).option("default-agent-name", {
+      alias: "dan",
+      type: "string",
+      describe: "Default agent 名字（默认 Roy，可被覆盖）",
+      default: "Roy"
     }),
     handler: async (argv) => {
       if (argv.markdown === false) {
@@ -14148,18 +14329,44 @@ function createRunCommand() {
         setMarkdownEnabled(true);
       }
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
-      const handleQuery = await loadHandleQuery(argv);
+      const runState = {
+        isIdle: () => true,
+        onNotification: () => {}
+      };
+      const {
+        handleQuery,
+        queryExecutor,
+        sessionId,
+        agentContext,
+        eventSourceSystemPrompt,
+        eventHandler,
+        taskEventHandler
+      } = await loadHandleQuery(argv, {
+        isIdle: () => runState.isIdle(),
+        onNotification: (msg, envEvent) => runState.onNotification(msg, envEvent)
+      });
+      const streamHandleQuery = createStreamHandleQuery(queryExecutor, sessionId, argv, agentContext, eventSourceSystemPrompt);
+      const stopEventHandler = eventHandler.start();
+      const stopTaskEventHandler = taskEventHandler.start();
       const { waitUntilExit } = render(React6.createElement(RunTui_default, {
         handleQuery,
+        streamHandleQuery,
         model: argv.model,
         workdir: argv.workdir,
         maxLines,
         markdownEnabled: argv.markdown !== false,
+        onRegisterHandlers: (handlers) => {
+          runState.onNotification = handlers.onNotification;
+          runState.isIdle = handlers.isIdle;
+        },
         onExit: () => {}
       }), { exitOnCtrlC: true });
       try {
         await waitUntilExit();
       } finally {
+        stopEventHandler();
+        stopTaskEventHandler();
+        queryExecutor.dispose();
         process.exit(0);
       }
     }
@@ -14172,7 +14379,7 @@ import React8 from "react";
 import { render as render2 } from "ink";
 
 // src/ChatTui.tsx
-import { useEffect as useEffect5, useState as useState7 } from "react";
+import { useEffect as useEffect6, useState as useState7 } from "react";
 import { Box as Box7, useApp as useApp3 } from "ink";
 init_markdown();
 import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
@@ -14191,7 +14398,7 @@ var ChatScreen = ({
   const stream = useStreamingAccumulator();
   const { exit } = useApp3();
   const width = process.stdout.columns ?? 80;
-  useEffect5(() => {
+  useEffect6(() => {
     let cancelled = false;
     stream.start();
     (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.6.42",
+  "version": "1.7.0",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",
@@ -49,7 +49,8 @@
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver": "^1.3.4",
     "yargs": "^17.7.2",
-    "zod-to-json-schema": "^3.25.2"
+    "zod-to-json-schema": "^3.25.2",
+    "@earendil-works/pi-ai": "^0.74.2"
   },
   "devDependencies": {
     "@types/node": "^20.10.0",