@zhongqian97-code/ecode 0.5.29 → 0.5.30

package/dist/index.js

@@ -1448,6 +1448,59 @@ function generateTitle(firstUserMessage) {
   const oneLine = firstUserMessage.replace(/\n+/g, " ").trim();
   return oneLine.length > 50 ? oneLine.slice(0, 47) + "..." : oneLine;
 }
+function deleteSessionFiles(logDir, id) {
+  const session = findSession(logDir, id);
+  if (!session) return false;
+  const logFilePath2 = path6.join(logDir, session.logFile);
+  const metaFilePath = metadataPathFromLogFile(logFilePath2);
+  let deleted = false;
+  try {
+    fs8.unlinkSync(logFilePath2);
+    deleted = true;
+  } catch {
+  }
+  try {
+    fs8.unlinkSync(metaFilePath);
+    deleted = true;
+  } catch {
+  }
+  return deleted;
+}
+function loadMessagesFromJsonl(logFilePath2) {
+  try {
+    const content = fs8.readFileSync(logFilePath2, "utf-8");
+    const lines = content.split("\n").filter((l) => l.trim());
+    const messages = [];
+    for (const line of lines) {
+      try {
+        const entry = JSON.parse(line);
+        if (!entry.role || entry.role === "system") continue;
+        if (entry.role === "user") {
+          messages.push({ role: "user", content: entry.content ?? "" });
+        } else if (entry.role === "assistant") {
+          const msg = {
+            role: "assistant",
+            content: entry.content ?? null
+          };
+          if (entry.tool_calls) {
+            msg.tool_calls = entry.tool_calls;
+          }
+          messages.push(msg);
+        } else if (entry.role === "tool") {
+          messages.push({
+            role: "tool",
+            tool_call_id: entry.tool_call_id ?? "",
+            content: entry.content ?? ""
+          });
+        }
+      } catch {
+      }
+    }
+    return messages;
+  } catch {
+    return [];
+  }
+}
 
 // src/tools/task.ts
 var TASK_TOOL = {
@@ -5353,6 +5406,13 @@ function generateAdminHtml(version2) {
     }
     .session-item .s-title { color: #c9d1d9; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
     .session-item .s-id { color: #8b949e; font-size: 10px; }
+    .s-delete {
+      float: right; margin-top: -20px; background: none; border: none;
+      color: #6e7681; cursor: pointer; font-size: 11px; padding: 0 2px; line-height: 1;
+      display: none;
+    }
+    .session-item:hover .s-delete, .session-item.active .s-delete { display: inline; }
+    .s-delete:hover { color: #f85149; }
     .sidebar-empty { color: #8b949e; font-size: 12px; font-style: italic; padding: 12px; }
 
     /* \u2500\u2500 Chat area \u2500\u2500 */
@@ -5447,6 +5507,17 @@ function generateAdminHtml(version2) {
       white-space: pre-wrap;
       word-break: break-word;
     }
+    .thinking-block {
+      border: 1px solid #21262d;
+      border-radius: 4px;
+      font-size: 12px;
+      padding: 6px 10px;
+      margin: 4px 0;
+      color: #6e7681;
+      font-style: italic;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
     .cursor-blink::after {
       content: "\u258B";
       animation: blink 1s step-start infinite;
@@ -5651,6 +5722,7 @@ function generateAdminHtml(version2) {
     <span id="topbar-model" class="version" style="display:none"></span>
     <button id="config-btn" class="btn">\u914D\u7F6E</button>
     <button id="upgrade-btn" class="btn">\u5347\u7EA7</button>
+    <button id="toggle-tools-btn" class="btn">\u5DE5\u5177 \u25BE</button>
   </div>
 
   <div id="app">
@@ -5740,6 +5812,7 @@ function generateAdminHtml(version2) {
       status: 'idle',        // idle | thinking | tool_calling | awaiting_confirm
       wsRetries: 0,
       streamingMsgEl: null,  // DOM element currently receiving delta tokens
+      showTools: true,
     };
 
     // \u2500\u2500 Toast \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
@@ -5848,13 +5921,43 @@ function generateAdminHtml(version2) {
         const title = (s.title || '(\u65E0\u6807\u9898)').replace(/</g, '&lt;');
         const id = s.id.slice(0, 8);
         return '<div class="session-item' + active + '" data-id="' + s.id + '">' +
+          '<button class="s-delete" data-sid="' + s.id + '" title="\u5220\u9664\u4F1A\u8BDD">\u2715</button>' +
           '<div class="s-title">' + title + '</div>' +
           '<div class="s-id">' + id + '\u2026</div>' +
           '</div>';
       }).join('');
       listEl.querySelectorAll('.session-item').forEach(el => {
-        el.addEventListener('click', () => selectSession(el.dataset.id));
+        el.addEventListener('click', (e) => {
+          if (e.target.classList.contains('s-delete')) return;
+          selectSession(el.dataset.id);
+        });
       });
+      listEl.querySelectorAll('.s-delete').forEach(btn => {
+        btn.addEventListener('click', (e) => {
+          e.stopPropagation();
+          deleteSession(btn.dataset.sid);
+        });
+      });
+    }
+
+    async function deleteSession(id) {
+      if (!confirm('\u786E\u8BA4\u5220\u9664\u8BE5\u4F1A\u8BDD\uFF1F\u6B64\u64CD\u4F5C\u4E0D\u53EF\u64A4\u9500\u3002')) return;
+      try {
+        await apiFetch('/api/sessions/' + id, { method: 'DELETE' });
+        state.sessions = state.sessions.filter(s => s.id !== id);
+        if (state.activeSessionId === id) {
+          state.activeSessionId = null;
+          document.getElementById('messages').innerHTML =
+            '<div class="empty-chat">\u2190 \u4ECE\u5DE6\u4FA7\u9009\u62E9\u4F1A\u8BDD\uFF0C\u6216\u70B9\u51FB"\u65B0\u5EFA\u4F1A\u8BDD"\u5F00\u59CB</div>';
+          document.getElementById('chat-title').textContent = '\u9009\u62E9\u6216\u65B0\u5EFA\u4F1A\u8BDD';
+          if (state.ws) { state.ws.onclose = null; state.ws.close(); state.ws = null; }
+          setStatus('idle');
+        }
+        renderSidebar();
+        showToast('\u4F1A\u8BDD\u5DF2\u5220\u9664', 'success');
+      } catch (e) {
+        showToast('\u5220\u9664\u5931\u8D25: ' + e.message, 'error');
+      }
     }
 
     async function loadSessions() {
@@ -5963,7 +6066,12 @@ function generateAdminHtml(version2) {
         document.getElementById('ws-status').textContent = 'WebSocket \u9519\u8BEF';
       };
 
-      ws.onclose = () => {
+      ws.onclose = (evt) => {
+        // 4404 = \u4F1A\u8BDD\u4E0D\u5728\u5185\u5B58\u4E2D\uFF08\u5DF2\u7531 resume API \u5904\u7406\uFF09\uFF0C\u4E0D\u9700\u8981\u91CD\u8BD5
+        if (evt.code === 4404) {
+          document.getElementById('ws-status').textContent = '';
+          return;
+        }
         document.getElementById('ws-status').textContent = 'WebSocket \u5DF2\u65AD\u5F00';
         finalizeStreamingMsg();
         if (state.activeSessionId === sessionId && state.wsRetries < 5) {
@@ -6004,6 +6112,7 @@ function generateAdminHtml(version2) {
         boxEl.innerHTML =
           '<div class="tool-box-header">\u250C\u2500 ' + escHtml(name) + ' \u2500</div>' +
           '<div class="tool-box-body">\u2026</div>';
+        if (!state.showTools) boxEl.style.display = 'none';
         msgsEl.appendChild(boxEl);
         msgsEl.scrollTop = msgsEl.scrollHeight;
         setStatus('tool_calling');
@@ -6028,6 +6137,16 @@ function generateAdminHtml(version2) {
       } else if (type === 'session.idle') {
         finalizeStreamingMsg();
         setStatus('idle');
+      } else if (type === 'message.reasoning') {
+        const msgsEl = document.getElementById('messages');
+        const placeholder = msgsEl.querySelector('.empty-chat');
+        if (placeholder) placeholder.remove();
+        const thinkEl = document.createElement('div');
+        thinkEl.className = 'thinking-block';
+        thinkEl.textContent = msg.reasoning || msg.text || '';
+        if (!state.showTools) thinkEl.style.display = 'none';
+        msgsEl.appendChild(thinkEl);
+        msgsEl.scrollTop = msgsEl.scrollHeight;
       } else if (type === 'session.error') {
         finalizeStreamingMsg();
         setStatus('idle');
@@ -6075,7 +6194,7 @@ function generateAdminHtml(version2) {
     document.getElementById('deny-btn').addEventListener('click', () => sendApproval(false));
 
     // \u2500\u2500 Session selection \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-    function selectSession(id) {
+    async function selectSession(id) {
       state.activeSessionId = id;
       const session = state.sessions.find(s => s.id === id);
       document.getElementById('chat-title').textContent =
@@ -6084,6 +6203,12 @@ function generateAdminHtml(version2) {
       loadMessages(id);
       renderSidebar();
       setStatus('idle');
+      // \u5148\u5C1D\u8BD5\u6062\u590D\uFF08\u5C06\u5386\u53F2\u4F1A\u8BDD\u52A0\u8F7D\u5230\u5185\u5B58\uFF09\uFF0C\u518D\u8FDE\u63A5 WS
+      try {
+        await apiFetch('/api/chat/sessions/' + id + '/resume', { method: 'POST' });
+      } catch {
+        // \u6062\u590D\u5931\u8D25\u4E5F\u7EE7\u7EED\uFF08\u53EF\u80FD\u5DF2\u5728\u5185\u5B58\u4E2D\uFF0C\u6216\u53EA\u8BFB\u67E5\u770B\uFF09
+      }
       connectWs(id);
       // Close sidebar on mobile
       document.getElementById('sidebar').classList.remove('open');
@@ -6248,6 +6373,15 @@ function generateAdminHtml(version2) {
       }
     });
 
+    // \u2500\u2500 \u5DE5\u5177/\u601D\u8003\u53EF\u89C1\u6027\u5207\u6362 \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+    document.getElementById('toggle-tools-btn').addEventListener('click', () => {
+      state.showTools = !state.showTools;
+      document.getElementById('toggle-tools-btn').textContent = state.showTools ? '\u5DE5\u5177 \u25BE' : '\u5DE5\u5177 \u25B8';
+      document.querySelectorAll('.tool-box, .thinking-block').forEach(el => {
+        el.style.display = state.showTools ? '' : 'none';
+      });
+    });
+
     // \u2500\u2500 Mobile keyboard adaptation \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
     document.getElementById('msg-input').addEventListener('focus', () => {
       setTimeout(() => {
@@ -6372,6 +6506,23 @@ async function sessionsRoutes(app, opts) {
       return reply.send({ success: true, command });
     }
   );
+  app.delete(
+    "/api/sessions/:id",
+    async (request, reply) => {
+      const { id } = request.params;
+      if (!opts.config.logDir) {
+        return reply.code(404).send({ success: false, error: "Log directory not configured" });
+      }
+      const deleted = deleteSessionFiles(opts.config.logDir, id);
+      if (!deleted) {
+        return reply.code(404).send({ success: false, error: `Session not found: ${id}` });
+      }
+      if (opts.manager) {
+        opts.manager.deleteSession(id);
+      }
+      return reply.send({ success: true });
+    }
+  );
   app.get(
     "/api/sessions/:id/fork-command",
     async (request, reply) => {
@@ -6503,6 +6654,7 @@ async function automationRoutes(app, opts) {
 }
 
 // src/web/routes/chat.ts
+import { join as join14 } from "path";
 var BUSY_STATUSES = /* @__PURE__ */ new Set(["thinking", "tool_calling", "awaiting_confirm"]);
 async function chatRoutes(app, opts) {
   const { manager } = opts;
@@ -6556,6 +6708,37 @@ async function chatRoutes(app, opts) {
       return reply.send({ success: true });
     }
   );
+  app.post(
+    "/api/chat/sessions/:id/resume",
+    async (request, reply) => {
+      const { id } = request.params;
+      if (manager.getSession(id)) {
+        return reply.send({ success: true, resumed: false });
+      }
+      if (!opts.config.apiKey) {
+        return reply.code(400).send({
+          success: false,
+          error: "\u672A\u914D\u7F6E API Key\uFF0C\u8BF7\u5148\u70B9\u51FB\u53F3\u4E0A\u89D2\u300C\u914D\u7F6E\u300D\u6309\u94AE\u586B\u5199"
+        });
+      }
+      if (!opts.config.logDir) {
+        return reply.code(404).send({ success: false, error: "Log directory not configured" });
+      }
+      const session = findSession(opts.config.logDir, id);
+      if (!session) {
+        return reply.code(404).send({ success: false, error: `Session not found: ${id}` });
+      }
+      const logFilePath2 = join14(opts.config.logDir, session.logFile);
+      const initialMessages = loadMessagesFromJsonl(logFilePath2);
+      try {
+        await manager.createSession({ sessionId: id, initialMessages });
+        return reply.send({ success: true, resumed: true });
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return reply.code(500).send({ success: false, error: msg });
+      }
+    }
+  );
   app.post(
     "/api/chat/sessions/:id/approve",
     async (request, reply) => {
@@ -7050,6 +7233,10 @@ var SessionManager = class {
   listRunning() {
     return [...this.sessions.values()].map((s) => s.snapshot());
   }
+  /** 从内存中移除指定会话（不影响磁盘文件，由上层路由负责文件清理） */
+  deleteSession(sessionId) {
+    this.sessions.delete(sessionId);
+  }
 };
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhongqian97-code/ecode",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",