jinzd-ai-cli 0.4.307 → 0.4.308

package/dist/{server-GGEO7SA2.js → server-QRAWSG4Z.js}

@@ -1,4 +1,9 @@
 #!/usr/bin/env node
+import {
+  AuthRateLimiter,
+  WebAccess,
+  equalToken
+} from "./chunk-TDQW2YHK.js";
 import {
   DiscussionOrchestrator,
   getPreset,
@@ -8,10 +13,10 @@ import "./chunk-C2Z77RTU.js";
 import {
   AuthManager,
   TOKEN_EXPIRY_MS
-} from "./chunk-RYQBBEMM.js";
+} from "./chunk-4PR5AVJ5.js";
 import {
   persistDiscussion
-} from "./chunk-NUJTNH76.js";
+} from "./chunk-LBWKMTT3.js";
 import {
   AUTO_COMPACT_INSTRUCTION,
   McpManager,
@@ -81,7 +86,7 @@ import {
   skillHistoryNote,
   snapshotFile,
   stripRoutingTags
-} from "./chunk-YFDQIUQ3.js";
+} from "./chunk-HC33C4U3.js";
 import {
   CNY_PER_USD,
   CostTracker,
@@ -90,7 +95,7 @@ import {
   getCostCurrency,
   getPricing,
   setCostCurrency
-} from "./chunk-YKJO3SI4.js";
+} from "./chunk-G6DVGQ4I.js";
 import {
   DEFAULT_MAX_TOOL_OUTPUT_CHARS,
   ToolExecutor,
@@ -121,12 +126,11 @@ import {
   resolveAgentConfig,
   resolveWriteFileArgs,
   runSafePhases,
-  runWithSessionKey,
   setPreferredAgentName,
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-L2RJPVHV.js";
+} from "./chunk-TPTFV3Y6.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -134,7 +138,7 @@ import {
 import {
   thinkingParamsFor
 } from "./chunk-6YZEZFX5.js";
-import "./chunk-GHWZVPUV.js";
+import "./chunk-6JHACXB3.js";
 import {
   addMemoryEntry,
   backupMemoryStore,
@@ -153,18 +157,18 @@ import {
   restoreMemoryEntries,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-AHL6KOGM.js";
-import "./chunk-LF67HWWR.js";
-import "./chunk-XJOK5353.js";
-import "./chunk-WQ3OMEC4.js";
-import "./chunk-NRSYBKWA.js";
+} from "./chunk-LR3TGZWQ.js";
+import "./chunk-RWRZVQCB.js";
+import "./chunk-B3MPYI4E.js";
+import "./chunk-M6HLYG33.js";
+import "./chunk-C7CKDFJS.js";
 import "./chunk-KHYD3WXE.js";
 import "./chunk-5C76XDDF.js";
 import {
   SessionManager,
   getContentText
-} from "./chunk-IUVDZVZ4.js";
-import "./chunk-NYNSYLFY.js";
+} from "./chunk-AXTLYOA7.js";
+import "./chunk-JL44HGZC.js";
 import {
   scanString
 } from "./chunk-3FEZSLGI.js";
@@ -172,7 +176,7 @@ import {
   buildDoctorReport,
   formatDoctorReport,
   loadContextFiles
-} from "./chunk-NQJSPMY2.js";
+} from "./chunk-E2PNXNKI.js";
 import {
   describePlugin,
   getActivePluginAssets,
@@ -187,14 +191,14 @@ import {
   runTool,
   setPluginEnabled,
   trustPlugin
-} from "./chunk-5GQL4TSZ.js";
+} from "./chunk-3537CQ5M.js";
 import "./chunk-RS7SKYTS.js";
 import {
   ProviderRegistry
-} from "./chunk-VXEF2SWG.js";
+} from "./chunk-WT252ZDV.js";
 import {
   ConfigManager
-} from "./chunk-AQF6IXSR.js";
+} from "./chunk-YBZM7PHI.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -210,7 +214,7 @@ import {
   runAgentLoop,
   stripToolCallReminder,
   teeStreamErrorSummary
-} from "./chunk-MI4SFZGX.js";
+} from "./chunk-RMEJR3AW.js";
 import "./chunk-TU3L3PW7.js";
 import {
   formatGitContextForPrompt,
@@ -219,13 +223,15 @@ import {
 } from "./chunk-HOSJZMQS.js";
 import {
   atomicWriteFileSync
-} from "./chunk-IW3Q7AE5.js";
+} from "./chunk-BMLQPSHP.js";
 import {
   applyConfigCommand,
   maskConfigSecrets
 } from "./chunk-XNFIYS7G.js";
-import "./chunk-4BKXL7SM.js";
-import "./chunk-4W6VDVQU.js";
+import {
+  assertReadablePath
+} from "./chunk-JJFJWD35.js";
+import "./chunk-JJNUASMJ.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -241,7 +247,11 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-VAV2IJ3R.js";
+} from "./chunk-2MNUMLN4.js";
+import {
+  runWithExecutionContext,
+  runWithSessionKey
+} from "./chunk-SXIJLSVF.js";
 
 // src/web/server.ts
 import express from "express";
@@ -968,7 +978,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-MBSBTBGY.js");
+    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-YYWIN6BG.js");
     const pending = countPendingMemories2(ctx.config.getConfigDir());
     if (pending > 0) memoryLine = `
 Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
@@ -1591,7 +1601,7 @@ async function handleRewind(args, ctx) {
     ctx.send({ type: "error", message: intent.message });
     return;
   }
-  const { fileCheckpoints } = await import("./file-checkpoint-NKBHGC7L.js");
+  const { fileCheckpoints } = await import("./file-checkpoint-VVPUJNCI.js");
   if (intent.kind === "list") {
     const rows = buildRewindList(session.messages, fileCheckpoints.getMessageIndices());
     ctx.send({
@@ -1897,7 +1907,7 @@ async function handleTest(args, ctx) {
       const isCommand = argStr.includes(" ") || /^(mvn|gradle|npm|pytest|cargo|go)\b/.test(argStr);
       testArgs = isCommand ? { command: argStr } : { filter: argStr };
     }
-    const runTests = ctx.runTests ?? (await import("./run-tests-EQCAMFQE.js")).executeTests;
+    const runTests = ctx.runTests ?? (await import("./run-tests-GHY4BYDE.js")).executeTests;
     const report = await runTests(testArgs);
     ctx.send({ type: "info", message: report });
   } catch (err) {
@@ -2074,9 +2084,9 @@ async function handleContext(_args, ctx) {
 async function handleIndex(args, ctx) {
   const sub = (args[0] ?? "status").toLowerCase();
   const root = process.cwd();
-  const { loadIndex, clearIndex } = await import("./store-CMSSWZF7.js");
-  const { indexProject } = await import("./indexer-P3FPRTPJ.js");
-  const { loadVectorStore, clearVectorStore } = await import("./vector-store-PWIOQFTP.js");
+  const { loadIndex, clearIndex } = await import("./store-76VVFDXM.js");
+  const { indexProject } = await import("./indexer-GKIWSSRP.js");
+  const { loadVectorStore, clearVectorStore } = await import("./vector-store-V6UGEYWK.js");
   if (sub === "status") {
     const idx = loadIndex(root);
     const vec = loadVectorStore(root);
@@ -2126,7 +2136,7 @@ async function handleIndex(args, ctx) {
       message: `Building semantic index for ${idx.symbolCount} symbols\u2026 (first run downloads ~117 MB model)`
     });
     try {
-      const { rebuildSemanticIndex } = await import("./semantic-7GM5M4MU.js");
+      const { rebuildSemanticIndex } = await import("./semantic-N227CLSC.js");
       const stats = await rebuildSemanticIndex(root);
       const first = stats.modelFirstLoadMs ? ` (model load+first batch ${stats.modelFirstLoadMs}ms)` : "";
       ctx.send({
@@ -2157,7 +2167,7 @@ async function handleMemory(args, ctx) {
   if (intent.kind === "rebuild") {
     ctx.send({ type: "info", message: rebuildStartMessage(intent.full) });
     try {
-      const { buildChatIndex } = await import("./chat-index-2D5GK2DB.js");
+      const { buildChatIndex } = await import("./chat-index-7CLR4CBG.js");
       const stats = await buildChatIndex({ full: intent.full });
       ctx.send({ type: "info", message: rebuildDoneMessage(stats) });
     } catch (err) {
@@ -2166,14 +2176,14 @@ async function handleMemory(args, ctx) {
     return;
   }
   if (intent.kind === "index-clear") {
-    const { clearChatIndex } = await import("./chat-index-2D5GK2DB.js");
+    const { clearChatIndex } = await import("./chat-index-7CLR4CBG.js");
     clearChatIndex();
     ctx.send({ type: "info", message: "Chat memory index cleared (persistent memory untouched)." });
     return;
   }
   if (intent.kind === "status") {
-    const { getChatIndexStatus } = await import("./chat-index-2D5GK2DB.js");
-    const { listMemoryEntries: listMemoryEntries2, isMemoryExpired: isMemoryExpired2, formatMemoryForPrompt: formatMemoryForPrompt2 } = await import("./persistent-memory-MBSBTBGY.js");
+    const { getChatIndexStatus } = await import("./chat-index-7CLR4CBG.js");
+    const { listMemoryEntries: listMemoryEntries2, isMemoryExpired: isMemoryExpired2, formatMemoryForPrompt: formatMemoryForPrompt2 } = await import("./persistent-memory-YYWIN6BG.js");
     const memories = listMemoryEntries2(configDir, { includeExpired: true, includeRejected: true });
     const injected = formatMemoryForPrompt2(configDir, process.cwd(), ctx.config.get("memory")?.maxChars);
     const view = buildMemoryStatusView({
@@ -2196,8 +2206,8 @@ async function handleMemory(args, ctx) {
     return;
   }
   if (intent.kind === "recall") {
-    const { searchPersistentMemories, touchMemoryReferences } = await import("./persistent-memory-MBSBTBGY.js");
-    const { searchChatMemory } = await import("./chat-index-2D5GK2DB.js");
+    const { searchPersistentMemories, touchMemoryReferences } = await import("./persistent-memory-YYWIN6BG.js");
+    const { searchChatMemory } = await import("./chat-index-7CLR4CBG.js");
     const persistentHits = searchPersistentMemories(configDir, intent.query, process.cwd(), 3);
     if (persistentHits.length > 0) {
       touchMemoryReferences(configDir, persistentHits.map((h) => h.entry.id));
@@ -2317,7 +2327,7 @@ async function handleMemory(args, ctx) {
     ctx.handleMemoryManage(intent.action, args[1], intent.action === "expire" ? args[2] : void 0);
   } else if (intent.kind === "export") {
     if (args[1] === "md") {
-      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-MBSBTBGY.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-YYWIN6BG.js");
       ctx.send({
         type: "export_data",
         format: "md",
@@ -2941,7 +2951,18 @@ var SessionHandler = class _SessionHandler {
       }))
     });
   }
+  executionState = /* @__PURE__ */ new Map();
+  connectionAbort = new AbortController();
   async handleMessage(raw) {
+    if (this.connectionAbort.signal.aborted && /"type"\s*:\s*"(?:chat|command|hub_start)"/.test(raw)) this.connectionAbort = new AbortController();
+    return runWithExecutionContext({
+      configDir: this.config.getConfigDir(),
+      sessionKey: this._bashSessionKey,
+      state: this.executionState,
+      signal: this.connectionAbort.signal
+    }, () => this.handleMessageScoped(raw));
+  }
+  async handleMessageScoped(raw) {
     if (this.disconnected) return;
     let msg;
     try {
@@ -2952,6 +2973,7 @@ var SessionHandler = class _SessionHandler {
     }
     switch (msg.type) {
       case "chat": {
+        if (this.connectionAbort.signal.aborted) this.connectionAbort = new AbortController();
         if (msg.messageId) {
           if (typeof msg.messageId !== "string" || msg.messageId.length > 200) throw new Error("Invalid message ID");
           const scope = this.config.getConfigDir();
@@ -3012,6 +3034,7 @@ var SessionHandler = class _SessionHandler {
         return;
       }
       case "abort":
+        this.connectionAbort.abort();
         if (this.abortController) {
           this.abortController.abort();
         }
@@ -3035,8 +3058,16 @@ var SessionHandler = class _SessionHandler {
     }
   }
   onDisconnect(closeSocket = true) {
+    runWithExecutionContext({
+      configDir: this.config.getConfigDir(),
+      sessionKey: this._bashSessionKey,
+      state: this.executionState
+    }, () => this.disconnectScoped(closeSocket));
+  }
+  disconnectScoped(closeSocket) {
     if (this.disconnected) return;
     this.disconnected = true;
+    this.connectionAbort.abort();
     if (closeSocket && this.ws.readyState === this.ws.OPEN) this.ws.close(1001, "Connection closed; reconnect to restore session");
     runLifecycleHooks(mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()), "Stop", { sessionId: this.sessions.current?.id }, { configDir: this.config.getConfigDir() });
     this.toolExecutor.cancelAll();
@@ -4138,7 +4169,7 @@ Backup saved: ${result.backupPath}` : "";
       return;
     }
     try {
-      const { searchChatMemory, loadChatIndex } = await import("./chat-index-2D5GK2DB.js");
+      const { searchChatMemory, loadChatIndex } = await import("./chat-index-7CLR4CBG.js");
       const loaded = loadChatIndex();
       if (!loaded || loaded.idx.chunks.length === 0) {
         this.send({ type: "memory_hits", query: q, hits: [], indexMissing: true });
@@ -4174,7 +4205,7 @@ Backup saved: ${result.backupPath}` : "";
   }
   async handleMemoryStatus() {
     try {
-      const { getChatIndexStatus } = await import("./chat-index-2D5GK2DB.js");
+      const { getChatIndexStatus } = await import("./chat-index-7CLR4CBG.js");
       const s = getChatIndexStatus();
       this.send({
         type: "memory_status",
@@ -4199,7 +4230,7 @@ Backup saved: ${result.backupPath}` : "";
         type: "info",
         message: full ? "\u{1F9E0} Rebuilding chat memory index (this may take a while on first run \u2014 ~117 MB embedder)." : "\u{1F9E0} Refreshing chat memory index (incremental)\u2026"
       });
-      const { buildChatIndex } = await import("./chat-index-2D5GK2DB.js");
+      const { buildChatIndex } = await import("./chat-index-7CLR4CBG.js");
       const stats = await buildChatIndex({
         full,
         onProgress: (p) => {
@@ -4363,6 +4394,10 @@ async function startWebServer(options = {}) {
   console.log(`\u{1F916} ai-cli Web UI v${VERSION}`);
   console.log(`   Initializing...`);
   const config = new ConfigManager();
+  const authManager = new AuthManager(config.getConfigDir());
+  if (!authManager.isEnabled() && !["localhost", "127.0.0.1", "::1"].includes(host)) {
+    throw new Error("Network listening requires authentication. Create a user with aicli user create first.");
+  }
   await setupProxy(config.get("proxy"));
   const providers = new ProviderRegistry();
   const sessions = new SessionManager(config);
@@ -4396,7 +4431,7 @@ async function startWebServer(options = {}) {
   const projectMcpResolved = mcpEnabled ? resolveProjectMcpPath() : null;
   let projectMcpServers = {};
   if (projectMcpResolved) {
-    const { checkTrust } = await import("./project-trust-NKYHL3VZ.js");
+    const { checkTrust } = await import("./project-trust-KGG2BWKC.js");
     const verdict = checkTrust(config.getConfigDir(), projectMcpResolved);
     if (verdict.trusted) {
       projectMcpServers = loadProjectMcpConfig() ?? {};
@@ -4443,6 +4478,16 @@ async function startWebServer(options = {}) {
     skillManager
   };
   const app = express();
+  const access = new WebAccess(host, options.externalOrigin);
+  const authLimits = new AuthRateLimiter();
+  app.use((req, res, next) => {
+    if (!access.accepts(req)) {
+      res.status(403).json({ error: "Untrusted request origin or host" });
+      return;
+    }
+    res.locals.externalSecure = !!options.externalOrigin?.startsWith("https://") && req.headers.host === new URL(options.externalOrigin).host;
+    next();
+  });
   app.use((_req, res, next) => {
     res.setHeader(
       "Content-Security-Policy",
@@ -4471,19 +4516,23 @@ async function startWebServer(options = {}) {
   const WS_MSG_RATE_PER_SEC = 30;
   const WS_MSG_BURST = 60;
   const WS_PREAUTH_TIMEOUT_MS = 3e4;
-  const wss = new WebSocketServer({ server, maxPayload: WS_MAX_PAYLOAD });
-  const authManager = new AuthManager(config.getConfigDir());
+  const wss = new WebSocketServer({ server, maxPayload: WS_MAX_PAYLOAD, verifyClient: ({ req }) => {
+    if (!access.accepts(req) || wss.clients.size >= 128) return false;
+    if (req.headers.origin) return true;
+    const cookie = parseCookie(req.headers.cookie ?? "");
+    return equalToken(cookie.aicli_local, access.localToken) || !!authManager.verifyToken(cookie.aicli_token ?? "");
+  } });
   if (authManager.isEnabled()) {
     console.log(`   Auth: ${authManager.listUsers().length} user(s) registered`);
   } else {
-    console.log(`   Auth: disabled (no users registered)`);
-    if (host === "0.0.0.0" || host === "::") {
-      console.log("   WARNING: Web UI is reachable from the network without authentication.");
-      console.log("            Create a user first for LAN/team use: aicli user create <name>");
-    }
+    console.log("   Auth: local launch token (no users registered)");
   }
   const requireAuth = (req, res, next) => {
-    if (!authManager.isEnabled()) return next();
+    if (!authManager.isEnabled()) {
+      if (equalToken(parseCookie(req.headers.cookie ?? "").aicli_local, access.localToken)) return next();
+      res.status(401).json({ error: "Open the launch URL printed by aicli to authorize this browser" });
+      return;
+    }
     const authHeader = req.headers.authorization;
     const token = authHeader?.startsWith("Bearer ") ? authHeader.slice(7) : null;
     const cookieToken = parseCookie(req.headers.cookie ?? "")["aicli_token"];
@@ -4514,6 +4563,7 @@ async function startWebServer(options = {}) {
   console.log(`   Static files: ${clientDir}`);
   const PRECOMPRESSED_TYPES = {
     ".js": "text/javascript; charset=utf-8",
+    ".mjs": "text/javascript; charset=utf-8",
     ".css": "text/css; charset=utf-8",
     ".html": "text/html; charset=utf-8",
     ".json": "application/json; charset=utf-8",
@@ -4554,9 +4604,28 @@ async function startWebServer(options = {}) {
       }
     });
   });
-  app.use(express.json());
-  app.post("/api/auth/register", (req, res) => {
+  app.use(express.json({ limit: "16kb" }));
+  app.post("/api/auth/bootstrap", (req, res) => {
+    if (!equalToken(req.body?.token, access.localToken)) {
+      res.status(403).json({ error: "Invalid launch token" });
+      return;
+    }
+    res.cookie("aicli_local", access.localToken, { httpOnly: true, sameSite: "strict", secure: isHttpsRequest(req) });
+    res.json({ success: true });
+  });
+  app.use("/api/auth", (req, res, next) => {
+    if (!authLimits.take(req.socket.remoteAddress ?? "unknown")) {
+      res.status(429).json({ error: "Too many authentication attempts; try again later" });
+      return;
+    }
+    next();
+  });
+  app.post("/api/auth/register", async (req, res) => {
     const firstRun = !authManager.hasUsers();
+    if (firstRun && !equalToken(parseCookie(req.headers.cookie ?? "").aicli_local, access.localToken)) {
+      res.status(403).json({ error: "Open the launch URL before enabling authentication" });
+      return;
+    }
     if (!firstRun) {
       const authHeader = req.headers.authorization;
       const token2 = authHeader?.startsWith("Bearer ") ? authHeader.slice(7) : null;
@@ -4572,23 +4641,24 @@ async function startWebServer(options = {}) {
       res.status(400).json({ error: "Username and password required" });
       return;
     }
-    const err = authManager.register(username, password);
+    const err = await authManager.registerAsync(username, password);
     if (err) {
       res.status(400).json({ error: err });
       return;
     }
-    const token = authManager.login(username, password);
+    const token = await authManager.loginAsync(username, password);
+    invalidateConnections();
     console.log(`   \u2713 User registered via API: ${username}${firstRun ? " (first-run)" : ""}`);
     res.cookie("aicli_token", token, authCookieOptions(req));
     res.json({ success: true, username });
   });
-  app.post("/api/auth/login", (req, res) => {
+  app.post("/api/auth/login", async (req, res) => {
     const { username, password } = req.body ?? {};
     if (!username || !password) {
       res.status(400).json({ error: "Username and password required" });
       return;
     }
-    const token = authManager.login(username, password);
+    const token = await authManager.loginAsync(username, password);
     if (!token) {
       res.status(401).json({ error: "Invalid username or password" });
       return;
@@ -4597,6 +4667,9 @@ async function startWebServer(options = {}) {
     res.json({ success: true, username });
   });
   app.post("/api/auth/logout", (req, res) => {
+    const user = authManager.verifyToken(parseCookie(req.headers.cookie ?? "").aicli_token ?? "");
+    if (user) authManager.logoutAll(user);
+    invalidateConnections();
     res.clearCookie("aicli_token", clearAuthCookieOptions(req));
     res.json({ success: true });
   });
@@ -4692,6 +4765,7 @@ async function startWebServer(options = {}) {
     const fullPath = resolve3(join2(cwd, filePath));
     try {
       const canonicalFull = realpathSync(fullPath);
+      assertReadablePath(canonicalFull);
       const canonicalCwd = realpathSync(resolve3(cwd));
       if (!canonicalFull.startsWith(canonicalCwd + sep2) && canonicalFull !== canonicalCwd) {
         res.json({ error: "Access denied" });
@@ -4719,6 +4793,9 @@ async function startWebServer(options = {}) {
     if (cached) return cached;
     const userDataDir = authManager.getUserDataDir(username);
     const userConfig = new ConfigManager(userDataDir);
+    for (const key of ["defaultPermissionProfile", "allowedPermissionProfiles", "permissionProfiles", "permissionRules", "defaultPermission", "networkPolicy"]) {
+      userConfig.setTransient(key, structuredClone(config.get(key)));
+    }
     if (userConfig.isFirstRun()) {
       userConfig.setTransient("defaultProvider", config.get("defaultProvider"));
       userConfig.setTransient("defaultModels", config.get("defaultModels"));
@@ -4729,7 +4806,7 @@ async function startWebServer(options = {}) {
       // 每用户各自的 config 目录 → 各自的 cost-history.json
       costTracker: new CostTracker(userConfig.getConfigDir()),
       providers,
-      // Shared — providers re-read API keys per call
+      // Host-owned service credentials; shared explicitly, never per-user keys.
       sessions: userSessions,
       toolRegistry,
       // Shared
@@ -4742,6 +4819,21 @@ async function startWebServer(options = {}) {
     return userShared;
   }
   const handlers = /* @__PURE__ */ new Map();
+  const validators = /* @__PURE__ */ new Set();
+  function invalidateConnections() {
+    for (const validate of validators) validate();
+  }
+  let authRefreshTimer;
+  server.on("listening", () => {
+    if (!authRefreshTimer) {
+      authRefreshTimer = setInterval(invalidateConnections, 1e3);
+      authRefreshTimer.unref();
+    }
+  });
+  server.on("close", () => {
+    clearInterval(authRefreshTimer);
+    authRefreshTimer = void 0;
+  });
   wss.on("connection", (ws, req) => {
     const urlStr = req.url ?? "";
     const qMark = urlStr.indexOf("?");
@@ -4749,6 +4841,8 @@ async function startWebServer(options = {}) {
     const tabId = params.get("tabId") || `tab-${Date.now()}`;
     const cookies = parseCookie(req.headers.cookie ?? "");
     const token = cookies["aicli_token"] || "";
+    let activeToken = token;
+    const localAuthorized = equalToken(cookies.aicli_local, access.localToken);
     let tokens = WS_MSG_BURST;
     let lastRefill = Date.now();
     const takeToken = () => {
@@ -4808,7 +4902,7 @@ async function startWebServer(options = {}) {
       authenticatedUser = authManager.verifyToken(token);
     }
     const authRequired = authManager.isEnabled();
-    if (!authRequired) {
+    if (!authRequired && localAuthorized) {
       console.log(`   \u2713 Tab connected: ${tabId.slice(0, 12)} (no auth) (total: ${handlers.size + 1})`);
       handler = attachHandler(shared);
       clearPreAuthTimer();
@@ -4826,7 +4920,26 @@ async function startWebServer(options = {}) {
         }));
       }
     }
+    const validate = () => {
+      if (!handler) return;
+      let valid = false;
+      try {
+        valid = authManager.isEnabled() ? !!activeToken && authManager.verifyToken(activeToken) === authenticatedUser : localAuthorized && !authenticatedUser;
+      } catch {
+      }
+      if (!valid) {
+        handler.onDisconnect(false);
+        if (handlers.get(handlerKey) === handler) handlers.delete(handlerKey);
+        handler = null;
+        ws.close(1008, "Authentication changed; reconnect");
+      }
+    };
+    validators.add(validate);
+    ws.on("close", () => validators.delete(validate));
+    let authBusy = false;
     ws.on("message", async (data) => {
+      validate();
+      if (ws.readyState !== ws.OPEN) return;
       if (!takeToken()) {
         if (ws.readyState === ws.OPEN) {
           try {
@@ -4846,57 +4959,73 @@ async function startWebServer(options = {}) {
           return;
         }
         if (parsed.type === "auth") {
-          const { action, username, password } = parsed;
-          if (action === "register") {
-            if (authManager.hasUsers() && !authenticatedUser) {
-              ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Registration is closed. Use `aicli user create` on the host to add users." }));
+          if (authBusy) return;
+          authBusy = true;
+          try {
+            if (!authLimits.take(req.socket.remoteAddress ?? "unknown")) {
+              ws.close(1008, "Authentication rate limit");
               return;
             }
-            const err = authManager.register(username, password);
-            if (err) {
-              ws.send(JSON.stringify({ type: "auth_result", success: false, error: err }));
+            const { action, password } = parsed;
+            const username = typeof parsed.username === "string" ? parsed.username.trim().toLowerCase() : "";
+            if (action === "register") {
+              if (!authenticatedUser && (authManager.hasUsers() || !localAuthorized)) {
+                ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Registration is closed. Use `aicli user create` on the host to add users." }));
+                return;
+              }
+              const err = await authManager.registerAsync(username, password);
+              if (err) {
+                ws.send(JSON.stringify({ type: "auth_result", success: false, error: err }));
+                return;
+              }
+              activeToken = await authManager.loginAsync(username, password) ?? "";
+              if (ws.readyState !== ws.OPEN || authManager.verifyToken(activeToken) !== username) return;
+              authenticatedUser = username;
+              const userShared = getUserShared(username);
+              handler = attachHandler(userShared);
+              clearPreAuthTimer();
+              invalidateConnections();
+              console.log(`   \u2713 User registered & connected: ${username} (tab: ${tabId.slice(0, 12)})`);
+              ws.send(JSON.stringify({ type: "auth_result", success: true, username }));
               return;
             }
-            authManager.login(username, password);
-            authenticatedUser = username;
-            const userShared = getUserShared(username);
-            handler = attachHandler(userShared);
-            clearPreAuthTimer();
-            console.log(`   \u2713 User registered & connected: ${username} (tab: ${tabId.slice(0, 12)})`);
-            ws.send(JSON.stringify({ type: "auth_result", success: true, username }));
-            return;
-          }
-          if (action === "token") {
-            const { token: clientToken } = parsed;
-            const verifiedUser = authManager.verifyToken(clientToken);
-            if (!verifiedUser) {
-              ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Invalid or expired token" }));
+            if (action === "token") {
+              const { token: clientToken } = parsed;
+              const verifiedUser = authManager.verifyToken(clientToken);
+              if (!verifiedUser) {
+                ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Invalid or expired token" }));
+                return;
+              }
+              activeToken = clientToken;
+              authenticatedUser = verifiedUser;
+              const userShared = getUserShared(verifiedUser);
+              handler = attachHandler(userShared);
+              clearPreAuthTimer();
+              console.log(`   \u2713 Token auth: ${verifiedUser} (tab: ${tabId.slice(0, 12)})`);
+              ws.send(JSON.stringify({ type: "auth_result", success: true, username: verifiedUser }));
               return;
             }
-            authenticatedUser = verifiedUser;
-            const userShared = getUserShared(verifiedUser);
-            handler = attachHandler(userShared);
-            clearPreAuthTimer();
-            console.log(`   \u2713 Token auth: ${verifiedUser} (tab: ${tabId.slice(0, 12)})`);
-            ws.send(JSON.stringify({ type: "auth_result", success: true, username: verifiedUser }));
-            return;
-          }
-          if (action === "login") {
-            const loginToken = authManager.login(username, password);
-            if (!loginToken) {
-              ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Invalid username or password" }));
+            if (action === "login") {
+              const loginToken = await authManager.loginAsync(username, password);
+              if (!loginToken) {
+                ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Invalid username or password" }));
+                return;
+              }
+              if (ws.readyState !== ws.OPEN || authManager.verifyToken(loginToken) !== username) return;
+              activeToken = loginToken;
+              authenticatedUser = username;
+              const userShared = getUserShared(username);
+              handler = attachHandler(userShared);
+              clearPreAuthTimer();
+              console.log(`   \u2713 User logged in: ${username} (tab: ${tabId.slice(0, 12)})`);
+              ws.send(JSON.stringify({ type: "auth_result", success: true, username }));
               return;
             }
-            authenticatedUser = username;
-            const userShared = getUserShared(username);
-            handler = attachHandler(userShared);
-            clearPreAuthTimer();
-            console.log(`   \u2713 User logged in: ${username} (tab: ${tabId.slice(0, 12)})`);
-            ws.send(JSON.stringify({ type: "auth_result", success: true, username }));
+            ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Unknown auth action" }));
             return;
+          } finally {
+            authBusy = false;
           }
-          ws.send(JSON.stringify({ type: "auth_result", success: false, error: "Unknown auth action" }));
-          return;
         }
         if (!handler) {
           if (ws.readyState === ws.OPEN) {
@@ -4942,7 +5071,9 @@ async function startWebServer(options = {}) {
         }
       });
       server.listen(actualPort, host, () => {
-        const url = `http://${host === "0.0.0.0" ? "localhost" : host}:${actualPort}`;
+        actualPort = server.address().port;
+        const address = host.includes(":") ? `[${host}]` : host === "0.0.0.0" ? "localhost" : host;
+        const url = `http://${address}:${actualPort}` + (!authManager.isEnabled() ? `#token=${access.localToken}` : "");
         console.log(`
    \u{1F310} Web UI ready: ${url}`);
         if (actualPort !== port) console.log(`   (port ${port} was in use, using ${actualPort})`);
@@ -4998,10 +5129,7 @@ function loadProjectMcpConfig() {
   }
 }
 function isHttpsRequest(req) {
-  if (req.secure) return true;
-  const forwardedProto = req.headers["x-forwarded-proto"];
-  const proto = Array.isArray(forwardedProto) ? forwardedProto[0] : forwardedProto;
-  return proto?.split(",")[0]?.trim().toLowerCase() === "https";
+  return req.secure || req.res?.locals.externalSecure === true;
 }
 function authCookieOptions(req) {
   return {