@very_aq/codex-cli-web 0.0.9 → 0.0.11

package/README.md

@@ -30,7 +30,7 @@ English | [简体中文](README.zh-CN.md)
 
 ### Requirements
 
-- Node.js 22+
+- Node.js 18+
 - `codex` CLI installed and available on `PATH` (`codex --help` should work)
 
 ### Install
@@ -69,6 +69,18 @@ By default the server binds to loopback (`127.0.0.1`). To expose on LAN:
 CODEX_WEB_HOST=0.0.0.0 npm start
 ```
 
+On Windows PowerShell:
+
+```powershell
+$env:CODEX_WEB_HOST="0.0.0.0"; npm start
+```
+
+On Windows cmd.exe:
+
+```bat
+set CODEX_WEB_HOST=0.0.0.0 && npm start
+```
+
 Note: the server refuses to bind to a non-loopback host until admin initialization is completed on loopback.
 Start on loopback first, complete the admin initialization flow in the Web UI, then restart with `CODEX_WEB_HOST=0.0.0.0`.
 
@@ -140,6 +152,18 @@ Runtime config is resolved in this order:
 - Inline JSON: `CODEX_CONFIG='{\"web\":{\"port\":9000}}' npm start`
 - JSON file path: `CODEX_CONFIG=./config.json npm start`
 
+On Windows PowerShell (recommended to use the JSON file form):
+
+```powershell
+$env:CODEX_CONFIG="./config.json"; npm start
+```
+
+On Windows cmd.exe:
+
+```bat
+set CODEX_CONFIG=./config.json && npm start
+```
+
 This repository includes a commented example file: `config.json`.
 
 ### CLI config flag
@@ -155,12 +179,31 @@ The server parses a config flag at startup and maps it to `CODEX_CONFIG`:
 
 - Web: `CODEX_WEB_HOST`, `CODEX_WEB_PORT`
 - Auth: `SESSION_TOKEN`, `CODEX_WEB_AUTH_DB_PATH`
-- Codex: `CODEX_BIN`, `CODEX_CWD`, `CODEX_ALLOWED_CWD_ROOTS`, `CODEX_APPROVAL_POLICY`, `CODEX_SANDBOX_MODE`, `CODEX_HISTORY_PERSISTENCE`, `CODEX_DISABLE_RESPONSE_STORAGE`
+- Codex: `CODEX_BIN`, `CODEX_APP_SERVER_ARGS`, `CODEX_CWD`, `CODEX_ALLOWED_CWD_ROOTS`, `CODEX_APPROVAL_POLICY`, `CODEX_SANDBOX_MODE`, `CODEX_HISTORY_PERSISTENCE`, `CODEX_DISABLE_RESPONSE_STORAGE`
 - Legacy import (optional): `CODEX_WEB_USERS_FILE`, `CODEX_WEB_USER_WORKSPACES_FILE`
 - History: `CODEX_WEB_HISTORY_MODE`, `CODEX_WEB_HISTORY_DB_PATH`
 - Uploads: `CODEX_WEB_UPLOAD_BASE_DIR`, `CODEX_WEB_MAX_UPLOAD_BYTES`
 - `CODEX_CWD` is the base directory for relative cwd resolution, and is used when a new thread does not provide `cwd`.
 
+### Windows-native Codex CLI differences
+
+On native Windows, Codex CLI subcommands/flags may differ from Linux/macOS. If `codex app-server --listen stdio://` does not work on your setup, override the app-server args:
+
+- Via `CODEX_CONFIG` (`codex.appServerArgs`), or
+- Via `CODEX_APP_SERVER_ARGS` (JSON array or comma-delimited list), e.g.:
+
+PowerShell:
+
+```powershell
+$env:CODEX_APP_SERVER_ARGS="app-server,--listen,stdio://"; npm start
+```
+
+cmd.exe:
+
+```bat
+set CODEX_APP_SERVER_ARGS=app-server,--listen,stdio:// && npm start
+```
+
 ### Thread loading
 
 - `CODEX_WEB_OPEN_THREAD_TURNS_LIMIT`: max turns included when opening a thread (default: unlimited, equivalent to `Number.MAX_SAFE_INTEGER` / `9007199254740991`; set a number to cap the initial payload; set `all`, `unlimited`, or `infinite` to explicitly disable the cap).

package/README.zh-CN.md

@@ -30,7 +30,7 @@
 
 ### 环境要求
 
-- Node.js 22+
+- Node.js 18+
 - 已安装并可执行 `codex` CLI（`codex --help` 可用）
 
 ### 安装依赖
@@ -69,6 +69,18 @@ npm start
 CODEX_WEB_HOST=0.0.0.0 npm start
 ```
 
+Windows PowerShell 写法：
+
+```powershell
+$env:CODEX_WEB_HOST="0.0.0.0"; npm start
+```
+
+Windows cmd.exe 写法：
+
+```bat
+set CODEX_WEB_HOST=0.0.0.0 && npm start
+```
+
 注意：管理员初始化未完成（或仍存在默认口令账号）时，服务会拒绝监听非回环地址。
 建议先用回环地址启动，在 Web UI 完成管理员初始化后，再用 `CODEX_WEB_HOST=0.0.0.0` 重启。
 
@@ -140,6 +152,18 @@ npm run build
 - 内联 JSON：`CODEX_CONFIG='{\"web\":{\"port\":9000}}' npm start`
 - JSON 文件路径：`CODEX_CONFIG=./config.json npm start`
 
+Windows PowerShell（建议使用 JSON 文件路径形式）：
+
+```powershell
+$env:CODEX_CONFIG="./config.json"; npm start
+```
+
+Windows cmd.exe：
+
+```bat
+set CODEX_CONFIG=./config.json && npm start
+```
+
 本仓库提供了带 `+comment` 字段注释的示例文件：`config.json`。
 
 ### CLI 启动参数
@@ -155,12 +179,31 @@ npm run build
 
 - Web：`CODEX_WEB_HOST`、`CODEX_WEB_PORT`
 - 认证：`SESSION_TOKEN`、`CODEX_WEB_AUTH_DB_PATH`
-- Codex：`CODEX_BIN`、`CODEX_CWD`、`CODEX_ALLOWED_CWD_ROOTS`、`CODEX_APPROVAL_POLICY`、`CODEX_SANDBOX_MODE`、`CODEX_HISTORY_PERSISTENCE`、`CODEX_DISABLE_RESPONSE_STORAGE`
+- Codex：`CODEX_BIN`、`CODEX_APP_SERVER_ARGS`、`CODEX_CWD`、`CODEX_ALLOWED_CWD_ROOTS`、`CODEX_APPROVAL_POLICY`、`CODEX_SANDBOX_MODE`、`CODEX_HISTORY_PERSISTENCE`、`CODEX_DISABLE_RESPONSE_STORAGE`
 - 兼容导入（可选）：`CODEX_WEB_USERS_FILE`、`CODEX_WEB_USER_WORKSPACES_FILE`
 - 历史：`CODEX_WEB_HISTORY_MODE`、`CODEX_WEB_HISTORY_DB_PATH`
 - 上传：`CODEX_WEB_UPLOAD_BASE_DIR`、`CODEX_WEB_MAX_UPLOAD_BYTES`
 - `CODEX_CWD` 用于相对路径解析基准；新建线程未显式提供 `cwd` 时会使用该目录。
 
+### Windows 原生命令差异
+
+原生 Windows 环境下，Codex CLI 的子命令/参数可能与 Linux/macOS 不一致。如果默认的 `codex app-server --listen stdio://` 在你的环境跑不通，可以覆盖 app-server 启动参数：
+
+- 用 `CODEX_CONFIG`（`codex.appServerArgs`），或
+- 用 `CODEX_APP_SERVER_ARGS`（支持 JSON 数组或逗号分隔列表），例如：
+
+PowerShell：
+
+```powershell
+$env:CODEX_APP_SERVER_ARGS="app-server,--listen,stdio://"; npm start
+```
+
+cmd.exe：
+
+```bat
+set CODEX_APP_SERVER_ARGS=app-server,--listen,stdio:// && npm start
+```
+
 ### 打开线程 turns 上限
 
 - `CODEX_WEB_OPEN_THREAD_TURNS_LIMIT`：打开线程时首包返回的 turns 数量上限（默认不限制，等价于 `Number.MAX_SAFE_INTEGER` / `9007199254740991`；设置为数字可限制首包体积；设置为 `all`、`unlimited` 或 `infinite` 也可显式取消限制）。

package/bin/ccw

@@ -1,33 +1,10 @@
 #!/usr/bin/env node
 "use strict";
 
-const { spawnSync } = require("node:child_process");
-const { existsSync } = require("node:fs");
-const path = require("node:path");
+/**
+ * 兼容入口：
+ * - 旧版本 `package.json#bin.ccw` 指向 `bin/ccw`；
+ * - 当前版本已改为 `bin/ccw.js`，但保留该文件以避免用户手动执行时踩到 bash 依赖。
+ */
+require("./ccw.js");
 
-const packageRoot = path.resolve(__dirname, "..");
-const serverEntry = path.join(packageRoot, "server", "dist", "index.js");
-const cliArgs = process.argv.slice(2);
-
-if (!existsSync(serverEntry)) {
-  console.error("[ccw] Missing build artifact:", serverEntry);
-  console.error("[ccw] Run `npm run build` before using `ccw` from source checkout.");
-  process.exit(1);
-}
-
-const childResult = spawnSync(process.execPath, [serverEntry, ...cliArgs], {
-  cwd: process.cwd(),
-  env: process.env,
-  stdio: "inherit",
-});
-
-if (childResult.error) {
-  console.error("[ccw] Failed to start server:", childResult.error.message);
-  process.exit(1);
-}
-
-if (typeof childResult.status === "number") {
-  process.exit(childResult.status);
-}
-
-process.exit(1);

package/bin/ccw.js

@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+"use strict";
+
+const childProcess = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+/**
+ * 解析 npm 包根目录路径。
+ * Resolve the package root path.
+ */
+function resolvePackageRoot() {
+  // 当前文件在 `<pkg>/bin/ccw.js`，上一级为包根目录。
+  // This file lives at `<pkg>/bin/ccw.js`, so parent is package root.
+  return path.resolve(__dirname, "..");
+}
+
+/**
+ * 解析服务端入口文件路径。
+ * Resolve the server entry file path.
+ */
+function resolveServerEntry(packageRoot) {
+  // 发布包内的 server 入口位置固定为 `server/dist/index.js`。
+  // Server entry path is fixed as `server/dist/index.js` in the published package.
+  return path.join(packageRoot, "server", "dist", "index.js");
+}
+
+/**
+ * 打印错误并退出。
+ * Print an error message and exit.
+ */
+function fatal(message) {
+  // 统一从 stderr 输出，便于 CLI 调用方识别错误。
+  // Always write to stderr for CLI-friendly output.
+  process.stderr.write(`${message}\n`);
+  process.exit(1);
+}
+
+/**
+ * 主入口：透传参数并启动服务端入口脚本。
+ * Main entry: forward args and run the server entry script.
+ */
+function main() {
+  // npm 包根目录。
+  // Package root directory.
+  const packageRoot = resolvePackageRoot();
+  // 服务端编译产物入口路径。
+  // Server build output entry path.
+  const serverEntry = resolveServerEntry(packageRoot);
+
+  // 当发布包缺少构建产物时给出明确提示，避免报错信息不友好。
+  // Provide a clear error when build output is missing.
+  if (!fs.existsSync(serverEntry)) {
+    fatal("ccw: 缺少 server/dist/index.js，请先执行 npm run build 后再运行。");
+  }
+
+  // 透传参数到 server 入口；参数解析由 server/src/index.ts 处理。
+  // Forward args to server entry; arg parsing is handled by server/src/index.ts.
+  const forwardedArgs = process.argv.slice(2);
+  const nodeArgs = [serverEntry, ...forwardedArgs];
+
+  // 使用当前 Node 可执行文件启动，保持与用户环境一致。
+  // Use current Node executable for consistency with the user's environment.
+  const child = childProcess.spawn(process.execPath, nodeArgs, {
+    stdio: "inherit",
+  });
+
+  child.on("error", (err) => {
+    fatal(`ccw: 启动失败: ${String(err)}`);
+  });
+
+  child.on("exit", (code, signal) => {
+    // Windows 上 signal 常为空；这里尽量保持行为可预期。
+    // On Windows, signal is often null; keep exit behavior predictable.
+    if (typeof code === "number") {
+      process.exit(code);
+      return;
+    }
+    if (signal) {
+      fatal(`ccw: 子进程退出 (signal=${signal})`);
+      return;
+    }
+    process.exit(1);
+  });
+}
+
+main();
+

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@very_aq/codex-cli-web",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "private": false,
   "bin": {
-    "ccw": "bin/ccw"
+    "ccw": "bin/ccw.js"
   },
   "files": [
     "bin/ccw",
+    "bin/ccw.js",
     "server/dist",
     "web/dist",
     "README.md"
@@ -21,13 +22,13 @@
     "codex:generate": "npm -w server run codex:generate",
     "start": "node server/dist/index.js",
     "test": "npm -w server test",
-    "prepack": "npm run build",
-    "pack": "npm pack",
-    "version patch": "npm version patch"
+    "prepack": "npm run build"
   },
   "dependencies": {
+    "better-sqlite3": "^11.8.1",
     "busboy": "^1.6.0",
     "express": "^4.19.2",
+    "micromark-util-sanitize-uri": "^2.0.1",
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "remark-parse": "^11.0.0",

package/server/dist/admin/mcpAdminRoutes.d.ts

@@ -0,0 +1,7 @@
+import express from "express";
+import type { CodexMcpCli } from "../codex/codexMcpCli";
+type CreateMcpAdminRoutesOptions = {
+    codexMcp: CodexMcpCli | null;
+};
+export declare function createMcpAdminRoutes(opts: CreateMcpAdminRoutesOptions): express.Router;
+export {};

package/server/dist/admin/mcpAdminRoutes.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMcpAdminRoutes = createMcpAdminRoutes;
+const express_1 = __importDefault(require("express"));
+const requireAdmin_1 = require("../auth/requireAdmin");
+function normalizeName(name) {
+    return String(name ?? "").trim();
+}
+function normalizeUrl(url) {
+    return String(url ?? "").trim();
+}
+function createMcpAdminRoutes(opts) {
+    const router = express_1.default.Router();
+    router.use(requireAdmin_1.requireAdmin);
+    router.get("/servers", async (_req, res) => {
+        if (!opts.codexMcp) {
+            res.status(501).json({ ok: false, error: "not_supported" });
+            return;
+        }
+        try {
+            const servers = await opts.codexMcp.listServers();
+            res.json({ ok: true, servers });
+        }
+        catch (err) {
+            res.status(500).json({ ok: false, error: "list_failed", details: String(err) });
+        }
+    });
+    router.post("/add", async (req, res) => {
+        if (!opts.codexMcp) {
+            res.status(501).json({ ok: false, error: "not_supported" });
+            return;
+        }
+        const body = (req.body ?? {});
+        const name = normalizeName(body.name);
+        const url = normalizeUrl(body.url);
+        if (!name || !url) {
+            res.status(400).json({ ok: false, error: "invalid_input" });
+            return;
+        }
+        try {
+            await opts.codexMcp.addUrlServer({ name, url });
+            res.json({ ok: true });
+        }
+        catch (err) {
+            res.status(400).json({ ok: false, error: "add_failed", details: String(err) });
+        }
+    });
+    router.post("/remove", async (req, res) => {
+        if (!opts.codexMcp) {
+            res.status(501).json({ ok: false, error: "not_supported" });
+            return;
+        }
+        const body = (req.body ?? {});
+        const name = normalizeName(body.name);
+        if (!name) {
+            res.status(400).json({ ok: false, error: "invalid_input" });
+            return;
+        }
+        try {
+            await opts.codexMcp.removeServer({ name });
+            res.json({ ok: true });
+        }
+        catch (err) {
+            res.status(400).json({ ok: false, error: "remove_failed", details: String(err) });
+        }
+    });
+    return router;
+}
+//# sourceMappingURL=mcpAdminRoutes.js.map

package/server/dist/admin/mcpAdminRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpAdminRoutes.js","sourceRoot":"","sources":["../../src/admin/mcpAdminRoutes.ts"],"names":[],"mappings":"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"}

package/server/dist/app.d.ts

@@ -4,6 +4,7 @@ import type { CodexAppServer } from "./codex/codexAppServer";
 import type { UserWorkspaceStore } from "./workspace/userWorkspaceStore";
 import type { UserSettingsStore } from "./settings/userSettingsStore";
 import type { HistoryQueryService } from "./history/query/historyQueryService";
+import type { CodexMcpCli } from "./codex/codexMcpCli";
 type StatusSnapshot = {
     codex?: unknown;
     codexTask?: unknown;
@@ -14,6 +15,7 @@ export declare function createApp(opts: {
     startedAtMs?: number;
     getStatusSnapshot?: () => StatusSnapshot;
     codex?: CodexAppServer;
+    codexMcp?: CodexMcpCli | null;
     userStore?: UserStore;
     userWorkspaceStore?: UserWorkspaceStore;
     userSettingsStore?: UserSettingsStore;

package/server/dist/app.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,9 +49,11 @@ const bootstrapAdmin_1 = require("./auth/bootstrapAdmin");
 const password_1 = require("./auth/password");
 const adminInit_1 = require("./auth/adminInit");
 const userAdminRoutes_1 = require("./admin/userAdminRoutes");
+const mcpAdminRoutes_1 = require("./admin/mcpAdminRoutes");
 const cwdSuggest_1 = require("./tools/cwdSuggest");
 const accessControl_1 = require("./workspace/accessControl");
 const threadAccess_1 = require("./workspace/threadAccess");
+const executionPolicy_1 = require("./security/executionPolicy");
 const threadListVisibility_1 = require("./workspace/threadListVisibility");
 const userWorkspaceRoutes_1 = require("./workspace/userWorkspaceRoutes");
 const userSettingsRoutes_1 = require("./settings/userSettingsRoutes");
@@ -41,7 +76,9 @@ function createInMemoryUserStore() {
             const password = String(input.password ?? "");
             if (!password)
                 throw new Error("password is required");
-            const passwordHash = await (0, password_1.hashPassword)(password);
+            // 这里复用 password.ts 的哈希逻辑，确保测试环境与生产一致。
+            const { hashPassword } = await Promise.resolve().then(() => __importStar(require("./auth/password")));
+            const passwordHash = await hashPassword(password);
             const user = { username, role: normalizeRole(input.role), passwordHash, workspaces: [] };
             usersByUsername.set(username, user);
             return user;
@@ -63,8 +100,10 @@ function createInMemoryUserStore() {
             const user = usersByUsername.get(normalizedUsername);
             if (!user)
                 throw new Error("user not found");
+            // 这里复用 password.ts 的哈希逻辑，确保测试环境与生产一致。
+            const { hashPassword } = await Promise.resolve().then(() => __importStar(require("./auth/password")));
             // 计算新的 passwordHash 并回写。
-            const nextPasswordHash = await (0, password_1.hashPassword)(nextPassword);
+            const nextPasswordHash = await hashPassword(nextPassword);
             user.passwordHash = nextPasswordHash;
             usersByUsername.set(normalizedUsername, user);
             return user;
@@ -328,6 +367,7 @@ function createApp(opts) {
         return (0, httpAuth_1.requireAuth)(opts.sessionSecret, userStore)(req, res, next);
     });
     app.use("/api/admin", (0, userAdminRoutes_1.createUserAdminRoutes)({ userStore }));
+    app.use("/api/admin/mcp", (0, mcpAdminRoutes_1.createMcpAdminRoutes)({ codexMcp: opts.codexMcp ?? null }));
     app.use("/api/workspaces", (0, userWorkspaceRoutes_1.createUserWorkspaceRoutes)({ userWorkspaceStore }));
     app.use("/api/user-settings", (0, userSettingsRoutes_1.createUserSettingsRoutes)({ userSettingsStore }));
     const uploadHandler = async (req, res) => {
@@ -382,6 +422,7 @@ function createApp(opts) {
     app.get("/api/config", async (_req, res) => {
         const approvalPolicy = (0, env_1.getCodexApprovalPolicy)();
         const sandboxMode = (0, env_1.getCodexSandboxMode)();
+        const historyPageLimit = (0, env_1.getWebHistoryPageLimit)();
         let model = null;
         let reasoningEffort = null;
         if (opts.codex) {
@@ -421,7 +462,7 @@ function createApp(opts) {
             }
         }
         // Security: avoid leaking server directory structure (e.g. CODEX_CWD) to clients.
-        res.json({ approvalPolicy, sandboxMode, model, reasoningEffort });
+        res.json({ approvalPolicy, sandboxMode, model, reasoningEffort, historyPageLimit });
     });
     app.get("/api/cwd/suggest", async (req, res) => {
         const q = typeof req.query?.q === "string" ? String(req.query.q) : "";
@@ -589,6 +630,16 @@ function createApp(opts) {
         }
     });
     // 线程写接口统一鉴权：member 必须在其分配 workspaces 内操作 thread.cwd。
+    // 说明：历史/线程接口会高频触发该校验；为避免每次都走 codex.readThread + fs.stat/realpath，
+    // 这里做一个短 TTL 的 per-user/per-thread 缓存（缓存命中后直接放行）。
+    const THREAD_ACCESS_CACHE_TTL_MS = 30_000;
+    const THREAD_ACCESS_CACHE_MAX_PER_USER = 500;
+    const threadAccessCacheByUsername = new Map();
+    const resolveUserWorkspacesKey = (user) => {
+        const rawWorkspaces = Array.isArray(user?.workspaces) ? user.workspaces : [];
+        // workspacesKey：用于在“用户被重新分配工作区”时自动失效缓存（同一 username 下的权限可能变更）。
+        return rawWorkspaces.map((w) => String(w ?? "").trim()).filter(Boolean).sort().join("|");
+    };
     const requireThreadAccess = async (req, res, threadId) => {
         const user = req.user;
         if (!user) {
@@ -596,7 +647,30 @@ function createApp(opts) {
             return false;
         }
         try {
+            const username = String(user.username ?? "").trim();
+            const nowMs = Date.now();
+            // 非 admin：优先走缓存，减少对 codex/app-server 与文件系统的重复访问。
+            if (username && !(0, roles_1.isAdminRole)(user.role)) {
+                const workspacesKey = resolveUserWorkspacesKey(user);
+                const cacheForUser = threadAccessCacheByUsername.get(username);
+                const cached = cacheForUser?.get(threadId);
+                if (cached &&
+                    cached.workspacesKey === workspacesKey &&
+                    Number.isFinite(cached.ts) &&
+                    nowMs - cached.ts < THREAD_ACCESS_CACHE_TTL_MS) {
+                    return true;
+                }
+            }
             await (0, threadAccess_1.assertThreadAllowedForUser)({ threadId, user, codex: opts.codex });
+            if (username && !(0, roles_1.isAdminRole)(user.role)) {
+                const workspacesKey = resolveUserWorkspacesKey(user);
+                const cacheForUser = threadAccessCacheByUsername.get(username) ?? new Map();
+                threadAccessCacheByUsername.set(username, cacheForUser);
+                // best-effort 限制缓存大小，避免长时间运行导致内存增长。
+                if (cacheForUser.size > THREAD_ACCESS_CACHE_MAX_PER_USER)
+                    cacheForUser.clear();
+                cacheForUser.set(threadId, { ts: nowMs, workspacesKey });
+            }
             return true;
         }
         catch {
@@ -612,6 +686,67 @@ function createApp(opts) {
             requireThreadAccess,
         }));
     }
+    /**
+     * 发送一条用户输入（submit turn），通过 HTTP 触发 codex 执行。
+     * 注意：该接口只负责“触发执行 + 立即返回”，后续流式输出仍由 WS 通道推送到前端。
+     */
+    app.post("/api/thread/submit", async (req, res) => {
+        if (!opts.codex) {
+            res.status(501).json({ ok: false, error: "not_supported" });
+            return;
+        }
+        const user = req.user;
+        if (!user) {
+            res.status(401).json({ ok: false, error: "unauthorized" });
+            return;
+        }
+        const body = (req.body ?? {});
+        const threadId = String(body.threadId ?? "").trim();
+        const text = typeof body.text === "string" ? body.text : "";
+        const clientMessageId = String(body.clientMessageId ?? "").trim();
+        if (!threadId || !text.trim()) {
+            res.status(400).json({ ok: false, error: "invalid_request" });
+            return;
+        }
+        try {
+            if (!(await requireThreadAccess(req, res, threadId)))
+                return;
+            const requestedApprovalPolicy = body.approvalPolicy;
+            const requestedSandbox = body.sandbox;
+            // turn 级别的执行策略必须按角色收敛，避免 member 通过 API 提升权限。
+            const approvalPolicy = typeof requestedApprovalPolicy === "string" && requestedApprovalPolicy.trim()
+                ? (0, executionPolicy_1.coerceApprovalPolicyForUser)({
+                    userRole: user.role,
+                    requested: requestedApprovalPolicy,
+                    fallback: (0, env_1.getCodexApprovalPolicy)(),
+                })
+                : undefined;
+            const sandbox = typeof requestedSandbox === "string" && requestedSandbox.trim()
+                ? (0, executionPolicy_1.coerceSandboxModeForUser)({
+                    userRole: user.role,
+                    requested: requestedSandbox,
+                    fallback: (0, env_1.getCodexSandboxMode)(),
+                })
+                : undefined;
+            const effort = typeof body.effort === "string"
+                ? body.effort
+                : typeof body.reasoningEffort === "string"
+                    ? body.reasoningEffort
+                    : undefined;
+            const turnOpts = {
+                model: typeof body.model === "string" ? body.model : undefined,
+                effort,
+                approvalPolicy,
+                sandbox,
+                collaborationMode: body.collaborationMode && typeof body.collaborationMode === "object" ? body.collaborationMode : undefined,
+            };
+            await opts.codex.startTurn(threadId, text, turnOpts);
+            res.json({ ok: true, threadId, clientMessageId: clientMessageId || undefined });
+        }
+        catch (err) {
+            res.status(500).json({ ok: false, error: "request_failed", details: String(err?.message ?? err) });
+        }
+    });
     app.post("/api/thread/name/set", async (req, res) => {
         if (!opts.codex) {
             res.status(501).json({ ok: false, error: "not_supported" });