From b1868a6401ef6e6ad45cdbbcf45b9c96dff91791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E9=98=B3?= <wuy398@chinaunicom.cn>
Date: Thu, 7 May 2026 17:51:23 +0800
Subject: [PATCH] Improve active run timing and turn limits

---
 .../components/assistant-ui/thread-list.tsx   | 20 +++++++++--
 .../app/components/assistant-ui/thread.tsx    | 35 ++++++++++++++++---
 src/agent_tools.py                            | 10 +++---
 src/agent_types.py                            |  5 ++-
 src/main.py                                   | 17 ++++-----
 src/session_store.py                          |  3 +-
 tests/test_session_store.py                   |  2 +-
 7 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/frontend/app/components/assistant-ui/thread-list.tsx b/frontend/app/components/assistant-ui/thread-list.tsx
index c0d953f..6b38d26 100644
--- a/frontend/app/components/assistant-ui/thread-list.tsx
+++ b/frontend/app/components/assistant-ui/thread-list.tsx
@@ -426,7 +426,12 @@ export function toReplayRepository(
 			role: message.role,
 			parts,
 			...(message.role === "assistant"
-				? { metadata: { sessionId: session.session_id ?? fallbackSessionId } }
+				? {
+						metadata: {
+							sessionId: session.session_id ?? fallbackSessionId,
+							elapsedMs: normalizeElapsedMs(message.metadata?.elapsed_ms),
+						},
+					}
 				: {}),
 		} as UIMessage;
 		const threadMessage = {
@@ -442,7 +447,10 @@ export function toReplayRepository(
 							unstable_annotations: [],
 							unstable_data: [],
 							steps: [],
-							custom: { sessionId: session.session_id ?? fallbackSessionId },
+							custom: {
+								sessionId: session.session_id ?? fallbackSessionId,
+								elapsedMs: normalizeElapsedMs(message.metadata?.elapsed_ms),
+							},
 						},
 					}
 				: { metadata: { custom: {} } }),
@@ -536,8 +544,9 @@ function buildActiveRunParts(runStatus: ClawActiveRunStatus) {
 			? "当前会话已有任务在执行，本轮正在排队。"
 			: runStatus.current_stage || "后端正在执行这个会话。";
 	const reasoningText = eventLines.length ? eventLines.join("\n") : fallback;
+	const runStartedAtMs = normalizeRunTimestampMs(runStatus.started_at);
 	return [
-		{ type: "reasoning", text: reasoningText },
+		{ type: "reasoning", text: reasoningText, runStartedAtMs },
 		...buildRunToolParts(runStatus.events ?? []),
 	];
 }
@@ -694,6 +703,11 @@ function normalizeRunTimestampMs(value: unknown) {
 	return value < 10_000_000_000 ? Math.round(value * 1000) : Math.round(value);
 }
 
+function normalizeElapsedMs(value: unknown) {
+	if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
+	return Math.max(0, Math.round(value));
+}
+
 function findLastAssistantContentIndex(messages: readonly ClawStoredMessage[]) {
 	for (let index = messages.length - 1; index >= 0; index -= 1) {
 		const message = messages[index];
diff --git a/frontend/app/components/assistant-ui/thread.tsx b/frontend/app/components/assistant-ui/thread.tsx
index 1209f8d..60747da 100644
--- a/frontend/app/components/assistant-ui/thread.tsx
+++ b/frontend/app/components/assistant-ui/thread.tsx
@@ -1217,11 +1217,20 @@ const ActivityChainSummary: FC<{
 }> = ({ messageId, partIndex }) => {
 	const { openItem } = useActivityPanel();
 	const startedAtRef = useRef(Date.now());
-	const [elapsedMs, setElapsedMs] = useState(0);
-	const runStartedAtMs = useAuiState((s) => {
+	const metadataRunStartedAtMs = useAuiState((s) => {
 		const value = readMetadataValue(s.message.metadata, "runStartedAtMs");
 		return typeof value === "number" && Number.isFinite(value) ? value : null;
 	});
+	const contentRunStartedAtMs = useAuiState((s) =>
+		findNumberInActivityParts(s.message.content, "runStartedAtMs"),
+	);
+	const storedElapsedMs = useAuiState((s) => {
+		const value = readMetadataValue(s.message.metadata, "elapsedMs");
+		return typeof value === "number" && Number.isFinite(value)
+			? Math.max(0, Math.round(value))
+			: null;
+	});
+	const [elapsedMs, setElapsedMs] = useState(storedElapsedMs ?? 0);
 	const label = useAuiState((s) => {
 		const message = s.message;
 		const status =
@@ -1238,14 +1247,18 @@ const ActivityChainSummary: FC<{
 	});
 
 	useEffect(() => {
-		if (!active) return;
-		const startedAt = runStartedAtMs ?? startedAtRef.current;
+		if (!active) {
+			if (storedElapsedMs !== null) setElapsedMs(storedElapsedMs);
+			return;
+		}
+		const startedAt =
+			metadataRunStartedAtMs ?? contentRunStartedAtMs ?? startedAtRef.current;
 		setElapsedMs(Math.max(0, Date.now() - startedAt));
 		const timer = window.setInterval(() => {
 			setElapsedMs(Math.max(0, Date.now() - startedAt));
 		}, 1000);
 		return () => window.clearInterval(timer);
-	}, [active, runStartedAtMs]);
+	}, [active, metadataRunStartedAtMs, contentRunStartedAtMs, storedElapsedMs]);
 
 	return (
 		<button
@@ -1272,8 +1285,20 @@ type ActivitySummaryPart = {
 	result?: unknown;
 	args?: unknown;
 	toolName?: string;
+	runStartedAtMs?: unknown;
 };
 
+function findNumberInActivityParts(
+	content: readonly ActivitySummaryPart[],
+	key: keyof ActivitySummaryPart,
+) {
+	for (const part of content) {
+		const value = part[key];
+		if (typeof value === "number" && Number.isFinite(value)) return value;
+	}
+	return null;
+}
+
 function summarizeActivityChainLabel(
 	content: readonly ActivitySummaryPart[],
 	status: string | undefined,
diff --git a/src/agent_tools.py b/src/agent_tools.py
index 55db320..4aa5ee6 100644
--- a/src/agent_tools.py
+++ b/src/agent_tools.py
@@ -27,7 +27,7 @@ from .agent_tool_core import (
 from .agent_tool_specs.data_agent import build_data_agent_tools
 from .agent_tool_specs.execution import build_execution_tools
 from .agent_tool_specs.files import build_file_tools
-from .agent_types import ToolExecutionResult
+from .agent_types import DEFAULT_MAX_TURNS, ToolExecutionResult
 from .data_agent_records import (
     DataRecordError,
     confirm_generation_goal,
@@ -938,7 +938,7 @@ def default_tool_registry() -> dict[str, AgentTool]:
                                     'properties': {
                                         'prompt': {'type': 'string'},
                                         'label': {'type': 'string'},
-                                        'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': 20},
+                                        'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': DEFAULT_MAX_TURNS},
                                         'resume_session_id': {'type': 'string'},
                                         'session_id': {'type': 'string'},
                                         'depends_on': {
@@ -953,7 +953,7 @@ def default_tool_registry() -> dict[str, AgentTool]:
                     },
                     'resume_session_id': {'type': 'string'},
                     'session_id': {'type': 'string'},
-                    'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': 20},
+                    'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': DEFAULT_MAX_TURNS},
                     'allow_write': {'type': 'boolean'},
                     'allow_shell': {'type': 'boolean'},
                     'include_parent_context': {'type': 'boolean'},
@@ -983,7 +983,7 @@ def default_tool_registry() -> dict[str, AgentTool]:
                                     'properties': {
                                         'prompt': {'type': 'string'},
                                         'label': {'type': 'string'},
-                                        'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': 20},
+                                        'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': DEFAULT_MAX_TURNS},
                                         'resume_session_id': {'type': 'string'},
                                         'session_id': {'type': 'string'},
                                         'depends_on': {
@@ -998,7 +998,7 @@ def default_tool_registry() -> dict[str, AgentTool]:
                     },
                     'resume_session_id': {'type': 'string'},
                     'session_id': {'type': 'string'},
-                    'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': 20},
+                    'max_turns': {'type': 'integer', 'minimum': 1, 'maximum': DEFAULT_MAX_TURNS},
                     'allow_write': {'type': 'boolean'},
                     'allow_shell': {'type': 'boolean'},
                     'include_parent_context': {'type': 'boolean'},
diff --git a/src/agent_types.py b/src/agent_types.py
index 8058d2a..08cd3c0 100644
--- a/src/agent_types.py
+++ b/src/agent_types.py
@@ -150,10 +150,13 @@ class AgentPermissions:
     allow_destructive_shell_commands: bool = False
 
 
+DEFAULT_MAX_TURNS = 50
+
+
 @dataclass(frozen=True)
 class AgentRuntimeConfig:
     cwd: Path
-    max_turns: int = 12
+    max_turns: int = DEFAULT_MAX_TURNS
     command_timeout_seconds: float = 30.0
     max_output_chars: int = 12000
     stream_model_responses: bool = False
diff --git a/src/main.py b/src/main.py
index 7b038a5..acb2e05 100644
--- a/src/main.py
+++ b/src/main.py
@@ -23,6 +23,7 @@ from .agent_types import (
     AgentPermissions,
     AgentRuntimeConfig,
     BudgetConfig,
+    DEFAULT_MAX_TURNS,
     ModelConfig,
     ModelPricing,
     OutputSchemaConfig,
@@ -104,7 +105,7 @@ def _add_agent_common_args(parser: argparse.ArgumentParser, *, include_backend:
 def _build_runtime_config(args: argparse.Namespace) -> AgentRuntimeConfig:
     return AgentRuntimeConfig(
         cwd=Path(args.cwd).resolve(),
-        max_turns=getattr(args, 'max_turns', 12),
+        max_turns=getattr(args, 'max_turns', None) or DEFAULT_MAX_TURNS,
         permissions=AgentPermissions(
             allow_file_write=args.allow_write,
             allow_shell_commands=args.allow_shell,
@@ -228,7 +229,7 @@ def _append_agent_forwarded_args(
     include_backend: bool,
 ) -> None:
     command.extend(['--cwd', str(args.cwd)])
-    command.extend(['--max-turns', str(getattr(args, 'max_turns', 12))])
+    command.extend(['--max-turns', str(getattr(args, 'max_turns', None) or DEFAULT_MAX_TURNS)])
     if include_backend:
         command.extend(['--model', str(args.model)])
         command.extend(['--base-url', str(args.base_url)])
@@ -837,13 +838,13 @@ def build_parser() -> argparse.ArgumentParser:
 
     agent_parser = subparsers.add_parser('agent', help='run the real Python local-model agent')
     agent_parser.add_argument('prompt')
-    agent_parser.add_argument('--max-turns', type=int, default=12)
+    agent_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     agent_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(agent_parser, include_backend=True)
 
     background_parser = subparsers.add_parser('agent-bg', help='run the Python local-model agent as a local background session')
     background_parser.add_argument('prompt')
-    background_parser.add_argument('--max-turns', type=int, default=12)
+    background_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     background_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(background_parser, include_backend=True)
 
@@ -851,7 +852,7 @@ def build_parser() -> argparse.ArgumentParser:
     background_worker_parser.add_argument('background_id')
     background_worker_parser.add_argument('prompt')
     background_worker_parser.add_argument('--background-root', required=True)
-    background_worker_parser.add_argument('--max-turns', type=int, default=12)
+    background_worker_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     background_worker_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(background_worker_parser, include_backend=True)
 
@@ -875,7 +876,7 @@ def build_parser() -> argparse.ArgumentParser:
 
     daemon_start_parser = daemon_subparsers.add_parser('start', help='launch a local daemon-style background agent session')
     daemon_start_parser.add_argument('prompt')
-    daemon_start_parser.add_argument('--max-turns', type=int, default=12)
+    daemon_start_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     daemon_start_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(daemon_start_parser, include_backend=True)
 
@@ -883,7 +884,7 @@ def build_parser() -> argparse.ArgumentParser:
     daemon_worker_parser.add_argument('background_id')
     daemon_worker_parser.add_argument('prompt')
     daemon_worker_parser.add_argument('--background-root', required=True)
-    daemon_worker_parser.add_argument('--max-turns', type=int, default=12)
+    daemon_worker_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     daemon_worker_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(daemon_worker_parser, include_backend=True)
 
@@ -904,7 +905,7 @@ def build_parser() -> argparse.ArgumentParser:
     chat_parser = subparsers.add_parser('agent-chat', help='run an interactive Python local-model chat loop')
     chat_parser.add_argument('prompt', nargs='?')
     chat_parser.add_argument('--resume-session-id')
-    chat_parser.add_argument('--max-turns', type=int, default=12)
+    chat_parser.add_argument('--max-turns', type=int, default=DEFAULT_MAX_TURNS)
     chat_parser.add_argument('--show-transcript', action='store_true')
     _add_agent_common_args(chat_parser, include_backend=True)
 
diff --git a/src/session_store.py b/src/session_store.py
index 05c90d2..4d37af8 100644
--- a/src/session_store.py
+++ b/src/session_store.py
@@ -9,6 +9,7 @@ from .agent_types import (
     AgentPermissions,
     AgentRuntimeConfig,
     BudgetConfig,
+    DEFAULT_MAX_TURNS,
     ModelConfig,
     ModelPricing,
     OutputSchemaConfig,
@@ -204,7 +205,7 @@ def deserialize_runtime_config(payload: JSONDict) -> AgentRuntimeConfig:
     output_schema_payload = payload.get('output_schema')
     return AgentRuntimeConfig(
         cwd=Path(str(payload['cwd'])).resolve(),
-        max_turns=int(payload.get('max_turns', 12)),
+        max_turns=int(payload.get('max_turns', DEFAULT_MAX_TURNS)),
         command_timeout_seconds=float(payload.get('command_timeout_seconds', 30.0)),
         max_output_chars=int(payload.get('max_output_chars', 12000)),
         stream_model_responses=bool(payload.get('stream_model_responses', False)),
diff --git a/tests/test_session_store.py b/tests/test_session_store.py
index 5c35813..d8f7fbb 100644
--- a/tests/test_session_store.py
+++ b/tests/test_session_store.py
@@ -360,7 +360,7 @@ class TestRuntimeConfigSerialization(unittest.TestCase):
         payload = {'cwd': '/home/user'}
         config = deserialize_runtime_config(payload)
 
-        self.assertEqual(config.max_turns, 12)
+        self.assertEqual(config.max_turns, 50)
         self.assertAlmostEqual(config.command_timeout_seconds, 30.0)
         self.assertEqual(config.max_output_chars, 12000)
         self.assertFalse(config.stream_model_responses)