jinzd-ai-cli 0.4.208 → 0.4.210

package/dist/{indexer-AKWMYNJI.js → indexer-2AG4G6B5.js}

@@ -2,7 +2,7 @@
 import {
   indexProject,
   updateFile
-} from "./chunk-O6UFCEUZ.js";
+} from "./chunk-K3CF65QH.js";
 import "./chunk-CKH4KQ4E.js";
 import "./chunk-IW3Q7AE5.js";
 export {

package/dist/{indexer-BMYUUDLH.js → indexer-4WWS3VIL.js}

@@ -1,7 +1,7 @@
 import {
   indexProject,
   updateFile
-} from "./chunk-SQB66GP6.js";
+} from "./chunk-BNERFXVO.js";
 import "./chunk-RWM2GFRC.js";
 import "./chunk-6BUTA5VW.js";
 export {

package/dist/{run-tests-HZ2CRCTZ.js → run-tests-NT2UIUVB.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-QDY72ABW.js";
+} from "./chunk-HZQVX7VF.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-D5SNUBYX.js → run-tests-UT7RZ7Y3.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-VWYUB22Y.js";
-import "./chunk-KV4GYNEA.js";
+} from "./chunk-E2ZWWE6Q.js";
+import "./chunk-GRJNQJA5.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-PVKLPRUP.js → server-AIHVMLNU.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   ToolRegistry
-} from "./chunk-2OVMMSGQ.js";
+} from "./chunk-NEPFADHX.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VWYUB22Y.js";
+import "./chunk-E2ZWWE6Q.js";
 import {
   runTool
-} from "./chunk-J22B3OSQ.js";
+} from "./chunk-DJ35G5VO.js";
 import {
   getDangerLevel,
   schemaToJsonSchema
@@ -15,12 +15,12 @@ import {
 import "./chunk-TZQHYZKT.js";
 import {
   VERSION
-} from "./chunk-KV4GYNEA.js";
+} from "./chunk-GRJNQJA5.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-TB4W4Y4T.js";
 import "./chunk-KHYD3WXE.js";
 import "./chunk-SLSWPBK3.js";
-import "./chunk-O6UFCEUZ.js";
+import "./chunk-K3CF65QH.js";
 import "./chunk-CKH4KQ4E.js";
 import "./chunk-IW3Q7AE5.js";
 

package/dist/{server-4EFTRFTN.js → server-E5D54DIZ.js}

@@ -16,10 +16,19 @@ import {
   McpManager,
   SkillManager,
   autoTrimSessionIfNeeded,
+  buildInitPrompt,
+  loadContextFiles,
   loadDevState,
   persistToolRound,
+  readGitDiff,
+  scanDirTree,
+  scanProject,
   setupProxy
-} from "./chunk-TD7JEHCR.js";
+} from "./chunk-7JWT3KXO.js";
+import {
+  buildReviewPrompt,
+  buildSecurityReviewPrompt
+} from "./chunk-HLWUDRBO.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -38,10 +47,10 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-2OVMMSGQ.js";
+} from "./chunk-NEPFADHX.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VWYUB22Y.js";
+import "./chunk-E2ZWWE6Q.js";
 import {
   SessionManager,
   getContentText
@@ -55,7 +64,7 @@ import {
 } from "./chunk-QMXC327F.js";
 import {
   runTool
-} from "./chunk-J22B3OSQ.js";
+} from "./chunk-DJ35G5VO.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -74,13 +83,12 @@ import {
 } from "./chunk-XPBEJB27.js";
 import {
   ConfigManager
-} from "./chunk-TM4MS63K.js";
+} from "./chunk-P6MTFCXB.js";
 import "./chunk-TZQHYZKT.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
   AUTHOR_EMAIL,
-  CONTEXT_FILE_CANDIDATES,
   CUSTOM_COMMANDS_DIR_NAME,
   DEFAULT_MAX_TOKENS,
   DEFAULT_MAX_TOOL_ROUNDS,
@@ -94,7 +102,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-KV4GYNEA.js";
+} from "./chunk-GRJNQJA5.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -104,7 +112,7 @@ import "./chunk-4BKXL7SM.js";
 import "./chunk-TB4W4Y4T.js";
 import "./chunk-KHYD3WXE.js";
 import "./chunk-SLSWPBK3.js";
-import "./chunk-O6UFCEUZ.js";
+import "./chunk-K3CF65QH.js";
 import "./chunk-CKH4KQ4E.js";
 import {
   atomicWriteFileSync
@@ -519,9 +527,8 @@ function loadMemoryContent(configDir) {
 }
 
 // src/web/session-handler.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, appendFileSync, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
 import { join as join2, resolve, dirname } from "path";
-import { execSync } from "child_process";
 function lastAssistantText(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
@@ -536,7 +543,7 @@ function lastAssistantText(messages) {
   }
   return void 0;
 }
-var SessionHandler = class _SessionHandler {
+var SessionHandler = class {
   ws;
   config;
   providers;
@@ -573,6 +580,7 @@ var SessionHandler = class _SessionHandler {
   pendingAutoPause = /* @__PURE__ */ new Map();
   /** Active system prompt from context files */
   activeSystemPrompt;
+  contextLoadResult = null;
   /** Directories added via /add-dir */
   addedDirs = /* @__PURE__ */ new Set();
   /** Track MCP tool names used across this session (for MCP budget prioritization) */
@@ -1697,7 +1705,7 @@ Tokens: in=${this.sessionTokenUsage.inputTokens} out=${this.sessionTokenUsage.ou
             "  /plan [enter|exit]   \u2014 Toggle read-only planning mode",
             "  /session new|list|load|delete <id> \u2014 Session management",
             "  /system [prompt|clear] \u2014 Set/view/reset system prompt",
-            "  /context [reload]    \u2014 Show/reload context layers",
+            "  /context [status|reload] \u2014 Show/reload context layers",
             "  /status              \u2014 Show session info & token usage",
             "  /cost                \u2014 Show cumulative token usage",
             "  /config [show|get|set] \u2014 View/modify configuration",
@@ -2221,7 +2229,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         const sub = (args[0] ?? "status").toLowerCase();
         const root = process.cwd();
         const { loadIndex, clearIndex } = await import("./store-MWNHVGJT.js");
-        const { indexProject } = await import("./indexer-AKWMYNJI.js");
+        const { indexProject } = await import("./indexer-2AG4G6B5.js");
         const { loadVectorStore, clearVectorStore } = await import("./vector-store-BBDXB5IQ.js");
         if (sub === "status") {
           const idx = loadIndex(root);
@@ -2340,8 +2348,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         const detailed = args.includes("--detailed");
         let diff;
         try {
-          const cmd = staged ? "git diff --staged" : "git diff";
-          diff = execSync(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+          diff = readGitDiff({ staged });
         } catch {
           this.send({ type: "error", message: "Failed to run git diff." });
           break;
@@ -2358,7 +2365,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           diff = head + "\n\n... [diff truncated, " + diff.length + " chars total] ...\n\n" + tail;
           truncated = true;
         }
-        const reviewPrompt = this.buildReviewPrompt(diff, formatGitContextForPrompt(gitCtx), detailed);
+        const reviewPrompt = buildReviewPrompt(diff, formatGitContextForPrompt(gitCtx), detailed);
         this.send({ type: "info", message: "\u{1F50D} Analyzing changes..." });
         try {
           const review = await this.chatOnce(reviewPrompt, { temperature: 0.3, maxTokens: 8192 });
@@ -2379,8 +2386,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         const secStaged = args.includes("--staged");
         let secDiff;
         try {
-          const cmd = secStaged ? "git diff --staged" : "git diff";
-          secDiff = execSync(cmd, { encoding: "utf-8", timeout: 1e4 }).trim();
+          secDiff = readGitDiff({ staged: secStaged });
         } catch {
           this.send({ type: "error", message: "Failed to run git diff." });
           break;
@@ -2397,7 +2403,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           secDiff = head + "\n\n... [diff truncated, " + secDiff.length + " chars total] ...\n\n" + tail;
           secTruncated = true;
         }
-        const secPrompt = this.buildSecurityReviewPrompt(secDiff, formatGitContextForPrompt(gitCtx));
+        const secPrompt = buildSecurityReviewPrompt(secDiff, formatGitContextForPrompt(gitCtx));
         this.send({ type: "info", message: "\u{1F512} Scanning for security vulnerabilities..." });
         try {
           const secReview = await this.chatOnce(secPrompt, { temperature: 0.2, maxTokens: 8192 });
@@ -2458,7 +2464,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-D5SNUBYX.js");
+          const { executeTests } = await import("./run-tests-UT7RZ7Y3.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2484,8 +2490,8 @@ Use /init --force to overwrite.` });
         }
         this.send({ type: "info", message: "\u{1F4DD} Scanning project structure..." });
         try {
-          const projectInfo = this.scanProject(cwd);
-          const prompt = this.buildInitPrompt(projectInfo, cwd);
+          const projectInfo = scanProject(cwd);
+          const prompt = buildInitPrompt(projectInfo, cwd);
           const content = await this.chatOnce(prompt, { temperature: 0.3, maxTokens: 4096 });
           writeFileSync(targetPath, content, "utf-8");
           this.send({ type: "info", message: `\u2713 Generated: ${targetPath} (${content.length} chars)
@@ -2622,29 +2628,24 @@ ${this.config.toFormattedJSON()}
           this.send({ type: "info", message: this.activeSystemPrompt ? `\u2713 Context reloaded (${this.activeSystemPrompt.length} chars).` : "\u2713 No context files found." });
           break;
         }
-        const configDir = this.config.getConfigDir();
-        const cwd = process.cwd();
-        const gitRoot = getGitRoot(cwd);
-        const projectRoot = gitRoot ?? cwd;
+        const result = this.contextLoadResult;
         const layers = ["\u{1F4DA} **Context Layers:**", ""];
-        const checkLayer = (label, dir) => {
-          for (const name2 of CONTEXT_FILE_CANDIDATES) {
-            const fullPath = join2(dir, name2);
-            if (existsSync3(fullPath)) {
-              try {
-                const size = statSync(fullPath).size;
-                layers.push(`  \u2713 ${label}: ${fullPath} (${size} bytes)`);
-                return;
-              } catch {
-              }
-            }
+        if (result && result.layers.length > 0) {
+          const labels = { global: "Global ", project: "Project", local: "Local  " };
+          for (const layer of result.layers) {
+            layers.push(`  \u2713 ${labels[layer.level] ?? layer.level}: ${layer.displayPath} (${layer.charCount} chars${layer.truncated ? ", truncated" : ""})`);
+          }
+          layers.push(`  Total: ${result.totalChars} chars (${result.layers.length} layer${result.layers.length > 1 ? "s" : ""})`);
+        } else {
+          layers.push("  No context files loaded.");
+          layers.push("  Search order per layer: AICLI.override.md \u2192 AGENTS.override.md \u2192 AICLI.md \u2192 CLAUDE.md \u2192 AGENTS.md");
+        }
+        if (result && result.skipped.length > 0) {
+          layers.push("");
+          layers.push("Skipped:");
+          for (const skipped of result.skipped.slice(0, 5)) {
+            layers.push(`  - ${skipped.displayPath}: ${skipped.reason}${skipped.message ? ` (${skipped.message})` : ""}`);
           }
-          layers.push(`  \u2013  ${label}: (none)`);
-        };
-        checkLayer("Global", configDir);
-        checkLayer("Project", projectRoot);
-        if (resolve(cwd) !== resolve(projectRoot)) {
-          checkLayer("Subdir", cwd);
         }
         layers.push("");
         layers.push(`Total prompt length: ${this.activeSystemPrompt?.length ?? 0} chars`);
@@ -2954,9 +2955,11 @@ Add .md files to create commands.` });
     try {
       mkdirSync(configDir, { recursive: true });
       const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", " ");
-      appendFileSync(memPath, `
+      const previous = existsSync3(memPath) ? readFileSync3(memPath, "utf-8") : "";
+      const entry = `
 - [${timestamp}] ${text}
-`, "utf-8");
+`;
+      atomicWriteFileSync(memPath, previous + entry);
       this.send({ type: "info", message: `\u{1F4DD} Memory entry added: "${text}"` });
     } catch (err) {
       this.send({ type: "error", message: `Failed to write memory: ${err.message}` });
@@ -2966,7 +2969,7 @@ Add .md files to create commands.` });
     const configDir = this.config.getConfigDir();
     const memPath = join2(configDir, MEMORY_FILE_NAME);
     try {
-      writeFileSync(memPath, "", "utf-8");
+      atomicWriteFileSync(memPath, "");
       this.send({ type: "info", message: "\u{1F5D1}\uFE0F Persistent memory cleared." });
     } catch (err) {
       this.send({ type: "error", message: `Failed to clear memory: ${err.message}` });
@@ -3129,7 +3132,7 @@ Add .md files to create commands.` });
         dirContext += `
 [Directory: ${dir}]
 `;
-        dirContext += this.scanDirTree(dir, 2, 40) + "\n";
+        dirContext += scanDirTree(dir, 2, 40) + "\n";
         totalLen = dirContext.length;
       }
       stable += dirContext;
@@ -3168,265 +3171,21 @@ Add .md files to create commands.` });
     }
     return { toolDefs: this.toolRegistry.getDefinitions(), mcpBudgetNote: null };
   }
-  /**
-   * Find first matching context file in a directory.
-   */
-  findContextFile(dir) {
-    for (const name of CONTEXT_FILE_CANDIDATES) {
-      const fullPath = join2(dir, name);
-      try {
-        if (existsSync3(fullPath)) {
-          const content = readFileSync3(fullPath, "utf-8").trim();
-          if (content) return content;
-        }
-      } catch {
-      }
-    }
-    return null;
-  }
-  /**
-   * Load hierarchical context files (same as CLI):
-   *   1. Global:  ~/.aicli/AICLI.md or CLAUDE.md
-   *   2. Project: <git-root>/AICLI.md or CLAUDE.md
-   *   3. Subdir:  <cwd>/AICLI.md or CLAUDE.md (only if cwd ≠ project root)
-   */
-  // ── /init helpers ─────────────────────────────────────────────────
-  static SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
-    "node_modules",
-    ".git",
-    "dist",
-    "build",
-    "out",
-    "target",
-    ".next",
-    ".nuxt",
-    "__pycache__",
-    ".venv",
-    "venv",
-    ".tox",
-    ".mypy_cache",
-    ".pytest_cache",
-    ".gradle",
-    ".idea",
-    ".vscode",
-    ".vs",
-    "coverage",
-    ".cache",
-    ".parcel-cache",
-    "dist-cjs",
-    "release",
-    ".output",
-    ".turbo",
-    "vendor"
-  ]);
-  scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
-    const lines = [];
-    let count = 0;
-    const walk = (d, prefix, depth) => {
-      if (depth > maxDepth || count >= maxEntries) return;
-      let entries;
-      try {
-        entries = readdirSync(d);
-      } catch {
-        return;
-      }
-      const filtered = entries.filter((e) => !e.startsWith(".") && !_SessionHandler.SCAN_SKIP_DIRS.has(e));
-      const sorted = filtered.sort((a, b) => {
-        let aIsDir = false, bIsDir = false;
-        try {
-          aIsDir = statSync(join2(d, a)).isDirectory();
-        } catch {
-        }
-        try {
-          bIsDir = statSync(join2(d, b)).isDirectory();
-        } catch {
-        }
-        if (aIsDir !== bIsDir) return aIsDir ? -1 : 1;
-        return a.localeCompare(b);
-      });
-      for (let i = 0; i < sorted.length && count < maxEntries; i++) {
-        const name = sorted[i];
-        const fullPath = join2(d, name);
-        const isLast = i === sorted.length - 1;
-        let isDir;
-        try {
-          isDir = statSync(fullPath).isDirectory();
-        } catch {
-          continue;
-        }
-        lines.push(prefix + (isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ") + name + (isDir ? "/" : ""));
-        count++;
-        if (isDir) walk(fullPath, prefix + (isLast ? "    " : "\u2502   "), depth + 1);
-      }
-    };
-    walk(dir, "", 0);
-    if (count >= maxEntries) lines.push("... (truncated)");
-    return lines.join("\n");
-  }
-  scanProject(cwd) {
-    const info = { type: "unknown", language: "unknown", configFiles: [], directoryStructure: "" };
-    const check = (file) => existsSync3(join2(cwd, file));
-    const configCandidates = [
-      "package.json",
-      "tsconfig.json",
-      "Cargo.toml",
-      "pyproject.toml",
-      "setup.py",
-      "requirements.txt",
-      "go.mod",
-      "pom.xml",
-      "build.gradle",
-      "build.gradle.kts",
-      "CMakeLists.txt",
-      "Makefile",
-      ".csproj",
-      ".sln",
-      "composer.json",
-      "Gemfile",
-      "mix.exs",
-      "deno.json",
-      "bun.lockb"
-    ];
-    info.configFiles = configCandidates.filter(check);
-    if (check("package.json")) {
-      info.type = "node";
-      info.language = check("tsconfig.json") ? "TypeScript" : "JavaScript";
-      try {
-        const pkg = JSON.parse(readFileSync3(join2(cwd, "package.json"), "utf-8"));
-        const scripts = pkg.scripts ?? {};
-        info.buildCommand = scripts.build ? "npm run build" : void 0;
-        info.testCommand = scripts.test ? "npm test" : void 0;
-        info.devCommand = scripts.dev ? "npm run dev" : void 0;
-        const allDeps = { ...pkg.dependencies, ...pkg.devDependencies };
-        if (allDeps["react"]) info.framework = "React";
-        else if (allDeps["vue"]) info.framework = "Vue";
-        else if (allDeps["@angular/core"]) info.framework = "Angular";
-        else if (allDeps["next"]) info.framework = "Next.js";
-        else if (allDeps["express"]) info.framework = "Express";
-      } catch {
-      }
-    } else if (check("Cargo.toml")) {
-      info.type = "rust";
-      info.language = "Rust";
-      info.buildCommand = "cargo build";
-      info.testCommand = "cargo test";
-    } else if (check("pyproject.toml") || check("setup.py") || check("requirements.txt")) {
-      info.type = "python";
-      info.language = "Python";
-      info.testCommand = "pytest";
-    } else if (check("go.mod")) {
-      info.type = "go";
-      info.language = "Go";
-      info.buildCommand = "go build ./...";
-      info.testCommand = "go test ./...";
-    } else if (check("pom.xml")) {
-      info.type = "java";
-      info.language = "Java";
-      info.buildCommand = "mvn package";
-      info.testCommand = "mvn test";
-    } else if (check("build.gradle") || check("build.gradle.kts")) {
-      info.type = "java";
-      info.language = "Java/Kotlin";
-      info.buildCommand = "./gradlew build";
-      info.testCommand = "./gradlew test";
-    }
-    info.directoryStructure = this.scanDirTree(cwd);
-    return info;
-  }
-  buildInitPrompt(info, cwd) {
-    const parts = [
-      "Please generate an AICLI.md context file (Markdown format) for the following project.",
-      "\n## Project Info\n",
-      `- Working directory: ${cwd}`,
-      `- Type: ${info.type}`,
-      `- Language: ${info.language}`
-    ];
-    if (info.framework) parts.push(`- Framework: ${info.framework}`);
-    if (info.buildCommand) parts.push(`- Build command: ${info.buildCommand}`);
-    if (info.testCommand) parts.push(`- Test command: ${info.testCommand}`);
-    if (info.devCommand) parts.push(`- Dev command: ${info.devCommand}`);
-    parts.push(`
-## Detected Config Files
-${info.configFiles.map((f) => `- ${f}`).join("\n")}`);
-    parts.push(`
-## Directory Structure
-\`\`\`
-${info.directoryStructure}
-\`\`\``);
-    parts.push(`
-## Requirements
-Generate a structured Markdown file with: project overview, tech stack, project structure, common commands, code style. Keep it concise, within 200 lines.`);
-    return parts.join("\n");
-  }
-  // ── /review helper ──────────────────────────────────────────────────
-  buildReviewPrompt(diff, gitContextStr, detailed) {
-    const level = detailed ? "Please perform a detailed in-depth review covering: security, performance, maintainability, error handling, naming conventions, and code duplication." : "Please perform a concise code review focusing on bugs, security issues, and key improvement suggestions.";
-    return `# Code Review Request
-
-${level}
-
-## Git Status
-${gitContextStr}
-
-## Code Changes (diff)
-\`\`\`diff
-${diff}
-\`\`\`
-
-## Output Format
-1. **Overall Assessment**: One-sentence summary
-2. **Issues** (if any): [Severity] file:line \u2014 description + fix
-3. **Improvement Suggestions** (if any)
-4. **Highlights** (if any)
-
-Severity: \u{1F534} Critical / \u{1F7E1} Warning / \u{1F535} Info`;
-  }
-  buildSecurityReviewPrompt(diff, gitContextStr) {
-    return `# Security Vulnerability Review
-
-Analyze the following code changes **exclusively for security vulnerabilities**.
-
-## Categories
-1. Injection (SQL, command, path traversal, XSS)
-2. Auth & Authorization (hardcoded creds, missing checks)
-3. Secrets & Sensitive Data (API keys, tokens in code)
-4. Input Validation (missing validation, unsafe deserialization)
-5. Cryptography (weak algorithms, hardcoded IVs)
-6. File System (path traversal, symlink attacks)
-7. Network (SSRF, insecure protocols)
-
-## Git Status
-${gitContextStr}
-
-## Code Changes
-\`\`\`diff
-${diff}
-\`\`\`
-
-## Output Format
-For each finding:
-- **Severity**: \u{1F534} CRITICAL / \u{1F7E0} HIGH / \u{1F7E1} MEDIUM / \u{1F535} LOW
-- **Category** + **File:line**
-- **Description** + exploitation scenario
-- **Recommended fix**
-
-If none found: "\u2705 No security vulnerabilities detected"`;
-  }
   loadContextFiles() {
-    const parts = [];
+    const contextConfig = this.config.get("context");
     const cwd = process.cwd();
-    const configDir = this.config.getConfigDir();
-    const globalCtx = this.findContextFile(configDir);
-    if (globalCtx) parts.push(globalCtx);
     const gitRoot = getGitRoot(cwd);
     const projectRoot = gitRoot ?? cwd;
-    const projectCtx = this.findContextFile(projectRoot);
-    if (projectCtx) parts.push(projectCtx);
-    if (resolve(cwd) !== resolve(projectRoot)) {
-      const localCtx = this.findContextFile(cwd);
-      if (localCtx) parts.push(localCtx);
-    }
-    return parts.length > 0 ? parts.join("\n\n---\n\n") : void 0;
+    const result = loadContextFiles({
+      cwd,
+      configDir: this.config.getConfigDir(),
+      projectRoot,
+      setting: this.config.get("contextFile"),
+      fallbackFilenames: contextConfig.projectDocFallbackFilenames,
+      maxBytes: contextConfig.projectDocMaxBytes
+    });
+    this.contextLoadResult = result;
+    return result.mergedContent || void 0;
   }
 };
 
@@ -3588,6 +3347,7 @@ async function startWebServer(options = {}) {
     clientDir = join3(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
+  app.use("/vendor", express.static(join3(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -3630,7 +3390,7 @@ async function startWebServer(options = {}) {
     }
     const token = authManager.login(username, password);
     console.log(`   \u2713 User registered via API: ${username}${firstRun ? " (first-run)" : ""}`);
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
+    res.cookie("aicli_token", token, authCookieOptions(req));
     res.json({ success: true, username });
   });
   app.post("/api/auth/login", (req, res) => {
@@ -3644,11 +3404,11 @@ async function startWebServer(options = {}) {
       res.status(401).json({ error: "Invalid username or password" });
       return;
     }
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
+    res.cookie("aicli_token", token, authCookieOptions(req));
     res.json({ success: true, username });
   });
-  app.post("/api/auth/logout", (_req, res) => {
-    res.clearCookie("aicli_token", { httpOnly: true, sameSite: "strict" });
+  app.post("/api/auth/logout", (req, res) => {
+    res.clearCookie("aicli_token", clearAuthCookieOptions(req));
     res.json({ success: true });
   });
   app.get("/api/files", requireAuth, (req, res) => {
@@ -4025,6 +3785,27 @@ function loadProjectMcpConfig() {
     return null;
   }
 }
+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";
+}
+function authCookieOptions(req) {
+  return {
+    httpOnly: true,
+    sameSite: "strict",
+    maxAge: TOKEN_EXPIRY_MS,
+    secure: isHttpsRequest(req)
+  };
+}
+function clearAuthCookieOptions(req) {
+  return {
+    httpOnly: true,
+    sameSite: "strict",
+    secure: isHttpsRequest(req)
+  };
+}
 function parseCookie(cookie) {
   const result = {};
   for (const part of cookie.split(";")) {