autoglm-gui 1.5.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

AutoGLM_GUI/agents/glm/agent.py

@@ -193,7 +193,12 @@ class GLMAgent:
             )
         else:
             screen_info = MessageBuilder.build_screen_info(current_app)
-            text_content = f"** Screen Info **\n\n{screen_info}"
+            # 如果有新的用户消息（多轮对话场景），把它加入消息中
+            if user_prompt:
+                text_content = f"{user_prompt}\n\n** Screen Info **\n\n{screen_info}"
+            else:
+                # 继续执行当前任务，只需要屏幕信息
+                text_content = f"** Screen Info **\n\n{screen_info}"
 
             self._context.append(
                 MessageBuilder.create_user_message(

AutoGLM_GUI/agents/mai/agent.py

@@ -96,6 +96,9 @@ class InternalMAIAgent:
 
         if is_first:
             self.traj_memory.task_goal = task or ""
+        elif task:
+            # 多轮对话：有新的用户消息，更新 task_goal
+            self.traj_memory.task_goal = task
 
         return self._execute_step(task, is_first)
 

AutoGLM_GUI/agents/stream_runner.py

@@ -99,9 +99,14 @@ class AgentStepStreamer:
 
                 try:
                     # 执行 step 循环
+                    # 使用会话级别的标记，而不是 agent.step_count
+                    # 这样每次新对话开始时，第一步都会传递 task
+                    is_first_in_session = True
                     while not self._stop_event.is_set():
-                        is_first = self._agent.step_count == 0
-                        result = self._agent.step(self._task if is_first else None)
+                        result = self._agent.step(
+                            self._task if is_first_in_session else None
+                        )
+                        is_first_in_session = False
 
                         # 发射 step 事件
                         self._event_queue.put(

AutoGLM_GUI/api/agents.py

@@ -200,7 +200,7 @@ def chat_stream(request: ChatRequest):
     from AutoGLM_GUI.device_manager import DeviceManager
     from AutoGLM_GUI.exceptions import AgentInitializationError, DeviceBusyError
     from AutoGLM_GUI.history_manager import history_manager
-    from AutoGLM_GUI.models.history import ConversationRecord
+    from AutoGLM_GUI.models.history import ConversationRecord, MessageRecord
     from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
 
     device_id = request.device_id
@@ -213,6 +213,17 @@ def chat_stream(request: ChatRequest):
         final_success = False
         final_steps = 0
 
+        # 收集完整对话消息
+        messages: list[MessageRecord] = []
+        # 添加用户消息
+        messages.append(
+            MessageRecord(
+                role="user",
+                content=request.message,
+                timestamp=start_time,
+            )
+        )
+
         try:
             acquired = manager.acquire_device(
                 device_id, timeout=0, raise_on_timeout=True, auto_initialize=True
@@ -235,6 +246,19 @@ def chat_stream(request: ChatRequest):
                         ):
                             continue
 
+                        # 收集每个 step 的消息
+                        if event_type == AgentEventType.STEP.value:
+                            messages.append(
+                                MessageRecord(
+                                    role="assistant",
+                                    content="",
+                                    timestamp=datetime.now(),
+                                    thinking=event_data_dict.get("thinking"),
+                                    action=event_data_dict.get("action"),
+                                    step=event_data_dict.get("step"),
+                                )
+                            )
+
                         if event_type == AgentEventType.DONE.value:
                             final_message = event_data_dict.get("message", "")
                             final_success = event_data_dict.get("success", False)
@@ -263,6 +287,7 @@ def chat_stream(request: ChatRequest):
                         duration_ms=int((end_time - start_time).total_seconds() * 1000),
                         source="chat",
                         error_message=None if final_success else final_message,
+                        messages=messages,
                     )
                     history_manager.add_record(serialno, record)
 

AutoGLM_GUI/api/history.py

@@ -3,7 +3,11 @@
 from fastapi import APIRouter, HTTPException
 
 from AutoGLM_GUI.history_manager import history_manager
-from AutoGLM_GUI.schemas import HistoryListResponse, HistoryRecordResponse
+from AutoGLM_GUI.schemas import (
+    HistoryListResponse,
+    HistoryRecordResponse,
+    MessageRecordResponse,
+)
 
 router = APIRouter()
 
@@ -34,6 +38,17 @@ def list_history(
                 source=r.source,
                 source_detail=r.source_detail,
                 error_message=r.error_message,
+                messages=[
+                    MessageRecordResponse(
+                        role=m.role,
+                        content=m.content,
+                        timestamp=m.timestamp.isoformat(),
+                        thinking=m.thinking,
+                        action=m.action,
+                        step=m.step,
+                    )
+                    for m in r.messages
+                ],
             )
             for r in records
         ],
@@ -61,6 +76,17 @@ def get_history_record(serialno: str, record_id: str) -> HistoryRecordResponse:
         source=record.source,
         source_detail=record.source_detail,
         error_message=record.error_message,
+        messages=[
+            MessageRecordResponse(
+                role=m.role,
+                content=m.content,
+                timestamp=m.timestamp.isoformat(),
+                thinking=m.thinking,
+                action=m.action,
+                step=m.step,
+            )
+            for m in record.messages
+        ],
     )
 
 

AutoGLM_GUI/models/history.py

@@ -2,10 +2,49 @@
 
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Literal
+from typing import Any, Literal
 from uuid import uuid4
 
 
+@dataclass
+class MessageRecord:
+    """对话中的单条消息记录."""
+
+    role: Literal["user", "assistant"]
+    content: str
+    timestamp: datetime = field(default_factory=datetime.now)
+
+    # assistant 消息特有字段
+    thinking: str | None = None
+    action: dict[str, Any] | None = None
+    step: int | None = None
+
+    def to_dict(self) -> dict:
+        """转换为可序列化的字典."""
+        return {
+            "role": self.role,
+            "content": self.content,
+            "timestamp": self.timestamp.isoformat(),
+            "thinking": self.thinking,
+            "action": self.action,
+            "step": self.step,
+        }
+
+    @classmethod
+    def from_dict(cls, data: dict) -> "MessageRecord":
+        """从字典创建实例."""
+        return cls(
+            role=data.get("role", "user"),
+            content=data.get("content", ""),
+            timestamp=datetime.fromisoformat(data["timestamp"])
+            if data.get("timestamp")
+            else datetime.now(),
+            thinking=data.get("thinking"),
+            action=data.get("action"),
+            step=data.get("step"),
+        )
+
+
 @dataclass
 class ConversationRecord:
     """单条对话记录."""
@@ -30,6 +69,9 @@ class ConversationRecord:
     # 错误信息
     error_message: str | None = None
 
+    # 完整对话消息列表
+    messages: list[MessageRecord] = field(default_factory=list)
+
     def to_dict(self) -> dict:
         """转换为可序列化的字典."""
         return {
@@ -44,6 +86,7 @@ class ConversationRecord:
             "source": self.source,
             "source_detail": self.source_detail,
             "error_message": self.error_message,
+            "messages": [m.to_dict() for m in self.messages],
         }
 
     @classmethod
@@ -65,6 +108,7 @@ class ConversationRecord:
             source=data.get("source", "chat"),
             source_detail=data.get("source_detail", ""),
             error_message=data.get("error_message"),
+            messages=[MessageRecord.from_dict(m) for m in data.get("messages", [])],
         )
 
 

AutoGLM_GUI/scheduler_manager.py

@@ -177,7 +177,7 @@ class SchedulerManager:
 
         from AutoGLM_GUI.device_manager import DeviceManager
         from AutoGLM_GUI.history_manager import history_manager
-        from AutoGLM_GUI.models.history import ConversationRecord
+        from AutoGLM_GUI.models.history import ConversationRecord, MessageRecord
         from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
         from AutoGLM_GUI.workflow_manager import workflow_manager
 
@@ -210,27 +210,72 @@ class SchedulerManager:
             return
 
         start_time = datetime.now()
+
+        # 收集完整对话消息
+        messages: list[MessageRecord] = []
+        messages.append(
+            MessageRecord(
+                role="user",
+                content=workflow["text"],
+                timestamp=start_time,
+            )
+        )
+
         try:
             agent = manager.get_agent(device.primary_device_id)
             agent.reset()
-            result = agent.run(workflow["text"])
-            steps = agent.step_count
 
+            # 使用 step 循环执行，收集每步信息
+            is_first = True
+            result_message = ""
+            task_success = False
+
+            while agent.step_count < agent.agent_config.max_steps:
+                step_result = agent.step(workflow["text"] if is_first else None)
+                is_first = False
+
+                # 收集每个 step 的消息
+                messages.append(
+                    MessageRecord(
+                        role="assistant",
+                        content="",
+                        timestamp=datetime.now(),
+                        thinking=step_result.thinking,
+                        action=step_result.action,
+                        step=agent.step_count,
+                    )
+                )
+
+                if step_result.finished:
+                    result_message = step_result.message or "Task completed"
+                    task_success = step_result.success
+                    break
+            else:
+                result_message = "Max steps reached"
+                task_success = False
+
+            steps = agent.step_count
             end_time = datetime.now()
+
             record = ConversationRecord(
                 task_text=workflow["text"],
-                final_message=result,
-                success=True,
+                final_message=result_message,
+                success=task_success,
                 steps=steps,
                 start_time=start_time,
                 end_time=end_time,
                 duration_ms=int((end_time - start_time).total_seconds() * 1000),
                 source="scheduled",
                 source_detail=task.name,
+                error_message=None if task_success else result_message,
+                messages=messages,
             )
             history_manager.add_record(task.device_serialno, record)
 
-            self._record_success(task, result)
+            if task_success:
+                self._record_success(task, result_message)
+            else:
+                self._record_failure(task, result_message)
 
         except Exception as e:
             end_time = datetime.now()
@@ -248,6 +293,7 @@ class SchedulerManager:
                 source="scheduled",
                 source_detail=task.name,
                 error_message=error_msg,
+                messages=messages,
             )
             history_manager.add_record(task.device_serialno, record)
 

AutoGLM_GUI/schemas.py

@@ -702,6 +702,17 @@ class ReinitAllAgentsResponse(BaseModel):
 # History Models
 
 
+class MessageRecordResponse(BaseModel):
+    """对话消息响应."""
+
+    role: str  # "user" | "assistant"
+    content: str
+    timestamp: str
+    thinking: str | None = None
+    action: dict | None = None
+    step: int | None = None
+
+
 class HistoryRecordResponse(BaseModel):
     """历史记录条目响应."""
 
@@ -716,6 +727,7 @@ class HistoryRecordResponse(BaseModel):
     source: str
     source_detail: str
     error_message: str | None
+    messages: list[MessageRecordResponse] = []
 
 
 class HistoryListResponse(BaseModel):

AutoGLM_GUI/static/assets/{about-BQm96DAl.js → about-CfwX1Cmc.js}

@@ -1 +1 @@
-import{j as o}from"./index-CssG-3TH.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};
+import{j as o}from"./index-CTHbFvKl.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};

AutoGLM_GUI/static/assets/{alert-dialog-B42XxGPR.js → alert-dialog-CtGlN2IJ.js}

@@ -1 +1 @@
-import{o as u,r as o,j as a,b as r,B as d}from"./index-CssG-3TH.js";import{P as g,b as x,c as f,d as m}from"./popover-DLsuV5Sx.js";import{D as p,d as h,e as w,f as j,g as D}from"./dialog-DZ78cEcj.js";const N=[["path",{d:"M20 6 9 17l-5-5",key:"1gmf2c"}]],b=u("check",N),c=o.createContext(void 0),P=({value:t="",onValueChange:e,children:s})=>{const[n,l]=o.useState(!1);return a.jsx(c.Provider,{value:{value:t,onValueChange:e||(()=>{}),open:n,setOpen:l},children:a.jsx(g,{open:n,onOpenChange:l,children:s})})},C=o.forwardRef(({className:t,children:e,...s},n)=>{if(!o.useContext(c))throw new Error("SelectTrigger must be used within Select");return a.jsx(x,{asChild:!0,children:a.jsxs("button",{ref:n,className:r("flex h-10 w-full items-center justify-between rounded-md border border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-slate-950 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus:ring-slate-300",t),...s,children:[e,a.jsx(f,{className:"h-4 w-4 opacity-50"})]})})});C.displayName="SelectTrigger";const V=({placeholder:t})=>{const e=o.useContext(c);if(!e)throw new Error("SelectValue must be used within Select");return a.jsx("span",{className:e.value?"":"text-slate-500",children:e.value||t})},I=({children:t,className:e})=>a.jsx(m,{className:r("w-[var(--radix-popover-trigger-width)] p-1",e),children:t}),O=({value:t,children:e,disabled:s,className:n})=>{const l=o.useContext(c);if(!l)throw new Error("SelectItem must be used within Select");const i=l.value===t;return a.jsxs("div",{role:"option","aria-selected":i,className:r("relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none hover:bg-slate-100 focus:bg-slate-100 dark:hover:bg-slate-800 dark:focus:bg-slate-800",s&&"pointer-events-none opacity-50",n),onClick:()=>{s||(l.onValueChange(t),l.setOpen(!1))},children:[a.jsx("span",{className:"absolute left-2 flex h-3.5 w-3.5 items-center justify-center",children:i&&a.jsx(b,{className:"h-4 w-4"})}),e]})},B=({open:t,onOpenChange:e,children:s})=>a.jsx(p,{open:t,onOpenChange:e,children:s}),v=o.forwardRef(({className:t,...e},s)=>a.jsx(h,{ref:s,className:r("sm:max-w-[425px]",t),...e}));v.displayName="AlertDialogContent";const F=({className:t,...e})=>a.jsx(w,{className:r(t),...e}),H=({className:t,...e})=>a.jsx(D,{className:r(t),...e}),A=o.forwardRef(({className:t,...e},s)=>a.jsx(j,{ref:s,className:r(t),...e}));A.displayName="AlertDialogTitle";const S=o.forwardRef(({className:t,...e},s)=>a.jsx("p",{ref:s,className:r("text-sm text-slate-500 dark:text-slate-400",t),...e}));S.displayName="AlertDialogDescription";const y=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,className:r(t),...e}));y.displayName="AlertDialogAction";const k=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,variant:"outline",className:r(t),...e}));k.displayName="AlertDialogCancel";export{B as A,P as S,C as a,V as b,I as c,O as d,v as e,F as f,A as g,S as h,H as i,k as j,y as k};
+import{o as u,r as o,j as a,b as r,B as d}from"./index-CTHbFvKl.js";import{P as g,c as x,b as f,d as m}from"./popover--JTJrE5v.js";import{D as p,d as h,e as w,f as j,g as D}from"./dialog-FNwZJFwk.js";const N=[["path",{d:"M20 6 9 17l-5-5",key:"1gmf2c"}]],b=u("check",N),c=o.createContext(void 0),P=({value:t="",onValueChange:e,children:s})=>{const[n,l]=o.useState(!1);return a.jsx(c.Provider,{value:{value:t,onValueChange:e||(()=>{}),open:n,setOpen:l},children:a.jsx(g,{open:n,onOpenChange:l,children:s})})},C=o.forwardRef(({className:t,children:e,...s},n)=>{if(!o.useContext(c))throw new Error("SelectTrigger must be used within Select");return a.jsx(x,{asChild:!0,children:a.jsxs("button",{ref:n,className:r("flex h-10 w-full items-center justify-between rounded-md border border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-slate-950 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus:ring-slate-300",t),...s,children:[e,a.jsx(f,{className:"h-4 w-4 opacity-50"})]})})});C.displayName="SelectTrigger";const V=({placeholder:t})=>{const e=o.useContext(c);if(!e)throw new Error("SelectValue must be used within Select");return a.jsx("span",{className:e.value?"":"text-slate-500",children:e.value||t})},I=({children:t,className:e})=>a.jsx(m,{className:r("w-[var(--radix-popover-trigger-width)] p-1",e),children:t}),O=({value:t,children:e,disabled:s,className:n})=>{const l=o.useContext(c);if(!l)throw new Error("SelectItem must be used within Select");const i=l.value===t;return a.jsxs("div",{role:"option","aria-selected":i,className:r("relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none hover:bg-slate-100 focus:bg-slate-100 dark:hover:bg-slate-800 dark:focus:bg-slate-800",s&&"pointer-events-none opacity-50",n),onClick:()=>{s||(l.onValueChange(t),l.setOpen(!1))},children:[a.jsx("span",{className:"absolute left-2 flex h-3.5 w-3.5 items-center justify-center",children:i&&a.jsx(b,{className:"h-4 w-4"})}),e]})},B=({open:t,onOpenChange:e,children:s})=>a.jsx(p,{open:t,onOpenChange:e,children:s}),v=o.forwardRef(({className:t,...e},s)=>a.jsx(h,{ref:s,className:r("sm:max-w-[425px]",t),...e}));v.displayName="AlertDialogContent";const F=({className:t,...e})=>a.jsx(w,{className:r(t),...e}),H=({className:t,...e})=>a.jsx(D,{className:r(t),...e}),A=o.forwardRef(({className:t,...e},s)=>a.jsx(j,{ref:s,className:r(t),...e}));A.displayName="AlertDialogTitle";const S=o.forwardRef(({className:t,...e},s)=>a.jsx("p",{ref:s,className:r("text-sm text-slate-500 dark:text-slate-400",t),...e}));S.displayName="AlertDialogDescription";const y=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,className:r(t),...e}));y.displayName="AlertDialogAction";const k=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,variant:"outline",className:r(t),...e}));k.displayName="AlertDialogCancel";export{B as A,P as S,C as a,V as b,I as c,O as d,v as e,F as f,A as g,S as h,H as i,k as j,y as k};