@zhongqian97-code/ecode 0.5.22 → 0.5.23

package/dist/index.js

@@ -5593,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>
@@ -6107,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
       }
@@ -6181,7 +6183,28 @@ function generateAdminHtml(version2) {
     };
 
     // \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>`;
@@ -6209,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(
@@ -6490,7 +6528,7 @@ async function systemRoutes(app, opts) {
     try {
       latest = execSync("npm view @zhongqian97-code/ecode version", {
         encoding: "utf-8",
-        timeout: 2e3
+        timeout: 5e3
       }).trim();
     } catch {
       latest = "unknown";
@@ -6539,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 });
@@ -6640,6 +6678,7 @@ var SessionRuntime = class {
   config;
   model;
   abortController = null;
+  _stopAfterToolRound = false;
   _turnCount = 0;
   _totalTokens = 0;
   startedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -6758,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({
@@ -6792,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

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