Skip to content

fix(opencode): use native instructions config to load CLAUDE.md and fragments #2153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gavrielc merged 2 commits into from
May 1, 2026
Merged

fix(opencode): use native instructions config to load CLAUDE.md and fragments #2153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c993527
fix(opencode): load CLAUDE.md context via native instructions pipeline
glifocat Apr 29, 2026
c0c46c1
fix(opencode): drop obsolete NANOCLAW_IS_MAIN / global CLAUDE.md branch
gavrielc May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions container/agent-runner/src/providers/opencode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as fs from 'fs';
import { spawn, type ChildProcess } from 'child_process';

import { createOpencodeClient, type OpencodeClient } from '@opencode-ai/sdk';
Expand Down Expand Up @@ -62,30 +61,11 @@ function spawnOpencodeServer(config: Record<string, unknown>, timeoutMs = 10_000
});
}

function readClaudeMdForPrompt(): 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');
}
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 wrapPromptWithContext(text: string, systemInstructions?: string): string {
let out = text;
if (systemInstructions) {
out = `<system>\n${systemInstructions}\n</system>\n\n${out}`;
}
const claudeMd = readClaudeMdForPrompt();
if (claudeMd) {
out = `<system>\n${claudeMd}\n</system>\n\n${out}`;
}
return out;
}

Expand Down Expand Up @@ -119,6 +99,16 @@ function buildOpenCodeConfig(options: ProviderOptions): Record<string, unknown>

const mcp = mcpServersToOpenCodeConfig(options.mcpServers);

// Load shared base + per-group fragments + per-group memory through OpenCode's
// native instructions pipeline (session/instruction.ts). Absolute paths with
// globs are supported. Files are read raw — `@./...` includes are NOT expanded
// by OpenCode, so point at the concrete files, not at composed CLAUDE.md.
const instructions = [
'/app/CLAUDE.md',
'/workspace/agent/.claude-fragments/*.md',
'/workspace/agent/CLAUDE.local.md',
];

return {
...(model ? { model } : {}),
...(smallModel ? { small_model: smallModel } : {}),
Expand All @@ -127,6 +117,7 @@ function buildOpenCodeConfig(options: ProviderOptions): Record<string, unknown>
autoupdate: false,
snapshot: false,
provider: providerOptions,
instructions,
mcp,
};
}
Expand Down