npm - @zhongqian97-code/ecode - Versions diffs - 0.5.21 → 0.5.23 - Mend

@zhongqian97-code/ecode 0.5.21 → 0.5.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/index.js +139 -26
package/package.json +1 -1

package/dist/index.js CHANGED Viewed

@@ -5250,7 +5250,7 @@ function generateAdminHtml(version2) {
 <html lang="zh">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content">
   <title>ecode web admin</title>
   <style>
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
@@ -5567,6 +5567,13 @@ function generateAdminHtml(version2) {
     .modal-footer { display:flex; gap:8px; justify-content:flex-end; margin-top:16px; }
     #upgrade-output { display:none; background:#0d1117; border:1px solid #30363d; border-radius:4px; padding:8px; font-family:monospace; font-size:12px; color:#c9d1d9; white-space:pre-wrap; max-height:200px; overflow-y:auto; margin-top:8px; }
+    /* \u2500\u2500 Syntax highlight \u2500\u2500 */
+    .kw   { color: #ff7b72; }
+    .str  { color: #a5d6ff; }
+    .cmt  { color: #8b949e; font-style: italic; }
+    .num  { color: #79c0ff; }
+    .fn   { color: #d2a8ff; }
     /* \u2500\u2500 Mobile \u2500\u2500 */
     @media (max-width: 600px) {
       #hamburger { display: block; }
@@ -5586,6 +5593,7 @@ function generateAdminHtml(version2) {
     <button id="hamburger" aria-label="Toggle sidebar">\u2630</button>
     <h1>\u26A1 ecode web admin</h1>
     <span class="version">v${version2}</span>
+    <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>
   </div>
@@ -5694,6 +5702,21 @@ function generateAdminHtml(version2) {
       return proto + '//' + location.host + '/api/ws/sessions/' + sessionId + '?token=' + encodeURIComponent(state.token);
     }
+    // \u2500\u2500 Code highlighting \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 highlightCode(code) {
+      let s = escHtml(code);
+      // keywords
+      s = s.replace(/\b(function|const|let|var|return|if|else|for|while|class|import|export|from|async|await|new|this|typeof|instanceof|null|undefined|true|false)\b/g, '<span class="kw">$1</span>');
+      // strings (single, double \u2014 after HTML escaping, quotes appear as &#39; or &quot;)
+      s = s.replace(/(&#39;[^&#]*&#39;|&quot;[^&]*&quot;)/g, '<span class="str">$1</span>');
+      // comments
+      s = s.replace(/(//[^
+]*)/g, '<span class="cmt">$1</span>');
+      // numbers
+      s = s.replace(/\b(d+.?d*)\b/g, '<span class="num">$1</span>');
+      return s;
+    }
     // Basic markdown \u2192 HTML (no libs)
     function renderMarkdown(text) {
       // Escape HTML first
@@ -5701,9 +5724,9 @@ function generateAdminHtml(version2) {
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;');
-      // Code blocks
+      // Code blocks (use highlightCode for syntax coloring)
       s = s.replace(/\`\`\`([\\s\\S]*?)\`\`\`/g, (_, code) =>
-        '<pre><code>' + code.trim() + '</code></pre>');
+        '<pre><code>' + highlightCode(code.trim()) + '</code></pre>');
       // Inline code
       s = s.replace(/\`([^\`]+)\`/g, '<code>$1</code>');
       // Bold
@@ -5781,6 +5804,31 @@ function generateAdminHtml(version2) {
       state.streamingMsgEl = null;
     }
+    async function loadMessages(sessionId) {
+      try {
+        const sep = '/api/sessions/' + sessionId + '/messages?token=' + encodeURIComponent(state.token);
+        const res = await fetch(sep);
+        if (!res.ok) return;
+        const text = await res.text();
+        const lines = text.split('\\n').filter(l => l.trim());
+        const msgsEl = document.getElementById('messages');
+        msgsEl.innerHTML = '';
+        for (const line of lines) {
+          try {
+            const m = JSON.parse(line);
+            if (m.content) {
+              appendMessage(m.role === 'user' ? 'user' : 'assistant', renderMarkdown(m.content));
+            }
+          } catch { /* skip malformed lines */ }
+        }
+        if (!lines.length) {
+          msgsEl.innerHTML = '<div class="empty-chat">\u6682\u65E0\u5386\u53F2\u6D88\u606F\uFF0C\u5F00\u59CB\u5BF9\u8BDD\u5427</div>';
+        }
+      } catch (e) {
+        // silently ignore \u2014 session might have no log file yet
+      }
+    }
     function appendMessage(role, htmlContent, opts) {
       const msgsEl = document.getElementById('messages');
       // Remove empty-chat placeholder
@@ -5848,7 +5896,12 @@ function generateAdminHtml(version2) {
         finalizeStreamingMsg();
         if (state.activeSessionId === sessionId && state.wsRetries < 5) {
           state.wsRetries++;
-          setTimeout(() => openWs(sessionId), 3000);
+          const wsRetryDelay = Math.min(1000 * Math.pow(2, state.wsRetries), 30000);
+          document.getElementById('ws-status').textContent =
+            '\u91CD\u8FDE\u4E2D\u2026 (' + state.wsRetries + '/5\uFF0C' + (wsRetryDelay/1000).toFixed(0) + 's\u540E)';
+          setTimeout(() => openWs(sessionId), wsRetryDelay);
+        } else if (state.wsRetries >= 5) {
+          document.getElementById('ws-status').textContent = '\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u5237\u65B0\u9875\u9762';
         }
       };
     }
@@ -5957,6 +6010,7 @@ function generateAdminHtml(version2) {
       document.getElementById('chat-title').textContent =
         session ? (session.title || id.slice(0, 12) + '\u2026') : id;
       clearMessages();
+      loadMessages(id);
       renderSidebar();
       setStatus('idle');
       connectWs(id);
@@ -6054,6 +6108,7 @@ function generateAdminHtml(version2) {
       if (apiKeyVal) body.apiKey = apiKeyVal;
       try {
         await apiFetch('/api/config', { method: 'PUT', headers: {'Content-Type':'application/json'}, body: JSON.stringify(body) });
+        updateTopbarModel(body.model);
       } catch (e) {
         // ignore errors silently for now
       }
@@ -6113,8 +6168,43 @@ function generateAdminHtml(version2) {
       }
     });
+    // \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(() => {
+        document.getElementById('msg-input').scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+      }, 300);
+    });
+    // \u2500\u2500 Global error boundary \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
+    window.onerror = function(msg, src, line) {
+      const wsStatusEl = document.getElementById('ws-status');
+      if (wsStatusEl) wsStatusEl.textContent = '\u9519\u8BEF: ' + msg;
+      return false;
+    };
     // \u2500\u2500 Init \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\u2500
+    function updateTopbarModel(model) {
+      const el = document.getElementById('topbar-model');
+      if (!el) return;
+      if (model) {
+        el.textContent = model;
+        el.style.display = '';
+      } else {
+        el.style.display = 'none';
+      }
+    }
+    async function initModel() {
+      try {
+        const data = await apiFetch('/api/config');
+        updateTopbarModel(data.model);
+      } catch {
+        // non-critical, ignore
+      }
+    }
     loadSessions();
+    initModel();
   </script>
 </body>
 </html>`;
@@ -6142,33 +6232,48 @@ async function statusRoutes(app, opts) {
 import { readFileSync as readFileSync5, existsSync as existsSync4 } from "fs";
 import { join as join13 } from "path";
 async function sessionsRoutes(app, opts) {
-  app.get("/api/sessions", async (_request, reply) => {
-    if (!opts.config.logDir) {
-      return reply.send([]);
-    }
-    return listSessions(opts.config.logDir);
+  app.get("/api/sessions", async (_request, _reply) => {
+    const fileSessions = opts.config.logDir ? listSessions(opts.config.logDir) : [];
+    if (!opts.manager) {
+      return fileSessions;
+    }
+    const runningSnapshots = opts.manager.listRunning();
+    const fileIds = new Set(fileSessions.map((s) => s.id));
+    const runtimeSessions = runningSnapshots.filter((s) => !fileIds.has(s.id)).map((s) => ({
+      id: s.id,
+      title: s.title,
+      model: s.model,
+      status: s.status,
+      turnCount: s.turnCount,
+      totalTokens: s.totalTokens,
+      startTime: s.startedAt,
+      lastActivity: s.lastActivity,
+      cwd: "",
+      logFile: ""
+    }));
+    return [...fileSessions, ...runtimeSessions];
   });
   app.get(
     "/api/sessions/:id/messages",
     async (request, reply) => {
       const { id } = request.params;
-      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 = join13(opts.config.logDir, session.logFile);
-      if (!existsSync4(logFilePath2)) {
-        return reply.code(404).send({ success: false, error: `Log file not found: ${session.logFile}` });
+      if (opts.config.logDir) {
+        const session = findSession(opts.config.logDir, id);
+        if (session) {
+          const logFilePath2 = join13(opts.config.logDir, session.logFile);
+          if (existsSync4(logFilePath2)) {
+            try {
+              const content = readFileSync5(logFilePath2, "utf-8");
+              return reply.header("Content-Type", "text/plain; charset=utf-8").send(content);
+            } catch {
+            }
+          }
+        }
       }
-      try {
-        const content = readFileSync5(logFilePath2, "utf-8");
-        return reply.header("Content-Type", "text/plain; charset=utf-8").send(content);
-      } catch (_err) {
-        return reply.code(404).send({ success: false, error: `Log file not found: ${session.logFile}` });
+      if (opts.manager && opts.manager.getSession(id)) {
+        return reply.header("Content-Type", "text/plain; charset=utf-8").send("");
       }
+      return reply.code(404).send({ success: false, error: `Session not found: ${id}` });
     }
   );
   app.get(
@@ -6472,7 +6577,7 @@ async function buildServer(opts) {
     manager: opts.manager,
     version: opts.version
   });
-  await app.register(sessionsRoutes, { config: opts.config });
+  await app.register(sessionsRoutes, { config: opts.config, manager: opts.manager });
   await app.register(configRoutes, { config: opts.config });
   await app.register(automationRoutes, { config: opts.config });
   await app.register(chatRoutes, { config: opts.config, manager: opts.manager });
@@ -6573,6 +6678,7 @@ var SessionRuntime = class {
   config;
   model;
   abortController = null;
+  _stopAfterToolRound = false;
   _turnCount = 0;
   _totalTokens = 0;
   startedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -6691,6 +6797,10 @@ var SessionRuntime = class {
           this.bus.emit({ type: "tool.completed", callId: tc.id, toolName: tc.name, output: toolResult });
           this.messages.push({ role: "tool", tool_call_id: tc.id, content: toolResult });
         }
+        if (this._stopAfterToolRound) {
+          this._stopAfterToolRound = false;
+          break;
+        }
       } else {
         if (assistantText) {
           this.messages.push({
@@ -6725,7 +6835,10 @@ Proceed?`;
           this.bus.emit({ type: "approval.requested", requestId: reqId, kind, prompt });
           const approved = await promise;
           this._status = "tool_calling";
-          if (!approved) return SKIP_MESSAGE;
+          if (!approved) {
+            this._stopAfterToolRound = true;
+            return SKIP_MESSAGE;
+          }
         }
         if (signal.aborted) return SKIP_MESSAGE;
         const result = await executeBash(parsed.command);

package/package.json CHANGED Viewed

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