shiyue/cc-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync latest local runtime changes

Browse Source
This commit is contained in:
cc-dan
2026-03-18 11:05:01 +00:00
parent e40f841649
commit c2427807e9
4 changed files with 135 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
public/app.js
View File

@@ -11,7 +11,7 @@
{ cmd: '/mode', desc: '查看/切换权限模式' },
{ cmd: '/cost', desc: '查看会话费用' },
{ cmd: '/compact', desc: '压缩上下文' },
{ cmd: '/init', desc: '生成/更新 CLAUDE.md' },
{ cmd: '/init', desc: '生成/更新 Agent 指南文件' },
{ cmd: '/help', desc: '显示帮助' },
];
@@ -4023,6 +4023,25 @@
}
}
// --- Recent CWD memory (localStorage) ---
const RECENT_CWD_KEY = 'cc-web-recent-cwds';
const RECENT_CWD_MAX = 5;
function getRecentCwds() {
try {
const raw = localStorage.getItem(RECENT_CWD_KEY);
return raw ? JSON.parse(raw) : [];
} catch { return []; }
}
function saveRecentCwd(cwd) {
if (!cwd) return;
let list = getRecentCwds().filter(p => p !== cwd);
list.unshift(cwd);
if (list.length > RECENT_CWD_MAX) list = list.slice(0, RECENT_CWD_MAX);
try { localStorage.setItem(RECENT_CWD_KEY, JSON.stringify(list)); } catch {}
}
// --- New Session Modal ---
let _onCwdSuggestions = null;
@@ -4063,11 +4082,28 @@
const cwdInput = overlay.querySelector('#ns-cwd-input');
const cwdList = overlay.querySelector('#ns-cwd-list');
// Fetch suggestions on focus
// Populate datalist with recent cwds + server suggestions
function renderCwdOptions(serverPaths) {
const recent = getRecentCwds();
const seen = new Set();
let html = '';
// Recent cwds first
for (const p of recent) {
if (!seen.has(p)) { seen.add(p); html += `<option value="${escapeHtml(p)}" label="最近"></option>`; }
}
// Server suggestions
for (const p of (serverPaths || [])) {
if (!seen.has(p)) { seen.add(p); html += `<option value="${escapeHtml(p)}"></option>`; }
}
cwdList.innerHTML = html;
}
// Pre-fill with local recent cwds immediately
renderCwdOptions([]);
// Fetch server suggestions on focus
cwdInput.addEventListener('focus', () => {
_onCwdSuggestions = (paths) => {
cwdList.innerHTML = paths.map(p => `<option value="${escapeHtml(p)}"></option>`).join('');
};
_onCwdSuggestions = (paths) => { renderCwdOptions(paths); };
send({ type: 'list_cwd_suggestions' });
});
@@ -4083,6 +4119,7 @@
overlay.querySelector('#ns-create-btn').addEventListener('click', () => {
const cwd = cwdInput.value.trim() || null;
close();
if (cwd) saveRecentCwd(cwd);
send({ type: 'new_session', cwd, agent: targetAgent, mode: currentMode });
});

9
scripts/mock-codex.js
View File

@@ -68,6 +68,13 @@ function readStdin() {
fs.writeFileSync(statePath, JSON.stringify(state));
}
const isInitPrompt = input === '/init' || input.includes('You are running cc-web\'s /init for a Codex session.');
if (isInitPrompt) {
const agentsPath = path.join(process.cwd(), 'AGENTS.md');
fs.writeFileSync(agentsPath, '# AGENTS.md\n\nGenerated by mock Codex /init.\n');
}
if (input === 'trigger codex context limit' && !state.compacted) {
process.stdout.write(`${JSON.stringify({
type: 'turn.failed',
@@ -78,6 +85,8 @@ function readStdin() {
const responseText = input === '/compact'
? 'Codex compact finished.'
: isInitPrompt
? 'Codex init finished.'
: `Codex mock handled (${imageCount} image): ${input}`;
process.stdout.write(`${JSON.stringify({

42
scripts/regression.js
View File

@@ -349,11 +349,19 @@ async function main() {
assert(codexConfigMsg.config.supportsSearch === false, 'Codex config should expose unsupported search capability');
assert(codexConfigMsg.config.enableSearch === false, 'Codex config should ignore unsupported search toggle');
ws.send(JSON.stringify({ type: 'new_session', agent: 'codex', cwd: '/tmp/codex-space', mode: 'plan' }));
const codexSession = await nextMessage(messages, ws, (msg) => msg.type === 'session_info' && msg.agent === 'codex' && msg.cwd === '/tmp/codex-space');
const codexInitCwd = path.join(tempRoot, 'codex-space');
mkdirp(codexInitCwd);
ws.send(JSON.stringify({ type: 'new_session', agent: 'codex', cwd: codexInitCwd, mode: 'plan' }));
const codexSession = await nextMessage(messages, ws, (msg) => msg.type === 'session_info' && msg.agent === 'codex' && msg.cwd === codexInitCwd);
assert(codexSession.mode === 'plan', 'Codex new_session should follow requested mode');
assert(codexSession.model === 'gpt-5.4', 'Codex new_session should inject default model gpt-5.4');
ws.send(JSON.stringify({ type: 'message', text: '/init', sessionId: codexSession.sessionId, mode: 'plan', agent: 'codex' }));
const codexInitStart = await nextMessage(messages, ws, (msg) => msg.type === 'system_message' && /AGENTS\.md/.test(msg.message || ''));
assert(/AGENTS\.md/.test(codexInitStart.message || ''), 'Codex /init should announce AGENTS.md generation');
await nextMessage(messages, ws, (msg) => msg.type === 'done' && msg.sessionId === codexSession.sessionId);
assert(fs.existsSync(path.join(codexInitCwd, 'AGENTS.md')), 'Codex /init should generate AGENTS.md in the workspace');
ws.send(JSON.stringify({ type: 'message', text: '/model gpt-5.3-codex', sessionId: codexSession.sessionId, mode: 'plan', agent: 'codex' }));
const codexModelChanged = await nextMessage(messages, ws, (msg) => msg.type === 'model_changed' && msg.model === 'gpt-5.3-codex');
assert(codexModelChanged.model === 'gpt-5.3-codex', 'Codex /model should accept arbitrary Codex model names');
@@ -393,14 +401,14 @@ async function main() {
.find((line) => line.includes(`"event":"process_spawn"`) && line.includes(firstMessageSession.sessionId.slice(0, 8)));
assert(spawnLine && !spawnLine.includes('--search') && spawnLine.includes('--image'), 'Codex exec should attach images and not append unsupported --search flag');
const allSpawnsForSession = processLog
.trim()
.split('\n')
.filter((line) => line.includes(`"event":"process_spawn"`) && line.includes(firstMessageSession.sessionId.slice(0, 8)));
const lastSpawn = allSpawnsForSession[allSpawnsForSession.length - 1] || '';
assert(lastSpawn.includes('resume') && lastSpawn.includes(threadIdBeforeMode), 'Codex mode switch should keep resume thread id');
assert(lastSpawn.includes('-s read-only'), 'Codex plan mode should set sandbox read-only');
assert(lastSpawn.includes('-s read-only resume'), 'Codex resume in plan mode must place -s before resume subcommand');
const allSpawnsForSession = processLog
.trim()
.split('\n')
.filter((line) => line.includes(`"event":"process_spawn"`) && line.includes(firstMessageSession.sessionId.slice(0, 8)));
const lastSpawn = allSpawnsForSession[allSpawnsForSession.length - 1] || '';
assert(lastSpawn.includes('resume') && lastSpawn.includes(threadIdBeforeMode), 'Codex mode switch should keep resume thread id');
assert(lastSpawn.includes('-s read-only'), 'Codex plan mode should set sandbox read-only');
assert(lastSpawn.includes('-s read-only resume'), 'Codex resume in plan mode must place -s before resume subcommand');
const runtimeToml = fs.readFileSync(path.join(configDir, 'codex-runtime-home', 'config.toml'), 'utf8');
assert(runtimeToml.includes('preferred_auth_method = "apikey"'), 'Codex custom profile should write isolated runtime auth mode');
@@ -423,10 +431,16 @@ async function main() {
assert(/Codex \/compact/.test(autoCompactStart.message || ''), 'Codex auto /compact should announce auto compact start');
const autoCompactDone = await nextMessage(messages, ws, (msg) => msg.type === 'system_message' && /已执行 Codex \/compact/.test(msg.message || ''));
assert(/已执行 Codex \/compact/.test(autoCompactDone.message || ''), 'Codex auto /compact should finish compact step');
const autoCompactResume = await nextMessage(messages, ws, (msg) => msg.type === 'system_message' && /按 Codex 压缩计划继续执行/.test(msg.message || ''));
assert(/继续执行/.test(autoCompactResume.message || ''), 'Codex auto /compact should announce retry');
const autoCompactRetryText = await nextMessage(messages, ws, (msg) => msg.type === 'text_delta' && /trigger codex context limit/.test(msg.text || ''), 8000);
assert(/trigger codex context limit/.test(autoCompactRetryText.text || ''), 'Codex auto /compact should replay the failed prompt after compact');
const autoCompactResume = await nextMessage(messages, ws, (msg) => msg.type === 'system_message' && /按 Codex 压缩计划继续执行/.test(msg.message || ''));
assert(/继续执行/.test(autoCompactResume.message || ''), 'Codex auto /compact should announce retry');
// Some Codex builds won't echo the original prompt text as a text delta on retry; accept either.
const autoCompactRetry = await nextMessage(messages, ws, (msg) => (
(msg.type === 'text_delta' && /trigger codex context limit/.test(msg.text || '')) ||
(msg.type === 'done' && msg.sessionId === autoCompactSession.sessionId)
), 20000);
if (autoCompactRetry.type === 'text_delta') {
assert(/trigger codex context limit/.test(autoCompactRetry.text || ''), 'Codex auto /compact should replay the failed prompt after compact');
}
const claudeAttachment = await uploadAttachment(port, token, {
filename: 'claude-test.png',

63
server.js
View File

@@ -1169,6 +1169,28 @@ function compactDoneMessage(agent) {
: '上下文压缩完成。已按 Claude Code 原生策略执行 /compact，下次继续在同一会话发送即可。';
}
function initStartMessage(agent) {
return agent === 'codex'
? '正在分析项目并生成 AGENTS.md ...'
: '正在分析项目并生成 CLAUDE.md ...';
}
function buildCodexInitPrompt(cwd) {
const targetPath = path.join(cwd || process.cwd(), 'AGENTS.md');
return [
'You are running cc-web\'s /init for a Codex session.',
'Analyze the current workspace and create or update AGENTS.md at the repository root.',
`The file path to write is: ${targetPath}`,
'Requirements:',
'- Actually write the file; do not stop after summarizing in chat.',
'- If AGENTS.md already exists, update it in place instead of creating a duplicate.',
'- Keep the document concise and practical for future coding agents working in this repo.',
'- Include the project purpose, key entry points, dev/test commands, important workflows, and repo-specific safety constraints.',
'- Prefer facts from the actual codebase over README claims when they differ.',
'- After editing the file, reply with a brief summary of what you wrote.',
].join('\n');
}
function compactAutoStartMessage(agent) {
return agent === 'codex'
? '检测到上下文达到上限，正在按 Codex /compact 自动压缩，然后继续当前任务…'
@@ -1825,6 +1847,33 @@ function handleSaveModelConfig(ws, newConfig) {
const tpl = merged.templates.find(t => t.name === merged.activeTemplate);
if (tpl) applyCustomTemplateToSettings(tpl);
}
// Remap ALL Claude sessions' model to current template values.
// Build a reverse map: modelName → tier, from ALL templates (not just old/new).
// This handles switches between any pair of templates regardless of name overlap.
const modelToTier = new Map();
for (const tpl of (merged.templates || [])) {
if (tpl.opusModel) modelToTier.set(tpl.opusModel, 'opus');
if (tpl.sonnetModel) modelToTier.set(tpl.sonnetModel, 'sonnet');
if (tpl.haikuModel) modelToTier.set(tpl.haikuModel, 'haiku');
}
try {
for (const file of fs.readdirSync(SESSIONS_DIR)) {
if (!file.endsWith('.json')) continue;
const sessionId = file.slice(0, -5);
try {
const session = loadSession(sessionId);
if (!session?.model || session.agent === 'codex') continue;
const tier = modelToTier.get(session.model);
if (tier && MODEL_MAP[tier] !== session.model) {
session.model = MODEL_MAP[tier];
session.updated = new Date().toISOString();
saveSession(session);
}
} catch {}
}
} catch {}
plog('INFO', 'model_config_saved', { mode: merged.mode, activeTemplate: merged.activeTemplate });
wsSend(ws, { type: 'model_config', config: getModelConfigMasked() });
wsSend(ws, { type: 'system_message', message: '模型配置已保存' });
@@ -2056,10 +2105,6 @@ function handleSlashCommand(ws, text, sessionId, fallbackAgent) {
}
case '/init': {
if (agent !== 'claude') {
wsSend(ws, { type: 'system_message', message: '/init 仅支持 Claude，Codex 暂不支持该命令。' });
break;
}
if (!sessionId || !session) {
wsSend(ws, { type: 'system_message', message: '请先进入一个会话后再执行 /init。' });
break;
@@ -2068,9 +2113,13 @@ function handleSlashCommand(ws, text, sessionId, fallbackAgent) {
wsSend(ws, { type: 'system_message', message: '当前会话正在处理中，请先等待完成或点击停止。' });
break;
}
wsSend(ws, { type: 'system_message', message: '正在分析项目并生成 CLAUDE.md ...' });
wsSend(ws, { type: 'system_message', message: initStartMessage(agent) });
pendingSlashCommands.set(session.id, { kind: 'init' });
handleMessage(ws, { text: '/init', sessionId: session.id, mode: session.permissionMode || 'yolo' }, { hideInHistory: true });
handleMessage(ws, {
text: agent === 'codex' ? buildCodexInitPrompt(session.cwd) : '/init',
sessionId: session.id,
mode: session.permissionMode || 'yolo',
}, { hideInHistory: true });
break;
}
@@ -2106,7 +2155,7 @@ function handleSlashCommand(ws, text, sessionId, fallbackAgent) {
wsSend(ws, {
type: 'system_message',
message: agent === 'codex'
? base + '\n/model [名称] — 查看/切换 Codex 模型（自由输入）\n/compact — 执行 Codex /compact 压缩上下文'
? base + '\n/model [名称] — 查看/切换 Codex 模型（自由输入）\n/compact — 执行 Codex /compact 压缩上下文\n/init — 分析项目并生成/更新 AGENTS.md'
: base + '\n/model [名称] — 查看/切换模型（opus, sonnet, haiku）\n/compact — 执行 Claude 原生上下文压缩（保留压缩计划并可自动续跑）\n/init — 分析项目并生成/更新 CLAUDE.md',
});
break;