nju-coding-agent-harness 0.2.2__tar.gz → 0.2.4__tar.gz

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nju-coding-agent-harness
-Version: 0.2.2
+Version: 0.2.4
 Requires-Python: >=3.11
 Requires-Dist: openai
 Requires-Dist: requests

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/harness/tools/ask.py

@@ -6,7 +6,18 @@ from typing import TYPE_CHECKING, Any, Callable
 if TYPE_CHECKING:
     from harness.registry import Context
 
-SCHEMA: dict = {"question": "string", "options": "array[string]"}
+SCHEMA: dict = {
+    "type": "object",
+    "properties": {
+        "question": {"type": "string", "description": "问题内容"},
+        "options": {
+            "type": "array",
+            "items": {"type": "string"},
+            "description": "选项列表（可选）",
+        },
+    },
+    "required": ["question"],
+}
 
 
 @dataclass

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/harness/webui/server.py

@@ -115,7 +115,10 @@ async def websocket_endpoint(websocket: WebSocket):
             if msg.get("type") == "chat":
                 async def push(event: dict):
                     await websocket.send_text(json.dumps(event, ensure_ascii=False))
-                await agent.chat(msg["content"], push)
+                try:
+                    await agent.chat(msg["content"], push)
+                except Exception as e:
+                    await push({"type": "error", "content": str(e)})
             elif msg.get("type") == "stop":
                 await agent.stop()
     except WebSocketDisconnect:

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/harness/webui/static/index.html

@@ -36,12 +36,13 @@
 
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-            background-color: var(--bg-dark);
-            color: var(--text-dark);
-            line-height: 1.5;
+            background-color: var(--bg-light);
+            color: var(--text-light);
+            line-height: 1.6;
             height: 100vh;
             display: flex;
             overflow: hidden;
+            font-size: 15px; /* 增加基础字体大小 */
         }
 
         /* Theme switcher */
@@ -82,11 +83,13 @@
         }
 
         .sidebar-header {
-            padding: 16px;
+            padding: 18px;
             border-bottom: 1px solid var(--border);
             display: flex;
             align-items: center;
             justify-content: space-between;
+            font-size: 17px;
+            font-weight: 600;
         }
 
         .sidebar-toggle {
@@ -94,9 +97,9 @@
             border: none;
             color: var(--text-muted);
             cursor: pointer;
-            padding: 4px;
+            padding: 6px;
             border-radius: 4px;
-            font-size: 16px;
+            font-size: 18px;
         }
 
         .sidebar-toggle:hover {
@@ -106,7 +109,7 @@
         .sidebar-content {
             flex: 1;
             overflow-y: auto;
-            padding: 8px;
+            padding: 12px;
         }
 
         .sidebar-section {
@@ -114,8 +117,8 @@
         }
 
         .sidebar-section h3 {
-            margin-bottom: 8px;
-            font-size: 14px;
+            margin-bottom: 12px;
+            font-size: 15px;
             font-weight: 600;
             color: var(--text-muted);
             text-transform: uppercase;
@@ -124,18 +127,19 @@
 
         .sidebar-button {
             width: 100%;
-            padding: 12px 16px;
+            padding: 14px 18px;
             background: none;
             border: 1px solid var(--border);
             color: var(--text);
-            border-radius: 6px;
+            border-radius: 8px;
             cursor: pointer;
             text-align: left;
-            margin-bottom: 8px;
+            margin-bottom: 10px;
             transition: all 0.2s ease;
             display: flex;
             align-items: center;
-            gap: 8px;
+            gap: 10px;
+            font-size: 15px;
         }
 
         .sidebar-button:hover {
@@ -160,16 +164,16 @@
         .chat-area {
             flex: 1;
             overflow-y: auto;
-            padding: 20px;
+            padding: 24px;
             display: flex;
             flex-direction: column;
-            gap: 16px;
+            gap: 20px;
         }
 
         .message {
             max-width: 75%;
-            padding: 12px 16px;
-            border-radius: 8px;
+            padding: 14px 18px;
+            border-radius: 10px;
             position: relative;
         }
 
@@ -189,14 +193,15 @@
             word-wrap: break-word;
             white-space: pre-wrap;
             font-family: 'JetBrains Mono', 'SF Mono', Monaco, 'Cascadia Code', monospace;
-            font-size: 14px;
-            line-height: 1.6;
+            font-size: 15px;
+            line-height: 1.7;
         }
 
         .tool-call {
-            margin-top: 12px;
+            margin-top: 8px;
+            border: 1px solid var(--border);
             border-left: 3px solid;
-            border-radius: 4px;
+            border-radius: 6px;
             overflow: hidden;
             background-color: var(--card);
         }
@@ -207,25 +212,43 @@
         .tool-call.other { border-color: var(--text-muted); }
 
         .tool-header {
-            padding: 8px 12px;
+            padding: 6px 10px;
             background-color: var(--sidebar);
             cursor: pointer;
             display: flex;
             align-items: center;
-            justify-content: space-between;
+            gap: 8px;
             font-weight: 500;
+            font-size: 13px;
+            user-select: none;
+        }
+
+        .tool-name {
+            font-weight: 600;
+            white-space: nowrap;
         }
 
         .tool-trigger {
             font-family: 'JetBrains Mono', monospace;
             font-size: 12px;
-            opacity: 0.8;
+            color: var(--text-muted);
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .tool-toggle {
+            font-size: 10px;
+            color: var(--text-muted);
+            flex-shrink: 0;
         }
 
         .tool-content {
-            padding: 12px;
+            padding: 10px;
             font-family: 'JetBrains Mono', monospace;
             font-size: 12px;
+            line-height: 1.5;
             white-space: pre-wrap;
             background-color: var(--bg);
             border-top: 1px solid var(--border);
@@ -235,9 +258,25 @@
             display: none;
         }
 
+        .tool-result {
+            padding: 4px 10px 6px;
+            font-family: 'JetBrains Mono', monospace;
+            font-size: 12px;
+            color: var(--text-muted);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            border-top: 1px solid var(--border);
+            display: none;
+        }
+
+        .tool-call.completed .tool-result {
+            display: block;
+        }
+
         /* Input area */
         .input-area {
-            padding: 16px 20px;
+            padding: 18px 24px;
             border-top: 1px solid var(--border);
             background-color: var(--bg);
         }
@@ -245,20 +284,20 @@
         .input-wrapper {
             position: relative;
             display: flex;
-            gap: 8px;
+            gap: 10px;
         }
 
         .text-input {
             flex: 1;
-            min-height: 40px;
+            min-height: 44px;
             max-height: 120px;
-            padding: 8px 12px;
+            padding: 10px 14px;
             border: 1px solid var(--border);
             border-radius: 6px;
             background-color: var(--card);
             color: var(--text);
             font-family: inherit;
-            font-size: 14px;
+            font-size: 15px;
             resize: vertical;
             outline: none;
         }
@@ -269,13 +308,14 @@
         }
 
         .send-button {
-            padding: 8px 16px;
+            padding: 10px 18px;
             background-color: var(--accent);
             color: white;
             border: none;
             border-radius: 6px;
             cursor: pointer;
             font-weight: 500;
+            font-size: 14px;
             transition: background-color 0.2s ease;
         }
 
@@ -289,13 +329,14 @@
         }
 
         .stop-button {
-            padding: 8px 16px;
+            padding: 10px 18px;
             background-color: var(--danger);
             color: white;
             border: none;
             border-radius: 6px;
             cursor: pointer;
             font-weight: 500;
+            font-size: 14px;
             transition: background-color 0.2s ease;
         }
 
@@ -305,11 +346,11 @@
 
         /* Status indicators */
         .status-indicator {
-            font-size: 12px;
+            font-size: 13px;
             color: var(--text-muted);
             text-align: center;
-            padding: 4px;
-            margin-top: 8px;
+            padding: 6px;
+            margin-top: 10px;
         }
 
         .status-indicator.connected { color: var(--success); }
@@ -336,7 +377,7 @@
         .flex { display: flex; }
     </style>
 </head>
-<body class="dark-theme">
+<body class="light-theme">
     <!-- Sidebar -->
     <div class="sidebar" id="sidebar">
         <div class="sidebar-header">
@@ -631,11 +672,18 @@
             handleToolOutput(data) {
                 const toolKey = data.name + '_' + (data.index || 0);
                 const toolElement = this.currentToolElements[toolKey];
-                
+
                 if (toolElement) {
                     const contentDiv = toolElement.querySelector('.tool-content');
                     contentDiv.textContent = this.formatToolOutput(data);
-                    contentDiv.classList.remove('collapsed');
+                    contentDiv.classList.add('collapsed');
+
+                    const resultDiv = toolElement.querySelector('.tool-result');
+                    const output = this.formatToolOutput(data);
+                    const firstLine = output.split('\n')[0];
+                    resultDiv.textContent = firstLine.length > 80 ? firstLine.substring(0, 80) + '...' : firstLine;
+
+                    toolElement.classList.add('completed');
                 }
             }
 
@@ -643,12 +691,14 @@
                 const toolDiv = document.createElement('div');
                 const toolType = this.getToolType(data.name);
                 toolDiv.className = `tool-call ${toolType}`;
+
+                const args = typeof data.arguments === 'object' ? JSON.stringify(data.arguments) : String(data.arguments || '');
                 
                 const header = document.createElement('div');
                 header.className = 'tool-header';
                 header.innerHTML = `
-                    <span>${data.name}</span>
-                    <span class="tool-trigger">${JSON.stringify(data.arguments).substring(0, 50)}...</span>
+                    <span class="tool-name">${data.name}</span>
+                    <span class="tool-trigger" title="${this.escapeHtml(args)}">${this.escapeHtml(args)}</span>
                     <span class="tool-toggle">▶</span>
                 `;
 
@@ -656,6 +706,9 @@
                 content.className = 'tool-content collapsed';
                 content.innerHTML = '<div class="loading"></div>';
 
+                const result = document.createElement('div');
+                result.className = 'tool-result';
+
                 header.addEventListener('click', () => {
                     content.classList.toggle('collapsed');
                     const toggle = header.querySelector('.tool-toggle');
@@ -663,8 +716,9 @@
                 });
 
                 toolDiv.appendChild(header);
+                toolDiv.appendChild(result);
                 toolDiv.appendChild(content);
-                
+
                 return toolDiv;
             }
 

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/harness/webui/stream_agent.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 from typing import Any, Callable, Coroutine
 
 from harness.agent import Agent
@@ -106,14 +107,17 @@ class StreamAgent:
 
     async def chat(self, message: str, push: Callable[[dict], Coroutine[Any, Any, None]]):
         """处理用户消息，通过 push 协程逐条推送事件。"""
-        events = []
+        loop = asyncio.get_running_loop()
 
         def on_event(event_type: str, data: dict):
-            events.append({"type": event_type, **data})
+            try:
+                asyncio.run_coroutine_threadsafe(
+                    push({"type": event_type, **data}), loop
+                )
+            except Exception:
+                pass
 
-        result = self.agent.chat(message, on_event=on_event)
-        for event in events:
-            await push(event)
+        result = await asyncio.to_thread(self.agent.chat, message, on_event=on_event)
         await push({"type": "done"})
         return result
 

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/nju_coding_agent_harness.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nju-coding-agent-harness
-Version: 0.2.2
+Version: 0.2.4
 Requires-Python: >=3.11
 Requires-Dist: openai
 Requires-Dist: requests

{nju_coding_agent_harness-0.2.2 → nju_coding_agent_harness-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name =     "nju-coding-agent-harness"
-version = "0.2.2"
+version = "0.2.4"
 requires-python = ">=3.11"
 dependencies = [
     "openai",