third/nanoclaw
1
0
Fork 0
mirror of https://github.com/qwibitai/nanoclaw.git synced 2026-06-12 18:11:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(codex): load /workspace/global/CLAUDE.md for non-main groups

Browse Source 
Codex's app-server doesn't expand Claude Code's `@-import` syntax, so
the previous loader only passed group CLAUDE.md — global content never
reached the model. This mirrors the OpenCode provider's
readClaudeMdForPrompt: load group CLAUDE.md, then (unless NANOCLAW_IS_MAIN=1)
append /workspace/global/CLAUDE.md.

The literal `@./.claude-global.md` line at the top of group CLAUDE.md is
left in place. OpenCode does the same — keeps the two non-Claude
providers behaviorally consistent, and upstream may revise the group
template later.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Chip Tonkin
2026-04-19 11:12:08 -04:00
parent 138c277fae
commit aba618215d
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container/agent-runner/src/providers/codex.ts
+20 -14
View File
@@ -49,25 +49,31 @@ const TURN_TIMEOUT_MS = 5 * 60 * 1000;
const STALE_THREAD_RE = /thread\s+not\s+found|unknown\s+thread|thread[_\s]id|no such thread/i;
// ── System-prompt assembly ──────────────────────────────────────────────────
// Codex's app-server doesn't read CLAUDE.md/AGENT.md from cwd the way Claude
// Code does. We have to load it and pass it in as `baseInstructions`. The
// addendum from the poll-loop (destinations syntax, etc.) is appended.
// Codex's app-server doesn't expand Claude Code's `@-import` syntax in
// CLAUDE.md, so we load group + global explicitly and pass the combined text
// as `baseInstructions`. Mirrors the OpenCode provider's readClaudeMdForPrompt
// so non-Claude providers behave the same way. The literal `@./.claude-global.md`
// line in group CLAUDE.md is left in place — it's harmless context for the
// model and strips on an agent-side convention upstream may change.
function loadAgentBaseInstructions(): string | undefined {
const candidates = ['/workspace/agent/CLAUDE.md', '/workspace/agent/AGENT.md'];
const parts: string[] = [];
for (const p of candidates) {
if (fs.existsSync(p)) {
parts.push(fs.readFileSync(p, 'utf-8'));
break;
}
function readAgentAndGlobalClaudeMd(): string | undefined {
const groupPath = '/workspace/agent/CLAUDE.md';
const globalPath = '/workspace/global/CLAUDE.md';
let content = '';
if (fs.existsSync(groupPath)) {
content += fs.readFileSync(groupPath, 'utf-8');
}
return parts.length > 0 ? parts.join('\n\n') : undefined;
const isMain = process.env.NANOCLAW_IS_MAIN === '1';
if (!isMain && fs.existsSync(globalPath)) {
if (content) content += '\n\n---\n\n';
content += fs.readFileSync(globalPath, 'utf-8');
}
return content || undefined;
}
function composeBaseInstructions(promptAddendum: string | undefined): string | undefined {
const agentMd = loadAgentBaseInstructions();
const pieces = [agentMd, promptAddendum].filter((s): s is string => Boolean(s));
const claudeMd = readAgentAndGlobalClaudeMd();
const pieces = [claudeMd, promptAddendum].filter((s): s is string => Boolean(s));
return pieces.length > 0 ? pieces.join('\n\n---\n\n') : undefined;
}